fix(template-base): install correct version of plugin-fuses (#3823)

* fix(template-base): install correct version of plugin-fuses * fix(template-base): install correct version of plugin-fuses * more fixes * oops!
electron · Jan 29, 2025 · 062ec75 · 062ec75
1 parent 33401e7
commit 062ec75
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 11 deletions.
diff --git a/packages/api/core/spec/fixture/custom_init/index.js b/packages/api/core/spec/fixture/custom_init/index.js
@@ -5,8 +5,8 @@ const fs = require('fs-extra');
 
 module.exports = {
   requiredForgeVersion: '>= 6.0.0-beta.1',
-  dependencies: ['debug'],
-  devDependencies: ['lodash'],
+  dependencies: [...baseTemplate.dependencies, 'debug'],
+  devDependencies: [...baseTemplate.devDependencies, 'lodash'],
   initializeTemplate: async (directory) => {
     const tasks = await baseTemplate.initializeTemplate(directory, {});
     return [

diff --git a/packages/template/base/src/BaseTemplate.ts b/packages/template/base/src/BaseTemplate.ts
@@ -17,6 +17,23 @@ export class BaseTemplate implements ForgeTemplate {
 
   public requiredForgeVersion = currentForgeVersion;
 
+  get dependencies(): string[] {
+    const packageJSONPath = path.join(this.templateDir, 'package.json');
+    if (fs.pathExistsSync(packageJSONPath)) {
+      const deps = fs.readJsonSync(packageJSONPath).dependencies;
+      if (deps) {
+        return Object.entries(deps).map(([packageName, version]) => {
+          if (version === 'ELECTRON_FORGE/VERSION') {
+            version = `^${currentForgeVersion}`;
+          }
+          return `${packageName}@${version}`;
+        });
+      }
+    }
+
+    return [];
+  }
+
   get devDependencies(): string[] {
     const packageJSONPath = path.join(this.templateDir, 'package.json');
     if (fs.pathExistsSync(packageJSONPath)) {

diff --git a/packages/template/base/tmpl/package.json b/packages/template/base/tmpl/package.json
@@ -10,10 +10,6 @@
     "make": "electron-forge make",
     "publish": "electron-forge publish"
   },
-  "devDependencies": {
-    "@electron/fuses": "^1.7.0",
-    "@electron-forge/plugin-fuses": "^7.2.0"
-  },
   "keywords": [],
   "author": "",
   "license": "MIT"

diff --git a/packages/template/vite-typescript/tmpl/package.json b/packages/template/vite-typescript/tmpl/package.json
@@ -1,7 +1,5 @@
 {
   "devDependencies": {
-    "@electron/fuses": "^1.7.0",
-    "@electron-forge/plugin-fuses": "ELECTRON_FORGE/VERSION",
     "@electron-forge/plugin-vite": "ELECTRON_FORGE/VERSION",
     "@typescript-eslint/eslint-plugin": "^5.0.0",
     "@typescript-eslint/parser": "^5.0.0",

diff --git a/packages/template/vite/tmpl/package.json b/packages/template/vite/tmpl/package.json
@@ -1,7 +1,6 @@
 {
   "devDependencies": {
     "@electron/fuses": "^1.7.0",
-    "@electron-forge/plugin-fuses": "ELECTRON_FORGE/VERSION",
     "@electron-forge/plugin-vite": "ELECTRON_FORGE/VERSION",
     "vite": "^5.0.12"
   }

diff --git a/packages/template/webpack-typescript/tmpl/package.json b/packages/template/webpack-typescript/tmpl/package.json
@@ -1,7 +1,5 @@
 {
   "devDependencies": {
-    "@electron/fuses": "^1.7.0",
-    "@electron-forge/plugin-fuses": "ELECTRON_FORGE/VERSION",
     "@electron-forge/plugin-webpack": "ELECTRON_FORGE/VERSION",
     "@typescript-eslint/eslint-plugin": "^5.0.0",
     "@typescript-eslint/parser": "^5.0.0",