@nrwl/angular 15.9.0-beta.0 → 15.9.0-beta.2

package/generators.d.ts

@@ -4,12 +4,14 @@ export * from './src/generators/component-cypress-spec/component-cypress-spec';
 export * from './src/generators/component-story/component-story';
 export * from './src/generators/component/component';
 export * from './src/generators/convert-tslint-to-eslint/convert-tslint-to-eslint';
+export * from './src/generators/directive/directive';
 export * from './src/generators/host/host';
 export * from './src/generators/init/init';
 export * from './src/generators/library-secondary-entry-point/library-secondary-entry-point';
 export * from './src/generators/library/library';
 export * from './src/generators/move/move';
 export * from './src/generators/ngrx/ngrx';
+export * from './src/generators/pipe/pipe';
 export * from './src/generators/remote/remote';
 export * from './src/generators/scam-directive/scam-directive';
 export * from './src/generators/scam-pipe/scam-pipe';

package/generators.js

@@ -7,12 +7,14 @@ tslib_1.__exportStar(require("./src/generators/component-cypress-spec/component-
 tslib_1.__exportStar(require("./src/generators/component-story/component-story"), exports);
 tslib_1.__exportStar(require("./src/generators/component/component"), exports);
 tslib_1.__exportStar(require("./src/generators/convert-tslint-to-eslint/convert-tslint-to-eslint"), exports);
+tslib_1.__exportStar(require("./src/generators/directive/directive"), exports);
 tslib_1.__exportStar(require("./src/generators/host/host"), exports);
 tslib_1.__exportStar(require("./src/generators/init/init"), exports);
 tslib_1.__exportStar(require("./src/generators/library-secondary-entry-point/library-secondary-entry-point"), exports);
 tslib_1.__exportStar(require("./src/generators/library/library"), exports);
 tslib_1.__exportStar(require("./src/generators/move/move"), exports);
 tslib_1.__exportStar(require("./src/generators/ngrx/ngrx"), exports);
+tslib_1.__exportStar(require("./src/generators/pipe/pipe"), exports);
 tslib_1.__exportStar(require("./src/generators/remote/remote"), exports);
 tslib_1.__exportStar(require("./src/generators/scam-directive/scam-directive"), exports);
 tslib_1.__exportStar(require("./src/generators/scam-pipe/scam-pipe"), exports);

package/generators.js.map

@@ -1 +1 @@
-{"version":3,"file":"generators.js","sourceRoot":"","sources":["../../../packages/angular/generators.ts"],"names":[],"mappings":";;;AAAA,mFAAyD;AACzD,mFAAyD;AACzD,yGAA+E;AAC/E,2FAAiE;AACjE,+EAAqD;AACrD,6GAAmF;AACnF,qEAA2C;AAC3C,qEAA2C;AAC3C,uHAA6F;AAC7F,2EAAiD;AACjD,qEAA2C;AAC3C,qEAA2C;AAC3C,yEAA+C;AAC/C,yFAA+D;AAC/D,+EAAqD;AACrD,iGAAuE;AACvE,qEAA2C;AAC3C,6EAAmD;AACnD,+EAAqD;AACrD,yFAA+D;AAC/D,2EAAiD;AACjD,2GAAiF;AACjF,iFAAuD;AACvD,2HAAiG;AACjG,yFAA+D;AAC/D,mEAAyC"}
+{"version":3,"file":"generators.js","sourceRoot":"","sources":["../../../packages/angular/generators.ts"],"names":[],"mappings":";;;AAAA,mFAAyD;AACzD,mFAAyD;AACzD,yGAA+E;AAC/E,2FAAiE;AACjE,+EAAqD;AACrD,6GAAmF;AACnF,+EAAqD;AACrD,qEAA2C;AAC3C,qEAA2C;AAC3C,uHAA6F;AAC7F,2EAAiD;AACjD,qEAA2C;AAC3C,qEAA2C;AAC3C,qEAA2C;AAC3C,yEAA+C;AAC/C,yFAA+D;AAC/D,+EAAqD;AACrD,iGAAuE;AACvE,qEAA2C;AAC3C,6EAAmD;AACnD,+EAAqD;AACrD,yFAA+D;AAC/D,2EAAiD;AACjD,2GAAiF;AACjF,iFAAuD;AACvD,2HAAiG;AACjG,yFAA+D;AAC/D,mEAAyC"}

package/generators.json

@@ -195,6 +195,12 @@
       "schema": "./src/generators/convert-tslint-to-eslint/schema.json",
       "description": "Converts a project from TSLint to ESLint."
     },
+    "directive": {
+      "factory": "./src/generators/directive/directive",
+      "schema": "./src/generators/directive/schema.json",
+      "aliases": ["d"],
+      "description": "Generate an Angular directive."
+    },
     "init": {
       "factory": "./src/generators/init/init",
       "schema": "./src/generators/init/schema.json",
@@ -248,6 +254,12 @@
       "schema": "./src/generators/ngrx/schema.json",
       "description": "Adds NgRx support to an application or library."
     },
+    "pipe": {
+      "factory": "./src/generators/pipe/pipe",
+      "schema": "./src/generators/pipe/schema.json",
+      "description": "Generate an Angular Pipe",
+      "aliases": ["p"]
+    },
     "scam-to-standalone": {
       "factory": "./src/generators/scam-to-standalone/scam-to-standalone",
       "schema": "./src/generators/scam-to-standalone/schema.json",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nrwl/angular",
-  "version": "15.9.0-beta.0",
+  "version": "15.9.0-beta.2",
   "private": false,
   "description": "The Nx Plugin for Angular contains executors, generators, and utilities for managing Angular applications and libraries within an Nx workspace. It provides: \n\n- Integration with libraries such as Storybook, Jest, ESLint, Tailwind CSS, Cypress, and Protractor. \n\n- Generators to help scaffold code quickly (like: Micro Frontends, Libraries, both internal to your codebase and publishable to npm) \n\n- Upgrading AngularJS applications \n\n- Single Component Application Modules (SCAMs) \n\n- NgRx helpers. \n\n- Utilities for automatic workspace refactoring.",
   "repository": {
@@ -63,13 +63,13 @@
     "migrations": "./migrations.json"
   },
   "dependencies": {
-    "@nrwl/cypress": "15.9.0-beta.0",
-    "@nrwl/devkit": "15.9.0-beta.0",
-    "@nrwl/jest": "15.9.0-beta.0",
-    "@nrwl/js": "15.9.0-beta.0",
-    "@nrwl/linter": "15.9.0-beta.0",
-    "@nrwl/webpack": "15.9.0-beta.0",
-    "@nrwl/workspace": "15.9.0-beta.0",
+    "@nrwl/cypress": "15.9.0-beta.2",
+    "@nrwl/devkit": "15.9.0-beta.2",
+    "@nrwl/jest": "15.9.0-beta.2",
+    "@nrwl/js": "15.9.0-beta.2",
+    "@nrwl/linter": "15.9.0-beta.2",
+    "@nrwl/webpack": "15.9.0-beta.2",
+    "@nrwl/workspace": "15.9.0-beta.2",
     "@phenomnomnominal/tsquery": "4.1.1",
     "chalk": "^4.1.0",
     "chokidar": "^3.5.1",
@@ -108,5 +108,5 @@
   "fesm2015": "fesm2015/nrwl-angular.mjs",
   "typings": "index.d.ts",
   "sideEffects": false,
-  "gitHead": "e3e87f57fd740bf78945a4907745d03f18d057c3"
+  "gitHead": "567024e107950016a72ec7806e02ce81eb8269b9"
 }

package/src/builders/webpack-dev-server/webpack-dev-server.impl.js

@@ -14,38 +14,35 @@ const rxjs_1 = require("rxjs");
 const operators_2 = require("rxjs/operators");
 const typescript_1 = require("nx/src/utils/typescript");
 function executeWebpackDevServerBuilder(rawOptions, context) {
-    var _a, _b, _c, _d, _e, _f;
+    var _a, _b, _c;
     process.env.NX_TSCONFIG_PATH = (0, typescript_1.getRootTsConfigPath)();
     const options = (0, lib_1.normalizeOptions)(rawOptions);
     const parsedBrowserTarget = (0, devkit_1.parseTargetString)(options.browserTarget, (0, devkit_1.readCachedProjectGraph)());
     const browserTargetProjectConfiguration = (0, project_graph_1.readCachedProjectConfiguration)(parsedBrowserTarget.project);
     const buildTarget = browserTargetProjectConfiguration.targets[parsedBrowserTarget.target];
-    const buildTargetConfiguration = parsedBrowserTarget.configuration
+    const buildTargetOptions = Object.assign(Object.assign({}, buildTarget.options), (parsedBrowserTarget.configuration
         ? buildTarget.configurations[parsedBrowserTarget.configuration]
         : buildTarget.defaultConfiguration
             ? buildTarget.configurations[buildTarget.defaultConfiguration]
-            : buildTarget.options;
-    const buildLibsFromSource = (_c = (_b = (_a = options.buildLibsFromSource) !== null && _a !== void 0 ? _a : buildTargetConfiguration === null || buildTargetConfiguration === void 0 ? void 0 : buildTargetConfiguration.buildLibsFromSource) !== null && _b !== void 0 ? _b : buildTarget.options.buildLibsFromSource) !== null && _c !== void 0 ? _c : true;
-    const customWebpackConfig = (_d = buildTargetConfiguration === null || buildTargetConfiguration === void 0 ? void 0 : buildTargetConfiguration.customWebpackConfig) !== null && _d !== void 0 ? _d : buildTarget.options.customWebpackConfig;
+            : {}));
+    const buildLibsFromSource = (_b = (_a = options.buildLibsFromSource) !== null && _a !== void 0 ? _a : buildTargetOptions.buildLibsFromSource) !== null && _b !== void 0 ? _b : true;
     let pathToWebpackConfig;
-    if (customWebpackConfig && customWebpackConfig.path) {
-        pathToWebpackConfig = (0, devkit_1.joinPathFragments)(context.workspaceRoot, customWebpackConfig.path);
+    if ((_c = buildTargetOptions.customWebpackConfig) === null || _c === void 0 ? void 0 : _c.path) {
+        pathToWebpackConfig = (0, devkit_1.joinPathFragments)(context.workspaceRoot, buildTargetOptions.customWebpackConfig.path);
         if (pathToWebpackConfig && !(0, fs_1.existsSync)(pathToWebpackConfig)) {
             throw new Error(`Custom Webpack Config File Not Found!\nTo use a custom webpack config, please ensure the path to the custom webpack file is correct: \n${pathToWebpackConfig}`);
         }
     }
-    const indexFileTransformer = (_e = buildTargetConfiguration === null || buildTargetConfiguration === void 0 ? void 0 : buildTargetConfiguration.indexFileTransformer) !== null && _e !== void 0 ? _e : buildTarget.options.indexFileTransformer;
     let pathToIndexFileTransformer;
-    if (indexFileTransformer) {
-        pathToIndexFileTransformer = (0, devkit_1.joinPathFragments)(context.workspaceRoot, indexFileTransformer);
+    if (buildTargetOptions.indexFileTransformer) {
+        pathToIndexFileTransformer = (0, devkit_1.joinPathFragments)(context.workspaceRoot, buildTargetOptions.indexFileTransformer);
         if (pathToIndexFileTransformer && !(0, fs_1.existsSync)(pathToIndexFileTransformer)) {
             throw new Error(`File containing Index File Transformer function Not Found!\n Please ensure the path to the file containing the function is correct: \n${pathToIndexFileTransformer}`);
         }
     }
     let dependencies;
     if (!buildLibsFromSource) {
-        const buildTargetTsConfigPath = (_f = buildTargetConfiguration === null || buildTargetConfiguration === void 0 ? void 0 : buildTargetConfiguration.tsConfig) !== null && _f !== void 0 ? _f : buildTarget.options.tsConfig;
-        const { tsConfigPath, dependencies: foundDependencies } = (0, buildable_libs_1.createTmpTsConfigForBuildableLibs)(buildTargetTsConfigPath, context, {
+        const { tsConfigPath, dependencies: foundDependencies } = (0, buildable_libs_1.createTmpTsConfigForBuildableLibs)(buildTargetOptions.buildTargetTsConfigPath, context, {
             target: parsedBrowserTarget.target,
         });
         dependencies = foundDependencies;
@@ -65,7 +62,7 @@ function executeWebpackDevServerBuilder(rawOptions, context) {
         // otherwise the build will fail if customWebpack function/file is referencing
         // local libs. This synchronize the behavior with webpack-browser and
         // webpack-server implementation.
-        buildTargetConfiguration.tsConfig = tsConfigPath;
+        buildTargetOptions.tsConfig = tsConfigPath;
     }
     return (0, rxjs_1.from)(Promise.resolve().then(() => require('@angular-devkit/build-angular'))).pipe((0, operators_2.switchMap)(({ executeDevServerBuilder }) => executeDevServerBuilder(options, context, Object.assign({ webpackConfiguration: (baseWebpackConfig) => tslib_1.__awaiter(this, void 0, void 0, function* () {
             if (!buildLibsFromSource) {
@@ -83,10 +80,10 @@ function executeWebpackDevServerBuilder(rawOptions, context) {
             if (!pathToWebpackConfig) {
                 return baseWebpackConfig;
             }
-            return (0, webpack_1.mergeCustomWebpackConfig)(baseWebpackConfig, pathToWebpackConfig, buildTargetConfiguration, context.target);
+            return (0, webpack_1.mergeCustomWebpackConfig)(baseWebpackConfig, pathToWebpackConfig, buildTargetOptions, context.target);
         }) }, (pathToIndexFileTransformer
         ? {
-            indexHtml: (0, webpack_1.resolveIndexHtmlTransformer)(pathToIndexFileTransformer, buildTargetConfiguration.tsConfig, context.target),
+            indexHtml: (0, webpack_1.resolveIndexHtmlTransformer)(pathToIndexFileTransformer, buildTargetOptions.tsConfig, context.target),
         }
         : {})))));
 }

package/src/builders/webpack-dev-server/webpack-dev-server.impl.js.map

@@ -1 +1 @@
-{"version":3,"file":"webpack-dev-server.impl.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/builders/webpack-dev-server/webpack-dev-server.impl.ts"],"names":[],"mappings":";;;;AAAA,yCAIsB;AACtB,yHAAkH;AAElH,sEAAoF;AACpF,2BAAgC;AAChC,8DAA8D;AAC9D,kDAG8B;AAC9B,+BAAyC;AAEzC,gEAAgF;AAChF,+BAA4B;AAC5B,8CAA2C;AAC3C,wDAA8D;AAE9D,SAAgB,8BAA8B,CAC5C,UAAkB,EAClB,OAA2D;;IAE3D,OAAO,CAAC,GAAG,CAAC,gBAAgB,GAAG,IAAA,gCAAmB,GAAE,CAAC;IAErD,MAAM,OAAO,GAAG,IAAA,sBAAgB,EAAC,UAAU,CAAC,CAAC;IAE7C,MAAM,mBAAmB,GAAG,IAAA,0BAAiB,EAC3C,OAAO,CAAC,aAAa,EACrB,IAAA,+BAAsB,GAAE,CACzB,CAAC;IACF,MAAM,iCAAiC,GAAG,IAAA,8CAA8B,EACtE,mBAAmB,CAAC,OAAO,CAC5B,CAAC;IAEF,MAAM,WAAW,GACf,iCAAiC,CAAC,OAAO,CAAC,mBAAmB,CAAC,MAAM,CAAC,CAAC;IAExE,MAAM,wBAAwB,GAAG,mBAAmB,CAAC,aAAa;QAChE,CAAC,CAAC,WAAW,CAAC,cAAc,CAAC,mBAAmB,CAAC,aAAa,CAAC;QAC/D,CAAC,CAAC,WAAW,CAAC,oBAAoB;YAClC,CAAC,CAAC,WAAW,CAAC,cAAc,CAAC,WAAW,CAAC,oBAAoB,CAAC;YAC9D,CAAC,CAAC,WAAW,CAAC,OAAO,CAAC;IAExB,MAAM,mBAAmB,GACvB,MAAA,MAAA,MAAA,OAAO,CAAC,mBAAmB,mCAC3B,wBAAwB,aAAxB,wBAAwB,uBAAxB,wBAAwB,CAAE,mBAAmB,mCAC7C,WAAW,CAAC,OAAO,CAAC,mBAAmB,mCACvC,IAAI,CAAC;IAEP,MAAM,mBAAmB,GACvB,MAAA,wBAAwB,aAAxB,wBAAwB,uBAAxB,wBAAwB,CAAE,mBAAmB,mCAC7C,WAAW,CAAC,OAAO,CAAC,mBAAmB,CAAC;IAE1C,IAAI,mBAA2B,CAAC;IAChC,IAAI,mBAAmB,IAAI,mBAAmB,CAAC,IAAI,EAAE;QACnD,mBAAmB,GAAG,IAAA,0BAAiB,EACrC,OAAO,CAAC,aAAa,EACrB,mBAAmB,CAAC,IAAI,CACzB,CAAC;QAEF,IAAI,mBAAmB,IAAI,CAAC,IAAA,eAAU,EAAC,mBAAmB,CAAC,EAAE;YAC3D,MAAM,IAAI,KAAK,CACb,0IAA0I,mBAAmB,EAAE,CAChK,CAAC;SACH;KACF;IAED,MAAM,oBAAoB,GACxB,MAAA,wBAAwB,aAAxB,wBAAwB,uBAAxB,wBAAwB,CAAE,oBAAoB,mCAC9C,WAAW,CAAC,OAAO,CAAC,oBAAoB,CAAC;IAE3C,IAAI,0BAAkC,CAAC;IACvC,IAAI,oBAAoB,EAAE;QACxB,0BAA0B,GAAG,IAAA,0BAAiB,EAC5C,OAAO,CAAC,aAAa,EACrB,oBAAoB,CACrB,CAAC;QAEF,IAAI,0BAA0B,IAAI,CAAC,IAAA,eAAU,EAAC,0BAA0B,CAAC,EAAE;YACzE,MAAM,IAAI,KAAK,CACb,yIAAyI,0BAA0B,EAAE,CACtK,CAAC;SACH;KACF;IAED,IAAI,YAA6C,CAAC;IAClD,IAAI,CAAC,mBAAmB,EAAE;QACxB,MAAM,uBAAuB,GAC3B,MAAA,wBAAwB,aAAxB,wBAAwB,uBAAxB,wBAAwB,CAAE,QAAQ,mCAAI,WAAW,CAAC,OAAO,CAAC,QAAQ,CAAC;QACrE,MAAM,EAAE,YAAY,EAAE,YAAY,EAAE,iBAAiB,EAAE,GACrD,IAAA,kDAAiC,EAAC,uBAAuB,EAAE,OAAO,EAAE;YAClE,MAAM,EAAE,mBAAmB,CAAC,MAAM;SACnC,CAAC,CAAC;QACL,YAAY,GAAG,iBAAiB,CAAC;QAEjC,wEAAwE;QACxE,2EAA2E;QAC3E,oEAAoE;QACpE,2EAA2E;QAC3E,yEAAyE;QACzE,sCAAsC;QACtC,MAAM,wBAAwB,GAAG,OAAO,CAAC,gBAAgB,CAAC;QAC1D,OAAO,CAAC,gBAAgB,GAAG,CAAO,MAAM,EAAE,EAAE;YAC1C,MAAM,OAAO,GAAG,MAAM,wBAAwB,CAAC,MAAM,CAAC,CAAC;YACvD,OAAO,CAAC,QAAQ,GAAG,YAAY,CAAC;YAChC,OAAO,OAAO,CAAC;QACjB,CAAC,CAAA,CAAC;QAEF,6EAA6E;QAC7E,8EAA8E;QAC9E,qEAAqE;QACrE,iCAAiC;QACjC,wBAAwB,CAAC,QAAQ,GAAG,YAAY,CAAC;KAClD;IAED,OAAO,IAAA,WAAI,uCAAQ,+BAA+B,GAAE,CAAC,IAAI,CACvD,IAAA,qBAAS,EAAC,CAAC,EAAE,uBAAuB,EAAE,EAAE,EAAE,CACxC,uBAAuB,CAAC,OAAO,EAAE,OAAO,kBACtC,oBAAoB,EAAE,CAAO,iBAAiB,EAAE,EAAE;YAChD,IAAI,CAAC,mBAAmB,EAAE;gBACxB,MAAM,qBAAqB,GAAG,YAAY;qBACvC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,IAAA,wBAAY,EAAC,GAAG,CAAC,IAAI,CAAC,CAAC;qBACxC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBAC/B,8CAA8C;gBAC9C,sEAAsE;gBACtE,mCAAmC;gBACnC,kDAAkD;gBAClD,IAAI,qBAAqB,CAAC,MAAM,GAAG,CAAC,EAAE;oBACpC,iBAAiB,CAAC,OAAO,CAAC,IAAI,CAC5B,IAAI,uEAAgC,CAClC,wBACE,mBAAmB,CAAC,MACtB,eAAe,qBAAqB,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CACjD,CACF,CAAC;iBACH;aACF;YAED,IAAI,CAAC,mBAAmB,EAAE;gBACxB,OAAO,iBAAiB,CAAC;aAC1B;YAED,OAAO,IAAA,kCAAwB,EAC7B,iBAAiB,EACjB,mBAAmB,EACnB,wBAAwB,EACxB,OAAO,CAAC,MAAM,CACf,CAAC;QACJ,CAAC,CAAA,IAEE,CAAC,0BAA0B;QAC5B,CAAC,CAAC;YACE,SAAS,EAAE,IAAA,qCAA2B,EACpC,0BAA0B,EAC1B,wBAAwB,CAAC,QAAQ,EACjC,OAAO,CAAC,MAAM,CACf;SACF;QACH,CAAC,CAAC,EAAE,CAAC,EACP,CACH,CACF,CAAC;AACJ,CAAC;AAhJD,wEAgJC;AAED,kBAAe,OAAO,CAAC,2BAA2B,CAAC,CAAC,aAAa,CAC/D,8BAA8B,CACxB,CAAC"}
+{"version":3,"file":"webpack-dev-server.impl.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/builders/webpack-dev-server/webpack-dev-server.impl.ts"],"names":[],"mappings":"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"}

package/src/generators/application/angular-v14/lib/nrwl-home-tpl.js

@@ -248,6 +248,7 @@ exports.nrwlHomeTemplate = {
       }
       .button-pill {
         padding: 1.5rem 2rem;
+        margin-bottom: 2rem;
         transition-duration: 300ms;
         transition-property: background-color, border-color, color, fill, stroke,
           opacity, box-shadow, transform, filter, backdrop-filter,
@@ -283,10 +284,10 @@ exports.nrwlHomeTemplate = {
       .button-pill:hover {
         color: rgba(255, 255, 255, 1) !important;
       }
-      #nx-console:hover {
+      .nx-console:hover {
         background-color: rgba(0, 122, 204, 1);
       }
-      #nx-console svg {
+      .nx-console svg {
         color: rgba(0, 122, 204, 1);
       }
 
@@ -639,7 +640,7 @@ exports.nrwlHomeTemplate = {
             </a>
           </div>
           <div id="other-links">
-            <a id="nx-console" class="button-pill rounded shadow" href="https://marketplace.visualstudio.com/items?itemName=nrwl.angular-console&utm_source=nx-project" target="_blank" rel="noreferrer">
+            <a class="button-pill rounded shadow nx-console" href="https://marketplace.visualstudio.com/items?itemName=nrwl.angular-console&utm_source=nx-project" target="_blank" rel="noreferrer">
               <svg
                 fill="currentColor"
                 role="img"
@@ -652,8 +653,28 @@ exports.nrwlHomeTemplate = {
                 />
               </svg>
               <span>
-                Install Nx Console
-                <span>Plugin for VSCode</span>
+                Install Nx Console for VSCode
+                <span>The official VSCode plugin for Nx.</span>
+              </span>
+            </a>
+            <a
+              class="button-pill rounded shadow nx-console"
+              href="https://plugins.jetbrains.com/plugin/21060-nx-console"
+              target="_blank"
+              rel="noreferrer"
+            >
+              <svg
+                fill="currentColor"
+                role="img"
+                viewBox="0 0 24 24"
+                xmlns="http://www.w3.org/2000/svg"
+              >
+                <title>IntelliJ</title>
+                <path d="M0 0v24h24V0zm3.723 3.111h5v1.834h-1.39v6.277h1.39v1.834h-5v-1.834h1.444V4.945H3.723zm11.055 0H17v6.5c0 .612-.055 1.111-.222 1.556-.167.444-.39.777-.723 1.11-.277.279-.666.557-1.11.668a3.933 3.933 0 0 1-1.445.278c-.778 0-1.444-.167-1.944-.445a4.81 4.81 0 0 1-1.279-1.056l1.39-1.555c.277.334.555.555.833.722.277.167.611.278.945.278.389 0 .721-.111 1-.389.221-.278.333-.667.333-1.278zM2.222 19.5h9V21h-9z"></path>
+              </svg>
+              <span>
+                Install Nx Console for JetBrains
+                <span>Available for WebStorm, Intellij IDEA Ultimate and more!</span>
               </span>
             </a>
             <div id="nx-cloud" class="rounded shadow">

package/src/generators/application/angular-v14/lib/nrwl-home-tpl.js.map

@@ -1 +1 @@
-{"version":3,"file":"nrwl-home-tpl.js","sourceRoot":"","sources":["../../../../../../../../packages/angular/src/generators/application/angular-v14/lib/nrwl-home-tpl.ts"],"names":[],"mappings":";;;AAAa,QAAA,gBAAgB,GAAG;IAC9B,WAAW,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,IAAI,MAAM,iBAAiB,MAAM,cAAc;IACxE,QAAQ,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;sBA6aD,KAAK;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6WxB;CACF,CAAC"}
+{"version":3,"file":"nrwl-home-tpl.js","sourceRoot":"","sources":["../../../../../../../../packages/angular/src/generators/application/angular-v14/lib/nrwl-home-tpl.ts"],"names":[],"mappings":";;;AAAa,QAAA,gBAAgB,GAAG;IAC9B,WAAW,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,IAAI,MAAM,iBAAiB,MAAM,cAAc;IACxE,QAAQ,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;sBA8aD,KAAK;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAiYxB;CACF,CAAC"}

package/src/generators/application/lib/nrwl-home-tpl.js

@@ -248,6 +248,7 @@ exports.nrwlHomeTemplate = {
       }
       .button-pill {
         padding: 1.5rem 2rem;
+        margin-bottom: 2rem;
         transition-duration: 300ms;
         transition-property: background-color, border-color, color, fill, stroke,
           opacity, box-shadow, transform, filter, backdrop-filter,
@@ -283,10 +284,10 @@ exports.nrwlHomeTemplate = {
       .button-pill:hover {
         color: rgba(255, 255, 255, 1) !important;
       }
-      #nx-console:hover {
+      .nx-console:hover {
         background-color: rgba(0, 122, 204, 1);
       }
-      #nx-console svg {
+      .nx-console svg {
         color: rgba(0, 122, 204, 1);
       }
 
@@ -639,7 +640,7 @@ exports.nrwlHomeTemplate = {
             </a>
           </div>
           <div id="other-links">
-            <a id="nx-console" class="button-pill rounded shadow" href="https://marketplace.visualstudio.com/items?itemName=nrwl.angular-console&utm_source=nx-project" target="_blank" rel="noreferrer">
+            <a class="button-pill rounded shadow nx-console" href="https://marketplace.visualstudio.com/items?itemName=nrwl.angular-console&utm_source=nx-project" target="_blank" rel="noreferrer">
               <svg
                 fill="currentColor"
                 role="img"
@@ -652,8 +653,28 @@ exports.nrwlHomeTemplate = {
                 />
               </svg>
               <span>
-                Install Nx Console
-                <span>Plugin for VSCode</span>
+                Install Nx Console for VSCode
+                <span>The official VSCode plugin for Nx.</span>
+              </span>
+            </a>
+            <a
+              class="button-pill rounded shadow nx-console"
+              href="https://plugins.jetbrains.com/plugin/21060-nx-console"
+              target="_blank"
+              rel="noreferrer"
+            >
+              <svg
+                fill="currentColor"
+                role="img"
+                viewBox="0 0 24 24"
+                xmlns="http://www.w3.org/2000/svg"
+              >
+                <title>IntelliJ</title>
+                <path d="M0 0v24h24V0zm3.723 3.111h5v1.834h-1.39v6.277h1.39v1.834h-5v-1.834h1.444V4.945H3.723zm11.055 0H17v6.5c0 .612-.055 1.111-.222 1.556-.167.444-.39.777-.723 1.11-.277.279-.666.557-1.11.668a3.933 3.933 0 0 1-1.445.278c-.778 0-1.444-.167-1.944-.445a4.81 4.81 0 0 1-1.279-1.056l1.39-1.555c.277.334.555.555.833.722.277.167.611.278.945.278.389 0 .721-.111 1-.389.221-.278.333-.667.333-1.278zM2.222 19.5h9V21h-9z"></path>
+              </svg>
+              <span>
+                Install Nx Console for JetBrains
+                <span>Available for WebStorm, Intellij IDEA Ultimate and more!</span>
               </span>
             </a>
             <div id="nx-cloud" class="rounded shadow">

package/src/generators/application/lib/nrwl-home-tpl.js.map

@@ -1 +1 @@
-{"version":3,"file":"nrwl-home-tpl.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/application/lib/nrwl-home-tpl.ts"],"names":[],"mappings":";;;AAAa,QAAA,gBAAgB,GAAG;IAC9B,WAAW,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,IAAI,MAAM,iBAAiB,MAAM,cAAc;IACxE,QAAQ,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;sBA6aD,KAAK;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6WxB;CACF,CAAC"}
+{"version":3,"file":"nrwl-home-tpl.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/application/lib/nrwl-home-tpl.ts"],"names":[],"mappings":";;;AAAa,QAAA,gBAAgB,GAAG;IAC9B,WAAW,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,IAAI,MAAM,iBAAiB,MAAM,cAAc;IACxE,QAAQ,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;sBA8aD,KAAK;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAiYxB;CACF,CAAC"}

package/src/generators/component/component.js

@@ -3,11 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.componentGenerator = void 0;
 const tslib_1 = require("tslib");
 const devkit_1 = require("@nrwl/devkit");
+const semver_1 = require("semver");
 const path_1 = require("../utils/path");
+const version_utils_1 = require("../utils/version-utils");
 const component_1 = require("./lib/component");
 const normalize_options_1 = require("./lib/normalize-options");
-const version_utils_1 = require("../utils/version-utils");
-const semver_1 = require("semver");
 function componentGenerator(tree, rawOptions) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         const installedAngularVersionInfo = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
@@ -18,7 +18,7 @@ function componentGenerator(tree, rawOptions) {
         }
         const options = yield (0, normalize_options_1.normalizeOptions)(tree, rawOptions);
         const { projectSourceRoot } = options, schematicOptions = tslib_1.__rest(options, ["projectSourceRoot"]);
-        checkPathUnderProjectRoot(tree, options);
+        (0, path_1.checkPathUnderProjectRoot)(tree, options.project, options.path);
         const { wrapAngularDevkitSchematic } = require('@nrwl/devkit/ngcli-adapter');
         const angularComponentSchematic = wrapAngularDevkitSchematic('@schematics/angular', 'component');
         yield angularComponentSchematic(tree, schematicOptions);
@@ -27,21 +27,5 @@ function componentGenerator(tree, rawOptions) {
     });
 }
 exports.componentGenerator = componentGenerator;
-function checkPathUnderProjectRoot(tree, schema) {
-    var _a;
-    if (!schema.path) {
-        return;
-    }
-    const project = (_a = schema.project) !== null && _a !== void 0 ? _a : (0, devkit_1.readNxJson)(tree).defaultProject;
-    const { root } = (0, devkit_1.readProjectConfiguration)(tree, project);
-    let pathToComponent = (0, devkit_1.normalizePath)(schema.path);
-    pathToComponent = pathToComponent.startsWith('/')
-        ? pathToComponent.slice(1)
-        : pathToComponent;
-    if (!(0, path_1.pathStartsWith)(pathToComponent, root)) {
-        throw new Error(`The path provided for the component (${schema.path}) does not exist under the project root (${root}). ` +
-            `Please make sure to provide a path that exists under the project root.`);
-    }
-}
 exports.default = componentGenerator;
 //# sourceMappingURL=component.js.map

package/src/generators/component/component.js.map

@@ -1 +1 @@
-{"version":3,"file":"component.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/component/component.ts"],"names":[],"mappings":";;;;AACA,yCAMsB;AACtB,wCAA+C;AAC/C,+CAA8D;AAC9D,+DAA2D;AAE3D,0DAAwE;AACxE,mCAA4B;AAE5B,SAAsB,kBAAkB,CAAC,IAAU,EAAE,UAAkB;;QACrE,MAAM,2BAA2B,GAAG,IAAA,8CAA8B,EAAC,IAAI,CAAC,CAAC;QAEzE,IACE,IAAA,WAAE,EAAC,2BAA2B,CAAC,OAAO,EAAE,QAAQ,CAAC;YACjD,UAAU,CAAC,UAAU,EACrB;YACA,MAAM,IAAI,KAAK,CAAC,IAAA,qBAAY,EAAA,2FAA2F,2BAA2B,CAAC,OAAO;sGACxD,CAAC,CAAC;SACrG;QAED,MAAM,OAAO,GAAG,MAAM,IAAA,oCAAgB,EAAC,IAAI,EAAE,UAAU,CAAC,CAAC;QACzD,MAAM,EAAE,iBAAiB,KAA0B,OAAO,EAA5B,gBAAgB,kBAAK,OAAO,EAApD,qBAA0C,CAAU,CAAC;QAE3D,yBAAyB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAEzC,MAAM,EAAE,0BAA0B,EAAE,GAAG,OAAO,CAAC,4BAA4B,CAAC,CAAC;QAC7E,MAAM,yBAAyB,GAAG,0BAA0B,CAC1D,qBAAqB,EACrB,WAAW,CACZ,CAAC;QACF,MAAM,yBAAyB,CAAC,IAAI,EAAE,gBAAgB,CAAC,CAAC;QAExD,IAAA,uCAA2B,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAE3C,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;CAAA;AA1BD,gDA0BC;AAED,SAAS,yBAAyB,CAAC,IAAU,EAAE,MAAwB;;IACrE,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE;QAChB,OAAO;KACR;IAED,MAAM,OAAO,GAAG,MAAA,MAAM,CAAC,OAAO,mCAAI,IAAA,mBAAU,EAAC,IAAI,CAAC,CAAC,cAAc,CAAC;IAClE,MAAM,EAAE,IAAI,EAAE,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAEzD,IAAI,eAAe,GAAG,IAAA,sBAAa,EAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IACjD,eAAe,GAAG,eAAe,CAAC,UAAU,CAAC,GAAG,CAAC;QAC/C,CAAC,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC,CAAC;QAC1B,CAAC,CAAC,eAAe,CAAC;IAEpB,IAAI,CAAC,IAAA,qBAAc,EAAC,eAAe,EAAE,IAAI,CAAC,EAAE;QAC1C,MAAM,IAAI,KAAK,CACb,wCAAwC,MAAM,CAAC,IAAI,4CAA4C,IAAI,KAAK;YACtG,wEAAwE,CAC3E,CAAC;KACH;AACH,CAAC;AAED,kBAAe,kBAAkB,CAAC"}
+{"version":3,"file":"component.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/component/component.ts"],"names":[],"mappings":";;;;AACA,yCAAyD;AACzD,mCAA4B;AAC5B,wCAA0D;AAC1D,0DAAwE;AACxE,+CAA8D;AAC9D,+DAA2D;AAG3D,SAAsB,kBAAkB,CAAC,IAAU,EAAE,UAAkB;;QACrE,MAAM,2BAA2B,GAAG,IAAA,8CAA8B,EAAC,IAAI,CAAC,CAAC;QAEzE,IACE,IAAA,WAAE,EAAC,2BAA2B,CAAC,OAAO,EAAE,QAAQ,CAAC;YACjD,UAAU,CAAC,UAAU,EACrB;YACA,MAAM,IAAI,KAAK,CAAC,IAAA,qBAAY,EAAA,2FAA2F,2BAA2B,CAAC,OAAO;sGACxD,CAAC,CAAC;SACrG;QAED,MAAM,OAAO,GAAG,MAAM,IAAA,oCAAgB,EAAC,IAAI,EAAE,UAAU,CAAC,CAAC;QACzD,MAAM,EAAE,iBAAiB,KAA0B,OAAO,EAA5B,gBAAgB,kBAAK,OAAO,EAApD,qBAA0C,CAAU,CAAC;QAE3D,IAAA,gCAAyB,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;QAE/D,MAAM,EAAE,0BAA0B,EAAE,GAAG,OAAO,CAAC,4BAA4B,CAAC,CAAC;QAC7E,MAAM,yBAAyB,GAAG,0BAA0B,CAC1D,qBAAqB,EACrB,WAAW,CACZ,CAAC;QACF,MAAM,yBAAyB,CAAC,IAAI,EAAE,gBAAgB,CAAC,CAAC;QAExD,IAAA,uCAA2B,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAE3C,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;CAAA;AA1BD,gDA0BC;AAED,kBAAe,kBAAkB,CAAC"}

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

@@ -3,34 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeOptions = void 0;
 const tslib_1 = require("tslib");
 const devkit_1 = require("@nrwl/devkit");
-const find_project_for_path_1 = require("nx/src/project-graph/utils/find-project-for-path");
-function findProjectFromOptions(options) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const projectGraph = yield (0, devkit_1.createProjectGraphAsync)();
-        const projectRootMappings = (0, find_project_for_path_1.createProjectRootMappings)(projectGraph.nodes);
-        // path can be undefined when running on the root of the workspace, we default to the root
-        // to handle standalone layouts
-        return (0, find_project_for_path_1.findProjectForPath)(options.path || '', projectRootMappings);
-    });
-}
 function normalizeOptions(tree, options) {
-    var _a, _b, _c;
+    var _a;
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const project = (_b = (_a = options.project) !== null && _a !== void 0 ? _a : (yield findProjectFromOptions(options))) !== null && _b !== void 0 ? _b : (0, devkit_1.readNxJson)(tree).defaultProject;
-        if (!project) {
-            // path is hidden, so if not provided we don't suggest setting it
-            if (!options.path) {
-                throw new Error('No "project" was specified and "defaultProject" is not set in the workspace configuration. Please provide the "project" option and try again.');
-            }
-            // path was provided, so it's wrong and we should mention it
-            throw new Error('The provided "path" is wrong and no "project" was specified and "defaultProject" is not set in the workspace configuration. ' +
-                'Please provide a correct "path" or provide the "project" option instead and try again.');
-        }
-        const { projectType, root, sourceRoot } = (0, devkit_1.readProjectConfiguration)(tree, project);
+        const { projectType, root, sourceRoot } = (0, devkit_1.readProjectConfiguration)(tree, options.project);
         const projectSourceRoot = sourceRoot !== null && sourceRoot !== void 0 ? sourceRoot : (0, devkit_1.joinPathFragments)(root, 'src');
-        const path = (_c = options.path) !== null && _c !== void 0 ? _c : (0, devkit_1.joinPathFragments)(projectSourceRoot, projectType === 'application' ? 'app' : 'lib');
+        const path = (_a = options.path) !== null && _a !== void 0 ? _a : (0, devkit_1.joinPathFragments)(projectSourceRoot, projectType === 'application' ? 'app' : 'lib');
         return Object.assign(Object.assign({}, options), { path,
-            project,
             projectSourceRoot });
     });
 }

package/src/generators/component/lib/normalize-options.js.map

@@ -1 +1 @@
-{"version":3,"file":"normalize-options.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/component/lib/normalize-options.ts"],"names":[],"mappings":";;;;AACA,yCAKsB;AAEtB,4FAG0D;AAE1D,SAAe,sBAAsB,CAAC,OAAe;;QACnD,MAAM,YAAY,GAAG,MAAM,IAAA,gCAAuB,GAAE,CAAC;QACrD,MAAM,mBAAmB,GAAG,IAAA,iDAAyB,EAAC,YAAY,CAAC,KAAK,CAAC,CAAC;QAE1E,0FAA0F;QAC1F,+BAA+B;QAC/B,OAAO,IAAA,0CAAkB,EAAC,OAAO,CAAC,IAAI,IAAI,EAAE,EAAE,mBAAmB,CAAC,CAAC;IACrE,CAAC;CAAA;AAED,SAAsB,gBAAgB,CACpC,IAAU,EACV,OAAe;;;QAEf,MAAM,OAAO,GACX,MAAA,MAAA,OAAO,CAAC,OAAO,mCACf,CAAC,MAAM,sBAAsB,CAAC,OAAO,CAAC,CAAC,mCACvC,IAAA,mBAAU,EAAC,IAAI,CAAC,CAAC,cAAc,CAAC;QAElC,IAAI,CAAC,OAAO,EAAE;YACZ,iEAAiE;YACjE,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE;gBACjB,MAAM,IAAI,KAAK,CACb,+IAA+I,CAChJ,CAAC;aACH;YAED,4DAA4D;YAC5D,MAAM,IAAI,KAAK,CACb,8HAA8H;gBAC5H,wFAAwF,CAC3F,CAAC;SACH;QAED,MAAM,EAAE,WAAW,EAAE,IAAI,EAAE,UAAU,EAAE,GAAG,IAAA,iCAAwB,EAChE,IAAI,EACJ,OAAO,CACR,CAAC;QACF,MAAM,iBAAiB,GAAG,UAAU,aAAV,UAAU,cAAV,UAAU,GAAI,IAAA,0BAAiB,EAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QACvE,MAAM,IAAI,GACR,MAAA,OAAO,CAAC,IAAI,mCACZ,IAAA,0BAAiB,EACf,iBAAiB,EACjB,WAAW,KAAK,aAAa,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAC9C,CAAC;QAEJ,uCACK,OAAO,KACV,IAAI;YACJ,OAAO;YACP,iBAAiB,IACjB;;CACH;AA1CD,4CA0CC"}
+{"version":3,"file":"normalize-options.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/component/lib/normalize-options.ts"],"names":[],"mappings":";;;;AACA,yCAA2E;AAG3E,SAAsB,gBAAgB,CACpC,IAAU,EACV,OAAe;;;QAEf,MAAM,EAAE,WAAW,EAAE,IAAI,EAAE,UAAU,EAAE,GAAG,IAAA,iCAAwB,EAChE,IAAI,EACJ,OAAO,CAAC,OAAO,CAChB,CAAC;QACF,MAAM,iBAAiB,GAAG,UAAU,aAAV,UAAU,cAAV,UAAU,GAAI,IAAA,0BAAiB,EAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QACvE,MAAM,IAAI,GACR,MAAA,OAAO,CAAC,IAAI,mCACZ,IAAA,0BAAiB,EACf,iBAAiB,EACjB,WAAW,KAAK,aAAa,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAC9C,CAAC;QAEJ,uCACK,OAAO,KACV,IAAI;YACJ,iBAAiB,IACjB;;CACH;AArBD,4CAqBC"}

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

@@ -1,7 +1,7 @@
 export interface Schema {
   name: string;
+  project: string;
   path?: string;
-  project?: string;
   displayBlock?: boolean;
   inlineStyle?: boolean;
   inlineTemplate?: boolean;
@@ -21,6 +21,5 @@ export interface Schema {
 
 export interface NormalizedSchema extends Schema {
   path: string;
-  project: string;
   projectSourceRoot: string;
 }

package/src/generators/component/schema.json

@@ -16,6 +16,9 @@
     "project": {
       "type": "string",
       "description": "The name of the project.",
+      "$default": {
+        "$source": "projectName"
+      },
       "x-dropdown": "projects"
     },
     "name": {

package/src/generators/component-cypress-spec/schema.json

@@ -8,6 +8,9 @@
     "projectName": {
       "type": "string",
       "description": "The name of the project.",
+      "$default": {
+        "$source": "projectName"
+      },
       "examples": ["ui-samples"],
       "x-priority": "important"
     },

package/src/generators/component-test/schema.json

@@ -8,6 +8,9 @@
     "project": {
       "type": "string",
       "description": "The name of the project where the component is located.",
+      "$default": {
+        "$source": "projectName"
+      },
       "x-dropdown": "projects",
       "x-prompt": "What project is the component located in?",
       "x-priority": "important"

package/src/generators/cypress-component-configuration/schema.json

@@ -9,6 +9,9 @@
     "project": {
       "type": "string",
       "description": "The name of the project to add cypress component testing configuration to",
+      "$default": {
+        "$source": "projectName"
+      },
       "x-dropdown": "projects",
       "x-prompt": "What project should we add Cypress component testing to?",
       "x-priority": "important"

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

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

package/src/generators/directive/directive.js

@@ -0,0 +1,51 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.directiveGenerator = void 0;
+const tslib_1 = require("tslib");
+const devkit_1 = require("@nrwl/devkit");
+const path_1 = require("../utils/path");
+const utils_1 = require("../utils");
+let tsModule;
+function directiveGenerator(tree, schema) {
+    var _a, _b, _c;
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        const projects = (0, devkit_1.getProjects)(tree);
+        if (!projects.has(schema.project)) {
+            throw new Error(`Project "${schema.project}" does not exist!`);
+        }
+        (0, path_1.checkPathUnderProjectRoot)(tree, schema.project, schema.path);
+        const project = (0, devkit_1.readProjectConfiguration)(tree, schema.project);
+        const path = (_a = schema.path) !== null && _a !== void 0 ? _a : `${project.sourceRoot}`;
+        const directiveNames = (0, devkit_1.names)(schema.name);
+        const selector = (_b = schema.selector) !== null && _b !== void 0 ? _b : buildSelector(tree, schema.name, (_c = schema.prefix) !== null && _c !== void 0 ? _c : project.prefix);
+        const pathToGenerateFiles = schema.flat
+            ? './files/__directiveFileName__'
+            : './files';
+        yield (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, pathToGenerateFiles), path, {
+            selector,
+            directiveClassName: directiveNames.className,
+            directiveFileName: directiveNames.fileName,
+            standalone: schema.standalone,
+            tpl: '',
+        });
+        if (schema.skipTests) {
+            const pathToSpecFile = (0, devkit_1.joinPathFragments)(path, `${!schema.flat ? `${directiveNames.fileName}/` : ``}${directiveNames.fileName}.directive.spec.ts`);
+            tree.delete(pathToSpecFile);
+        }
+        if (!schema.skipImport && !schema.standalone) {
+            const modulePath = (0, utils_1.findModule)(tree, path, schema.module);
+            (0, utils_1.addToNgModule)(tree, path, modulePath, directiveNames.fileName, `${directiveNames.className}Directive`, `${directiveNames.fileName}.directive`, 'declarations', schema.flat, schema.export);
+        }
+        if (!schema.skipFormat) {
+            yield (0, devkit_1.formatFiles)(tree);
+        }
+    });
+}
+exports.directiveGenerator = directiveGenerator;
+function buildSelector(tree, name, prefix) {
+    let selector = (0, devkit_1.names)(name).fileName;
+    const selectorPrefix = (0, devkit_1.names)(prefix !== null && prefix !== void 0 ? prefix : (0, devkit_1.readNxJson)(tree).npmScope).fileName;
+    return (0, devkit_1.names)(`${selectorPrefix}-${selector}`).propertyName;
+}
+exports.default = directiveGenerator;
+//# sourceMappingURL=directive.js.map

package/src/generators/directive/directive.js.map

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

package/src/generators/directive/files/__directiveFileName__/__directiveFileName__.directive.spec.ts__tpl__

@@ -0,0 +1,8 @@
+import { <%= directiveClassName %>Directive } from './<%= directiveFileName %>.directive';
+
+describe('<%= directiveClassName %>Directive', () => {
+  it('should create an instance', () => {
+    const directive = new <%= directiveClassName %>Directive();
+    expect(directive).toBeTruthy();
+  });
+});

package/src/generators/directive/files/__directiveFileName__/__directiveFileName__.directive.ts__tpl__

@@ -0,0 +1,11 @@
+import { Directive } from '@angular/core';
+
+@Directive({
+  selector: '[<%= selector %>]'<% if(standalone) {%>,
+  standalone: true<%}%>
+})
+export class <%= directiveClassName %>Directive {
+
+  constructor() { }
+
+}

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

@@ -0,0 +1,14 @@
+export interface Schema {
+  name: string;
+  project: string;
+  path?: string;
+  prefix?: string;
+  skipTests?: boolean;
+  skipImport?: boolean;
+  selector?: string;
+  standalone?: boolean;
+  flat?: boolean;
+  module?: string;
+  export?: boolean;
+  skipFormat?: boolean;
+}