Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/upgrade-pnpm-security-settings.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@baseplate-dev/core-generators': patch
---

Upgrade pnpm to 10.27.0 and add `blockExoticSubdeps: true` to generated pnpm-workspace.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@
},
"engines": {
"node": "^22.18.0",
"pnpm": "^10.18.0"
"pnpm": "^10.27.0"
},
"volta": {
"node": "22.18.0"
Expand Down
2 changes: 1 addition & 1 deletion examples/blog-with-auth/apps/admin/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@
},
"engines": {
"node": "^22.18.0",
"pnpm": "^10.18.0"
"pnpm": "^10.27.0"
},
"volta": {
"node": "22.18.0"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@
},
"engines": {
"node": "^22.18.0",
"pnpm": "^10.18.0"
"pnpm": "^10.27.0"
},
"volta": {
"node": "22.18.0"
Expand Down
2 changes: 1 addition & 1 deletion examples/blog-with-auth/apps/backend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@
},
"engines": {
"node": "^22.18.0",
"pnpm": "^10.18.0"
"pnpm": "^10.27.0"
},
"volta": {
"node": "22.18.0"
Expand Down
4 changes: 2 additions & 2 deletions examples/blog-with-auth/baseplate/generated/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@
"prettier-plugin-packagejson": "2.5.19",
"turbo": "2.5.0"
},
"packageManager": "pnpm@10.18.3",
"packageManager": "pnpm@10.27.0",
"engines": {
"node": "^22.18.0",
"pnpm": "^10.18.0"
"pnpm": "^10.27.0"
},
"volta": {
"node": "22.18.0"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
packages:
- apps/*
- packages/*
blockExoticSubdeps: true
linkWorkspacePackages: true
minimumReleaseAge: 1440
publishBranch: main
savePrefix: ''
linkWorkspacePackages: true
saveWorkspaceProtocol: rolling
minimumReleaseAge: 1440
4 changes: 2 additions & 2 deletions examples/blog-with-auth/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@
"prettier-plugin-packagejson": "2.5.19",
"turbo": "2.5.0"
},
"packageManager": "pnpm@10.18.3",
"packageManager": "pnpm@10.27.0",
"engines": {
"node": "^22.18.0",
"pnpm": "^10.18.0"
"pnpm": "^10.27.0"
},
"volta": {
"node": "22.18.0"
Expand Down
51 changes: 0 additions & 51 deletions examples/blog-with-auth/pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions examples/blog-with-auth/pnpm-workspace.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
packages:
- apps/*
- packages/*
blockExoticSubdeps: true
linkWorkspacePackages: true
minimumReleaseAge: 1440
publishBranch: main
savePrefix: ''
linkWorkspacePackages: true
saveWorkspaceProtocol: rolling
minimumReleaseAge: 1440
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@
},
"engines": {
"node": "^22.18.0",
"pnpm": "^10.18.0"
"pnpm": "^10.27.0"
},
"volta": {
"node": "22.18.0"
Expand Down
2 changes: 1 addition & 1 deletion examples/todo-with-auth0/apps/admin/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@
},
"engines": {
"node": "^22.18.0",
"pnpm": "^10.18.0"
"pnpm": "^10.27.0"
},
"volta": {
"node": "22.18.0"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@
},
"engines": {
"node": "^22.18.0",
"pnpm": "^10.18.0"
"pnpm": "^10.27.0"
},
"volta": {
"node": "22.18.0"
Expand Down
2 changes: 1 addition & 1 deletion examples/todo-with-auth0/apps/backend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@
},
"engines": {
"node": "^22.18.0",
"pnpm": "^10.18.0"
"pnpm": "^10.27.0"
},
"volta": {
"node": "22.18.0"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@
},
"engines": {
"node": "^22.18.0",
"pnpm": "^10.18.0"
"pnpm": "^10.27.0"
},
"volta": {
"node": "22.18.0"
Expand Down
2 changes: 1 addition & 1 deletion examples/todo-with-auth0/apps/web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@
},
"engines": {
"node": "^22.18.0",
"pnpm": "^10.18.0"
"pnpm": "^10.27.0"
},
"volta": {
"node": "22.18.0"
Expand Down
4 changes: 2 additions & 2 deletions examples/todo-with-auth0/baseplate/generated/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@
"prettier-plugin-packagejson": "2.5.19",
"turbo": "2.5.0"
},
"packageManager": "pnpm@10.18.3",
"packageManager": "pnpm@10.27.0",
"engines": {
"node": "^22.18.0",
"pnpm": "^10.18.0"
"pnpm": "^10.27.0"
},
"volta": {
"node": "22.18.0"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
packages:
- apps/*
- packages/*
blockExoticSubdeps: true
linkWorkspacePackages: true
minimumReleaseAge: 1440
publishBranch: main
savePrefix: ''
linkWorkspacePackages: true
saveWorkspaceProtocol: rolling
minimumReleaseAge: 1440
4 changes: 2 additions & 2 deletions examples/todo-with-auth0/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@
"prettier-plugin-packagejson": "2.5.19",
"turbo": "2.5.0"
},
"packageManager": "pnpm@10.18.3",
"packageManager": "pnpm@10.27.0",
"engines": {
"node": "^22.18.0",
"pnpm": "^10.18.0"
"pnpm": "^10.27.0"
},
"volta": {
"node": "22.18.0"
Expand Down
5 changes: 3 additions & 2 deletions examples/todo-with-auth0/pnpm-workspace.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
packages:
- apps/*
- packages/*
blockExoticSubdeps: true
linkWorkspacePackages: true
minimumReleaseAge: 1440
publishBranch: main
savePrefix: ''
linkWorkspacePackages: true
saveWorkspaceProtocol: rolling
minimumReleaseAge: 1440
2 changes: 1 addition & 1 deletion mise.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ min_version = "2025.8.14"

[tools]
node = "22.18.0"
pnpm = "10.18.3"
pnpm = "10.27.0"
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -70,10 +70,10 @@
"vitest": "catalog:",
"workspace-meta": "0.1.4"
},
"packageManager": "pnpm@10.18.3",
"packageManager": "pnpm@10.27.0",
"engines": {
"node": "^22.0.0",
"pnpm": "^10.18.3"
"pnpm": "^10.27.0"
},
"volta": {
"node": "22.18.0"
Expand Down
2 changes: 1 addition & 1 deletion packages/core-generators/src/constants/node.ts
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
export const NODE_VERSION = '22.18.0';
export const PNPM_VERSION = '10.18.3';
export const PNPM_VERSION = '10.27.0';
Original file line number Diff line number Diff line change
Expand Up @@ -29,20 +29,23 @@ export const pnpmWorkspaceGenerator = createGenerator({
build: (builder) => {
const yamlContent = stringify({
packages: descriptor.packages,
// prevents publish from any branch other than main
publishBranch: 'main',
// saves exact versions of dependencies by default
savePrefix: '',
// blocks dependencies from resolving to exotic (non-npm) subdependencies
// unless explicitly allowed, preventing supply chain attacks via git/http deps
blockExoticSubdeps: true,
// ensures we use locally linked packages when available
linkWorkspacePackages: true,
// defaults to saving as workspace:*
saveWorkspaceProtocol: 'rolling',
// security setting to delay installation of newly released dependencies
// to reduce risk of installing compromised packages. Popular packages that are
// successfully attacked are often discovered and removed from the registry
// within an hour. Setting to 1440 minutes (24 hours) ensures only packages
// released at least one day ago can be installed.
minimumReleaseAge: 1440,
// prevents publish from any branch other than main
publishBranch: 'main',
// saves exact versions of dependencies by default
savePrefix: '',
// defaults to saving as workspace:*
saveWorkspaceProtocol: 'rolling',
});

builder.writeFile({
Expand Down
2 changes: 1 addition & 1 deletion packages/project-builder-server/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
"@trpc/server": "^11.8.0",
"chalk": "5.3.0",
"change-case": "5.4.4",
"chokidar": "4.0.3",
"chokidar": "5.0.0",
"diff": "^8.0.2",
"es-toolkit": "1.31.0",
"execa": "9.3.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/project-builder-web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@
"@types/node": "catalog:",
"@types/semver": "^7.5.0",
"@vitejs/plugin-react": "catalog:",
"chokidar": "4.0.3",
"chokidar": "5.0.0",
"eslint": "catalog:",
"mime": "^4.0.3",
"prettier": "catalog:",
Expand Down
22 changes: 18 additions & 4 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions pnpm-workspace.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ ignoredBuiltDependencies:
- ssh2
- unrs-resolver

blockExoticSubdeps: true

linkWorkspacePackages: true

minimumReleaseAge: 1440
Expand Down
Loading