release: fix version updating (#114)

bytecodealliance · Aug 20, 2024 · bbac06b · bbac06b
1 parent df151ca
commit bbac06b
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 15 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -124,7 +124,7 @@ jobs:
       - name: Update npm packages to latest version
         if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v')
         working-directory: ./npm/wizer
-        run: npm install && npm version "${{ steps.tagname.outputs.val }}" --allow-same-version
+        run: npm install && node update.js "${{ steps.tagname.outputs.val }}"
       - name: Setup npm auth
         run: sudo npm config --global set '//registry.npmjs.org/:_authToken'='${NODE_AUTH_TOKEN}'
       - name: Publish npm packages

diff --git a/npm/wizer/package.json b/npm/wizer/package.json
@@ -1,11 +1,9 @@
 {
   "name": "@bytecodealliance/wizer",
-  "version": "6.0.0",
+  "version": "VERSION",
   "description": "The WebAssembly Pre-Initializer",
+  "private": true,
   "type": "module",
-  "scripts": {
-    "version": "node ./update.js $npm_package_version"
-  },
   "devDependencies": {
     "decompress": "^4.2.1",
     "decompress-unzip": "^4.0.1",
@@ -20,12 +18,12 @@
     "wizer": "./wizer.js"
   },
   "optionalDependencies": {
-    "@bytecodealliance/wizer-darwin-arm64": "6.0.0",
-    "@bytecodealliance/wizer-darwin-x64": "6.0.0",
-    "@bytecodealliance/wizer-linux-x64": "6.0.0",
-    "@bytecodealliance/wizer-linux-arm64": "6.0.0",
-    "@bytecodealliance/wizer-linux-s390x": "6.0.0",
-    "@bytecodealliance/wizer-win32-x64": "6.0.0"
+    "@bytecodealliance/wizer-darwin-arm64": "VERSION",
+    "@bytecodealliance/wizer-darwin-x64": "VERSION",
+    "@bytecodealliance/wizer-linux-x64": "VERSION",
+    "@bytecodealliance/wizer-linux-arm64": "VERSION",
+    "@bytecodealliance/wizer-linux-s390x": "VERSION",
+    "@bytecodealliance/wizer-win32-x64": "VERSION"
   },
   "license": "Apache-2.0",
   "repository": {
@@ -36,4 +34,4 @@
     "url": "https://github.com/bytecodealliance/wizer/issues"
   },
   "homepage": "https://github.com/bytecodealliance/wizer#readme"
-}
+}
diff --git a/npm/wizer/update.js b/npm/wizer/update.js
@@ -2,14 +2,22 @@
 
 import { fileURLToPath } from 'node:url';
 import { dirname, join, parse } from 'node:path';
-import { mkdir, writeFile } from "node:fs/promises";
+import { mkdir, writeFile, readFile } from "node:fs/promises";
 import decompress from 'decompress';
 import decompressUnzip from 'decompress-unzip';
 import decompressTar from 'decompress-tar';
 import plzma from 'plzmasdk';
 const __dirname = dirname(fileURLToPath(import.meta.url));
-const input = process.argv.slice(2).at(0);
-const tag = input ? `v${input}` : 'dev';
+const version = process.argv.slice(2).at(0).trim();
+const tag = version ? `v${version}` : 'dev';
+
+const pjson = JSON.parse(await readFile('package.json'));
+pjson.version = version;
+delete pjson.private;
+for (const dep of Object.keys(pjson.optionalDependencies)) {
+    pjson.optionalDependencies[dep] = version;
+}
+await writeFile('package.json', JSON.stringify(pjson, null, 2));
 
 let packages = {
     'wizer-darwin-arm64': {