From cde0eb621d9a0205c7f67b65e67da224d267a022 Mon Sep 17 00:00:00 2001 From: CaffeinePower <86540016+cffnpwr@users.noreply.github.com> Date: Thu, 23 Feb 2023 16:23:16 +0900 Subject: [PATCH] feat(server): add @swc/core-android-arm64 to optional (#10034) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat: add optional swc * fix: windowsで動かない現象を修正 * fix: fix swc path alias * fix: docker build時に`Host key verification failed`と言われてgitリポジトリからパッケージをインストールできないのでssh -> htpsに変更 * feat(server): add @swc/core-android-arm64 to optional * fix: conflict --- packages/backend/package.json | 15 ++++++++------- pnpm-lock.yaml | 19 +++++++++++++++++++ 2 files changed, 27 insertions(+), 7 deletions(-) diff --git a/packages/backend/package.json b/packages/backend/package.json index d40affd35..df7821998 100644 --- a/packages/backend/package.json +++ b/packages/backend/package.json @@ -21,8 +21,7 @@ "test-and-coverage": "pnpm jest-and-coverage" }, "optionalDependencies": { - "@tensorflow/tfjs": "4.2.0", - "@tensorflow/tfjs-node": "4.2.0", + "@swc/core-android-arm64": "^1.3.11", "@swc/core-darwin-arm64": "^1.3.36", "@swc/core-darwin-x64": "^1.3.36", "@swc/core-linux-arm-gnueabihf": "^1.3.36", @@ -32,7 +31,9 @@ "@swc/core-linux-x64-musl": "^1.3.36", "@swc/core-win32-arm64-msvc": "^1.3.36", "@swc/core-win32-ia32-msvc": "^1.3.36", - "@swc/core-win32-x64-msvc": "^1.3.36" + "@swc/core-win32-x64-msvc": "^1.3.36", + "@tensorflow/tfjs": "4.2.0", + "@tensorflow/tfjs-node": "4.2.0" }, "dependencies": { "@bull-board/api": "4.12.1", @@ -128,9 +129,11 @@ "systeminformation": "5.17.9", "tinycolor2": "1.6.0", "tmp": "0.2.1", + "tsc-alias": "1.8.2", "tsconfig-paths": "4.1.2", "twemoji-parser": "14.0.0", "typeorm": "0.3.11", + "typescript": "4.9.5", "ulid": "2.3.0", "unzipper": "0.10.11", "uuid": "9.0.0", @@ -138,9 +141,7 @@ "web-push": "3.5.0", "websocket": "1.0.34", "ws": "8.12.1", - "xev": "3.0.2", - "tsc-alias": "1.8.2", - "typescript": "4.9.5" + "xev": "3.0.2" }, "devDependencies": { "@jest/globals": "29.4.3", @@ -195,4 +196,4 @@ "jest": "29.4.3", "jest-mock": "29.4.3" } -} +} \ No newline at end of file diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 13a083275..58369e320 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -68,6 +68,7 @@ importers: '@sinonjs/fake-timers': 10.0.2 '@swc/cli': 0.1.62 '@swc/core': 1.3.35 + '@swc/core-android-arm64': ^1.3.11 '@swc/core-darwin-arm64': ^1.3.36 '@swc/core-darwin-x64': ^1.3.36 '@swc/core-linux-arm-gnueabihf': ^1.3.36 @@ -325,6 +326,7 @@ importers: ws: 8.12.1 xev: 3.0.2 optionalDependencies: + '@swc/core-android-arm64': 1.3.11 '@swc/core-darwin-arm64': 1.3.36 '@swc/core-darwin-x64': 1.3.36 '@swc/core-linux-arm-gnueabihf': 1.3.36 @@ -2186,6 +2188,17 @@ packages: source-map: 0.7.4 dev: false + /@swc/core-android-arm64/1.3.11: + resolution: {integrity: sha512-M7FamR3kFpVTyTw73FzKcOZmS7/TWHX75eqtwBTaU9fW4shf0KTLr/h9DnMxNKAnwUMeub/lqlINUe5EKFIKwQ==} + engines: {node: '>=10'} + cpu: [arm64] + os: [android] + requiresBuild: true + dependencies: + '@swc/wasm': 1.2.130 + dev: false + optional: true + /@swc/core-darwin-arm64/1.3.35: resolution: {integrity: sha512-zQUFkHx4gZpu0uo2IspvPnKsz8bsdXd5bC33xwjtoAI1cpLerDyqo4v2zIahEp+FdKZjyVsLHtfJiQiA1Qka3A==} engines: {node: '>=10'} @@ -2383,6 +2396,12 @@ packages: jsonc-parser: 3.2.0 dev: true + /@swc/wasm/1.2.130: + resolution: {integrity: sha512-rNcJsBxS70+pv8YUWwf5fRlWX6JoY/HJc25HD/F8m6Kv7XhJdqPPMhyX6TKkUBPAG7TWlZYoxa+rHAjPy4Cj3Q==} + requiresBuild: true + dev: false + optional: true + /@syuilo/aiscript/0.12.4: resolution: {integrity: sha512-fIWEAHsnw9vMWTcjmSM2rCsadhb+BLirLDLW6lnRw3PFC8LV76Np8Ih8ssfAb00udh6oiGBSj+WiBdkMagbjmQ==} dependencies: