@mnci/cli 4.12.0 → 4.12.2

package/README.md

@@ -1457,7 +1457,10 @@ extension:
   `engines.vscode` pinned to the installed `@types/vscode` (`vsce` refuses types
   newer than the engine range), `main: ./dist/main.js`, empty `activationEvents`
   (VS Code activates on a contributed command by itself since 1.74) and one sample
-  command. Tagged `type:vscode-extension`.
+  command. Tagged `type:vscode-extension`, and `nx.name` pins the Nx project name
+  to the folder, so `name` (the Marketplace id is `<publisher>.<name>`) and
+  `displayName` are yours to change: packages stay `<project>[-<target>].vsix`
+  and every script, task and launch entry keeps working.
 - **`src/main.ts`**, not `extension.ts`: the slice rules allow only `index` and
   `main` at the root of `src`.
 - **Unit tests run against a stub of `vscode`**, `test/vscode.stub.ts`, mapped by

package/dist/cli.js

@@ -2331,6 +2331,7 @@ const VERSION_TAG = /<Version>([^<]*)<\\/Version>/
  */
 function findCsproj (tree, root) {
   const name = tree.children(root).find((entry) => entry.endsWith('.csproj'))
+
   return name ? posix.join(root, name) : null
 }
 
@@ -3815,6 +3816,9 @@ var VSCODE_SIDECAR_TARGETS = {
   "darwin-x64": "darwin-amd64",
   "darwin-arm64": "darwin-arm64"
 };
+function scriptObjectLiteral(map) {
+  return `{ ${Object.entries(map).map(([key, value]) => `'${key}': '${value}'`).join(", ")} }`;
+}
 var VSCODE_EXTENSION_SCRIPT = String.raw`#!/usr/bin/env node
 // Written by mnci: 'mnci add vscode-extension' creates it and 'mnci upgrade'
 // rewrites it, so local edits do not survive an upgrade.
@@ -3822,15 +3826,15 @@ var VSCODE_EXTENSION_SCRIPT = String.raw`#!/usr/bin/env node
 // Packages and publishes a VS Code extension project. Its Nx targets call it:
 //   node tools/vscode-extension.cjs package apps/<name> [--sidecar <go-app>]
 //   node tools/vscode-extension.cjs publish apps/<name> [--sidecar <go-app>]
-// Without --sidecar: one universal dist/drop/<name>.vsix.
-// With --sidecar: one dist/drop/<name>-<target>.vsix per Marketplace target, each
+// Without --sidecar: one universal dist/drop/<project>.vsix.
+// With --sidecar: one dist/drop/<project>-<target>.vsix per Marketplace target, each
 // carrying that platform's binary from the Go app's build-all in bin/.
 'use strict'
 const { spawnSync } = require('node:child_process')
 const { cpSync, existsSync, mkdirSync, readFileSync, rmSync } = require('node:fs')
-const { dirname, join, resolve } = require('node:path')
+const { basename, dirname, join, resolve } = require('node:path')
 
-const TARGETS = ${JSON.stringify(VSCODE_SIDECAR_TARGETS)}
+const TARGETS = ${scriptObjectLiteral(VSCODE_SIDECAR_TARGETS)}
 const DROP = resolve('dist/drop')
 const VSCE_FLAGS = ['--no-dependencies', '--skip-license', '--allow-missing-repository']
 
@@ -3861,7 +3865,7 @@ function vsixFiles (name, sidecar) {
 function packageExtension (projectRoot, manifest, sidecar) {
   mkdirSync(DROP, { recursive: true })
   if (!sidecar) {
-    run('@vscode/vsce', 'vsce', ['package', ...VSCE_FLAGS, '--out', vsixFiles(manifest.name)[0]], { cwd: projectRoot })
+    run('@vscode/vsce', 'vsce', ['package', ...VSCE_FLAGS, '--out', vsixFiles(project)[0]], { cwd: projectRoot })
 
     return
   }
@@ -3873,7 +3877,7 @@ function packageExtension (projectRoot, manifest, sidecar) {
       if (!existsSync(source)) fail('No ' + platform + ' build of ' + sidecar + ' at ' + source + ' - its build-all target did not write one.')
       rmSync(staging, { recursive: true, force: true })
       cpSync(source, staging, { recursive: true })
-      run('@vscode/vsce', 'vsce', ['package', '--target', target, ...VSCE_FLAGS, '--out', join(DROP, manifest.name + '-' + target + '.vsix')], { cwd: projectRoot })
+      run('@vscode/vsce', 'vsce', ['package', '--target', target, ...VSCE_FLAGS, '--out', join(DROP, project + '-' + target + '.vsix')], { cwd: projectRoot })
     }
   } finally {
     rmSync(staging, { recursive: true, force: true })
@@ -3882,7 +3886,7 @@ function packageExtension (projectRoot, manifest, sidecar) {
 
 function publishExtension (manifest, sidecar, dryRun) {
   if (dryRun) {
-    console.log('Dry run - would publish ' + vsixFiles(manifest.name, sidecar).join(', ') + ' to the Marketplace.')
+    console.log('Dry run - would publish ' + vsixFiles(project, sidecar).join(', ') + ' to the Marketplace.')
 
     return
   }
@@ -3892,7 +3896,7 @@ function publishExtension (manifest, sidecar, dryRun) {
 
     return
   }
-  const files = vsixFiles(manifest.name, sidecar)
+  const files = vsixFiles(project, sidecar)
   const missing = files.filter(file => !existsSync(file))
   if (missing.length > 0) fail('Nothing to publish: ' + missing.join(', ') + ' not found - run the package target first.')
   run('@vscode/vsce', 'vsce', ['publish', '--packagePath', ...files, '--skip-duplicate'])
@@ -3903,9 +3907,12 @@ const sidecarIndex = rest.indexOf('--sidecar')
 const sidecar = sidecarIndex === -1 ? undefined : rest[sidecarIndex + 1]
 if (!projectRoot || !existsSync(join(projectRoot, 'package.json'))) fail('Usage: node tools/vscode-extension.cjs package|publish <project root> [--sidecar <go-app>]')
 const manifest = JSON.parse(readFileSync(join(projectRoot, 'package.json'), 'utf8'))
+// Packages are named after the project folder, never the manifest name, which is
+// free to change (the Marketplace id need not match the folder).
+const project = basename(resolve(projectRoot))
 // nx release --dry-run hands the publish target --dryRun=true and sets NX_DRY_RUN
 // (measured on Nx 23), so a dry run never reaches the Marketplace, token or not.
-const dryRun = rest.some(argument => /^--dry-?run(=true)?$/i.test(argument)) || process.env.NX_DRY_RUN === 'true'
+const dryRun = rest.some(argument => /^--dry-?run(?:=true)?$/i.test(argument)) || process.env.NX_DRY_RUN === 'true'
 if (command === 'package') packageExtension(projectRoot, manifest, sidecar)
 else if (command === 'publish') publishExtension(manifest, sidecar, dryRun)
 else fail('Unknown command ' + command + ' - expected package or publish.')
@@ -4036,7 +4043,7 @@ function reshapeManifest(projectRoot, name, publisher, typesVersion) {
       main: "./dist/main.js",
       activationEvents: [],
       contributes: { commands: [{ command: `${name}.hello`, title: `${name}: Hello` }] },
-      nx: { ...nx, tags: [.../* @__PURE__ */ new Set([...nx.tags ?? [], VSCODE_EXTENSION_TAG])], targets }
+      nx: { ...nx, name, tags: [.../* @__PURE__ */ new Set([...nx.tags ?? [], VSCODE_EXTENSION_TAG])], targets }
     })
   );
 }
@@ -4128,6 +4135,29 @@ function refreshVscodeExtensionScript(workspaceRoot) {
   writeFileEnsured(path, VSCODE_EXTENSION_SCRIPT);
   return true;
 }
+function pinVscodeExtensionProjectNames(workspaceRoot) {
+  const apps = (0, import_node_path15.join)(workspaceRoot, "apps");
+  let entries;
+  try {
+    entries = (0, import_node_fs11.readdirSync)(apps);
+  } catch {
+    return [];
+  }
+  const updated = [];
+  for (const entry of entries) {
+    const manifestPath = (0, import_node_path15.join)(apps, entry, "package.json");
+    if (!fileExists(manifestPath)) {
+      continue;
+    }
+    const manifest = readJson(manifestPath);
+    if (!manifest.nx?.tags?.includes(VSCODE_EXTENSION_TAG) || manifest.nx.name !== void 0 || manifest.name === void 0) {
+      continue;
+    }
+    writeFileEnsured(manifestPath, toJson({ ...manifest, nx: { ...manifest.nx, name: manifest.name } }));
+    updated.push(`apps/${entry}/package.json`);
+  }
+  return updated;
+}
 function addVscodeExtension(workspaceRoot, name, stack, options = {}) {
   const { sidecar } = options;
   if (sidecar !== void 0 && !fileExists((0, import_node_path15.join)(workspaceRoot, "apps", sidecar, "project.json"))) {
@@ -6105,6 +6135,13 @@ function runUpgrade(workspaceRoot, options) {
       logger.detail(`updated ${path}`);
     }
   }
+  const pinnedExtensions = pinVscodeExtensionProjectNames(workspaceRoot);
+  if (pinnedExtensions.length > 0) {
+    logger.step("Pinning the Nx project name of VS Code extensions (nx.name)");
+    for (const path of pinnedExtensions) {
+      logger.detail(`updated ${path}`);
+    }
+  }
   if (refreshVscodeExtensionScript(workspaceRoot)) {
     logger.step("Updating the VS Code extension packaging script");
     logger.detail(`updated ${VSCODE_EXTENSION_SCRIPT_PATH}`);