refactor: simplify rollup config and match @tauri-apps/api output s…

…tyle
tauri-apps · Nov 13, 2023 · 7d6e721 · 7d6e721
1 parent d4d1633
commit 7d6e721
Show file tree

Hide file tree

Showing 102 changed files with 363 additions and 871 deletions.
diff --git a/package.json b/package.json
@@ -24,7 +24,7 @@
     "eslint-plugin-promise": "6.1.1",
     "eslint-plugin-security": "1.7.1",
     "prettier": "3.0.3",
-    "rollup": "4.1.4",
+    "rollup": "4.2.0",
     "typescript": "5.2.2"
   },
   "resolutions": {

diff --git a/plugins/authenticator/package.json b/plugins/authenticator/package.json
@@ -7,26 +7,19 @@
     "Tauri Programme within The Commons Conservancy"
   ],
   "type": "module",
-  "browser": "dist-js/index.min.js",
-  "module": "dist-js/index.mjs",
-  "types": "dist-js/index.d.ts",
   "exports": {
-    "import": "./dist-js/index.mjs",
     "types": "./dist-js/index.d.ts",
-    "browser": "./dist-js/index.min.js"
+    "import": "./dist-js/index.js",
+    "require": "./dist-js/index.cjs"
   },
   "scripts": {
     "build": "rollup -c"
   },
   "files": [
     "dist-js",
-    "!dist-js/**/*.map",
     "README.md",
     "LICENSE"
   ],
-  "devDependencies": {
-    "tslib": "2.6.0"
-  },
   "dependencies": {
     "@tauri-apps/api": "2.0.0-alpha.11"
   }

diff --git a/plugins/authenticator/rollup.config.js b/plugins/authenticator/rollup.config.js
@@ -0,0 +1,3 @@
+import { createConfig } from "../../shared/rollup.config.js";
+
+export default createConfig();
diff --git a/plugins/authenticator/rollup.config.mjs b/plugins/authenticator/rollup.config.mjs
diff --git a/plugins/authenticator/src/api-iife.js b/plugins/authenticator/src/api-iife.js
diff --git a/plugins/autostart/package.json b/plugins/autostart/package.json
@@ -6,26 +6,19 @@
     "Tauri Programme within The Commons Conservancy"
   ],
   "type": "module",
-  "browser": "dist-js/index.min.js",
-  "module": "dist-js/index.mjs",
-  "types": "dist-js/index.d.ts",
   "exports": {
-    "import": "./dist-js/index.mjs",
     "types": "./dist-js/index.d.ts",
-    "browser": "./dist-js/index.min.js"
+    "import": "./dist-js/index.js",
+    "require": "./dist-js/index.cjs"
   },
   "scripts": {
     "build": "rollup -c"
   },
   "files": [
     "dist-js",
-    "!dist-js/**/*.map",
     "README.md",
     "LICENSE"
   ],
-  "devDependencies": {
-    "tslib": "2.6.0"
-  },
   "dependencies": {
     "@tauri-apps/api": "2.0.0-alpha.11"
   }

diff --git a/plugins/autostart/rollup.config.js b/plugins/autostart/rollup.config.js
@@ -0,0 +1,3 @@
+import { createConfig } from "../../shared/rollup.config.js";
+
+export default createConfig();
diff --git a/plugins/autostart/rollup.config.mjs b/plugins/autostart/rollup.config.mjs
diff --git a/plugins/autostart/src/api-iife.js b/plugins/autostart/src/api-iife.js
diff --git a/plugins/barcode-scanner/package.json b/plugins/barcode-scanner/package.json
@@ -7,26 +7,19 @@
     "Tauri Programme within The Commons Conservancy"
   ],
   "type": "module",
-  "browser": "dist-js/index.min.js",
-  "module": "dist-js/index.mjs",
-  "types": "dist-js/index.d.ts",
   "exports": {
-    "import": "./dist-js/index.mjs",
     "types": "./dist-js/index.d.ts",
-    "browser": "./dist-js/index.min.js"
+    "import": "./dist-js/index.js",
+    "require": "./dist-js/index.cjs"
   },
   "scripts": {
     "build": "rollup -c"
   },
   "files": [
     "dist-js",
-    "!dist-js/**/*.map",
     "README.md",
     "LICENSE"
   ],
-  "devDependencies": {
-    "tslib": "^2.5.0"
-  },
   "dependencies": {
     "@tauri-apps/api": "2.0.0-alpha.11"
   }

diff --git a/plugins/barcode-scanner/rollup.config.js b/plugins/barcode-scanner/rollup.config.js
@@ -0,0 +1,3 @@
+import { createConfig } from "../../shared/rollup.config.js";
+
+export default createConfig();
diff --git a/plugins/barcode-scanner/rollup.config.mjs b/plugins/barcode-scanner/rollup.config.mjs
diff --git a/plugins/barcode-scanner/src/api-iife.js b/plugins/barcode-scanner/src/api-iife.js
diff --git a/plugins/cli/package.json b/plugins/cli/package.json
@@ -6,26 +6,19 @@
     "Tauri Programme within The Commons Conservancy"
   ],
   "type": "module",
-  "browser": "dist-js/index.min.js",
-  "module": "dist-js/index.mjs",
-  "types": "dist-js/index.d.ts",
   "exports": {
-    "import": "./dist-js/index.mjs",
     "types": "./dist-js/index.d.ts",
-    "browser": "./dist-js/index.min.js"
+    "import": "./dist-js/index.js",
+    "require": "./dist-js/index.cjs"
   },
   "scripts": {
     "build": "rollup -c"
   },
   "files": [
     "dist-js",
-    "!dist-js/**/*.map",
     "README.md",
     "LICENSE"
   ],
-  "devDependencies": {
-    "tslib": "^2.4.1"
-  },
   "dependencies": {
     "@tauri-apps/api": "2.0.0-alpha.11"
   }

diff --git a/plugins/cli/rollup.config.js b/plugins/cli/rollup.config.js
@@ -0,0 +1,3 @@
+import { createConfig } from "../../shared/rollup.config.js";
+
+export default createConfig();
diff --git a/plugins/cli/rollup.config.mjs b/plugins/cli/rollup.config.mjs
diff --git a/plugins/cli/src/api-iife.js b/plugins/cli/src/api-iife.js
diff --git a/plugins/clipboard-manager/package.json b/plugins/clipboard-manager/package.json
@@ -6,26 +6,19 @@
     "Tauri Programme within The Commons Conservancy"
   ],
   "type": "module",
-  "browser": "dist-js/index.min.js",
-  "module": "dist-js/index.mjs",
-  "types": "dist-js/index.d.ts",
   "exports": {
-    "import": "./dist-js/index.mjs",
     "types": "./dist-js/index.d.ts",
-    "browser": "./dist-js/index.min.js"
+    "import": "./dist-js/index.js",
+    "require": "./dist-js/index.cjs"
   },
   "scripts": {
     "build": "rollup -c"
   },
   "files": [
     "dist-js",
-    "!dist-js/**/*.map",
     "README.md",
     "LICENSE"
   ],
-  "devDependencies": {
-    "tslib": "^2.4.1"
-  },
   "dependencies": {
     "@tauri-apps/api": "2.0.0-alpha.11"
   }

diff --git a/plugins/clipboard-manager/rollup.config.js b/plugins/clipboard-manager/rollup.config.js
@@ -0,0 +1,3 @@
+import { createConfig } from "../../shared/rollup.config.js";
+
+export default createConfig();
diff --git a/plugins/clipboard-manager/rollup.config.mjs b/plugins/clipboard-manager/rollup.config.mjs
diff --git a/plugins/clipboard-manager/src/api-iife.js b/plugins/clipboard-manager/src/api-iife.js
diff --git a/plugins/deep-link/package.json b/plugins/deep-link/package.json
@@ -7,26 +7,19 @@
     "Tauri Programme within The Commons Conservancy"
   ],
   "type": "module",
-  "browser": "dist-js/index.min.js",
-  "module": "dist-js/index.mjs",
-  "types": "dist-js/index.d.ts",
   "exports": {
-    "import": "./dist-js/index.mjs",
     "types": "./dist-js/index.d.ts",
-    "browser": "./dist-js/index.min.js"
+    "import": "./dist-js/index.js",
+    "require": "./dist-js/index.cjs"
   },
   "scripts": {
     "build": "rollup -c"
   },
   "files": [
     "dist-js",
-    "!dist-js/**/*.map",
     "README.md",
     "LICENSE"
   ],
-  "devDependencies": {
-    "tslib": "^2.5.0"
-  },
   "dependencies": {
     "@tauri-apps/api": "2.0.0-alpha.11"
   }

diff --git a/plugins/deep-link/rollup.config.js b/plugins/deep-link/rollup.config.js
@@ -0,0 +1,3 @@
+import { createConfig } from "../../shared/rollup.config.js";
+
+export default createConfig();
diff --git a/plugins/deep-link/rollup.config.mjs b/plugins/deep-link/rollup.config.mjs
diff --git a/plugins/deep-link/src/api-iife.js b/plugins/deep-link/src/api-iife.js
diff --git a/plugins/dialog/package.json b/plugins/dialog/package.json
@@ -6,26 +6,19 @@
     "Tauri Programme within The Commons Conservancy"
   ],
   "type": "module",
-  "browser": "dist-js/index.min.js",
-  "module": "dist-js/index.mjs",
-  "types": "dist-js/index.d.ts",
   "exports": {
-    "import": "./dist-js/index.mjs",
     "types": "./dist-js/index.d.ts",
-    "browser": "./dist-js/index.min.js"
+    "import": "./dist-js/index.js",
+    "require": "./dist-js/index.cjs"
   },
   "scripts": {
     "build": "rollup -c"
   },
   "files": [
     "dist-js",
-    "!dist-js/**/*.map",
     "README.md",
     "LICENSE"
   ],
-  "devDependencies": {
-    "tslib": "^2.4.1"
-  },
   "dependencies": {
     "@tauri-apps/api": "2.0.0-alpha.11"
   }

diff --git a/plugins/dialog/rollup.config.js b/plugins/dialog/rollup.config.js
@@ -0,0 +1,18 @@
+import { createConfig } from "../../shared/rollup.config.js";
+import { nodeResolve } from "@rollup/plugin-node-resolve";
+import typescript from "@rollup/plugin-typescript";
+import terser from "@rollup/plugin-terser";
+
+export default createConfig({
+  additionalConfigs: {
+    input: "guest-js/init.ts",
+    output: {
+      file: "src/init-iife.js",
+      format: "iife",
+    },
+    plugins: [typescript(), terser(), nodeResolve()],
+    onwarn: (warning) => {
+      throw Object.assign(new Error(), warning);
+    },
+  },
+});
diff --git a/plugins/dialog/rollup.config.mjs b/plugins/dialog/rollup.config.mjs