fix: The suffixes of main and render of the electron template are changed to .mjs

tomgao365 · tomgao365 · commit dcda8f76dcd5 · 2023-11-21T19:31:23.000+08:00
diff --git a/package.json b/package.json
@@ -54,7 +54,7 @@
     "@tomjs/prettier": "^1.0.5",
     "@tomjs/tsconfig": "^1.0.7",
     "@types/minimist": "^1.2.5",
-    "@types/node": "^18.18.10",
+    "@types/node": "^18.18.11",
     "@types/prompts": "^2.4.8",
     "eslint": "^8.53.0",
     "husky": "^8.0.3",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/template-electron-react/README.md b/template-electron-react/README.md
@@ -8,18 +8,18 @@ vite + electron + react
 
 ```
 ├── electron
-│   ├── main        > Electron-Main
-│   ├── payload     > Electron-payload
-├── src             > Electron-Renderer
+│   ├── main          > Electron-Main
+│   ├── payload       > Preload-Scripts
+├── src               > Electron-Renderer
 ```
 
 - output
 
 ```
 ├─┬ dist
-│ ├── main.js        > Electron-Main
-│ ├── preload.js     > Preload-Scripts
-│ ├─┬ render         > Electron-Renderer
+│ ├── main.mjs        > Electron-Main
+│ ├── preload.mjs     > Preload-Scripts
+│ ├─┬ render          > Electron-Renderer
 │ │ └── index.html
 ```
 
diff --git a/template-electron-react/electron/main/index.ts b/template-electron-react/electron/main/index.ts
@@ -6,9 +6,9 @@ import { app, BrowserWindow, ipcMain, shell } from 'electron';
 // The built directory structure
 //
 // ├─┬ dist
-// │ ├── main.js        > Electron-Main
-// │ ├── preload.js     > Preload-Scripts
-// │ ├─┬ render         > Electron-Renderer
+// │ ├── main.mjs        > Electron-Main
+// │ ├── preload.mjs     > Preload-Scripts
+// │ ├─┬ render          > Electron-Renderer
 // │ │ └── index.html
 //
 const __dirname = dirname(fileURLToPath(import.meta.url));
@@ -36,7 +36,7 @@ if (!app.requestSingleInstanceLock()) {
 
 let win: BrowserWindow | null = null;
 // Here, you can also use other preload
-const preload = join(__dirname, './preload.js');
+const preload = join(__dirname, './preload.mjs');
 const url = process.env.VITE_DEV_SERVER_URL as string;
 const indexHtml = join(process.env.DIST, 'index.html');
 
diff --git a/template-electron-react/package.json b/template-electron-react/package.json
@@ -11,7 +11,7 @@
       "VITE_DEV_SERVER_URL": "http://127.0.0.1:6888/"
     }
   },
-  "main": "dist/main.js",
+  "main": "dist/main.mjs",
   "scripts": {
     "dev": "vite",
     "build": "npm run clean && vite build && npm run release",
@@ -35,12 +35,12 @@
     "@tomjs/prettier": "^1.0.5",
     "@tomjs/stylelint": "^1.0.5",
     "@tomjs/tsconfig": "^1.0.7",
-    "@types/node": "^18.18.10",
+    "@types/node": "^18.18.11",
     "@types/react": "^18.2.37",
     "@types/react-dom": "^18.2.15",
     "@types/shelljs": "^0.8.15",
     "@vitejs/plugin-react-swc": "^3.5.0",
-    "electron": "^28.0.0-beta.7",
+    "electron": "^28.0.0-beta.8",
     "electron-builder": "^24.6.4",
     "eslint": "^8.53.0",
     "husky": "^8.0.3",
diff --git a/template-electron-react/scripts/builder.ts b/template-electron-react/scripts/builder.ts
@@ -11,7 +11,7 @@ export default {
     output: `build/${pkg.version}`,
     app: 'dist',
   },
-  files: ['main.js', 'preload.js', 'render'],
+  files: ['main.mjs', 'preload.mjs', 'render'],
   icon: 'public/img/icon.png',
   artifactName: '${productName}-${version}-${os}-${arch}.${ext}',
   electronLanguages: ['zh-CN', 'en-US'],
diff --git a/template-electron-react/scripts/release.ts b/template-electron-react/scripts/release.ts
@@ -14,7 +14,7 @@ function genPkgJson() {
     author: os.userInfo().username,
     description: pkg.description,
     type: 'module',
-    main: './main.js',
+    main: './main.mjs',
     dependencies: Object.entries(Object.assign({}, pkg.dependencies, pkg.devDependencies))
       .filter(([name]) => ELECTRON_DEPENDENCIES.includes(name))
       .reduce((object, entry) => ({ ...object, [entry[0]]: entry[1] }), {}),
diff --git a/template-electron-react/vite.config.ts b/template-electron-react/vite.config.ts
@@ -9,7 +9,7 @@ import pkg from './package.json';
 
 // https://vitejs.dev/config/
 export default defineConfig(({ command }) => {
-  ['main.js', 'main.js.map', 'preload.js'].forEach(s => {
+  ['main.mjs', 'main.mjs.map', 'preload.mjs'].forEach(s => {
     rmSync(`dist/${s}`, { recursive: true, force: true });
   });
 
@@ -52,7 +52,7 @@ export default defineConfig(({ command }) => {
               lib: {
                 entry: 'electron/main/index.ts',
                 formats: ['es'],
-                fileName: () => 'main.js',
+                fileName: () => 'main.mjs',
               },
               rollupOptions: {
                 // Some third-party Node.js libraries may not be built correctly by Vite, especially `C/C++` addons,
@@ -84,7 +84,7 @@ export default defineConfig(({ command }) => {
               lib: {
                 entry: 'electron/preload/index.ts',
                 formats: ['es'],
-                fileName: () => 'preload.js',
+                fileName: () => 'preload.mjs',
               },
               rollupOptions: {
                 external: Object.keys('dependencies' in pkg ? pkg.dependencies : {}),
diff --git a/template-electron-vue/README.md b/template-electron-vue/README.md
@@ -8,18 +8,18 @@ vite + electron + vue
 
 ```
 ├── electron
-│   ├── main        > Electron-Main
-│   ├── payload     > Electron-payload
-├── src             > Electron-Renderer
+│   ├── main          > Electron-Main
+│   ├── payload       > Preload-Scripts
+├── src               > Electron-Renderer
 ```
 
 - output
 
 ```
 ├─┬ dist
-│ ├── main.js        > Electron-Main
-│ ├── preload.js     > Preload-Scripts
-│ ├─┬ render         > Electron-Renderer
+│ ├── main.mjs        > Electron-Main
+│ ├── preload.mjs     > Preload-Scripts
+│ ├─┬ render          > Electron-Renderer
 │ │ └── index.html
 ```
 
diff --git a/template-electron-vue/electron/main/index.ts b/template-electron-vue/electron/main/index.ts
@@ -6,9 +6,9 @@ import { app, BrowserWindow, ipcMain, shell } from 'electron';
 // The built directory structure
 //
 // ├─┬ dist
-// │ ├── main.js        > Electron-Main
-// │ ├── preload.js     > Preload-Scripts
-// │ ├─┬ render         > Electron-Renderer
+// │ ├── main.mjs        > Electron-Main
+// │ ├── preload.mjs     > Preload-Scripts
+// │ ├─┬ render          > Electron-Renderer
 // │ │ └── index.html
 //
 const __dirname = dirname(fileURLToPath(import.meta.url));
@@ -36,7 +36,7 @@ if (!app.requestSingleInstanceLock()) {
 
 let win: BrowserWindow | null = null;
 // Here, you can also use other preload
-const preload = join(__dirname, './preload.js');
+const preload = join(__dirname, './preload.mjs');
 const url = process.env.VITE_DEV_SERVER_URL as string;
 const indexHtml = join(process.env.DIST, 'index.html');
 
diff --git a/template-electron-vue/package.json b/template-electron-vue/package.json
@@ -11,17 +11,13 @@
       "VITE_DEV_SERVER_URL": "http://127.0.0.1:6888/"
     }
   },
-  "main": "dist/main.js",
+  "main": "dist/main.mjs",
   "scripts": {
-    "dev": "vite",
-    "build": "npm run clean && vue-tsc --noEmit && vite build && npm run release",
-    "release": "tsx ./scripts/release.ts",
-    "clean": "rimraf ./dist",
-    "preview": "vite preview",
-    "lint": "run-s lint:eslint lint:stylelint lint:prettier",
-    "lint:eslint": "eslint \"src/**/*.{ts,tsx,vue}\" *.{js,cjs,ts} --fix --cache",
-    "lint:stylelint": "stylelint \"src/**/*.{css,scss,less,vue,html}\" --fix --cache",
-    "lint:prettier": "prettier --write .",
+    "dev": "tsup --watch",
+    "build": "tsup --minify",
+    "lint": "run-s lint:eslint lint:prettier",
+    "lint:eslint": "eslint \"src/**/*.{js,cjs,ts}\" *.{js,cjs,ts} --fix --cache",
+    "lint:prettier": "prettier --write \"src/**/*.{js,cjs,ts,json,md}\" *.{js,cjs,ts,json,md}",
     "prepare": "husky install"
   },
   "dependencies": {
@@ -34,10 +30,10 @@
     "@tomjs/prettier": "^1.0.5",
     "@tomjs/stylelint": "^1.0.5",
     "@tomjs/tsconfig": "^1.0.7",
-    "@types/node": "^18.18.10",
+    "@types/node": "^18.18.11",
     "@types/shelljs": "^0.8.15",
     "@vitejs/plugin-vue": "^4.5.0",
-    "electron": "^28.0.0-beta.7",
+    "electron": "^28.0.0-beta.8",
     "electron-builder": "^24.6.4",
     "eslint": "^8.53.0",
     "husky": "^8.0.3",
diff --git a/template-electron-vue/scripts/builder.ts b/template-electron-vue/scripts/builder.ts
@@ -11,7 +11,7 @@ export default {
     output: `build/${pkg.version}`,
     app: 'dist',
   },
-  files: ['main.js', 'preload.js', 'render'],
+  files: ['main.mjs', 'preload.mjs', 'render'],
   icon: 'public/img/icon.png',
   artifactName: '${productName}-${version}-${os}-${arch}.${ext}',
   electronLanguages: ['zh-CN', 'en-US'],
diff --git a/template-electron-vue/scripts/release.ts b/template-electron-vue/scripts/release.ts
@@ -13,7 +13,7 @@ function genPkgJson() {
     version: pkg.version,
     author: os.userInfo().username,
     description: pkg.description,
-    main: './main.js',
+    main: './main.mjs',
     type: 'module',
     dependencies: Object.entries(Object.assign({}, pkg.dependencies, pkg.devDependencies))
       .filter(([name]) => ELECTRON_DEPENDENCIES.includes(name))
diff --git a/template-electron-vue/vite.config.ts b/template-electron-vue/vite.config.ts
@@ -9,7 +9,7 @@ import pkg from './package.json';
 
 // https://vitejs.dev/config/
 export default defineConfig(({ command }) => {
-  ['main.js', 'main.js.map', 'preload.js'].forEach(s => {
+  ['main.mjs', 'main.mjs.map', 'preload.mjs'].forEach(s => {
     rmSync(`dist/${s}`, { recursive: true, force: true });
   });
 
@@ -52,7 +52,7 @@ export default defineConfig(({ command }) => {
               lib: {
                 entry: 'electron/main/index.ts',
                 formats: ['es'],
-                fileName: () => 'main.js',
+                fileName: () => 'main.mjs',
               },
               rollupOptions: {
                 // Some third-party Node.js libraries may not be built correctly by Vite, especially `C/C++` addons,
@@ -84,7 +84,7 @@ export default defineConfig(({ command }) => {
               lib: {
                 entry: 'electron/preload/index.ts',
                 formats: ['es'],
-                fileName: () => 'preload.js',
+                fileName: () => 'preload.mjs',
               },
               rollupOptions: {
                 external: Object.keys('dependencies' in pkg ? pkg.dependencies : {}),
diff --git a/template-react/package.json b/template-react/package.json
@@ -27,6 +27,7 @@
     "@tomjs/prettier": "^1.0.5",
     "@tomjs/stylelint": "^1.0.5",
     "@tomjs/tsconfig": "^1.0.7",
+    "@types/node": "^18.18.11",
     "@types/react": "^18.2.37",
     "@types/react-dom": "^18.2.15",
     "@vitejs/plugin-react-swc": "^3.5.0",
diff --git a/template-vue/package.json b/template-vue/package.json
@@ -26,6 +26,7 @@
     "@tomjs/prettier": "^1.0.5",
     "@tomjs/stylelint": "^1.0.5",
     "@tomjs/tsconfig": "^1.0.7",
+    "@types/node": "^18.18.11",
     "@vitejs/plugin-vue": "^4.5.0",
     "eslint": "^8.53.0",
     "husky": "^8.0.3",
