Merge pull request #106 from zowe-actions/fix/vsce-publish-prerelease

Support prerelease flag for publishing VSIXs
zowe-actions · Aug 18, 2023 · 3c5ec88 · 3c5ec88
2 parents 6796f97 + 1ab8df7
commit 3c5ec88
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 4 deletions.
diff --git a/.github/workflows/update-tag.yml b/.github/workflows/update-tag.yml
@@ -0,0 +1,11 @@
+name: Update latest tag
+
+on:
+  push:
+    tags: ["v*"]
+
+jobs:
+  update-tag:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: nowactions/update-majorver@main
diff --git a/dist/run-script.js b/dist/run-script.js
diff --git a/dist/vsce.js b/dist/vsce.js
diff --git a/packages/run-script/scripts/npmUpdate.ts b/packages/run-script/scripts/npmUpdate.ts
@@ -46,8 +46,8 @@ function getDependencies(context: IContext, branch: IProtectedBranchWithDeps, de
 
 async function updateDependency(context: IContext, pkgName: string, pkgTag: string, dev: boolean): Promise<void> {
     context.logger.debug(`Updating ${dev ? "devD" : "d"}ependency for: ${pkgName}@${pkgTag}`);
-    const lockfile = JSON.parse(fs.readFileSync(lockfilePath, "utf-8"));
-    const currentVersion = lockfile.dependencies[pkgName].version;
+    const cmdOutput = (await exec.getExecOutput("npm", ["list", pkgName, "--json", "--depth", "0"])).stdout;
+    const currentVersion = JSON.parse(cmdOutput).dependencies[pkgName].version;
 
     if (resolutions[pkgName] == null) {
         context.logger.debug(`Gathering version information for: ${pkgName}@${pkgTag}`);

diff --git a/packages/vsce/src/utils.ts b/packages/vsce/src/utils.ts
@@ -31,6 +31,9 @@ export async function ovsxPublish(context: IContext, vsixPath?: string): Promise
     } else if (fs.existsSync(path.join(context.rootDir, "yarn.lock"))) {
         cmdArgs.push("--yarn");
     }
+    if (context.version.prerelease != null) {
+        cmdArgs.push("--pre-release");
+    }
     await utils.dryRunTask(context, `npx ${cmdArgs.join(" ")}`, async () => {
         await exec.exec("npx", cmdArgs);
     });
@@ -57,6 +60,9 @@ export async function vscePublish(context: IContext, vsixPath?: string): Promise
     } else if (fs.existsSync(path.join(context.rootDir, "yarn.lock"))) {
         cmdArgs.push("--yarn");
     }
+    if (context.version.prerelease != null) {
+        cmdArgs.push("--pre-release");
+    }
     await utils.dryRunTask(context, `npx ${cmdArgs.join(" ")}`, async () => {
         await exec.exec("npx", cmdArgs);
     });