@nrwl/react 13.10.0-rc.1 → 13.10.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nrwl/react",
-  "version": "13.10.0-rc.1",
+  "version": "13.10.1",
   "description": "The React plugin contains executors and generators for managing React applications and libraries within an Nx workspace. It provides:\n\n\n- Integration with libraries such as Jest, Cypress, and Storybook.\n\n- Generators for applications, libraries, components, hooks, and more.\n\n- Library build support for publishing packages to npm or other registries.\n\n- Utilities for automatic workspace refactoring.",
   "repository": {
     "type": "git",
@@ -32,14 +32,14 @@
   "dependencies": {
     "@babel/core": "^7.15.0",
     "@babel/preset-react": "^7.14.5",
-    "@nrwl/cypress": "13.10.0-rc.1",
-    "@nrwl/devkit": "13.10.0-rc.1",
-    "@nrwl/jest": "13.10.0-rc.1",
-    "@nrwl/js": "13.10.0-rc.1",
-    "@nrwl/linter": "13.10.0-rc.1",
-    "@nrwl/storybook": "13.10.0-rc.1",
-    "@nrwl/web": "13.10.0-rc.1",
-    "@nrwl/workspace": "13.10.0-rc.1",
+    "@nrwl/cypress": "13.10.1",
+    "@nrwl/devkit": "13.10.1",
+    "@nrwl/jest": "13.10.1",
+    "@nrwl/js": "13.10.1",
+    "@nrwl/linter": "13.10.1",
+    "@nrwl/storybook": "13.10.1",
+    "@nrwl/web": "13.10.1",
+    "@nrwl/workspace": "13.10.1",
     "@pmmmwh/react-refresh-webpack-plugin": "^0.5.1",
     "@svgr/webpack": "^6.1.2",
     "chalk": "4.1.0",

package/src/generators/application/lib/find-free-port.d.ts

@@ -0,0 +1,2 @@
+import { Tree } from 'nx/src/config/tree';
+export declare function findFreePort(host: Tree): number;

package/src/generators/application/lib/find-free-port.js

@@ -0,0 +1,18 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.findFreePort = void 0;
+const devkit_1 = require("@nrwl/devkit");
+function findFreePort(host) {
+    var _a, _b, _c;
+    const projects = (0, devkit_1.getProjects)(host);
+    let port = -Infinity;
+    for (const [, p] of projects.entries()) {
+        const curr = (_c = (_b = (_a = p.targets) === null || _a === void 0 ? void 0 : _a.serve) === null || _b === void 0 ? void 0 : _b.options) === null || _c === void 0 ? void 0 : _c.port;
+        if (typeof curr === 'number') {
+            port = Math.max(port, curr);
+        }
+    }
+    return port > 0 ? port + 1 : 4200;
+}
+exports.findFreePort = findFreePort;
+//# sourceMappingURL=find-free-port.js.map

package/src/generators/application/lib/find-free-port.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"find-free-port.js","sourceRoot":"","sources":["../../../../../../../packages/react/src/generators/application/lib/find-free-port.ts"],"names":[],"mappings":";;;AACA,yCAA2C;AAE3C,SAAgB,YAAY,CAAC,IAAU;;IACrC,MAAM,QAAQ,GAAG,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IACnC,IAAI,IAAI,GAAG,CAAC,QAAQ,CAAC;IACrB,KAAK,MAAM,CAAC,EAAE,CAAC,CAAC,IAAI,QAAQ,CAAC,OAAO,EAAE,EAAE;QACtC,MAAM,IAAI,GAAG,MAAA,MAAA,MAAA,CAAC,CAAC,OAAO,0CAAE,KAAK,0CAAE,OAAO,0CAAE,IAAI,CAAC;QAC7C,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE;YAC5B,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;SAC7B;KACF;IACD,OAAO,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;AACpC,CAAC;AAVD,oCAUC"}

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

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeOptions = void 0;
 const assertion_1 = require("../../../utils/assertion");
 const devkit_1 = require("@nrwl/devkit");
+const find_free_port_1 = require("./find-free-port");
 function normalizeOptions(host, options) {
     var _a, _b, _c, _d, _e, _f, _g;
     const appDirectory = options.directory
@@ -26,11 +27,12 @@ function normalizeOptions(host, options) {
     options.unitTestRunner = (_d = options.unitTestRunner) !== null && _d !== void 0 ? _d : 'jest';
     options.e2eTestRunner = (_e = options.e2eTestRunner) !== null && _e !== void 0 ? _e : 'cypress';
     options.compiler = (_f = options.compiler) !== null && _f !== void 0 ? _f : 'babel';
+    (_g = options.devServerPort) !== null && _g !== void 0 ? _g : (options.devServerPort = (0, find_free_port_1.findFreePort)(host));
     return Object.assign(Object.assign({}, options), { name: (0, devkit_1.names)(options.name).fileName, projectName: appProjectName, appProjectRoot,
         e2eProjectName,
         parsedTags,
         fileName,
-        styledModule, hasStyles: options.style !== 'none', devServerPort: (_g = options.devServerPort) !== null && _g !== void 0 ? _g : 4200 });
+        styledModule, hasStyles: options.style !== 'none' });
 }
 exports.normalizeOptions = normalizeOptions;
 //# sourceMappingURL=normalize-options.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"normalize-options.js","sourceRoot":"","sources":["../../../../../../../packages/react/src/generators/application/lib/normalize-options.ts"],"names":[],"mappings":";;;AACA,wDAA4D;AAC5D,yCAA8E;AAE9E,SAAgB,gBAAgB,CAC9B,IAAU,EACV,OAAe;;IAEf,MAAM,YAAY,GAAG,OAAO,CAAC,SAAS;QACpC,CAAC,CAAC,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,SAAS,CAAC,CAAC,QAAQ,IAAI,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE;QACxE,CAAC,CAAC,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC;IAEjC,MAAM,cAAc,GAAG,YAAY,CAAC,OAAO,CAAC,IAAI,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,GAAG,CAAC,CAAC;IACvE,MAAM,cAAc,GAAG,GAAG,cAAc,MAAM,CAAC;IAE/C,MAAM,EAAE,OAAO,EAAE,GAAG,IAAA,2BAAkB,EAAC,IAAI,CAAC,CAAC;IAC7C,MAAM,cAAc,GAAG,IAAA,sBAAa,EAAC,GAAG,OAAO,IAAI,YAAY,EAAE,CAAC,CAAC;IAEnE,MAAM,UAAU,GAAG,OAAO,CAAC,IAAI;QAC7B,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;QAC9C,CAAC,CAAC,EAAE,CAAC;IAEP,MAAM,QAAQ,GAAG,OAAO,CAAC,eAAe,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC;IAEzD,MAAM,YAAY,GAAG,6BAA6B,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC;QACpE,CAAC,CAAC,IAAI;QACN,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC;IAElB,IAAA,4BAAgB,EAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IAEhC,OAAO,CAAC,OAAO,GAAG,MAAA,OAAO,CAAC,OAAO,mCAAI,KAAK,CAAC;IAC3C,OAAO,CAAC,MAAM,GAAG,MAAA,OAAO,CAAC,MAAM,mCAAI,IAAI,CAAC;IACxC,OAAO,CAAC,cAAc,GAAG,MAAA,OAAO,CAAC,cAAc,mCAAI,KAAK,CAAC;IACzD,OAAO,CAAC,cAAc,GAAG,MAAA,OAAO,CAAC,cAAc,mCAAI,MAAM,CAAC;IAC1D,OAAO,CAAC,aAAa,GAAG,MAAA,OAAO,CAAC,aAAa,mCAAI,SAAS,CAAC;IAC3D,OAAO,CAAC,QAAQ,GAAG,MAAA,OAAO,CAAC,QAAQ,mCAAI,OAAO,CAAC;IAE/C,uCACK,OAAO,KACV,IAAI,EAAE,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,EAClC,WAAW,EAAE,cAAc,EAC3B,cAAc;QACd,cAAc;QACd,UAAU;QACV,QAAQ;QACR,YAAY,EACZ,SAAS,EAAE,OAAO,CAAC,KAAK,KAAK,MAAM,EACnC,aAAa,EAAE,MAAA,OAAO,CAAC,aAAa,mCAAI,IAAI,IAC5C;AACJ,CAAC;AA7CD,4CA6CC"}
+{"version":3,"file":"normalize-options.js","sourceRoot":"","sources":["../../../../../../../packages/react/src/generators/application/lib/normalize-options.ts"],"names":[],"mappings":";;;AACA,wDAA4D;AAC5D,yCAA8E;AAC9E,qDAAgD;AAEhD,SAAgB,gBAAgB,CAC9B,IAAU,EACV,OAAe;;IAEf,MAAM,YAAY,GAAG,OAAO,CAAC,SAAS;QACpC,CAAC,CAAC,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,SAAS,CAAC,CAAC,QAAQ,IAAI,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE;QACxE,CAAC,CAAC,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC;IAEjC,MAAM,cAAc,GAAG,YAAY,CAAC,OAAO,CAAC,IAAI,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,GAAG,CAAC,CAAC;IACvE,MAAM,cAAc,GAAG,GAAG,cAAc,MAAM,CAAC;IAE/C,MAAM,EAAE,OAAO,EAAE,GAAG,IAAA,2BAAkB,EAAC,IAAI,CAAC,CAAC;IAC7C,MAAM,cAAc,GAAG,IAAA,sBAAa,EAAC,GAAG,OAAO,IAAI,YAAY,EAAE,CAAC,CAAC;IAEnE,MAAM,UAAU,GAAG,OAAO,CAAC,IAAI;QAC7B,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;QAC9C,CAAC,CAAC,EAAE,CAAC;IAEP,MAAM,QAAQ,GAAG,OAAO,CAAC,eAAe,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC;IAEzD,MAAM,YAAY,GAAG,6BAA6B,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC;QACpE,CAAC,CAAC,IAAI;QACN,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC;IAElB,IAAA,4BAAgB,EAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IAEhC,OAAO,CAAC,OAAO,GAAG,MAAA,OAAO,CAAC,OAAO,mCAAI,KAAK,CAAC;IAC3C,OAAO,CAAC,MAAM,GAAG,MAAA,OAAO,CAAC,MAAM,mCAAI,IAAI,CAAC;IACxC,OAAO,CAAC,cAAc,GAAG,MAAA,OAAO,CAAC,cAAc,mCAAI,KAAK,CAAC;IACzD,OAAO,CAAC,cAAc,GAAG,MAAA,OAAO,CAAC,cAAc,mCAAI,MAAM,CAAC;IAC1D,OAAO,CAAC,aAAa,GAAG,MAAA,OAAO,CAAC,aAAa,mCAAI,SAAS,CAAC;IAC3D,OAAO,CAAC,QAAQ,GAAG,MAAA,OAAO,CAAC,QAAQ,mCAAI,OAAO,CAAC;IAC/C,MAAA,OAAO,CAAC,aAAa,oCAArB,OAAO,CAAC,aAAa,GAAK,IAAA,6BAAY,EAAC,IAAI,CAAC,EAAC;IAE7C,uCACK,OAAO,KACV,IAAI,EAAE,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,EAClC,WAAW,EAAE,cAAc,EAC3B,cAAc;QACd,cAAc;QACd,UAAU;QACV,QAAQ;QACR,YAAY,EACZ,SAAS,EAAE,OAAO,CAAC,KAAK,KAAK,MAAM,IACnC;AACJ,CAAC;AA7CD,4CA6CC"}

package/src/generators/mfe-host/files/mfe/webpack.config.prod.js__tmpl__

@@ -1 +1,26 @@
-module.exports = require('./webpack.config');
+const withModuleFederation = require('@nrwl/react/module-federation');
+const mfeConfig = require('./mfe.config');
+
+module.exports = withModuleFederation({
+    ...mfeConfig,
+    /*
+     * Remote overrides for production.
+     * Each entry is a pair of an unique name and the URL where it is deployed.
+     *
+     * e.g.
+     * remotes: [
+     *   ['app1', '//app1.example.com'],
+     *   ['app2', '//app2.example.com'],
+     * ]
+     *
+     * You can also use a full path to the remoteEntry.js file if desired.
+     *
+     * remotes: [
+     *   ['app1', '//example.com/path/to/app1/remoteEntry.js'],
+     *   ['app2', '//example.com/path/to/app2/remoteEntry.js'],
+     * ]
+     */
+    remotes: [
+      <% remotes.forEach(function(r) {%>['<%= r.fileName %>', '//localhost:<%= r.port %>/'],<% }); %>
+    ],
+});

package/src/generators/mfe-host/lib/add-mfe-files.d.ts

@@ -0,0 +1,5 @@
+import { NormalizedSchema } from '../schema';
+export declare function addMfeFiles(host: any, options: NormalizedSchema, defaultRemoteManifest: {
+    name: string;
+    port: number;
+}[]): void;

package/src/generators/mfe-host/lib/{add-mfe.js → add-mfe-files.js}

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.addMFEFiles = void 0;
+exports.addMfeFiles = void 0;
 const devkit_1 = require("@nrwl/devkit");
 const path_1 = require("path");
-function addMFEFiles(host, options) {
-    const templateVariables = Object.assign(Object.assign(Object.assign({}, (0, devkit_1.names)(options.name)), options), { tmpl: '', remotes: options.remotes.map((r) => (0, devkit_1.names)(r)) });
+function addMfeFiles(host, options, defaultRemoteManifest) {
+    const templateVariables = Object.assign(Object.assign(Object.assign({}, (0, devkit_1.names)(options.name)), options), { tmpl: '', remotes: defaultRemoteManifest.map(({ name, port }) => (Object.assign(Object.assign({}, (0, devkit_1.names)(name)), { port }))) });
     // Module federation requires bootstrap code to be dynamically imported.
     // Renaming original entry file so we can use `import(./bootstrap)` in
     // new entry file.
@@ -13,5 +13,5 @@ function addMFEFiles(host, options) {
     (0, devkit_1.generateFiles)(host, (0, path_1.join)(__dirname, `../files/mfe`), options.appProjectRoot, templateVariables);
     (0, devkit_1.generateFiles)(host, (0, path_1.join)(__dirname, `../files/common`), options.appProjectRoot, templateVariables);
 }
-exports.addMFEFiles = addMFEFiles;
-//# sourceMappingURL=add-mfe.js.map
+exports.addMfeFiles = addMfeFiles;
+//# sourceMappingURL=add-mfe-files.js.map

package/src/generators/mfe-host/lib/add-mfe-files.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"add-mfe-files.js","sourceRoot":"","sources":["../../../../../../../packages/react/src/generators/mfe-host/lib/add-mfe-files.ts"],"names":[],"mappings":";;;AACA,yCAAoD;AACpD,+BAA4B;AAE5B,SAAgB,WAAW,CACzB,IAAI,EACJ,OAAyB,EACzB,qBAAuD;IAEvD,MAAM,iBAAiB,iDAClB,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,GACnB,OAAO,KACV,IAAI,EAAE,EAAE,EACR,OAAO,EAAE,qBAAqB,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,iCAClD,IAAA,cAAK,EAAC,IAAI,CAAC,KACd,IAAI,IACJ,CAAC,GACJ,CAAC;IAEF,wEAAwE;IACxE,sEAAsE;IACtE,kBAAkB;IAClB,IAAI,CAAC,MAAM,CACT,IAAA,WAAI,EAAC,OAAO,CAAC,cAAc,EAAE,cAAc,CAAC,EAC5C,IAAA,WAAI,EAAC,OAAO,CAAC,cAAc,EAAE,mBAAmB,CAAC,CAClD,CAAC;IAEF,kCAAkC;IAClC,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,WAAI,EAAC,SAAS,EAAE,cAAc,CAAC,EAC/B,OAAO,CAAC,cAAc,EACtB,iBAAiB,CAClB,CAAC;IAEF,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,WAAI,EAAC,SAAS,EAAE,iBAAiB,CAAC,EAClC,OAAO,CAAC,cAAc,EACtB,iBAAiB,CAClB,CAAC;AACJ,CAAC;AArCD,kCAqCC"}

package/src/generators/mfe-host/lib/update-mfe-e2e-project.d.ts

@@ -1,3 +1,3 @@
-import { Tree } from 'nx/src/shared/tree';
 import { NormalizedSchema } from '../schema';
+import { Tree } from '@nrwl/devkit';
 export declare function updateMfeE2eProject(host: Tree, options: NormalizedSchema): void;

package/src/generators/mfe-host/lib/update-mfe-e2e-project.js.map

@@ -1 +1 @@
-{"version":3,"file":"update-mfe-e2e-project.js","sourceRoot":"","sources":["../../../../../../../packages/react/src/generators/mfe-host/lib/update-mfe-e2e-project.ts"],"names":[],"mappings":";;;AAEA,yCAGsB;AAEtB,SAAgB,mBAAmB,CAAC,IAAU,EAAE,OAAyB;IACvE,MAAM,OAAO,GAAG,GAAG,OAAO,CAAC,IAAI,MAAM,CAAC;IACtC,IAAI;QACF,IAAI,aAAa,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAC5D,aAAa,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,mCAC5B,aAAa,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,KACpC,OAAO,EAAE,uBAAuB,GACjC,CAAC;QACF,IAAA,mCAA0B,EAAC,IAAI,EAAE,OAAO,EAAE,aAAa,CAAC,CAAC;KAC1D;IAAC,WAAM;QACN,UAAU;KACX;AACH,CAAC;AAZD,kDAYC"}
+{"version":3,"file":"update-mfe-e2e-project.js","sourceRoot":"","sources":["../../../../../../../packages/react/src/generators/mfe-host/lib/update-mfe-e2e-project.ts"],"names":[],"mappings":";;;AACA,yCAIsB;AAEtB,SAAgB,mBAAmB,CAAC,IAAU,EAAE,OAAyB;IACvE,MAAM,OAAO,GAAG,GAAG,OAAO,CAAC,IAAI,MAAM,CAAC;IACtC,IAAI;QACF,IAAI,aAAa,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAC5D,aAAa,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,mCAC5B,aAAa,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,KACpC,OAAO,EAAE,uBAAuB,GACjC,CAAC;QACF,IAAA,mCAA0B,EAAC,IAAI,EAAE,OAAO,EAAE,aAAa,CAAC,CAAC;KAC1D;IAAC,WAAM;QACN,UAAU;KACX;AACH,CAAC;AAZD,kDAYC"}

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

@@ -1,3 +1,4 @@
 import { Tree } from '@nrwl/devkit';
 import { Schema } from './schema';
 export declare function mfeHostGenerator(host: Tree, schema: Schema): Promise<import("@nrwl/devkit").GeneratorCallback>;
+export default mfeHostGenerator;

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

@@ -5,9 +5,9 @@ const tslib_1 = require("tslib");
 const devkit_1 = require("@nrwl/devkit");
 const application_1 = require("../application/application");
 const normalize_options_1 = require("../application/lib/normalize-options");
-const add_mfe_1 = require("./lib/add-mfe");
-const update_mfe_project_1 = require("./lib/update-mfe-project");
 const mfe_remote_1 = require("../mfe-remote/mfe-remote");
+const update_mfe_project_1 = require("../../rules/update-mfe-project");
+const add_mfe_files_1 = require("./lib/add-mfe-files");
 const update_mfe_e2e_project_1 = require("./lib/update-mfe-e2e-project");
 function mfeHostGenerator(host, schema) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
@@ -15,12 +15,11 @@ function mfeHostGenerator(host, schema) {
         const initTask = yield (0, application_1.default)(host, Object.assign(Object.assign({}, options), { 
             // The target use-case for MFE is loading remotes as child routes, thus always enable routing.
             routing: true }));
-        (0, add_mfe_1.addMFEFiles)(host, options);
-        (0, update_mfe_project_1.updateMfeProject)(host, options);
-        (0, update_mfe_e2e_project_1.updateMfeE2eProject)(host, options);
+        const remotesWithPorts = [];
         if (schema.remotes) {
             let remotePort = options.devServerPort + 1;
             for (const remote of schema.remotes) {
+                remotesWithPorts.push({ name: remote, port: remotePort });
                 yield (0, mfe_remote_1.mfeRemoteGenerator)(host, {
                     name: remote,
                     style: options.style,
@@ -33,6 +32,9 @@ function mfeHostGenerator(host, schema) {
                 remotePort++;
             }
         }
+        (0, add_mfe_files_1.addMfeFiles)(host, options, remotesWithPorts);
+        (0, update_mfe_project_1.updateMfeProject)(host, options);
+        (0, update_mfe_e2e_project_1.updateMfeE2eProject)(host, options);
         if (!options.skipFormat) {
             yield (0, devkit_1.formatFiles)(host);
         }
@@ -40,4 +42,5 @@ function mfeHostGenerator(host, schema) {
     });
 }
 exports.mfeHostGenerator = mfeHostGenerator;
+exports.default = mfeHostGenerator;
 //# sourceMappingURL=mfe-host.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"mfe-host.js","sourceRoot":"","sources":["../../../../../../packages/react/src/generators/mfe-host/mfe-host.ts"],"names":[],"mappings":";;;;AAAA,yCAAiD;AAEjD,4DAA8D;AAC9D,4EAAwE;AACxE,2CAA4C;AAC5C,iEAA4D;AAC5D,yDAA8D;AAC9D,yEAAmE;AAEnE,SAAsB,gBAAgB,CAAC,IAAU,EAAE,MAAc;;QAC/D,MAAM,OAAO,GAAG,IAAA,oCAAgB,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAE/C,MAAM,QAAQ,GAAG,MAAM,IAAA,qBAAoB,EAAC,IAAI,kCAC3C,OAAO;YACV,8FAA8F;YAC9F,OAAO,EAAE,IAAI,IACb,CAAC;QAEH,IAAA,qBAAW,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAC3B,IAAA,qCAAgB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAChC,IAAA,4CAAmB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAEnC,IAAI,MAAM,CAAC,OAAO,EAAE;YAClB,IAAI,UAAU,GAAG,OAAO,CAAC,aAAa,GAAG,CAAC,CAAC;YAC3C,KAAK,MAAM,MAAM,IAAI,MAAM,CAAC,OAAO,EAAE;gBACnC,MAAM,IAAA,+BAAkB,EAAC,IAAI,EAAE;oBAC7B,IAAI,EAAE,MAAM;oBACZ,KAAK,EAAE,OAAO,CAAC,KAAK;oBACpB,UAAU,EAAE,OAAO,CAAC,UAAU;oBAC9B,cAAc,EAAE,OAAO,CAAC,cAAc;oBACtC,aAAa,EAAE,OAAO,CAAC,aAAa;oBACpC,MAAM,EAAE,OAAO,CAAC,MAAM;oBACtB,aAAa,EAAE,UAAU;iBAC1B,CAAC,CAAC;gBACH,UAAU,EAAE,CAAC;aACd;SACF;QAED,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;YACvB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;QAED,OAAO,QAAQ,CAAC;IAClB,CAAC;CAAA;AAlCD,4CAkCC"}
+{"version":3,"file":"mfe-host.js","sourceRoot":"","sources":["../../../../../../packages/react/src/generators/mfe-host/mfe-host.ts"],"names":[],"mappings":";;;;AAAA,yCAAiD;AAEjD,4DAA8D;AAC9D,4EAAwE;AACxE,yDAA8D;AAC9D,uEAAkE;AAClE,uDAAkD;AAClD,yEAAmE;AAGnE,SAAsB,gBAAgB,CAAC,IAAU,EAAE,MAAc;;QAC/D,MAAM,OAAO,GAAG,IAAA,oCAAgB,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAE/C,MAAM,QAAQ,GAAG,MAAM,IAAA,qBAAoB,EAAC,IAAI,kCAC3C,OAAO;YACV,8FAA8F;YAC9F,OAAO,EAAE,IAAI,IACb,CAAC;QAEH,MAAM,gBAAgB,GAAqC,EAAE,CAAC;QAE9D,IAAI,MAAM,CAAC,OAAO,EAAE;YAClB,IAAI,UAAU,GAAG,OAAO,CAAC,aAAa,GAAG,CAAC,CAAC;YAC3C,KAAK,MAAM,MAAM,IAAI,MAAM,CAAC,OAAO,EAAE;gBACnC,gBAAgB,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC,CAAC;gBAC1D,MAAM,IAAA,+BAAkB,EAAC,IAAI,EAAE;oBAC7B,IAAI,EAAE,MAAM;oBACZ,KAAK,EAAE,OAAO,CAAC,KAAK;oBACpB,UAAU,EAAE,OAAO,CAAC,UAAU;oBAC9B,cAAc,EAAE,OAAO,CAAC,cAAc;oBACtC,aAAa,EAAE,OAAO,CAAC,aAAa;oBACpC,MAAM,EAAE,OAAO,CAAC,MAAM;oBACtB,aAAa,EAAE,UAAU;iBAC1B,CAAC,CAAC;gBACH,UAAU,EAAE,CAAC;aACd;SACF;QAED,IAAA,2BAAW,EAAC,IAAI,EAAE,OAAO,EAAE,gBAAgB,CAAC,CAAC;QAC7C,IAAA,qCAAgB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAChC,IAAA,4CAAmB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAEnC,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;YACvB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;QAED,OAAO,QAAQ,CAAC;IAClB,CAAC;CAAA;AArCD,4CAqCC;AAED,kBAAe,gBAAgB,CAAC"}

package/src/generators/mfe-remote/lib/update-host-with-remote.d.ts

@@ -0,0 +1,2 @@
+import { Tree } from '@nrwl/devkit';
+export declare function updateHostWithRemote(host: Tree, hostName: string, remoteName: string): void;

package/src/generators/mfe-remote/lib/update-host-with-remote.js

@@ -0,0 +1,49 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.updateHostWithRemote = void 0;
+const devkit_1 = require("@nrwl/devkit");
+const mfe_ast_utils_1 = require("../../../mfe/mfe-ast-utils");
+const ts = require("typescript");
+function updateHostWithRemote(host, hostName, remoteName) {
+    const hostConfig = (0, devkit_1.readProjectConfiguration)(host, hostName);
+    const mfeConfigPath = (0, devkit_1.joinPathFragments)(hostConfig.root, 'mfe.config.js');
+    const remoteDefsPath = (0, devkit_1.joinPathFragments)(hostConfig.sourceRoot, 'remotes.d.ts');
+    const appComponentPath = findAppComponentPath(host, hostConfig.sourceRoot);
+    if (host.exists(mfeConfigPath)) {
+        // find the host project path
+        // Update remotes inside ${host_path}/src/remotes.d.ts
+        let sourceCode = host.read(mfeConfigPath).toString();
+        const source = ts.createSourceFile(mfeConfigPath, sourceCode, ts.ScriptTarget.Latest, true);
+        host.write(mfeConfigPath, (0, devkit_1.applyChangesToString)(sourceCode, (0, mfe_ast_utils_1.addRemoteToMfeConfig)(source, remoteName)));
+    }
+    else {
+        // TODO(jack): Point to the nx.dev guide when ready.
+        devkit_1.logger.warn(`Could not find MFE configuration at ${mfeConfigPath}. Did you generate this project with "@nrwl/react:mfe-host"?`);
+    }
+    if (host.exists(remoteDefsPath)) {
+        let sourceCode = host.read(remoteDefsPath).toString();
+        const source = ts.createSourceFile(mfeConfigPath, sourceCode, ts.ScriptTarget.Latest, true);
+        host.write(remoteDefsPath, (0, devkit_1.applyChangesToString)(sourceCode, (0, mfe_ast_utils_1.addRemoteDefinition)(source, remoteName)));
+    }
+    else {
+        devkit_1.logger.warn(`Could not find remote definitions at ${remoteDefsPath}. Did you generate this project with "@nrwl/react:mfe-host"?`);
+    }
+    if (host.exists(appComponentPath)) {
+        let sourceCode = host.read(appComponentPath).toString();
+        const source = ts.createSourceFile(mfeConfigPath, sourceCode, ts.ScriptTarget.Latest, true);
+        host.write(appComponentPath, (0, devkit_1.applyChangesToString)(sourceCode, (0, mfe_ast_utils_1.addRemoteRoute)(source, (0, devkit_1.names)(remoteName))));
+    }
+    else {
+        devkit_1.logger.warn(`Could not find app component at ${appComponentPath}. Did you generate this project with "@nrwl/react:mfe-host"?`);
+    }
+}
+exports.updateHostWithRemote = updateHostWithRemote;
+function findAppComponentPath(host, sourceRoot) {
+    const locations = ['app/app.tsx', 'app/App.tsx', 'app.tsx', 'App.tsx'];
+    for (const loc of locations) {
+        if (host.exists((0, devkit_1.joinPathFragments)(sourceRoot, loc))) {
+            return (0, devkit_1.joinPathFragments)(sourceRoot, loc);
+        }
+    }
+}
+//# sourceMappingURL=update-host-with-remote.js.map

package/src/generators/mfe-remote/lib/update-host-with-remote.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"update-host-with-remote.js","sourceRoot":"","sources":["../../../../../../../packages/react/src/generators/mfe-remote/lib/update-host-with-remote.ts"],"names":[],"mappings":";;;AAAA,yCAOsB;AACtB,8DAIoC;AACpC,iCAAiC;AAEjC,SAAgB,oBAAoB,CAClC,IAAU,EACV,QAAgB,EAChB,UAAkB;IAElB,MAAM,UAAU,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;IAC5D,MAAM,aAAa,GAAG,IAAA,0BAAiB,EAAC,UAAU,CAAC,IAAI,EAAE,eAAe,CAAC,CAAC;IAC1E,MAAM,cAAc,GAAG,IAAA,0BAAiB,EACtC,UAAU,CAAC,UAAU,EACrB,cAAc,CACf,CAAC;IACF,MAAM,gBAAgB,GAAG,oBAAoB,CAAC,IAAI,EAAE,UAAU,CAAC,UAAU,CAAC,CAAC;IAE3E,IAAI,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,EAAE;QAC9B,6BAA6B;QAC7B,sDAAsD;QACtD,IAAI,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,QAAQ,EAAE,CAAC;QACrD,MAAM,MAAM,GAAG,EAAE,CAAC,gBAAgB,CAChC,aAAa,EACb,UAAU,EACV,EAAE,CAAC,YAAY,CAAC,MAAM,EACtB,IAAI,CACL,CAAC;QACF,IAAI,CAAC,KAAK,CACR,aAAa,EACb,IAAA,6BAAoB,EAAC,UAAU,EAAE,IAAA,oCAAoB,EAAC,MAAM,EAAE,UAAU,CAAC,CAAC,CAC3E,CAAC;KACH;SAAM;QACL,oDAAoD;QACpD,eAAM,CAAC,IAAI,CACT,uCAAuC,aAAa,8DAA8D,CACnH,CAAC;KACH;IAED,IAAI,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,EAAE;QAC/B,IAAI,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,QAAQ,EAAE,CAAC;QACtD,MAAM,MAAM,GAAG,EAAE,CAAC,gBAAgB,CAChC,aAAa,EACb,UAAU,EACV,EAAE,CAAC,YAAY,CAAC,MAAM,EACtB,IAAI,CACL,CAAC;QACF,IAAI,CAAC,KAAK,CACR,cAAc,EACd,IAAA,6BAAoB,EAAC,UAAU,EAAE,IAAA,mCAAmB,EAAC,MAAM,EAAE,UAAU,CAAC,CAAC,CAC1E,CAAC;KACH;SAAM;QACL,eAAM,CAAC,IAAI,CACT,wCAAwC,cAAc,8DAA8D,CACrH,CAAC;KACH;IAED,IAAI,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC,EAAE;QACjC,IAAI,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC,QAAQ,EAAE,CAAC;QACxD,MAAM,MAAM,GAAG,EAAE,CAAC,gBAAgB,CAChC,aAAa,EACb,UAAU,EACV,EAAE,CAAC,YAAY,CAAC,MAAM,EACtB,IAAI,CACL,CAAC;QACF,IAAI,CAAC,KAAK,CACR,gBAAgB,EAChB,IAAA,6BAAoB,EAClB,UAAU,EACV,IAAA,8BAAc,EAAC,MAAM,EAAE,IAAA,cAAK,EAAC,UAAU,CAAC,CAAC,CAC1C,CACF,CAAC;KACH;SAAM;QACL,eAAM,CAAC,IAAI,CACT,mCAAmC,gBAAgB,8DAA8D,CAClH,CAAC;KACH;AACH,CAAC;AAxED,oDAwEC;AAED,SAAS,oBAAoB,CAAC,IAAU,EAAE,UAAkB;IAC1D,MAAM,SAAS,GAAG,CAAC,aAAa,EAAE,aAAa,EAAE,SAAS,EAAE,SAAS,CAAC,CAAC;IACvE,KAAK,MAAM,GAAG,IAAI,SAAS,EAAE;QAC3B,IAAI,IAAI,CAAC,MAAM,CAAC,IAAA,0BAAiB,EAAC,UAAU,EAAE,GAAG,CAAC,CAAC,EAAE;YACnD,OAAO,IAAA,0BAAiB,EAAC,UAAU,EAAE,GAAG,CAAC,CAAC;SAC3C;KACF;AACH,CAAC"}

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

@@ -1,5 +1,6 @@
 import { Tree } from '@nrwl/devkit';
-import { Schema } from './schema';
 import { NormalizedSchema } from '../application/schema';
+import { Schema } from './schema';
 export declare function addMfeFiles(host: Tree, options: NormalizedSchema): void;
 export declare function mfeRemoteGenerator(host: Tree, schema: Schema): Promise<import("@nrwl/devkit").GeneratorCallback>;
+export default mfeRemoteGenerator;

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

@@ -7,8 +7,8 @@ const devkit_1 = require("@nrwl/devkit");
 const run_tasks_in_serial_1 = require("@nrwl/workspace/src/utilities/run-tasks-in-serial");
 const normalize_options_1 = require("../application/lib/normalize-options");
 const application_1 = require("../application/application");
-const update_mfe_project_1 = require("../mfe-host/lib/update-mfe-project");
-const update_host_with_remote_1 = require("../mfe-host/lib/update-host-with-remote");
+const update_host_with_remote_1 = require("./lib/update-host-with-remote");
+const update_mfe_project_1 = require("../../rules/update-mfe-project");
 function addMfeFiles(host, options) {
     const templateVariables = Object.assign(Object.assign(Object.assign({}, (0, devkit_1.names)(options.name)), options), { tmpl: '' });
     (0, devkit_1.generateFiles)(host, (0, path_1.join)(__dirname, `./files/mfe`), options.appProjectRoot, templateVariables);
@@ -18,19 +18,15 @@ function mfeRemoteGenerator(host, schema) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         const options = (0, normalize_options_1.normalizeOptions)(host, schema);
         const initApp = yield (0, application_1.default)(host, options);
+        if (schema.host) {
+            (0, update_host_with_remote_1.updateHostWithRemote)(host, schema.host, options.name);
+        }
         // Module federation requires bootstrap code to be dynamically imported.
         // Renaming original entry file so we can use `import(./bootstrap)` in
         // new entry file.
         host.rename((0, path_1.join)(options.appProjectRoot, 'src/main.tsx'), (0, path_1.join)(options.appProjectRoot, 'src/bootstrap.tsx'));
         addMfeFiles(host, options);
         (0, update_mfe_project_1.updateMfeProject)(host, options);
-        if (schema.host) {
-            (0, update_host_with_remote_1.updateHostWithRemote)(host, options);
-        }
-        else {
-            // Log that no host has been passed in so we will use the default project as the host (Only if through CLI)
-            // Since Remotes can be generated from the Host Generator we should probably have some identifier to use
-        }
         if (!options.skipFormat) {
             yield (0, devkit_1.formatFiles)(host);
         }
@@ -38,4 +34,5 @@ function mfeRemoteGenerator(host, schema) {
     });
 }
 exports.mfeRemoteGenerator = mfeRemoteGenerator;
+exports.default = mfeRemoteGenerator;
 //# sourceMappingURL=mfe-remote.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"mfe-remote.js","sourceRoot":"","sources":["../../../../../../packages/react/src/generators/mfe-remote/mfe-remote.ts"],"names":[],"mappings":";;;;AAAA,+BAA4B;AAC5B,yCAAuE;AACvE,2FAAqF;AAGrF,4EAAwE;AACxE,4DAA8D;AAC9D,2EAAsE;AAEtE,qFAA+E;AAE/E,SAAgB,WAAW,CAAC,IAAU,EAAE,OAAyB;IAC/D,MAAM,iBAAiB,iDAClB,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,GACnB,OAAO,KACV,IAAI,EAAE,EAAE,GACT,CAAC;IAEF,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,WAAI,EAAC,SAAS,EAAE,aAAa,CAAC,EAC9B,OAAO,CAAC,cAAc,EACtB,iBAAiB,CAClB,CAAC;AACJ,CAAC;AAbD,kCAaC;AAED,SAAsB,kBAAkB,CAAC,IAAU,EAAE,MAAc;;QACjE,MAAM,OAAO,GAAG,IAAA,oCAAgB,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAC/C,MAAM,OAAO,GAAG,MAAM,IAAA,qBAAoB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAE1D,wEAAwE;QACxE,sEAAsE;QACtE,kBAAkB;QAClB,IAAI,CAAC,MAAM,CACT,IAAA,WAAI,EAAC,OAAO,CAAC,cAAc,EAAE,cAAc,CAAC,EAC5C,IAAA,WAAI,EAAC,OAAO,CAAC,cAAc,EAAE,mBAAmB,CAAC,CAClD,CAAC;QAEF,WAAW,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAC3B,IAAA,qCAAgB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAChC,IAAI,MAAM,CAAC,IAAI,EAAE;YACf,IAAA,8CAAoB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;SACrC;aAAM;YACL,2GAA2G;YAC3G,wGAAwG;SACzG;QAED,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;YACvB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;QAED,OAAO,IAAA,sCAAgB,EAAC,OAAO,CAAC,CAAC;IACnC,CAAC;CAAA;AA1BD,gDA0BC"}
+{"version":3,"file":"mfe-remote.js","sourceRoot":"","sources":["../../../../../../packages/react/src/generators/mfe-remote/mfe-remote.ts"],"names":[],"mappings":";;;;AAAA,+BAA4B;AAC5B,yCAAuE;AACvE,2FAAqF;AAErF,4EAAwE;AACxE,4DAA8D;AAE9D,2EAAqE;AACrE,uEAAkE;AAGlE,SAAgB,WAAW,CAAC,IAAU,EAAE,OAAyB;IAC/D,MAAM,iBAAiB,iDAClB,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,GACnB,OAAO,KACV,IAAI,EAAE,EAAE,GACT,CAAC;IAEF,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,WAAI,EAAC,SAAS,EAAE,aAAa,CAAC,EAC9B,OAAO,CAAC,cAAc,EACtB,iBAAiB,CAClB,CAAC;AACJ,CAAC;AAbD,kCAaC;AAED,SAAsB,kBAAkB,CAAC,IAAU,EAAE,MAAc;;QACjE,MAAM,OAAO,GAAG,IAAA,oCAAgB,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAC/C,MAAM,OAAO,GAAG,MAAM,IAAA,qBAAoB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAE1D,IAAI,MAAM,CAAC,IAAI,EAAE;YACf,IAAA,8CAAoB,EAAC,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;SACvD;QAED,wEAAwE;QACxE,sEAAsE;QACtE,kBAAkB;QAClB,IAAI,CAAC,MAAM,CACT,IAAA,WAAI,EAAC,OAAO,CAAC,cAAc,EAAE,cAAc,CAAC,EAC5C,IAAA,WAAI,EAAC,OAAO,CAAC,cAAc,EAAE,mBAAmB,CAAC,CAClD,CAAC;QAEF,WAAW,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAC3B,IAAA,qCAAgB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAEhC,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;YACvB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;QAED,OAAO,IAAA,sCAAgB,EAAC,OAAO,CAAC,CAAC;IACnC,CAAC;CAAA;AAxBD,gDAwBC;AAED,kBAAe,kBAAkB,CAAC"}

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

@@ -9,10 +9,6 @@ export interface Schema {
   directory?: string;
   tags?: string;
   unitTestRunner: 'jest' | 'none';
-  /**
-   * @deprecated
-   */
-  babelJest?: boolean;
   e2eTestRunner: 'cypress' | 'none';
   linter: Linter;
   pascalCaseFiles?: boolean;

package/src/generators/storybook-configuration/schema.d.ts

@@ -9,4 +9,5 @@ export interface StorybookConfigureSchema {
   linter?: Linter;
   cypressDirectory?: string;
   standaloneConfig?: boolean;
+  projectBuildConfig?: string;
 }

package/src/generators/storybook-configuration/schema.json

@@ -47,6 +47,10 @@
       "enum": ["eslint", "tslint"],
       "default": "eslint"
     },
+    "projectBuildConfig": {
+      "description": "Provide a custom projectBuildConfig for the Angular executor. If left blank, Nx will use the default.",
+      "type": "string"
+    },
     "standaloneConfig": {
       "description": "Split the project configuration into `<projectRoot>/project.json` rather than including it inside `workspace.json`.",
       "type": "boolean"

package/src/mfe/mfe-ast-utils.d.ts

@@ -0,0 +1,8 @@
+import * as ts from 'typescript';
+import { StringChange } from '@nrwl/devkit';
+export declare function addRemoteToMfeConfig(source: ts.SourceFile, app: string): StringChange[];
+export declare function addRemoteDefinition(source: ts.SourceFile, app: string): StringChange[];
+export declare function addRemoteRoute(source: ts.SourceFile, names: {
+    fileName: string;
+    className: string;
+}): StringChange[];

package/src/mfe/mfe-ast-utils.js

@@ -0,0 +1,96 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.addRemoteRoute = exports.addRemoteDefinition = exports.addRemoteToMfeConfig = void 0;
+const ts = require("typescript");
+const devkit_1 = require("@nrwl/devkit");
+const find_nodes_1 = require("@nrwl/workspace/src/utilities/typescript/find-nodes");
+const ast_utils_1 = require("../utils/ast-utils");
+function addRemoteToMfeConfig(source, app) {
+    const assignments = (0, find_nodes_1.findNodes)(source, ts.SyntaxKind.PropertyAssignment);
+    const remotesAssignment = assignments.find((s) => s.name.getText() === 'remotes');
+    if (remotesAssignment) {
+        const arrayExpression = remotesAssignment.initializer;
+        return arrayExpression.elements
+            ? [
+                {
+                    type: devkit_1.ChangeType.Insert,
+                    index: arrayExpression.elements[arrayExpression.elements.length - 1].end,
+                    text: `,`,
+                },
+                {
+                    type: devkit_1.ChangeType.Insert,
+                    index: remotesAssignment.end - 1,
+                    text: `'${app}',\n`,
+                },
+            ]
+            : [];
+    }
+    const binaryExpressions = (0, find_nodes_1.findNodes)(source, ts.SyntaxKind.BinaryExpression);
+    const exportExpression = binaryExpressions.find((b) => {
+        if (b.left.kind === ts.SyntaxKind.PropertyAccessExpression) {
+            const pae = b.left;
+            return (pae.expression.getText() === 'module' &&
+                pae.name.getText() === 'exports');
+        }
+    });
+    if ((exportExpression === null || exportExpression === void 0 ? void 0 : exportExpression.right.kind) === ts.SyntaxKind.ObjectLiteralExpression) {
+        const ole = exportExpression.right;
+        return [
+            {
+                type: devkit_1.ChangeType.Insert,
+                index: ole.end - 1,
+                text: `remotes: ['${app}']\n`,
+            },
+        ];
+    }
+    return [];
+}
+exports.addRemoteToMfeConfig = addRemoteToMfeConfig;
+function addRemoteDefinition(source, app) {
+    return [
+        {
+            type: devkit_1.ChangeType.Insert,
+            index: source.end,
+            text: `\ndeclare module '${app}/Module';`,
+        },
+    ];
+}
+exports.addRemoteDefinition = addRemoteDefinition;
+function addRemoteRoute(source, names) {
+    const routes = (0, ast_utils_1.findElements)(source, 'Route');
+    const links = (0, ast_utils_1.findElements)(source, 'Link');
+    if (routes.length === 0) {
+        return [];
+    }
+    else {
+        const changes = [];
+        const firstRoute = routes[0];
+        const firstLink = links[0];
+        changes.push(...(0, ast_utils_1.addImport)(source, `const ${names.className} = React.lazy(() => import('${names.fileName}/Module'));`));
+        changes.push({
+            type: devkit_1.ChangeType.Insert,
+            index: firstRoute.end,
+            text: `\n<Route path="/${names.fileName}" render={() => <${names.className} />} />`,
+        });
+        if (firstLink) {
+            const parentLi = (0, ast_utils_1.findClosestOpening)('li', firstLink);
+            if (parentLi) {
+                changes.push({
+                    type: devkit_1.ChangeType.Insert,
+                    index: parentLi.end,
+                    text: `\n<li><Link to="/${names.fileName}">${names.className}</Link></li>`,
+                });
+            }
+            else {
+                changes.push({
+                    type: devkit_1.ChangeType.Insert,
+                    index: firstLink.parent.end,
+                    text: `\n<Link to="/${names.fileName}">${names.className}</Link>`,
+                });
+            }
+        }
+        return changes;
+    }
+}
+exports.addRemoteRoute = addRemoteRoute;
+//# sourceMappingURL=mfe-ast-utils.js.map

package/src/mfe/mfe-ast-utils.js.map

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

package/src/rules/update-mfe-project.d.ts

@@ -0,0 +1,6 @@
+import { Tree } from '@nrwl/devkit';
+export declare function updateMfeProject(host: Tree, options: {
+    name: string;
+    appProjectRoot: string;
+    devServerPort?: number;
+}): void;

package/src/{generators/mfe-host/lib → rules}/update-mfe-project.js

@@ -5,6 +5,7 @@ const devkit_1 = require("@nrwl/devkit");
 function updateMfeProject(host, options) {
     let projectConfig = (0, devkit_1.readProjectConfiguration)(host, options.name);
     projectConfig.targets.build.options = Object.assign(Object.assign({}, projectConfig.targets.build.options), { main: `${options.appProjectRoot}/src/main.ts`, webpackConfig: `${options.appProjectRoot}/webpack.config.js` });
+    projectConfig.targets.build.configurations.production = Object.assign(Object.assign({}, projectConfig.targets.build.configurations.production), { webpackConfig: `${options.appProjectRoot}/webpack.config.prod.js` });
     projectConfig.targets.serve.executor = '@nrwl/react:mfe-dev-server';
     projectConfig.targets.serve.options.port = options.devServerPort;
     (0, devkit_1.updateProjectConfiguration)(host, options.name, projectConfig);

package/src/rules/update-mfe-project.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"update-mfe-project.js","sourceRoot":"","sources":["../../../../../packages/react/src/rules/update-mfe-project.ts"],"names":[],"mappings":";;;AAAA,yCAIsB;AAEtB,SAAgB,gBAAgB,CAC9B,IAAU,EACV,OAAyE;IAEzE,IAAI,aAAa,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IACjE,aAAa,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,mCAC9B,aAAa,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,KACtC,IAAI,EAAE,GAAG,OAAO,CAAC,cAAc,cAAc,EAC7C,aAAa,EAAE,GAAG,OAAO,CAAC,cAAc,oBAAoB,GAC7D,CAAC;IACF,aAAa,CAAC,OAAO,CAAC,KAAK,CAAC,cAAc,CAAC,UAAU,mCAChD,aAAa,CAAC,OAAO,CAAC,KAAK,CAAC,cAAc,CAAC,UAAU,KACxD,aAAa,EAAE,GAAG,OAAO,CAAC,cAAc,yBAAyB,GAClE,CAAC;IACF,aAAa,CAAC,OAAO,CAAC,KAAK,CAAC,QAAQ,GAAG,4BAA4B,CAAC;IACpE,aAAa,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,GAAG,OAAO,CAAC,aAAa,CAAC;IACjE,IAAA,mCAA0B,EAAC,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,aAAa,CAAC,CAAC;AAChE,CAAC;AAjBD,4CAiBC"}

package/src/utils/versions.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.babelPluginStyledComponentsVersion = exports.eslintPluginReactHooksVersion = exports.eslintPluginReactVersion = exports.eslintPluginJsxA11yVersion = exports.eslintPluginImportVersion = exports.reactTestRendererVersion = exports.reactReduxVersion = exports.reduxjsToolkitVersion = exports.testingLibraryReactHooksVersion = exports.testingLibraryReactVersion = exports.typesReactRouterDomVersion = exports.reactRouterDomVersion = exports.styledJsxVersion = exports.emotionBabelPlugin = exports.emotionReactVersion = exports.emotionStyledVersion = exports.typesStyledComponentsVersion = exports.styledComponentsVersion = exports.typesReactIsVersion = exports.typesReactDomVersion = exports.typesReactVersion = exports.reactIsVersion = exports.reactDomVersion = exports.reactVersion = exports.nxVersion = void 0;
-exports.nxVersion = '13.10.0-rc.1';
+exports.nxVersion = '13.10.1';
 exports.reactVersion = '18.0.0';
 exports.reactDomVersion = '18.0.0';
 exports.reactIsVersion = '18.0.0';

package/src/generators/mfe-host/lib/add-mfe.d.ts

@@ -1,2 +0,0 @@
-import { NormalizedSchema } from '../schema';
-export declare function addMFEFiles(host: any, options: NormalizedSchema): void;

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

@@ -1 +0,0 @@
-{"version":3,"file":"add-mfe.js","sourceRoot":"","sources":["../../../../../../../packages/react/src/generators/mfe-host/lib/add-mfe.ts"],"names":[],"mappings":";;;AACA,yCAAoD;AACpD,+BAA4B;AAE5B,SAAgB,WAAW,CAAC,IAAI,EAAE,OAAyB;IACzD,MAAM,iBAAiB,iDAClB,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,GACnB,OAAO,KACV,IAAI,EAAE,EAAE,EACR,OAAO,EAAE,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,cAAK,EAAC,CAAC,CAAC,CAAC,GAC9C,CAAC;IAEF,wEAAwE;IACxE,sEAAsE;IACtE,kBAAkB;IAClB,IAAI,CAAC,MAAM,CACT,IAAA,WAAI,EAAC,OAAO,CAAC,cAAc,EAAE,cAAc,CAAC,EAC5C,IAAA,WAAI,EAAC,OAAO,CAAC,cAAc,EAAE,mBAAmB,CAAC,CAClD,CAAC;IAEF,kCAAkC;IAClC,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,WAAI,EAAC,SAAS,EAAE,cAAc,CAAC,EAC/B,OAAO,CAAC,cAAc,EACtB,iBAAiB,CAClB,CAAC;IAEF,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,WAAI,EAAC,SAAS,EAAE,iBAAiB,CAAC,EAClC,OAAO,CAAC,cAAc,EACtB,iBAAiB,CAClB,CAAC;AACJ,CAAC;AA9BD,kCA8BC"}

package/src/generators/mfe-host/lib/update-host-with-remote.d.ts

@@ -1,3 +0,0 @@
-import { Tree } from '@nrwl/devkit';
-import { Schema } from '../schema';
-export declare function updateHostWithRemote(host: Tree, options: Schema): void;

package/src/generators/mfe-host/lib/update-host-with-remote.js

@@ -1,10 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.updateHostWithRemote = void 0;
-function updateHostWithRemote(host, options) {
-    // find the host project path
-    // Update remotes inside ${host_path}/src/remotes.d.ts
-    // Update remotes inside ${host_path}/mfe.config.js
-}
-exports.updateHostWithRemote = updateHostWithRemote;
-//# sourceMappingURL=update-host-with-remote.js.map

package/src/generators/mfe-host/lib/update-host-with-remote.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"update-host-with-remote.js","sourceRoot":"","sources":["../../../../../../../packages/react/src/generators/mfe-host/lib/update-host-with-remote.ts"],"names":[],"mappings":";;;AAGA,SAAgB,oBAAoB,CAAC,IAAU,EAAE,OAAe;IAC9D,6BAA6B;IAC7B,sDAAsD;IACtD,mDAAmD;AACrD,CAAC;AAJD,oDAIC"}

package/src/generators/mfe-host/lib/update-mfe-project.d.ts

@@ -1,3 +0,0 @@
-import { Tree } from 'nx/src/shared/tree';
-import { NormalizedSchema } from '../schema';
-export declare function updateMfeProject(host: Tree, options: NormalizedSchema): void;

package/src/generators/mfe-host/lib/update-mfe-project.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"update-mfe-project.js","sourceRoot":"","sources":["../../../../../../../packages/react/src/generators/mfe-host/lib/update-mfe-project.ts"],"names":[],"mappings":";;;AAEA,yCAGsB;AAEtB,SAAgB,gBAAgB,CAAC,IAAU,EAAE,OAAyB;IACpE,IAAI,aAAa,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IACjE,aAAa,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,mCAC9B,aAAa,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,KACtC,IAAI,EAAE,GAAG,OAAO,CAAC,cAAc,cAAc,EAC7C,aAAa,EAAE,GAAG,OAAO,CAAC,cAAc,oBAAoB,GAC7D,CAAC;IACF,aAAa,CAAC,OAAO,CAAC,KAAK,CAAC,QAAQ,GAAG,4BAA4B,CAAC;IACpE,aAAa,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,GAAG,OAAO,CAAC,aAAa,CAAC;IACjE,IAAA,mCAA0B,EAAC,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,aAAa,CAAC,CAAC;AAChE,CAAC;AAVD,4CAUC"}