@nx/workspace 18.1.0-canary.20240221-abc0cf8 → 18.1.0-canary.20240223-21e7648

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/workspace",
-  "version": "18.1.0-canary.20240221-abc0cf8",
+  "version": "18.1.0-canary.20240223-21e7648",
   "private": false,
   "description": "The Workspace plugin contains executors and generators that are useful for any Nx workspace. It should be present in every Nx workspace and other plugins build on it.",
   "repository": {
@@ -61,13 +61,13 @@
     }
   },
   "dependencies": {
-    "@nx/devkit": "18.1.0-canary.20240221-abc0cf8",
+    "@nx/devkit": "18.1.0-canary.20240223-21e7648",
     "chalk": "^4.1.0",
     "enquirer": "~2.3.6",
     "tslib": "^2.3.0",
     "yargs-parser": "21.1.1",
-    "nx": "18.1.0-canary.20240221-abc0cf8",
-    "@nrwl/workspace": "18.1.0-canary.20240221-abc0cf8"
+    "nx": "18.1.0-canary.20240223-21e7648",
+    "@nrwl/workspace": "18.1.0-canary.20240223-21e7648"
   },
   "publishConfig": {
     "access": "public"

package/src/generators/ci-workflow/ci-workflow.js

@@ -46,16 +46,15 @@ function normalizeOptions(options, tree) {
     };
 }
 function defaultBranchNeedsOriginPrefix(nxJson) {
-    return !nxJson.affected?.defaultBase?.startsWith('origin/');
+    const base = nxJson.defaultBase ?? nxJson.affected?.defaultBase;
+    return !base?.startsWith('origin/');
 }
 function appendOriginPrefix(nxJson) {
-    return {
-        ...nxJson,
-        affected: {
-            ...(nxJson.affected ?? {}),
-            defaultBase: nxJson.affected?.defaultBase
-                ? `origin/${nxJson.affected.defaultBase}`
-                : 'origin/main',
-        },
-    };
+    if (nxJson?.affected?.defaultBase) {
+        nxJson.affected.defaultBase = `origin/${nxJson.affected.defaultBase}`;
+    }
+    if (nxJson.defaultBase || !nxJson.affected) {
+        nxJson.defaultBase = `origin/${nxJson.defaultBase ?? (0, default_base_1.deduceDefaultBase)()}`;
+    }
+    return nxJson;
 }

package/src/generators/new/generate-preset.js

@@ -67,6 +67,7 @@ function generatePreset(host, opts) {
                 ? `--e2eTestRunner=${opts.e2eTestRunner}`
                 : null,
             opts.ssr ? `--ssr` : null,
+            opts.prefix !== undefined ? `--prefix=${opts.prefix}` : null,
         ].filter((e) => !!e);
     }
 }

package/src/generators/new/generate-workspace-files.js

@@ -45,9 +45,7 @@ function setPresetProperty(tree, options) {
 function createNxJson(tree, { directory, defaultBase, preset }) {
     const nxJson = {
         $schema: './node_modules/nx/schemas/nx-schema.json',
-        affected: {
-            defaultBase,
-        },
+        defaultBase,
         targetDefaults: process.env.NX_ADD_PLUGINS === 'false'
             ? {
                 build: {
@@ -61,7 +59,7 @@ function createNxJson(tree, { directory, defaultBase, preset }) {
             : undefined,
     };
     if (defaultBase === 'main') {
-        delete nxJson.affected;
+        delete nxJson.defaultBase;
     }
     if (preset !== presets_1.Preset.NPM) {
         nxJson.namedInputs = {

package/src/generators/new/new.d.ts

@@ -20,6 +20,7 @@ interface Schema {
     packageManager?: PackageManager;
     e2eTestRunner?: 'cypress' | 'playwright' | 'detox' | 'jest' | 'none';
     ssr?: boolean;
+    prefix?: string;
 }
 export interface NormalizedSchema extends Schema {
     presetVersion?: string;

package/src/generators/new/schema.json

@@ -82,6 +82,10 @@
       "description": "Enable Server-Side Rendering (SSR) and Static Site Generation (SSG/Prerendering) for the Angular application.",
       "type": "boolean",
       "default": false
+    },
+    "prefix": {
+      "description": "The prefix to use for Angular component and directive selectors.",
+      "type": "string"
     }
   },
   "additionalProperties": true

package/src/generators/preset/preset.js

@@ -33,6 +33,7 @@ async function createPreset(tree, options) {
             e2eTestRunner: options.e2eTestRunner ?? 'cypress',
             bundler: options.bundler,
             ssr: options.ssr,
+            prefix: options.prefix,
         });
     }
     else if (options.preset === presets_1.Preset.AngularStandalone) {
@@ -49,6 +50,7 @@ async function createPreset(tree, options) {
             e2eTestRunner: options.e2eTestRunner ?? 'cypress',
             bundler: options.bundler,
             ssr: options.ssr,
+            prefix: options.prefix,
         });
     }
     else if (options.preset === presets_1.Preset.ReactMonorepo) {

package/src/generators/preset/schema.d.ts

@@ -18,4 +18,5 @@ export interface Schema {
   e2eTestRunner?: 'cypress' | 'playwright' | 'jest' | 'detox' | 'none';
   js?: boolean;
   ssr?: boolean;
+  prefix?: string;
 }

package/src/generators/preset/schema.json

@@ -99,6 +99,10 @@
       "description": "Enable Server-Side Rendering (SSR) and Static Site Generation (SSG/Prerendering) for the Angular application.",
       "type": "boolean",
       "default": false
+    },
+    "prefix": {
+      "description": "The prefix to use for Angular component and directive selectors.",
+      "type": "string"
     }
   },
   "required": ["preset", "name"]