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

package/src/generators/setup-mfe/lib/setup-host-if-dynamic.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.setupHostIfDynamic = void 0;
+const devkit_1 = require("@nrwl/devkit");
+function setupHostIfDynamic(tree, options) {
+    if (options.federationType === 'static' || options.mfeType === 'remote') {
+        return;
+    }
+    const pathToMfeManifest = (0, devkit_1.joinPathFragments)((0, devkit_1.readProjectConfiguration)(tree, options.appName).sourceRoot, 'assets/mfe.manifest.json');
+    if (!tree.exists(pathToMfeManifest)) {
+        tree.write(pathToMfeManifest, '{}');
+    }
+}
+exports.setupHostIfDynamic = setupHostIfDynamic;
+//# sourceMappingURL=setup-host-if-dynamic.js.map

package/src/generators/setup-mfe/lib/setup-host-if-dynamic.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"setup-host-if-dynamic.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/setup-mfe/lib/setup-host-if-dynamic.ts"],"names":[],"mappings":";;;AAGA,yCAA2E;AAE3E,SAAgB,kBAAkB,CAAC,IAAU,EAAE,OAAe;IAC5D,IAAI,OAAO,CAAC,cAAc,KAAK,QAAQ,IAAI,OAAO,CAAC,OAAO,KAAK,QAAQ,EAAE;QACvE,OAAO;KACR;IAED,MAAM,iBAAiB,GAAG,IAAA,0BAAiB,EACzC,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC,UAAU,EAC1D,0BAA0B,CAC3B,CAAC;IAEF,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,iBAAiB,CAAC,EAAE;QACnC,IAAI,CAAC,KAAK,CAAC,iBAAiB,EAAE,IAAI,CAAC,CAAC;KACrC;AACH,CAAC;AAbD,gDAaC"}

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

@@ -4,6 +4,7 @@ export interface Schema {
   port?: number;
   remotes?: string[];
   host?: string;
+  federationType?: 'static' | 'dynamic';
   routing?: boolean;
   skipFormat?: boolean;
   skipPackageJson?: boolean;

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

@@ -21,6 +21,12 @@
       "description": "Type of application to generate the Module Federation configuration for.",
       "default": "remote"
     },
+    "federationType": {
+      "type": "string",
+      "enum": ["static", "dynamic"],
+      "description": "Use either Static or Dynamic Module Federation pattern for the application.",
+      "default": "static"
+    },
     "port": {
       "type": "number",
       "description": "The port at which the remote application should be served."

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

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

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

@@ -4,22 +4,25 @@ exports.setupMfe = void 0;
 const tslib_1 = require("tslib");
 const devkit_1 = require("@nrwl/devkit");
 const lib_1 = require("./lib");
-function setupMfe(host, options) {
+function setupMfe(tree, options) {
+    var _a;
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const projectConfig = (0, devkit_1.readProjectConfiguration)(host, options.appName);
-        const remotesWithPorts = (0, lib_1.getRemotesWithPorts)(host, options);
-        (0, lib_1.addRemoteToHost)(host, options);
-        (0, lib_1.generateWebpackConfig)(host, options, projectConfig.root, remotesWithPorts);
-        (0, lib_1.addEntryModule)(host, options, projectConfig.root);
-        (0, lib_1.addImplicitDeps)(host, options);
-        (0, lib_1.changeBuildTarget)(host, options);
-        (0, lib_1.updateTsConfigTarget)(host, options);
-        (0, lib_1.setupServeTarget)(host, options);
-        (0, lib_1.fixBootstrap)(host, projectConfig.root);
-        (0, lib_1.addCypressOnErrorWorkaround)(host, options);
+        const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, options.appName);
+        options.federationType = (_a = options.federationType) !== null && _a !== void 0 ? _a : 'static';
+        (0, lib_1.setupHostIfDynamic)(tree, options);
+        const remotesWithPorts = (0, lib_1.getRemotesWithPorts)(tree, options);
+        (0, lib_1.addRemoteToHost)(tree, options);
+        (0, lib_1.generateWebpackConfig)(tree, options, projectConfig.root, remotesWithPorts);
+        (0, lib_1.addEntryModule)(tree, options, projectConfig.root);
+        (0, lib_1.addImplicitDeps)(tree, options);
+        (0, lib_1.changeBuildTarget)(tree, options);
+        (0, lib_1.updateTsConfigTarget)(tree, options);
+        (0, lib_1.setupServeTarget)(tree, options);
+        (0, lib_1.fixBootstrap)(tree, projectConfig.root, options);
+        (0, lib_1.addCypressOnErrorWorkaround)(tree, options);
         // format files
         if (!options.skipFormat) {
-            yield (0, devkit_1.formatFiles)(host);
+            yield (0, devkit_1.formatFiles)(tree);
         }
     });
 }

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

@@ -1 +1 @@
-{"version":3,"file":"setup-mfe.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/setup-mfe/setup-mfe.ts"],"names":[],"mappings":";;;;AAGA,yCAAqE;AAErE,+BAWe;AAEf,SAAsB,QAAQ,CAAC,IAAU,EAAE,OAAe;;QACxD,MAAM,aAAa,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;QAEtE,MAAM,gBAAgB,GAAG,IAAA,yBAAmB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAC5D,IAAA,qBAAe,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAE/B,IAAA,2BAAqB,EAAC,IAAI,EAAE,OAAO,EAAE,aAAa,CAAC,IAAI,EAAE,gBAAgB,CAAC,CAAC;QAE3E,IAAA,oBAAc,EAAC,IAAI,EAAE,OAAO,EAAE,aAAa,CAAC,IAAI,CAAC,CAAC;QAClD,IAAA,qBAAe,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAC/B,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,CAAC,CAAC;QAEvC,IAAA,iCAA2B,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAE3C,eAAe;QACf,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;YACvB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;IACH,CAAC;CAAA;AAtBD,4BAsBC;AAED,kBAAe,QAAQ,CAAC"}
+{"version":3,"file":"setup-mfe.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/setup-mfe/setup-mfe.ts"],"names":[],"mappings":";;;;AAGA,yCAAqE;AAErE,+BAYe;AAEf,SAAsB,QAAQ,CAAC,IAAU,EAAE,OAAe;;;QACxD,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,IAAA,wBAAkB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAElC,MAAM,gBAAgB,GAAG,IAAA,yBAAmB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAC5D,IAAA,qBAAe,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAE/B,IAAA,2BAAqB,EAAC,IAAI,EAAE,OAAO,EAAE,aAAa,CAAC,IAAI,EAAE,gBAAgB,CAAC,CAAC;QAE3E,IAAA,oBAAc,EAAC,IAAI,EAAE,OAAO,EAAE,aAAa,CAAC,IAAI,CAAC,CAAC;QAClD,IAAA,qBAAe,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAC/B,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,IAAA,iCAA2B,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAE3C,eAAe;QACf,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;YACvB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;;CACF;AA1BD,4BA0BC;AAED,kBAAe,QAAQ,CAAC"}

package/src/utils/versions.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.autoprefixerVersion = exports.postcssVersion = exports.tailwindVersion = exports.angularEslintVersion = exports.jestPresetAngularVersion = exports.rxjsVersion = exports.ngrxVersion = exports.angularJsVersion = exports.angularDevkitVersion = exports.angularVersion = exports.nxVersion = void 0;
-exports.nxVersion = '13.10.0-beta.7';
+exports.nxVersion = '13.10.0-beta.8';
 exports.angularVersion = '~13.3.0';
 exports.angularDevkitVersion = '~13.3.0';
 exports.angularJsVersion = '1.7.9';

package/src/generators/ng-add/files/decorate-angular-cli/decorate-angular-cli.js__tmpl__

@@ -1,69 +0,0 @@
-/**
- * This file decorates the Angular CLI with the Nx CLI to enable features such as computation caching
- * and faster execution of tasks.
- *
- * It does this by:
- *
- * - Patching the Angular CLI to warn you in case you accidentally use the undecorated ng command.
- * - Symlinking the ng to nx command, so all commands run through the Nx CLI
- * - Updating the package.json postinstall script to give you control over this script
- *
- * The Nx CLI decorates the Angular CLI, so the Nx CLI is fully compatible with it.
- * Every command you run should work the same when using the Nx CLI, except faster.
- *
- * Because of symlinking you can still type `ng build/test/lint` in the terminal. The ng command, in this case,
- * will point to nx, which will perform optimizations before invoking ng. So the Angular CLI is always invoked.
- * The Nx CLI simply does some optimizations before invoking the Angular CLI.
- *
- * To opt out of this patch:
- * - Replace occurrences of nx with ng in your package.json
- * - Remove the script from your postinstall script in your package.json
- * - Delete and reinstall your node_modules
- */
-
-const fs = require('fs');
-const os = require('os');
-const cp = require('child_process');
-const isWindows = os.platform() === 'win32';
-let output;
-try {
-  output = require('@nrwl/workspace').output;
-} catch (e) {
-  console.warn('Angular CLI could not be decorated to enable computation caching. Please ensure @nrwl/workspace is installed.');
-  process.exit(0);
-}
-
-/**
- * Symlink of ng to nx, so you can keep using `ng build/test/lint` and still
- * invoke the Nx CLI and get the benefits of computation caching.
- */
-function symlinkNgCLItoNxCLI() {
-  try {
-    const ngPath = './node_modules/.bin/ng';
-    const nxPath = './node_modules/.bin/nx';
-    if (isWindows) {
-      /**
-       * This is the most reliable way to create symlink-like behavior on Windows.
-       * Such that it works in all shells and works with npx.
-       */
-      ['', '.cmd', '.ps1'].forEach(ext => {
-        if (fs.existsSync(nxPath + ext)) fs.writeFileSync(ngPath + ext, fs.readFileSync(nxPath + ext));
-      });
-    } else {
-      // If unix-based, symlink
-      cp.execSync(`ln -sf ./nx ${ngPath}`);
-    }
-  }
-  catch(e) {
-    output.error({ title: 'Unable to create a symlink from the Angular CLI to the Nx CLI:' + e.message });
-    throw e;
-  }
-}
-
-try {
-  symlinkNgCLItoNxCLI();
-  require('nx/src/adapter/decorate-cli').decorateCli();
-  output.log({ title: 'Angular CLI has been decorated to enable computation caching.' });
-} catch(e) {
-  output.error({ title: 'Decoration of the Angular CLI did not complete successfully' });
-}

package/src/generators/ng-add/files/root/nx.json__tmpl__

@@ -1,29 +0,0 @@
-{
-  "npmScope": "<%= npmScope %>",
-  "affected": {
-    "defaultBase": "<%= defaultBase %>"
-  },
-  "implicitDependencies": {
-    "package.json": {
-      "dependencies": "*",
-      "devDependencies": "*"
-    },
-    ".eslintrc.json": "*"
-  },
-  "tasksRunnerOptions": {
-    "default": {
-      "runner": "nx/tasks-runners/default",
-      "options": {
-        "cacheableOperations": ["build", "lint", "test", "e2e"]
-      }
-    }
-  },
-  "targetDependencies": {
-    "build": [
-      {
-        "target": "build",
-        "projects": "dependencies"
-      }
-    ]
-  }
-}