@nrwl/angular 14.8.7 → 14.9.0-beta.1

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

@@ -2,36 +2,23 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateTsConfig = void 0;
 const devkit_1 = require("@nrwl/devkit");
-const typescript_1 = require("@nrwl/workspace/src/utilities/typescript");
-function updateRootConfig(host, options) {
-    (0, devkit_1.updateJson)(host, (0, typescript_1.getRootTsConfigPathInTree)(host), (json) => {
-        const c = json.compilerOptions;
-        c.paths = c.paths || {};
-        delete c.paths[options.name];
-        if (c.paths[options.importPath]) {
-            throw new Error(`You already have a library using the import path "${options.importPath}". Make sure to specify a unique one.`);
-        }
-        c.paths[options.importPath] = [
-            (0, devkit_1.joinPathFragments)((0, devkit_1.getWorkspaceLayout)(host).libsDir, options.projectDirectory, '/src/index.ts'),
-        ];
-        return json;
-    });
-}
+const js_1 = require("@nrwl/js");
+const create_ts_config_1 = require("../../utils/create-ts-config");
 function updateProjectConfig(host, options) {
     (0, devkit_1.updateJson)(host, `${options.projectRoot}/tsconfig.lib.json`, (json) => {
-        json.include = ['**/*.ts'];
+        json.include = ['src/**/*.ts'];
         json.exclude = [
             ...new Set([
                 ...(json.exclude || []),
                 'jest.config.ts',
-                '**/*.test.ts',
-                '**/*.spec.ts',
+                'src/**/*.test.ts',
+                'src/**/*.spec.ts',
             ]),
         ];
         return json;
     });
     // tsconfig.json
-    (0, devkit_1.updateJson)(host, `${options.projectRoot}/tsconfig.json`, (json) => (Object.assign(Object.assign({}, json), { compilerOptions: Object.assign(Object.assign({}, json.compilerOptions), { target: 'es2020' }) })));
+    (0, create_ts_config_1.createTsConfig)(host, options.projectRoot, 'lib', options, (0, js_1.getRelativePathToRootTsConfig)(host, options.projectRoot));
 }
 function updateProjectIvyConfig(host, options) {
     if (options.buildable || options.publishable) {
@@ -43,7 +30,7 @@ function updateProjectIvyConfig(host, options) {
     }
 }
 function updateTsConfig(host, options) {
-    updateRootConfig(host, options);
+    (0, create_ts_config_1.extractTsConfigBase)(host);
     updateProjectConfig(host, options);
     updateProjectIvyConfig(host, options);
 }

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

@@ -1 +1 @@
-{"version":3,"file":"update-tsconfig.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/library/lib/update-tsconfig.ts"],"names":[],"mappings":";;;AAAA,yCAKsB;AACtB,yEAAqF;AAGrF,SAAS,gBAAgB,CACvB,IAAU,EACV,OAA2C;IAE3C,IAAA,mBAAU,EAAC,IAAI,EAAE,IAAA,sCAAyB,EAAC,IAAI,CAAC,EAAE,CAAC,IAAI,EAAE,EAAE;QACzD,MAAM,CAAC,GAAG,IAAI,CAAC,eAAe,CAAC;QAC/B,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,KAAK,IAAI,EAAE,CAAC;QACxB,OAAO,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAE7B,IAAI,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE;YAC/B,MAAM,IAAI,KAAK,CACb,qDAAqD,OAAO,CAAC,UAAU,uCAAuC,CAC/G,CAAC;SACH;QAED,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,GAAG;YAC5B,IAAA,0BAAiB,EACf,IAAA,2BAAkB,EAAC,IAAI,CAAC,CAAC,OAAO,EAChC,OAAO,CAAC,gBAAgB,EACxB,eAAe,CAChB;SACF,CAAC;QAEF,OAAO,IAAI,CAAC;IACd,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAS,mBAAmB,CAC1B,IAAU,EACV,OAA2C;IAE3C,IAAA,mBAAU,EAAC,IAAI,EAAE,GAAG,OAAO,CAAC,WAAW,oBAAoB,EAAE,CAAC,IAAI,EAAE,EAAE;QACpE,IAAI,CAAC,OAAO,GAAG,CAAC,SAAS,CAAC,CAAC;QAC3B,IAAI,CAAC,OAAO,GAAG;YACb,GAAG,IAAI,GAAG,CAAC;gBACT,GAAG,CAAC,IAAI,CAAC,OAAO,IAAI,EAAE,CAAC;gBACvB,gBAAgB;gBAChB,cAAc;gBACd,cAAc;aACf,CAAC;SACH,CAAC;QACF,OAAO,IAAI,CAAC;IACd,CAAC,CAAC,CAAC;IAEH,gBAAgB;IAChB,IAAA,mBAAU,EAAC,IAAI,EAAE,GAAG,OAAO,CAAC,WAAW,gBAAgB,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,iCAC9D,IAAI,KACP,eAAe,kCAAO,IAAI,CAAC,eAAe,KAAE,MAAM,EAAE,QAAQ,OAC5D,CAAC,CAAC;AACN,CAAC;AAED,SAAS,sBAAsB,CAC7B,IAAU,EACV,OAA2C;IAE3C,IAAI,OAAO,CAAC,SAAS,IAAI,OAAO,CAAC,WAAW,EAAE;QAC5C,OAAO,IAAA,mBAAU,EACf,IAAI,EACJ,GAAG,OAAO,CAAC,WAAW,yBAAyB,EAC/C,CAAC,IAAI,EAAE,EAAE;YACP,IAAI,CAAC,sBAAsB,CAAC,iBAAiB,CAAC;gBAC5C,OAAO,CAAC,eAAe,KAAK,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC;YAC7D,OAAO,IAAI,CAAC;QACd,CAAC,CACF,CAAC;KACH;AACH,CAAC;AAED,SAAgB,cAAc,CAC5B,IAAU,EACV,OAA2C;IAE3C,gBAAgB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAChC,mBAAmB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IACnC,sBAAsB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;AACxC,CAAC;AAPD,wCAOC"}
+{"version":3,"file":"update-tsconfig.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/library/lib/update-tsconfig.ts"],"names":[],"mappings":";;;AACA,yCAA0C;AAC1C,iCAAyD;AAEzD,mEAGsC;AAEtC,SAAS,mBAAmB,CAC1B,IAAU,EACV,OAA2C;IAE3C,IAAA,mBAAU,EAAC,IAAI,EAAE,GAAG,OAAO,CAAC,WAAW,oBAAoB,EAAE,CAAC,IAAI,EAAE,EAAE;QACpE,IAAI,CAAC,OAAO,GAAG,CAAC,aAAa,CAAC,CAAC;QAC/B,IAAI,CAAC,OAAO,GAAG;YACb,GAAG,IAAI,GAAG,CAAC;gBACT,GAAG,CAAC,IAAI,CAAC,OAAO,IAAI,EAAE,CAAC;gBACvB,gBAAgB;gBAChB,kBAAkB;gBAClB,kBAAkB;aACnB,CAAC;SACH,CAAC;QACF,OAAO,IAAI,CAAC;IACd,CAAC,CAAC,CAAC;IAEH,gBAAgB;IAChB,IAAA,iCAAc,EACZ,IAAI,EACJ,OAAO,CAAC,WAAW,EACnB,KAAK,EACL,OAAO,EACP,IAAA,kCAA6B,EAAC,IAAI,EAAE,OAAO,CAAC,WAAW,CAAC,CACzD,CAAC;AACJ,CAAC;AAED,SAAS,sBAAsB,CAC7B,IAAU,EACV,OAA2C;IAE3C,IAAI,OAAO,CAAC,SAAS,IAAI,OAAO,CAAC,WAAW,EAAE;QAC5C,OAAO,IAAA,mBAAU,EACf,IAAI,EACJ,GAAG,OAAO,CAAC,WAAW,yBAAyB,EAC/C,CAAC,IAAI,EAAE,EAAE;YACP,IAAI,CAAC,sBAAsB,CAAC,iBAAiB,CAAC;gBAC5C,OAAO,CAAC,eAAe,KAAK,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC;YAC7D,OAAO,IAAI,CAAC;QACd,CAAC,CACF,CAAC;KACH;AACH,CAAC;AAED,SAAgB,cAAc,CAC5B,IAAU,EACV,OAA2C;IAE3C,IAAA,sCAAmB,EAAC,IAAI,CAAC,CAAC;IAC1B,mBAAmB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IACnC,sBAAsB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;AACxC,CAAC;AAPD,wCAOC"}

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

@@ -1 +1 @@
-export declare const librarySchematic: (generatorOptions: Partial<import("./schema").Schema>) => (tree: any, context: any) => Promise<any>;
+export declare const librarySchematic: (generatorOptions: import("./schema").Schema) => (tree: any, context: any) => Promise<any>;

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

@@ -1,4 +1,4 @@
-import { Tree } from '@nrwl/devkit';
+import { GeneratorCallback, Tree } from '@nrwl/devkit';
 import { Schema } from './schema';
-export declare function libraryGenerator(tree: Tree, schema: Partial<Schema>): Promise<() => void>;
+export declare function libraryGenerator(tree: Tree, schema: Schema): Promise<GeneratorCallback>;
 export default libraryGenerator;

package/src/generators/library/library.js

@@ -3,24 +3,23 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.libraryGenerator = void 0;
 const tslib_1 = require("tslib");
 const devkit_1 = require("@nrwl/devkit");
-const ngcli_adapter_1 = require("@nrwl/devkit/ngcli-adapter");
 const jest_1 = require("@nrwl/jest");
 const linter_1 = require("@nrwl/linter");
-const generators_1 = require("@nrwl/workspace/generators");
+const js_1 = require("@nrwl/js");
+const semver_1 = require("semver");
 const init_1 = require("../../generators/init/init");
 const test_runners_1 = require("../../utils/test-runners");
-const versions_1 = require("../../utils/versions");
+const version_utils_1 = require("../../utils/version-utils");
 const add_linting_1 = require("../add-linting/add-linting");
-const karma_project_1 = require("../karma-project/karma-project");
 const setup_tailwind_1 = require("../setup-tailwind/setup-tailwind");
+const version_utils_2 = require("../utils/version-utils");
 const dependencies_1 = require("../utils/dependencies");
 const add_module_1 = require("./lib/add-module");
+const add_standalone_component_1 = require("./lib/add-standalone-component");
 const enable_strict_type_checking_1 = require("./lib/enable-strict-type-checking");
 const normalize_options_1 = require("./lib/normalize-options");
 const update_lib_package_npm_scope_1 = require("./lib/update-lib-package-npm-scope");
-const update_project_1 = require("./lib/update-project");
 const update_tsconfig_1 = require("./lib/update-tsconfig");
-const add_standalone_component_1 = require("./lib/add-standalone-component");
 function libraryGenerator(tree, schema) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         // Do some validation checks
@@ -33,10 +32,15 @@ function libraryGenerator(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_2.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 = (0, normalize_options_1.normalizeOptions)(tree, schema);
-        const { libraryOptions, componentOptions } = options;
+        const { libraryOptions } = options;
         yield (0, init_1.default)(tree, Object.assign(Object.assign({}, libraryOptions), { skipFormat: true, e2eTestRunner: test_runners_1.E2eTestRunner.None }));
-        const runAngularLibrarySchematic = (0, ngcli_adapter_1.wrapAngularDevkitSchematic)('@schematics/angular', 'library');
+        const { wrapAngularDevkitSchematic } = require('@nrwl/devkit/ngcli-adapter');
+        const runAngularLibrarySchematic = wrapAngularDevkitSchematic('@schematics/angular', 'library');
         yield runAngularLibrarySchematic(tree, {
             name: libraryOptions.name,
             prefix: libraryOptions.prefix,
@@ -48,7 +52,8 @@ function libraryGenerator(tree, schema) {
         if (libraryOptions.ngCliSchematicLibRoot !== libraryOptions.projectRoot) {
             (0, devkit_1.moveFilesToNewDirectory)(tree, libraryOptions.ngCliSchematicLibRoot, libraryOptions.projectRoot);
         }
-        yield (0, update_project_1.updateProject)(tree, libraryOptions);
+        const { updateProject } = yield Promise.resolve().then(() => require('./lib/update-project'));
+        yield updateProject(tree, libraryOptions);
         (0, update_tsconfig_1.updateTsConfig)(tree, libraryOptions);
         yield addUnitTestRunner(tree, libraryOptions);
         updateNpmScopeIfBuildableOrPublishable(tree, libraryOptions);
@@ -69,17 +74,11 @@ function libraryGenerator(tree, schema) {
         if (libraryOptions.buildable || libraryOptions.publishable) {
             (0, devkit_1.removeDependenciesFromPackageJson)(tree, [], ['ng-packagr']);
             (0, devkit_1.addDependenciesToPackageJson)(tree, {}, {
-                'ng-packagr': versions_1.ngPackagrVersion,
+                'ng-packagr': (0, version_utils_1.getPkgVersionForAngularMajorVersion)('ngPackagrVersion', userInstalledAngularVersion.major),
             });
             (0, dependencies_1.addBuildableLibrariesPostCssDependencies)(tree);
         }
-        if (libraryOptions.standaloneConfig) {
-            yield (0, generators_1.convertToNxProjectGenerator)(tree, {
-                project: libraryOptions.name,
-                all: false,
-                skipFormat: true,
-            });
-        }
+        (0, js_1.updateRootTsConfig)(tree, Object.assign(Object.assign({}, libraryOptions), { js: false }));
         if (!libraryOptions.skipFormat) {
             yield (0, devkit_1.formatFiles)(tree);
         }
@@ -98,12 +97,7 @@ function addUnitTestRunner(host, options) {
                 supportTsx: false,
                 skipSerializers: false,
                 skipFormat: true,
-            });
-        }
-        else if (options.unitTestRunner === 'karma') {
-            yield (0, karma_project_1.default)(host, {
-                project: options.name,
-                skipFormat: true,
+                skipPackageJson: options.skipPackageJson,
             });
         }
     });
@@ -133,6 +127,7 @@ function addLinting(host, options) {
             unitTestRunner: options.unitTestRunner,
             setParserOptionsProject: options.setParserOptionsProject,
             skipFormat: true,
+            skipPackageJson: options.skipPackageJson,
         });
     });
 }

package/src/generators/library/library.js.map

@@ -1 +1 @@
-{"version":3,"file":"library.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/library/library.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"library.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/library/library.ts"],"names":[],"mappings":"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"}

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

@@ -1,13 +1,15 @@
 import { UnitTestRunner } from '../../utils/test-runners';
 import { Linter } from '@nrwl/linter';
 
-type AngularLinter = Exclude<Linter, Linter.TsLint>;
-
 export interface Schema {
   name: string;
   addTailwind?: boolean;
   skipFormat?: boolean;
+  /**
+   * @deprecated Use `simpleName` instead. It will be removed in v16.
+   */
   simpleModuleName?: boolean;
+  simpleName?: boolean;
   addModuleSpec?: boolean;
   directory?: string;
   sourceDir?: string;
@@ -21,16 +23,15 @@ export interface Schema {
   prefix?: string;
   routing?: boolean;
   lazy?: boolean;
-  parentModule?: string;
+  parent?: string;
   tags?: string;
   strict?: boolean;
-  linter?: AngularLinter;
+  linter?: Linter;
   unitTestRunner?: UnitTestRunner;
   compilationMode?: 'full' | 'partial';
   setParserOptionsProject?: boolean;
   skipModule?: boolean;
   skipPackageJson?: boolean;
-  skipPostInstall?: boolean;
   standalone?: boolean;
   displayBlock?: boolean;
   inlineStyle?: boolean;

package/src/generators/library/schema.json

@@ -18,17 +18,20 @@
     },
     "directory": {
       "type": "string",
-      "description": "A directory where the library is placed."
+      "description": "A directory where the library is placed.",
+      "x-priority": "important"
     },
     "publishable": {
       "type": "boolean",
       "default": false,
-      "description": "Generate a publishable library."
+      "description": "Generate a publishable library.",
+      "x-priority": "important"
     },
     "buildable": {
       "type": "boolean",
       "default": false,
-      "description": "Generate a buildable library."
+      "description": "Generate a buildable library.",
+      "x-priority": "important"
     },
     "prefix": {
       "type": "string",
@@ -39,11 +42,18 @@
     "skipFormat": {
       "description": "Skip formatting files.",
       "type": "boolean",
-      "default": false
+      "default": false,
+      "x-priority": "internal"
     },
     "simpleModuleName": {
       "description": "Keep the module name simple (when using `--directory`).",
       "type": "boolean",
+      "default": false,
+      "x-deprecated": "Use `simpleName` instead. It will be removed in v16."
+    },
+    "simpleName": {
+      "description": "Don't include the directory in the name of the module or standalone component entry of the library.",
+      "type": "boolean",
       "default": false
     },
     "addModuleSpec": {
@@ -54,12 +64,8 @@
     "skipPackageJson": {
       "type": "boolean",
       "default": false,
-      "description": "Do not add dependencies to `package.json`."
-    },
-    "skipPostInstall": {
-      "type": "boolean",
-      "default": false,
-      "description": "Do not add or append `ngcc` to the `postinstall` script in `package.json`."
+      "description": "Do not add dependencies to `package.json`.",
+      "x-priority": "internal"
     },
     "skipTsConfig": {
       "type": "boolean",
@@ -69,17 +75,19 @@
     "routing": {
       "type": "boolean",
       "default": false,
-      "description": "Add router configuration. See `lazy` for more information."
+      "description": "Add router configuration. See `lazy` for more information.",
+      "x-priority": "important"
     },
     "lazy": {
       "type": "boolean",
       "default": false,
-      "description": "Add `RouterModule.forChild` when set to true, and a simple array of routes when set to false."
+      "description": "Add `RouterModule.forChild` when set to true, and a simple array of routes when set to false.",
+      "x-priority": "important"
     },
-    "parentModule": {
+    "parent": {
       "type": "string",
-      "description": "Update the router configuration of the parent module using `loadChildren` or `children`, depending on what `lazy` is set to.",
-      "alias": "parent"
+      "description": "Path to the parent route configuration using `loadChildren` or `children`, depending on what `lazy` is set to.",
+      "x-priority": "important"
     },
     "tags": {
       "type": "string",
@@ -87,7 +95,7 @@
     },
     "unitTestRunner": {
       "type": "string",
-      "enum": ["karma", "jest", "none"],
+      "enum": ["jest", "none"],
       "description": "Test runner to use for unit tests.",
       "default": "jest"
     },
@@ -108,7 +116,9 @@
     },
     "standaloneConfig": {
       "description": "Split the project configuration into `<projectRoot>/project.json` rather than including it inside `workspace.json`.",
-      "type": "boolean"
+      "type": "boolean",
+      "default": true,
+      "x-deprecated": "Nx only supports standaloneConfig"
     },
     "compilationMode": {
       "description": "Specifies the compilation mode to use. If not specified, it will default to `partial` for publishable libraries and to `full` for buildable libraries. The `full` value can not be used for publishable libraries.",
@@ -132,62 +142,68 @@
     },
     "standalone": {
       "type": "boolean",
-      "description": "Generate a library that uses a standalone component instead of a module as the entry point.",
+      "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
     },
     "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`.",
+      "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_",
       "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`.",
+      "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_",
       "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`.",
+      "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_",
       "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`.",
+      "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_",
       "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`.",
+      "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_",
       "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`.",
+      "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_",
       "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`.",
+      "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_",
       "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`."
+      "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_"
     },
     "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`."
+      "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_"
+    },
+    "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_"
     }
   },
   "additionalProperties": false,
-  "required": ["name"]
+  "required": ["name"],
+  "examplesFile": "../../../docs/library-examples.md"
 }

package/src/generators/library-secondary-entry-point/lib/add-path-mapping.js

@@ -2,9 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addPathMapping = void 0;
 const devkit_1 = require("@nrwl/devkit");
-const typescript_1 = require("@nrwl/workspace/src/utilities/typescript");
+const js_1 = require("@nrwl/js");
 function addPathMapping(tree, options) {
-    (0, devkit_1.updateJson)(tree, (0, typescript_1.getRootTsConfigPathInTree)(tree), (json) => {
+    (0, devkit_1.updateJson)(tree, (0, js_1.getRootTsConfigPathInTree)(tree), (json) => {
         const c = json.compilerOptions;
         c.paths = c.paths || {};
         c.paths[options.secondaryEntryPoint] = [

package/src/generators/library-secondary-entry-point/lib/add-path-mapping.js.map

@@ -1 +1 @@
-{"version":3,"file":"add-path-mapping.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/library-secondary-entry-point/lib/add-path-mapping.ts"],"names":[],"mappings":";;;AAAA,yCAAgD;AAChD,yEAAqF;AAGrF,SAAgB,cAAc,CAC5B,IAAU,EACV,OAAmC;IAEnC,IAAA,mBAAU,EAAC,IAAI,EAAE,IAAA,sCAAyB,EAAC,IAAI,CAAC,EAAE,CAAC,IAAI,EAAE,EAAE;QACzD,MAAM,CAAC,GAAG,IAAI,CAAC,eAAe,CAAC;QAC/B,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,KAAK,IAAI,EAAE,CAAC;QACxB,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,mBAAmB,CAAC,GAAG;YACrC,GAAG,OAAO,CAAC,cAAc,CAAC,IAAI,IAAI,OAAO,CAAC,IAAI,eAAe;SAC9D,CAAC;QAEF,OAAO,IAAI,CAAC;IACd,CAAC,CAAC,CAAC;AACL,CAAC;AAbD,wCAaC"}
+{"version":3,"file":"add-path-mapping.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/library-secondary-entry-point/lib/add-path-mapping.ts"],"names":[],"mappings":";;;AAAA,yCAAgD;AAChD,iCAAqD;AAGrD,SAAgB,cAAc,CAC5B,IAAU,EACV,OAAmC;IAEnC,IAAA,mBAAU,EAAC,IAAI,EAAE,IAAA,8BAAyB,EAAC,IAAI,CAAC,EAAE,CAAC,IAAI,EAAE,EAAE;QACzD,MAAM,CAAC,GAAG,IAAI,CAAC,eAAe,CAAC;QAC/B,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,KAAK,IAAI,EAAE,CAAC;QACxB,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,mBAAmB,CAAC,GAAG;YACrC,GAAG,OAAO,CAAC,cAAc,CAAC,IAAI,IAAI,OAAO,CAAC,IAAI,eAAe;SAC9D,CAAC;QAEF,OAAO,IAAI,CAAC;IACd,CAAC,CAAC,CAAC;AACL,CAAC;AAbD,wCAaC"}

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

@@ -14,14 +14,16 @@
         "index": 0
       },
       "x-prompt": "What name would you like to use for the secondary entry point?",
-      "pattern": "^[a-zA-Z].*$"
+      "pattern": "^[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].*$",
-      "x-dropdown": "projects"
+      "x-dropdown": "projects",
+      "x-priority": "important"
     },
     "skipModule": {
       "type": "boolean",
@@ -30,5 +32,6 @@
     }
   },
   "additionalProperties": false,
-  "required": ["name", "library"]
+  "required": ["name", "library"],
+  "examplesFile": "../../../docs/library-secondary-entry-point-examples.md"
 }

package/src/generators/move/lib/update-module-name.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateModuleName = void 0;
 const devkit_1 = require("@nrwl/devkit");
-const utils_1 = require("@nrwl/workspace/src/generators/move/lib/utils");
+const get_new_project_name_1 = require("../../utils/get-new-project-name");
 const path_1 = require("path");
 /**
  * Updates the Angular module name (including the spec file and index.ts)
@@ -13,7 +13,7 @@ const path_1 = require("path");
  * @param schema The options provided to the schematic
  */
 function updateModuleName(tree, { projectName, destination }) {
-    const newProjectName = (0, utils_1.getNewProjectName)(destination);
+    const newProjectName = (0, get_new_project_name_1.getNewProjectName)(destination);
     const project = (0, devkit_1.readProjectConfiguration)(tree, newProjectName);
     if (project.projectType === 'application') {
         // Expect the module to be something like 'app.module.ts' regardless of the folder name,

package/src/generators/move/lib/update-module-name.js.map

@@ -1 +1 @@
-{"version":3,"file":"update-module-name.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/move/lib/update-module-name.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"update-module-name.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/move/lib/update-module-name.ts"],"names":[],"mappings":"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"}

package/src/generators/move/lib/update-ng-package.js

@@ -2,11 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateNgPackage = void 0;
 const devkit_1 = require("@nrwl/devkit");
-const utils_1 = require("@nrwl/workspace/src/generators/move/lib/utils");
+const get_new_project_name_1 = require("../../utils/get-new-project-name");
 const path_1 = require("path");
 function updateNgPackage(tree, schema) {
-    var _a, _b, _c;
-    const newProjectName = (0, utils_1.getNewProjectName)(schema.destination);
+    var _a;
+    const newProjectName = (0, get_new_project_name_1.getNewProjectName)(schema.destination);
     const project = (0, devkit_1.readProjectConfiguration)(tree, newProjectName);
     if (project.projectType === 'application') {
         return;
@@ -16,10 +16,21 @@ function updateNgPackage(tree, schema) {
         return;
     }
     const rootOffset = (0, devkit_1.normalizePath)((0, path_1.relative)((0, path_1.join)(devkit_1.workspaceRoot, project.root), devkit_1.workspaceRoot));
-    let output = `dist/${project.root}`;
-    if (((_c = (_b = (_a = project.targets) === null || _a === void 0 ? void 0 : _a.build) === null || _b === void 0 ? void 0 : _b.outputs) === null || _c === void 0 ? void 0 : _c.length) > 0) {
-        output = project.targets.build.outputs[0];
-    }
+    const outputs = (0, devkit_1.getOutputsForTargetAndConfiguration)({
+        target: {
+            project: newProjectName,
+            target: 'build',
+        },
+        overrides: {},
+    }, {
+        name: newProjectName,
+        type: 'lib',
+        data: {
+            root: project.root,
+            targets: project.targets,
+        },
+    });
+    const output = (_a = outputs[0]) !== null && _a !== void 0 ? _a : `dist/${project.root}`;
     (0, devkit_1.updateJson)(tree, ngPackagePath, (json) => {
         json.dest = `${rootOffset}/${output}`;
         return json;

package/src/generators/move/lib/update-ng-package.js.map

@@ -1 +1 @@
-{"version":3,"file":"update-ng-package.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/move/lib/update-ng-package.ts"],"names":[],"mappings":";;;AAAA,yCAMsB;AACtB,yEAAkF;AAClF,+BAAsC;AAGtC,SAAgB,eAAe,CAAC,IAAU,EAAE,MAAc;;IACxD,MAAM,cAAc,GAAG,IAAA,yBAAiB,EAAC,MAAM,CAAC,WAAW,CAAC,CAAC;IAC7D,MAAM,OAAO,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,cAAc,CAAC,CAAC;IAE/D,IAAI,OAAO,CAAC,WAAW,KAAK,aAAa,EAAE;QACzC,OAAO;KACR;IAED,MAAM,aAAa,GAAG,GAAG,OAAO,CAAC,IAAI,kBAAkB,CAAC;IACxD,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,EAAE;QAC/B,OAAO;KACR;IAED,MAAM,UAAU,GAAG,IAAA,sBAAa,EAC9B,IAAA,eAAQ,EAAC,IAAA,WAAI,EAAC,sBAAa,EAAE,OAAO,CAAC,IAAI,CAAC,EAAE,sBAAa,CAAC,CAC3D,CAAC;IACF,IAAI,MAAM,GAAG,QAAQ,OAAO,CAAC,IAAI,EAAE,CAAC;IACpC,IAAI,CAAA,MAAA,MAAA,MAAA,OAAO,CAAC,OAAO,0CAAE,KAAK,0CAAE,OAAO,0CAAE,MAAM,IAAG,CAAC,EAAE;QAC/C,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;KAC3C;IAED,IAAA,mBAAU,EAAC,IAAI,EAAE,aAAa,EAAE,CAAC,IAAI,EAAE,EAAE;QACvC,IAAI,CAAC,IAAI,GAAG,GAAG,UAAU,IAAI,MAAM,EAAE,CAAC;QACtC,OAAO,IAAI,CAAC;IACd,CAAC,CAAC,CAAC;AACL,CAAC;AAzBD,0CAyBC"}
+{"version":3,"file":"update-ng-package.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/move/lib/update-ng-package.ts"],"names":[],"mappings":";;;AAAA,yCAOsB;AACtB,2EAAqE;AACrE,+BAAsC;AAGtC,SAAgB,eAAe,CAAC,IAAU,EAAE,MAAc;;IACxD,MAAM,cAAc,GAAG,IAAA,wCAAiB,EAAC,MAAM,CAAC,WAAW,CAAC,CAAC;IAC7D,MAAM,OAAO,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,cAAc,CAAC,CAAC;IAE/D,IAAI,OAAO,CAAC,WAAW,KAAK,aAAa,EAAE;QACzC,OAAO;KACR;IAED,MAAM,aAAa,GAAG,GAAG,OAAO,CAAC,IAAI,kBAAkB,CAAC;IACxD,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,EAAE;QAC/B,OAAO;KACR;IAED,MAAM,UAAU,GAAG,IAAA,sBAAa,EAC9B,IAAA,eAAQ,EAAC,IAAA,WAAI,EAAC,sBAAa,EAAE,OAAO,CAAC,IAAI,CAAC,EAAE,sBAAa,CAAC,CAC3D,CAAC;IACF,MAAM,OAAO,GAAG,IAAA,4CAAmC,EACjD;QACE,MAAM,EAAE;YACN,OAAO,EAAE,cAAc;YACvB,MAAM,EAAE,OAAO;SAChB;QACD,SAAS,EAAE,EAAE;KACd,EACD;QACE,IAAI,EAAE,cAAc;QACpB,IAAI,EAAE,KAAK;QACX,IAAI,EAAE;YACJ,IAAI,EAAE,OAAO,CAAC,IAAI;YAClB,OAAO,EAAE,OAAO,CAAC,OAAO;SACzB;KACK,CACT,CAAC;IAEF,MAAM,MAAM,GAAG,MAAA,OAAO,CAAC,CAAC,CAAC,mCAAI,QAAQ,OAAO,CAAC,IAAI,EAAE,CAAC;IAEpD,IAAA,mBAAU,EAAC,IAAI,EAAE,aAAa,EAAE,CAAC,IAAI,EAAE,EAAE;QACvC,IAAI,CAAC,IAAI,GAAG,GAAG,UAAU,IAAI,MAAM,EAAE,CAAC;QACtC,OAAO,IAAI,CAAC;IACd,CAAC,CAAC,CAAC;AACL,CAAC;AAxCD,0CAwCC"}

package/src/generators/move/schema.json

@@ -16,7 +16,8 @@
       "type": "string",
       "alias": "project",
       "description": "The name of the Angular project to move.",
-      "x-dropdown": "projects"
+      "x-dropdown": "projects",
+      "x-priority": "important"
     },
     "destination": {
       "type": "string",
@@ -24,7 +25,8 @@
       "$default": {
         "$source": "argv",
         "index": 0
-      }
+      },
+      "x-priority": "important"
     },
     "importPath": {
       "type": "string",
@@ -39,7 +41,8 @@
       "type": "boolean",
       "aliases": ["skip-format"],
       "description": "Skip formatting files.",
-      "default": false
+      "default": false,
+      "x-priority": "internal"
     }
   },
   "required": ["projectName", "destination"]

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

@@ -1,3 +1,3 @@
-import { Tree } from '@nrwl/devkit';
+import type { GeneratorCallback, Tree } from '@nrwl/devkit';
 import type { GeneratorOptions } from './schema';
-export declare function migrateFromAngularCli(tree: Tree, rawOptions: GeneratorOptions): Promise<() => void>;
+export declare function migrateFromAngularCli(tree: Tree, rawOptions: GeneratorOptions): Promise<GeneratorCallback>;