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

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/mfe-host.js

@@ -21,6 +21,7 @@ function mfeHost(tree, options) {
             routing: true,
             remotes: (_a = options.remotes) !== null && _a !== void 0 ? _a : [],
             port: 4200,
+            federationType: options.dynamic ? 'dynamic' : 'static',
         });
         return installTask;
     });

package/src/generators/mfe-host/mfe-host.js.map

@@ -1 +1 @@
-{"version":3,"file":"mfe-host.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/mfe-host/mfe-host.ts"],"names":[],"mappings":";;;AAGA,yCAA2C;AAC3C,4DAA8D;AAE9D,SAA8B,OAAO,CAAC,IAAU,EAAE,OAAe;;;QAC/D,MAAM,QAAQ,GAAG,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;QAEnC,IAAI,OAAO,CAAC,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE;YACjD,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;gBACjC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE;oBACzB,MAAM,IAAI,KAAK,CACb,gDAAgD,MAAM,GAAG,CAC1D,CAAC;iBACH;YACH,CAAC,CAAC,CAAC;SACJ;QAED,MAAM,WAAW,GAAG,MAAM,IAAA,qBAAoB,EAAC,IAAI,EAAE;YACnD,IAAI,EAAE,OAAO,CAAC,IAAI;YAClB,GAAG,EAAE,IAAI;YACT,OAAO,EAAE,MAAM;YACf,OAAO,EAAE,IAAI;YACb,OAAO,EAAE,MAAA,OAAO,CAAC,OAAO,mCAAI,EAAE;YAC9B,IAAI,EAAE,IAAI;SACX,CAAC,CAAC;QAEH,OAAO,WAAW,CAAC;;CACpB;AAvBD,0BAuBC"}
+{"version":3,"file":"mfe-host.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/mfe-host/mfe-host.ts"],"names":[],"mappings":";;;AAGA,yCAA2C;AAC3C,4DAA8D;AAE9D,SAA8B,OAAO,CAAC,IAAU,EAAE,OAAe;;;QAC/D,MAAM,QAAQ,GAAG,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;QAEnC,IAAI,OAAO,CAAC,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE;YACjD,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;gBACjC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE;oBACzB,MAAM,IAAI,KAAK,CACb,gDAAgD,MAAM,GAAG,CAC1D,CAAC;iBACH;YACH,CAAC,CAAC,CAAC;SACJ;QAED,MAAM,WAAW,GAAG,MAAM,IAAA,qBAAoB,EAAC,IAAI,EAAE;YACnD,IAAI,EAAE,OAAO,CAAC,IAAI;YAClB,GAAG,EAAE,IAAI;YACT,OAAO,EAAE,MAAM;YACf,OAAO,EAAE,IAAI;YACb,OAAO,EAAE,MAAA,OAAO,CAAC,OAAO,mCAAI,EAAE;YAC9B,IAAI,EAAE,IAAI;YACV,cAAc,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,QAAQ;SACvD,CAAC,CAAC;QAEH,OAAO,WAAW,CAAC;;CACpB;AAxBD,0BAwBC"}

package/src/generators/mfe-host/schema.d.ts

@@ -1,4 +1,5 @@
 export interface Schema {
   name: string;
   remotes?: string[];
+  dynamic?: boolean;
 }

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

@@ -2,31 +2,32 @@
   "$schema": "http://json-schema.org/schema",
   "$id": "NxMFEHost",
   "cli": "nx",
-  "title": "Nx MFE Host App",
+  "title": "Nx MFE Host Application",
   "description": "Create an Angular Host Micro Frontend Application",
   "type": "object",
   "examples": [
     {
-      "command": "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."
+      "command": "nx g @nrwl/angular:mfe-host appName --remotes=remote1",
+      "description": "Create an Angular application with configuration in place for MFE. If the `remotes` option is provided, attach the remote application to this application's configuration"
     }
   ],
   "properties": {
     "name": {
       "type": "string",
-      "description": "The name to give to the host Angular app.",
+      "description": "The name to give to the host Angular application.",
       "$default": {
         "$source": "argv",
         "index": 0
       }
     },
-    "host": {
-      "type": "string",
-      "description": "The name of the host app to attach this host app to."
+    "remotes": {
+      "type": "array",
+      "description": "The names of the remote applications to add to the host."
     },
-    "port": {
-      "type": "number",
-      "description": "The port on which this app should be served."
+    "dynamic": {
+      "type": "boolean",
+      "description": "Should the host application use dynamic federation?",
+      "default": false
     }
   },
   "required": ["name"]

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/lib/update-ng-package.js

@@ -16,7 +16,7 @@ function updateNgPackage(tree, schema) {
     if (!tree.exists(ngPackagePath)) {
         return;
     }
-    const rootOffset = (0, path_1.relative)((0, path_1.join)(devkit_2.appRootPath, project.root), devkit_2.appRootPath);
+    const rootOffset = (0, path_1.relative)((0, path_1.join)(devkit_2.workspaceRoot, project.root), devkit_2.workspaceRoot);
     let output = `dist/${project.root}`;
     if (((_c = (_b = (_a = project.targets) === null || _a === void 0 ? void 0 : _a.build) === null || _b === void 0 ? void 0 : _b.outputs) === null || _c === void 0 ? void 0 : _c.length) > 0) {
         output = project.targets.build.outputs[0];

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

@@ -1 +1 @@
-{"version":3,"file":"update-ng-package.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/move/lib/update-ng-package.ts"],"names":[],"mappings":";;;AAAA,yCAA0E;AAC1E,yCAA2C;AAC3C,yEAAkF;AAClF,+BAAsC;AAGtC,SAAgB,eAAe,CAAC,IAAU,EAAE,MAAc;;IACxD,MAAM,cAAc,GAAG,IAAA,yBAAiB,EAAC,MAAM,CAAC,WAAW,CAAC,CAAC;IAC7D,MAAM,OAAO,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,cAAc,CAAC,CAAC;IAE/D,IAAI,OAAO,CAAC,WAAW,KAAK,aAAa,EAAE;QACzC,OAAO;KACR;IAED,MAAM,aAAa,GAAG,GAAG,OAAO,CAAC,IAAI,kBAAkB,CAAC;IACxD,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,EAAE;QAC/B,OAAO;KACR;IAED,MAAM,UAAU,GAAG,IAAA,eAAQ,EAAC,IAAA,WAAI,EAAC,oBAAW,EAAE,OAAO,CAAC,IAAI,CAAC,EAAE,oBAAW,CAAC,CAAC;IAC1E,IAAI,MAAM,GAAG,QAAQ,OAAO,CAAC,IAAI,EAAE,CAAC;IACpC,IAAI,CAAA,MAAA,MAAA,MAAA,OAAO,CAAC,OAAO,0CAAE,KAAK,0CAAE,OAAO,0CAAE,MAAM,IAAG,CAAC,EAAE;QAC/C,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;KAC3C;IAED,IAAA,mBAAU,EAAC,IAAI,EAAE,aAAa,EAAE,CAAC,IAAI,EAAE,EAAE;QACvC,IAAI,CAAC,IAAI,GAAG,GAAG,UAAU,IAAI,MAAM,EAAE,CAAC;QACtC,OAAO,IAAI,CAAC;IACd,CAAC,CAAC,CAAC;AACL,CAAC;AAvBD,0CAuBC"}
+{"version":3,"file":"update-ng-package.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/move/lib/update-ng-package.ts"],"names":[],"mappings":";;;AAAA,yCAA0E;AAC1E,yCAA6C;AAC7C,yEAAkF;AAClF,+BAAsC;AAGtC,SAAgB,eAAe,CAAC,IAAU,EAAE,MAAc;;IACxD,MAAM,cAAc,GAAG,IAAA,yBAAiB,EAAC,MAAM,CAAC,WAAW,CAAC,CAAC;IAC7D,MAAM,OAAO,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,cAAc,CAAC,CAAC;IAE/D,IAAI,OAAO,CAAC,WAAW,KAAK,aAAa,EAAE;QACzC,OAAO;KACR;IAED,MAAM,aAAa,GAAG,GAAG,OAAO,CAAC,IAAI,kBAAkB,CAAC;IACxD,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,EAAE;QAC/B,OAAO;KACR;IAED,MAAM,UAAU,GAAG,IAAA,eAAQ,EAAC,IAAA,WAAI,EAAC,sBAAa,EAAE,OAAO,CAAC,IAAI,CAAC,EAAE,sBAAa,CAAC,CAAC;IAC9E,IAAI,MAAM,GAAG,QAAQ,OAAO,CAAC,IAAI,EAAE,CAAC;IACpC,IAAI,CAAA,MAAA,MAAA,MAAA,OAAO,CAAC,OAAO,0CAAE,KAAK,0CAAE,OAAO,0CAAE,MAAM,IAAG,CAAC,EAAE;QAC/C,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;KAC3C;IAED,IAAA,mBAAU,EAAC,IAAI,EAAE,aAAa,EAAE,CAAC,IAAI,EAAE,EAAE;QACvC,IAAI,CAAC,IAAI,GAAG,GAAG,UAAU,IAAI,MAAM,EAAE,CAAC;QACtC,OAAO,IAAI,CAAC;IACd,CAAC,CAAC,CAAC;AACL,CAAC;AAvBD,0CAuBC"}

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/ng-add/compat.d.ts

@@ -1,2 +1,2 @@
-declare const _default: (options: import("./schema").Schema) => (tree: any, context: any) => Promise<any>;
+declare const _default: (options: import("./schema").GeneratorOptions) => (tree: any, context: any) => Promise<any>;
 export default _default;

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

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