feat(app-vite/app-webpack): drop support for legacy "electron-package…

…r" (only support the newer @electron/packager)
quasarframework · Aug 5, 2024 · bb844ac · bb844ac
1 parent 6d056c5
commit bb844ac
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 28 deletions.
diff --git a/app-vite/lib/cache/module.electron.js b/app-vite/lib/cache/module.electron.js
@@ -41,9 +41,8 @@ export async function createInstance ({
   const nodePackager = await cacheProxy.getModule('nodePackager')
 
   function bundlerIsInstalled (bundlerName) {
-    return bundlerName === 'packager'
-      ? (hasPackage('@electron/packager', appPkg) || hasPackage('electron-packager', appPkg))
-      : hasPackage('electron-builder', appPkg)
+    const bundler = bundlerMap[ bundlerName ]
+    return hasPackage(bundler.pkg, appPkg)
   }
 
   function ensureInstall (bundlerName) {
@@ -70,12 +69,8 @@ export async function createInstance ({
 
   // May return "{ default }" (@electron/packager) or directly the package (electron-builder);
   async function getBundler (bundlerName) {
-    if (bundlerName === 'packager') {
-      const newPkg = await getPackage('@electron/packager', appPaths.appDir)
-      return newPkg || getPackage('electron-packager', appPaths.appDir)
-    }
-
-    return getPackage('electron-builder', appPaths.appDir)
+    const bundler = bundlerMap[ bundlerName ]
+    return getPackage(bundler.pkg, appPaths.appDir)
   }
 
   return {

diff --git a/app-vite/lib/cmd/info.js b/app-vite/lib/cmd/info.js
@@ -93,7 +93,6 @@ print({ key: 'Important local packages', section: true })
   'workbox-build',
   'register-service-worker',
   'electron',
-  'electron-packager',
   '@electron/packager',
   'electron-builder'
 ].forEach(pkg => print(safePkgInfo(pkg, appPaths.appDir)))

diff --git a/app-vite/package.json b/app-vite/package.json
@@ -100,7 +100,6 @@
   "peerDependencies": {
     "@electron/packager": ">= 18",
     "electron-builder": ">= 22",
-    "electron-packager": ">= 15",
     "pinia": "^2.0.0",
     "quasar": "^2.16.0",
     "vue": "^3.2.29",
@@ -112,9 +111,6 @@
     "electron-builder": {
       "optional": true
     },
-    "electron-packager": {
-      "optional": true
-    },
     "@electron/packager": {
       "optional": true
     },

diff --git a/app-webpack/lib/cache/module.electron.js b/app-webpack/lib/cache/module.electron.js
@@ -41,9 +41,8 @@ module.exports.createInstance = function createInstance ({
   const nodePackager = cacheProxy.getModule('nodePackager')
 
   function bundlerIsInstalled (bundlerName) {
-    return bundlerName === 'packager'
-      ? (hasPackage('@electron/packager', appPkg) || hasPackage('electron-packager', appPkg))
-      : hasPackage('electron-builder', appPkg)
+    const bundler = bundlerMap[ bundlerName ]
+    return hasPackage(bundler.pkg, appPkg)
   }
 
   function ensureInstall (bundlerName) {
@@ -70,13 +69,9 @@ module.exports.createInstance = function createInstance ({
 
   function getBundler (bundlerName) {
     const { appDir } = appPaths
+    const bundler = bundlerMap[ bundlerName ]
 
-    return bundlerName === 'packager'
-      ? (
-          getPackage('@electron/packager', appDir)
-          || getPackage('electron-packager', appDir)
-        )
-      : getPackage('electron-builder', appDir)
+    return getPackage(bundler.pkg, appDir)
   }
 
   return {

diff --git a/app-webpack/lib/cmd/info.js b/app-webpack/lib/cmd/info.js
@@ -94,7 +94,6 @@ print({ key: 'Important local packages', section: true })
   'workbox-webpack-plugin',
   'register-service-worker',
   'electron',
-  'electron-packager',
   '@electron/packager',
   'electron-builder'
 ].forEach(pkg => print(safePkgInfo(pkg, appPaths.appDir)))

diff --git a/app-webpack/package.json b/app-webpack/package.json
@@ -130,7 +130,6 @@
   "peerDependencies": {
     "@electron/packager": ">= 18",
     "electron-builder": ">= 22",
-    "electron-packager": ">= 15",
     "eslint": "^8.57.0",
     "pinia": "^2.0.0",
     "quasar": "^2.16.0",
@@ -143,9 +142,6 @@
     "electron-builder": {
       "optional": true
     },
-    "electron-packager": {
-      "optional": true
-    },
     "@electron/packager": {
       "optional": true
     },