Skip to content

A platform for community discussion. Free, open, simple.

DEV: Update pnpm to v12 (#44690)

David Taylor4368431eb4b5
diff --git a/.github/workflows/dependency-submission.yml b/.github/workflows/dependency-submission.yml
new file mode 100644
index 00000000000..c031675665a
--- /dev/null
+++ b/.github/workflows/dependency-submission.yml
@@ -0,0 +1,46 @@
+name: Dependency submission
+
+# GitHub's dependency graph reads only the first document of a two-document
+# pnpm-lock.yaml. Submitting the full lockfile keeps Dependabot alerts working.
+# https://github.com/dependabot/dependabot-core/issues/15904
+
+on:
+ push:
+ branches:
+ - main
+ workflow_dispatch:
+
+concurrency:
+ group: dependency-submission
+ cancel-in-progress: true
+
+permissions:
+ contents: write
+
+jobs:
+ submit:
+ if: github.repository == 'discourse/discourse'
+ runs-on: ubuntu-latest
+ timeout-minutes: 5
+
+ steps:
+ - uses: actions/checkout@v7
+
+ - uses: pnpm/action-setup@v6
+
+ - uses: actions/setup-node@v7
+ with:
+ node-version: 24
+
+ - name: Generate SBOM from the lockfile
+ run: pnpm sbom --lockfile-only --sbom-format cyclonedx > sbom.json
+
+ - name: Convert to a dependency snapshot
+ env:
+ MIN_PACKAGES: 1000
+ run: node script/pnpm_dependency_snapshot.mjs sbom.json > snapshot.json
+
+ - name: Submit the snapshot
+ env:
+ GH_TOKEN: ${{ github.token }}
+ run: gh api "repos/${{ github.repository }}/dependency-graph/snapshots" --input snapshot.json
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index f012d64cf43..312f7d186bf 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -280,13 +280,10 @@ jobs:
if: matrix.build_type == 'backend' || matrix.build_type == 'system'
run: bin/rake assets:precompile:asset_processor assets:precompile:pretty_text
- # TODO: drop hard-coded pnpm 12 once package.json is updated
- name: Deploy Playwright outside node_modules
if: matrix.build_type == 'system'
- env:
- npm_config_manage_package_manager_versions: "false"
run: |
- npx -y [email protected] deploy --filter @discourse/playwright-runner --prod tmp/playwright
+ pnpm deploy --filter @discourse/playwright-runner --prod tmp/playwright
echo "PLAYWRIGHT_CLI_EXECUTABLE_PATH=$PWD/tmp/playwright/node_modules/.bin/playwright" >> $GITHUB_ENV
# Drop node_modules to match production
diff --git a/bin/dev b/bin/dev
index 0f4b80fa682..cac6cd0728b 100755
--- a/bin/dev
+++ b/bin/dev
@@ -19,7 +19,8 @@ try {
path.join(RAILS_ROOT, "pnpm-lock.yaml"),
"utf8"
);
- nodeModulesOutdated = installed !== lockfile;
+ // pnpm copies only the last document of the lockfile into node_modules
+ nodeModulesOutdated = installed !== lockfile.split(/^---\n/m).at(-1);
} catch (e) {
nodeModulesOutdated = true;
}
diff --git a/bin/qunit b/bin/qunit
index 801b9cd1e83..7e56e64e2ca 100755
--- a/bin/qunit
+++ b/bin/qunit
@@ -442,7 +442,9 @@ class QunitRunner
node_modules_outdated =
begin
- File.read("node_modules/.pnpm/lock.yaml") != File.read("pnpm-lock.yaml")
+ # pnpm copies only the last document of the lockfile into node_modules
+ File.read("node_modules/.pnpm/lock.yaml") !=
+ File.read("pnpm-lock.yaml").split(/^---\n/).last
rescue Errno::ENOENT
true
end
diff --git a/frontend/asset-processor/package.json b/frontend/asset-processor/package.json
index 91f08a143a5..d70aaf8c62a 100644
--- a/frontend/asset-processor/package.json
+++ b/frontend/asset-processor/package.json
@@ -42,7 +42,7 @@
"node": ">= 20",
"npm": "please-use-pnpm",
"yarn": "please-use-pnpm",
- "pnpm": "^10"
+ "pnpm": "^12"
},
"devDependencies": {
"vitest": "^4.1.11"
diff --git a/frontend/deprecation-silencer/package.json b/frontend/deprecation-silencer/package.json
index ca7999687a8..607585e8d4a 100644
--- a/frontend/deprecation-silencer/package.json
+++ b/frontend/deprecation-silencer/package.json
@@ -10,6 +10,6 @@
"node": ">= 20",
"npm": "please-use-pnpm",
"yarn": "please-use-pnpm",
- "pnpm": "^10"
+ "pnpm": "^12"
}
}
diff --git a/frontend/discourse-i18n/package.json b/frontend/discourse-i18n/package.json
index db83356e48f..072aed832a3 100644
--- a/frontend/discourse-i18n/package.json
+++ b/frontend/discourse-i18n/package.json
@@ -29,7 +29,7 @@
"node": ">= 20",
"npm": "please-use-pnpm",
"yarn": "please-use-pnpm",
- "pnpm": "^10"
+ "pnpm": "^12"
},
"ember": {
"edition": "octane"
diff --git a/frontend/discourse-markdown-it/package.json b/frontend/discourse-markdown-it/package.json
index c9e8fe0d91f..3176a2695c0 100644
--- a/frontend/discourse-markdown-it/package.json
+++ b/frontend/discourse-markdown-it/package.json
@@ -34,7 +34,7 @@
"node": ">= 20",
"npm": "please-use-pnpm",
"yarn": "please-use-pnpm",
- "pnpm": "^10"
+ "pnpm": "^12"
},
"ember": {
"edition": "octane"
diff --git a/frontend/discourse-types/package.json b/frontend/discourse-types/package.json
index 90b36c4dac0..33632f5aab2 100644
--- a/frontend/discourse-types/package.json
+++ b/frontend/discourse-types/package.json
@@ -93,6 +93,6 @@
"node": ">= 20",
"npm": "please-use-pnpm",
"yarn": "please-use-pnpm",
- "pnpm": "^10"
+ "pnpm": "^12"
}
}
diff --git a/frontend/discourse/package.json b/frontend/discourse/package.json
index 6c7050c2604..a52e2eb7f96 100644
--- a/frontend/discourse/package.json
+++ b/frontend/discourse/package.json
@@ -183,7 +183,7 @@
"node": ">= 20",
"npm": "please-use-pnpm",
"yarn": "please-use-pnpm",
- "pnpm": "^10"
+ "pnpm": "^12"
},
"ember": {
"edition": "octane"
diff --git a/frontend/pretty-text-processor/package.json b/frontend/pretty-text-processor/package.json
index 8139859b2c7..6e183fab4d8 100644
--- a/frontend/pretty-text-processor/package.json
+++ b/frontend/pretty-text-processor/package.json
@@ -19,6 +19,6 @@
"node": ">= 20",
"npm": "please-use-pnpm",
"yarn": "please-use-pnpm",
- "pnpm": "^10"
+ "pnpm": "^12"
}
}
diff --git a/frontend/pretty-text/package.json b/frontend/pretty-text/package.json
index 90c48fe08b3..0d2eec30801 100644
--- a/frontend/pretty-text/package.json
+++ b/frontend/pretty-text/package.json
@@ -21,6 +21,6 @@
"node": ">= 20",
"npm": "please-use-pnpm",
"yarn": "please-use-pnpm",
- "pnpm": "^10"
+ "pnpm": "^12"
}
}
diff --git a/lib/precompiled_bundle.rb b/lib/precompiled_bundle.rb
index 28e649da785..44b07ac32c8 100644
--- a/lib/precompiled_bundle.rb
+++ b/lib/precompiled_bundle.rb
@@ -41,7 +41,10 @@ class PrecompiledBundle
installed = Rails.root.join("node_modules/.pnpm/lock.yaml")
lockfile = Rails.root.join("pnpm-lock.yaml")
- return if File.exist?(installed) && File.read(installed) == File.read(lockfile)
+ # pnpm copies only the last document of the lockfile into node_modules
+ if File.exist?(installed) && File.read(installed) == File.read(lockfile).split(/^---\n/).last
+ return
+ end
raise <<~MSG.squish
Cannot build #{@filename_prefix}: node_modules is missing or out of date.
diff --git a/package.json b/package.json
index 9e575bf33af..bb76a50b869 100644
--- a/package.json
+++ b/package.json
@@ -51,7 +51,7 @@
"node": ">= 20",
"npm": "please-use-pnpm",
"yarn": "please-use-pnpm",
- "pnpm": "^10"
+ "pnpm": "^12"
},
- "packageManager": "[email protected]"
+ "packageManager": "[email protected]"
}
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 9238f09ec29..975dd3c27d0 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -1,3 +1,161 @@
+---
+lockfileVersion: '9.0'
+
+importers:
+
+ .:
+ configDependencies: {}
+ packageManagerDependencies:
+ pnpm:
+ specifier: 12.11.2
+ version: 12.11.2
+
+packages:
+
+ resolution: {integrity: sha512-owLw13OfPkEoY+hLBNeeG+dCFhywr7q2d/EHPz4mNL2RhKnv8gNwMARkjkiDQu234aItVwFNDeGnmQXm+ikkAg==}
+ cpu: [arm64]
+ os: [android]
+
+ resolution: {integrity: sha512-GYPkVebl4iokOA/4MPSpGoUVfFlsth7uqOCe1XiaiM23LAdvUOMJBObqHJijr89ZqjwHm9pO6vO45GRwJ2U2qA==}
+ cpu: [x64]
+ os: [android]
+
+ resolution: {integrity: sha512-n9M4On66y8FDxUAKgMO1FXt0qihyG4e+56p3/F0uo8Bx9KplW8BwKVnXigzCJ8aNM6sVVPkOE6M9XXbeVIxnZA==}
+ cpu: [arm64]
+ os: [darwin]
+
+ resolution: {integrity: sha512-oSW7n3sBT0c0cyk4kj10T2Y6Mpm+OFEiCAWozgX039tdoI6yqJF1uaFD3sw7ugLdu6VV3+uY0pa1TUZIPdxDWA==}
+ cpu: [x64]
+ os: [darwin]
+
+ resolution: {integrity: sha512-qbzc3KoDpa/Lkf8vs3jnDe6dUUbso+6eLIyssYFMiliLpYNxn8dirk11YoNnOQcdHVB50v5RFls1Yid6ttT5pg==}
+ cpu: [x64]
+ os: [freebsd]
+
+ resolution: {integrity: sha512-uMEYDwKRktGwANubQ+kYCwmhNwg3Ik6qK89ahsbQ5cP30R/5FVJb/T99vr9XRUBC/A7mZI6eeT92oyVas9ACyg==}
+ cpu: [arm64]
+ os: [linux]
+ libc: [musl]
+
+ resolution: {integrity: sha512-6e8ZAQUwFXAWHHHv5FesWqf/kEK04wuitBv5f/gxzkC0DiBfaixr+f+6JQede8SF4Ji5LcMwVFJbzAtffpWxEg==}
+ cpu: [arm64]
+ os: [linux]
+ libc: [glibc]
+
+ resolution: {integrity: sha512-Ui8A4nepkVupx2VpuFfysEluMvWK6gTB5rgVts7Ss/+8dj0RD28x3F/seNeH/zSypgC6yKdV6qsKVQh/uffTuQ==}
+ cpu: [ppc64]
+ os: [linux]
+ libc: [glibc]
+
+ resolution: {integrity: sha512-i1yLdQ5bu+wjQ+srtFoJAaY2gN/+oXHFdjul4llCeoDxHE0rTIG3R41NhHfCjyFPW4+CpbBT58933CL9sMOCnA==}
+ cpu: [riscv64]
+ os: [linux]
+ libc: [glibc]
+
+ resolution: {integrity: sha512-YS1/lhPjjTsN4QL50VaFZKRa3Uc/bDnhE8eKbJMFvuX06UuFS5YaiDg04APoZdfVSGqTfX27QAg7rfLMSWaqxA==}
+ cpu: [s390x]
+ os: [linux]
+ libc: [glibc]
+
+ resolution: {integrity: sha512-7eIxQR05fvJxCujUSKp5KTtehJ7QqrgqP/HD1+BcB/SaV2Be4XI1PEHiOgA1zxsiMIeMvTF6E4G4dYHrFjeXRg==}
+ cpu: [x64]
+ os: [linux]
+ libc: [musl]
+
+ resolution: {integrity: sha512-FK7QKe24AYgppJwO3mpooYptduuvIGqKJPi5ac7MdnWkjUy46JBfYhCW0grnkWKC8YOf0x+vGviuQqJEj3SpQQ==}
+ cpu: [x64]
+ os: [linux]
+ libc: [glibc]
+
+ resolution: {integrity: sha512-PCTjVDdJb6VvraZxrEeFv6EqEA0hhIsAySx28e95J2Tqpi88hLpgOXgNqV0vpxq9A+b8GLQfyk/D+1UlJPv/YQ==}
+ cpu: [arm64]
+ os: [win32]
+
+ resolution: {integrity: sha512-8sgX86OvRjJ3yZs/TvGR2L31wH9ScPZ+f+geKI3ikuB0RRiK3i4LlTRO8OXN6pdRqj8epMde4312MCjj7JsJdA==}
+ cpu: [x64]
+ os: [win32]
+
+ resolution: {integrity: sha512-JaUWUqGWeFr18ovabf6NxYLr76SsHRgCIc4TkCMcX7dmN4IupLbkYzznSs3LCnf3Ja8RutOBd/3t2u6BipVcuQ==}
+ engines: {node: '>=18.*'}
+ hasBin: true
+
+snapshots:
+
+ optional: true
+
+ optional: true
+
+ optional: true
+
+ optional: true
+
+ optional: true
+
+ optional: true
+
+ optional: true
+
+ optional: true
+
+ optional: true
+
+ optional: true
+
+ optional: true
+
+ optional: true
+
+ optional: true
+
+ optional: true
+
+ optionalDependencies:
+ '@pnpm/exe.android-arm64': 12.11.2
+ '@pnpm/exe.android-x64': 12.11.2
+ '@pnpm/exe.darwin-arm64': 12.11.2
+ '@pnpm/exe.darwin-x64': 12.11.2
+ '@pnpm/exe.freebsd-x64': 12.11.2
+ '@pnpm/exe.linux-arm64': 12.11.2
+ '@pnpm/exe.linux-arm64-musl': 12.11.2
+ '@pnpm/exe.linux-ppc64': 12.11.2
+ '@pnpm/exe.linux-riscv64': 12.11.2
+ '@pnpm/exe.linux-s390x': 12.11.2
+ '@pnpm/exe.linux-x64': 12.11.2
+ '@pnpm/exe.linux-x64-musl': 12.11.2
+ '@pnpm/exe.win32-arm64': 12.11.2
+ '@pnpm/exe.win32-x64': 12.11.2
+
+---
lockfileVersion: '9.0'
settings:
@@ -11,24 +169,12 @@ overrides:
patchedDependencies:
- '@warp-drive/[email protected]':
- hash: de74ff6c540d75d173dcb41244cb6c4f6c86dabdb41908170a9d1c0e47ee099f
- path: patches/@[email protected]
- hash: 387f93bad78f3a98b20dc742f4f0b7a165c7e6ebc65cc60356748346c0725c7f
- path: patches/[email protected]
- hash: aa23a9187235d165dee5e57e37f5310baafb88869fb08c274dca853d6b804201
- path: patches/[email protected]
- hash: 3032f3a47f33911d5c278ec6f2d4e0e4afc8f977baea1012613b13de23831c73
- path: patches/[email protected]
- licensee:
- hash: 566956dc682db703e899e5b01c65b129e434ad9f0848f5b9f62c3c28afd086e9
- path: patches/licensee.patch
- pikaday:
- hash: ab597bca99e3c8cc091cd804d003516de8a3744472e0a4b881e598a38b51dc83
- path: patches/pikaday.patch
+ '@warp-drive/[email protected]': de74ff6c540d75d173dcb41244cb6c4f6c86dabdb41908170a9d1c0e47ee099f
+ [email protected]: 387f93bad78f3a98b20dc742f4f0b7a165c7e6ebc65cc60356748346c0725c7f
+ [email protected]: aa23a9187235d165dee5e57e37f5310baafb88869fb08c274dca853d6b804201
+ [email protected]: 3032f3a47f33911d5c278ec6f2d4e0e4afc8f977baea1012613b13de23831c73
+ licensee: 566956dc682db703e899e5b01c65b129e434ad9f0848f5b9f62c3c28afd086e9
+ pikaday: ab597bca99e3c8cc091cd804d003516de8a3744472e0a4b881e598a38b51dc83
importers:
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
index 996da8a9581..f653451f7e1 100644
--- a/pnpm-workspace.yaml
+++ b/pnpm-workspace.yaml
@@ -7,12 +7,11 @@ ignoreWorkspaceCycles: true
updateNotifier: false
strictPeerDependencies: true
strictDepBuilds: true
-onlyBuiltDependencies:
-- lefthook
-ignoredBuiltDependencies:
-- "@zoom/meetingsdk"
-- core-js
-- rete
+allowBuilds:
+ lefthook: true
+ "@zoom/meetingsdk": false
+ core-js: false
+ rete: false
minimumReleaseAge: 10080
minimumReleaseAgeExclude:
- "@discourse/*"
diff --git a/script/pnpm_dependency_snapshot.mjs b/script/pnpm_dependency_snapshot.mjs
new file mode 100644
index 00000000000..fc0ea33c71a
--- /dev/null
+++ b/script/pnpm_dependency_snapshot.mjs
@@ -0,0 +1,82 @@
+// Converts `pnpm sbom --lockfile-only --sbom-format cyclonedx` output into a
+// GitHub dependency submission snapshot for `pnpm-lock.yaml`.
+
+import { readFileSync } from "node:fs";
+
+const LOCKFILE = "pnpm-lock.yaml";
+
+const sbom = JSON.parse(readFileSync(process.argv[2], "utf8"));
+const minPackages = Number(process.env.MIN_PACKAGES || 1);
+
+const isRegistryPackage = (component) =>
+ component.externalReferences?.some((ref) => ref.type === "distribution");
+
+const isDevelopment = (component) =>
+ component.properties?.some(
+ (prop) =>
+ prop.name === "cdx:npm:package:development" && prop.value === "true"
+ );
+
+const packages = sbom.components.filter(isRegistryPackage);
+const packageRefs = new Set(packages.map((c) => c["bom-ref"]));
+const edges = new Map(
+ sbom.dependencies.map((d) => [d.ref, d.dependsOn ?? []])
+);
+
+const projects = [
+ sbom.metadata.component,
+ ...sbom.components.filter((c) => !isRegistryPackage(c)),
+];
+const direct = new Set(projects.flatMap((p) => edges.get(p["bom-ref"]) ?? []));
+
+if (packages.length < minPackages) {
+ console.error(
+ `Found ${packages.length} packages in ${LOCKFILE}, expected at least ${minPackages}.`
+ );
+ process.exit(1);
+}
+
+const resolved = Object.fromEntries(
+ packages.map((c) => [
+ c.purl,
+ {
+ package_url: c.purl,
+ relationship: direct.has(c["bom-ref"]) ? "direct" : "indirect",
+ scope: isDevelopment(c) ? "development" : "runtime",
+ dependencies: (edges.get(c["bom-ref"]) ?? []).filter((ref) =>
+ packageRefs.has(ref)
+ ),
+ },
+ ])
+);
+
+const pnpm = sbom.metadata.tools?.components?.find((t) => t.name === "pnpm");
+
+const snapshot = {
+ version: 0,
+ sha: process.env.GITHUB_SHA,
+ ref: process.env.GITHUB_REF,
+ job: {
+ correlator: `${process.env.GITHUB_WORKFLOW}_${process.env.GITHUB_JOB}`,
+ id: process.env.GITHUB_RUN_ID,
+ },
+ detector: {
+ name: "pnpm-sbom",
+ version: pnpm?.version ?? "unknown",
+ url: "https://pnpm.io/cli/sbom",
+ },
+ scanned: new Date().toISOString(),
+ manifests: {
+ [LOCKFILE]: {
+ name: LOCKFILE,
+ file: { source_location: LOCKFILE },
+ resolved,
+ },
+ },
+};
+
+const directCount = packages.filter((c) => direct.has(c["bom-ref"])).length;
+console.error(
+ `${packages.length} packages (${directCount} direct) from ${LOCKFILE}`
+);
+process.stdout.write(JSON.stringify(snapshot));