@nx/angular 17.0.3 → 17.0.5

package/src/generators/library/lib/normalize-options.js

@@ -3,11 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeOptions = void 0;
 const devkit_1 = require("@nx/devkit");
 const project_name_and_root_utils_1 = require("@nx/devkit/src/generators/project-name-and-root-utils");
-const get_npm_scope_1 = require("@nx/js/src/utils/package-json/get-npm-scope");
 const eslint_1 = require("@nx/eslint");
 const test_runners_1 = require("../../../utils/test-runners");
-const project_1 = require("../../utils/project");
 async function normalizeOptions(host, schema) {
+    schema.standalone = schema.standalone ?? true;
     // Create a schema with populated default values
     const options = {
         buildable: false,
@@ -39,14 +38,12 @@ async function normalizeOptions(host, schema) {
         ? options.tags.split(',').map((s) => s.trim())
         : [];
     const modulePath = `${projectRoot}/src/lib/${fileName}.module.ts`;
-    const npmScope = (0, get_npm_scope_1.getNpmScope)(host);
-    const prefix = (0, project_1.normalizeNewProjectPrefix)(options.prefix, npmScope, 'lib');
     const ngCliSchematicLibRoot = projectName;
     const allNormalizedOptions = {
         ...options,
         linter: options.linter ?? eslint_1.Linter.EsLint,
         unitTestRunner: options.unitTestRunner ?? test_runners_1.UnitTestRunner.Jest,
-        prefix,
+        prefix: options.prefix ?? 'lib',
         name: projectName,
         projectRoot,
         entryFile: 'index',

package/src/generators/library/lib/set-generator-defaults.d.ts

@@ -0,0 +1,3 @@
+import { type Tree } from '@nx/devkit';
+import type { NormalizedSchema } from './normalized-schema';
+export declare function setGeneratorDefaults(tree: Tree, options: NormalizedSchema): void;

package/src/generators/library/lib/set-generator-defaults.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.setGeneratorDefaults = void 0;
+const devkit_1 = require("@nx/devkit");
+function setGeneratorDefaults(tree, options) {
+    const nxJson = (0, devkit_1.readNxJson)(tree);
+    nxJson.generators = nxJson.generators ?? {};
+    nxJson.generators['@nx/angular:library'] = {
+        linter: options.libraryOptions.linter,
+        unitTestRunner: options.libraryOptions.unitTestRunner,
+        ...(nxJson.generators['@nx/angular:library'] || {}),
+    };
+    (0, devkit_1.updateNxJson)(tree, nxJson);
+}
+exports.setGeneratorDefaults = setGeneratorDefaults;

package/src/generators/library/lib/update-tsconfig.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateTsConfig = void 0;
 const devkit_1 = require("@nx/devkit");
 const js_1 = require("@nx/js");
-const create_ts_config_1 = require("../../utils/create-ts-config");
+const update_project_root_tsconfig_1 = require("../../utils/update-project-root-tsconfig");
 function updateProjectConfig(host, options) {
     (0, devkit_1.updateJson)(host, `${options.projectRoot}/tsconfig.lib.json`, (json) => {
         json.include = ['src/**/*.ts'];
@@ -18,7 +18,7 @@ function updateProjectConfig(host, options) {
         return json;
     });
     // tsconfig.json
-    (0, create_ts_config_1.createTsConfig)(host, options.projectRoot, 'lib', options, (0, js_1.getRelativePathToRootTsConfig)(host, options.projectRoot));
+    (0, update_project_root_tsconfig_1.updateProjectRootTsConfig)(host, options.projectRoot, (0, js_1.getRelativePathToRootTsConfig)(host, options.projectRoot));
 }
 function updateProjectIvyConfig(host, options) {
     if (options.buildable || options.publishable) {
@@ -30,7 +30,7 @@ function updateProjectIvyConfig(host, options) {
     }
 }
 function updateTsConfig(host, options) {
-    (0, create_ts_config_1.extractTsConfigBase)(host);
+    (0, update_project_root_tsconfig_1.extractTsConfigBase)(host);
     updateProjectConfig(host, options);
     updateProjectIvyConfig(host, options);
 }

package/src/generators/library/library.js

@@ -2,12 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.libraryGeneratorInternal = exports.libraryGenerator = void 0;
 const devkit_1 = require("@nx/devkit");
-const jest_1 = require("@nx/jest");
 const eslint_1 = require("@nx/eslint");
 const js_1 = require("@nx/js");
-const semver_1 = require("semver");
 const init_1 = require("../../generators/init/init");
-const test_runners_1 = require("../../utils/test-runners");
 const add_linting_1 = require("../add-linting/add-linting");
 const setup_tailwind_1 = require("../setup-tailwind/setup-tailwind");
 const version_utils_1 = require("../utils/version-utils");
@@ -20,6 +17,10 @@ const update_lib_package_npm_scope_1 = require("./lib/update-lib-package-npm-sco
 const update_tsconfig_1 = require("./lib/update-tsconfig");
 const create_files_1 = require("./lib/create-files");
 const add_project_1 = require("./lib/add-project");
+const add_jest_1 = require("../utils/add-jest");
+const set_generator_defaults_1 = require("./lib/set-generator-defaults");
+const ensure_angular_dependencies_1 = require("../utils/ensure-angular-dependencies");
+const log_show_project_command_1 = require("@nx/devkit/src/utils/log-show-project-command");
 async function libraryGenerator(tree, schema) {
     return await libraryGeneratorInternal(tree, {
         // provide a default projectNameAndRootFormat to avoid breaking changes
@@ -40,23 +41,22 @@ async function libraryGeneratorInternal(tree, schema) {
     if (schema.addTailwind && !schema.buildable && !schema.publishable) {
         throw new Error(`To use "--addTailwind" option, you have to set either "--buildable" or "--publishable".`);
     }
-    const userInstalledAngularVersion = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
-    if ((0, semver_1.lt)(userInstalledAngularVersion.version, '14.1.0') && schema.standalone) {
-        throw new Error(`The "--standalone" option is not supported in Angular versions < 14.1.0.`);
-    }
     const options = await (0, normalize_options_1.normalizeOptions)(tree, schema);
     const { libraryOptions } = options;
     const pkgVersions = (0, version_utils_1.versions)(tree);
-    await (0, init_1.default)(tree, {
+    await (0, js_1.initGenerator)(tree, {
         ...libraryOptions,
+        js: false,
         skipFormat: true,
-        e2eTestRunner: test_runners_1.E2eTestRunner.None,
     });
+    await (0, init_1.default)(tree, { ...libraryOptions, skipFormat: true });
+    (0, ensure_angular_dependencies_1.ensureAngularDependencies)(tree);
     const project = (0, add_project_1.addProject)(tree, libraryOptions);
     (0, create_files_1.createFiles)(tree, options, project);
     (0, update_tsconfig_1.updateTsConfig)(tree, libraryOptions);
     await addUnitTestRunner(tree, libraryOptions);
     updateNpmScopeIfBuildableOrPublishable(tree, libraryOptions);
+    (0, set_generator_defaults_1.setGeneratorDefaults)(tree, options);
     if (!libraryOptions.standalone) {
         (0, add_module_1.addModule)(tree, libraryOptions);
     }
@@ -69,6 +69,7 @@ async function libraryGeneratorInternal(tree, schema) {
         await (0, setup_tailwind_1.default)(tree, {
             project: libraryOptions.name,
             skipFormat: true,
+            skipPackageJson: libraryOptions.skipPackageJson,
         });
     }
     if (libraryOptions.buildable || libraryOptions.publishable) {
@@ -85,31 +86,18 @@ async function libraryGeneratorInternal(tree, schema) {
     }
     return () => {
         (0, devkit_1.installPackagesTask)(tree);
+        (0, log_show_project_command_1.logShowProjectCommand)(libraryOptions.name);
     };
 }
 exports.libraryGeneratorInternal = libraryGeneratorInternal;
 async function addUnitTestRunner(host, options) {
     if (options.unitTestRunner === 'jest') {
-        await (0, jest_1.configurationGenerator)(host, {
-            project: options.name,
-            setupFile: 'angular',
-            supportTsx: false,
-            skipSerializers: false,
-            skipFormat: true,
+        await (0, add_jest_1.addJest)(host, {
+            name: options.name,
+            projectRoot: options.projectRoot,
             skipPackageJson: options.skipPackageJson,
+            strict: options.strict,
         });
-        const setupFile = (0, devkit_1.joinPathFragments)(options.projectRoot, 'src', 'test-setup.ts');
-        if (options.strict && host.exists(setupFile)) {
-            const contents = host.read(setupFile, 'utf-8');
-            host.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}`);
-        }
     }
 }
 function updateNpmScopeIfBuildableOrPublishable(host, options) {

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

@@ -40,4 +40,5 @@ export interface Schema {
   skipTests?: boolean;
   selector?: string;
   skipSelector?: boolean;
+  addPlugin?: boolean;
 }

package/src/generators/library/schema.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/schema",
+  "$schema": "https://json-schema.org/schema",
   "$id": "GeneratorAngularLibrary",
   "title": "Create a library",
   "description": "Creates an Angular library.",
@@ -141,65 +141,65 @@
     },
     "standalone": {
       "type": "boolean",
-      "description": "Generate a library that uses a standalone component instead of a module as the entry point. _Note: This is only supported in Angular versions >= 14.1.0_",
-      "default": false
+      "description": "Generate a library that uses a standalone component instead of a module as the entry point.",
+      "default": true
     },
     "displayBlock": {
-      "description": "Specifies if the component generated style will contain `:host { display: block; }`. Disclaimer: This option is only valid when `--standalone` is set to `true`. _Note: This is only supported in Angular versions >= 14.1.0_",
+      "description": "Specifies if the component generated style will contain `:host { display: block; }`. Disclaimer: This option is only valid when `--standalone` is set to `true`.",
       "type": "boolean",
       "default": false,
       "alias": "b"
     },
     "inlineStyle": {
-      "description": "Include styles inline in the component.ts file. Only CSS styles can be included inline. By default, an external styles file is created and referenced in the component.ts file. Disclaimer: This option is only valid when `--standalone` is set to `true`. _Note: This is only supported in Angular versions >= 14.1.0_",
+      "description": "Include styles inline in the component.ts file. Only CSS styles can be included inline. By default, an external styles file is created and referenced in the component.ts file. Disclaimer: This option is only valid when `--standalone` is set to `true`.",
       "type": "boolean",
       "default": false,
       "alias": "s"
     },
     "inlineTemplate": {
-      "description": "Include template inline in the component.ts file. By default, an external template file is created and referenced in the component.ts file. Disclaimer: This option is only valid when `--standalone` is set to `true`. _Note: This is only supported in Angular versions >= 14.1.0_",
+      "description": "Include template inline in the component.ts file. By default, an external template file is created and referenced in the component.ts file. Disclaimer: This option is only valid when `--standalone` is set to `true`.",
       "type": "boolean",
       "default": false,
       "alias": "t"
     },
     "viewEncapsulation": {
-      "description": "The view encapsulation strategy to use in the new component. Disclaimer: This option is only valid when `--standalone` is set to `true`. _Note: This is only supported in Angular versions >= 14.1.0_",
+      "description": "The view encapsulation strategy to use in the new component. Disclaimer: This option is only valid when `--standalone` is set to `true`.",
       "enum": ["Emulated", "None", "ShadowDom"],
       "type": "string",
       "alias": "v"
     },
     "changeDetection": {
-      "description": "The change detection strategy to use in the new component. Disclaimer: This option is only valid when `--standalone` is set to `true`. _Note: This is only supported in Angular versions >= 14.1.0_",
+      "description": "The change detection strategy to use in the new component. Disclaimer: This option is only valid when `--standalone` is set to `true`.",
       "enum": ["Default", "OnPush"],
       "type": "string",
       "default": "Default",
       "alias": "c"
     },
     "style": {
-      "description": "The file extension or preprocessor to use for style files, or `none` to skip generating the style file. Disclaimer: This option is only valid when `--standalone` is set to `true`. _Note: This is only supported in Angular versions >= 14.1.0_",
+      "description": "The file extension or preprocessor to use for style files, or `none` to skip generating the style file. Disclaimer: This option is only valid when `--standalone` is set to `true`.",
       "type": "string",
       "default": "css",
       "enum": ["css", "scss", "sass", "less", "none"]
     },
     "skipTests": {
       "type": "boolean",
-      "description": "Do not create `spec.ts` test files for the new component. Disclaimer: This option is only valid when `--standalone` is set to `true`. _Note: This is only supported in Angular versions >= 14.1.0_",
+      "description": "Do not create `spec.ts` test files for the new component. Disclaimer: This option is only valid when `--standalone` is set to `true`.",
       "default": false
     },
     "selector": {
       "type": "string",
       "format": "html-selector",
-      "description": "The HTML selector to use for this component. Disclaimer: This option is only valid when `--standalone` is set to `true`. _Note: This is only supported in Angular versions >= 14.1.0_"
+      "description": "The HTML selector to use for this component. Disclaimer: This option is only valid when `--standalone` is set to `true`."
     },
     "skipSelector": {
       "type": "boolean",
       "default": false,
-      "description": "Specifies if the component should have a selector or not. Disclaimer: This option is only valid when `--standalone` is set to `true`. _Note: This is only supported in Angular versions >= 14.1.0_"
+      "description": "Specifies if the component should have a selector or not. Disclaimer: This option is only valid when `--standalone` is set to `true`."
     },
     "flat": {
       "type": "boolean",
       "default": false,
-      "description": "Ensure the generated standalone component is not placed in a subdirectory. Disclaimer: This option is only valid when `--standalone` is set to `true`. _Note: This is only supported in Angular versions >= 14.1.0_"
+      "description": "Ensure the generated standalone component is not placed in a subdirectory. Disclaimer: This option is only valid when `--standalone` is set to `true`."
     }
   },
   "additionalProperties": false,

package/src/generators/library-secondary-entry-point/files/src/index.ts__tmpl__

@@ -1,5 +1 @@
-<% if (!skipModule) { %>
-export * from './lib/<%= fileName %>.module';
-<% } else { %>
-export const greeting = 'Hello World!';
-<% } %>
+<% if (!skipModule) { %>export * from './lib/<%= fileName %>.module';<% } else { %>export const greeting = 'Hello World!';<% } %>

package/src/generators/library-secondary-entry-point/lib/index.d.ts

@@ -1,5 +1,4 @@
 export * from './add-files';
 export * from './add-path-mapping';
 export * from './normalize-options';
-export * from './update-linting-file-patterns';
 export * from './update-tsconfig-included-files';

package/src/generators/library-secondary-entry-point/lib/index.js

@@ -4,5 +4,4 @@ const tslib_1 = require("tslib");
 tslib_1.__exportStar(require("./add-files"), exports);
 tslib_1.__exportStar(require("./add-path-mapping"), exports);
 tslib_1.__exportStar(require("./normalize-options"), exports);
-tslib_1.__exportStar(require("./update-linting-file-patterns"), exports);
 tslib_1.__exportStar(require("./update-tsconfig-included-files"), exports);

package/src/generators/library-secondary-entry-point/library-secondary-entry-point.js

@@ -8,8 +8,9 @@ async function librarySecondaryEntryPointGenerator(tree, rawOptions) {
     (0, lib_1.addFiles)(tree, options);
     (0, lib_1.addPathMapping)(tree, options);
     (0, lib_1.updateTsConfigIncludedFiles)(tree, options);
-    (0, lib_1.updateLintingFilePatterns)(tree, options);
-    await (0, devkit_1.formatFiles)(tree);
+    if (!options.skipFormat) {
+        await (0, devkit_1.formatFiles)(tree);
+    }
 }
 exports.librarySecondaryEntryPointGenerator = librarySecondaryEntryPointGenerator;
 exports.default = librarySecondaryEntryPointGenerator;

package/src/generators/library-secondary-entry-point/schema.d.ts

@@ -4,6 +4,7 @@ export interface GeneratorOptions {
   library: string;
   name: string;
   skipModule?: boolean;
+  skipFormat?: boolean;
 }
 
 export interface NormalizedGeneratorOptions extends GeneratorOptions {

package/src/generators/library-secondary-entry-point/schema.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/schema",
+  "$schema": "https://json-schema.org/schema",
   "$id": "NxAngularLibrarySecondaryEntryPoint",
   "title": "Creates a secondary entry point for a library",
   "description": "Creates a secondary entry point for an Angular publishable library.",
@@ -14,14 +14,14 @@
         "index": 0
       },
       "x-prompt": "What name would you like to use for the secondary entry point?",
-      "pattern": "^[a-zA-Z].*$",
+      "pattern": "(?:^@[a-zA-Z0-9-*~][a-zA-Z0-9-*._~]*(?:\\/[a-zA-Z0-9-~][a-zA-Z0-9-._~]*)+|^[a-zA-Z][^:]*)$",
       "x-priority": "important"
     },
     "library": {
       "type": "string",
       "description": "The name of the library to create the secondary entry point for.",
       "x-prompt": "What library would you like to create the secondary entry point for?",
-      "pattern": "^[a-zA-Z].*$",
+      "pattern": "(?:^@[a-zA-Z0-9-*~][a-zA-Z0-9-*._~]*\\/[a-zA-Z0-9-~][a-zA-Z0-9-._~]*|^[a-zA-Z][^:]*)$",
       "x-dropdown": "projects",
       "x-priority": "important"
     },
@@ -29,6 +29,12 @@
       "type": "boolean",
       "description": "Skip generating a module for the secondary entry point.",
       "default": false
+    },
+    "skipFormat": {
+      "description": "Skip formatting files.",
+      "type": "boolean",
+      "default": false,
+      "x-priority": "internal"
     }
   },
   "additionalProperties": false,

package/src/generators/move/schema.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/schema",
+  "$schema": "https://json-schema.org/schema",
   "$id": "NxAngularMove",
   "cli": "nx",
   "title": "Nx Angular Move",

package/src/generators/ng-add/migrate-from-angular-cli.js

@@ -47,7 +47,7 @@ async function migrateFromAngularCli(tree, options) {
         (0, utilities_1.createRootKarmaConfig)(tree);
     }
     if (workspaceRootFileTypesInfo.eslint) {
-        (0, utilities_1.updateRootEsLintConfig)(tree, eslintConfig, options.unitTestRunner);
+        await (0, utilities_1.updateRootEsLintConfig)(tree, eslintConfig, options.unitTestRunner);
         (0, utilities_1.cleanupEsLintPackages)(tree);
     }
     (0, utilities_1.deleteGitKeepFilesIfNotNeeded)(tree);

package/src/generators/ng-add/migrators/projects/app.migrator.js

@@ -9,7 +9,13 @@ const builders_1 = require("../builders");
 const e2e_migrator_1 = require("./e2e.migrator");
 const project_migrator_1 = require("./project.migrator");
 const supportedTargets = {
-    build: { builders: ['@angular-devkit/build-angular:browser'] },
+    build: {
+        builders: [
+            '@angular-devkit/build-angular:application',
+            '@angular-devkit/build-angular:browser',
+            '@angular-devkit/build-angular:browser-esbuild',
+        ],
+    },
     e2e: {
         acceptMultipleDefinitions: true,
         builders: [
@@ -18,10 +24,20 @@ const supportedTargets = {
         ],
     },
     i18n: { builders: ['@angular-devkit/build-angular:extract-i18n'] },
-    prerender: { builders: ['@nguniversal/builders:prerender'] },
+    prerender: {
+        builders: [
+            '@nguniversal/builders:prerender',
+            '@angular-devkit/build-angular:prerender',
+        ],
+    },
     serve: { builders: ['@angular-devkit/build-angular:dev-server'] },
     server: { builders: ['@angular-devkit/build-angular:server'] },
-    serveSsr: { builders: ['@nguniversal/builders:ssr-dev-server'] },
+    serveSsr: {
+        builders: [
+            '@nguniversal/builders:ssr-dev-server',
+            '@angular-devkit/build-angular:ssr-dev-server',
+        ],
+    },
 };
 // TODO(leo): this will replace `supportedTargets` once the full refactor is done.
 const supportedBuilderMigrators = [
@@ -125,10 +141,22 @@ class AppMigrator extends project_migrator_1.ProjectMigrator {
         buildOptions.outputPath =
             buildOptions.outputPath &&
                 (0, devkit_1.joinPathFragments)('dist', this.project.newRoot, this.targetNames.server ? 'browser' : '');
-        buildOptions.index =
-            buildOptions.index && this.convertAsset(buildOptions.index);
+        if (buildOptions.index) {
+            if (typeof buildOptions.index === 'string') {
+                buildOptions.index = this.convertAsset(buildOptions.index);
+            }
+            else {
+                buildOptions.index.input =
+                    buildOptions.index.input &&
+                        this.convertAsset(buildOptions.index.input);
+            }
+        }
         buildOptions.main =
             buildOptions.main && this.convertAsset(buildOptions.main);
+        buildOptions.browser =
+            buildOptions.browser && this.convertAsset(buildOptions.browser);
+        buildOptions.server =
+            buildOptions.server && this.convertAsset(buildOptions.server);
         buildOptions.polyfills =
             buildOptions.polyfills &&
                 (Array.isArray(buildOptions.polyfills)
@@ -152,6 +180,20 @@ class AppMigrator extends project_migrator_1.ProjectMigrator {
                     replace: this.convertAsset(replacement.replace),
                     with: this.convertAsset(replacement.with),
                 }));
+        buildOptions.serviceWorker =
+            buildOptions.serviceWorker &&
+                typeof buildOptions.serviceWorker === 'string' &&
+                this.convertAsset(buildOptions.serviceWorker);
+        buildOptions.ngswConfigPath =
+            buildOptions.ngswConfigPath &&
+                this.convertAsset(buildOptions.ngswConfigPath);
+        if (buildOptions.prerender?.routesFile) {
+            buildOptions.prerender.routesFile = this.convertAsset(buildOptions.prerender.routesFile);
+        }
+        buildOptions.ssr =
+            buildOptions.ssr &&
+                typeof buildOptions.ssr === 'string' &&
+                this.convertAsset(buildOptions.ssr);
     }
     convertServerOptions(serverOptions) {
         serverOptions.outputPath =
@@ -243,11 +285,12 @@ class AppMigrator extends project_migrator_1.ProjectMigrator {
             this.shouldSkipTargetTypeMigration('serveSsr')) {
             return;
         }
-        const serveSsrTarget = this.projectConfig.targets[this.targetNames.serveSsr];
+        const ssrTarget = this.targetNames.serveSsr ?? this.targetNames['serve-ssr'];
+        const serveSsrTarget = this.projectConfig.targets[ssrTarget];
         if (!serveSsrTarget.options &&
             (!serveSsrTarget.configurations ||
                 !Object.keys(serveSsrTarget.configurations).length)) {
-            this.logger.warn(`The target "${this.targetNames.serveSsr}" is not specifying any options or configurations. Skipping updating the target configuration.`);
+            this.logger.warn(`The target "${ssrTarget}" is not specifying any options or configurations. Skipping updating the target configuration.`);
             return;
         }
         ['sslKey', 'sslCert', 'proxyConfig'].forEach((option) => {

package/src/generators/ng-add/migrators/projects/e2e.migrator.js

@@ -1,17 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.E2eMigrator = void 0;
-const cypress_1 = require("@nx/cypress");
-const cypress_preset_1 = require("@nx/cypress/plugins/cypress-preset");
-const cypress_version_1 = require("@nx/cypress/src/utils/cypress-version");
 const devkit_1 = require("@nx/devkit");
 const eslint_1 = require("@nx/eslint");
 const js_1 = require("@nx/js");
+const ensure_typescript_1 = require("@nx/js/src/utils/typescript/ensure-typescript");
 const path_1 = require("path");
-const typescript_1 = require("typescript");
 const file_change_recorder_1 = require("../../../../utils/file-change-recorder");
+const versions_1 = require("../../../../utils/versions");
 const project_migrator_1 = require("./project.migrator");
-const ensure_typescript_1 = require("@nx/js/src/utils/typescript/ensure-typescript");
 const supportedTargets = {
     e2e: {
         acceptMultipleDefinitions: true,
@@ -175,7 +172,9 @@ class E2eMigrator extends project_migrator_1.ProjectMigrator {
             };
         }
         else if (this.isCypressE2eProject()) {
-            this.cypressInstalledVersion = (0, cypress_version_1.installedCypressVersion)();
+            (0, devkit_1.ensurePackage)('@nx/cypress', versions_1.nxVersion);
+            const { installedCypressVersion, } = require('@nx/cypress/src/utils/cypress-version');
+            this.cypressInstalledVersion = installedCypressVersion();
             this.project = {
                 ...this.project,
                 name,
@@ -217,7 +216,6 @@ class E2eMigrator extends project_migrator_1.ProjectMigrator {
             await (0, eslint_1.lintProjectGenerator)(this.tree, {
                 project: this.project.name,
                 linter: eslint_1.Linter.EsLint,
-                eslintFilePatterns: [`${this.project.newRoot}/**/*.{js,ts}`],
                 unitTestRunner: this.options.unitTestRunner,
                 tsConfigPaths: [
                     (0, devkit_1.joinPathFragments)(this.project.newRoot, 'tsconfig.json'),
@@ -236,12 +234,18 @@ class E2eMigrator extends project_migrator_1.ProjectMigrator {
             tags: [],
             implicitDependencies: [this.appName],
         });
-        await (0, cypress_1.configurationGenerator)(this.tree, {
+        const nxJson = (0, devkit_1.readNxJson)(this.tree) ?? {};
+        const addPlugin = process.env.NX_ADD_PLUGINS !== 'false' &&
+            nxJson.useInferencePlugins !== false;
+        const { configurationGenerator } = await Promise.resolve().then(() => require('@nx/cypress'));
+        await configurationGenerator(this.tree, {
             project: this.project.name,
             linter: this.isProjectUsingEsLint ? eslint_1.Linter.EsLint : eslint_1.Linter.None,
             skipFormat: true,
             // any target would do, we replace it later with the target existing in the project being migrated
             devServerTarget: `${this.appName}:serve`,
+            baseUrl: 'http://localhost:4200',
+            addPlugin,
         });
         const cypressConfigFilePath = this.updateOrCreateCypressConfigFile(oldCypressConfigFilePath);
         this.updateCypressProjectConfiguration(cypressConfigFilePath);
@@ -362,9 +366,10 @@ class E2eMigrator extends project_migrator_1.ProjectMigrator {
             : undefined;
     }
     updateCypress10ConfigFile(configFilePath) {
-        (0, ensure_typescript_1.ensureTypescript)();
+        const { isPropertyAssignment } = (0, ensure_typescript_1.ensureTypescript)();
         const { tsquery } = require('@phenomnomnominal/tsquery');
-        this.cypressPreset = (0, cypress_preset_1.nxE2EPreset)(configFilePath);
+        const { nxE2EPreset } = require('@nx/cypress/plugins/cypress-preset');
+        this.cypressPreset = nxE2EPreset(configFilePath);
         const fileContent = this.tree.read(configFilePath, 'utf-8');
         let sourceFile = tsquery.ast(fileContent);
         const recorder = new file_change_recorder_1.FileChangeRecorder(this.tree, configFilePath);
@@ -377,15 +382,15 @@ class E2eMigrator extends project_migrator_1.ProjectMigrator {
         let componentNode;
         const globalConfig = {};
         defineConfigExpression.forEachChild((node) => {
-            if ((0, typescript_1.isPropertyAssignment)(node) && node.name.getText() === 'component') {
+            if (isPropertyAssignment(node) && node.name.getText() === 'component') {
                 componentNode = node;
                 return;
             }
-            if ((0, typescript_1.isPropertyAssignment)(node) && node.name.getText() === 'e2e') {
+            if (isPropertyAssignment(node) && node.name.getText() === 'e2e') {
                 e2eNode = node;
                 return;
             }
-            if ((0, typescript_1.isPropertyAssignment)(node)) {
+            if (isPropertyAssignment(node)) {
                 this.updateCypressConfigNodeValue(recorder, node, globalConfig);
             }
         });
@@ -397,14 +402,15 @@ class E2eMigrator extends project_migrator_1.ProjectMigrator {
         if (!componentNode) {
             return;
         }
-        if (!(0, typescript_1.isObjectLiteralExpression)(componentNode.initializer)) {
+        const { isObjectLiteralExpression, isPropertyAssignment } = (0, ensure_typescript_1.ensureTypescript)();
+        if (!isObjectLiteralExpression(componentNode.initializer)) {
             this.logger.warn('The automatic migration only supports having an object literal in the "component" option of the Cypress configuration. ' +
                 `The configuration won't be updated. Please make sure to update any paths you may have in the "component" option ` +
                 'manually to point to the new location.');
             return;
         }
         componentNode.initializer.properties.forEach((node) => {
-            if ((0, typescript_1.isPropertyAssignment)(node)) {
+            if (isPropertyAssignment(node)) {
                 this.updateCypressConfigNodeValue(recorder, node);
             }
         });
@@ -427,7 +433,8 @@ class E2eMigrator extends project_migrator_1.ProjectMigrator {
             recorder.insertRight(defineConfigNode.getStart() + 1, e2eAssignment);
         }
         else {
-            if (!(0, typescript_1.isObjectLiteralExpression)(e2eNode.initializer)) {
+            const { isObjectLiteralExpression, isPropertyAssignment } = (0, ensure_typescript_1.ensureTypescript)();
+            if (!isObjectLiteralExpression(e2eNode.initializer)) {
                 this.logger.warn('The automatic migration only supports having an object literal in the "e2e" option of the Cypress configuration. ' +
                     `The configuration won't be updated. Please make sure to update any paths you might have in the "e2e" option ` +
                     'manually to point to the new location.');
@@ -435,7 +442,7 @@ class E2eMigrator extends project_migrator_1.ProjectMigrator {
             }
             recorder.insertRight(e2eNode.initializer.getStart() + 1, presetSpreadAssignment);
             e2eNode.initializer.properties.forEach((node) => {
-                if (!(0, typescript_1.isPropertyAssignment)(node)) {
+                if (!isPropertyAssignment(node)) {
                     return;
                 }
                 let change = { type: 'ignore' };
@@ -514,7 +521,8 @@ class E2eMigrator extends project_migrator_1.ProjectMigrator {
         }
     }
     isValidPathLikePropertyWithStringLiteralValue(node, properties) {
-        if (!(0, typescript_1.isPropertyAssignment)(node)) {
+        const { isPropertyAssignment, isStringLiteralLike, isTemplateExpression, SyntaxKind, } = (0, ensure_typescript_1.ensureTypescript)();
+        if (!isPropertyAssignment(node)) {
             // TODO(leo): handle more scenarios (spread assignments, etc)
             return false;
         }
@@ -522,13 +530,13 @@ class E2eMigrator extends project_migrator_1.ProjectMigrator {
         if (!property) {
             return false;
         }
-        if (node.initializer.kind === typescript_1.SyntaxKind.UndefinedKeyword ||
-            node.initializer.kind === typescript_1.SyntaxKind.NullKeyword ||
-            node.initializer.kind === typescript_1.SyntaxKind.FalseKeyword) {
+        if (node.initializer.kind === SyntaxKind.UndefinedKeyword ||
+            node.initializer.kind === SyntaxKind.NullKeyword ||
+            node.initializer.kind === SyntaxKind.FalseKeyword) {
             return false;
         }
-        if (!(0, typescript_1.isStringLiteralLike)(node.initializer)) {
-            if ((0, typescript_1.isTemplateExpression)(node.initializer)) {
+        if (!isStringLiteralLike(node.initializer)) {
+            if (isTemplateExpression(node.initializer)) {
                 this.logger.warn(`The "${node.name.getText()}" in the Cypress configuration file is set to a template expression ("${node.initializer.getText()}"). ` +
                     `This is not supported by the automatic migration and its value won't be automatically migrated. ` +
                     `Please make sure to update its value to match the new location if needed.`);

package/src/generators/ng-add/ng-add.js

@@ -1,16 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ngAddGenerator = void 0;
-const init_1 = require("../init/init");
 const migrate_from_angular_cli_1 = require("./migrate-from-angular-cli");
-function getWorkspaceType(tree) {
-    return tree.exists('nx.json') ? 'nx' : 'angular';
-}
 async function ngAddGenerator(tree, options) {
-    if (getWorkspaceType(tree) === 'angular') {
-        return await (0, migrate_from_angular_cli_1.migrateFromAngularCli)(tree, options);
-    }
-    return await (0, init_1.angularInitGenerator)(tree, options);
+    return await (0, migrate_from_angular_cli_1.migrateFromAngularCli)(tree, options);
 }
 exports.ngAddGenerator = ngAddGenerator;
 exports.default = ngAddGenerator;