From 82afa3de90ddd52768b9f89ac80c6c073a294f59 Mon Sep 17 00:00:00 2001 From: kakkokari-gtyih <67428053+kakkokari-gtyih@users.noreply.github.com> Date: Mon, 3 Mar 2025 20:25:59 +0900 Subject: [PATCH] fix --- Dockerfile | 6 +++--- package.json | 1 + .../backend/test-federation/compose.tpl.yml | 3 ++- packages/backend/test-federation/compose.yml | 6 +++--- pnpm-lock.yaml | 18 ++++++++++++++---- 5 files changed, 23 insertions(+), 11 deletions(-) diff --git a/Dockerfile b/Dockerfile index 448e1b2f3d..13909e64ba 100644 --- a/Dockerfile +++ b/Dockerfile @@ -29,7 +29,7 @@ COPY --link ["packages/misskey-bubble-game/package.json", "./packages/misskey-bu ARG NODE_ENV=production -RUN npm install -g pnpm +RUN wget -qO- https://get.pnpm.io/install.sh | ENV="$HOME/.bashrc" SHELL="$(which bash)" bash - RUN --mount=type=cache,target=/root/.local/share/pnpm/store,sharing=locked \ pnpm i --frozen-lockfile --aggregate-output @@ -59,7 +59,7 @@ COPY --link ["packages/misskey-bubble-game/package.json", "./packages/misskey-bu ARG NODE_ENV=production -RUN npm install -g pnpm +RUN wget -qO- https://get.pnpm.io/install.sh | ENV="$HOME/.bashrc" SHELL="$(which bash)" bash - RUN --mount=type=cache,target=/root/.local/share/pnpm/store,sharing=locked \ pnpm i --frozen-lockfile --aggregate-output @@ -86,7 +86,7 @@ WORKDIR /misskey # add package.json to add pnpm COPY --chown=misskey:misskey ./package.json ./package.json -RUN npm install -g pnpm +RUN wget -qO- https://get.pnpm.io/install.sh | ENV="$HOME/.bashrc" SHELL="$(which bash)" bash - COPY --chown=misskey:misskey --from=target-builder /misskey/node_modules ./node_modules COPY --chown=misskey:misskey --from=target-builder /misskey/packages/backend/node_modules ./packages/backend/node_modules diff --git a/package.json b/package.json index 5b82a06da7..a38cae9b55 100644 --- a/package.json +++ b/package.json @@ -73,6 +73,7 @@ "eslint": "9.20.1", "globals": "15.15.0", "ncp": "2.0.0", + "pnpm": "10.5.2", "start-server-and-test": "2.0.10" }, "optionalDependencies": { diff --git a/packages/backend/test-federation/compose.tpl.yml b/packages/backend/test-federation/compose.tpl.yml index a7e907c3ee..c6909a7681 100644 --- a/packages/backend/test-federation/compose.tpl.yml +++ b/packages/backend/test-federation/compose.tpl.yml @@ -80,8 +80,9 @@ services: read_only: true working_dir: /misskey command: > + wget -qO- https://get.pnpm.io/install.sh | ENV="$HOME/.bashrc" SHELL="$(which bash)" bash - && + pnpm install && bash -c " - npm install -g pnpm pnpm -F backend migrate pnpm -F backend start " diff --git a/packages/backend/test-federation/compose.yml b/packages/backend/test-federation/compose.yml index 4df4ced365..45c331a60f 100644 --- a/packages/backend/test-federation/compose.yml +++ b/packages/backend/test-federation/compose.yml @@ -8,8 +8,8 @@ services: file: ./compose.tpl.yml service: misskey command: > + wget -qO- https://get.pnpm.io/install.sh | ENV="$HOME/.bashrc" SHELL="$(which bash)" bash - && bash -c " - npm install -g pnpm pnpm -F backend i pnpm -F misskey-js i pnpm -F misskey-reversi i @@ -76,8 +76,8 @@ services: read_only: true working_dir: /misskey entrypoint: > + wget -qO- https://get.pnpm.io/install.sh | ENV="$HOME/.bashrc" SHELL="$(which bash)" bash - && bash -c ' - npm install -g pnpm pnpm -F misskey-js i --frozen-lockfile pnpm -F backend i --frozen-lockfile exec "$0" "$@" @@ -116,8 +116,8 @@ services: read_only: true working_dir: /misskey command: > + wget -qO- https://get.pnpm.io/install.sh | ENV="$HOME/.bashrc" SHELL="$(which bash)" bash - && bash -c " - npm install -g pnpm pnpm -F backend i --frozen-lockfile pnpm exec tsc -p ./packages/backend/test-federation node ./packages/backend/test-federation/built/daemon.js diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index dfd7d4780a..5807ec9963 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -73,6 +73,9 @@ importers: ncp: specifier: 2.0.0 version: 2.0.0 + pnpm: + specifier: 10.5.2 + version: 10.5.2 start-server-and-test: specifier: 2.0.10 version: 2.0.10 @@ -1445,8 +1448,8 @@ packages: '@adobe/css-tools@4.4.2': resolution: {integrity: sha512-baYZExFpsdkBNuvGKTKWCwKH57HRZLVtycZS05WTQNVOiXVSeAki3nU35zlRbToeMW8aHlJfyS+1C4BOv27q0A==} - '@aiscript-dev/aiscript-languageserver@https://objects.githubusercontent.com/github-production-release-asset-2e65be/719047635/e986a4bc-d6d1-4ccc-8772-37eead5f7832?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=releaseassetproduction%2F20250303%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20250303T111358Z&X-Amz-Expires=300&X-Amz-Signature=ebdecf8ce25284c5147090a24794aeb7e61b5fcd6328aa77ebd176dfde334008&X-Amz-SignedHeaders=host&response-content-disposition=attachment%3B%20filename%3Daiscript-dev-aiscript-languageserver-0.1.6.tgz&response-content-type=application%2Foctet-stream': - resolution: {tarball: https://objects.githubusercontent.com/github-production-release-asset-2e65be/719047635/e986a4bc-d6d1-4ccc-8772-37eead5f7832?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=releaseassetproduction%2F20250303%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20250303T111358Z&X-Amz-Expires=300&X-Amz-Signature=ebdecf8ce25284c5147090a24794aeb7e61b5fcd6328aa77ebd176dfde334008&X-Amz-SignedHeaders=host&response-content-disposition=attachment%3B%20filename%3Daiscript-dev-aiscript-languageserver-0.1.6.tgz&response-content-type=application%2Foctet-stream} + '@aiscript-dev/aiscript-languageserver@https://objects.githubusercontent.com/github-production-release-asset-2e65be/719047635/e986a4bc-d6d1-4ccc-8772-37eead5f7832?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=releaseassetproduction%2F20250303%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20250303T112038Z&X-Amz-Expires=300&X-Amz-Signature=f348f441da3efb023f1092c6bb6bcba6a0650398c1e5486c3721b73a6d424aa6&X-Amz-SignedHeaders=host&response-content-disposition=attachment%3B%20filename%3Daiscript-dev-aiscript-languageserver-0.1.6.tgz&response-content-type=application%2Foctet-stream': + resolution: {tarball: https://objects.githubusercontent.com/github-production-release-asset-2e65be/719047635/e986a4bc-d6d1-4ccc-8772-37eead5f7832?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=releaseassetproduction%2F20250303%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20250303T112038Z&X-Amz-Expires=300&X-Amz-Signature=f348f441da3efb023f1092c6bb6bcba6a0650398c1e5486c3721b73a6d424aa6&X-Amz-SignedHeaders=host&response-content-disposition=attachment%3B%20filename%3Daiscript-dev-aiscript-languageserver-0.1.6.tgz&response-content-type=application%2Foctet-stream} version: 0.1.6 hasBin: true @@ -8441,6 +8444,11 @@ packages: resolution: {integrity: sha512-40QW5YalBNfQo5yRYmiw7Yz6TKKVr3h6970B2YE+3fQpsWcrbj1PzJgxeJ19DRQjhMbKPIuMY8rFaXc8moolVw==} engines: {node: '>=10.13.0'} + pnpm@10.5.2: + resolution: {integrity: sha512-2p3CjNP/QNBZIYgjWrJdMgKt2KIHr77caCIg5KACn/v/RWIQK55uRrTj+ei9U+bQXeSFRLDFfUsBeeIsdtEZmw==} + engines: {node: '>=18.12'} + hasBin: true + polished@4.3.1: resolution: {integrity: sha512-OBatVyC/N7SCW/FaDHrSd+vn0o5cS855TOmYi4OkdWUMSJCET/xip//ch8xGUvtr3i44X9LVyWwQlRMTN3pwSA==} engines: {node: '>=10'} @@ -10562,7 +10570,7 @@ snapshots: '@adobe/css-tools@4.4.2': {} - '@aiscript-dev/aiscript-languageserver@https://objects.githubusercontent.com/github-production-release-asset-2e65be/719047635/e986a4bc-d6d1-4ccc-8772-37eead5f7832?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=releaseassetproduction%2F20250303%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20250303T111358Z&X-Amz-Expires=300&X-Amz-Signature=ebdecf8ce25284c5147090a24794aeb7e61b5fcd6328aa77ebd176dfde334008&X-Amz-SignedHeaders=host&response-content-disposition=attachment%3B%20filename%3Daiscript-dev-aiscript-languageserver-0.1.6.tgz&response-content-type=application%2Foctet-stream': + '@aiscript-dev/aiscript-languageserver@https://objects.githubusercontent.com/github-production-release-asset-2e65be/719047635/e986a4bc-d6d1-4ccc-8772-37eead5f7832?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=releaseassetproduction%2F20250303%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20250303T112038Z&X-Amz-Expires=300&X-Amz-Signature=f348f441da3efb023f1092c6bb6bcba6a0650398c1e5486c3721b73a6d424aa6&X-Amz-SignedHeaders=host&response-content-disposition=attachment%3B%20filename%3Daiscript-dev-aiscript-languageserver-0.1.6.tgz&response-content-type=application%2Foctet-stream': dependencies: seedrandom: 3.0.5 stringz: 2.1.0 @@ -14797,7 +14805,7 @@ snapshots: aiscript-vscode@https://codeload.github.com/aiscript-dev/aiscript-vscode/tar.gz/c3cde89e79a41d93540cf8a48cd619c3f2dcb1b7: dependencies: - '@aiscript-dev/aiscript-languageserver': https://objects.githubusercontent.com/github-production-release-asset-2e65be/719047635/e986a4bc-d6d1-4ccc-8772-37eead5f7832?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=releaseassetproduction%2F20250303%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20250303T111358Z&X-Amz-Expires=300&X-Amz-Signature=ebdecf8ce25284c5147090a24794aeb7e61b5fcd6328aa77ebd176dfde334008&X-Amz-SignedHeaders=host&response-content-disposition=attachment%3B%20filename%3Daiscript-dev-aiscript-languageserver-0.1.6.tgz&response-content-type=application%2Foctet-stream + '@aiscript-dev/aiscript-languageserver': https://objects.githubusercontent.com/github-production-release-asset-2e65be/719047635/e986a4bc-d6d1-4ccc-8772-37eead5f7832?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=releaseassetproduction%2F20250303%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20250303T112038Z&X-Amz-Expires=300&X-Amz-Signature=f348f441da3efb023f1092c6bb6bcba6a0650398c1e5486c3721b73a6d424aa6&X-Amz-SignedHeaders=host&response-content-disposition=attachment%3B%20filename%3Daiscript-dev-aiscript-languageserver-0.1.6.tgz&response-content-type=application%2Foctet-stream vscode-languageclient: 9.0.1 ajv-draft-04@1.0.0(ajv@8.13.0): @@ -19487,6 +19495,8 @@ snapshots: pngjs@5.0.0: {} + pnpm@10.5.2: {} + polished@4.3.1: dependencies: '@babel/runtime': 7.26.9