@mnci/cli 4.21.0 → 4.23.0

package/README.md

@@ -204,7 +204,7 @@ value always wins.
 swc's `transform()` without `sourceMaps`, so swc returns no map, the rollup
 chain breaks, and the map comes out valid-looking and **empty** — `sources: []`.
 Measured on a real package: swc gave 0 sources, babel gave 9. Revert the swap
-once Nx passes `sourceMaps` through; ROADMAP 7d has the one-line upstream fix.
+once Nx passes `sourceMaps` through; issue #308 has the one-line upstream fix.
 
 Re-measured against the exact toolchain `mnci new` pins today (Nx 23.2.0,
 `@swc/core` 1.15.8): `@nx/rollup`'s swc plugin still does **not** pass
@@ -1335,12 +1335,12 @@ already use:
 - **`node-function-app` overlay**: `@azure/functions` is installed for real
   (a plain `@nx/node:application` app has no Azure dependency by default,
   unlike a plugin-generated one), an HTTP-triggered `app.http(...)` sample
-  (v4 programming model) is written under `src/functions/`, `host.json` is
+  (v4 programming model) is written as a `src/hello/` slice (`hello.handler.ts` plus a pure `greeting.algorithm.ts` and its spec, behind an `index.ts`), `host.json` is
   added, and the manifest is repaired — `main: 'main.js'` (the dist shim) and
   `@azure/functions` added to `dependencies` for Azure's deploy-time install
   to find.
 - **Convention** (both kinds): `src/main.ts` is the esbuild entry — add one
-  import per function file you create under `src/functions/`, or it won't be
+  import per function slice you create under `src/` (through its `index.ts`), or it won't be
   reachable (and thus won't be transpiled into `dist`).
 
 ## How React apps work (one build per environment)

package/dist/cli.js

@@ -2673,27 +2673,60 @@ function projectTask(name, kind) {
   return kind === "start" ? { ...base, isBackground: true } : { ...base, group: kind };
 }
 function renameScaffoldPlaceholder(projectRoot, name) {
+  reshapeScaffoldSlice(projectRoot, name, "ts", "use-case");
+}
+function reshapeReactScaffold(projectRoot, name) {
+  reshapeScaffoldSlice(projectRoot, name, "tsx", "component");
+}
+function reshapeReactAppScaffold(projectRoot) {
+  const appDir = (0, import_node_path5.join)(projectRoot, "src", "app");
+  if (!(0, import_node_fs5.existsSync)((0, import_node_path5.join)(appDir, "app.tsx"))) {
+    return;
+  }
+  for (const [from, to] of [
+    ["app.tsx", "app.component.tsx"],
+    ["app.spec.tsx", "app.component.spec.tsx"],
+    ["nx-welcome.tsx", "nx-welcome.component.tsx"]
+  ]) {
+    if ((0, import_node_fs5.existsSync)((0, import_node_path5.join)(appDir, from))) {
+      (0, import_node_fs5.renameSync)((0, import_node_path5.join)(appDir, from), (0, import_node_path5.join)(appDir, to));
+    }
+  }
+  const rewrite = (file, from, to) => {
+    if ((0, import_node_fs5.existsSync)(file)) {
+      writeFileEnsured(file, repointSpecifier((0, import_node_fs5.readFileSync)(file, "utf8"), from, to));
+    }
+  };
+  rewrite((0, import_node_path5.join)(appDir, "app.component.tsx"), "./nx-welcome", "./nx-welcome.component");
+  rewrite((0, import_node_path5.join)(appDir, "app.component.spec.tsx"), "./app", "./app.component");
+  rewrite((0, import_node_path5.join)(projectRoot, "src", "main.tsx"), "./app/app", "./app");
+  writeFileEnsured(
+    (0, import_node_path5.join)(appDir, "index.ts"),
+    "export * from './app.component'\nexport { default } from './app.component'\n"
+  );
+}
+function reshapeScaffoldSlice(projectRoot, name, extension, role) {
   const sourceDir = (0, import_node_path5.join)(projectRoot, "src");
-  const placeholder = (0, import_node_path5.join)(sourceDir, "lib", `${name}.ts`);
-  if (!(0, import_node_fs5.existsSync)(placeholder)) {
+  const libDir = (0, import_node_path5.join)(sourceDir, "lib");
+  if (!(0, import_node_fs5.existsSync)((0, import_node_path5.join)(libDir, `${name}.${extension}`))) {
     return;
   }
   const sliceDir = (0, import_node_path5.join)(sourceDir, name);
   (0, import_node_fs5.mkdirSync)(sliceDir, { recursive: true });
-  (0, import_node_fs5.renameSync)(placeholder, (0, import_node_path5.join)(sliceDir, `${name}.use-case.ts`));
-  const spec = (0, import_node_path5.join)(sourceDir, "lib", `${name}.spec.ts`);
-  if ((0, import_node_fs5.existsSync)(spec)) {
-    const renamed = (0, import_node_path5.join)(sliceDir, `${name}.use-case.spec.ts`);
-    (0, import_node_fs5.renameSync)(spec, renamed);
-    writeFileEnsured(
-      renamed,
-      // The spec still sits beside the implementation, so only its role suffix changes.
-      repointSpecifier((0, import_node_fs5.readFileSync)(renamed, "utf8"), `./${name}`, `./${name}.use-case`)
-    );
+  for (const entry of (0, import_node_fs5.readdirSync)(libDir)) {
+    if (entry === `${name}.${extension}`) {
+      (0, import_node_fs5.renameSync)((0, import_node_path5.join)(libDir, entry), (0, import_node_path5.join)(sliceDir, `${name}.${role}.${extension}`));
+    } else if (entry === `${name}.spec.${extension}`) {
+      const renamed = (0, import_node_path5.join)(sliceDir, `${name}.${role}.spec.${extension}`);
+      (0, import_node_fs5.renameSync)((0, import_node_path5.join)(libDir, entry), renamed);
+      writeFileEnsured(renamed, repointSpecifier((0, import_node_fs5.readFileSync)(renamed, "utf8"), `./${name}`, `./${name}.${role}`));
+    } else {
+      (0, import_node_fs5.renameSync)((0, import_node_path5.join)(libDir, entry), (0, import_node_path5.join)(sliceDir, entry));
+    }
   }
   const barrel = (0, import_node_path5.join)(sourceDir, "index.ts");
   const esm = (0, import_node_fs5.existsSync)(barrel) && (0, import_node_fs5.readFileSync)(barrel, "utf8").includes(`./lib/${name}.js'`);
-  writeFileEnsured((0, import_node_path5.join)(sliceDir, "index.ts"), `export * from './${name}.use-case${esm ? ".js" : ""}'
+  writeFileEnsured((0, import_node_path5.join)(sliceDir, "index.ts"), `export * from './${name}.${role}${esm ? ".js" : ""}'
 `);
   if ((0, import_node_fs5.existsSync)(barrel)) {
     writeFileEnsured(
@@ -2701,10 +2734,14 @@ function renameScaffoldPlaceholder(projectRoot, name) {
       (0, import_node_fs5.readFileSync)(barrel, "utf8").replaceAll(`./lib/${name}.js'`, () => `./${name}/index.js'`).replaceAll(`./lib/${name}'`, () => `./${name}'`)
     );
   }
-  (0, import_node_fs5.rmSync)((0, import_node_path5.join)(sourceDir, "lib"), { recursive: true, force: true });
+  (0, import_node_fs5.rmSync)(libDir, { recursive: true, force: true });
 }
 function repointSpecifier(source, from, to) {
-  return source.replaceAll(`${from}'`, () => `${to}'`).replaceAll(`${from}.js'`, () => `${to}.js'`);
+  let result = source;
+  for (const quote of ["'", '"']) {
+    result = result.replaceAll(`${from}${quote}`, () => `${to}${quote}`).replaceAll(`${from}.js${quote}`, () => `${to}.js${quote}`);
+  }
+  return result;
 }
 function ensureNxPeerOverrides(workspaceRoot) {
   const manifestPath = (0, import_node_path5.join)(workspaceRoot, "package.json");
@@ -3967,8 +4004,8 @@ function ensureAzureFunctionsPackage(workspaceRoot) {
   }
 }
 var NODE_FUNCTION_APP_MAIN = `// esbuild only includes what is reachable from here, so add one import per
-// function file you create under src/functions/.
-import './functions/hello'
+// function slice you create under src/ (through its index).
+import './hello'
 `;
 var NODE_FUNCTION_APP_HOST_JSON = `{
   "version": "2.0",
@@ -3980,7 +4017,7 @@ var NODE_FUNCTION_APP_HOST_JSON = `{
 `;
 var NODE_FUNCTION_APP_HELLO = `import { app } from '@azure/functions'
 import type { HttpRequest, HttpResponseInit } from '@azure/functions'
-import { buildGreeting } from './greeting'
+import { buildGreeting } from './greeting.algorithm'
 
 async function hello(request: HttpRequest): Promise<HttpResponseInit> {
   const name = request.query.get('name') ?? 'world'
@@ -3994,11 +4031,13 @@ app.http('hello', {
   handler: hello,
 })
 `;
+var NODE_FUNCTION_APP_HELLO_BARREL = `export * from './hello.handler'
+`;
 var NODE_FUNCTION_APP_GREETING = `export function buildGreeting (name: string): string {
   return 'Hello, ' + name + '!'
 }
 `;
-var NODE_FUNCTION_APP_GREETING_SPEC = `import { buildGreeting } from './greeting'
+var NODE_FUNCTION_APP_GREETING_SPEC = `import { buildGreeting } from './greeting.algorithm'
 
 describe('buildGreeting', () => {
   it('greets a name', () => {
@@ -4055,15 +4094,10 @@ function addNodeFunctionApp(workspaceRoot, name, stack) {
   ensureAzureFunctionsPackage(workspaceRoot);
   const nodeFunctionAppRoot = (0, import_node_path12.join)(workspaceRoot, "apps", name);
   writeFileEnsured((0, import_node_path12.join)(nodeFunctionAppRoot, "src/main.ts"), NODE_FUNCTION_APP_MAIN);
-  writeFileEnsured((0, import_node_path12.join)(nodeFunctionAppRoot, "src/functions/hello.ts"), NODE_FUNCTION_APP_HELLO);
-  writeFileEnsured(
-    (0, import_node_path12.join)(nodeFunctionAppRoot, "src/functions/greeting.ts"),
-    NODE_FUNCTION_APP_GREETING
-  );
-  writeFileEnsured(
-    (0, import_node_path12.join)(nodeFunctionAppRoot, "src/functions/greeting.spec.ts"),
-    NODE_FUNCTION_APP_GREETING_SPEC
-  );
+  writeFileEnsured((0, import_node_path12.join)(nodeFunctionAppRoot, "src/hello/hello.handler.ts"), NODE_FUNCTION_APP_HELLO);
+  writeFileEnsured((0, import_node_path12.join)(nodeFunctionAppRoot, "src/hello/greeting.algorithm.ts"), NODE_FUNCTION_APP_GREETING);
+  writeFileEnsured((0, import_node_path12.join)(nodeFunctionAppRoot, "src/hello/greeting.algorithm.spec.ts"), NODE_FUNCTION_APP_GREETING_SPEC);
+  writeFileEnsured((0, import_node_path12.join)(nodeFunctionAppRoot, "src/hello/index.ts"), NODE_FUNCTION_APP_HELLO_BARREL);
   writeFileEnsured((0, import_node_path12.join)(nodeFunctionAppRoot, "host.json"), NODE_FUNCTION_APP_HOST_JSON);
   repairNodeFunctionAppManifest(nodeFunctionAppRoot, workspaceRoot);
   ensureAdmZip(workspaceRoot);
@@ -4136,7 +4170,7 @@ function sourceMapCapableCompiler(indent) {
   return [
     `${indent}// Swapped from swc by MoNecromanCI. @nx/rollup runs swc without`,
     `${indent}// sourceMaps, so it returns no map and the bundle's map comes out empty -`,
-    `${indent}// valid-looking, and useless for debugging. See ROADMAP.`,
+    `${indent}// valid-looking, and useless for debugging. See issue #308.`,
     `${indent}compiler: 'babel',`
   ].join("\n");
 }
@@ -4732,6 +4766,7 @@ function addReactApp(workspaceRoot, name, stack) {
   }
   allowEnvFiles(workspaceRoot);
   addNxTargets((0, import_node_path18.join)(reactAppRoot, "package.json"), reactAppTargets(name));
+  reshapeReactAppScaffold(reactAppRoot);
   removeGeneratedEslintConfig(workspaceRoot, `apps/${name}`);
   registerProjectCommands(workspaceRoot, name, { build: true, start: `nx run ${name}:serve` });
 }
@@ -4764,6 +4799,7 @@ async function addReactLib(workspaceRoot, name, options, kindProvided, stack) {
       repairPublishableManifest(publishableManifest);
       repairDeclarationSpecifiers(projectRoot);
       writeProjectReadme(projectRoot, `${scope}/${name}`, stack.testRunner);
+      reshapeReactScaffold(projectRoot, name);
       removeGeneratedEslintConfig(workspaceRoot, `packages/${name}`);
       removeLocalRegistryScaffolding(workspaceRoot);
       registerProjectCommands(workspaceRoot, name, { build: true });