@nrwl/angular 15.9.0-beta.9 → 15.9.0-rc.1

package/executors.json

@@ -14,11 +14,6 @@
       "implementation": "./src/executors/package/package.impl",
       "schema": "./src/executors/package/schema.json",
       "description": "Builds and packages an Angular library producing an output following the Angular Package Format (APF) to be distributed as an NPM package.\nThis executor is similar to the `@angular-devkit/build-angular:ng-packagr` with additional support for incremental builds."
-    },
-    "file-server": {
-      "implementation": "./src/executors/file-server/file-server.impl",
-      "schema": "./src/executors/file-server/schema.json",
-      "description": "Serves a static web application from a folder."
     }
   },
   "builders": {
@@ -61,11 +56,6 @@
       "implementation": "./src/builders/module-federation-dev-ssr/module-federation-dev-ssr.impl",
       "schema": "./src/builders/module-federation-dev-ssr/schema.json",
       "description": "The module-federation-dev-ssr executor is reserved exclusively for use with host Module Federation applications that use SSR. It allows the user to specify which remote applications should be served with the host."
-    },
-    "file-server": {
-      "implementation": "./src/executors/file-server/compat",
-      "schema": "./src/executors/file-server/schema.json",
-      "description": "Serve a web application from a folder."
     }
   }
 }

package/migrations.json

@@ -158,6 +158,12 @@
       "version": "15.9.0-beta.3",
       "description": "Update the tsconfig.spec.json to use target es2016 for jest-preset-angular v13",
       "factory": "./src/migrations/update-15-9-0/update-testing-tsconfig"
+    },
+    "update-file-server-executor": {
+      "cli": "nx",
+      "version": "15.9.0-beta.9",
+      "description": "Update the file-server executor to use @nrwl/web:file-server",
+      "factory": "./src/migrations/update-15-9-0/update-file-server-executor"
     }
   },
   "packageJsonUpdates": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nrwl/angular",
-  "version": "15.9.0-beta.9",
+  "version": "15.9.0-rc.1",
   "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, and Cypress. \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.9",
-    "@nrwl/devkit": "15.9.0-beta.9",
-    "@nrwl/jest": "15.9.0-beta.9",
-    "@nrwl/js": "15.9.0-beta.9",
-    "@nrwl/linter": "15.9.0-beta.9",
-    "@nrwl/webpack": "15.9.0-beta.9",
-    "@nrwl/workspace": "15.9.0-beta.9",
+    "@nrwl/cypress": "15.9.0-rc.1",
+    "@nrwl/devkit": "15.9.0-rc.1",
+    "@nrwl/jest": "15.9.0-rc.1",
+    "@nrwl/js": "15.9.0-rc.1",
+    "@nrwl/linter": "15.9.0-rc.1",
+    "@nrwl/webpack": "15.9.0-rc.1",
+    "@nrwl/workspace": "15.9.0-rc.1",
     "@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": "f1dc1520243ccb061993186c5793653cacd31ed6"
+  "gitHead": "c4a23881bfd9c5751ec80ed754af9d223038d5a3"
 }

package/src/generators/application/lib/add-e2e.js

@@ -19,7 +19,6 @@ function addE2e(tree, options) {
                 skipFormat: options.skipFormat,
                 standaloneConfig: options.standaloneConfig,
                 skipPackageJson: options.skipPackageJson,
-                rootProject: options.rootProject,
             });
         }
     });

package/src/generators/application/lib/add-e2e.js.map

@@ -1 +1 @@
-{"version":3,"file":"add-e2e.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/application/lib/add-e2e.ts"],"names":[],"mappings":";;;;AAGA,yCAGsB;AACtB,2CAAwD;AACxD,mEAA8D;AAE9D,SAAsB,MAAM,CAAC,IAAU,EAAE,OAAyB;;QAChE,IAAA,2CAAmB,EAAC,IAAI,EAAE,OAAO,EAAE,OAAO,CAAC,qBAAqB,CAAC,CAAC;QAElE,IAAI,OAAO,CAAC,aAAa,KAAK,SAAS,EAAE;YACvC,kIAAkI;YAClI,mBAAmB,CAAC,IAAI,EAAE,OAAO,EAAE,cAAc,CAAC,CAAC;YAEnD,MAAM,IAAA,iCAAuB,EAAC,IAAI,EAAE;gBAClC,IAAI,EAAE,OAAO,CAAC,cAAc;gBAC5B,SAAS,EAAE,OAAO,CAAC,SAAS;gBAC5B,OAAO,EAAE,OAAO,CAAC,IAAI;gBACrB,MAAM,EAAE,OAAO,CAAC,MAAM;gBACtB,UAAU,EAAE,OAAO,CAAC,UAAU;gBAC9B,gBAAgB,EAAE,OAAO,CAAC,gBAAgB;gBAC1C,eAAe,EAAE,OAAO,CAAC,eAAe;gBACxC,WAAW,EAAE,OAAO,CAAC,WAAW;aACjC,CAAC,CAAC;SACJ;IACH,CAAC;CAAA;AAlBD,wBAkBC;AAED,SAAS,mBAAmB,CAC1B,IAAU,EACV,OAAyB,EACzB,UAAkB;IAElB,MAAM,aAAa,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IACnE,aAAa,CAAC,OAAO,CAAC,UAAU,CAAC,GAAG;QAClC,QAAQ,EAAE,2BAA2B;QACrC,OAAO,EAAE;YACP,WAAW,EAAE,GAAG,OAAO,CAAC,IAAI,QAAQ;YACpC,IAAI,EAAE,OAAO,CAAC,IAAI;SACnB;KACF,CAAC;IACF,IAAA,mCAA0B,EAAC,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,aAAa,CAAC,CAAC;AAChE,CAAC"}
+{"version":3,"file":"add-e2e.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/application/lib/add-e2e.ts"],"names":[],"mappings":";;;;AAGA,yCAGsB;AACtB,2CAAwD;AACxD,mEAA8D;AAE9D,SAAsB,MAAM,CAAC,IAAU,EAAE,OAAyB;;QAChE,IAAA,2CAAmB,EAAC,IAAI,EAAE,OAAO,EAAE,OAAO,CAAC,qBAAqB,CAAC,CAAC;QAElE,IAAI,OAAO,CAAC,aAAa,KAAK,SAAS,EAAE;YACvC,kIAAkI;YAClI,mBAAmB,CAAC,IAAI,EAAE,OAAO,EAAE,cAAc,CAAC,CAAC;YAEnD,MAAM,IAAA,iCAAuB,EAAC,IAAI,EAAE;gBAClC,IAAI,EAAE,OAAO,CAAC,cAAc;gBAC5B,SAAS,EAAE,OAAO,CAAC,SAAS;gBAC5B,OAAO,EAAE,OAAO,CAAC,IAAI;gBACrB,MAAM,EAAE,OAAO,CAAC,MAAM;gBACtB,UAAU,EAAE,OAAO,CAAC,UAAU;gBAC9B,gBAAgB,EAAE,OAAO,CAAC,gBAAgB;gBAC1C,eAAe,EAAE,OAAO,CAAC,eAAe;aACzC,CAAC,CAAC;SACJ;IACH,CAAC;CAAA;AAjBD,wBAiBC;AAED,SAAS,mBAAmB,CAC1B,IAAU,EACV,OAAyB,EACzB,UAAkB;IAElB,MAAM,aAAa,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IACnE,aAAa,CAAC,OAAO,CAAC,UAAU,CAAC,GAAG;QAClC,QAAQ,EAAE,2BAA2B;QACrC,OAAO,EAAE;YACP,WAAW,EAAE,GAAG,OAAO,CAAC,IAAI,QAAQ;YACpC,IAAI,EAAE,OAAO,CAAC,IAAI;SACnB;KACF,CAAC;IACF,IAAA,mCAA0B,EAAC,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,aAAa,CAAC,CAAC;AAChE,CAAC"}

package/src/generators/application/lib/add-unit-test-runner.js

@@ -13,7 +13,6 @@ function addUnitTestRunner(host, options) {
                 supportTsx: false,
                 skipSerializers: false,
                 skipPackageJson: options.skipPackageJson,
-                rootProject: options.rootProject,
             });
         }
     });

package/src/generators/application/lib/add-unit-test-runner.js.map

@@ -1 +1 @@
-{"version":3,"file":"add-unit-test-runner.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/application/lib/add-unit-test-runner.ts"],"names":[],"mappings":";;;;AAGA,qCAAkD;AAElD,8DAA6D;AAE7D,SAAsB,iBAAiB,CAAC,IAAU,EAAE,OAAyB;;QAC3E,IAAI,OAAO,CAAC,cAAc,KAAK,6BAAc,CAAC,IAAI,EAAE;YAClD,MAAM,IAAA,2BAAoB,EAAC,IAAI,EAAE;gBAC/B,OAAO,EAAE,OAAO,CAAC,IAAI;gBACrB,SAAS,EAAE,SAAS;gBACpB,UAAU,EAAE,KAAK;gBACjB,eAAe,EAAE,KAAK;gBACtB,eAAe,EAAE,OAAO,CAAC,eAAe;gBACxC,WAAW,EAAE,OAAO,CAAC,WAAW;aACjC,CAAC,CAAC;SACJ;IACH,CAAC;CAAA;AAXD,8CAWC"}
+{"version":3,"file":"add-unit-test-runner.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/application/lib/add-unit-test-runner.ts"],"names":[],"mappings":";;;;AAGA,qCAAkD;AAElD,8DAA6D;AAE7D,SAAsB,iBAAiB,CAAC,IAAU,EAAE,OAAyB;;QAC3E,IAAI,OAAO,CAAC,cAAc,KAAK,6BAAc,CAAC,IAAI,EAAE;YAClD,MAAM,IAAA,2BAAoB,EAAC,IAAI,EAAE;gBAC/B,OAAO,EAAE,OAAO,CAAC,IAAI;gBACrB,SAAS,EAAE,SAAS;gBACpB,UAAU,EAAE,KAAK;gBACjB,eAAe,EAAE,KAAK;gBACtB,eAAe,EAAE,OAAO,CAAC,eAAe;aACzC,CAAC,CAAC;SACJ;IACH,CAAC;CAAA;AAVD,8CAUC"}

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

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

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

@@ -1,36 +1,39 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.componentCypressSpecGenerator = void 0;
+const tslib_1 = require("tslib");
 const devkit_1 = require("@nrwl/devkit");
 const storybook_inputs_1 = require("../utils/storybook-ast/storybook-inputs");
 const get_args_default_value_1 = require("./lib/get-args-default-value");
 const get_component_selector_1 = require("./lib/get-component-selector");
 function componentCypressSpecGenerator(tree, options) {
-    const { cypressProject, projectName, projectPath, componentPath, componentFileName, componentName, specDirectory, } = options;
-    const e2eProjectName = cypressProject || `${projectName}-e2e`;
-    const { sourceRoot, root } = (0, devkit_1.readProjectConfiguration)(tree, e2eProjectName);
-    const isCypressV10 = tree.exists((0, devkit_1.joinPathFragments)(root, 'cypress.config.ts'));
-    const e2eLibIntegrationFolderPath = (0, devkit_1.joinPathFragments)(sourceRoot, isCypressV10 ? 'e2e' : 'integration');
-    const templatesDir = (0, devkit_1.joinPathFragments)(__dirname, 'files');
-    const destinationDir = (0, devkit_1.joinPathFragments)(e2eLibIntegrationFolderPath, specDirectory !== null && specDirectory !== void 0 ? specDirectory : componentPath);
-    const storyFile = (0, devkit_1.joinPathFragments)(destinationDir, `${componentFileName}.${isCypressV10 ? 'cy' : 'spec'}.ts`);
-    if (tree.exists(storyFile)) {
-        return;
-    }
-    const fullComponentPath = (0, devkit_1.joinPathFragments)(projectPath, componentPath, `${componentFileName}.ts`);
-    const props = (0, storybook_inputs_1.getComponentProps)(tree, fullComponentPath, get_args_default_value_1.getArgsDefaultValue);
-    const componentSelector = (0, get_component_selector_1.getComponentSelector)(tree, fullComponentPath);
-    (0, devkit_1.generateFiles)(tree, templatesDir, destinationDir, {
-        projectName,
-        componentFileName,
-        componentName,
-        componentSelector,
-        props,
-        fileExt: isCypressV10 ? 'cy.ts' : 'spec.ts',
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        const { cypressProject, projectName, projectPath, componentPath, componentFileName, componentName, specDirectory, } = options;
+        const e2eProjectName = cypressProject || `${projectName}-e2e`;
+        const { sourceRoot, root } = (0, devkit_1.readProjectConfiguration)(tree, e2eProjectName);
+        const isCypressV10 = tree.exists((0, devkit_1.joinPathFragments)(root, 'cypress.config.ts'));
+        const e2eLibIntegrationFolderPath = (0, devkit_1.joinPathFragments)(sourceRoot, isCypressV10 ? 'e2e' : 'integration');
+        const templatesDir = (0, devkit_1.joinPathFragments)(__dirname, 'files');
+        const destinationDir = (0, devkit_1.joinPathFragments)(e2eLibIntegrationFolderPath, specDirectory !== null && specDirectory !== void 0 ? specDirectory : componentPath);
+        const storyFile = (0, devkit_1.joinPathFragments)(destinationDir, `${componentFileName}.${isCypressV10 ? 'cy' : 'spec'}.ts`);
+        if (tree.exists(storyFile)) {
+            return;
+        }
+        const fullComponentPath = (0, devkit_1.joinPathFragments)(projectPath, componentPath, `${componentFileName}.ts`);
+        const props = (0, storybook_inputs_1.getComponentProps)(tree, fullComponentPath, get_args_default_value_1.getArgsDefaultValue);
+        const componentSelector = (0, get_component_selector_1.getComponentSelector)(tree, fullComponentPath);
+        (0, devkit_1.generateFiles)(tree, templatesDir, destinationDir, {
+            projectName,
+            componentFileName,
+            componentName,
+            componentSelector,
+            props,
+            fileExt: isCypressV10 ? 'cy.ts' : 'spec.ts',
+        });
+        if (!options.skipFormat) {
+            yield (0, devkit_1.formatFiles)(tree);
+        }
     });
-    if (!options.skipFormat) {
-        (0, devkit_1.formatFiles)(tree);
-    }
 }
 exports.componentCypressSpecGenerator = componentCypressSpecGenerator;
 exports.default = componentCypressSpecGenerator;

package/src/generators/component-cypress-spec/component-cypress-spec.js.map

@@ -1 +1 @@
-{"version":3,"file":"component-cypress-spec.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/component-cypress-spec/component-cypress-spec.ts"],"names":[],"mappings":";;;AACA,yCAKsB;AACtB,8EAA4E;AAC5E,yEAAmE;AACnE,yEAAoE;AAGpE,SAAgB,6BAA6B,CAC3C,IAAU,EACV,OAA6C;IAE7C,MAAM,EACJ,cAAc,EACd,WAAW,EACX,WAAW,EACX,aAAa,EACb,iBAAiB,EACjB,aAAa,EACb,aAAa,GACd,GAAG,OAAO,CAAC;IACZ,MAAM,cAAc,GAAG,cAAc,IAAI,GAAG,WAAW,MAAM,CAAC;IAC9D,MAAM,EAAE,UAAU,EAAE,IAAI,EAAE,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,cAAc,CAAC,CAAC;IAC5E,MAAM,YAAY,GAAG,IAAI,CAAC,MAAM,CAC9B,IAAA,0BAAiB,EAAC,IAAI,EAAE,mBAAmB,CAAC,CAC7C,CAAC;IACF,MAAM,2BAA2B,GAAG,IAAA,0BAAiB,EACnD,UAAU,EACV,YAAY,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,aAAa,CACrC,CAAC;IAEF,MAAM,YAAY,GAAG,IAAA,0BAAiB,EAAC,SAAS,EAAE,OAAO,CAAC,CAAC;IAC3D,MAAM,cAAc,GAAG,IAAA,0BAAiB,EACtC,2BAA2B,EAC3B,aAAa,aAAb,aAAa,cAAb,aAAa,GAAI,aAAa,CAC/B,CAAC;IACF,MAAM,SAAS,GAAG,IAAA,0BAAiB,EACjC,cAAc,EACd,GAAG,iBAAiB,IAAI,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,KAAK,CAC1D,CAAC;IAEF,IAAI,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE;QAC1B,OAAO;KACR;IAED,MAAM,iBAAiB,GAAG,IAAA,0BAAiB,EACzC,WAAW,EACX,aAAa,EACb,GAAG,iBAAiB,KAAK,CAC1B,CAAC;IACF,MAAM,KAAK,GAAG,IAAA,oCAAiB,EAAC,IAAI,EAAE,iBAAiB,EAAE,4CAAmB,CAAC,CAAC;IAC9E,MAAM,iBAAiB,GAAG,IAAA,6CAAoB,EAAC,IAAI,EAAE,iBAAiB,CAAC,CAAC;IAExE,IAAA,sBAAa,EAAC,IAAI,EAAE,YAAY,EAAE,cAAc,EAAE;QAChD,WAAW;QACX,iBAAiB;QACjB,aAAa;QACb,iBAAiB;QACjB,KAAK;QACL,OAAO,EAAE,YAAY,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS;KAC5C,CAAC,CAAC;IAEH,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;QACvB,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;KACnB;AACH,CAAC;AAzDD,sEAyDC;AAED,kBAAe,6BAA6B,CAAC"}
+{"version":3,"file":"component-cypress-spec.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/component-cypress-spec/component-cypress-spec.ts"],"names":[],"mappings":";;;;AACA,yCAKsB;AACtB,8EAA4E;AAC5E,yEAAmE;AACnE,yEAAoE;AAGpE,SAAsB,6BAA6B,CACjD,IAAU,EACV,OAA6C;;QAE7C,MAAM,EACJ,cAAc,EACd,WAAW,EACX,WAAW,EACX,aAAa,EACb,iBAAiB,EACjB,aAAa,EACb,aAAa,GACd,GAAG,OAAO,CAAC;QACZ,MAAM,cAAc,GAAG,cAAc,IAAI,GAAG,WAAW,MAAM,CAAC;QAC9D,MAAM,EAAE,UAAU,EAAE,IAAI,EAAE,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,cAAc,CAAC,CAAC;QAC5E,MAAM,YAAY,GAAG,IAAI,CAAC,MAAM,CAC9B,IAAA,0BAAiB,EAAC,IAAI,EAAE,mBAAmB,CAAC,CAC7C,CAAC;QACF,MAAM,2BAA2B,GAAG,IAAA,0BAAiB,EACnD,UAAU,EACV,YAAY,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,aAAa,CACrC,CAAC;QAEF,MAAM,YAAY,GAAG,IAAA,0BAAiB,EAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QAC3D,MAAM,cAAc,GAAG,IAAA,0BAAiB,EACtC,2BAA2B,EAC3B,aAAa,aAAb,aAAa,cAAb,aAAa,GAAI,aAAa,CAC/B,CAAC;QACF,MAAM,SAAS,GAAG,IAAA,0BAAiB,EACjC,cAAc,EACd,GAAG,iBAAiB,IAAI,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,KAAK,CAC1D,CAAC;QAEF,IAAI,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE;YAC1B,OAAO;SACR;QAED,MAAM,iBAAiB,GAAG,IAAA,0BAAiB,EACzC,WAAW,EACX,aAAa,EACb,GAAG,iBAAiB,KAAK,CAC1B,CAAC;QACF,MAAM,KAAK,GAAG,IAAA,oCAAiB,EAAC,IAAI,EAAE,iBAAiB,EAAE,4CAAmB,CAAC,CAAC;QAC9E,MAAM,iBAAiB,GAAG,IAAA,6CAAoB,EAAC,IAAI,EAAE,iBAAiB,CAAC,CAAC;QAExE,IAAA,sBAAa,EAAC,IAAI,EAAE,YAAY,EAAE,cAAc,EAAE;YAChD,WAAW;YACX,iBAAiB;YACjB,aAAa;YACb,iBAAiB;YACjB,KAAK;YACL,OAAO,EAAE,YAAY,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS;SAC5C,CAAC,CAAC;QAEH,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;YACvB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;IACH,CAAC;CAAA;AAzDD,sEAyDC;AAED,kBAAe,6BAA6B,CAAC"}

package/src/generators/component-story/component-story.d.ts

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

package/src/generators/component-story/component-story.js

@@ -1,26 +1,29 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.componentStoryGenerator = void 0;
+const tslib_1 = require("tslib");
 const devkit_1 = require("@nrwl/devkit");
 const storybook_inputs_1 = require("../utils/storybook-ast/storybook-inputs");
 function componentStoryGenerator(tree, options) {
-    const { componentFileName, componentName, componentPath, projectPath } = options;
-    const templatesDir = (0, devkit_1.joinPathFragments)(__dirname, 'files');
-    const destinationDir = (0, devkit_1.joinPathFragments)(projectPath, componentPath);
-    const storyFile = (0, devkit_1.joinPathFragments)(destinationDir, `${componentFileName}.stories.ts`);
-    if (tree.exists(storyFile)) {
-        return;
-    }
-    const props = (0, storybook_inputs_1.getComponentProps)(tree, (0, devkit_1.joinPathFragments)(destinationDir, `${componentFileName}.ts`));
-    (0, devkit_1.generateFiles)(tree, templatesDir, destinationDir, {
-        componentFileName: componentFileName,
-        componentName: componentName,
-        props: props.filter((p) => typeof p.defaultValue !== 'undefined'),
-        tmpl: '',
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        const { componentFileName, componentName, componentPath, projectPath } = options;
+        const templatesDir = (0, devkit_1.joinPathFragments)(__dirname, 'files');
+        const destinationDir = (0, devkit_1.joinPathFragments)(projectPath, componentPath);
+        const storyFile = (0, devkit_1.joinPathFragments)(destinationDir, `${componentFileName}.stories.ts`);
+        if (tree.exists(storyFile)) {
+            return;
+        }
+        const props = (0, storybook_inputs_1.getComponentProps)(tree, (0, devkit_1.joinPathFragments)(destinationDir, `${componentFileName}.ts`));
+        (0, devkit_1.generateFiles)(tree, templatesDir, destinationDir, {
+            componentFileName: componentFileName,
+            componentName: componentName,
+            props: props.filter((p) => typeof p.defaultValue !== 'undefined'),
+            tmpl: '',
+        });
+        if (!options.skipFormat) {
+            yield (0, devkit_1.formatFiles)(tree);
+        }
     });
-    if (!options.skipFormat) {
-        (0, devkit_1.formatFiles)(tree);
-    }
 }
 exports.componentStoryGenerator = componentStoryGenerator;
 exports.default = componentStoryGenerator;

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

@@ -1 +1 @@
-{"version":3,"file":"component-story.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/component-story/component-story.ts"],"names":[],"mappings":";;;AACA,yCAA6E;AAC7E,8EAA4E;AAG5E,SAAgB,uBAAuB,CACrC,IAAU,EACV,OAAuC;IAEvC,MAAM,EAAE,iBAAiB,EAAE,aAAa,EAAE,aAAa,EAAE,WAAW,EAAE,GACpE,OAAO,CAAC;IAEV,MAAM,YAAY,GAAG,IAAA,0BAAiB,EAAC,SAAS,EAAE,OAAO,CAAC,CAAC;IAC3D,MAAM,cAAc,GAAG,IAAA,0BAAiB,EAAC,WAAW,EAAE,aAAa,CAAC,CAAC;IACrE,MAAM,SAAS,GAAG,IAAA,0BAAiB,EACjC,cAAc,EACd,GAAG,iBAAiB,aAAa,CAClC,CAAC;IAEF,IAAI,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE;QAC1B,OAAO;KACR;IAED,MAAM,KAAK,GAAG,IAAA,oCAAiB,EAC7B,IAAI,EACJ,IAAA,0BAAiB,EAAC,cAAc,EAAE,GAAG,iBAAiB,KAAK,CAAC,CAC7D,CAAC;IAEF,IAAA,sBAAa,EAAC,IAAI,EAAE,YAAY,EAAE,cAAc,EAAE;QAChD,iBAAiB,EAAE,iBAAiB;QACpC,aAAa,EAAE,aAAa;QAC5B,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,CAAC,YAAY,KAAK,WAAW,CAAC;QACjE,IAAI,EAAE,EAAE;KACT,CAAC,CAAC;IAEH,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;QACvB,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;KACnB;AACH,CAAC;AAjCD,0DAiCC;AAED,kBAAe,uBAAuB,CAAC"}
+{"version":3,"file":"component-story.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/component-story/component-story.ts"],"names":[],"mappings":";;;;AACA,yCAA6E;AAC7E,8EAA4E;AAG5E,SAAsB,uBAAuB,CAC3C,IAAU,EACV,OAAuC;;QAEvC,MAAM,EAAE,iBAAiB,EAAE,aAAa,EAAE,aAAa,EAAE,WAAW,EAAE,GACpE,OAAO,CAAC;QAEV,MAAM,YAAY,GAAG,IAAA,0BAAiB,EAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QAC3D,MAAM,cAAc,GAAG,IAAA,0BAAiB,EAAC,WAAW,EAAE,aAAa,CAAC,CAAC;QACrE,MAAM,SAAS,GAAG,IAAA,0BAAiB,EACjC,cAAc,EACd,GAAG,iBAAiB,aAAa,CAClC,CAAC;QAEF,IAAI,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE;YAC1B,OAAO;SACR;QAED,MAAM,KAAK,GAAG,IAAA,oCAAiB,EAC7B,IAAI,EACJ,IAAA,0BAAiB,EAAC,cAAc,EAAE,GAAG,iBAAiB,KAAK,CAAC,CAC7D,CAAC;QAEF,IAAA,sBAAa,EAAC,IAAI,EAAE,YAAY,EAAE,cAAc,EAAE;YAChD,iBAAiB,EAAE,iBAAiB;YACpC,aAAa,EAAE,aAAa;YAC5B,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,CAAC,YAAY,KAAK,WAAW,CAAC;YACjE,IAAI,EAAE,EAAE;SACT,CAAC,CAAC;QAEH,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;YACvB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;IACH,CAAC;CAAA;AAjCD,0DAiCC;AAED,kBAAe,uBAAuB,CAAC"}

package/src/generators/init/init.js

@@ -11,7 +11,6 @@ const test_runners_1 = require("../../utils/test-runners");
 const version_utils_1 = require("../utils/version-utils");
 function angularInitGenerator(tree, rawOptions) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const installedAngularVersionInfo = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
         const tasks = [];
         const options = normalizeOptions(rawOptions);
         const pkgVersions = (0, version_utils_1.versions)(tree);
@@ -47,7 +46,7 @@ function angularInitGenerator(tree, rawOptions) {
         tasks.push(unitTestTask);
         const e2eTask = yield addE2ETestRunner(tree, options);
         tasks.push(e2eTask);
-        addGitIgnoreEntry(tree, '.angular');
+        ignoreAngularCacheDirectory(tree);
         if (!options.skipFormat) {
             yield (0, devkit_1.formatFiles)(tree);
         }
@@ -131,18 +130,38 @@ function addE2ETestRunner(tree, options) {
         }
     });
 }
-function addGitIgnoreEntry(host, entry) {
-    if (host.exists('.gitignore')) {
-        let content = host.read('.gitignore', 'utf-8');
+function ignoreAngularCacheDirectory(tree) {
+    var _a, _b;
+    const { cli } = (0, devkit_1.readNxJson)(tree);
+    // angular-specific cli config is supported though is not included in the
+    // NxJsonConfiguration type
+    const angularCacheDir = (_b = (_a = cli === null || cli === void 0 ? void 0 : cli.cache) === null || _a === void 0 ? void 0 : _a.path) !== null && _b !== void 0 ? _b : '.angular';
+    addGitIgnoreEntry(tree, angularCacheDir);
+    addPrettierIgnoreEntry(tree, angularCacheDir);
+}
+function addGitIgnoreEntry(tree, entry) {
+    if (tree.exists('.gitignore')) {
+        let content = tree.read('.gitignore', 'utf-8');
         if (/^\.angular$/gm.test(content)) {
             return;
         }
         content = `${content}\n${entry}\n`;
-        host.write('.gitignore', content);
+        tree.write('.gitignore', content);
     }
     else {
         devkit_1.logger.warn(`Couldn't find .gitignore file to update`);
     }
 }
+function addPrettierIgnoreEntry(tree, entry) {
+    if (!tree.exists('.prettierignore')) {
+        return;
+    }
+    let content = tree.read('.prettierignore', 'utf-8');
+    if (/^\.angular$/gm.test(content)) {
+        return;
+    }
+    content = `${content}\n${entry}\n`;
+    tree.write('.prettierignore', content);
+}
 exports.default = angularInitGenerator;
 //# sourceMappingURL=init.js.map

package/src/generators/init/init.js.map

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

package/src/generators/setup-mf/lib/setup-serve-target.js

@@ -10,7 +10,7 @@ function setupServeTarget(host, options) {
             : '@nrwl/angular:webpack-dev-server', options: Object.assign(Object.assign({}, appConfig.targets['serve'].options), { port: (_a = options.port) !== null && _a !== void 0 ? _a : undefined, publicHost: `http://localhost:${(_b = options.port) !== null && _b !== void 0 ? _b : 4200}` }) });
     if (options.mfType === 'remote') {
         appConfig.targets['serve-static'] = {
-            executor: '@nrwl/angular:file-server',
+            executor: '@nrwl/web:file-server',
             defaultConfiguration: 'development',
             options: {
                 buildTarget: `${options.appName}:build`,

package/src/generators/setup-mf/lib/setup-serve-target.js.map

@@ -1 +1 @@
-{"version":3,"file":"setup-serve-target.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/setup-mf/lib/setup-serve-target.ts"],"names":[],"mappings":";;;AACA,yCAGsB;AAGtB,SAAgB,gBAAgB,CAAC,IAAU,EAAE,OAAe;;IAC1D,MAAM,SAAS,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;IAElE,SAAS,CAAC,OAAO,CAAC,OAAO,CAAC,mCACrB,SAAS,CAAC,OAAO,CAAC,OAAO,CAAC,KAC7B,QAAQ,EACN,OAAO,CAAC,MAAM,KAAK,MAAM;YACvB,CAAC,CAAC,4CAA4C;YAC9C,CAAC,CAAC,kCAAkC,EACxC,OAAO,kCACF,SAAS,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,OAAO,KACrC,IAAI,EAAE,MAAA,OAAO,CAAC,IAAI,mCAAI,SAAS,EAC/B,UAAU,EAAE,oBAAoB,MAAA,OAAO,CAAC,IAAI,mCAAI,IAAI,EAAE,MAEzD,CAAC;IAEF,IAAI,OAAO,CAAC,MAAM,KAAK,QAAQ,EAAE;QAC/B,SAAS,CAAC,OAAO,CAAC,cAAc,CAAC,GAAG;YAClC,QAAQ,EAAE,2BAA2B;YACrC,oBAAoB,EAAE,aAAa;YACnC,OAAO,EAAE;gBACP,WAAW,EAAE,GAAG,OAAO,CAAC,OAAO,QAAQ;gBACvC,IAAI,EAAE,OAAO,CAAC,IAAI;aACnB;YACD,cAAc,EAAE;gBACd,WAAW,EAAE;oBACX,WAAW,EAAE,GAAG,OAAO,CAAC,OAAO,oBAAoB;iBACpD;gBACD,UAAU,EAAE;oBACV,WAAW,EAAE,GAAG,OAAO,CAAC,OAAO,mBAAmB;iBACnD;aACF;SACF,CAAC;KACH;IAED,IAAA,mCAA0B,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;AAC/D,CAAC;AApCD,4CAoCC"}
+{"version":3,"file":"setup-serve-target.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/setup-mf/lib/setup-serve-target.ts"],"names":[],"mappings":";;;AACA,yCAGsB;AAGtB,SAAgB,gBAAgB,CAAC,IAAU,EAAE,OAAe;;IAC1D,MAAM,SAAS,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;IAElE,SAAS,CAAC,OAAO,CAAC,OAAO,CAAC,mCACrB,SAAS,CAAC,OAAO,CAAC,OAAO,CAAC,KAC7B,QAAQ,EACN,OAAO,CAAC,MAAM,KAAK,MAAM;YACvB,CAAC,CAAC,4CAA4C;YAC9C,CAAC,CAAC,kCAAkC,EACxC,OAAO,kCACF,SAAS,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,OAAO,KACrC,IAAI,EAAE,MAAA,OAAO,CAAC,IAAI,mCAAI,SAAS,EAC/B,UAAU,EAAE,oBAAoB,MAAA,OAAO,CAAC,IAAI,mCAAI,IAAI,EAAE,MAEzD,CAAC;IAEF,IAAI,OAAO,CAAC,MAAM,KAAK,QAAQ,EAAE;QAC/B,SAAS,CAAC,OAAO,CAAC,cAAc,CAAC,GAAG;YAClC,QAAQ,EAAE,uBAAuB;YACjC,oBAAoB,EAAE,aAAa;YACnC,OAAO,EAAE;gBACP,WAAW,EAAE,GAAG,OAAO,CAAC,OAAO,QAAQ;gBACvC,IAAI,EAAE,OAAO,CAAC,IAAI;aACnB;YACD,cAAc,EAAE;gBACd,WAAW,EAAE;oBACX,WAAW,EAAE,GAAG,OAAO,CAAC,OAAO,oBAAoB;iBACpD;gBACD,UAAU,EAAE;oBACV,WAAW,EAAE,GAAG,OAAO,CAAC,OAAO,mBAAmB;iBACnD;aACF;SACF,CAAC;KACH;IAED,IAAA,mCAA0B,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;AAC/D,CAAC;AApCD,4CAoCC"}

package/src/generators/setup-mf/setup-mf.d.ts

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

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

@@ -5,6 +5,7 @@ const tslib_1 = require("tslib");
 const devkit_1 = require("@nrwl/devkit");
 const lib_1 = require("./lib");
 const version_utils_1 = require("../utils/version-utils");
+const versions_1 = require("../../utils/versions");
 const semver_1 = require("semver");
 function setupMf(tree, options) {
     var _a;
@@ -19,10 +20,12 @@ function setupMf(tree, options) {
             (0, lib_1.setupHostIfDynamic)(tree, options);
             (0, lib_1.updateHostAppRoutes)(tree, options);
         }
+        let installTask = () => { };
         if (options.mfType === 'remote') {
             (0, lib_1.addRemoteToHost)(tree, options);
             (0, lib_1.addRemoteEntry)(tree, options, projectConfig.root);
             (0, lib_1.removeDeadCodeFromRemote)(tree, options);
+            installTask = (0, devkit_1.addDependenciesToPackageJson)(tree, {}, { '@nrwl/web': versions_1.nxVersion });
         }
         const remotesWithPorts = (0, lib_1.getRemotesWithPorts)(tree, options);
         (0, lib_1.generateWebpackConfig)(tree, options, projectConfig.root, remotesWithPorts);
@@ -37,6 +40,7 @@ function setupMf(tree, options) {
         if (!options.skipFormat) {
             yield (0, devkit_1.formatFiles)(tree);
         }
+        return installTask;
     });
 }
 exports.setupMf = setupMf;

package/src/generators/setup-mf/setup-mf.js.map

@@ -1 +1 @@
-{"version":3,"file":"setup-mf.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/setup-mf/setup-mf.ts"],"names":[],"mappings":";;;;AACA,yCAAqE;AAGrE,+BAae;AACf,0DAAwE;AACxE,mCAA4B;AAE5B,SAAsB,OAAO,CAAC,IAAU,EAAE,OAAe;;;QACvD,MAAM,oBAAoB,GAAG,IAAA,8CAA8B,EAAC,IAAI,CAAC,CAAC;QAElE,IAAI,IAAA,WAAE,EAAC,oBAAoB,CAAC,OAAO,EAAE,QAAQ,CAAC,IAAI,OAAO,CAAC,UAAU,EAAE;YACpE,MAAM,IAAI,KAAK,CACb,8EAA8E,oBAAoB,CAAC,OAAO,2FAA2F,CACtM,CAAC;SACH;QACD,MAAM,aAAa,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;QAEtE,OAAO,CAAC,cAAc,GAAG,MAAA,OAAO,CAAC,cAAc,mCAAI,QAAQ,CAAC;QAE5D,IAAI,OAAO,CAAC,MAAM,KAAK,MAAM,EAAE;YAC7B,IAAA,wBAAkB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YAClC,IAAA,yBAAmB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;SACpC;QAED,IAAI,OAAO,CAAC,MAAM,KAAK,QAAQ,EAAE;YAC/B,IAAA,qBAAe,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YAC/B,IAAA,oBAAc,EAAC,IAAI,EAAE,OAAO,EAAE,aAAa,CAAC,IAAI,CAAC,CAAC;YAClD,IAAA,8BAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;SACzC;QAED,MAAM,gBAAgB,GAAG,IAAA,yBAAmB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAE5D,IAAA,2BAAqB,EAAC,IAAI,EAAE,OAAO,EAAE,aAAa,CAAC,IAAI,EAAE,gBAAgB,CAAC,CAAC;QAE3E,IAAA,uBAAiB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACjC,IAAA,0BAAoB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACpC,IAAA,sBAAgB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAEhC,IAAA,kBAAY,EAAC,IAAI,EAAE,aAAa,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAEhD,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE;YACpB,IAAA,iCAA2B,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;SAC5C;QAED,eAAe;QACf,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;YACvB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;;CACF;AAzCD,0BAyCC;AAED,kBAAe,OAAO,CAAC"}
+{"version":3,"file":"setup-mf.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/setup-mf/setup-mf.ts"],"names":[],"mappings":";;;;AACA,yCAIsB;AAGtB,+BAae;AACf,0DAAwE;AACxE,mDAAiD;AACjD,mCAA4B;AAE5B,SAAsB,OAAO,CAAC,IAAU,EAAE,OAAe;;;QACvD,MAAM,oBAAoB,GAAG,IAAA,8CAA8B,EAAC,IAAI,CAAC,CAAC;QAElE,IAAI,IAAA,WAAE,EAAC,oBAAoB,CAAC,OAAO,EAAE,QAAQ,CAAC,IAAI,OAAO,CAAC,UAAU,EAAE;YACpE,MAAM,IAAI,KAAK,CACb,8EAA8E,oBAAoB,CAAC,OAAO,2FAA2F,CACtM,CAAC;SACH;QACD,MAAM,aAAa,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;QAEtE,OAAO,CAAC,cAAc,GAAG,MAAA,OAAO,CAAC,cAAc,mCAAI,QAAQ,CAAC;QAE5D,IAAI,OAAO,CAAC,MAAM,KAAK,MAAM,EAAE;YAC7B,IAAA,wBAAkB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YAClC,IAAA,yBAAmB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;SACpC;QAED,IAAI,WAAW,GAAG,GAAG,EAAE,GAAE,CAAC,CAAC;QAC3B,IAAI,OAAO,CAAC,MAAM,KAAK,QAAQ,EAAE;YAC/B,IAAA,qBAAe,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YAC/B,IAAA,oBAAc,EAAC,IAAI,EAAE,OAAO,EAAE,aAAa,CAAC,IAAI,CAAC,CAAC;YAClD,IAAA,8BAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YACxC,WAAW,GAAG,IAAA,qCAA4B,EACxC,IAAI,EACJ,EAAE,EACF,EAAE,WAAW,EAAE,oBAAS,EAAE,CAC3B,CAAC;SACH;QAED,MAAM,gBAAgB,GAAG,IAAA,yBAAmB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAE5D,IAAA,2BAAqB,EAAC,IAAI,EAAE,OAAO,EAAE,aAAa,CAAC,IAAI,EAAE,gBAAgB,CAAC,CAAC;QAE3E,IAAA,uBAAiB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACjC,IAAA,0BAAoB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACpC,IAAA,sBAAgB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAEhC,IAAA,kBAAY,EAAC,IAAI,EAAE,aAAa,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAEhD,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE;YACpB,IAAA,iCAA2B,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;SAC5C;QAED,eAAe;QACf,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;YACvB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;QAED,OAAO,WAAW,CAAC;;CACpB;AAjDD,0BAiDC;AAED,kBAAe,OAAO,CAAC"}

package/src/generators/stories/stories.d.ts

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

package/src/generators/stories/stories.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.angularStoriesGenerator = void 0;
+const tslib_1 = require("tslib");
 const devkit_1 = require("@nrwl/devkit");
 const component_cypress_spec_1 = require("../component-cypress-spec/component-cypress-spec");
 const component_story_1 = require("../component-story/component-story");
@@ -10,52 +11,54 @@ const get_e2e_project_1 = require("./lib/get-e2e-project");
 const module_info_1 = require("../utils/storybook-ast/module-info");
 const minimatch = require("minimatch");
 function angularStoriesGenerator(tree, options) {
-    var _a, _b;
-    const e2eProjectName = (_a = options.cypressProject) !== null && _a !== void 0 ? _a : `${options.name}-e2e`;
-    const e2eProject = (0, get_e2e_project_1.getE2EProject)(tree, e2eProjectName);
-    const entryPoints = (0, entry_point_1.getProjectEntryPoints)(tree, options.name);
-    const componentsInfo = [];
-    for (const entryPoint of entryPoints) {
-        const moduleFilePaths = (0, module_info_1.getModuleFilePaths)(tree, entryPoint);
-        componentsInfo.push(...(0, component_info_1.getComponentsInfo)(tree, entryPoint, moduleFilePaths, options.name), ...(0, component_info_1.getStandaloneComponentsInfo)(tree, entryPoint));
-    }
-    if (options.generateCypressSpecs && !e2eProject) {
-        devkit_1.logger.info(`There was no e2e project "${e2eProjectName}" found, so cypress specs will not be generated. Pass "--cypressProject" to specify a different e2e project name.`);
-    }
-    (_b = componentsInfo
-        .filter((f) => {
-        var _a;
-        return !((_a = options.ignorePaths) === null || _a === void 0 ? void 0 : _a.some((pattern) => {
-            const shouldIgnorePath = minimatch((0, devkit_1.joinPathFragments)(f.moduleFolderPath, f.path, `${f.componentFileName}.ts`), pattern);
-            return shouldIgnorePath;
-        }));
-    })) === null || _b === void 0 ? void 0 : _b.forEach((info) => {
-        if (info === undefined) {
-            return;
+    var _a;
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        const e2eProjectName = (_a = options.cypressProject) !== null && _a !== void 0 ? _a : `${options.name}-e2e`;
+        const e2eProject = (0, get_e2e_project_1.getE2EProject)(tree, e2eProjectName);
+        const entryPoints = (0, entry_point_1.getProjectEntryPoints)(tree, options.name);
+        const componentsInfo = [];
+        for (const entryPoint of entryPoints) {
+            const moduleFilePaths = (0, module_info_1.getModuleFilePaths)(tree, entryPoint);
+            componentsInfo.push(...(0, component_info_1.getComponentsInfo)(tree, entryPoint, moduleFilePaths, options.name), ...(0, component_info_1.getStandaloneComponentsInfo)(tree, entryPoint));
         }
-        (0, component_story_1.default)(tree, {
-            projectPath: info.moduleFolderPath,
-            componentName: info.name,
-            componentPath: info.path,
-            componentFileName: info.componentFileName,
-            skipFormat: false,
+        if (options.generateCypressSpecs && !e2eProject) {
+            devkit_1.logger.info(`There was no e2e project "${e2eProjectName}" found, so cypress specs will not be generated. Pass "--cypressProject" to specify a different e2e project name.`);
+        }
+        const componentInfos = componentsInfo.filter((f) => {
+            var _a;
+            return !((_a = options.ignorePaths) === null || _a === void 0 ? void 0 : _a.some((pattern) => {
+                const shouldIgnorePath = minimatch((0, devkit_1.joinPathFragments)(f.moduleFolderPath, f.path, `${f.componentFileName}.ts`), pattern);
+                return shouldIgnorePath;
+            }));
         });
-        if (options.generateCypressSpecs && e2eProject) {
-            (0, component_cypress_spec_1.default)(tree, {
-                projectName: options.name,
+        for (const info of componentInfos) {
+            if (info === undefined) {
+                continue;
+            }
+            yield (0, component_story_1.default)(tree, {
                 projectPath: info.moduleFolderPath,
-                cypressProject: options.cypressProject,
                 componentName: info.name,
                 componentPath: info.path,
                 componentFileName: info.componentFileName,
-                specDirectory: (0, devkit_1.joinPathFragments)(info.entryPointName, info.path),
-                skipFormat: false,
+                skipFormat: true,
             });
+            if (options.generateCypressSpecs && e2eProject) {
+                yield (0, component_cypress_spec_1.default)(tree, {
+                    projectName: options.name,
+                    projectPath: info.moduleFolderPath,
+                    cypressProject: options.cypressProject,
+                    componentName: info.name,
+                    componentPath: info.path,
+                    componentFileName: info.componentFileName,
+                    specDirectory: (0, devkit_1.joinPathFragments)(info.entryPointName, info.path),
+                    skipFormat: true,
+                });
+            }
+        }
+        if (!options.skipFormat) {
+            yield (0, devkit_1.formatFiles)(tree);
         }
     });
-    if (!options.skipFormat) {
-        (0, devkit_1.formatFiles)(tree);
-    }
 }
 exports.angularStoriesGenerator = angularStoriesGenerator;
 exports.default = angularStoriesGenerator;

package/src/generators/stories/stories.js.map

@@ -1 +1 @@
-{"version":3,"file":"stories.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/stories/stories.ts"],"names":[],"mappings":";;;AAAA,yCAA4E;AAC5E,6FAA6F;AAC7F,wEAAyE;AAEzE,0EAG+C;AAC/C,oEAA2E;AAC3E,2DAAsD;AACtD,oEAAwE;AAExE,uCAAwC;AAExC,SAAgB,uBAAuB,CACrC,IAAU,EACV,OAAgC;;IAEhC,MAAM,cAAc,GAAG,MAAA,OAAO,CAAC,cAAc,mCAAI,GAAG,OAAO,CAAC,IAAI,MAAM,CAAC;IACvE,MAAM,UAAU,GAAG,IAAA,+BAAa,EAAC,IAAI,EAAE,cAAc,CAAC,CAAC;IACvD,MAAM,WAAW,GAAG,IAAA,mCAAqB,EAAC,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IAC9D,MAAM,cAAc,GAAoB,EAAE,CAAC;IAC3C,KAAK,MAAM,UAAU,IAAI,WAAW,EAAE;QACpC,MAAM,eAAe,GAAG,IAAA,gCAAkB,EAAC,IAAI,EAAE,UAAU,CAAC,CAAC;QAC7D,cAAc,CAAC,IAAI,CACjB,GAAG,IAAA,kCAAiB,EAAC,IAAI,EAAE,UAAU,EAAE,eAAe,EAAE,OAAO,CAAC,IAAI,CAAC,EACrE,GAAG,IAAA,4CAA2B,EAAC,IAAI,EAAE,UAAU,CAAC,CACjD,CAAC;KACH;IAED,IAAI,OAAO,CAAC,oBAAoB,IAAI,CAAC,UAAU,EAAE;QAC/C,eAAM,CAAC,IAAI,CACT,6BAA6B,cAAc,mHAAmH,CAC/J,CAAC;KACH;IAED,MAAA,cAAc;SACX,MAAM,CACL,CAAC,CAAC,EAAE,EAAE;;QACJ,OAAA,CAAC,CAAA,MAAA,OAAO,CAAC,WAAW,0CAAE,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE;YACrC,MAAM,gBAAgB,GAAG,SAAS,CAChC,IAAA,0BAAiB,EACf,CAAC,CAAC,gBAAgB,EAClB,CAAC,CAAC,IAAI,EACN,GAAG,CAAC,CAAC,iBAAiB,KAAK,CAC5B,EACD,OAAO,CACR,CAAC;YACF,OAAO,gBAAgB,CAAC;QAC1B,CAAC,CAAC,CAAA,CAAA;KAAA,CACL,0CACC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;QACjB,IAAI,IAAI,KAAK,SAAS,EAAE;YACtB,OAAO;SACR;QAED,IAAA,yBAAuB,EAAC,IAAI,EAAE;YAC5B,WAAW,EAAE,IAAI,CAAC,gBAAgB;YAClC,aAAa,EAAE,IAAI,CAAC,IAAI;YACxB,aAAa,EAAE,IAAI,CAAC,IAAI;YACxB,iBAAiB,EAAE,IAAI,CAAC,iBAAiB;YACzC,UAAU,EAAE,KAAK;SAClB,CAAC,CAAC;QAEH,IAAI,OAAO,CAAC,oBAAoB,IAAI,UAAU,EAAE;YAC9C,IAAA,gCAA6B,EAAC,IAAI,EAAE;gBAClC,WAAW,EAAE,OAAO,CAAC,IAAI;gBACzB,WAAW,EAAE,IAAI,CAAC,gBAAgB;gBAClC,cAAc,EAAE,OAAO,CAAC,cAAc;gBACtC,aAAa,EAAE,IAAI,CAAC,IAAI;gBACxB,aAAa,EAAE,IAAI,CAAC,IAAI;gBACxB,iBAAiB,EAAE,IAAI,CAAC,iBAAiB;gBACzC,aAAa,EAAE,IAAA,0BAAiB,EAAC,IAAI,CAAC,cAAc,EAAE,IAAI,CAAC,IAAI,CAAC;gBAChE,UAAU,EAAE,KAAK;aAClB,CAAC,CAAC;SACJ;IACH,CAAC,CAAC,CAAC;IAEL,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;QACvB,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;KACnB;AACH,CAAC;AAnED,0DAmEC;AAED,kBAAe,uBAAuB,CAAC"}
+{"version":3,"file":"stories.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/stories/stories.ts"],"names":[],"mappings":";;;;AAAA,yCAA4E;AAC5E,6FAA6F;AAC7F,wEAAyE;AAEzE,0EAG+C;AAC/C,oEAA2E;AAC3E,2DAAsD;AACtD,oEAAwE;AAExE,uCAAwC;AAExC,SAAsB,uBAAuB,CAC3C,IAAU,EACV,OAAgC;;;QAEhC,MAAM,cAAc,GAAG,MAAA,OAAO,CAAC,cAAc,mCAAI,GAAG,OAAO,CAAC,IAAI,MAAM,CAAC;QACvE,MAAM,UAAU,GAAG,IAAA,+BAAa,EAAC,IAAI,EAAE,cAAc,CAAC,CAAC;QACvD,MAAM,WAAW,GAAG,IAAA,mCAAqB,EAAC,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;QAC9D,MAAM,cAAc,GAAoB,EAAE,CAAC;QAC3C,KAAK,MAAM,UAAU,IAAI,WAAW,EAAE;YACpC,MAAM,eAAe,GAAG,IAAA,gCAAkB,EAAC,IAAI,EAAE,UAAU,CAAC,CAAC;YAC7D,cAAc,CAAC,IAAI,CACjB,GAAG,IAAA,kCAAiB,EAAC,IAAI,EAAE,UAAU,EAAE,eAAe,EAAE,OAAO,CAAC,IAAI,CAAC,EACrE,GAAG,IAAA,4CAA2B,EAAC,IAAI,EAAE,UAAU,CAAC,CACjD,CAAC;SACH;QAED,IAAI,OAAO,CAAC,oBAAoB,IAAI,CAAC,UAAU,EAAE;YAC/C,eAAM,CAAC,IAAI,CACT,6BAA6B,cAAc,mHAAmH,CAC/J,CAAC;SACH;QAED,MAAM,cAAc,GAAG,cAAc,CAAC,MAAM,CAC1C,CAAC,CAAC,EAAE,EAAE;;YACJ,OAAA,CAAC,CAAA,MAAA,OAAO,CAAC,WAAW,0CAAE,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE;gBACrC,MAAM,gBAAgB,GAAG,SAAS,CAChC,IAAA,0BAAiB,EACf,CAAC,CAAC,gBAAgB,EAClB,CAAC,CAAC,IAAI,EACN,GAAG,CAAC,CAAC,iBAAiB,KAAK,CAC5B,EACD,OAAO,CACR,CAAC;gBACF,OAAO,gBAAgB,CAAC;YAC1B,CAAC,CAAC,CAAA,CAAA;SAAA,CACL,CAAC;QAEF,KAAK,MAAM,IAAI,IAAI,cAAc,EAAE;YACjC,IAAI,IAAI,KAAK,SAAS,EAAE;gBACtB,SAAS;aACV;YAED,MAAM,IAAA,yBAAuB,EAAC,IAAI,EAAE;gBAClC,WAAW,EAAE,IAAI,CAAC,gBAAgB;gBAClC,aAAa,EAAE,IAAI,CAAC,IAAI;gBACxB,aAAa,EAAE,IAAI,CAAC,IAAI;gBACxB,iBAAiB,EAAE,IAAI,CAAC,iBAAiB;gBACzC,UAAU,EAAE,IAAI;aACjB,CAAC,CAAC;YAEH,IAAI,OAAO,CAAC,oBAAoB,IAAI,UAAU,EAAE;gBAC9C,MAAM,IAAA,gCAA6B,EAAC,IAAI,EAAE;oBACxC,WAAW,EAAE,OAAO,CAAC,IAAI;oBACzB,WAAW,EAAE,IAAI,CAAC,gBAAgB;oBAClC,cAAc,EAAE,OAAO,CAAC,cAAc;oBACtC,aAAa,EAAE,IAAI,CAAC,IAAI;oBACxB,aAAa,EAAE,IAAI,CAAC,IAAI;oBACxB,iBAAiB,EAAE,IAAI,CAAC,iBAAiB;oBACzC,aAAa,EAAE,IAAA,0BAAiB,EAAC,IAAI,CAAC,cAAc,EAAE,IAAI,CAAC,IAAI,CAAC;oBAChE,UAAU,EAAE,IAAI;iBACjB,CAAC,CAAC;aACJ;SACF;QAED,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;YACvB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;;CACF;AAnED,0DAmEC;AAED,kBAAe,uBAAuB,CAAC"}

package/src/generators/storybook-configuration/lib/generate-stories.d.ts

@@ -1,3 +1,3 @@
 import type { Tree } from '@nrwl/devkit';
 import type { StorybookConfigurationOptions } from '../schema';
-export declare function generateStories(tree: Tree, options: StorybookConfigurationOptions): void;
+export declare function generateStories(tree: Tree, options: StorybookConfigurationOptions): Promise<void>;

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

@@ -1,17 +1,20 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateStories = void 0;
+const tslib_1 = require("tslib");
 const project_name_1 = require("@nrwl/cypress/src/utils/project-name");
 const devkit_1 = require("@nrwl/devkit");
 const stories_1 = require("../../stories/stories");
 function generateStories(tree, options) {
-    const project = (0, devkit_1.readProjectConfiguration)(tree, options.name);
-    const e2eProjectName = (0, project_name_1.getE2eProjectName)(options.name, project.root, options.cypressDirectory);
-    (0, stories_1.angularStoriesGenerator)(tree, {
-        name: options.name,
-        generateCypressSpecs: options.configureCypress && options.generateCypressSpecs,
-        cypressProject: e2eProjectName,
-        ignorePaths: options.ignorePaths,
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        const project = (0, devkit_1.readProjectConfiguration)(tree, options.name);
+        const e2eProjectName = (0, project_name_1.getE2eProjectName)(options.name, project.root, options.cypressDirectory);
+        yield (0, stories_1.angularStoriesGenerator)(tree, {
+            name: options.name,
+            generateCypressSpecs: options.configureCypress && options.generateCypressSpecs,
+            cypressProject: e2eProjectName,
+            ignorePaths: options.ignorePaths,
+        });
     });
 }
 exports.generateStories = generateStories;

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

@@ -1 +1 @@
-{"version":3,"file":"generate-stories.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/storybook-configuration/lib/generate-stories.ts"],"names":[],"mappings":";;;AAAA,uEAAyE;AAEzE,yCAAwD;AACxD,mDAAgE;AAGhE,SAAgB,eAAe,CAC7B,IAAU,EACV,OAAsC;IAEtC,MAAM,OAAO,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IAC7D,MAAM,cAAc,GAAG,IAAA,gCAAiB,EACtC,OAAO,CAAC,IAAI,EACZ,OAAO,CAAC,IAAI,EACZ,OAAO,CAAC,gBAAgB,CACzB,CAAC;IAEF,IAAA,iCAAuB,EAAC,IAAI,EAAE;QAC5B,IAAI,EAAE,OAAO,CAAC,IAAI;QAClB,oBAAoB,EAClB,OAAO,CAAC,gBAAgB,IAAI,OAAO,CAAC,oBAAoB;QAC1D,cAAc,EAAE,cAAc;QAC9B,WAAW,EAAE,OAAO,CAAC,WAAW;KACjC,CAAC,CAAC;AACL,CAAC;AAlBD,0CAkBC"}
+{"version":3,"file":"generate-stories.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/storybook-configuration/lib/generate-stories.ts"],"names":[],"mappings":";;;;AAAA,uEAAyE;AAEzE,yCAAwD;AACxD,mDAAgE;AAGhE,SAAsB,eAAe,CACnC,IAAU,EACV,OAAsC;;QAEtC,MAAM,OAAO,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;QAC7D,MAAM,cAAc,GAAG,IAAA,gCAAiB,EACtC,OAAO,CAAC,IAAI,EACZ,OAAO,CAAC,IAAI,EACZ,OAAO,CAAC,gBAAgB,CACzB,CAAC;QAEF,MAAM,IAAA,iCAAuB,EAAC,IAAI,EAAE;YAClC,IAAI,EAAE,OAAO,CAAC,IAAI;YAClB,oBAAoB,EAClB,OAAO,CAAC,gBAAgB,IAAI,OAAO,CAAC,oBAAoB;YAC1D,cAAc,EAAE,cAAc;YAC9B,WAAW,EAAE,OAAO,CAAC,WAAW;SACjC,CAAC,CAAC;IACL,CAAC;CAAA;AAlBD,0CAkBC"}

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

@@ -13,7 +13,7 @@ function storybookConfigurationGenerator(tree, options) {
         (0, validate_options_1.validateOptions)(options);
         const storybookGeneratorInstallTask = yield (0, generate_storybook_configuration_1.generateStorybookConfiguration)(tree, options);
         if (options.generateStories) {
-            (0, generate_stories_1.generateStories)(tree, Object.assign(Object.assign({}, options), { skipFormat: false }));
+            yield (0, generate_stories_1.generateStories)(tree, Object.assign(Object.assign({}, options), { skipFormat: true }));
         }
         if (!options.skipFormat) {
             yield (0, devkit_1.formatFiles)(tree);

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

@@ -1 +1 @@
-{"version":3,"file":"storybook-configuration.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/storybook-configuration/storybook-configuration.ts"],"names":[],"mappings":";;;;AAAA,yCAAoE;AACpE,mGAA6F;AAC7F,6DAAyD;AACzD,6FAAwF;AACxF,6DAAyD;AAGzD,SAAsB,+BAA+B,CACnD,IAAU,EACV,OAAsC;;QAEtC,IAAA,sEAAgC,GAAE,CAAC;QACnC,IAAA,kCAAe,EAAC,OAAO,CAAC,CAAC;QAEzB,MAAM,6BAA6B,GAAG,MAAM,IAAA,iEAA8B,EACxE,IAAI,EACJ,OAAO,CACR,CAAC;QAEF,IAAI,OAAO,CAAC,eAAe,EAAE;YAC3B,IAAA,kCAAe,EAAC,IAAI,kCAAO,OAAO,KAAE,UAAU,EAAE,KAAK,IAAG,CAAC;SAC1D;QAED,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;YACvB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;QAED,OAAO,GAAG,EAAE;YACV,6BAA6B,EAAE,CAAC;QAClC,CAAC,CAAC;IACJ,CAAC;CAAA;AAvBD,0EAuBC;AAED,kBAAe,+BAA+B,CAAC"}
+{"version":3,"file":"storybook-configuration.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/storybook-configuration/storybook-configuration.ts"],"names":[],"mappings":";;;;AAAA,yCAAoE;AACpE,mGAA6F;AAC7F,6DAAyD;AACzD,6FAAwF;AACxF,6DAAyD;AAGzD,SAAsB,+BAA+B,CACnD,IAAU,EACV,OAAsC;;QAEtC,IAAA,sEAAgC,GAAE,CAAC;QACnC,IAAA,kCAAe,EAAC,OAAO,CAAC,CAAC;QAEzB,MAAM,6BAA6B,GAAG,MAAM,IAAA,iEAA8B,EACxE,IAAI,EACJ,OAAO,CACR,CAAC;QAEF,IAAI,OAAO,CAAC,eAAe,EAAE;YAC3B,MAAM,IAAA,kCAAe,EAAC,IAAI,kCAAO,OAAO,KAAE,UAAU,EAAE,IAAI,IAAG,CAAC;SAC/D;QAED,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;YACvB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;QAED,OAAO,GAAG,EAAE;YACV,6BAA6B,EAAE,CAAC;QAClC,CAAC,CAAC;IACJ,CAAC;CAAA;AAvBD,0EAuBC;AAED,kBAAe,+BAA+B,CAAC"}

package/src/generators/utils/insert-ngmodule-import.js

@@ -63,7 +63,7 @@ function insertNgModuleProperty(tree, modulePath, name, property) {
             if (ngModuleOptions.properties.hasTrailingComma) {
                 text = `${text},`;
             }
-            else {
+            else if (ngModuleOptions.properties.length) {
                 text = `, ${text}`;
             }
             const newContents = (0, devkit_1.applyChangesToString)(contents, [
@@ -83,9 +83,12 @@ function insertNgModuleProperty(tree, modulePath, name, property) {
             if (typeProperty.initializer.elements.hasTrailingComma) {
                 text = `${name},`;
             }
-            else {
+            else if (typeProperty.initializer.elements.length) {
                 text = `, ${name}`;
             }
+            else {
+                text = name;
+            }
             const newContents = (0, devkit_1.applyChangesToString)(contents, [
                 {
                     type: devkit_1.ChangeType.Insert,

package/src/generators/utils/insert-ngmodule-import.js.map

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

package/src/generators/utils/testing.js

@@ -8,6 +8,7 @@ const linter_1 = require("@nrwl/linter");
 const test_runners_1 = require("../../utils/test-runners");
 const versions_1 = require("../../utils/versions");
 const application_1 = require("../application/application");
+const component_1 = require("../component/component");
 const host_1 = require("../host/host");
 const library_1 = require("../library/library");
 const remote_1 = require("../remote/remote");
@@ -50,7 +51,6 @@ function createStorybookTestWorkspaceForLib(libName) {
         tree.write('.gitignore', '');
         const { wrapAngularDevkitSchematic } = require('@nrwl/devkit/ngcli-adapter');
         const moduleGenerator = wrapAngularDevkitSchematic('@schematics/angular', 'module');
-        const componentGenerator = wrapAngularDevkitSchematic('@schematics/angular', 'component');
         yield (0, library_1.libraryGenerator)(tree, {
             name: libName,
             buildable: false,
@@ -60,7 +60,7 @@ function createStorybookTestWorkspaceForLib(libName) {
             skipFormat: false,
             unitTestRunner: test_runners_1.UnitTestRunner.Jest,
         });
-        yield componentGenerator(tree, {
+        yield (0, component_1.componentGenerator)(tree, {
             name: 'test-button',
             project: libName,
         });
@@ -88,7 +88,7 @@ export class TestButtonComponent {
             name: 'barrel',
             project: libName,
         });
-        yield componentGenerator(tree, {
+        yield (0, component_1.componentGenerator)(tree, {
             name: 'barrel-button',
             project: libName,
             path: `libs/${libName}/src/lib/barrel`,
@@ -109,13 +109,13 @@ export class BarrelModule {}`);
             name: 'variable-declare',
             project: libName,
         });
-        yield componentGenerator(tree, {
+        yield (0, component_1.componentGenerator)(tree, {
             name: 'variable-declare-button',
             project: libName,
             path: `libs/${libName}/src/lib/variable-declare`,
             module: 'variable-declare',
         });
-        yield componentGenerator(tree, {
+        yield (0, component_1.componentGenerator)(tree, {
             name: 'variable-declare-view',
             project: libName,
             path: `libs/${libName}/src/lib/variable-declare`,
@@ -142,19 +142,19 @@ export class VariableDeclareModule {}`);
             name: 'variable-spread-declare',
             project: libName,
         });
-        yield componentGenerator(tree, {
+        yield (0, component_1.componentGenerator)(tree, {
             name: 'variable-spread-declare-button',
             project: libName,
             path: `libs/${libName}/src/lib/variable-spread-declare`,
             module: 'variable-spread-declare',
         });
-        yield componentGenerator(tree, {
+        yield (0, component_1.componentGenerator)(tree, {
             name: 'variable-spread-declare-view',
             project: libName,
             path: `libs/${libName}/src/lib/variable-spread-declare`,
             module: 'variable-spread-declare',
         });
-        yield componentGenerator(tree, {
+        yield (0, component_1.componentGenerator)(tree, {
             name: 'variable-spread-declare-anotherview',
             project: libName,
             path: `libs/${libName}/src/lib/variable-spread-declare`,
@@ -181,13 +181,13 @@ export class VariableSpreadDeclareModule {}`);
             name: 'static-member-declarations',
             project: libName,
         });
-        yield componentGenerator(tree, {
+        yield (0, component_1.componentGenerator)(tree, {
             name: 'cmp1',
             project: libName,
             path: `libs/${libName}/src/lib/static-member-declarations`,
             module: 'static-member-declarations',
         });
-        yield componentGenerator(tree, {
+        yield (0, component_1.componentGenerator)(tree, {
             name: 'cmp2',
             project: libName,
             path: `libs/${libName}/src/lib/static-member-declarations`,
@@ -212,13 +212,13 @@ export class StaticMemberDeclarationsModule {
             project: libName,
             path: `libs/${libName}/src/lib`,
         });
-        yield componentGenerator(tree, {
+        yield (0, component_1.componentGenerator)(tree, {
             name: 'nested-button',
             project: libName,
             module: 'nested',
             path: `libs/${libName}/src/lib/nested`,
         });
-        yield componentGenerator(tree, {
+        yield (0, component_1.componentGenerator)(tree, {
             name: 'test-other',
             project: libName,
         });

package/src/generators/utils/testing.js.map

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

package/src/generators/utils/warn-for-schematic-usage.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.warnForSchematicUsage = void 0;
 function warnForSchematicUsage(convertedGenerator) {
-    console.warn('Running generators as schematics is deprecated and will be removed in v17.');
+    console.warn('Running generators as schematics is deprecated and will be removed in v17. Prefer `callRule(convertNxGenerator(generator)(options), tree, context)` where "generator" is the name of the generator you wish to use.');
     return convertedGenerator;
 }
 exports.warnForSchematicUsage = warnForSchematicUsage;

package/src/generators/utils/warn-for-schematic-usage.js.map

@@ -1 +1 @@
-{"version":3,"file":"warn-for-schematic-usage.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/utils/warn-for-schematic-usage.ts"],"names":[],"mappings":";;;AAAA,SAAgB,qBAAqB,CAAI,kBAAqB;IAC5D,OAAO,CAAC,IAAI,CACV,4EAA4E,CAC7E,CAAC;IAEF,OAAO,kBAAkB,CAAC;AAC5B,CAAC;AAND,sDAMC"}
+{"version":3,"file":"warn-for-schematic-usage.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/utils/warn-for-schematic-usage.ts"],"names":[],"mappings":";;;AAAA,SAAgB,qBAAqB,CAAI,kBAAqB;IAC5D,OAAO,CAAC,IAAI,CACV,qNAAqN,CACtN,CAAC;IAEF,OAAO,kBAAkB,CAAC;AAC5B,CAAC;AAND,sDAMC"}

package/src/migrations/update-15-9-0/update-file-server-executor.d.ts

@@ -0,0 +1,2 @@
+import type { Tree } from '@nrwl/devkit';
+export default function updateFileServerExecutor(tree: Tree): Promise<void>;

package/src/migrations/update-15-9-0/update-file-server-executor.js

@@ -0,0 +1,46 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+const devkit_1 = require("@nrwl/devkit");
+const versions_1 = require("../../utils/versions");
+function updateFileServerExecutor(tree) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        const oldExecutor = '@nrwl/angular:file-server';
+        const newExecutor = '@nrwl/web:file-server';
+        let needsNrwlWeb = false;
+        const nxJson = (0, devkit_1.readNxJson)(tree);
+        if (nxJson.targetDefaults) {
+            let nxJsonChanged = false;
+            for (const [targetName, target] of Object.entries(nxJson.targetDefaults)) {
+                if (target.executor === oldExecutor) {
+                    nxJson.targetDefaults[targetName].executor = newExecutor;
+                    nxJsonChanged = true;
+                    needsNrwlWeb = true;
+                }
+            }
+            if (nxJsonChanged) {
+                (0, devkit_1.updateNxJson)(tree, nxJson);
+            }
+        }
+        const projects = (0, devkit_1.getProjects)(tree);
+        for (const [projectName, project] of projects.entries()) {
+            let projectChanged = false;
+            for (const [targetName, target] of Object.entries(project.targets)) {
+                if (target.executor === oldExecutor) {
+                    project.targets[targetName].executor = newExecutor;
+                    projectChanged = true;
+                    needsNrwlWeb = true;
+                }
+            }
+            if (projectChanged) {
+                (0, devkit_1.updateProjectConfiguration)(tree, projectName, project);
+            }
+        }
+        if (needsNrwlWeb) {
+            (0, devkit_1.addDependenciesToPackageJson)(tree, {}, { '@nrwl/web': versions_1.nxVersion });
+        }
+        yield (0, devkit_1.formatFiles)(tree);
+    });
+}
+exports.default = updateFileServerExecutor;
+//# sourceMappingURL=update-file-server-executor.js.map

package/src/migrations/update-15-9-0/update-file-server-executor.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"update-file-server-executor.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/migrations/update-15-9-0/update-file-server-executor.ts"],"names":[],"mappings":";;;AACA,yCAOsB;AACtB,mDAAiD;AAEjD,SAA8B,wBAAwB,CAAC,IAAU;;QAC/D,MAAM,WAAW,GAAG,2BAA2B,CAAC;QAChD,MAAM,WAAW,GAAG,uBAAuB,CAAC;QAC5C,IAAI,YAAY,GAAG,KAAK,CAAC;QAEzB,MAAM,MAAM,GAAG,IAAA,mBAAU,EAAC,IAAI,CAAC,CAAC;QAChC,IAAI,MAAM,CAAC,cAAc,EAAE;YACzB,IAAI,aAAa,GAAG,KAAK,CAAC;YAE1B,KAAK,MAAM,CAAC,UAAU,EAAE,MAAM,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,cAAc,CAAC,EAAE;gBACxE,IAAI,MAAM,CAAC,QAAQ,KAAK,WAAW,EAAE;oBACnC,MAAM,CAAC,cAAc,CAAC,UAAU,CAAC,CAAC,QAAQ,GAAG,WAAW,CAAC;oBACzD,aAAa,GAAG,IAAI,CAAC;oBACrB,YAAY,GAAG,IAAI,CAAC;iBACrB;aACF;YAED,IAAI,aAAa,EAAE;gBACjB,IAAA,qBAAY,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;aAC5B;SACF;QAED,MAAM,QAAQ,GAAG,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;QACnC,KAAK,MAAM,CAAC,WAAW,EAAE,OAAO,CAAC,IAAI,QAAQ,CAAC,OAAO,EAAE,EAAE;YACvD,IAAI,cAAc,GAAG,KAAK,CAAC;YAE3B,KAAK,MAAM,CAAC,UAAU,EAAE,MAAM,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE;gBAClE,IAAI,MAAM,CAAC,QAAQ,KAAK,WAAW,EAAE;oBACnC,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,QAAQ,GAAG,WAAW,CAAC;oBACnD,cAAc,GAAG,IAAI,CAAC;oBACtB,YAAY,GAAG,IAAI,CAAC;iBACrB;aACF;YAED,IAAI,cAAc,EAAE;gBAClB,IAAA,mCAA0B,EAAC,IAAI,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC;aACxD;SACF;QAED,IAAI,YAAY,EAAE;YAChB,IAAA,qCAA4B,EAAC,IAAI,EAAE,EAAE,EAAE,EAAE,WAAW,EAAE,oBAAS,EAAE,CAAC,CAAC;SACpE;QAED,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;CAAA;AA5CD,2CA4CC"}

package/src/executors/file-server/compat.d.ts

@@ -1,2 +0,0 @@
-declare const _default: any;
-export default _default;

package/src/executors/file-server/compat.js

@@ -1,6 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const devkit_1 = require("@nrwl/devkit");
-const file_server_impl_1 = require("./file-server.impl");
-exports.default = (0, devkit_1.convertNxExecutor)(file_server_impl_1.default);
-//# sourceMappingURL=compat.js.map

package/src/executors/file-server/compat.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"compat.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/executors/file-server/compat.ts"],"names":[],"mappings":";;AAAA,yCAAiD;AAEjD,yDAAoD;AAEpD,kBAAe,IAAA,0BAAiB,EAAC,0BAAkB,CAAC,CAAC"}

package/src/executors/file-server/file-server.impl.d.ts

@@ -1,8 +0,0 @@
-import { ExecutorContext } from '@nrwl/devkit';
-import { Schema } from './schema';
-export default function fileServerExecutor(options: Schema, context: ExecutorContext): AsyncGenerator<{
-    success: boolean;
-    baseUrl: string;
-}, {
-    success: boolean;
-}, unknown>;

package/src/executors/file-server/file-server.impl.js

@@ -1,177 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
-const devkit_1 = require("@nrwl/devkit");
-const child_process_1 = require("child_process");
-const chokidar_1 = require("chokidar");
-const fs_1 = require("fs");
-const ignore_1 = require("ignore");
-const package_json_1 = require("nx/src/utils/package-json");
-const os_1 = require("os");
-const path_1 = require("path");
-// platform specific command name
-const pmCmd = (0, os_1.platform)() === 'win32' ? `npx.cmd` : 'npx';
-function getHttpServerArgs(options) {
-    const args = ['-c-1'];
-    if (options.cors) {
-        args.push(`--cors`);
-    }
-    if (options.port) {
-        args.push(`-p=${options.port}`);
-    }
-    if (options.host) {
-        args.push(`-a=${options.host}`);
-    }
-    if (options.ssl) {
-        args.push(`-S`);
-    }
-    if (options.sslCert) {
-        args.push(`-C=${options.sslCert}`);
-    }
-    if (options.sslKey) {
-        args.push(`-K=${options.sslKey}`);
-    }
-    if (options.proxyUrl) {
-        args.push(`-P=${options.proxyUrl}`);
-    }
-    if (options.proxyOptions) {
-        Object.keys(options.proxyOptions).forEach((key) => {
-            args.push(`--proxy-options.${key}=options.proxyOptions[key]`);
-        });
-    }
-    return args;
-}
-function getBuildTargetCommand(options) {
-    const cmd = ['nx', 'run', options.buildTarget];
-    if (options.parallel) {
-        cmd.push(`--parallel`);
-    }
-    if (options.maxParallel) {
-        cmd.push(`--maxParallel=${options.maxParallel}`);
-    }
-    return cmd;
-}
-function getBuildTargetOutputPath(options, context) {
-    let buildOptions;
-    try {
-        const [project, target, config] = options.buildTarget.split(':');
-        const buildTarget = context.projectsConfigurations.projects[project].targets[target];
-        buildOptions = config
-            ? Object.assign(Object.assign({}, buildTarget.options), buildTarget.configurations[config]) : buildTarget.options;
-    }
-    catch (e) {
-        throw new Error(`Invalid buildTarget: ${options.buildTarget}`);
-    }
-    // TODO: vsavkin we should also check outputs
-    const outputPath = buildOptions.outputPath;
-    if (!outputPath) {
-        throw new Error(`Invalid buildTarget: ${options.buildTarget}. The target must contain outputPath property.`);
-    }
-    return outputPath;
-}
-function getIgnoredGlobs(root) {
-    const ig = (0, ignore_1.default)();
-    try {
-        ig.add((0, fs_1.readFileSync)(`${root}/.gitignore`, 'utf-8'));
-    }
-    catch (_a) { }
-    try {
-        ig.add((0, fs_1.readFileSync)(`${root}/.nxignore`, 'utf-8'));
-    }
-    catch (_b) { }
-    return ig;
-}
-function createFileWatcher(root, changeHandler) {
-    const ignoredGlobs = getIgnoredGlobs(root);
-    const layout = (0, devkit_1.workspaceLayout)();
-    const watcher = (0, chokidar_1.watch)([
-        (0, devkit_1.joinPathFragments)(layout.appsDir, '**'),
-        (0, devkit_1.joinPathFragments)(layout.libsDir, '**'),
-    ], {
-        cwd: root,
-        ignoreInitial: true,
-    });
-    watcher.on('all', (_event, path) => {
-        if (ignoredGlobs.ignores(path))
-            return;
-        changeHandler();
-    });
-    return () => watcher.close();
-}
-function fileServerExecutor(options, context) {
-    return tslib_1.__asyncGenerator(this, arguments, function* fileServerExecutor_1() {
-        let running = false;
-        const run = () => {
-            if (!running) {
-                running = true;
-                try {
-                    const args = getBuildTargetCommand(options);
-                    (0, child_process_1.execFileSync)(pmCmd, args, {
-                        stdio: [0, 1, 2],
-                    });
-                }
-                catch (_a) {
-                    throw new Error("Project failed to build. Check the build's error output for more information.");
-                }
-                running = false;
-            }
-        };
-        let disposeWatch;
-        if (options.watch) {
-            disposeWatch = createFileWatcher(context.root, run);
-        }
-        // perform initial run
-        run();
-        const outputPath = getBuildTargetOutputPath(options, context);
-        if (options.spa) {
-            const src = (0, path_1.join)(outputPath, 'index.html');
-            const dst = (0, path_1.join)(outputPath, '404.html');
-            // See: https://github.com/http-party/http-server#magic-files
-            (0, fs_1.copyFileSync)(src, dst);
-        }
-        const args = getHttpServerArgs(options);
-        const { path: pathToHttpServerPkgJson, packageJson } = (0, package_json_1.readModulePackageJson)('http-server');
-        const pathToHttpServerBin = packageJson.bin['http-server'];
-        const pathToHttpServer = (0, path_1.resolve)(pathToHttpServerPkgJson.replace('package.json', ''), pathToHttpServerBin);
-        const serve = (0, child_process_1.fork)(pathToHttpServer, [outputPath, ...args], {
-            stdio: 'pipe',
-            cwd: context.root,
-            env: Object.assign({ FORCE_COLOR: 'true' }, process.env),
-        });
-        const processExitListener = () => {
-            serve.kill();
-            if (disposeWatch) {
-                disposeWatch();
-            }
-            if (options.spa) {
-                (0, fs_1.unlinkSync)((0, path_1.join)(outputPath, '404.html'));
-            }
-        };
-        process.on('exit', processExitListener);
-        process.on('SIGTERM', processExitListener);
-        serve.stdout.on('data', (chunk) => {
-            if (chunk.toString().indexOf('GET') === -1) {
-                process.stdout.write(chunk);
-            }
-        });
-        serve.stderr.on('data', (chunk) => {
-            process.stderr.write(chunk);
-        });
-        yield yield tslib_1.__await({
-            success: true,
-            baseUrl: `${options.ssl ? 'https' : 'http'}://${options.host}:${options.port}`,
-        });
-        return yield tslib_1.__await(new Promise((res) => {
-            serve.on('exit', (code) => {
-                if (code == 0) {
-                    res({ success: true });
-                }
-                else {
-                    res({ success: false });
-                }
-            });
-        }));
-    });
-}
-exports.default = fileServerExecutor;
-//# sourceMappingURL=file-server.impl.js.map

package/src/executors/file-server/file-server.impl.js.map

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

package/src/executors/file-server/schema.d.ts

@@ -1,16 +0,0 @@
-export interface Schema {
-  host: string;
-  port: number;
-  ssl: boolean;
-  sslKey?: string;
-  sslCert?: string;
-  proxyUrl?: string;
-  buildTarget: string;
-  parallel: boolean;
-  maxParallel?: number;
-  withDeps: boolean;
-  proxyOptions?: object;
-  watch?: boolean;
-  spa?: boolean;
-  cors?: boolean;
-}

package/src/executors/file-server/schema.json

@@ -1,80 +0,0 @@
-{
-  "version": 2,
-  "outputCapture": "direct-nodejs",
-  "title": "File Server",
-  "description": "Serves a static web application from a folder.",
-  "type": "object",
-  "cli": "nx",
-  "properties": {
-    "buildTarget": {
-      "type": "string",
-      "description": "Target which builds the application."
-    },
-    "parallel": {
-      "type": "boolean",
-      "description": "Build the target in parallel.",
-      "default": true
-    },
-    "maxParallel": {
-      "type": "number",
-      "description": "Max number of parallel jobs."
-    },
-    "port": {
-      "type": "number",
-      "description": "Port to listen on.",
-      "default": 4200
-    },
-    "host": {
-      "type": "string",
-      "description": "Host to listen on.",
-      "default": "localhost"
-    },
-    "ssl": {
-      "type": "boolean",
-      "description": "Serve using `HTTPS`.",
-      "default": false
-    },
-    "sslKey": {
-      "type": "string",
-      "description": "SSL key to use for serving `HTTPS`."
-    },
-    "sslCert": {
-      "type": "string",
-      "description": "SSL certificate to use for serving `HTTPS`."
-    },
-    "proxyUrl": {
-      "type": "string",
-      "description": "URL to proxy unhandled requests to."
-    },
-    "proxyOptions": {
-      "type": "object",
-      "description": "Options for the proxy used by `http-server`.",
-      "default": {},
-      "properties": {
-        "secure": {
-          "type": "boolean",
-          "default": false
-        }
-      },
-      "additionalProperties": true
-    },
-    "watch": {
-      "type": "boolean",
-      "description": "Watch for file changes.",
-      "default": false
-    },
-    "spa": {
-      "type": "boolean",
-      "description": "Redirect 404 errors to index.html (useful for SPA's).",
-      "default": false
-    },
-    "cors": {
-      "type": "boolean",
-      "description": "Enable CORS",
-      "default": true
-    }
-  },
-  "additionalProperties": false,
-  "required": ["buildTarget"],
-  "examplesFile": "../../../docs/file-server-examples.md"
-}