@nx/angular 17.0.3 → 17.0.4

package/src/generators/setup-ssr/lib/update-project-config.js

@@ -1,9 +1,39 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.updateProjectConfig = void 0;
+exports.updateProjectConfigForBrowserBuilder = exports.updateProjectConfigForApplicationBuilder = void 0;
 const devkit_1 = require("@nx/devkit");
-function updateProjectConfig(tree, schema) {
-    let projectConfig = (0, devkit_1.readProjectConfiguration)(tree, schema.project);
+const version_utils_1 = require("../../utils/version-utils");
+const constants_1 = require("./constants");
+function updateProjectConfigForApplicationBuilder(tree, options) {
+    const project = (0, devkit_1.readProjectConfiguration)(tree, options.project);
+    const buildTarget = project.targets.build;
+    let outputPath = buildTarget.options?.outputPath;
+    if (outputPath &&
+        typeof outputPath !== 'string' &&
+        outputPath.browser === '') {
+        const base = outputPath.base;
+        devkit_1.logger.warn(`The output location of the browser build has been updated from "${base}" to "${(0, devkit_1.joinPathFragments)(base, constants_1.DEFAULT_BROWSER_DIR)}".
+          You might need to adjust your deployment pipeline.`);
+        if ((outputPath.media && outputPath.media !== constants_1.DEFAULT_MEDIA_DIR) ||
+            (outputPath.server && outputPath.server !== constants_1.DEFAULT_SERVER_DIR)) {
+            delete outputPath.browser;
+        }
+        else {
+            outputPath = outputPath.base;
+        }
+    }
+    buildTarget.options ??= {};
+    buildTarget.options.outputPath = outputPath;
+    buildTarget.options.server = (0, devkit_1.joinPathFragments)(project.sourceRoot ?? (0, devkit_1.joinPathFragments)(project.root, 'src'), options.main);
+    buildTarget.options.prerender = true;
+    buildTarget.options.ssr = {
+        entry: (0, devkit_1.joinPathFragments)(project.root, options.serverFileName),
+    };
+    (0, devkit_1.updateProjectConfiguration)(tree, options.project, project);
+}
+exports.updateProjectConfigForApplicationBuilder = updateProjectConfigForApplicationBuilder;
+function updateProjectConfigForBrowserBuilder(tree, schema) {
+    const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, schema.project);
     const buildTarget = projectConfig.targets.build;
     const baseOutputPath = buildTarget.options.outputPath;
     buildTarget.options.outputPath = (0, devkit_1.joinPathFragments)(baseOutputPath, 'browser');
@@ -16,7 +46,9 @@ function updateProjectConfig(tree, schema) {
     }
     projectConfig.targets.server = {
         dependsOn: ['build'],
-        executor: '@angular-devkit/build-angular:server',
+        executor: buildTarget.executor.startsWith('@angular-devkit/build-angular:')
+            ? '@angular-devkit/build-angular:server'
+            : '@nx/angular:webpack-server',
         options: {
             outputPath: (0, devkit_1.joinPathFragments)(baseOutputPath, 'server'),
             main: (0, devkit_1.joinPathFragments)(projectConfig.root, schema.serverFileName),
@@ -26,8 +58,11 @@ function updateProjectConfig(tree, schema) {
         configurations,
         defaultConfiguration: 'production',
     };
+    const { major: angularMajorVersion } = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
     projectConfig.targets['serve-ssr'] = {
-        executor: '@nguniversal/builders:ssr-dev-server',
+        executor: angularMajorVersion >= 17
+            ? '@angular-devkit/build-angular:ssr-dev-server'
+            : '@nguniversal/builders:ssr-dev-server',
         configurations: {
             development: {
                 browserTarget: `${schema.project}:build:development`,
@@ -41,7 +76,9 @@ function updateProjectConfig(tree, schema) {
         defaultConfiguration: 'development',
     };
     projectConfig.targets.prerender = {
-        executor: '@nguniversal/builders:prerender',
+        executor: angularMajorVersion >= 17
+            ? '@angular-devkit/build-angular:prerender'
+            : '@nguniversal/builders:prerender',
         options: {
             routes: ['/'],
         },
@@ -59,20 +96,16 @@ function updateProjectConfig(tree, schema) {
     };
     (0, devkit_1.updateProjectConfiguration)(tree, schema.project, projectConfig);
     const nxJson = (0, devkit_1.readNxJson)(tree);
-    if (nxJson.tasksRunnerOptions?.default &&
+    if (nxJson.tasksRunnerOptions?.default?.options?.cacheableOperations &&
         !nxJson.tasksRunnerOptions.default.options.cacheableOperations.includes('server')) {
-        nxJson.tasksRunnerOptions.default.options.cacheableOperations = [
-            ...nxJson.tasksRunnerOptions.default.options.cacheableOperations,
-            'server',
-        ];
-        (0, devkit_1.updateNxJson)(tree, nxJson);
+        nxJson.tasksRunnerOptions.default.options.cacheableOperations.push('server');
     }
     nxJson.targetDefaults ??= {};
     nxJson.targetDefaults.server ??= {};
     nxJson.targetDefaults.server.cache ??= true;
     (0, devkit_1.updateNxJson)(tree, nxJson);
 }
-exports.updateProjectConfig = updateProjectConfig;
+exports.updateProjectConfigForBrowserBuilder = updateProjectConfigForBrowserBuilder;
 function getServerOptions(options = {}) {
     return {
         buildOptimizer: options?.buildOptimizer,

package/src/generators/setup-ssr/lib/validate-options.js

@@ -6,11 +6,24 @@ const validations_1 = require("../../utils/validations");
 const version_utils_1 = require("../../utils/version-utils");
 const semver_1 = require("semver");
 function validateOptions(tree, options) {
-    (0, validations_1.validateProject)(tree, options.project);
-    (0, validations_1.validateStandaloneOption)(tree, options.standalone);
+    validateProject(tree, options.project);
+    validateBuildTarget(tree, options.project);
     validateHydrationOption(tree, options.hydration);
 }
 exports.validateOptions = validateOptions;
+function validateProject(tree, project) {
+    (0, validations_1.validateProject)(tree, project);
+    const { projectType } = (0, devkit_1.readProjectConfiguration)(tree, project);
+    if (projectType !== 'application') {
+        throw new Error(`The "${project}" project is not an application. Only application projects are supported by the "setup-ssr" generator.`);
+    }
+}
+function validateBuildTarget(tree, project) {
+    const { targets } = (0, devkit_1.readProjectConfiguration)(tree, project);
+    if (!targets?.build) {
+        throw new Error(`The "${project}" project does not have a "build" target. Please add a "build" target.`);
+    }
+}
 function validateHydrationOption(tree, hydration) {
     if (!hydration) {
         return;

package/src/generators/setup-ssr/schema.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/schema",
+  "$schema": "https://json-schema.org/schema",
   "$id": "GeneratorAngularUniversalSetup",
   "cli": "nx",
   "title": "Generate Angular Universal (SSR) setup for an Angular App",
@@ -19,7 +19,7 @@
     "appId": {
       "type": "string",
       "format": "html-selector",
-      "description": "The `appId` to use with `withServerTransition`. _Note: This is only used in Angular versions <16.0.0. It's deprecated since Angular 16._",
+      "description": "The `appId` to use with `withServerTransition`. _Note: This is only used in Angular versions <16.0.0. It's deprecated since Angular 16 and not supported since Angular 17._",
       "default": "serverApp"
     },
     "main": {
@@ -51,11 +51,11 @@
     },
     "standalone": {
       "type": "boolean",
-      "description": "Use Standalone Components to bootstrap SSR. _Note: This is only supported in Angular versions >= 14.1.0_."
+      "description": "Use Standalone Components to bootstrap SSR."
     },
     "hydration": {
       "type": "boolean",
-      "description": "Set up Hydration for the SSR application. _Note: This is only supported in Angular versions >= 16.0.0_."
+      "description": "Set up Hydration for the SSR application. It defaults to `true` for Angular versions >= 17.0.0. Otherwise, it defaults to `false`. _Note: This is only supported in Angular versions >= 16.0.0_."
     },
     "skipFormat": {
       "type": "boolean",

package/src/generators/setup-ssr/setup-ssr.js

@@ -7,24 +7,30 @@ const lib_1 = require("./lib");
 async function setupSsr(tree, schema) {
     (0, lib_1.validateOptions)(tree, schema);
     const options = (0, lib_1.normalizeOptions)(tree, schema);
-    (0, lib_1.updateProjectConfig)(tree, options);
-    (0, lib_1.generateSSRFiles)(tree, options);
+    const { targets } = (0, devkit_1.readProjectConfiguration)(tree, options.project);
+    const isUsingApplicationBuilder = targets.build.executor === '@angular-devkit/build-angular:application' ||
+        targets.build.executor === '@nx/angular:application';
+    (0, lib_1.addDependencies)(tree, isUsingApplicationBuilder);
+    (0, lib_1.generateSSRFiles)(tree, options, isUsingApplicationBuilder);
     if (!options.standalone) {
         (0, lib_1.updateAppModule)(tree, options);
     }
     if (options.hydration) {
         (0, lib_1.addHydration)(tree, options);
     }
-    const pkgVersions = (0, version_utils_1.versions)(tree);
-    (0, devkit_1.addDependenciesToPackageJson)(tree, {
-        '@nguniversal/express-engine': (0, version_utils_1.getInstalledPackageVersionInfo)(tree, '@nguniversal/express-engine')
-            ?.version ?? pkgVersions.ngUniversalVersion,
-        '@angular/platform-server': (0, version_utils_1.getInstalledPackageVersionInfo)(tree, '@angular/platform-server')
-            ?.version ?? pkgVersions.angularVersion,
-    }, {
-        '@nguniversal/builders': (0, version_utils_1.getInstalledPackageVersionInfo)(tree, '@nguniversal/builders')
-            ?.version ?? pkgVersions.ngUniversalVersion,
-    });
+    const { major: angularMajorVersion } = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
+    if (angularMajorVersion < 17 || !options.hydration) {
+        (0, lib_1.setRouterInitialNavigation)(tree, options);
+    }
+    if (isUsingApplicationBuilder) {
+        (0, lib_1.updateProjectConfigForApplicationBuilder)(tree, options);
+        (0, lib_1.setServerTsConfigOptionsForApplicationBuilder)(tree, options);
+    }
+    else {
+        (0, lib_1.updateProjectConfigForBrowserBuilder)(tree, options);
+        (0, lib_1.generateTsConfigServerJsonForBrowserBuilder)(tree, options);
+    }
+    (0, lib_1.addServerFile)(tree, options, isUsingApplicationBuilder);
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(tree);
     }

package/src/generators/setup-tailwind/schema.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/schema",
+  "$schema": "https://json-schema.org/schema",
   "$id": "NxAngularTailwindSetupGenerator",
   "cli": "nx",
   "title": "Configures Tailwind CSS for an application or a buildable/publishable library.",

package/src/generators/stories/schema.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/schema",
+  "$schema": "https://json-schema.org/schema",
   "$id": "NxAngularStorybookStoriesGenerator",
   "title": "Create Storybook stories/specs",
   "description": "Creates Storybook stories/specs for all Angular components declared in a project.",

package/src/generators/stories/stories.js

@@ -8,7 +8,7 @@ const component_info_1 = require("../utils/storybook-ast/component-info");
 const entry_point_1 = require("../utils/storybook-ast/entry-point");
 const get_e2e_project_1 = require("./lib/get-e2e-project");
 const module_info_1 = require("../utils/storybook-ast/module-info");
-const minimatch = require("minimatch");
+const minimatch_1 = require("minimatch");
 const versions_1 = require("../../utils/versions");
 async function angularStoriesGenerator(tree, options) {
     const e2eProjectName = options.cypressProject ?? `${options.name}-e2e`;
@@ -23,7 +23,7 @@ async function angularStoriesGenerator(tree, options) {
         devkit_1.logger.info(`There was no e2e project "${e2eProjectName}" found, so cypress specs will not be generated. Pass "--cypressProject" to specify a different e2e project name.`);
     }
     const componentInfos = componentsInfo.filter((f) => !options.ignorePaths?.some((pattern) => {
-        const shouldIgnorePath = minimatch((0, devkit_1.joinPathFragments)(f.moduleFolderPath, f.path, `${f.componentFileName}.ts`), pattern);
+        const shouldIgnorePath = (0, minimatch_1.minimatch)((0, devkit_1.joinPathFragments)(f.moduleFolderPath, f.path, `${f.componentFileName}.ts`), pattern);
         return shouldIgnorePath;
     }));
     for (const info of componentInfos) {

package/src/generators/storybook-configuration/lib/generate-stories.js

@@ -1,14 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateStories = void 0;
-const project_name_1 = require("@nx/cypress/src/utils/project-name");
 const devkit_1 = require("@nx/devkit");
+const versions_1 = require("../../../utils/versions");
 const stories_1 = require("../../stories/stories");
 async function generateStories(tree, options) {
-    const project = (0, devkit_1.readProjectConfiguration)(tree, options.name);
-    const e2eProjectName = (0, project_name_1.getE2eProjectName)(options.name, project.root, options.cypressDirectory);
+    const project = (0, devkit_1.readProjectConfiguration)(tree, options.project);
+    (0, devkit_1.ensurePackage)('@nx/cypress', versions_1.nxVersion);
+    const { getE2eProjectName } = await Promise.resolve().then(() => require('@nx/cypress/src/utils/project-name'));
+    const e2eProjectName = getE2eProjectName(options.project, project.root, options.cypressDirectory);
     await (0, stories_1.angularStoriesGenerator)(tree, {
-        name: options.name,
+        name: options.project,
         generateCypressSpecs: options.configureCypress && options.generateCypressSpecs,
         cypressProject: e2eProjectName,
         ignorePaths: options.ignorePaths,

package/src/generators/storybook-configuration/lib/generate-storybook-configuration.js

@@ -6,7 +6,7 @@ const versions_1 = require("../../../utils/versions");
 async function generateStorybookConfiguration(tree, options) {
     const { configurationGenerator } = (0, devkit_1.ensurePackage)('@nx/storybook', versions_1.nxVersion);
     return await configurationGenerator(tree, {
-        name: options.name,
+        project: options.project,
         uiFramework: '@storybook/angular',
         configureCypress: options.configureCypress,
         linter: options.linter,
@@ -15,6 +15,8 @@ async function generateStorybookConfiguration(tree, options) {
         interactionTests: options.interactionTests,
         configureStaticServe: options.configureStaticServe,
         skipFormat: true,
+        addPlugin: false,
+        addExplicitTargets: true,
     });
 }
 exports.generateStorybookConfiguration = generateStorybookConfiguration;

package/src/generators/storybook-configuration/schema.d.ts

@@ -4,7 +4,7 @@ export interface StorybookConfigurationOptions {
   configureStaticServe?: boolean;
   generateStories: boolean;
   linter: Linter;
-  name: string;
+  project: string;
   tsConfiguration?: boolean;
   skipFormat?: boolean;
   ignorePaths?: string[];

package/src/generators/storybook-configuration/schema.json

@@ -1,14 +1,14 @@
 {
-  "$schema": "http://json-schema.org/schema",
+  "$schema": "https://json-schema.org/schema",
   "$id": "NxAngularStorybookConfigurationGenerator",
   "title": "Adds Storybook configuration to a project.",
   "description": "Adds Storybook configuration to a project to be able to use and create stories.",
   "cli": "nx",
   "type": "object",
   "properties": {
-    "name": {
+    "project": {
       "type": "string",
-      "aliases": ["project", "projectName"],
+      "aliases": ["name", "projectName"],
       "description": "Project for which to generate Storybook configuration.",
       "$default": {
         "$source": "argv",
@@ -29,7 +29,7 @@
     "configureCypress": {
       "type": "boolean",
       "description": "Specifies whether to configure Cypress or not.",
-      "x-deprecated": "Use interactionTests instead. This option will be removed in v18."
+      "x-deprecated": "Use interactionTests instead. This option will be removed in v19."
     },
     "generateStories": {
       "type": "boolean",
@@ -41,7 +41,7 @@
     "generateCypressSpecs": {
       "type": "boolean",
       "description": "Specifies whether to automatically generate test files in the generated Cypress e2e app.",
-      "x-deprecated": "Use interactionTests instead. This option will be removed in v18."
+      "x-deprecated": "Use interactionTests instead. This option will be removed in v19."
     },
     "configureStaticServe": {
       "type": "boolean",
@@ -53,7 +53,7 @@
     "cypressDirectory": {
       "type": "string",
       "description": "A directory where the Cypress project will be placed. Placed at the root by default.",
-      "x-deprecated": "Use interactionTests instead. This option will be removed in v18."
+      "x-deprecated": "Use interactionTests instead. This option will be removed in v19."
     },
     "linter": {
       "description": "The tool to use for running lint checks.",
@@ -93,6 +93,6 @@
     }
   },
   "additionalProperties": false,
-  "required": ["name"],
+  "required": ["project"],
   "examplesFile": "../../../docs/storybook-configuration-examples.md"
 }

package/src/generators/storybook-configuration/storybook-configuration.js

@@ -2,17 +2,18 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.storybookConfigurationGenerator = void 0;
 const devkit_1 = require("@nx/devkit");
+const update_app_editor_tsconfig_excluded_files_1 = require("../utils/update-app-editor-tsconfig-excluded-files");
 const assert_compatible_storybook_version_1 = require("./lib/assert-compatible-storybook-version");
 const generate_stories_1 = require("./lib/generate-stories");
 const generate_storybook_configuration_1 = require("./lib/generate-storybook-configuration");
 const validate_options_1 = require("./lib/validate-options");
-// TODO(katerina): Nx 18 -> remove Cypress
+// TODO(katerina): Nx 19 -> remove Cypress
 async function storybookConfigurationGenerator(tree, options) {
     (0, assert_compatible_storybook_version_1.assertCompatibleStorybookVersion)();
     (0, validate_options_1.validateOptions)(options);
     const storybookGeneratorInstallTask = await (0, generate_storybook_configuration_1.generateStorybookConfiguration)(tree, {
         ...options,
-        interactionTests: options.interactionTests ?? true,
+        interactionTests: options.interactionTests ?? true, // default is true
         tsConfiguration: options.tsConfiguration ?? true, // default is true
     });
     if (options.generateStories) {
@@ -22,12 +23,14 @@ async function storybookConfigurationGenerator(tree, options) {
             skipFormat: true,
         });
     }
+    const project = (0, devkit_1.readProjectConfiguration)(tree, options.project);
+    if (project.projectType === 'application') {
+        (0, update_app_editor_tsconfig_excluded_files_1.updateAppEditorTsConfigExcludedFiles)(tree, project);
+    }
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(tree);
     }
-    return () => {
-        storybookGeneratorInstallTask();
-    };
+    return storybookGeneratorInstallTask;
 }
 exports.storybookConfigurationGenerator = storybookConfigurationGenerator;
 exports.default = storybookConfigurationGenerator;

package/src/generators/utils/add-jest.d.ts

@@ -0,0 +1,8 @@
+import { type Tree } from '@nx/devkit';
+export type AddJestOptions = {
+    name: string;
+    projectRoot: string;
+    skipPackageJson: boolean;
+    strict: boolean;
+};
+export declare function addJest(tree: Tree, options: AddJestOptions): Promise<void>;

package/src/generators/utils/add-jest.js

@@ -0,0 +1,36 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.addJest = void 0;
+const devkit_1 = require("@nx/devkit");
+const versions_1 = require("../../utils/versions");
+const version_utils_1 = require("./version-utils");
+async function addJest(tree, options) {
+    if (!options.skipPackageJson) {
+        process.env.npm_config_legacy_peer_deps ??= 'true';
+        (0, version_utils_1.addDependenciesToPackageJsonIfDontExist)(tree, {}, { 'jest-preset-angular': versions_1.jestPresetAngularVersion });
+    }
+    const { configurationGenerator } = (0, devkit_1.ensurePackage)('@nx/jest', versions_1.nxVersion);
+    await configurationGenerator(tree, {
+        project: options.name,
+        setupFile: 'angular',
+        supportTsx: false,
+        skipSerializers: false,
+        skipPackageJson: options.skipPackageJson,
+        skipFormat: true,
+        addPlugin: false,
+        addExplicitTargets: true,
+    });
+    const setupFile = (0, devkit_1.joinPathFragments)(options.projectRoot, 'src', 'test-setup.ts');
+    if (options.strict && tree.exists(setupFile)) {
+        const contents = tree.read(setupFile, 'utf-8');
+        tree.write(setupFile, `// @ts-expect-error https://thymikee.github.io/jest-preset-angular/docs/getting-started/test-environment
+globalThis.ngJest = {
+testEnvironmentOptions: {
+  errorOnUnknownElements: true,
+  errorOnUnknownProperties: true,
+},
+};
+${contents}`);
+    }
+}
+exports.addJest = addJest;

package/src/generators/utils/add-mf-env-to-inputs.d.ts

@@ -0,0 +1,2 @@
+import { type Tree } from '@nx/devkit';
+export declare function addMfEnvToTargetDefaultInputs(tree: Tree): void;

package/src/generators/utils/add-mf-env-to-inputs.js

@@ -0,0 +1,27 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.addMfEnvToTargetDefaultInputs = void 0;
+const devkit_1 = require("@nx/devkit");
+function addMfEnvToTargetDefaultInputs(tree) {
+    const nxJson = (0, devkit_1.readNxJson)(tree);
+    const webpackExecutor = '@nx/angular:webpack-browser';
+    const mfEnvVar = 'NX_MF_DEV_SERVER_STATIC_REMOTES';
+    nxJson.targetDefaults ??= {};
+    nxJson.targetDefaults[webpackExecutor] ??= {};
+    nxJson.targetDefaults[webpackExecutor].inputs ??= [
+        'production',
+        '^production',
+    ];
+    let mfEnvVarExists = false;
+    for (const input of nxJson.targetDefaults[webpackExecutor].inputs) {
+        if (typeof input === 'object' && input['env'] === mfEnvVar) {
+            mfEnvVarExists = true;
+            break;
+        }
+    }
+    if (!mfEnvVarExists) {
+        nxJson.targetDefaults[webpackExecutor].inputs.push({ env: mfEnvVar });
+        (0, devkit_1.updateNxJson)(tree, nxJson);
+    }
+}
+exports.addMfEnvToTargetDefaultInputs = addMfEnvToTargetDefaultInputs;

package/src/generators/utils/dependencies.js

@@ -7,8 +7,7 @@ function addBuildableLibrariesPostCssDependencies(tree) {
     const pkgVersions = (0, version_utils_1.versions)(tree);
     (0, devkit_1.addDependenciesToPackageJson)(tree, {}, {
         postcss: pkgVersions.postcssVersion,
-        'postcss-import': pkgVersions.postcssImportVersion,
-        'postcss-preset-env': pkgVersions.postcssPresetEnvVersion,
+        autoprefixer: pkgVersions.autoprefixerVersion,
         'postcss-url': pkgVersions.postcssUrlVersion,
     });
 }

package/src/generators/utils/ensure-angular-dependencies.d.ts

@@ -0,0 +1,2 @@
+import type { GeneratorCallback, Tree } from '@nx/devkit';
+export declare function ensureAngularDependencies(tree: Tree): GeneratorCallback;

package/src/generators/utils/ensure-angular-dependencies.js

@@ -0,0 +1,35 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ensureAngularDependencies = void 0;
+const version_utils_1 = require("./version-utils");
+function ensureAngularDependencies(tree) {
+    const pkgVersions = (0, version_utils_1.versions)(tree);
+    const angularVersion = (0, version_utils_1.getInstalledPackageVersion)(tree, '@angular/core') ??
+        pkgVersions.angularVersion;
+    const angularDevkitVersion = (0, version_utils_1.getInstalledPackageVersion)(tree, '@angular-devkit/build-angular') ??
+        pkgVersions.angularDevkitVersion;
+    const rxjsVersion = (0, version_utils_1.getInstalledPackageVersion)(tree, 'rxjs') ?? pkgVersions.rxjsVersion;
+    const tsLibVersion = (0, version_utils_1.getInstalledPackageVersion)(tree, 'tslib') ?? pkgVersions.tsLibVersion;
+    const zoneJsVersion = (0, version_utils_1.getInstalledPackageVersion)(tree, 'zone.js') ?? pkgVersions.zoneJsVersion;
+    return (0, version_utils_1.addDependenciesToPackageJsonIfDontExist)(tree, {
+        '@angular/animations': angularVersion,
+        '@angular/common': angularVersion,
+        '@angular/compiler': angularVersion,
+        '@angular/core': angularVersion,
+        '@angular/forms': angularVersion,
+        '@angular/platform-browser': angularVersion,
+        '@angular/platform-browser-dynamic': angularVersion,
+        '@angular/router': angularVersion,
+        rxjs: rxjsVersion,
+        tslib: tsLibVersion,
+        'zone.js': zoneJsVersion,
+    }, {
+        '@angular/cli': angularDevkitVersion,
+        '@angular/compiler-cli': angularVersion,
+        '@angular/language-service': angularVersion,
+        '@angular-devkit/build-angular': angularDevkitVersion,
+        '@angular-devkit/schematics': angularDevkitVersion,
+        '@schematics/angular': angularDevkitVersion,
+    });
+}
+exports.ensureAngularDependencies = ensureAngularDependencies;

package/src/generators/utils/export-scam.js

@@ -25,12 +25,12 @@ function exportScam(tree, options) {
     const relativePathFromEntryPoint = (0, path_1.getRelativeImportToFile)(entryPointPath, options.filePath);
     const entryPointContent = tree.read(entryPointPath, 'utf-8');
     let updatedEntryPointContent = (0, devkit_1.stripIndents) `${entryPointContent}
-    export * from "${relativePathFromEntryPoint}";`;
+    export * from '${relativePathFromEntryPoint}';`;
     if (!options.inlineScam) {
         const moduleFilePath = (0, devkit_1.joinPathFragments)(options.directory, `${(0, devkit_1.names)(options.name).fileName}.module.ts`);
         const relativePathFromModule = (0, path_1.getRelativeImportToFile)(entryPointPath, moduleFilePath);
         updatedEntryPointContent = (0, devkit_1.stripIndents) `${updatedEntryPointContent}
-        export * from "${relativePathFromModule}";`;
+        export * from '${relativePathFromModule}';`;
     }
     tree.write(entryPointPath, updatedEntryPointContent);
 }

package/src/generators/utils/project.d.ts

@@ -1,3 +1,2 @@
 import type { Tree } from '@nx/devkit';
-export declare function normalizeNewProjectPrefix(prefix: string | undefined, npmScope: string | undefined, fallbackPrefix: string): string;
 export declare function getProjectPrefix(tree: Tree, project: string): string | undefined;

package/src/generators/utils/project.js

@@ -1,35 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getProjectPrefix = exports.normalizeNewProjectPrefix = void 0;
+exports.getProjectPrefix = void 0;
 const devkit_1 = require("@nx/devkit");
-const get_npm_scope_1 = require("@nx/js/src/utils/package-json/get-npm-scope");
-function normalizeNewProjectPrefix(prefix, npmScope, fallbackPrefix) {
-    // Prefix needs to be a valid html selector, if npmScope it's not valid, we don't default
-    // to it and let it fall through to the Angular schematic to handle it
-    // https://github.com/angular/angular-cli/blob/aa9f0528f174e856a4923cb24861fdf6e6f96b48/packages/schematics/angular/component/index.ts#L64
-    const htmlSelectorRegex = /^[a-zA-Z][.0-9a-zA-Z]*((:?-[0-9]+)*|(:?-[a-zA-Z][.0-9a-zA-Z]*(:?-[0-9]+)*)*)$/;
-    if (prefix) {
-        if (!htmlSelectorRegex.test(prefix)) {
-            throw new Error('The provided "prefix" is invalid. The prefix must start with a letter, and must contain only alphanumeric characters or dashes.');
-        }
-        return prefix;
-    }
-    if (npmScope && !htmlSelectorRegex.test(npmScope)) {
-        throw new Error(`The "--prefix" option was not provided, therefore attempted to use the "npmScope" defined in "nx.json" to set the application's selector prefix, but it is invalid.
-
-There are two options that can be followed to resolve this issue:
-  - Pass a valid "--prefix" option.
-  - Update the "npmScope" in "nx.json" (Note: this can be an involved process, as other libraries and applications may need to be updated to match the new scope).
-
-If you encountered this error when creating a new Nx Workspace, the workspace name or "npmScope" is invalid to use as the selector prefix for the application being generated.
-
-Valid selector prefixes must start with a letter, and must contain only alphanumeric characters or dashes.`);
-    }
-    return npmScope || fallbackPrefix;
-}
-exports.normalizeNewProjectPrefix = normalizeNewProjectPrefix;
 function getProjectPrefix(tree, project) {
-    return ((0, devkit_1.readProjectConfiguration)(tree, project)
-        .prefix ?? (0, get_npm_scope_1.getNpmScope)(tree));
+    return (0, devkit_1.readProjectConfiguration)(tree, project).prefix;
 }
 exports.getProjectPrefix = getProjectPrefix;

package/src/generators/utils/selector.d.ts

@@ -1,3 +1,3 @@
-import type { Tree } from '@nx/devkit';
 import { names } from '@nx/devkit';
-export declare function buildSelector(tree: Tree, name: string, prefix: string | undefined, projectPrefix: string | undefined, casing: keyof Pick<ReturnType<typeof names>, 'fileName' | 'propertyName'>): string;
+export declare function buildSelector(name: string, prefix: string | undefined, projectPrefix: string | undefined, casing: keyof Pick<ReturnType<typeof names>, 'fileName' | 'propertyName'>): string;
+export declare function validateHtmlSelector(selector: string): void;

package/src/generators/utils/selector.js

@@ -1,14 +1,21 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.buildSelector = void 0;
+exports.validateHtmlSelector = exports.buildSelector = void 0;
 const devkit_1 = require("@nx/devkit");
-const get_npm_scope_1 = require("@nx/js/src/utils/package-json/get-npm-scope");
-function buildSelector(tree, name, prefix, projectPrefix, casing) {
+function buildSelector(name, prefix, projectPrefix, casing) {
     let selector = name;
-    prefix ??= projectPrefix ?? (0, get_npm_scope_1.getNpmScope)(tree);
+    prefix ??= projectPrefix;
     if (prefix) {
         selector = `${prefix}-${selector}`;
     }
     return (0, devkit_1.names)(selector)[casing];
 }
 exports.buildSelector = buildSelector;
+// https://github.com/angular/angular-cli/blob/main/packages/schematics/angular/utility/validation.ts#L11-L14
+const htmlSelectorRegex = /^[a-zA-Z][.0-9a-zA-Z]*((:?-[0-9]+)*|(:?-[a-zA-Z][.0-9a-zA-Z]*(:?-[0-9]+)*)*)$/;
+function validateHtmlSelector(selector) {
+    if (selector && !htmlSelectorRegex.test(selector)) {
+        throw new Error(`The selector "${selector}" is invalid.`);
+    }
+}
+exports.validateHtmlSelector = validateHtmlSelector;