Move versions to package.json, and not a separate file

Author: zaerl

.github/workflows/compile-php-wasm.yml

@@ -181,30 +181,30 @@ jobs:
               with:
                   node-version: '20'
 
-            - name: Update wasm-versions.json
+            - name: Bump package.json versions to PR/SHA pre-release
               run: |
                   node -e "
                     const fs = require('fs');
-                    const versionsPath = 'packages/php-wasm/wasm-versions.json';
-                    const versions = JSON.parse(fs.readFileSync(versionsPath, 'utf8'));
                     const matrix = ${{ needs.read-matrix.outputs.matrix }};
                     const currentVersion = require('./lerna.json').version;
                     const pr = '${{ github.event.pull_request.number || '' }}';
                     const run = '${{ github.run_number }}';
+                    const sha = require('child_process').execSync('git rev-parse --short HEAD').toString().trim();
+                    const version = pr
+                      ? \`\${currentVersion}-pr.\${pr}.\${run}\`
+                      : \`\${currentVersion}-sha.\${sha}.\${run}\`;
                     for (const item of matrix.include) {
-                      const key = item.packageSuffix;
-                      const version = pr
-                        ? \`\${currentVersion}-pr.\${pr}.\${run}\`
-                        : \`\${currentVersion}-sha.\${require('child_process').execSync('git rev-parse --short HEAD').toString().trim()}.\${run}\`;
-                      versions[key] = version;
+                      const pkgPath = \`packages/php-wasm/\${item.platform}-builds/\${item.phpVersionSlug}/package.json\`;
+                      const pkg = JSON.parse(fs.readFileSync(pkgPath, 'utf8'));
+                      pkg.version = version;
+                      fs.writeFileSync(pkgPath, JSON.stringify(pkg, null, '\t') + '\n');
                     }
-                    fs.writeFileSync(versionsPath, JSON.stringify(versions, null, '\t') + '\n');
                   "
 
-            - name: Commit updated wasm-versions.json
+            - name: Commit updated package.json files
               run: |
-                  git add packages/php-wasm/wasm-versions.json
-                  git diff --staged --quiet || git commit -m "chore: update wasm-versions.json for PHP WASM recompile [skip ci]"
+                  git add packages/php-wasm/web-builds packages/php-wasm/node-builds
+                  git diff --staged --quiet || git commit -m "chore: bump WASM package versions for PHP WASM recompile [skip ci]"
                   git push
 
             - name: Post PR comment
@@ -228,7 +228,7 @@ jobs:
                         ...lines,
                         '',
                         'These packages will be available until the PR is merged.',
-                        'The `wasm-versions.json` has been updated on this branch.',
+                        'The `package.json` files have been updated on this branch.',
                       ].join('\n');
                       await github.rest.issues.createComment({
                         owner: context.repo.owner,

.github/workflows/publish-npm-packages.yml

@@ -84,39 +84,15 @@ jobs:
 
             - uses: ./.github/actions/prepare-playground
 
-            - name: Bump version (trunk)
-              # Bump all package versions and create a local git commit + tag,
-              # but do not push yet — we amend the commit in the next step to
-              # include the wasm-versions.json reset so both land as one commit.
-              if: github.ref == 'refs/heads/trunk'
-              run: lerna version ${{ inputs.version_bump || 'patch' }} --yes --no-push
-
-            - name: Clear wasm-versions.json overrides and push (trunk)
-              # wasm-versions.json may contain PR/SHA pre-release overrides from
-              # the last WASM recompile. Reset it to {} so download-wasm.mjs
-              # falls back to the lerna version for all packages.
-              if: github.ref == 'refs/heads/trunk'
-              run: |
-                  echo '{}' > packages/php-wasm/wasm-versions.json
-                  git add packages/php-wasm/wasm-versions.json
-                  git commit --amend --no-edit
-                  NEW_VERSION=$(node -e "console.log(require('./lerna.json').version)")
-                  git tag -f "v${NEW_VERSION}"
-                  git push origin trunk --follow-tags
-
-            - name: Publish NPM packages (trunk)
-              if: github.ref == 'refs/heads/trunk'
-              run: >
-                  lerna publish from-git
-                  --yes --no-private --loglevel=verbose
-                  --dist-tag=${{ inputs.dist_tag || 'latest' }}
-
-            - name: Publish NPM packages (non-trunk)
-              # On non-trunk branches no commit or tag is created — the version
-              # bump only affects the published package.json on npm.
-              if: github.ref != 'refs/heads/trunk'
+            - name: Publish NPM packages
+              # Version bump, release, tag a new version on GitHub.
+              # Lerna resets all package.json versions (including WASM packages)
+              # to the new stable version, clearing any PR/SHA pre-release bumps.
+              # On non-trunk branches, --no-push avoids pushing the version
+              # bump commit back to the branch. The published packages still
+              # get the version bump in their package.json on npm.
               run: >
                   lerna publish ${{ inputs.version_bump || 'patch' }}
                   --yes --no-private --loglevel=verbose
                   --dist-tag=${{ inputs.dist_tag || 'latest' }}
-                  --no-push --no-git-tag-version
+                  ${{ github.ref != 'refs/heads/trunk' && '--no-push --no-git-tag-version' || '' }}

packages/php-wasm/wasm-versions.json

@@ -5,10 +5,9 @@
  * Used by local developers (after git bisect, fresh clone) and by CI jobs
  * before building wasm-dependent packages.
  *
- * Package versions default to the current lerna.json version. The file
- * packages/php-wasm/wasm-versions.json is an optional sparse overrides map
- * used during active WASM recompiles to point specific packages at PR/SHA
- * pre-release builds. It is reset to {} on every stable release.
+ * The version to download for each package is read directly from its
+ * package.json. Stable releases use the lerna version; PR/SHA recompiles
+ * temporarily bump the package.json to a pre-release version.
  */
 
 import { execSync } from 'child_process';
@@ -21,20 +20,8 @@ import { createGunzip } from 'zlib';
 
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 const repoRoot = path.resolve(__dirname, '../../');
-const versionsFile = path.join(
-	repoRoot,
-	'packages/php-wasm/wasm-versions.json'
-);
-
-// Default version comes from lerna.json (the current stable release).
-// wasm-versions.json only stores overrides for PR/SHA pre-release builds.
-const defaultVersion = JSON.parse(
-	fs.readFileSync(path.join(repoRoot, 'lerna.json'), 'utf8')
-).version;
-const versions = JSON.parse(fs.readFileSync(versionsFile, 'utf8'));
 
-// Build the full list of packages from the filesystem so wasm-versions.json
-// only needs to contain overrides, not every entry.
+// Discover all WASM packages from the filesystem.
 const allKeys = [];
 for (const platform of ['web', 'node']) {
 	const buildsDir = path.join(
@@ -64,8 +51,14 @@ if (fs.existsSync(triggerFile)) {
 	const stale = (trigger.compilations ?? []).filter(
 		({ platform, phpVersion }) => {
 			const [major, minor] = phpVersion.split('.');
-			const key = `${platform}-${major}-${minor}`;
-			const version = versions[key] ?? defaultVersion;
+			const pkgPath = path.join(
+				repoRoot,
+				`packages/php-wasm/${platform}-builds/${major}-${minor}/package.json`
+			);
+			if (!fs.existsSync(pkgPath)) return false;
+			const version = JSON.parse(
+				fs.readFileSync(pkgPath, 'utf8')
+			).version;
 			return !version.includes('-pr.');
 		}
 	);
@@ -75,8 +68,8 @@ if (fs.existsSync(triggerFile)) {
 			.map((c) => `  - ${c.platform} PHP ${c.phpVersion}`)
 			.join('\n');
 		console.warn(
-			`\nWARNING: .recompile-request.json exists but wasm-versions.json still points\n` +
-				`to stable versions for the following entries (CI may not have finished yet):\n` +
+			`\nWARNING: .recompile-request.json exists but the following packages\n` +
+				`still have a stable version (CI may not have finished yet):\n` +
 				`${list}\n` +
 				`You are downloading the previous stable binaries — not the recompiled ones.\n` +
 				`Wait for the "Compile PHP WASM" CI job to complete and re-run prepare-wasm.\n`
@@ -88,7 +81,6 @@ let downloaded = 0;
 let skipped = 0;
 
 for (const key of allKeys) {
-	const version = versions[key] ?? defaultVersion;
 	// key format: "{platform}-{major}-{minor}" e.g. "web-8-5"
 	const parts = key.split('-');
 	const platform = parts[0]; // "web" or "node"
@@ -99,6 +91,11 @@ for (const key of allKeys) {
 		repoRoot,
 		`packages/php-wasm/${platform}-builds/${versionDir}`
 	);
+
+	const version = JSON.parse(
+		fs.readFileSync(path.join(buildsDir, 'package.json'), 'utf8')
+	).version;
+
 	const jspiDir = path.join(buildsDir, 'jspi');
 	const asyncifyDir = path.join(buildsDir, 'asyncify');