Skip to content

Commit 3fd9092

Browse files
authored
fix: install latest corepack globally and upgrade pnpm (#1287)
1 parent 39673f2 commit 3fd9092

File tree

3 files changed

+12
-5
lines changed

3 files changed

+12
-5
lines changed

.devcontainer/devcontainer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"otherPortsAttributes": {
66
"onAutoForward": "silent"
77
},
8-
"postCreateCommand": "sudo npm uninstall -g pnpm yarn && sudo git config --system --add safe.directory ${containerWorkspaceFolder} && sudo chown node node_modules .pnpm-store && sudo npm install -g corepack@latest && sudo corepack enable && corepack install && pnpm install",
8+
"postCreateCommand": "sudo npm uninstall -g pnpm yarn && sudo git config --system --add safe.directory ${containerWorkspaceFolder} && sudo chown node node_modules .pnpm-store && sudo npm install -g corepack@latest && sudo corepack enable && corepack install && pnpm install && pnpm approve-builds",
99
"waitFor": "postCreateCommand",
1010
"mounts": [
1111
"source=${localWorkspaceFolderBasename}-node_modules,target=${containerWorkspaceFolder}/node_modules,type=volume",
@@ -38,7 +38,7 @@
3838
"[typescript]": {
3939
"editor.defaultFormatter": "esbenp.prettier-vscode",
4040
"editor.codeActionsOnSave": {
41-
"source.organizeImports": false
41+
"source.organizeImports": "never"
4242
}
4343
}
4444
},

Dockerfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ RUN apk upgrade --no-cache --available && \
1414
echo "Asia/Tokyo" > /etc/timezone && \
1515
apk del tzdata && \
1616
npm install -g corepack@latest && \
17+
pnpm approve-builds && \
1718
corepack enable
1819

1920
WORKDIR /app
@@ -25,7 +26,8 @@ RUN --mount=type=cache,id=pnpm,target=/pnpm/store pnpm fetch
2526
COPY package.json tsconfig.json ./
2627
COPY src src
2728

28-
RUN --mount=type=cache,id=pnpm,target=/pnpm/store pnpm install --frozen-lockfile --offline
29+
RUN --mount=type=cache,id=pnpm,target=/pnpm/store pnpm install --frozen-lockfile --offline && \
30+
pnpm approve-builds
2931

3032
COPY entrypoint.sh ./
3133
RUN chmod +x ./entrypoint.sh

package.json

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,5 +50,10 @@
5050
"tsx": "4.19.2",
5151
"typescript": "5.7.3"
5252
},
53-
"packageManager": "pnpm@10.2.1"
54-
}
53+
"packageManager": "pnpm@10.2.1+sha512.398035c7bd696d0ba0b10a688ed558285329d27ea994804a52bad9167d8e3a72bcb993f9699585d3ca25779ac64949ef422757a6c31102c12ab932e5cbe5cc92",
54+
"pnpm": {
55+
"onlyBuiltDependencies": [
56+
"esbuild"
57+
]
58+
}
59+
}

0 commit comments

Comments
 (0)