fix: lock TypeScript version to 4.x to resolve build issues after upgrading to 5.x

noodlefighter · noodlefighter · commit 91886b70be3e · 2024-09-21T16:40:42.000+08:00
After upgrading to TypeScript 5.x, we encountered build issues due to compatibility problems. This commit locks the TypeScript version to 4.x to ensure stable builds and compatibility with our existing codebase.
diff --git a/README.md b/README.md
@@ -29,6 +29,8 @@ LabelPlus是一个用于图片翻译的工具包，本工程是其中的Photosho
 ```
 $ sudo apt install python nodejs
 $ sudo npm install -g typescript yarn
+$ npm config set registry https://registry.npmmirror.com
+$ yarn config set registry https://registry.npmmirror.com
 ```
 
 ### build
diff --git a/build.sh b/build.sh
@@ -2,14 +2,15 @@
 
 cd "${0%%/*}"
 
+TSC=./node_modules/typescript/bin/tsc
 TSC_OUTPUT=build/app.js
 PS_JSX_OUTPUT=build/LabelPlus_Ps_Script.jsx
 
 rm -rf ./build/*
 mkdir -p build/
-tsc -p . --out $TSC_OUTPUT
+$TSC --preserveConstEnums -p . --out $TSC_OUTPUT
 cat src/copyleft_header.js $TSC_OUTPUT > $PS_JSX_OUTPUT
-./flatten_jsx.py $PS_JSX_OUTPUT $PS_JSX_OUTPUT -I build/ src/
+python ./flatten_jsx.py $PS_JSX_OUTPUT $PS_JSX_OUTPUT -I build/ src/
 
 cp -r doc_template/ build/ps_script_res
 
diff --git a/do_release.sh b/do_release.sh
@@ -24,7 +24,7 @@ if [ $# -lt 1 ]; then
 fi
 
 version=$1
-program_exists git 7z tsc python
+program_exists git 7z python
 [ $? -ne 0 ] && exit 1
 
 cd "${0%%/*}"
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,5 +1,8 @@
 {
   "dependencies": {
     "photoshop.d.ts": "^1.0.0"
+  },
+  "devDependencies": {
+    "typescript": "^4.9.5"
   }
 }
diff --git a/yarn.lock b/yarn.lock
@@ -4,5 +4,10 @@
 
 photoshop.d.ts@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.npm.taobao.org/photoshop.d.ts/download/photoshop.d.ts-1.0.0.tgz#40c8b0701a4ffb492a5b3421e46146f3560a6170"
-  integrity sha1-QMiwcBpP+0kqWzQh5GFG81YKYXA=
+  resolved "https://registry.npmmirror.com/photoshop.d.ts/-/photoshop.d.ts-1.0.0.tgz"
+  integrity sha512-bNJdjg+4ZFoxHh3ZVz1PY8Gi7r/2Xa597EsJS/ZzZCXyebvYQWNWhLuP/2iwjOf148NH7X5AF5mqrhTFxBxwoQ==
+
+typescript@^4.9.5:
+  version "4.9.5"
+  resolved "https://registry.npmmirror.com/typescript/-/typescript-4.9.5.tgz"
+  integrity sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,8 @@`
`1`	`1`	`{`
`2`	`2`	`"dependencies": {`
`3`	`3`	`"photoshop.d.ts": "^1.0.0"`
	`4`	`+ },`
	`5`	`+ "devDependencies": {`
	`6`	`+ "typescript": "^4.9.5"`
`4`	`7`	`}`
`5`	`8`	`}`