改进 tpl 文件生成流 #656

Hi-Windom · Apr 25, 2024 · 1145cea · 1145cea
1 parent 2ecbd94
commit 1145cea
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
@@ -6,6 +6,7 @@ on:
     tags:
       - "v*-sillot"
 
+# ref https://docs.github.com/zh/actions/learn-github-actions/variables
 env:
   repo_name_android: "Sillot-android"
   repo_name: "Sillot"

diff --git a/app/package.json b/app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "sillot",
-  "version": "0.31.1750",
+  "version": "0.31.1760",
   "syv": "3.0.12",
   "sypv": "[]",
   "description": "Build Your Eternal Digital Garden",
@@ -25,13 +25,13 @@
     "unlink:sofill": "pnpm uninstall sofill && pnpm i sofill -D",
     "check": "NPM_CHECK_INSTALLER=pnpm npm-check -u",
     "check:electron": "pnpm install electron@alpha",
-    "gentpl": "echo '危险覆写操作警告：生成替换前请确认版本合并冲突已解决' && pause && node ./scripts/genTPL.js",
-    "build": "pnpm run '/build:.*/'",
+    "gentpl": "node ./scripts/genTPL.js && echo '危险覆写操作警告：git 提交前请确认'",
+    "build": "pnpm run gentpl && pnpm run '/build:.*/'",
     "docker:build": "pnpm run build:mobile && pnpm run build-docker",
-    "build-docker": "pnpm run gentpl:docker && webpack --mode production --config webpack.docker.js",
-    "build:app": "pnpm run gentpl:app && webpack --mode production",
-    "build:mobile": "pnpm run gentpl:mobile && webpack --mode production --config webpack.mobile.js",
-    "build:desktop": "pnpm run gentpl:desktop && webpack --mode production --config webpack.desktop.js",
+    "build-docker": "webpack --mode production --config webpack.docker.js",
+    "build:app": "webpack --mode production",
+    "build:mobile": "webpack --mode production --config webpack.mobile.js",
+    "build:desktop": "webpack --mode production --config webpack.desktop.js",
     "build:export": "webpack --mode production --config webpack.export.js",
     "build-ignore:mobile": "webpack --mode production && pnpm run build:desktop && pnpm run build:export",
     "b:lint": "biome lint ./src --config-path ../ --diagnostic-level error --apply && echo 'ref https://biomejs.dev/reference/cli/#biome-lint'",