@nrwl/react 13.10.0-rc.2 → 13.10.2

package/migrations.json

@@ -287,6 +287,43 @@
           "alwaysAddToPackageJson": false
         }
       }
+    },
+    "13.10.1": {
+      "version": "13.10.1-beta.1",
+      "packages": {
+        "@types/react": {
+          "version": "18.0.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@types/react-dom": {
+          "version": "18.0.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@types/styled-components": {
+          "version": "5.1.25",
+          "alwaysAddToPackageJson": false
+        },
+        "@emotion/react": {
+          "version": "11.9.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@testing-library/react": {
+          "version": "13.0.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@reduxjs/toolkit": {
+          "version": "1.8.1",
+          "alwaysAddToPackageJson": false
+        },
+        "react-redux": {
+          "version": "7.2.8",
+          "alwaysAddToPackageJson": false
+        },
+        "eslint-plugin-import": {
+          "version": "2.26.0",
+          "alwaysAddToPackageJson": false
+        }
+      }
     }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nrwl/react",
-  "version": "13.10.0-rc.2",
+  "version": "13.10.2",
   "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.2",
-    "@nrwl/devkit": "13.10.0-rc.2",
-    "@nrwl/jest": "13.10.0-rc.2",
-    "@nrwl/js": "13.10.0-rc.2",
-    "@nrwl/linter": "13.10.0-rc.2",
-    "@nrwl/storybook": "13.10.0-rc.2",
-    "@nrwl/web": "13.10.0-rc.2",
-    "@nrwl/workspace": "13.10.0-rc.2",
+    "@nrwl/cypress": "13.10.2",
+    "@nrwl/devkit": "13.10.2",
+    "@nrwl/jest": "13.10.2",
+    "@nrwl/js": "13.10.2",
+    "@nrwl/linter": "13.10.2",
+    "@nrwl/storybook": "13.10.2",
+    "@nrwl/web": "13.10.2",
+    "@nrwl/workspace": "13.10.2",
     "@pmmmwh/react-refresh-webpack-plugin": "^0.5.1",
     "@svgr/webpack": "^6.1.2",
     "chalk": "4.1.0",

package/src/generators/application/files/common/src/main.tsx__tmpl__

@@ -1,7 +1,10 @@
 <% if (strict) { %>import { StrictMode } from 'react';<% } %>
-import * as ReactDOM from 'react-dom';
+import * as ReactDOMClient from 'react-dom/client';
 <% if (routing) { %>import { BrowserRouter } from 'react-router-dom';<% } %>
 
 import App from './app/<%= fileName %>';
 
-ReactDOM.render(<% if (strict) { %><StrictMode><% } %><% if (routing) { %><BrowserRouter><% } %><App /><% if (routing) { %></BrowserRouter><% } %><% if (strict) { %></StrictMode><% } %>, document.getElementById('root'));
+const root = ReactDOMClient.createRoot(document.getElementById('root') as HTMLElement);
+root.render(
+<% if (strict) { %><StrictMode><% } %><% if (routing) { %><BrowserRouter><% } %><App /><% if (routing) { %></BrowserRouter><% } %><% if (strict) { %></StrictMode><% } %>
+);

package/src/generators/init/init.d.ts

@@ -1,5 +1,5 @@
-import { InitSchema } from './schema';
 import { GeneratorCallback, Tree } from '@nrwl/devkit';
+import { InitSchema } from './schema';
 export declare function reactInitGenerator(host: Tree, schema: InitSchema): Promise<GeneratorCallback>;
 export default reactInitGenerator;
 export declare const reactInitSchematic: (generatorOptions: InitSchema) => (tree: any, context: any) => Promise<any>;

package/src/generators/init/init.js

@@ -2,12 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.reactInitSchematic = exports.reactInitGenerator = void 0;
 const tslib_1 = require("tslib");
+const cypress_1 = require("@nrwl/cypress");
 const devkit_1 = require("@nrwl/devkit");
 const jest_1 = require("@nrwl/jest");
-const cypress_1 = require("@nrwl/cypress");
 const web_1 = require("@nrwl/web");
-const set_default_collection_1 = require("@nrwl/workspace/src/utilities/set-default-collection");
 const run_tasks_in_serial_1 = require("@nrwl/workspace/src/utilities/run-tasks-in-serial");
+const set_default_collection_1 = require("@nrwl/workspace/src/utilities/set-default-collection");
 const versions_1 = require("../../utils/versions");
 function setDefault(host) {
     const workspace = (0, devkit_1.readWorkspaceConfiguration)(host);
@@ -18,12 +18,7 @@ function setDefault(host) {
     (0, set_default_collection_1.setDefaultCollection)(host, '@nrwl/react');
 }
 function updateDependencies(host) {
-    (0, devkit_1.updateJson)(host, 'package.json', (json) => {
-        if (json.dependencies && json.dependencies['@nrwl/react']) {
-            delete json.dependencies['@nrwl/react'];
-        }
-        return json;
-    });
+    (0, devkit_1.removeDependenciesFromPackageJson)(host, ['@nrwl/react'], []);
     return (0, devkit_1.addDependenciesToPackageJson)(host, {
         'core-js': '^3.6.5',
         react: versions_1.reactVersion,

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

@@ -1 +1 @@
-{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../../../packages/react/src/generators/init/init.ts"],"names":[],"mappings":";;;;AACA,yCAQsB;AACtB,qCAA+C;AAC/C,2CAAqD;AACrD,mCAA6C;AAC7C,iGAA4F;AAC5F,2FAAqF;AACrF,mDAS8B;AAE9B,SAAS,UAAU,CAAC,IAAU;IAC5B,MAAM,SAAS,GAAG,IAAA,mCAA0B,EAAC,IAAI,CAAC,CAAC;IAEnD,SAAS,CAAC,UAAU,GAAG,SAAS,CAAC,UAAU,IAAI,EAAE,CAAC;IAClD,MAAM,eAAe,GAAG,SAAS,CAAC,UAAU,CAAC,aAAa,CAAC,IAAI,EAAE,CAAC;IAClE,MAAM,UAAU,mCACX,SAAS,CAAC,UAAU,KACvB,aAAa,kCACR,eAAe,KAClB,WAAW,kCACN,eAAe,CAAC,WAAW,KAC9B,KAAK,EAAE,IAAI,SAGhB,CAAC;IAEF,IAAA,qCAA4B,EAAC,IAAI,kCAAO,SAAS,KAAE,UAAU,IAAG,CAAC;IACjE,IAAA,6CAAoB,EAAC,IAAI,EAAE,aAAa,CAAC,CAAC;AAC5C,CAAC;AAED,SAAS,kBAAkB,CAAC,IAAU;IACpC,IAAA,mBAAU,EAAC,IAAI,EAAE,cAAc,EAAE,CAAC,IAAI,EAAE,EAAE;QACxC,IAAI,IAAI,CAAC,YAAY,IAAI,IAAI,CAAC,YAAY,CAAC,aAAa,CAAC,EAAE;YACzD,OAAO,IAAI,CAAC,YAAY,CAAC,aAAa,CAAC,CAAC;SACzC;QACD,OAAO,IAAI,CAAC;IACd,CAAC,CAAC,CAAC;IAEH,OAAO,IAAA,qCAA4B,EACjC,IAAI,EACJ;QACE,SAAS,EAAE,QAAQ;QACnB,KAAK,EAAE,uBAAY;QACnB,WAAW,EAAE,0BAAe;QAC5B,qBAAqB,EAAE,QAAQ;QAC/B,KAAK,EAAE,QAAQ;KAChB,EACD;QACE,aAAa,EAAE,oBAAS;QACxB,cAAc,EAAE,4BAAiB;QACjC,kBAAkB,EAAE,+BAAoB;QACxC,wBAAwB,EAAE,qCAA0B;QACpD,8BAA8B,EAAE,0CAA+B;QAC/D,qBAAqB,EAAE,mCAAwB;KAChD,CACF,CAAC;AACJ,CAAC;AAED,SAAsB,kBAAkB,CAAC,IAAU,EAAE,MAAkB;;QACrE,MAAM,KAAK,GAAwB,EAAE,CAAC;QAEtC,UAAU,CAAC,IAAI,CAAC,CAAC;QAEjB,IAAI,CAAC,MAAM,CAAC,cAAc,IAAI,MAAM,CAAC,cAAc,KAAK,MAAM,EAAE;YAC9D,MAAM,QAAQ,GAAG,IAAA,wBAAiB,EAAC,IAAI,EAAE,EAAE,CAAC,CAAC;YAC7C,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;SACtB;QACD,IAAI,CAAC,MAAM,CAAC,aAAa,IAAI,MAAM,CAAC,aAAa,KAAK,SAAS,EAAE;YAC/D,MAAM,WAAW,GAAG,IAAA,8BAAoB,EAAC,IAAI,EAAE,EAAE,CAAC,CAAC;YACnD,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;SACzB;QAED,MAAM,QAAQ,GAAG,MAAM,IAAA,sBAAgB,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QACtD,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QACrB,MAAM,WAAW,GAAG,kBAAkB,CAAC,IAAI,CAAC,CAAC;QAC7C,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QAExB,OAAO,IAAA,sCAAgB,EAAC,GAAG,KAAK,CAAC,CAAC;IACpC,CAAC;CAAA;AApBD,gDAoBC;AAED,kBAAe,kBAAkB,CAAC;AAErB,QAAA,kBAAkB,GAAG,IAAA,2BAAkB,EAAC,kBAAkB,CAAC,CAAC"}
+{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../../../packages/react/src/generators/init/init.ts"],"names":[],"mappings":";;;;AAAA,2CAAqD;AACrD,yCAQsB;AACtB,qCAA+C;AAC/C,mCAA6C;AAC7C,2FAAqF;AACrF,iGAA4F;AAC5F,mDAS8B;AAG9B,SAAS,UAAU,CAAC,IAAU;IAC5B,MAAM,SAAS,GAAG,IAAA,mCAA0B,EAAC,IAAI,CAAC,CAAC;IAEnD,SAAS,CAAC,UAAU,GAAG,SAAS,CAAC,UAAU,IAAI,EAAE,CAAC;IAClD,MAAM,eAAe,GAAG,SAAS,CAAC,UAAU,CAAC,aAAa,CAAC,IAAI,EAAE,CAAC;IAClE,MAAM,UAAU,mCACX,SAAS,CAAC,UAAU,KACvB,aAAa,kCACR,eAAe,KAClB,WAAW,kCACN,eAAe,CAAC,WAAW,KAC9B,KAAK,EAAE,IAAI,SAGhB,CAAC;IAEF,IAAA,qCAA4B,EAAC,IAAI,kCAAO,SAAS,KAAE,UAAU,IAAG,CAAC;IACjE,IAAA,6CAAoB,EAAC,IAAI,EAAE,aAAa,CAAC,CAAC;AAC5C,CAAC;AAED,SAAS,kBAAkB,CAAC,IAAU;IACpC,IAAA,0CAAiC,EAAC,IAAI,EAAE,CAAC,aAAa,CAAC,EAAE,EAAE,CAAC,CAAC;IAE7D,OAAO,IAAA,qCAA4B,EACjC,IAAI,EACJ;QACE,SAAS,EAAE,QAAQ;QACnB,KAAK,EAAE,uBAAY;QACnB,WAAW,EAAE,0BAAe;QAC5B,qBAAqB,EAAE,QAAQ;QAC/B,KAAK,EAAE,QAAQ;KAChB,EACD;QACE,aAAa,EAAE,oBAAS;QACxB,cAAc,EAAE,4BAAiB;QACjC,kBAAkB,EAAE,+BAAoB;QACxC,wBAAwB,EAAE,qCAA0B;QACpD,8BAA8B,EAAE,0CAA+B;QAC/D,qBAAqB,EAAE,mCAAwB;KAChD,CACF,CAAC;AACJ,CAAC;AAED,SAAsB,kBAAkB,CAAC,IAAU,EAAE,MAAkB;;QACrE,MAAM,KAAK,GAAwB,EAAE,CAAC;QAEtC,UAAU,CAAC,IAAI,CAAC,CAAC;QAEjB,IAAI,CAAC,MAAM,CAAC,cAAc,IAAI,MAAM,CAAC,cAAc,KAAK,MAAM,EAAE;YAC9D,MAAM,QAAQ,GAAG,IAAA,wBAAiB,EAAC,IAAI,EAAE,EAAE,CAAC,CAAC;YAC7C,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;SACtB;QACD,IAAI,CAAC,MAAM,CAAC,aAAa,IAAI,MAAM,CAAC,aAAa,KAAK,SAAS,EAAE;YAC/D,MAAM,WAAW,GAAG,IAAA,8BAAoB,EAAC,IAAI,EAAE,EAAE,CAAC,CAAC;YACnD,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;SACzB;QAED,MAAM,QAAQ,GAAG,MAAM,IAAA,sBAAgB,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QACtD,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QACrB,MAAM,WAAW,GAAG,kBAAkB,CAAC,IAAI,CAAC,CAAC;QAC7C,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QAExB,OAAO,IAAA,sCAAgB,EAAC,GAAG,KAAK,CAAC,CAAC;IACpC,CAAC;CAAA;AApBD,gDAoBC;AAED,kBAAe,kBAAkB,CAAC;AAErB,QAAA,kBAAkB,GAAG,IAAA,2BAAkB,EAAC,kBAAkB,CAAC,CAAC"}

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

@@ -3,10 +3,24 @@ const mfeConfig = require('./mfe.config');
 
 module.exports = withModuleFederation({
     ...mfeConfig,
-    // Override remote location for production build.
-    // Each entry is a pair of an unique name and the URL where it is deployed.
-    // remotes: [
-    //   ['app1', 'http://app1.example.com/'],
-    //   ['app2', 'http://app2.example.com/'],
-    // ],
+    /*
+     * 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.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);
         }

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;AAED,kBAAe,gBAAgB,CAAC"}
+{"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.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,6 +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);

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,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"}
+{"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/migrations/update-13-10-0/update-13-10-0.js

@@ -18,8 +18,9 @@ function updateToReact18(host) {
                 react: '18.0.0',
                 'react-dom': '18.0.0',
                 'react-is': '18.0.0',
+            }, {
                 'react-test-renderer': '18.0.0',
-            }, {});
+            });
         }
     });
 }

package/src/migrations/update-13-10-0/update-13-10-0.js.map

@@ -1 +1 @@
-{"version":3,"file":"update-13-10-0.js","sourceRoot":"","sources":["../../../../../../packages/react/src/migrations/update-13-10-0/update-13-10-0.ts"],"names":[],"mappings":";;;;AAAA,yCAKsB;AAEtB,6EAA6E;AAC7E,0DAA0D;AAC1D,4IAA4I;AAC5I,SAAsB,eAAe,CAAC,IAAU;;QAC9C,MAAM,EAAE,YAAY,EAAE,GAAG,IAAA,iBAAQ,EAAC,IAAI,EAAE,cAAc,CAAC,CAAC;QACxD,IACE,YAAY,CAAC,cAAc,CAAC;YAC5B,CAAC,YAAY,CAAC,cAAc,CAAC,CAAC,KAAK,CAAC,YAAY,CAAC,EACjD;YACA,eAAM,CAAC,IAAI,CACT,gBAAgB,YAAY,CAAC,cAAc,CAAC,wFAAwF,CACrI,CAAC;SACH;aAAM;YACL,OAAO,IAAA,qCAA4B,EACjC,IAAI,EACJ;gBACE,KAAK,EAAE,QAAQ;gBACf,WAAW,EAAE,QAAQ;gBACrB,UAAU,EAAE,QAAQ;gBACpB,qBAAqB,EAAE,QAAQ;aAChC,EACD,EAAE,CACH,CAAC;SACH;IACH,CAAC;CAAA;AArBD,0CAqBC;AAED,kBAAe,eAAe,CAAC"}
+{"version":3,"file":"update-13-10-0.js","sourceRoot":"","sources":["../../../../../../packages/react/src/migrations/update-13-10-0/update-13-10-0.ts"],"names":[],"mappings":";;;;AAAA,yCAKsB;AAEtB,6EAA6E;AAC7E,0DAA0D;AAC1D,4IAA4I;AAC5I,SAAsB,eAAe,CAAC,IAAU;;QAC9C,MAAM,EAAE,YAAY,EAAE,GAAG,IAAA,iBAAQ,EAAC,IAAI,EAAE,cAAc,CAAC,CAAC;QACxD,IACE,YAAY,CAAC,cAAc,CAAC;YAC5B,CAAC,YAAY,CAAC,cAAc,CAAC,CAAC,KAAK,CAAC,YAAY,CAAC,EACjD;YACA,eAAM,CAAC,IAAI,CACT,gBAAgB,YAAY,CAAC,cAAc,CAAC,wFAAwF,CACrI,CAAC;SACH;aAAM;YACL,OAAO,IAAA,qCAA4B,EACjC,IAAI,EACJ;gBACE,KAAK,EAAE,QAAQ;gBACf,WAAW,EAAE,QAAQ;gBACrB,UAAU,EAAE,QAAQ;aACrB,EACD;gBACE,qBAAqB,EAAE,QAAQ;aAChC,CACF,CAAC;SACH;IACH,CAAC;CAAA;AAtBD,0CAsBC;AAED,kBAAe,eAAe,CAAC"}

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/ast-utils.js

@@ -32,11 +32,18 @@ function findMainRenderStatement(source) {
     const calls = (0, find_nodes_1.findNodes)(source, ts.SyntaxKind.CallExpression);
     for (const expr of calls) {
         const inner = expr.expression;
+        // React 17 and below
         if (ts.isPropertyAccessExpression(inner) &&
             /ReactDOM/i.test(inner.expression.getText()) &&
             inner.name.getText() === 'render') {
             return expr;
         }
+        // React 18
+        if (ts.isPropertyAccessExpression(inner) &&
+            /root/.test(inner.expression.getText()) &&
+            inner.name.getText() === 'render') {
+            return expr;
+        }
     }
     // 2. Try to find render from 'react-dom'.
     const imports = (0, find_nodes_1.findNodes)(source, ts.SyntaxKind.ImportDeclaration);
@@ -254,7 +261,7 @@ exports.addBrowserRouter = addBrowserRouter;
 function addReduxStoreToMain(sourcePath, source) {
     const renderStmt = findMainRenderStatement(source);
     if (!renderStmt) {
-        devkit_1.logger.warn(`Could not find ReactDOM.render in ${sourcePath}`);
+        devkit_1.logger.warn(`Could not find render(...) in ${sourcePath}`);
         return [];
     }
     const jsx = renderStmt.arguments[0];

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

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

package/src/utils/versions.d.ts

@@ -2,23 +2,23 @@ export declare const nxVersion = "*";
 export declare const reactVersion = "18.0.0";
 export declare const reactDomVersion = "18.0.0";
 export declare const reactIsVersion = "18.0.0";
-export declare const typesReactVersion = "17.0.43";
-export declare const typesReactDomVersion = "17.0.14";
+export declare const typesReactVersion = "18.0.0";
+export declare const typesReactDomVersion = "18.0.0";
 export declare const typesReactIsVersion = "17.0.3";
 export declare const styledComponentsVersion = "5.3.5";
-export declare const typesStyledComponentsVersion = "5.1.24";
+export declare const typesStyledComponentsVersion = "5.1.25";
 export declare const emotionStyledVersion = "11.8.1";
-export declare const emotionReactVersion = "11.8.2";
+export declare const emotionReactVersion = "11.9.0";
 export declare const emotionBabelPlugin = "11.7.2";
 export declare const styledJsxVersion = "5.0.2";
 export declare const reactRouterDomVersion = "5.3.0";
 export declare const typesReactRouterDomVersion = "5.3.3";
-export declare const testingLibraryReactVersion = "12.1.4";
+export declare const testingLibraryReactVersion = "13.0.0";
 export declare const testingLibraryReactHooksVersion = "7.0.2";
-export declare const reduxjsToolkitVersion = "1.8.0";
-export declare const reactReduxVersion = "7.2.6";
+export declare const reduxjsToolkitVersion = "1.8.1";
+export declare const reactReduxVersion = "7.2.8";
 export declare const reactTestRendererVersion = "18.0.0";
-export declare const eslintPluginImportVersion = "2.25.4";
+export declare const eslintPluginImportVersion = "2.26.0";
 export declare const eslintPluginJsxA11yVersion = "6.5.1";
 export declare const eslintPluginReactVersion = "7.29.4";
 export declare const eslintPluginReactHooksVersion = "4.4.0";

package/src/utils/versions.js

@@ -1,27 +1,27 @@
 "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.2';
+exports.nxVersion = '13.10.2';
 exports.reactVersion = '18.0.0';
 exports.reactDomVersion = '18.0.0';
 exports.reactIsVersion = '18.0.0';
-exports.typesReactVersion = '17.0.43';
-exports.typesReactDomVersion = '17.0.14';
+exports.typesReactVersion = '18.0.0';
+exports.typesReactDomVersion = '18.0.0';
 exports.typesReactIsVersion = '17.0.3';
 exports.styledComponentsVersion = '5.3.5';
-exports.typesStyledComponentsVersion = '5.1.24';
+exports.typesStyledComponentsVersion = '5.1.25';
 exports.emotionStyledVersion = '11.8.1';
-exports.emotionReactVersion = '11.8.2';
+exports.emotionReactVersion = '11.9.0';
 exports.emotionBabelPlugin = '11.7.2';
 exports.styledJsxVersion = '5.0.2';
 exports.reactRouterDomVersion = '5.3.0';
 exports.typesReactRouterDomVersion = '5.3.3';
-exports.testingLibraryReactVersion = '12.1.4';
+exports.testingLibraryReactVersion = '13.0.0';
 exports.testingLibraryReactHooksVersion = '7.0.2';
-exports.reduxjsToolkitVersion = '1.8.0';
-exports.reactReduxVersion = '7.2.6';
+exports.reduxjsToolkitVersion = '1.8.1';
+exports.reactReduxVersion = '7.2.8';
 exports.reactTestRendererVersion = '18.0.0';
-exports.eslintPluginImportVersion = '2.25.4';
+exports.eslintPluginImportVersion = '2.26.0';
 exports.eslintPluginJsxA11yVersion = '6.5.1';
 exports.eslintPluginReactVersion = '7.29.4';
 exports.eslintPluginReactHooksVersion = '4.4.0';

package/src/utils/versions.js.map

@@ -1 +1 @@
-{"version":3,"file":"versions.js","sourceRoot":"","sources":["../../../../../packages/react/src/utils/versions.ts"],"names":[],"mappings":";;;AAAa,QAAA,SAAS,GAAG,GAAG,CAAC;AAEhB,QAAA,YAAY,GAAG,QAAQ,CAAC;AACxB,QAAA,eAAe,GAAG,QAAQ,CAAC;AAC3B,QAAA,cAAc,GAAG,QAAQ,CAAC;AAC1B,QAAA,iBAAiB,GAAG,SAAS,CAAC;AAC9B,QAAA,oBAAoB,GAAG,SAAS,CAAC;AACjC,QAAA,mBAAmB,GAAG,QAAQ,CAAC;AAE/B,QAAA,uBAAuB,GAAG,OAAO,CAAC;AAClC,QAAA,4BAA4B,GAAG,QAAQ,CAAC;AAExC,QAAA,oBAAoB,GAAG,QAAQ,CAAC;AAChC,QAAA,mBAAmB,GAAG,QAAQ,CAAC;AAC/B,QAAA,kBAAkB,GAAG,QAAQ,CAAC;AAE9B,QAAA,gBAAgB,GAAG,OAAO,CAAC;AAE3B,QAAA,qBAAqB,GAAG,OAAO,CAAC;AAChC,QAAA,0BAA0B,GAAG,OAAO,CAAC;AAErC,QAAA,0BAA0B,GAAG,QAAQ,CAAC;AACtC,QAAA,+BAA+B,GAAG,OAAO,CAAC;AAE1C,QAAA,qBAAqB,GAAG,OAAO,CAAC;AAChC,QAAA,iBAAiB,GAAG,OAAO,CAAC;AAC5B,QAAA,wBAAwB,GAAG,QAAQ,CAAC;AAEpC,QAAA,yBAAyB,GAAG,QAAQ,CAAC;AACrC,QAAA,0BAA0B,GAAG,OAAO,CAAC;AACrC,QAAA,wBAAwB,GAAG,QAAQ,CAAC;AACpC,QAAA,6BAA6B,GAAG,OAAO,CAAC;AAExC,QAAA,kCAAkC,GAAG,QAAQ,CAAC"}
+{"version":3,"file":"versions.js","sourceRoot":"","sources":["../../../../../packages/react/src/utils/versions.ts"],"names":[],"mappings":";;;AAAa,QAAA,SAAS,GAAG,GAAG,CAAC;AAEhB,QAAA,YAAY,GAAG,QAAQ,CAAC;AACxB,QAAA,eAAe,GAAG,QAAQ,CAAC;AAC3B,QAAA,cAAc,GAAG,QAAQ,CAAC;AAC1B,QAAA,iBAAiB,GAAG,QAAQ,CAAC;AAC7B,QAAA,oBAAoB,GAAG,QAAQ,CAAC;AAChC,QAAA,mBAAmB,GAAG,QAAQ,CAAC;AAE/B,QAAA,uBAAuB,GAAG,OAAO,CAAC;AAClC,QAAA,4BAA4B,GAAG,QAAQ,CAAC;AAExC,QAAA,oBAAoB,GAAG,QAAQ,CAAC;AAChC,QAAA,mBAAmB,GAAG,QAAQ,CAAC;AAC/B,QAAA,kBAAkB,GAAG,QAAQ,CAAC;AAE9B,QAAA,gBAAgB,GAAG,OAAO,CAAC;AAE3B,QAAA,qBAAqB,GAAG,OAAO,CAAC;AAChC,QAAA,0BAA0B,GAAG,OAAO,CAAC;AAErC,QAAA,0BAA0B,GAAG,QAAQ,CAAC;AACtC,QAAA,+BAA+B,GAAG,OAAO,CAAC;AAE1C,QAAA,qBAAqB,GAAG,OAAO,CAAC;AAChC,QAAA,iBAAiB,GAAG,OAAO,CAAC;AAC5B,QAAA,wBAAwB,GAAG,QAAQ,CAAC;AAEpC,QAAA,yBAAyB,GAAG,QAAQ,CAAC;AACrC,QAAA,0BAA0B,GAAG,OAAO,CAAC;AACrC,QAAA,wBAAwB,GAAG,QAAQ,CAAC;AACpC,QAAA,6BAA6B,GAAG,OAAO,CAAC;AAExC,QAAA,kCAAkC,GAAG,QAAQ,CAAC"}

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.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":";;;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-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"}