feat(template)!: unify JS/TS templates

.nvmrc

@@ -1 +1 @@
-22.12
+22.13

knip.json

@@ -142,24 +142,10 @@
       "entry": ["spec/**/*.spec.ts"],
       "project": ["src/**/*.ts!", "spec/**/*.ts"]
     },
-    "packages/template/vite-typescript": {
-      "entry": ["spec/**/*.spec.ts"],
-      "project": ["src/**/*.ts!", "spec/**/*.ts"]
-    },
     "packages/template/webpack": {
       "entry": ["spec/**/*.spec.ts"],
       "project": ["src/**/*.ts!", "spec/**/*.ts"]
     },
-    "packages/template/webpack-typescript": {
-      "entry": ["spec/**/*.spec.ts"],
-      "project": ["src/**/*.ts!", "spec/**/*.ts"],
-      "ignoreDependencies": [
-        "@electron-forge/maker-.*",
-        "@electron-forge/plugin-webpack",
-        "webpack",
-        "listr2"
-      ]
-    },
     "packages/utils/core-utils": {
       "entry": ["src/remote-rebuild.ts!", "spec/**/*.spec.ts"],
       "project": ["src/**/*.ts!", "spec/**/*.ts"]

package.json

@@ -5,7 +5,7 @@
   "license": "MIT",
   "type": "module",
   "engines": {
-    "node": ">= 22.12.0"
+    "node": ">= "
   },
   "resolutions": {
     "ajv@8.17.1": "^8.18.0",

packages/api/cli/package.json

@@ -29,7 +29,7 @@
     "semver": "^7.2.1"
   },
   "engines": {
-    "node": ">= 22.12.0"
+    "node": ">= 22.13.0"
   },
   "funding": [
     {

packages/api/core/package.json

@@ -42,7 +42,7 @@
     "log-symbols": "^4.0.0"
   },
   "engines": {
-    "node": ">= 22.12.0"
+    "node": ">= 22.13.0"
   },
   "funding": [
     {

packages/external/create-electron-app/package.json

@@ -9,16 +9,14 @@
   "author": "Samuel Attard",
   "license": "MIT",
   "engines": {
-    "node": ">= 22.12.0"
+    "node": ">= 22.13.0"
   },
   "dependencies": {
     "@electron-forge/core-utils": "workspace:*",
     "@electron-forge/shared-types": "workspace:*",
     "@electron-forge/template-base": "workspace:*",
     "@electron-forge/template-vite": "workspace:*",
-    "@electron-forge/template-vite-typescript": "workspace:*",
     "@electron-forge/template-webpack": "workspace:*",
-    "@electron-forge/template-webpack-typescript": "workspace:*",
     "@inquirer/prompts": "^6.0.1",
     "@listr2/prompt-adapter-inquirer": "^2.0.22",
     "@malept/cross-spawn-promise": "^2.0.0",

packages/external/create-electron-app/spec/fast/init-scripts/find-template.spec.ts

@@ -48,4 +48,18 @@ describe('findTemplate', () => {
       'Failed to locate custom template: "non-existent-template".',
     );
   });
+
+  describe('deprecated -typescript templates', () => {
+    it('should provide a helpful error for vite-typescript', async () => {
+      await expect(findTemplate('vite-typescript')).rejects.toThrowError(
+        /no longer exists.*--template vite/,
+      );
+    });
+
+    it('should provide a helpful error for webpack-typescript', async () => {
+      await expect(findTemplate('webpack-typescript')).rejects.toThrowError(
+        /no longer exists.*--template webpack/,
+      );
+    });
+  });
 });

packages/external/create-electron-app/src/create-electron-app.ts

@@ -41,6 +41,7 @@ const initCommand = program
     '--package-manager [name]',
     'Set a specific package manager to use for your Forge project. Supported package managers are `npm`, `pnpm`, and `yarn`. You can also specify an exact version to use (e.g. `yarn@1.22.22`).',
   )
+  .option('--typescript', 'Use TypeScript in the template.')
   .action(async (dir) => {
     const options = initCommand.opts();
     const tasks = new Listr<InitOptions>(
@@ -52,6 +53,7 @@ const initCommand = program
             initOpts.copyCIFiles = Boolean(options.copyCiFiles);
             initOpts.force = Boolean(options.force);
             initOpts.skipGit = Boolean(options.skipGit);
+            initOpts.typescript = Boolean(options.typescript);
             initOpts.dir = resolveWorkingDir(dir, false);
             initOpts.electronVersion = options.electronVersion ?? 'latest';
             initOpts.packageManager = options.packageManager ?? 'npm@latest';
@@ -120,29 +122,27 @@ const initCommand = program
               },
             );
 
-            let language: string | undefined;
-
             if (bundler !== 'base') {
-              language = await prompt.run<Prompt<string | undefined, any>>(
+              initOpts.typescript = await prompt.run<Prompt<boolean, any>>(
                 select,
                 {
                   message: 'Select a programming language',
                   choices: [
                     {
                       name: 'JavaScript',
-                      value: undefined,
+                      value: false,
                     },
                     {
                       name: 'TypeScript',
-                      value: 'typescript',
+                      value: true,
                     },
                   ],
                 },
               );
             }
 
             initOpts.packageManager = packageManager;
-            initOpts.template = `${bundler}${language ? `-${language}` : ''}`;
+            initOpts.template = bundler;
 
             // TODO: add prompt for passing in an exact version as well
             initOpts.electronVersion = await prompt.run<Prompt<string, any>>(

packages/external/create-electron-app/src/init-scripts/find-template.ts

@@ -44,6 +44,12 @@ export const findTemplate = async (
     }
   }
   if (!foundTemplate) {
+    const tsMatch = template.match(/^(.+)-typescript$/);
+    if (tsMatch) {
+      throw new Error(
+        `The "${template}" template no longer exists. Use "--template ${tsMatch[1]}" instead and select TypeScript when prompted.`,
+      );
+    }
     throw new Error(`Failed to locate custom template: "${template}".`);
   } else {
     d(`found template module at: ${foundTemplate.path}`);

packages/external/create-electron-app/src/init.ts

@@ -59,6 +59,10 @@ export interface InitOptions {
    * Force a package manager to use (npm|yarn|pnpm).
    */
   packageManager?: string;
+  /**
+   * Whether to use TypeScript in the template.
+   */
+  typescript?: boolean;
 }
 
 async function validateTemplate(
@@ -95,9 +99,16 @@ export async function init({
   skipGit = false,
   electronVersion = 'latest',
   packageManager,
+  typescript = false,
 }: InitOptions): Promise<void> {
   d(`Initializing in: ${dir}`);
 
+  if (typescript && template === 'base') {
+    throw new Error(
+      'The "base" template does not support TypeScript. Use "--template vite" or "--template webpack" with "--typescript".',
+    );
+  }
+
   const runner = new Listr<{
     templateModule: ForgeTemplate;
     pm: PMDetails;
@@ -173,6 +184,7 @@ export async function init({
             const tasks = await templateModule.initializeTemplate(dir, {
               copyCIFiles,
               force,
+              typescript,
             });
             if (tasks) {
               return task.newListr(tasks, { concurrent: false });

packages/maker/appx/package.json

@@ -12,7 +12,7 @@
     "vitest": "catalog:"
   },
   "engines": {
-    "node": ">= 22.12.0"
+    "node": ">= 22.13.0"
   },
   "dependencies": {
     "@electron-forge/core-utils": "workspace:*",

packages/maker/base/package.json

@@ -12,7 +12,7 @@
     "vitest": "catalog:"
   },
   "engines": {
-    "node": ">= 22.12.0"
+    "node": ">= 22.13.0"
   },
   "dependencies": {
     "@electron-forge/shared-types": "workspace:*",

packages/maker/deb/package.json

@@ -12,7 +12,7 @@
     "vitest": "catalog:"
   },
   "engines": {
-    "node": ">= 22.12.0"
+    "node": ">= 22.13.0"
   },
   "dependencies": {
     "@electron-forge/maker-base": "workspace:*",

packages/maker/dmg/package.json

@@ -12,7 +12,7 @@
     "vitest": "catalog:"
   },
   "engines": {
-    "node": ">= 22.12.0"
+    "node": ">= 22.13.0"
   },
   "dependencies": {
     "@electron-forge/maker-base": "workspace:*",

packages/maker/flatpak/package.json

@@ -12,7 +12,7 @@
     "vitest": "catalog:"
   },
   "engines": {
-    "node": ">= 22.12.0"
+    "node": ">= 22.13.0"
   },
   "dependencies": {
     "@electron-forge/maker-base": "workspace:*",

packages/maker/msix/package.json

@@ -12,7 +12,7 @@
     "vitest": "catalog:"
   },
   "engines": {
-    "node": ">= 22.12.0"
+    "node": ">= 22.13.0"
   },
   "dependencies": {
     "@electron-forge/core-utils": "workspace:*",

packages/maker/pkg/package.json

@@ -11,7 +11,7 @@
     "vitest": "catalog:"
   },
   "engines": {
-    "node": ">= 22.12.0"
+    "node": ">= 22.13.0"
   },
   "dependencies": {
     "@electron-forge/maker-base": "workspace:*",

packages/maker/rpm/package.json

@@ -12,7 +12,7 @@
     "vitest": "catalog:"
   },
   "engines": {
-    "node": ">= 22.12.0"
+    "node": ">= 22.13.0"
   },
   "dependencies": {
     "@electron-forge/maker-base": "workspace:*",

packages/maker/snap/package.json

@@ -11,7 +11,7 @@
     "vitest": "catalog:"
   },
   "engines": {
-    "node": ">= 22.12.0"
+    "node": ">= 22.13.0"
   },
   "dependencies": {
     "@electron-forge/maker-base": "workspace:*",

packages/maker/squirrel/package.json

@@ -9,7 +9,7 @@
   "exports": "./dist/MakerSquirrel.js",
   "typings": "dist/MakerSquirrel.d.ts",
   "engines": {
-    "node": ">= 22.12.0"
+    "node": ">= 22.13.0"
   },
   "dependencies": {
     "@electron-forge/maker-base": "workspace:*",

packages/maker/wix/package.json

@@ -9,7 +9,7 @@
   "exports": "./dist/MakerWix.js",
   "typings": "dist/MakerWix.d.ts",
   "engines": {
-    "node": ">= 22.12.0"
+    "node": ">= 22.13.0"
   },
   "dependencies": {
     "@electron-forge/core-utils": "workspace:*",

packages/maker/zip/package.json

@@ -12,7 +12,7 @@
     "vitest": "catalog:"
   },
   "engines": {
-    "node": ">= 22.12.0"
+    "node": ">= 22.13.0"
   },
   "dependencies": {
     "@electron-forge/maker-base": "workspace:*",

packages/plugin/auto-unpack-natives/package.json

@@ -9,7 +9,7 @@
   "exports": "./dist/AutoUnpackNativesPlugin.js",
   "typings": "dist/AutoUnpackNativesPlugin.d.ts",
   "engines": {
-    "node": ">= 22.12.0"
+    "node": ">= 22.13.0"
   },
   "dependencies": {
     "@electron-forge/plugin-base": "workspace:*",

packages/plugin/base/package.json

@@ -9,7 +9,7 @@
   "exports": "./dist/Plugin.js",
   "typings": "dist/Plugin.d.ts",
   "engines": {
-    "node": ">= 22.12.0"
+    "node": ">= 22.13.0"
   },
   "dependencies": {
     "@electron-forge/shared-types": "workspace:*"

packages/plugin/fuses/package.json

@@ -23,7 +23,7 @@
     "@electron/fuses": "^2.0.0"
   },
   "engines": {
-    "node": ">= 22.12.0"
+    "node": ">= 22.13.0"
   },
   "dependencies": {
     "@electron-forge/plugin-base": "workspace:*",

packages/plugin/local-electron/package.json

@@ -9,7 +9,7 @@
   "exports": "./dist/LocalElectronPlugin.js",
   "typings": "dist/LocalElectronPlugin.d.ts",
   "engines": {
-    "node": ">= 22.12.0"
+    "node": ">= 22.13.0"
   },
   "dependencies": {
     "@electron-forge/plugin-base": "workspace:*",

packages/plugin/vite/package.json

@@ -33,7 +33,7 @@
     "xvfb-maybe": "^0.2.1"
   },
   "engines": {
-    "node": ">= 22.12.0"
+    "node": ">= 22.13.0"
   },
   "publishConfig": {
     "access": "public"

packages/plugin/webpack/package.json

@@ -17,7 +17,7 @@
     "xvfb-maybe": "^0.2.1"
   },
   "engines": {
-    "node": ">= 22.12.0"
+    "node": ">= 22.13.0"
   },
   "dependencies": {
     "@electron-forge/core-utils": "workspace:*",

packages/publisher/base-static/package.json

@@ -16,7 +16,7 @@
     "vitest": "catalog:"
   },
   "engines": {
-    "node": ">= 22.12.0"
+    "node": ">= 22.13.0"
   },
   "publishConfig": {
     "access": "public"

packages/publisher/base/package.json

@@ -15,7 +15,7 @@
     "vitest": "catalog:"
   },
   "engines": {
-    "node": ">= 22.12.0"
+    "node": ">= 22.13.0"
   },
   "publishConfig": {
     "access": "public"

packages/publisher/bitbucket/package.json

@@ -9,7 +9,7 @@
   "exports": "./dist/PublisherBitbucket.js",
   "typings": "dist/PublisherBitbucket.d.ts",
   "engines": {
-    "node": ">= 22.12.0"
+    "node": ">= 22.13.0"
   },
   "dependencies": {
     "@electron-forge/publisher-base": "workspace:*",

packages/publisher/electron-release-server/package.json

@@ -13,7 +13,7 @@
     "vitest": "catalog:"
   },
   "engines": {
-    "node": ">= 22.12.0"
+    "node": ">= 22.13.0"
   },
   "dependencies": {
     "@electron-forge/publisher-base": "workspace:*",

packages/publisher/gcs/package.json

@@ -9,7 +9,7 @@
   "exports": "./dist/PublisherGCS.js",
   "typings": "dist/PublisherGCS.d.ts",
   "engines": {
-    "node": ">= 22.12.0"
+    "node": ">= 22.13.0"
   },
   "dependencies": {
     "@electron-forge/publisher-static": "workspace:*",