pack: revert to js, fix test

jooy2 · Oct 17, 2023 · 12d4db3 · 12d4db3
1 parent 614380a
commit 12d4db3
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 25 deletions.
diff --git a/buildAssets/builder/config.mjs → buildAssets/builder/config.js b/buildAssets/builder/config.mjs → buildAssets/builder/config.js
@@ -1,5 +1,5 @@
 /* eslint-disable no-template-curly-in-string */
-import dotenv from 'dotenv'
+const dotenv = require('dotenv')
 
 const baseConfig = {
   productName: 'Vutron',
@@ -111,6 +111,6 @@ baseConfig.mac.identity = null
   baseConfig.mac.identity = null
 } */
 
-export default {
+module.exports = {
   ...baseConfig
 }
diff --git a/docs/src/Installation and Build/npm-scripts.md b/docs/src/Installation and Build/npm-scripts.md
@@ -9,23 +9,23 @@ order: 3
 
 ## General
 
-| Script Name       | Description                                                                                             |
-|-------------------|---------------------------------------------------------------------------------------------------------|
-| `dev`             | Start Electron as a development environment                                                             |
-| `dev:debug`       | Start Electron as a development environment (with vite debug)                                           |
-| `dev:debug:force` | Start Electron as a development environment (with vite debug + clean vite cache)                        |
-| `build:pre`       | Commands commonly run at build time. This script does not need to be run separately.                    |
-| `build`           | Build the package for the current operating system.                                                                                 |
-| `build:all`       | Build a specified package for the entire operating system (Requires cross-platform build configuration) |
-| `build:dir`       | `electron-builder` directory build                                                                      |
-| `build:mac`       | Build preconfigured packages for macOS                                                                  |
-| `build:linux`     | Build preconfigured packages for Linux                                                                  |
-| `build:win`       | Build preconfigured packages for Windows                                                                |
-| `lint`            | ESLint code inspection. It does not modify the code.                                                    |
-| `lint:fix`        | ESLint code inspection. Use auto-fix to fix your code.                                                  |
-| `format`          | Prettier code inspection. It does not modify the code.                                                  |
-| `format:fix`      | Prettier code inspection. Use auto-fix to fix your code.                                                |
-| `test`            | Build a package for testing and run tests against the test specification file.                          |
+| Script Name | Description |
+| --- | --- |
+| `dev` | Start Electron as a development environment |
+| `dev:debug` | Start Electron as a development environment (with vite debug) |
+| `dev:debug:force` | Start Electron as a development environment (with vite debug + clean vite cache) |
+| `build:pre` | Commands commonly run at build time. This script does not need to be run separately. |
+| `build` | Build the package for the current operating system. |
+| `build:all` | Build a specified package for the entire operating system (Requires cross-platform build configuration) |
+| `build:dir` | `electron-builder` directory build |
+| `build:mac` | Build preconfigured packages for macOS |
+| `build:linux` | Build preconfigured packages for Linux |
+| `build:win` | Build preconfigured packages for Windows |
+| `lint` | ESLint code inspection. It does not modify the code. |
+| `lint:fix` | ESLint code inspection. Use auto-fix to fix your code. |
+| `format` | Prettier code inspection. It does not modify the code. |
+| `format:fix` | Prettier code inspection. Use auto-fix to fix your code. |
+| `test` | Build a package for testing and run tests against the test specification file. |
 
 ## For Documentation
 

diff --git a/package.json b/package.json
@@ -18,13 +18,13 @@
     "dev": "cross-env ELECTRON_ENABLE_LOGGING=true vite",
     "dev:debug": "vite -d",
     "dev:debug:force": "vite -d --force",
-    "build": "npm run build:pre && electron-builder --config=buildAssets/builder/config.mjs",
+    "build": "npm run build:pre && electron-builder --config=buildAssets/builder/config.js",
     "build:pre": "npm run format:fix && vue-tsc --noEmit && vite build",
-    "build:all": "npm run build:pre && electron-builder --config=buildAssets/builder/config.mjs -wml",
-    "build:dir": "npm run build:pre && electron-builder --config=buildAssets/builder/config.mjs --dir",
-    "build:mac": "npm run build:pre && CSC_IDENTITY_AUTO_DISCOVERY=false electron-builder --config=buildAssets/builder/config.mjs --mac",
-    "build:linux": "npm run build:pre && electron-builder --config=buildAssets/builder/config.mjs --linux",
-    "build:win": "npm run build:pre && electron-builder --config=buildAssets/builder/config.mjs --windows",
+    "build:all": "npm run build:pre && electron-builder --config=buildAssets/builder/config.js -wml",
+    "build:dir": "npm run build:pre && electron-builder --config=buildAssets/builder/config.js --dir",
+    "build:mac": "npm run build:pre && CSC_IDENTITY_AUTO_DISCOVERY=false electron-builder --config=buildAssets/builder/config.js --mac",
+    "build:linux": "npm run build:pre && electron-builder --config=buildAssets/builder/config.js --linux",
+    "build:win": "npm run build:pre && electron-builder --config=buildAssets/builder/config.js --windows",
     "lint": "eslint --ext .js,.ts,.vue -f ./node_modules/eslint-friendly-formatter src",
     "lint:fix": "eslint --ext .js,.ts,.vue -f ./node_modules/eslint-friendly-formatter --fix src",
     "format": "prettier .",