@nrwl/angular 13.10.0-beta.6 → 13.10.0-beta.7

package/src/executors/ng-packagr-lite/schema.json

@@ -4,6 +4,20 @@
   "description": "ng-packagr target options for Build Architect. Use to build library projects.",
   "cli": "nx",
   "type": "object",
+  "presets": [
+    {
+      "name": "Buildable Library with Tailwind",
+      "keys": ["project", "tailwindConfig"]
+    },
+    {
+      "name": "Updating Project Dependencies for Buildable Library",
+      "keys": [
+        "project",
+        "updateBuildableProjectDepsInPackageJson",
+        "buildableProjectDepsInPackageJsonType"
+      ]
+    }
+  ],
   "properties": {
     "project": {
       "type": "string",

package/src/executors/package/schema.json

@@ -4,6 +4,20 @@
   "description": "ng-packagr target options for Build Architect. Use to build and package library projects for publishing.",
   "cli": "nx",
   "type": "object",
+  "presets": [
+    {
+      "name": "Publishable Library with Tailwind",
+      "keys": ["project", "tailwindConfig"]
+    },
+    {
+      "name": "Updating Project Dependencies for Publishable Library",
+      "keys": [
+        "project",
+        "updateBuildableProjectDepsInPackageJson",
+        "buildableProjectDepsInPackageJsonType"
+      ]
+    }
+  ],
   "properties": {
     "project": {
       "type": "string",

package/src/generators/application/schema.json

@@ -1,7 +1,7 @@
 {
   "$schema": "http://json-schema.org/schema",
   "$id": "GeneratorNxApp",
-  "title": "Nx Application Options Schema",
+  "title": "Creates an Angular application.",
   "type": "object",
   "cli": "nx",
   "properties": {
@@ -101,7 +101,7 @@
     "e2eTestRunner": {
       "type": "string",
       "enum": ["protractor", "cypress", "none"],
-      "description": "Test runner to use for end to end (e2e) tests.",
+      "description": "Test runner to use for end to end (E2E) tests.",
       "default": "cypress"
     },
     "tags": {
@@ -152,7 +152,7 @@
     },
     "setParserOptionsProject": {
       "type": "boolean",
-      "description": "Whether or not to configure the ESLint \"parserOptions.project\" option. We do not do this by default for lint performance reasons.",
+      "description": "Whether or not to configure the ESLint `parserOptions.project` option. We do not do this by default for lint performance reasons.",
       "default": false
     },
     "addTailwind": {

package/src/generators/component/schema.json

@@ -61,14 +61,14 @@
       "alias": "c"
     },
     "style": {
-      "description": "The file extension or preprocessor to use for style files, or 'none' to skip generating the style file.",
+      "description": "The file extension or preprocessor to use for style files, or `none` to skip generating the style file.",
       "type": "string",
       "default": "css",
       "enum": ["css", "scss", "sass", "less", "none"]
     },
     "skipTests": {
       "type": "boolean",
-      "description": "Do not create \"spec.ts\" test files for the new component.",
+      "description": "Do not create `spec.ts` test files for the new component.",
       "default": false
     },
     "flat": {
@@ -88,12 +88,12 @@
     },
     "type": {
       "type": "string",
-      "description": "Adds a developer-defined type to the filename, in the format \"name.type.ts\".",
+      "description": "Adds a developer-defined type to the filename, in the format `name.type.ts`.",
       "default": "component"
     },
     "export": {
       "type": "boolean",
-      "description": "Specifies if the component should be exported in the declaring NgModule. Additionally, if the project is a library, the component will be exported from the project's entry point (normally `index.ts`).",
+      "description": "Specifies if the component should be exported in the declaring `NgModule`. Additionally, if the project is a library, the component will be exported from the project's entry point (normally `index.ts`).",
       "default": false
     }
   },

package/src/generators/convert-to-with-mf/convert-to-with-mf.js

@@ -23,8 +23,9 @@ function convertToWithMF(tree, schema) {
         There are npm packages being shared with a custom configuration in webpack config (${pathToWebpackConfig}).`);
         }
         devkit_1.logger.warn(`This Micro Frontend configuration conversion will overwrite "${schema.project}"'s current webpack config. If you have anything custom that is not related to Micro Frontends, it will be lost. You should be able to see the changes in your version control system.`);
-        const updatedWebpackConfig = (0, lib_1.writeNewWebpackConfig)(webpackAst, (0, lib_1.isHostRemoteConfig)(webpackAst), schema.project);
+        const [updatedWebpackConfig, mfeConfig] = (0, lib_1.writeNewWebpackConfig)(webpackAst, (0, lib_1.isHostRemoteConfig)(webpackAst), schema.project);
         tree.write(pathToWebpackConfig, updatedWebpackConfig);
+        tree.write((0, devkit_1.joinPathFragments)(project.root, 'mfe.config.js'), mfeConfig);
         yield (0, devkit_2.formatFiles)(tree);
     });
 }

package/src/generators/convert-to-with-mf/convert-to-with-mf.js.map

@@ -1 +1 @@
-{"version":3,"file":"convert-to-with-mf.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/convert-to-with-mf/convert-to-with-mf.ts"],"names":[],"mappings":";;;AAAA,yCAA4C;AAG5C,yCAAqE;AACrE,mEAA8D;AAC9D,+BAOe;AAEf,SAA8B,eAAe,CAAC,IAAU,EAAE,MAAc;;QACtE,MAAM,QAAQ,GAAG,IAAI,GAAG,CAAC,IAAA,iCAAc,EAAC,IAAI,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;QAEjE,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE;YACjC,MAAM,IAAI,KAAK,CACb,2BAA2B,MAAM,CAAC,OAAO,iIAAiI,CAC3K,CAAC;SACH;QAED,MAAM,OAAO,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC;QAC/D,MAAM,mBAAmB,GAAG,IAAA,0BAAoB,EAAC,OAAO,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC;QAC1E,MAAM,UAAU,GAAG,IAAA,6BAAuB,EAAC,IAAI,EAAE,mBAAmB,CAAC,CAAC;QAEtE,IAAI,CAAC,IAAA,uCAAiC,EAAC,UAAU,EAAE,MAAM,CAAC,OAAO,CAAC,EAAE;YAClE,MAAM,IAAI,KAAK,CACb,iCAAiC,MAAM,CAAC,OAAO;wCACb,mBAAmB,gCAAgC,CACtF,CAAC;SACH;QAED,IAAI,CAAC,IAAA,yCAAmC,EAAC,UAAU,CAAC,EAAE;YACpD,MAAM,IAAI,KAAK,CACb,iCAAiC,MAAM,CAAC,OAAO;6FACwC,mBAAmB,IAAI,CAC/G,CAAC;SACH;QAED,eAAM,CAAC,IAAI,CACT,gEAAgE,MAAM,CAAC,OAAO,wLAAwL,CACvQ,CAAC;QAEF,MAAM,oBAAoB,GAAG,IAAA,2BAAqB,EAChD,UAAU,EACV,IAAA,wBAAkB,EAAC,UAAU,CAAC,EAC9B,MAAM,CAAC,OAAO,CACf,CAAC;QACF,IAAI,CAAC,KAAK,CAAC,mBAAmB,EAAE,oBAAoB,CAAC,CAAC;QAEtD,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;CAAA;AAvCD,kCAuCC"}
+{"version":3,"file":"convert-to-with-mf.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/convert-to-with-mf/convert-to-with-mf.ts"],"names":[],"mappings":";;;AAAA,yCAA+D;AAG/D,yCAAqE;AACrE,mEAA8D;AAC9D,+BAOe;AAEf,SAA8B,eAAe,CAAC,IAAU,EAAE,MAAc;;QACtE,MAAM,QAAQ,GAAG,IAAI,GAAG,CAAC,IAAA,iCAAc,EAAC,IAAI,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;QAEjE,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE;YACjC,MAAM,IAAI,KAAK,CACb,2BAA2B,MAAM,CAAC,OAAO,iIAAiI,CAC3K,CAAC;SACH;QAED,MAAM,OAAO,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC;QAC/D,MAAM,mBAAmB,GAAG,IAAA,0BAAoB,EAAC,OAAO,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC;QAC1E,MAAM,UAAU,GAAG,IAAA,6BAAuB,EAAC,IAAI,EAAE,mBAAmB,CAAC,CAAC;QAEtE,IAAI,CAAC,IAAA,uCAAiC,EAAC,UAAU,EAAE,MAAM,CAAC,OAAO,CAAC,EAAE;YAClE,MAAM,IAAI,KAAK,CACb,iCAAiC,MAAM,CAAC,OAAO;wCACb,mBAAmB,gCAAgC,CACtF,CAAC;SACH;QAED,IAAI,CAAC,IAAA,yCAAmC,EAAC,UAAU,CAAC,EAAE;YACpD,MAAM,IAAI,KAAK,CACb,iCAAiC,MAAM,CAAC,OAAO;6FACwC,mBAAmB,IAAI,CAC/G,CAAC;SACH;QAED,eAAM,CAAC,IAAI,CACT,gEAAgE,MAAM,CAAC,OAAO,wLAAwL,CACvQ,CAAC;QAEF,MAAM,CAAC,oBAAoB,EAAE,SAAS,CAAC,GAAG,IAAA,2BAAqB,EAC7D,UAAU,EACV,IAAA,wBAAkB,EAAC,UAAU,CAAC,EAC9B,MAAM,CAAC,OAAO,CACf,CAAC;QACF,IAAI,CAAC,KAAK,CAAC,mBAAmB,EAAE,oBAAoB,CAAC,CAAC;QACtD,IAAI,CAAC,KAAK,CAAC,IAAA,0BAAiB,EAAC,OAAO,CAAC,IAAI,EAAE,eAAe,CAAC,EAAE,SAAS,CAAC,CAAC;QAExE,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;CAAA;AAxCD,kCAwCC"}

package/src/generators/convert-to-with-mf/lib/write-new-webpack-config.d.ts

@@ -1,3 +1,3 @@
 import type { SourceFile } from 'typescript';
 import { IsHostRemoteConfigResult } from './is-host-remote-config';
-export declare function writeNewWebpackConfig(ast: SourceFile, mfType: IsHostRemoteConfigResult, projectName: string): string;
+export declare function writeNewWebpackConfig(ast: SourceFile, mfType: IsHostRemoteConfigResult, projectName: string): string[];

package/src/generators/convert-to-with-mf/lib/write-new-webpack-config.js

@@ -3,40 +3,43 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.writeNewWebpackConfig = void 0;
 const is_host_remote_config_1 = require("./is-host-remote-config");
 function writeNewWebpackConfig(ast, mfType, projectName) {
-    let webpackConfig = '';
+    const webpackConfig = `const { withModuleFederation } = require('@nrwl/angular/module-federation');
+  const config = require('./mfe.config');
+  module.exports = withModuleFederation(config);`;
+    let mfeConfig = '';
     if (!mfType) {
-        webpackConfig = `const { withModuleFederation } = require('@nrwl/angular/module-federation');
-        module.exports = withModuleFederation({
+        mfeConfig = `
+        module.exports = {
           name: '${projectName}',
-        });`;
+        };`;
     }
     else if (mfType === 'host') {
         const remotes = hostRemotesToString(ast);
-        webpackConfig = `const { withModuleFederation } = require('@nrwl/angular/module-federation');
-        module.exports = withModuleFederation({
+        mfeConfig = `
+        module.exports = {
           name: '${projectName}',
           remotes: ${remotes},
-        });`;
+        };`;
     }
     else if (mfType === 'remote') {
         const exposedModules = (0, is_host_remote_config_1.getExposedModulesFromRemote)(ast);
-        webpackConfig = `const { withModuleFederation } = require('@nrwl/angular/module-federation');
-        module.exports = withModuleFederation({
+        mfeConfig = `
+        module.exports = {
           name: '${projectName}',
           exposes: ${exposedModules},
-        });`;
+        };`;
     }
     else if (mfType === 'both') {
         const remotes = hostRemotesToString(ast);
         const exposedModules = (0, is_host_remote_config_1.getExposedModulesFromRemote)(ast);
-        webpackConfig = `const { withModuleFederation } = require('@nrwl/angular/module-federation');
-    module.exports = withModuleFederation({
+        mfeConfig = `
+    module.exports = {
       name: '${projectName}',
       remotes: ${remotes},
       exposes: ${exposedModules},
-    });`;
+    };`;
     }
-    return webpackConfig;
+    return [webpackConfig, mfeConfig];
 }
 exports.writeNewWebpackConfig = writeNewWebpackConfig;
 function hostRemotesToString(ast) {

package/src/generators/convert-to-with-mf/lib/write-new-webpack-config.js.map

@@ -1 +1 @@
-{"version":3,"file":"write-new-webpack-config.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/convert-to-with-mf/lib/write-new-webpack-config.ts"],"names":[],"mappings":";;;AACA,mEAIiC;AAEjC,SAAgB,qBAAqB,CACnC,GAAe,EACf,MAAgC,EAChC,WAAmB;IAEnB,IAAI,aAAa,GAAG,EAAE,CAAC;IACvB,IAAI,CAAC,MAAM,EAAE;QACX,aAAa,GAAG;;mBAED,WAAW;YAClB,CAAC;KACV;SAAM,IAAI,MAAM,KAAK,MAAM,EAAE;QAC5B,MAAM,OAAO,GAAG,mBAAmB,CAAC,GAAG,CAAC,CAAC;QACzC,aAAa,GAAG;;mBAED,WAAW;qBACT,OAAO;YAChB,CAAC;KACV;SAAM,IAAI,MAAM,KAAK,QAAQ,EAAE;QAC9B,MAAM,cAAc,GAAG,IAAA,mDAA2B,EAAC,GAAG,CAAC,CAAC;QACxD,aAAa,GAAG;;mBAED,WAAW;qBACT,cAAc;YACvB,CAAC;KACV;SAAM,IAAI,MAAM,KAAK,MAAM,EAAE;QAC5B,MAAM,OAAO,GAAG,mBAAmB,CAAC,GAAG,CAAC,CAAC;QACzC,MAAM,cAAc,GAAG,IAAA,mDAA2B,EAAC,GAAG,CAAC,CAAC;QACxD,aAAa,GAAG;;eAEL,WAAW;iBACT,OAAO;iBACP,cAAc;QACvB,CAAC;KACN;IAED,OAAO,aAAa,CAAC;AACvB,CAAC;AArCD,sDAqCC;AAED,SAAS,mBAAmB,CAAC,GAAe;IAC1C,MAAM,OAAO,GAAW,IAAA,0CAAkB,EAAC,GAAG,CAAC;SAC5C,MAAM,CACL,CAAC,GAAG,EAAE,UAAU,EAAE,EAAE,CAAC,KAAK,UAAU,CAAC,CAAC,CAAC,OAAO,UAAU,CAAC,CAAC,CAAC,OAAO,GAAG,EAAE,EACvE,EAAE,CACH;SACA,IAAI,EAAE,CAAC;IACV,OAAO,IAAI,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,GAAG,CAAC;AACvE,CAAC"}
+{"version":3,"file":"write-new-webpack-config.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/convert-to-with-mf/lib/write-new-webpack-config.ts"],"names":[],"mappings":";;;AACA,mEAIiC;AAEjC,SAAgB,qBAAqB,CACnC,GAAe,EACf,MAAgC,EAChC,WAAmB;IAEnB,MAAM,aAAa,GAAG;;iDAEyB,CAAC;IAEhD,IAAI,SAAS,GAAG,EAAE,CAAC;IACnB,IAAI,CAAC,MAAM,EAAE;QACX,SAAS,GAAG;;mBAEG,WAAW;WACnB,CAAC;KACT;SAAM,IAAI,MAAM,KAAK,MAAM,EAAE;QAC5B,MAAM,OAAO,GAAG,mBAAmB,CAAC,GAAG,CAAC,CAAC;QACzC,SAAS,GAAG;;mBAEG,WAAW;qBACT,OAAO;WACjB,CAAC;KACT;SAAM,IAAI,MAAM,KAAK,QAAQ,EAAE;QAC9B,MAAM,cAAc,GAAG,IAAA,mDAA2B,EAAC,GAAG,CAAC,CAAC;QACxD,SAAS,GAAG;;mBAEG,WAAW;qBACT,cAAc;WACxB,CAAC;KACT;SAAM,IAAI,MAAM,KAAK,MAAM,EAAE;QAC5B,MAAM,OAAO,GAAG,mBAAmB,CAAC,GAAG,CAAC,CAAC;QACzC,MAAM,cAAc,GAAG,IAAA,mDAA2B,EAAC,GAAG,CAAC,CAAC;QACxD,SAAS,GAAG;;eAED,WAAW;iBACT,OAAO;iBACP,cAAc;OACxB,CAAC;KACL;IAED,OAAO,CAAC,aAAa,EAAE,SAAS,CAAC,CAAC;AACpC,CAAC;AAzCD,sDAyCC;AAED,SAAS,mBAAmB,CAAC,GAAe;IAC1C,MAAM,OAAO,GAAW,IAAA,0CAAkB,EAAC,GAAG,CAAC;SAC5C,MAAM,CACL,CAAC,GAAG,EAAE,UAAU,EAAE,EAAE,CAAC,KAAK,UAAU,CAAC,CAAC,CAAC,OAAO,UAAU,CAAC,CAAC,CAAC,OAAO,GAAG,EAAE,EACvE,EAAE,CACH;SACA,IAAI,EAAE,CAAC;IACV,OAAO,IAAI,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,GAAG,CAAC;AACvE,CAAC"}

package/src/generators/convert-tslint-to-eslint/schema.json

@@ -3,18 +3,18 @@
   "$id": "NxAngularConvertTSLintToESLintGenerator",
   "cli": "nx",
   "title": "Convert an Angular project from TSLint to ESLint",
-  "description": "NOTE: Does not work in --dry-run mode",
+  "description": "Convert an Angular project from TSLint to ESLint. NOTE: Does not work in `--dry-run mode`",
   "examples": [
     {
-      "command": "g convert-tslint-to-eslint myapp",
+      "command": "nx g convert-tslint-to-eslint myapp",
       "description": "The following will first configure the project, `myapp`, the same way a _new_ project is configured i.e. It will use Nx's new recommended ESLint config. By default, this also adds the existing TSLint configuration on top of the default ESLint config from Nx to continue checking what it checks today. This is done by migrating TSLint rules to their equivalent ESLint rules to the best of its abilities. Some TSLint rules may not have ESLint equivalents and will be reported during the conversion"
     },
     {
-      "command": "g convert-tslint-to-eslint myapp --ignoreExistingTslintConfig=true",
+      "command": "nx g convert-tslint-to-eslint myapp --ignoreExistingTslintConfig=true",
       "description": "If your TSLint config isn't extremely important to you, ignoring it makes this process more deterministic. Unlike the prior example, this will discard the existing TSLint configuration, meaning that the project will only have the Nx's latest recommended ESLint configuration which may be good enough for some workspaces"
     },
     {
-      "command": "g convert-tslint-to-eslint myapp --removeTSLintIfNoMoreTSLintTargets=false",
+      "command": "nx g convert-tslint-to-eslint myapp --removeTSLintIfNoMoreTSLintTargets=false",
       "description": "By default, this process removes the TSLint related dependencies and configuration once no more projects use TSLint. This can be disabled with the following flag to keep TSLint related dependencies and configuration in the repo"
     }
   ],

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

@@ -2,6 +2,7 @@
   "$schema": "http://json-schema.org/schema",
   "$id": "NxDowngradeModuleGenerator",
   "title": "Generates downgradeModule setup.",
+  "description": "Sets up a Downgrade Module.",
   "cli": "nx",
   "type": "object",
   "properties": {

package/src/generators/init/schema.json

@@ -3,7 +3,7 @@
   "$id": "SchematicsAngularModuleInit",
   "cli": "nx",
   "title": "Init Angular Plugin",
-  "description": "NOTE: Does not work in the --dry-run mode",
+  "description": "Initializes the `@nrwl/angular` plugin. NOTE: Does not work in the `--dry-run` mode",
   "type": "object",
   "properties": {
     "unitTestRunner": {

package/src/generators/karma/karma.d.ts

@@ -1,4 +1,4 @@
 import type { Tree } from '@nrwl/devkit';
 import { GeneratorOptions } from './schema';
-export declare function karmaGenerator(tree: Tree, options: GeneratorOptions): import("@nrwl/devkit").GeneratorCallback;
+export declare function karmaGenerator(tree: Tree, options: GeneratorOptions): () => void;
 export default karmaGenerator;

package/src/generators/karma/karma.js

@@ -4,22 +4,24 @@ exports.karmaGenerator = void 0;
 const devkit_1 = require("@nrwl/devkit");
 function karmaGenerator(tree, options) {
     const packageJson = (0, devkit_1.readJson)(tree, 'package.json');
-    if (packageJson.devDependencies['karma']) {
-        return;
+    if (!tree.exists('karma.conf.js')) {
+        (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files'), '.', {
+            tmpl: '',
+        });
     }
-    (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files'), '.', { tmpl: '' });
-    return !options.skipPackageJson
-        ? (0, devkit_1.addDependenciesToPackageJson)(tree, {}, {
-            karma: '~6.3.0',
-            'karma-chrome-launcher': '~3.1.0',
-            'karma-coverage': '~2.2.0',
-            'karma-jasmine': '~4.0.0',
-            'karma-jasmine-html-reporter': '~1.7.0',
-            'jasmine-core': '~3.10.0',
-            'jasmine-spec-reporter': '~5.0.0',
-            '@types/jasmine': '~3.5.0',
-        })
-        : () => { };
+    if (options.skipPackageJson || packageJson.devDependencies['karma']) {
+        return () => { };
+    }
+    return (0, devkit_1.addDependenciesToPackageJson)(tree, {}, {
+        karma: '~6.3.0',
+        'karma-chrome-launcher': '~3.1.0',
+        'karma-coverage': '~2.2.0',
+        'karma-jasmine': '~4.0.0',
+        'karma-jasmine-html-reporter': '~1.7.0',
+        'jasmine-core': '~3.10.0',
+        'jasmine-spec-reporter': '~5.0.0',
+        '@types/jasmine': '~3.5.0',
+    });
 }
 exports.karmaGenerator = karmaGenerator;
 exports.default = karmaGenerator;

package/src/generators/karma/karma.js.map

@@ -1 +1 @@
-{"version":3,"file":"karma.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/karma/karma.ts"],"names":[],"mappings":";;;AACA,yCAKsB;AAGtB,SAAgB,cAAc,CAAC,IAAU,EAAE,OAAyB;IAClE,MAAM,WAAW,GAAG,IAAA,iBAAQ,EAAC,IAAI,EAAE,cAAc,CAAC,CAAC;IACnD,IAAI,WAAW,CAAC,eAAe,CAAC,OAAO,CAAC,EAAE;QACxC,OAAO;KACR;IAED,IAAA,sBAAa,EAAC,IAAI,EAAE,IAAA,0BAAiB,EAAC,SAAS,EAAE,OAAO,CAAC,EAAE,GAAG,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC;IAE9E,OAAO,CAAC,OAAO,CAAC,eAAe;QAC7B,CAAC,CAAC,IAAA,qCAA4B,EAC1B,IAAI,EACJ,EAAE,EACF;YACE,KAAK,EAAE,QAAQ;YACf,uBAAuB,EAAE,QAAQ;YACjC,gBAAgB,EAAE,QAAQ;YAC1B,eAAe,EAAE,QAAQ;YACzB,6BAA6B,EAAE,QAAQ;YACvC,cAAc,EAAE,SAAS;YACzB,uBAAuB,EAAE,QAAQ;YACjC,gBAAgB,EAAE,QAAQ;SAC3B,CACF;QACH,CAAC,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC;AACf,CAAC;AAxBD,wCAwBC;AAED,kBAAe,cAAc,CAAC"}
+{"version":3,"file":"karma.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/karma/karma.ts"],"names":[],"mappings":";;;AACA,yCAKsB;AAGtB,SAAgB,cAAc,CAAC,IAAU,EAAE,OAAyB;IAClE,MAAM,WAAW,GAAG,IAAA,iBAAQ,EAAC,IAAI,EAAE,cAAc,CAAC,CAAC;IAEnD,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,EAAE;QACjC,IAAA,sBAAa,EAAC,IAAI,EAAE,IAAA,0BAAiB,EAAC,SAAS,EAAE,OAAO,CAAC,EAAE,GAAG,EAAE;YAC9D,IAAI,EAAE,EAAE;SACT,CAAC,CAAC;KACJ;IAED,IAAI,OAAO,CAAC,eAAe,IAAI,WAAW,CAAC,eAAe,CAAC,OAAO,CAAC,EAAE;QACnE,OAAO,GAAG,EAAE,GAAE,CAAC,CAAC;KACjB;IACD,OAAO,IAAA,qCAA4B,EACjC,IAAI,EACJ,EAAE,EACF;QACE,KAAK,EAAE,QAAQ;QACf,uBAAuB,EAAE,QAAQ;QACjC,gBAAgB,EAAE,QAAQ;QAC1B,eAAe,EAAE,QAAQ;QACzB,6BAA6B,EAAE,QAAQ;QACvC,cAAc,EAAE,SAAS;QACzB,uBAAuB,EAAE,QAAQ;QACjC,gBAAgB,EAAE,QAAQ;KAC3B,CACF,CAAC;AACJ,CAAC;AA1BD,wCA0BC;AAED,kBAAe,cAAc,CAAC"}

package/src/generators/karma/schema.json

@@ -2,6 +2,7 @@
   "$schema": "http://json-schema.org/schema",
   "$id": "NxAngularKarmaGenerator",
   "title": "Add Karma Configuration to the workspace.",
+  "description": "Add Karma configuration to an Nx workspace.",
   "cli": "nx",
   "type": "object",
   "properties": {

package/src/generators/karma-project/karma-project.js

@@ -7,8 +7,10 @@ const check_test_target_1 = require("./lib/check-test-target");
 const generate_karma_project_files_1 = require("./lib/generate-karma-project-files");
 const update_tsconfig_1 = require("./lib/update-tsconfig");
 const update_workspace_config_1 = require("./lib/update-workspace-config");
+const karma_1 = require("../karma/karma");
 function karmaProjectGenerator(tree, options) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        (0, karma_1.karmaGenerator)(tree, options);
         (0, check_test_target_1.checkProjectTestTarget)(tree, options.project);
         (0, generate_karma_project_files_1.generateKarmaProjectFiles)(tree, options.project);
         (0, update_tsconfig_1.updateTsConfigs)(tree, options.project);

package/src/generators/karma-project/karma-project.js.map

@@ -1 +1 @@
-{"version":3,"file":"karma-project.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/karma-project/karma-project.ts"],"names":[],"mappings":";;;;AACA,yCAA2C;AAC3C,+DAAiE;AACjE,qFAA+E;AAC/E,2DAAwD;AACxD,2EAAsE;AAGtE,SAAsB,qBAAqB,CACzC,IAAU,EACV,OAA4B;;QAE5B,IAAA,0CAAsB,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;QAC9C,IAAA,wDAAyB,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;QACjD,IAAA,iCAAe,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;QACvC,IAAA,+CAAqB,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;QAC7C,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;YACvB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;IACH,CAAC;CAAA;AAXD,sDAWC;AAED,kBAAe,qBAAqB,CAAC"}
+{"version":3,"file":"karma-project.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/karma-project/karma-project.ts"],"names":[],"mappings":";;;;AACA,yCAA2C;AAC3C,+DAAiE;AACjE,qFAA+E;AAC/E,2DAAwD;AACxD,2EAAsE;AAEtE,0CAAgD;AAEhD,SAAsB,qBAAqB,CACzC,IAAU,EACV,OAA4B;;QAE5B,IAAA,sBAAc,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAC9B,IAAA,0CAAsB,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;QAC9C,IAAA,wDAAyB,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;QACjD,IAAA,iCAAe,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;QACvC,IAAA,+CAAqB,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;QAC7C,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;YACvB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;IACH,CAAC;CAAA;AAZD,sDAYC;AAED,kBAAe,qBAAqB,CAAC"}

package/src/generators/karma-project/schema.d.ts

@@ -1,4 +1,5 @@
 export interface KarmaProjectOptions {
   project: string;
   skipFormat?: boolean;
+  skipPackageJson?: boolean;
 }

package/src/generators/karma-project/schema.json

@@ -2,6 +2,7 @@
   "$schema": "http://json-schema.org/schema",
   "$id": "NxKarmaProjectGenerator",
   "title": "Create Karma Configuration for a project",
+  "description": "Add Karma configuration to an angular project.",
   "cli": "nx",
   "type": "object",
   "properties": {
@@ -16,6 +17,11 @@
       "description": "Skip formatting files.",
       "type": "boolean",
       "default": false
+    },
+    "skipPackageJson": {
+      "description": "Skip updating package.json.",
+      "type": "boolean",
+      "default": false
     }
   },
   "additionalProperties": false,

package/src/generators/library/schema.json

@@ -2,6 +2,7 @@
   "$schema": "http://json-schema.org/schema",
   "$id": "GeneratorAngularLibrary",
   "title": "Create a library",
+  "description": "Creates an Angular library.",
   "type": "object",
   "cli": "nx",
   "properties": {
@@ -110,7 +111,7 @@
     },
     "setParserOptionsProject": {
       "type": "boolean",
-      "description": "Whether or not to configure the ESLint \"parserOptions.project\" option. We do not do this by default for lint performance reasons.",
+      "description": "Whether or not to configure the ESLint `parserOptions.project` option. We do not do this by default for lint performance reasons.",
       "default": false
     },
     "addTailwind": {

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

@@ -2,6 +2,7 @@
   "$schema": "http://json-schema.org/schema",
   "$id": "NxAngularLibrarySecondaryEntryPoint",
   "title": "Creates a secondary entry point for a library",
+  "description": "Creates a secondary entry point for an Angular publishable library.",
   "type": "object",
   "cli": "nx",
   "properties": {

package/src/generators/mfe-host/schema.json

@@ -7,7 +7,7 @@
   "type": "object",
   "examples": [
     {
-      "command": "g @nrwl/angular:mfe-host appName --remotes=remote1",
+      "command": "nx g @nrwl/angular:mfe-host appName --remotes=remote1",
       "description": "Create an Angular app with configuration in place for MFE. If remotes is provided, attach the remote app to this app's configuration."
     }
   ],

package/src/generators/mfe-remote/schema.json

@@ -3,11 +3,11 @@
   "$id": "NxMFERemote",
   "cli": "nx",
   "title": "Nx MFE Remote App",
-  "description": "Create an Angular Remote Micro Frontend Application",
+  "description": "Create an Angular Remote Micro Frontend Application.",
   "type": "object",
   "examples": [
     {
-      "command": "g @nrwl/angular:mfe-remote appName --host=host --port=4201",
+      "command": "nx g @nrwl/angular:mfe-remote appName --host=host --port=4201",
       "description": "Create an Angular app with configuration in place for MFE. If host is provided, attach this remote app to host app's configuration."
     }
   ],

package/src/generators/move/schema.json

@@ -3,12 +3,12 @@
   "$id": "NxAngularMove",
   "cli": "nx",
   "title": "Nx Angular Move",
-  "description": "Move an Angular project to another folder in the workspace",
+  "description": "Move an Angular project to another folder in the workspace.",
   "type": "object",
   "examples": [
     {
-      "command": "g @nrwl/angular:move --project my-feature-lib shared/my-feature-lib",
-      "description": "Move libs/my-feature-lib to libs/shared/my-feature-lib"
+      "command": "nx g @nrwl/angular:move --project my-feature-lib shared/my-feature-lib",
+      "description": "Move libs/my-feature-lib to libs/shared/my-feature-lib."
     }
   ],
   "properties": {

package/src/generators/ngrx/schema.json

@@ -2,6 +2,7 @@
   "$schema": "http://json-schema.org/schema",
   "$id": "NxNgrxGenerator",
   "title": "Add NgRx support to an application or library.",
+  "description": "Adds NgRx support to an application or library.",
   "cli": "nx",
   "type": "object",
   "properties": {

package/src/generators/scam/schema.json

@@ -36,13 +36,13 @@
       "alias": "b"
     },
     "inlineStyle": {
-      "description": "Include styles inline in the component.ts file. Only CSS styles can be included inline. By default, an external styles file is created and referenced in the component.ts file.",
+      "description": "Include styles inline in the `component.ts` file. Only CSS styles can be included inline. By default, an external styles file is created and referenced in the `component.ts` file.",
       "type": "boolean",
       "default": false,
       "alias": "s"
     },
     "inlineTemplate": {
-      "description": "Include template inline in the component.ts file. By default, an external template file is created and referenced in the component.ts file.",
+      "description": "Include template inline in the `component.ts` file. By default, an external template file is created and referenced in the `component.ts` file.",
       "type": "boolean",
       "default": false,
       "alias": "t"
@@ -68,12 +68,12 @@
     },
     "skipTests": {
       "type": "boolean",
-      "description": "Do not create \"spec.ts\" test files for the new component.",
+      "description": "Do not create `spec.ts` test files for the new component.",
       "default": false
     },
     "inlineScam": {
       "type": "boolean",
-      "description": "Create the NgModule in the same file as the Component.",
+      "description": "Create the `NgModule` in the same file as the component.",
       "default": true
     },
     "flat": {
@@ -84,7 +84,7 @@
     "selector": {
       "type": "string",
       "format": "html-selector",
-      "description": "The HTML selector to use for this component."
+      "description": "The `HTML` selector to use for this component."
     },
     "skipSelector": {
       "type": "boolean",
@@ -93,7 +93,7 @@
     },
     "type": {
       "type": "string",
-      "description": "Adds a developer-defined type to the filename, in the format \"name.type.ts\".",
+      "description": "Adds a developer-defined type to the filename, in the format `name.type.ts`.",
       "default": "component"
     },
     "prefix": {

package/src/generators/scam-directive/schema.json

@@ -31,12 +31,12 @@
     },
     "skipTests": {
       "type": "boolean",
-      "description": "Do not create \"spec.ts\" test files for the new directive.",
+      "description": "Do not create `spec.ts` test files for the new directive.",
       "default": false
     },
     "inlineScam": {
       "type": "boolean",
-      "description": "Create the NgModule in the same file as the Directive.",
+      "description": "Create the `NgModule` in the same file as the Directive.",
       "default": true
     },
     "flat": {
@@ -47,7 +47,7 @@
     "selector": {
       "type": "string",
       "format": "html-selector",
-      "description": "The HTML selector to use for this directive."
+      "description": "The `HTML` selector to use for this directive."
     },
     "prefix": {
       "type": "string",

package/src/generators/scam-pipe/schema.json

@@ -31,7 +31,7 @@
     },
     "skipTests": {
       "type": "boolean",
-      "description": "Do not create \"spec.ts\" test files for the new pipe.",
+      "description": "Do not create `spec.ts` test files for the new pipe.",
       "default": false
     },
     "inlineScam": {

package/src/generators/setup-mfe/files/webpack/mfe.config.js__tmpl__

@@ -0,0 +1,7 @@
+module.exports = {
+  name: '<%= name %>',<% if(type === 'host') { %>
+  remotes: [<% remotes.forEach(function(remote) { %>'<%= remote.remoteName %>',<% }); %>]<% } %><% if(type === 'remote') { %>
+  exposes: {
+    './Module': '<%= projectRoot %>/src/app/remote-entry/entry.module.ts',
+  },<% } %>
+}

package/src/generators/setup-mfe/files/webpack/webpack.config.js__tmpl__

@@ -1,8 +1,3 @@
 const { withModuleFederation } = require('@nrwl/angular/module-federation');
-module.exports = withModuleFederation({
-  name: '<%= name %>',<% if(type === 'host') { %>
-  remotes: [<% remotes.forEach(function(remote) { %>'<%= remote.remoteName %>',<% }); %>]<% } %><% if(type === 'remote') { %>
-  exposes: {
-    './Module': '<%= projectRoot %>/src/app/remote-entry/entry.module.ts',
-  },<% } %>
-});
+const config = require('./mfe.config');
+module.exports = withModuleFederation(config);

package/src/generators/setup-mfe/lib/add-remote-to-host.js

@@ -15,20 +15,19 @@ function checkIsCommaNeeded(mfeRemoteText) {
 }
 exports.checkIsCommaNeeded = checkIsCommaNeeded;
 function addRemoteToHost(host, options) {
-    var _a;
     if (options.mfeType === 'remote' && options.host) {
         const hostProject = (0, devkit_1.readProjectConfiguration)(host, options.host);
-        const hostWebpackPath = (_a = hostProject.targets['build'].options.customWebpackConfig) === null || _a === void 0 ? void 0 : _a.path;
-        if (!hostWebpackPath || !host.exists(hostWebpackPath)) {
-            throw new Error(`The selected host application, ${options.host}, does not contain a webpack.config.js. Are you sure it has been set up as a host application?`);
+        const hostMfeConfigPath = (0, devkit_1.joinPathFragments)(hostProject.root, 'mfe.config.js');
+        if (!hostMfeConfigPath || !host.exists(hostMfeConfigPath)) {
+            throw new Error(`The selected host application, ${options.host}, does not contain a mfe.config.js. Are you sure it has been set up as a host application?`);
         }
-        const hostWebpackConfig = host.read(hostWebpackPath, 'utf-8');
-        const webpackAst = tsquery_1.tsquery.ast(hostWebpackConfig);
+        const hostMFEConfig = host.read(hostMfeConfigPath, 'utf-8');
+        const webpackAst = tsquery_1.tsquery.ast(hostMFEConfig);
         const mfRemotesNode = (0, tsquery_1.tsquery)(webpackAst, 'Identifier[name=remotes] ~ ArrayLiteralExpression', { visitAllChildren: true })[0];
         const endOfPropertiesPos = mfRemotesNode.getEnd() - 1;
         const isCommaNeeded = checkIsCommaNeeded(mfRemotesNode.getText());
-        const updatedConfig = `${hostWebpackConfig.slice(0, endOfPropertiesPos)}${isCommaNeeded ? ',' : ''}'${options.appName}',${hostWebpackConfig.slice(endOfPropertiesPos)}`;
-        host.write(hostWebpackPath, updatedConfig);
+        const updatedConfig = `${hostMFEConfig.slice(0, endOfPropertiesPos)}${isCommaNeeded ? ',' : ''}'${options.appName}',${hostMFEConfig.slice(endOfPropertiesPos)}`;
+        host.write(hostMfeConfigPath, updatedConfig);
         const declarationFilePath = (0, devkit_1.joinPathFragments)(hostProject.sourceRoot, 'decl.d.ts');
         const declarationFileContent = (host.exists(declarationFilePath)
             ? host.read(declarationFilePath, 'utf-8')

package/src/generators/setup-mfe/lib/add-remote-to-host.js.map

@@ -1 +1 @@
-{"version":3,"file":"add-remote-to-host.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/setup-mfe/lib/add-remote-to-host.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"add-remote-to-host.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/setup-mfe/lib/add-remote-to-host.ts"],"names":[],"mappings":";;;AAGA,yCAA2E;AAC3E,uDAAoD;AAEpD,kEAA8D;AAE9D,iCAAiC;AAEjC,SAAgB,kBAAkB,CAAC,aAAqB;IACtD,MAAM,UAAU,GAAG,aAAa,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;IACrD,OAAO,CAAC,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC;QAC/B,CAAC,CAAC,UAAU,KAAK,IAAI;YACnB,CAAC,CAAC,KAAK;YACP,CAAC,CAAC,IAAI;QACR,CAAC,CAAC,KAAK,CAAC;AACZ,CAAC;AAPD,gDAOC;AAED,SAAgB,eAAe,CAAC,IAAU,EAAE,OAAe;IACzD,IAAI,OAAO,CAAC,OAAO,KAAK,QAAQ,IAAI,OAAO,CAAC,IAAI,EAAE;QAChD,MAAM,WAAW,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;QACjE,MAAM,iBAAiB,GAAG,IAAA,0BAAiB,EACzC,WAAW,CAAC,IAAI,EAChB,eAAe,CAChB,CAAC;QAEF,IAAI,CAAC,iBAAiB,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,iBAAiB,CAAC,EAAE;YACzD,MAAM,IAAI,KAAK,CACb,kCAAkC,OAAO,CAAC,IAAI,4FAA4F,CAC3I,CAAC;SACH;QAED,MAAM,aAAa,GAAG,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,OAAO,CAAC,CAAC;QAC5D,MAAM,UAAU,GAAG,iBAAO,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;QAC9C,MAAM,aAAa,GAAG,IAAA,iBAAO,EAC3B,UAAU,EACV,mDAAmD,EACnD,EAAE,gBAAgB,EAAE,IAAI,EAAE,CAC3B,CAAC,CAAC,CAA2B,CAAC;QAE/B,MAAM,kBAAkB,GAAG,aAAa,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;QACtD,MAAM,aAAa,GAAG,kBAAkB,CAAC,aAAa,CAAC,OAAO,EAAE,CAAC,CAAC;QAElE,MAAM,aAAa,GAAG,GAAG,aAAa,CAAC,KAAK,CAAC,CAAC,EAAE,kBAAkB,CAAC,GACjE,aAAa,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EACxB,IAAI,OAAO,CAAC,OAAO,KAAK,aAAa,CAAC,KAAK,CAAC,kBAAkB,CAAC,EAAE,CAAC;QAElE,IAAI,CAAC,KAAK,CAAC,iBAAiB,EAAE,aAAa,CAAC,CAAC;QAE7C,MAAM,mBAAmB,GAAG,IAAA,0BAAiB,EAC3C,WAAW,CAAC,UAAU,EACtB,WAAW,CACZ,CAAC;QAEF,MAAM,sBAAsB,GAC1B,CAAC,IAAI,CAAC,MAAM,CAAC,mBAAmB,CAAC;YAC/B,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,mBAAmB,EAAE,OAAO,CAAC;YACzC,CAAC,CAAC,EAAE,CAAC,GAAG,qBAAqB,OAAO,CAAC,OAAO,WAAW,CAAC;QAC5D,IAAI,CAAC,KAAK,CAAC,mBAAmB,EAAE,sBAAsB,CAAC,CAAC;QAExD,iCAAiC,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;KAClD;AACH,CAAC;AA5CD,0CA4CC;AAED,wEAAwE;AACxE,SAAS,iCAAiC,CAAC,IAAU,EAAE,OAAe;IACpE,MAAM,aAAa,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IACnE,MAAM,mBAAmB,GAAG,GAAG,aAAa,CAAC,UAAU,oBAAoB,CAAC;IAC5E,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,mBAAmB,CAAC,EAAE;QACrC,OAAO;KACR;IAED,MAAM,aAAa,GAAG,IAAI,CAAC,IAAI,CAAC,mBAAmB,EAAE,OAAO,CAAC,CAAC;IAC9D,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,uBAAuB,CAAC,EAAE;QACpD,OAAO;KACR;IAED,IAAI,UAAU,GAAG,EAAE,CAAC,gBAAgB,CAClC,mBAAmB,EACnB,aAAa,EACb,EAAE,CAAC,YAAY,CAAC,MAAM,EACtB,IAAI,CACL,CAAC;IAEF,UAAU,GAAG,IAAA,oBAAQ,EACnB,IAAI,EACJ,mBAAmB,EACnB,UAAU,EACV;kBACc,OAAO,CAAC,OAAO;uCACM,OAAO,CAAC,OAAO;OAC/C,CACJ,CAAC;AACJ,CAAC"}

package/src/generators/setup-mfe/lib/generate-config.js

@@ -3,7 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateWebpackConfig = void 0;
 const devkit_1 = require("@nrwl/devkit");
 function generateWebpackConfig(host, options, appRoot, remotesWithPorts) {
-    if (host.exists(`${appRoot}/webpack.config.js`) ||
+    if (host.exists(`${appRoot}/mfe.config.js`) ||
+        host.exists(`${appRoot}/webpack.config.js`) ||
         host.exists(`${appRoot}/webpack.prod.config.js`)) {
         devkit_1.logger.warn(`NOTE: We encountered an existing webpack config for the app ${options.appName}. We have overwritten this file with the Module Federation Config.\n
       If this was not the outcome you expected, you can discard the changes we have made, create a backup of your current webpack config, and run the command again.`);

package/src/generators/setup-mfe/lib/generate-config.js.map

@@ -1 +1 @@
-{"version":3,"file":"generate-config.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/setup-mfe/lib/generate-config.ts"],"names":[],"mappings":";;;AACA,yCAAwE;AAGxE,SAAgB,qBAAqB,CACnC,IAAU,EACV,OAAe,EACf,OAAe,EACf,gBAAwD;IAExD,IACE,IAAI,CAAC,MAAM,CAAC,GAAG,OAAO,oBAAoB,CAAC;QAC3C,IAAI,CAAC,MAAM,CAAC,GAAG,OAAO,yBAAyB,CAAC,EAChD;QACA,eAAM,CAAC,IAAI,CACT,+DAA+D,OAAO,CAAC,OAAO;qKACiF,CAChK,CAAC;KACH;IAED,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,0BAAiB,EAAC,SAAS,EAAE,kBAAkB,CAAC,EAChD,OAAO,EACP;QACE,IAAI,EAAE,EAAE;QACR,IAAI,EAAE,OAAO,CAAC,OAAO;QACrB,IAAI,EAAE,OAAO,CAAC,OAAO;QACrB,OAAO,EAAE,gBAAgB,aAAhB,gBAAgB,cAAhB,gBAAgB,GAAI,EAAE;QAC/B,WAAW,EAAE,OAAO;KACrB,CACF,CAAC;AACJ,CAAC;AA5BD,sDA4BC"}
+{"version":3,"file":"generate-config.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/setup-mfe/lib/generate-config.ts"],"names":[],"mappings":";;;AACA,yCAAwE;AAGxE,SAAgB,qBAAqB,CACnC,IAAU,EACV,OAAe,EACf,OAAe,EACf,gBAAwD;IAExD,IACE,IAAI,CAAC,MAAM,CAAC,GAAG,OAAO,gBAAgB,CAAC;QACvC,IAAI,CAAC,MAAM,CAAC,GAAG,OAAO,oBAAoB,CAAC;QAC3C,IAAI,CAAC,MAAM,CAAC,GAAG,OAAO,yBAAyB,CAAC,EAChD;QACA,eAAM,CAAC,IAAI,CACT,+DAA+D,OAAO,CAAC,OAAO;qKACiF,CAChK,CAAC;KACH;IAED,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,0BAAiB,EAAC,SAAS,EAAE,kBAAkB,CAAC,EAChD,OAAO,EACP;QACE,IAAI,EAAE,EAAE;QACR,IAAI,EAAE,OAAO,CAAC,OAAO;QACrB,IAAI,EAAE,OAAO,CAAC,OAAO;QACrB,OAAO,EAAE,gBAAgB,aAAhB,gBAAgB,cAAhB,gBAAgB,GAAI,EAAE;QAC/B,WAAW,EAAE,OAAO;KACrB,CACF,CAAC;AACJ,CAAC;AA7BD,sDA6BC"}