@nx/angular 18.0.0-beta.0 → 18.0.0-beta.2

package/src/generators/convert-to-application-executor/convert-to-application-executor.js

@@ -0,0 +1,240 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.convertToApplicationExecutor = void 0;
+const devkit_1 = require("@nx/devkit");
+const posix_1 = require("node:path/posix");
+const semver_1 = require("semver");
+const targets_1 = require("../../utils/targets");
+const setup_ssr_1 = require("../setup-ssr/setup-ssr");
+const validations_1 = require("../utils/validations");
+const version_utils_1 = require("../utils/version-utils");
+const executorsToConvert = new Set([
+    '@angular-devkit/build-angular:browser',
+    '@angular-devkit/build-angular:browser-esbuild',
+    '@nx/angular:webpack-browser',
+    '@nx/angular:browser-esbuild',
+]);
+const serverTargetExecutors = new Set([
+    '@angular-devkit/build-angular:server',
+    '@nx/angular:webpack-server',
+]);
+const redundantExecutors = new Set([
+    '@angular-devkit/build-angular:server',
+    '@angular-devkit/build-angular:prerender',
+    '@angular-devkit/build-angular:app-shell',
+    '@angular-devkit/build-angular:ssr-dev-server',
+    '@nx/angular:webpack-server',
+]);
+async function convertToApplicationExecutor(tree, options) {
+    const { major: angularMajorVersion, version: angularVersion } = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
+    if (angularMajorVersion < 17) {
+        throw new Error(`The "convert-to-application-executor" generator is only supported in Angular >= 17.0.0. You are currently using "${angularVersion}".`);
+    }
+    let didAnySucceed = false;
+    if (options.project) {
+        (0, validations_1.validateProject)(tree, options.project);
+        didAnySucceed = await convertProjectTargets(tree, options.project, angularVersion, true);
+    }
+    else {
+        const projects = (0, devkit_1.getProjects)(tree);
+        for (const [projectName] of projects) {
+            devkit_1.logger.info(`Converting project "${projectName}"...`);
+            const success = await convertProjectTargets(tree, projectName, angularVersion);
+            if (success) {
+                devkit_1.logger.info(`Project "${projectName}" converted successfully.`);
+            }
+            else {
+                devkit_1.logger.info(`Project "${projectName}" could not be converted. See above for more information.`);
+            }
+            devkit_1.logger.info('');
+            didAnySucceed = didAnySucceed || success;
+        }
+    }
+    if (!options.skipFormat) {
+        await (0, devkit_1.formatFiles)(tree);
+    }
+    return didAnySucceed ? () => (0, devkit_1.installPackagesTask)(tree) : () => { };
+}
+exports.convertToApplicationExecutor = convertToApplicationExecutor;
+async function convertProjectTargets(tree, projectName, angularVersion, isProvidedProject = false) {
+    function warnIfProvided(message) {
+        if (isProvidedProject) {
+            devkit_1.logger.warn(message);
+        }
+    }
+    let project = (0, devkit_1.readProjectConfiguration)(tree, projectName);
+    if (project.projectType !== 'application') {
+        warnIfProvided(`The provided project "${projectName}" is not an application. Skipping conversion.`);
+        return false;
+    }
+    const { buildTargetName, serverTargetName } = getTargetsToConvert(project.targets);
+    if (!buildTargetName) {
+        warnIfProvided(`The provided project "${projectName}" does not have any targets using on of the ` +
+            `'@angular-devkit/build-angular:browser', '@angular-devkit/build-angular:browser-esbuild', ` +
+            `'@nx/angular:browser' and '@nx/angular:browser-esbuild' executors. Skipping conversion.`);
+        return false;
+    }
+    const useNxExecutor = project.targets[buildTargetName].executor.startsWith('@nx/angular:');
+    const newExecutor = useNxExecutor
+        ? '@nx/angular:application'
+        : '@angular-devkit/build-angular:application';
+    const buildTarget = project.targets[buildTargetName];
+    buildTarget.executor = newExecutor;
+    if ((0, semver_1.gte)(angularVersion, '17.1.0') && buildTarget.outputs) {
+        buildTarget.outputs = buildTarget.outputs.map((output) => output === '{options.outputPath}' ? '{options.outputPath.base}' : output);
+    }
+    for (const [, options] of (0, targets_1.allTargetOptions)(buildTarget)) {
+        if (options['index'] === '') {
+            options['index'] = false;
+        }
+        // Rename and transform options
+        options['browser'] = options['main'];
+        if (serverTargetName && typeof options['browser'] === 'string') {
+            options['server'] = (0, posix_1.dirname)(options['browser']) + '/main.server.ts';
+        }
+        options['serviceWorker'] =
+            options['ngswConfigPath'] ?? options['serviceWorker'];
+        if (typeof options['polyfills'] === 'string') {
+            options['polyfills'] = [options['polyfills']];
+        }
+        let outputPath = options['outputPath'];
+        if ((0, semver_1.lt)(angularVersion, '17.1.0')) {
+            options['outputPath'] = outputPath?.replace(/\/browser\/?$/, '');
+        }
+        else if (typeof outputPath === 'string') {
+            if (!/\/browser\/?$/.test(outputPath)) {
+                devkit_1.logger.warn(`The output location of the browser build has been updated from "${outputPath}" to ` +
+                    `"${(0, posix_1.join)(outputPath, 'browser')}". ` +
+                    'You might need to adjust your deployment pipeline or, as an alternative, ' +
+                    'set outputPath.browser to "" in order to maintain the previous functionality.');
+            }
+            else {
+                outputPath = outputPath.replace(/\/browser\/?$/, '');
+            }
+            options['outputPath'] = {
+                base: outputPath,
+            };
+            if (typeof options['resourcesOutputPath'] === 'string') {
+                const media = options['resourcesOutputPath'].replaceAll('/', '');
+                if (media && media !== 'media') {
+                    options['outputPath'] = {
+                        base: outputPath,
+                        media: media,
+                    };
+                }
+            }
+        }
+        // Delete removed options
+        delete options['deployUrl'];
+        delete options['vendorChunk'];
+        delete options['commonChunk'];
+        delete options['resourcesOutputPath'];
+        delete options['buildOptimizer'];
+        delete options['main'];
+        delete options['ngswConfigPath'];
+    }
+    // Merge browser and server tsconfig
+    if (serverTargetName) {
+        const browserTsConfigPath = buildTarget?.options?.tsConfig;
+        const serverTsConfigPath = project.targets['server']?.options?.tsConfig;
+        if (typeof browserTsConfigPath !== 'string') {
+            devkit_1.logger.warn(`Cannot update project "${projectName}" to use the application executor ` +
+                `as the browser tsconfig cannot be located.`);
+        }
+        if (typeof serverTsConfigPath !== 'string') {
+            devkit_1.logger.warn(`Cannot update project "${projectName}" to use the application executor ` +
+                `as the server tsconfig cannot be located.`);
+        }
+        const browserTsConfigJson = (0, devkit_1.readJson)(tree, browserTsConfigPath);
+        const serverTsConfigJson = (0, devkit_1.readJson)(tree, serverTsConfigPath);
+        const files = new Set([
+            ...(browserTsConfigJson.files ?? []),
+            ...(serverTsConfigJson.files ?? []),
+        ]);
+        // Server file will be added later by the setup-ssr generator
+        files.delete('server.ts');
+        browserTsConfigJson.files = Array.from(files);
+        browserTsConfigJson.compilerOptions ?? {};
+        browserTsConfigJson.compilerOptions.types = Array.from(new Set([
+            ...(browserTsConfigJson.compilerOptions.types ?? []),
+            ...(serverTsConfigJson.compilerOptions?.types ?? []),
+        ]));
+        // Delete server tsconfig
+        tree.delete(serverTsConfigPath);
+    }
+    // Update project main tsconfig
+    const projectRootTsConfigPath = (0, posix_1.join)(project.root, 'tsconfig.json');
+    if (tree.exists(projectRootTsConfigPath)) {
+        const rootTsConfigJson = (0, devkit_1.readJson)(tree, projectRootTsConfigPath);
+        rootTsConfigJson.compilerOptions ?? {};
+        rootTsConfigJson.compilerOptions.esModuleInterop = true;
+        rootTsConfigJson.compilerOptions.downlevelIteration = undefined;
+        rootTsConfigJson.compilerOptions.allowSyntheticDefaultImports = undefined;
+        (0, devkit_1.writeJson)(tree, projectRootTsConfigPath, rootTsConfigJson);
+    }
+    // Update server file
+    const ssrMainFile = project.targets['server']?.options?.['main'];
+    if (typeof ssrMainFile === 'string') {
+        tree.delete(ssrMainFile);
+        // apply changes so the setup-ssr generator can access the updated project
+        (0, devkit_1.updateProjectConfiguration)(tree, projectName, project);
+        await (0, setup_ssr_1.setupSsr)(tree, { project: projectName, skipFormat: true });
+        // re-read project configuration as it might have changed
+        project = (0, devkit_1.readProjectConfiguration)(tree, projectName);
+    }
+    // Delete all redundant targets
+    for (const [targetName, target] of Object.entries(project.targets)) {
+        if (redundantExecutors.has(target.executor)) {
+            delete project.targets[targetName];
+        }
+    }
+    (0, devkit_1.updateProjectConfiguration)(tree, projectName, project);
+    return true;
+}
+function getTargetsToConvert(targets) {
+    let buildTargetName;
+    let serverTargetName;
+    for (const target of Object.keys(targets)) {
+        if (targets[target].executor === '@nx/angular:application' ||
+            targets[target].executor === '@angular-devkit/build-angular:application') {
+            devkit_1.logger.warn('The project is already using the application builder. Skipping conversion.');
+            return {};
+        }
+        // build target
+        if (executorsToConvert.has(targets[target].executor)) {
+            for (const [, options] of (0, targets_1.allTargetOptions)(targets[target])) {
+                if (options.deployUrl) {
+                    devkit_1.logger.warn(`The project is using the "deployUrl" option which is not available in the application builder. Skipping conversion.`);
+                    return {};
+                }
+                if (options.customWebpackConfig) {
+                    devkit_1.logger.warn(`The project is using a custom webpack configuration which is not supported by the esbuild-based application executor. Skipping conversion.`);
+                    return {};
+                }
+            }
+            if (buildTargetName) {
+                devkit_1.logger.warn('The project has more than one build target. Skipping conversion.');
+                return {};
+            }
+            buildTargetName = target;
+        }
+        // server target
+        if (serverTargetExecutors.has(targets[target].executor)) {
+            if (targets[target].executor === '@nx/angular:webpack-server') {
+                for (const [, options] of (0, targets_1.allTargetOptions)(targets[target])) {
+                    if (options.customWebpackConfig) {
+                        devkit_1.logger.warn(`The project is using a custom webpack configuration which is not supported by the esbuild-based application executor. Skipping conversion.`);
+                        return {};
+                    }
+                }
+            }
+            if (serverTargetName) {
+                devkit_1.logger.warn('The project has more than one server target. Skipping conversion.');
+                return {};
+            }
+            serverTargetName = target;
+        }
+    }
+    return { buildTargetName, serverTargetName };
+}
+exports.default = convertToApplicationExecutor;

package/src/generators/convert-to-application-executor/schema.d.ts

@@ -0,0 +1,4 @@
+export interface GeneratorOptions {
+  project?: string;
+  skipFormat?: boolean;
+}

package/src/generators/convert-to-application-executor/schema.json

@@ -0,0 +1,26 @@
+{
+  "$schema": "http://json-schema.org/schema",
+  "$id": "NxAngularConvertToApplicationExecutorGenerator",
+  "cli": "nx",
+  "title": "Converts projects to use the `@nx/angular:application` executor or the `@angular-devkit/build-angular:application` builder. _Note: this is only supported in Angular versions >= 17.0.0_.",
+  "description": "Converts a project or all projects using one of the `@angular-devkit/build-angular:browser`, `@angular-devkit/build-angular:browser-esbuild`, `@nx/angular:browser` and `@nx/angular:browser-esbuild` executors to use the `@nx/angular:application` executor or the `@angular-devkit/build-angular:application` builder. If the converted target is using one of the `@nx/angular` executors, the `@nx/angular:application` executor will be used. Otherwise, the `@angular-devkit/build-angular:application` builder will be used.",
+  "type": "object",
+  "properties": {
+    "project": {
+      "type": "string",
+      "description": "Name of the Angular application project to convert. It has to contain a target using one of the `@angular-devkit/build-angular:browser`, `@angular-devkit/build-angular:browser-esbuild`, `@nx/angular:browser` and `@nx/angular:browser-esbuild` executors. If not specified, all projects with such targets will be converted.",
+      "$default": {
+        "$source": "argv",
+        "index": 0
+      },
+      "x-priority": "important"
+    },
+    "skipFormat": {
+      "description": "Skip formatting files.",
+      "type": "boolean",
+      "default": false,
+      "x-priority": "internal"
+    }
+  },
+  "additionalProperties": false
+}

package/src/generators/cypress-component-configuration/cypress-component-configuration.d.ts

@@ -1,8 +1,9 @@
 import { Tree } from '@nx/devkit';
 import { CypressComponentConfigSchema } from './schema';
+export declare function cypressComponentConfiguration(tree: Tree, options: CypressComponentConfigSchema): Promise<import("@nx/devkit").GeneratorCallback>;
 /**
  * This is for cypress built in component testing, if you want to test with
  * storybook + cypress then use the componentCypressGenerator instead.
  */
-export declare function cypressComponentConfiguration(tree: Tree, options: CypressComponentConfigSchema): Promise<import("@nx/devkit").GeneratorCallback>;
+export declare function cypressComponentConfigurationInternal(tree: Tree, options: CypressComponentConfigSchema): Promise<import("@nx/devkit").GeneratorCallback>;
 export default cypressComponentConfiguration;

package/src/generators/cypress-component-configuration/cypress-component-configuration.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.cypressComponentConfiguration = void 0;
+exports.cypressComponentConfigurationInternal = exports.cypressComponentConfiguration = void 0;
 const cypress_1 = require("@nx/cypress");
 const config_1 = require("@nx/cypress/src/utils/config");
 const find_target_options_1 = require("@nx/cypress/src/utils/find-target-options");
@@ -10,28 +10,34 @@ const component_test_1 = require("../component-test/component-test");
 const component_info_1 = require("../utils/storybook-ast/component-info");
 const entry_point_1 = require("../utils/storybook-ast/entry-point");
 const module_info_1 = require("../utils/storybook-ast/module-info");
+function cypressComponentConfiguration(tree, options) {
+    return cypressComponentConfigurationInternal(tree, {
+        addPlugin: false,
+        ...options,
+    });
+}
+exports.cypressComponentConfiguration = cypressComponentConfiguration;
 /**
  * This is for cypress built in component testing, if you want to test with
  * storybook + cypress then use the componentCypressGenerator instead.
  */
-async function cypressComponentConfiguration(tree, options) {
+async function cypressComponentConfigurationInternal(tree, options) {
+    options.addPlugin ??= process.env.NX_ADD_PLUGINS !== 'false';
     const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, options.project);
     const installTask = await (0, cypress_1.componentConfigurationGenerator)(tree, {
         project: options.project,
         skipFormat: true,
+        addPlugin: options.addPlugin,
     });
-    await updateProjectConfig(tree, options);
+    await configureCypressCT(tree, options);
     await addFiles(tree, projectConfig, options);
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(tree);
     }
     return installTask;
 }
-exports.cypressComponentConfiguration = cypressComponentConfiguration;
+exports.cypressComponentConfigurationInternal = cypressComponentConfigurationInternal;
 async function addFiles(tree, projectConfig, options) {
-    const cyConfigFile = (0, devkit_1.joinPathFragments)(projectConfig.root, 'cypress.config.ts');
-    const updatedCyConfig = await (0, config_1.addDefaultCTConfig)(tree.read(cyConfigFile, 'utf-8'));
-    tree.write(cyConfigFile, `import { nxComponentTestingPreset } from '@nx/angular/plugins/component-testing';\n${updatedCyConfig}`);
     const componentFile = (0, devkit_1.joinPathFragments)(projectConfig.root, 'cypress', 'support', 'component.ts');
     const updatedCmpContents = await (0, config_1.addMountDefinition)(tree.read(componentFile, 'utf-8'));
     tree.write(componentFile, `import { mount } from 'cypress/angular';\n${updatedCmpContents}`);
@@ -57,7 +63,7 @@ async function addFiles(tree, projectConfig, options) {
         }
     }
 }
-async function updateProjectConfig(tree, options) {
+async function configureCypressCT(tree, options) {
     let found = { target: options.buildTarget, config: undefined };
     if (!options.buildTarget) {
         found = await (0, find_target_options_1.findBuildConfig)(tree, {
@@ -71,13 +77,23 @@ async function updateProjectConfig(tree, options) {
         });
         assertValidConfig(found?.config);
     }
+    const ctConfigOptions = {};
     const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, options.project);
-    projectConfig.targets['component-test'].options = {
-        ...projectConfig.targets['component-test'].options,
-        skipServe: true,
-        devServerTarget: found.target,
-    };
-    (0, devkit_1.updateProjectConfiguration)(tree, options.project, projectConfig);
+    if (projectConfig.targets?.['component-test']?.executor ===
+        '@nx/cypress:cypress') {
+        projectConfig.targets['component-test'].options = {
+            ...projectConfig.targets['component-test'].options,
+            skipServe: true,
+            devServerTarget: found.target,
+        };
+        (0, devkit_1.updateProjectConfiguration)(tree, options.project, projectConfig);
+    }
+    else {
+        ctConfigOptions.buildTarget = found.target;
+    }
+    const cypressConfigPath = (0, config_1.getProjectCypressConfigPath)(tree, projectConfig.root);
+    const updatedCyConfig = await (0, config_1.addDefaultCTConfig)(tree.read(cypressConfigPath, 'utf-8'), ctConfigOptions);
+    tree.write(cypressConfigPath, `import { nxComponentTestingPreset } from '@nx/angular/plugins/component-testing';\n${updatedCyConfig}`);
 }
 function assertValidConfig(config) {
     if (!config) {

package/src/generators/cypress-component-configuration/schema.d.ts

@@ -3,4 +3,5 @@ export interface CypressComponentConfigSchema {
   generateTests: boolean;
   skipFormat?: boolean;
   buildTarget?: string;
+  addPlugin?: boolean;
 }

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

@@ -13,15 +13,15 @@ export interface Schema {
   export?: boolean;
   skipFormat?: boolean;
   /**
-   * @deprecated Provide the `directory` option instead and use the `as-provided` format. It will be removed in Nx v18.
+   * @deprecated Provide the `directory` option instead and use the `as-provided` format. It will be removed in Nx v19.
    */
   flat?: boolean;
   /**
-   * @deprecated Provide the `directory` option instead. It will be removed in Nx v18.
+   * @deprecated Provide the `directory` option instead. It will be removed in Nx v19.
    */
   path?: string;
   /**
-   * @deprecated Provide the `directory` option instead. The project will be determined from the directory provided. It will be removed in Nx v18.
+   * @deprecated Provide the `directory` option instead. The project will be determined from the directory provided. It will be removed in Nx v19.
    */
   project?: string;
 }

package/src/generators/directive/schema.json

@@ -34,7 +34,7 @@
         "$source": "projectName"
       },
       "x-dropdown": "projects",
-      "x-deprecated": "Provide the `directory` option instead and use the `as-provided` format. The project will be determined from the directory provided. It will be removed in Nx v18."
+      "x-deprecated": "Provide the `directory` option instead and use the `as-provided` format. The project will be determined from the directory provided. It will be removed in Nx v19."
     },
     "prefix": {
       "type": "string",
@@ -74,7 +74,7 @@
       "type": "boolean",
       "description": "When true (the default), creates the new files at the top level of the current project.",
       "default": true,
-      "x-deprecated": "Provide the `directory` option instead and use the `as-provided` format. It will be removed in Nx v18."
+      "x-deprecated": "Provide the `directory` option instead and use the `as-provided` format. It will be removed in Nx v19."
     },
     "module": {
       "type": "string",

package/src/generators/federate-module/schema.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/schema",
+  "$schema": "https://json-schema.org/schema",
   "cli": "nx",
   "$id": "NxReactFederateModule",
   "title": "Federate Module",

package/src/generators/host/host.js

@@ -8,6 +8,7 @@ const application_1 = require("../application/application");
 const remote_1 = require("../remote/remote");
 const setup_mf_1 = require("../setup-mf/setup-mf");
 const lib_1 = require("./lib");
+const add_mf_env_to_inputs_1 = require("../utils/add-mf-env-to-inputs");
 async function host(tree, options) {
     return await hostInternal(tree, {
         projectNameAndRootFormat: 'derived',
@@ -90,6 +91,7 @@ async function hostInternal(tree, schema) {
             typescriptConfiguration,
         });
     }
+    (0, add_mf_env_to_inputs_1.addMfEnvToTargetDefaultInputs)(tree);
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(tree);
     }

package/src/generators/host/schema.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/schema",
+  "$schema": "https://json-schema.org/schema",
   "$id": "NxMFHost",
   "cli": "nx",
   "title": "Nx Module Federation Host Application",
@@ -55,15 +55,15 @@
           },
           {
             "value": "scss",
-            "label": "SASS(.scss)  [ http://sass-lang.com   ]"
+            "label": "SASS(.scss)  [ https://sass-lang.com   ]"
           },
           {
             "value": "sass",
-            "label": "SASS(.sass)  [ http://sass-lang.com   ]"
+            "label": "SASS(.sass)  [ https://sass-lang.com   ]"
           },
           {
             "value": "less",
-            "label": "LESS         [ http://lesscss.org     ]"
+            "label": "LESS         [ https://lesscss.org     ]"
           }
         ]
       }

package/src/generators/init/schema.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/schema",
+  "$schema": "https://json-schema.org/schema",
   "$id": "SchematicsAngularModuleInit",
   "cli": "nx",
   "title": "Init Angular Plugin",

package/src/generators/library/lib/add-project.js

@@ -2,7 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addProject = void 0;
 const devkit_1 = require("@nx/devkit");
+const add_build_target_defaults_1 = require("@nx/devkit/src/generators/add-build-target-defaults");
 function addProject(tree, libraryOptions) {
+    const executor = libraryOptions.publishable
+        ? '@nx/angular:package'
+        : '@nx/angular:ng-packagr-lite';
+    (0, add_build_target_defaults_1.addBuildTargetDefaults)(tree, executor);
     const project = {
         name: libraryOptions.name,
         root: libraryOptions.projectRoot,
@@ -13,9 +18,7 @@ function addProject(tree, libraryOptions) {
         targets: {
             build: libraryOptions.buildable || libraryOptions.publishable
                 ? {
-                    executor: libraryOptions.publishable
-                        ? '@nx/angular:package'
-                        : '@nx/angular:ng-packagr-lite',
+                    executor,
                     outputs: ['{workspaceRoot}/dist/{projectRoot}'],
                     options: {
                         project: `${libraryOptions.projectRoot}/ng-package.json`,

package/src/generators/library/library.js

@@ -20,6 +20,7 @@ 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
@@ -80,6 +81,7 @@ async function libraryGeneratorInternal(tree, schema) {
     }
     return () => {
         (0, devkit_1.installPackagesTask)(tree);
+        (0, log_show_project_command_1.logShowProjectCommand)(libraryOptions.name);
     };
 }
 exports.libraryGeneratorInternal = libraryGeneratorInternal;

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.",

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.",

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/migrators/projects/e2e.migrator.js

@@ -242,6 +242,7 @@ class E2eMigrator extends project_migrator_1.ProjectMigrator {
             // 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: process.env.NX_ADD_PLUGINS !== 'false',
         });
         const cypressConfigFilePath = this.updateOrCreateCypressConfigFile(oldCypressConfigFilePath);
         this.updateCypressProjectConfiguration(cypressConfigFilePath);

package/src/generators/ng-add/schema.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/schema",
+  "$schema": "https://json-schema.org/schema",
   "$id": "NxAngularNgAddGenerator",
   "title": "Angular plugin initialization",
   "cli": "nx",

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

@@ -150,7 +150,9 @@ function updatePackageJson(tree) {
 }
 exports.updatePackageJson = updatePackageJson;
 async function updateRootEsLintConfig(tree, existingEsLintConfig, unitTestRunner) {
-    await (0, eslint_1.lintInitGenerator)(tree, {});
+    await (0, eslint_1.lintInitGenerator)(tree, {
+        addPlugin: process.env.NX_ADD_PLUGINS !== 'false',
+    });
     if (!existingEsLintConfig) {
         // There was no eslint config in the root, so we set it up and use it as-is
         (0, setup_root_eslint_1.setupRootEsLint)(tree, { unitTestRunner });

package/src/generators/ngrx/schema.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/schema",
+  "$schema": "https://json-schema.org/schema",
   "$id": "NxNgrxGenerator",
   "title": "Add NgRx support to an application or library.",
   "description": "Adds NgRx support to an application or library.",

package/src/generators/ngrx-feature-store/schema.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/schema",
+  "$schema": "https://json-schema.org/schema",
   "$id": "NxNgrxFeatureStoreGenerator",
   "title": "NgRx Feature Store Generator",
   "description": "Add an NgRx Feature Store to an application or library.",

package/src/generators/ngrx-root-store/schema.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/schema",
+  "$schema": "https://json-schema.org/schema",
   "$id": "NxNgrxRootStoreGenerator",
   "title": "Add NgRx support to an application.",
   "description": "Adds NgRx support to an application.",

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

@@ -11,15 +11,15 @@ export interface Schema {
   export?: boolean;
   skipFormat?: boolean;
   /**
-   * @deprecated Provide the `directory` option instead and use the `as-provided` format. It will be removed in Nx v18.
+   * @deprecated Provide the `directory` option instead and use the `as-provided` format. It will be removed in Nx v19.
    */
   flat?: boolean;
   /**
-   * @deprecated Provide the `directory` option instead. It will be removed in Nx v18.
+   * @deprecated Provide the `directory` option instead. It will be removed in Nx v19.
    */
   path?: string;
   /**
-   * @deprecated Provide the `directory` option instead. The project will be determined from the directory provided. It will be removed in Nx v18.
+   * @deprecated Provide the `directory` option instead. The project will be determined from the directory provided. It will be removed in Nx v19.
    */
   project?: string;
 }

package/src/generators/pipe/schema.json

@@ -34,13 +34,13 @@
         "$source": "projectName"
       },
       "x-dropdown": "projects",
-      "x-deprecated": "Provide the `directory` option instead and use the `as-provided` format. The project will be determined from the directory provided. It will be removed in Nx v18."
+      "x-deprecated": "Provide the `directory` option instead and use the `as-provided` format. The project will be determined from the directory provided. It will be removed in Nx v19."
     },
     "flat": {
       "type": "boolean",
       "default": true,
       "description": "When true (the default) creates files at the top level of the project.",
-      "x-deprecated": "Provide the `directory` option instead and use the `as-provided` format. It will be removed in Nx v18."
+      "x-deprecated": "Provide the `directory` option instead and use the `as-provided` format. It will be removed in Nx v19."
     },
     "skipTests": {
       "type": "boolean",