Merge pull request #527 from PayButton/chore/rollup-v4

Upgraded to rollup v4, removed yarn-conflicting package-lock.json

Author: Klakurka

paybutton/package.json

@@ -4,28 +4,29 @@
   "description": "The easiest way to accept eCash online",
   "author": "",
   "main": "dist/paybutton.js",
+  "type": "module",
   "devDependencies": {
     "@paybutton/react": "link:../react",
-    "@rollup/plugin-alias": "^5.1.0",
-    "@rollup/plugin-commonjs": "^25.0.7",
-    "@rollup/plugin-html": "^1.0.3",
+    "@rollup/plugin-alias": "^5.1.1",
+    "@rollup/plugin-commonjs": "^28.0.1",
+    "@rollup/plugin-html": "^1.0.4",
     "@rollup/plugin-image": "^3.0.3",
     "@rollup/plugin-json": "^6.1.0",
-    "@rollup/plugin-node-resolve": "^15.2.3",
-    "@rollup/plugin-replace": "^5.0.5",
-    "@rollup/plugin-typescript": "^11.1.6",
+    "@rollup/plugin-node-resolve": "^15.3.0",
+    "@rollup/plugin-replace": "^6.0.1",
+    "@rollup/plugin-typescript": "^12.1.1",
     "camelcase": "^6.3.0",
     "ecashaddrjs": "^2.0.0",
     "preact": "^10.10.0",
-    "rollup": "^2.77.4-1",
+    "rollup": "^4.46.2",
     "rollup-plugin-cleanup": "^3.2.1",
-    "rollup-plugin-dotenv": "^0.5.0",
+    "rollup-plugin-dotenv": "^0.5.1",
     "rollup-plugin-livereload": "^2.0.0",
     "rollup-plugin-node-polyfills": "^0.2.1",
     "rollup-plugin-progress": "^1.1.2",
     "rollup-plugin-serve": "^2.0.0",
     "rollup-plugin-svg": "^2.0.0",
-    "rollup-plugin-terser": "^7.0.0",
+    "@rollup/plugin-terser": "^0.4.4",
     "tslib": "^2.6.2",
     "typescript": "^4.8.2"
   },
@@ -45,6 +46,9 @@
     "@types/react": "17.0.0",
     "@types/react-dom": "17.0.0",
     "readable-stream": "^3.5.0",
-    "ecashaddrjs": "^2.0.0"
+    "ecashaddrjs": "^2.0.0",
+    "webpack": "^5.0.0",
+    "@babel/plugin-syntax-flow": "^7.14.5",
+    "@babel/plugin-transform-react-jsx": "^7.14.9"
   }
 }

paybutton/rollup.config.js

@@ -9,6 +9,11 @@ import typescript from '@rollup/plugin-typescript';
 import json from "@rollup/plugin-json";
 import dotenv from "rollup-plugin-dotenv";
 import progress from "rollup-plugin-progress";
+import { fileURLToPath } from 'url';
+import { dirname, resolve as pathResolve } from 'path';
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = dirname(__filename);
 
 export default ( env ) => ({
   input: 'src/index.tsx',
@@ -23,8 +28,9 @@ export default ( env ) => ({
     }),
     alias({
       entries: [
-        { find: 'react', replacement: require.resolve( 'preact/compat' ) },
-        { find: 'react-dom', replacement: require.resolve( 'preact/compat' ) },
+        { find: 'react', replacement: pathResolve(__dirname, 'node_modules/preact/compat/dist/compat.js') },
+        { find: 'react-dom', replacement: pathResolve(__dirname, 'node_modules/preact/compat/dist/compat.js') },
+        { find: '@paybutton/react', replacement: pathResolve(__dirname, '../react/dist/index.js') },
       ]
     }),
     replace({
@@ -36,16 +42,17 @@ export default ( env ) => ({
     resolve({ 
       browser: true, 
       extensions: [ '.js', '.jsx', '.ts', '.tsx', '.svg' ],
-      preferBuiltins: false 
+      preferBuiltins: false,
+      mainFields: ['module', 'main']
     }),
-    commonJS( { extensions: [ '.js', '.jsx', '.ts', '.tsx', '.svg' ], transformMixedEsModules: true } ),
+    typescript({ compilerOptions: {lib: ["es5", "es6", "dom"], target: "es5"}}),
+    commonJS( { extensions: [ '.js', '.jsx' ], transformMixedEsModules: true } ),
     image(),
     nodePolyfills(),
     json(),
     dotenv({
       cwd: "../react"
     }),
-    typescript({ compilerOptions: {lib: ["es5", "es6", "dom"], target: "es5"}}),
     ],
     external: ['@types/currency-formatter', 'currency-formatter'],
   });

paybutton/rollup.dev.js

@@ -5,9 +5,10 @@ import common from './rollup.config.js';
 
 const config = common( 'development' );
 
-module.exports = config;
 config.output.file = 'dev/demo/paybutton.js'
 config.plugins.push(
     serve( 'dev/demo' ),
     livereload( ),
-);
+);
+
+export default config;

paybutton/rollup.prod.js

@@ -1,13 +1,13 @@
 import common from './rollup.config.js';
 
-import { terser } from 'rollup-plugin-terser';
+import terser from '@rollup/plugin-terser';
 
 const config = common( 'production' );
 
-module.exports = config;
-
 config.plugins.push(
   terser( {
     mangle: true,
   } ),
 );
+
+export default config;