@nrwl/react 14.0.0-beta.1 → 14.0.0-beta.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.eslintrc.json +24 -0
- package/package.json +9 -9
- package/src/generators/application/lib/normalize-options.d.ts +2 -0
- package/src/generators/application/lib/normalize-options.js +13 -5
- package/src/generators/application/lib/normalize-options.js.map +1 -1
- package/src/generators/host/files/common/src/app/__fileName__.tsx__tmpl__ +1 -1
- package/src/generators/host/host.js +1 -0
- package/src/generators/host/host.js.map +1 -1
- package/src/generators/host/lib/add-module-federation-files.js +5 -1
- package/src/generators/host/lib/add-module-federation-files.js.map +1 -1
- package/src/generators/host/lib/update-module-federation-e2e-project.js +3 -4
- package/src/generators/host/lib/update-module-federation-e2e-project.js.map +1 -1
- package/src/generators/host/schema.d.ts +2 -0
- package/src/migrations/update-14-0-0/add-default-development-configurations.js +8 -8
- package/src/migrations/update-14-0-0/add-default-development-configurations.js.map +1 -1
- package/src/migrations/update-14-0-0/replace-testing-library-react-hook.js +2 -2
- package/src/migrations/update-14-0-0/replace-testing-library-react-hook.js.map +1 -1
- package/src/migrations/update-14-0-0/update-react-dom-render-for-v18.js +2 -2
- package/src/migrations/update-14-0-0/update-react-dom-render-for-v18.js.map +1 -1
- package/src/module-federation/ast-utils.js +15 -12
- package/src/module-federation/ast-utils.js.map +1 -1
- package/src/module-federation/with-module-federation.js +5 -4
- package/src/module-federation/with-module-federation.js.map +1 -1
- package/src/rules/update-module-federation-project.d.ts +1 -1
- package/src/rules/update-module-federation-project.js +5 -5
- package/src/rules/update-module-federation-project.js.map +1 -1
- package/src/utils/versions.js +1 -1
package/.eslintrc.json
ADDED
|
@@ -0,0 +1,24 @@
|
|
|
1
|
+
{
|
|
2
|
+
"extends": "../../.eslintrc",
|
|
3
|
+
"rules": {},
|
|
4
|
+
"overrides": [
|
|
5
|
+
{
|
|
6
|
+
"files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
|
|
7
|
+
"rules": {}
|
|
8
|
+
},
|
|
9
|
+
{
|
|
10
|
+
"files": ["**/*.ts"],
|
|
11
|
+
"excludedFiles": ["./src/migrations/**"],
|
|
12
|
+
"rules": {
|
|
13
|
+
"no-restricted-imports": [
|
|
14
|
+
"error",
|
|
15
|
+
"@nrwl/workspace",
|
|
16
|
+
"@angular-devkit/core",
|
|
17
|
+
"@angular-devkit/schematics",
|
|
18
|
+
"@angular-devkit/architect"
|
|
19
|
+
]
|
|
20
|
+
}
|
|
21
|
+
}
|
|
22
|
+
],
|
|
23
|
+
"ignorePatterns": ["!**/*"]
|
|
24
|
+
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nrwl/react",
|
|
3
|
-
"version": "14.0.0-beta.
|
|
3
|
+
"version": "14.0.0-beta.4",
|
|
4
4
|
"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.",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -32,14 +32,14 @@
|
|
|
32
32
|
"dependencies": {
|
|
33
33
|
"@babel/core": "^7.15.0",
|
|
34
34
|
"@babel/preset-react": "^7.14.5",
|
|
35
|
-
"@nrwl/cypress": "14.0.0-beta.
|
|
36
|
-
"@nrwl/devkit": "14.0.0-beta.
|
|
37
|
-
"@nrwl/jest": "14.0.0-beta.
|
|
38
|
-
"@nrwl/js": "14.0.0-beta.
|
|
39
|
-
"@nrwl/linter": "14.0.0-beta.
|
|
40
|
-
"@nrwl/storybook": "14.0.0-beta.
|
|
41
|
-
"@nrwl/web": "14.0.0-beta.
|
|
42
|
-
"@nrwl/workspace": "14.0.0-beta.
|
|
35
|
+
"@nrwl/cypress": "14.0.0-beta.4",
|
|
36
|
+
"@nrwl/devkit": "14.0.0-beta.4",
|
|
37
|
+
"@nrwl/jest": "14.0.0-beta.4",
|
|
38
|
+
"@nrwl/js": "14.0.0-beta.4",
|
|
39
|
+
"@nrwl/linter": "14.0.0-beta.4",
|
|
40
|
+
"@nrwl/storybook": "14.0.0-beta.4",
|
|
41
|
+
"@nrwl/web": "14.0.0-beta.4",
|
|
42
|
+
"@nrwl/workspace": "14.0.0-beta.4",
|
|
43
43
|
"@pmmmwh/react-refresh-webpack-plugin": "^0.5.1",
|
|
44
44
|
"@svgr/webpack": "^6.1.2",
|
|
45
45
|
"chalk": "4.1.0",
|
|
@@ -1,3 +1,5 @@
|
|
|
1
1
|
import { NormalizedSchema, Schema } from '../schema';
|
|
2
2
|
import { Tree } from '@nrwl/devkit';
|
|
3
|
+
export declare function normalizeDirectory(options: Schema): string;
|
|
4
|
+
export declare function normalizeProjectName(options: Schema): string;
|
|
3
5
|
export declare function normalizeOptions(host: Tree, options: Schema): NormalizedSchema;
|
|
@@ -1,15 +1,23 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.normalizeOptions = void 0;
|
|
3
|
+
exports.normalizeOptions = exports.normalizeProjectName = exports.normalizeDirectory = void 0;
|
|
4
4
|
const assertion_1 = require("../../../utils/assertion");
|
|
5
5
|
const devkit_1 = require("@nrwl/devkit");
|
|
6
6
|
const find_free_port_1 = require("./find-free-port");
|
|
7
|
-
function
|
|
8
|
-
|
|
9
|
-
const appDirectory = options.directory
|
|
7
|
+
function normalizeDirectory(options) {
|
|
8
|
+
return options.directory
|
|
10
9
|
? `${(0, devkit_1.names)(options.directory).fileName}/${(0, devkit_1.names)(options.name).fileName}`
|
|
11
10
|
: (0, devkit_1.names)(options.name).fileName;
|
|
12
|
-
|
|
11
|
+
}
|
|
12
|
+
exports.normalizeDirectory = normalizeDirectory;
|
|
13
|
+
function normalizeProjectName(options) {
|
|
14
|
+
return normalizeDirectory(options).replace(new RegExp('/', 'g'), '-');
|
|
15
|
+
}
|
|
16
|
+
exports.normalizeProjectName = normalizeProjectName;
|
|
17
|
+
function normalizeOptions(host, options) {
|
|
18
|
+
var _a, _b, _c, _d, _e, _f, _g;
|
|
19
|
+
const appDirectory = normalizeDirectory(options);
|
|
20
|
+
const appProjectName = normalizeProjectName(options);
|
|
13
21
|
const e2eProjectName = `${appProjectName}-e2e`;
|
|
14
22
|
const { appsDir } = (0, devkit_1.getWorkspaceLayout)(host);
|
|
15
23
|
const appProjectRoot = (0, devkit_1.normalizePath)(`${appsDir}/${appDirectory}`);
|
|
@@ -1 +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;AAC9E,qDAAgD;AAEhD,SAAgB,
|
|
1
|
+
{"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,kBAAkB,CAAC,OAAe;IAChD,OAAO,OAAO,CAAC,SAAS;QACtB,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;AACnC,CAAC;AAJD,gDAIC;AAED,SAAgB,oBAAoB,CAAC,OAAe;IAClD,OAAO,kBAAkB,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,IAAI,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,GAAG,CAAC,CAAC;AACxE,CAAC;AAFD,oDAEC;AAED,SAAgB,gBAAgB,CAC9B,IAAU,EACV,OAAe;;IAEf,MAAM,YAAY,GAAG,kBAAkB,CAAC,OAAO,CAAC,CAAC;IACjD,MAAM,cAAc,GAAG,oBAAoB,CAAC,OAAO,CAAC,CAAC;IACrD,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;AA1CD,4CA0CC"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import * as React from 'react';
|
|
2
2
|
import NxWelcome from "./nx-welcome";
|
|
3
|
-
<% if (remotes.length > 0) { %>
|
|
4
3
|
import { Link, Route, Routes } from 'react-router-dom';
|
|
5
4
|
|
|
5
|
+
<% if (remotes.length > 0) { %>
|
|
6
6
|
<% remotes.forEach(function(r) { %>
|
|
7
7
|
const <%= r.className %> = React.lazy(() => import('<%= r.fileName %>/Module'));
|
|
8
8
|
<% }); %>
|
|
@@ -22,6 +22,7 @@ function hostGenerator(host, schema) {
|
|
|
22
22
|
remotesWithPorts.push({ name: remote, port: remotePort });
|
|
23
23
|
yield (0, remote_1.default)(host, {
|
|
24
24
|
name: remote,
|
|
25
|
+
directory: options.directory,
|
|
25
26
|
style: options.style,
|
|
26
27
|
skipFormat: options.skipFormat,
|
|
27
28
|
unitTestRunner: options.unitTestRunner,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"host.js","sourceRoot":"","sources":["../../../../../../packages/react/src/generators/host/host.ts"],"names":[],"mappings":";;;;AAAA,yCAAiD;AAEjD,4DAA8D;AAC9D,
|
|
1
|
+
{"version":3,"file":"host.js","sourceRoot":"","sources":["../../../../../../packages/react/src/generators/host/host.ts"],"names":[],"mappings":";;;;AAAA,yCAAiD;AAEjD,4DAA8D;AAC9D,4EAG8C;AAC9C,mGAA6F;AAC7F,mFAA6E;AAC7E,qGAA8F;AAE9F,6CAA+C;AAE/C,SAAsB,aAAa,CAAC,IAAU,EAAE,MAAc;;QAC5D,MAAM,OAAO,GAAG,IAAA,oCAAgB,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAE/C,MAAM,QAAQ,GAAG,MAAM,IAAA,qBAAoB,EAAC,IAAI,kCAC3C,OAAO;YACV,sFAAsF;YACtF,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,gBAAe,EAAC,IAAI,EAAE;oBAC1B,IAAI,EAAE,MAAM;oBACZ,SAAS,EAAE,OAAO,CAAC,SAAS;oBAC5B,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,sDAAwB,EAAC,IAAI,EAAE,OAAO,EAAE,gBAAgB,CAAC,CAAC;QAC1D,IAAA,gEAA6B,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAC7C,IAAA,uEAAgC,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAEhD,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;YACvB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;QAED,OAAO,QAAQ,CAAC;IAClB,CAAC;CAAA;AAtCD,sCAsCC;AAED,kBAAe,aAAa,CAAC"}
|
|
@@ -3,8 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.addModuleFederationFiles = void 0;
|
|
4
4
|
const devkit_1 = require("@nrwl/devkit");
|
|
5
5
|
const path_1 = require("path");
|
|
6
|
+
const normalize_options_1 = require("../../application/lib/normalize-options");
|
|
6
7
|
function addModuleFederationFiles(host, options, defaultRemoteManifest) {
|
|
7
|
-
const templateVariables = Object.assign(Object.assign(Object.assign({}, (0, devkit_1.names)(options.name)), options), { tmpl: '', remotes: defaultRemoteManifest.map(({ name, port }) =>
|
|
8
|
+
const templateVariables = Object.assign(Object.assign(Object.assign({}, (0, devkit_1.names)(options.name)), options), { tmpl: '', remotes: defaultRemoteManifest.map(({ name, port }) => {
|
|
9
|
+
const remote = (0, normalize_options_1.normalizeProjectName)(Object.assign(Object.assign({}, options), { name }));
|
|
10
|
+
return Object.assign(Object.assign({}, (0, devkit_1.names)(remote)), { port });
|
|
11
|
+
}) });
|
|
8
12
|
// Module federation requires bootstrap code to be dynamically imported.
|
|
9
13
|
// Renaming original entry file so we can use `import(./bootstrap)` in
|
|
10
14
|
// new entry file.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add-module-federation-files.js","sourceRoot":"","sources":["../../../../../../../packages/react/src/generators/host/lib/add-module-federation-files.ts"],"names":[],"mappings":";;;AACA,yCAAoD;AACpD,+BAA4B;
|
|
1
|
+
{"version":3,"file":"add-module-federation-files.js","sourceRoot":"","sources":["../../../../../../../packages/react/src/generators/host/lib/add-module-federation-files.ts"],"names":[],"mappings":";;;AACA,yCAAoD;AACpD,+BAA4B;AAC5B,+EAA+E;AAE/E,SAAgB,wBAAwB,CACtC,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;YACpD,MAAM,MAAM,GAAG,IAAA,wCAAoB,kCAAM,OAAO,KAAE,IAAI,IAAG,CAAC;YAC1D,uCACK,IAAA,cAAK,EAAC,MAAM,CAAC,KAChB,IAAI,IACJ;QACJ,CAAC,CAAC,GACH,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,4BAA4B,CAAC,EAC7C,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;AAxCD,4DAwCC"}
|
|
@@ -3,11 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.updateModuleFederationE2eProject = void 0;
|
|
4
4
|
const devkit_1 = require("@nrwl/devkit");
|
|
5
5
|
function updateModuleFederationE2eProject(host, options) {
|
|
6
|
-
const e2eName = `${options.name}-e2e`;
|
|
7
6
|
try {
|
|
8
|
-
let projectConfig = (0, devkit_1.readProjectConfiguration)(host,
|
|
9
|
-
projectConfig.targets.e2e.options = Object.assign(Object.assign({}, projectConfig.targets.e2e.options), { baseUrl:
|
|
10
|
-
(0, devkit_1.updateProjectConfiguration)(host,
|
|
7
|
+
let projectConfig = (0, devkit_1.readProjectConfiguration)(host, options.e2eProjectName);
|
|
8
|
+
projectConfig.targets.e2e.options = Object.assign(Object.assign({}, projectConfig.targets.e2e.options), { baseUrl: `http://localhost:${options.devServerPort}` });
|
|
9
|
+
(0, devkit_1.updateProjectConfiguration)(host, options.e2eProjectName, projectConfig);
|
|
11
10
|
}
|
|
12
11
|
catch (_a) {
|
|
13
12
|
// nothing
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-module-federation-e2e-project.js","sourceRoot":"","sources":["../../../../../../../packages/react/src/generators/host/lib/update-module-federation-e2e-project.ts"],"names":[],"mappings":";;;AACA,yCAIsB;AAEtB,SAAgB,gCAAgC,CAC9C,IAAU,EACV,OAAyB;IAEzB,
|
|
1
|
+
{"version":3,"file":"update-module-federation-e2e-project.js","sourceRoot":"","sources":["../../../../../../../packages/react/src/generators/host/lib/update-module-federation-e2e-project.ts"],"names":[],"mappings":";;;AACA,yCAIsB;AAEtB,SAAgB,gCAAgC,CAC9C,IAAU,EACV,OAAyB;IAEzB,IAAI;QACF,IAAI,aAAa,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,cAAc,CAAC,CAAC;QAC3E,aAAa,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,mCAC5B,aAAa,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,KACpC,OAAO,EAAE,oBAAoB,OAAO,CAAC,aAAa,EAAE,GACrD,CAAC;QACF,IAAA,mCAA0B,EAAC,IAAI,EAAE,OAAO,CAAC,cAAc,EAAE,aAAa,CAAC,CAAC;KACzE;IAAC,WAAM;QACN,UAAU;KACX;AACH,CAAC;AAdD,4EAcC"}
|
|
@@ -7,23 +7,23 @@ function update(tree) {
|
|
|
7
7
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
8
8
|
const projects = (0, devkit_1.getProjects)(tree);
|
|
9
9
|
projects.forEach((config, name) => {
|
|
10
|
-
var _a, _b, _c, _d, _e, _f;
|
|
11
|
-
var
|
|
10
|
+
var _a, _b, _c, _d, _e, _f, _g, _h;
|
|
11
|
+
var _j, _k, _l, _m;
|
|
12
12
|
let shouldUpdate = false;
|
|
13
|
-
if (((_a = config.targets
|
|
13
|
+
if (((_b = (_a = config.targets) === null || _a === void 0 ? void 0 : _a.build) === null || _b === void 0 ? void 0 : _b.executor) === '@nrwl/web:webpack') {
|
|
14
14
|
shouldUpdate = true;
|
|
15
|
-
(
|
|
16
|
-
(
|
|
15
|
+
(_c = (_j = config.targets.build).defaultConfiguration) !== null && _c !== void 0 ? _c : (_j.defaultConfiguration = 'production');
|
|
16
|
+
(_d = (_k = config.targets.build.configurations).development) !== null && _d !== void 0 ? _d : (_k.development = {
|
|
17
17
|
extractLicenses: false,
|
|
18
18
|
optimization: false,
|
|
19
19
|
sourceMap: true,
|
|
20
20
|
vendorChunk: true,
|
|
21
21
|
});
|
|
22
22
|
}
|
|
23
|
-
if (((
|
|
23
|
+
if (((_f = (_e = config.targets) === null || _e === void 0 ? void 0 : _e.serve) === null || _f === void 0 ? void 0 : _f.executor) === '@nrwl/web:dev-server') {
|
|
24
24
|
shouldUpdate = true;
|
|
25
|
-
(
|
|
26
|
-
(
|
|
25
|
+
(_g = (_l = config.targets.serve).defaultConfiguration) !== null && _g !== void 0 ? _g : (_l.defaultConfiguration = 'development');
|
|
26
|
+
(_h = (_m = config.targets.serve.configurations).development) !== null && _h !== void 0 ? _h : (_m.development = {
|
|
27
27
|
buildTarget: `${name}:build:development`,
|
|
28
28
|
});
|
|
29
29
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add-default-development-configurations.js","sourceRoot":"","sources":["../../../../../../packages/react/src/migrations/update-14-0-0/add-default-development-configurations.ts"],"names":[],"mappings":";;;;AAAA,yCAKsB;AAEtB,SAAsB,MAAM,CAAC,IAAU;;QACrC,MAAM,QAAQ,GAAG,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;QAEnC,QAAQ,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,IAAI,EAAE,EAAE;;;YAChC,IAAI,YAAY,GAAG,KAAK,CAAC;YACzB,IAAI,CAAA,MAAA,MAAM,CAAC,OAAO,
|
|
1
|
+
{"version":3,"file":"add-default-development-configurations.js","sourceRoot":"","sources":["../../../../../../packages/react/src/migrations/update-14-0-0/add-default-development-configurations.ts"],"names":[],"mappings":";;;;AAAA,yCAKsB;AAEtB,SAAsB,MAAM,CAAC,IAAU;;QACrC,MAAM,QAAQ,GAAG,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;QAEnC,QAAQ,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,IAAI,EAAE,EAAE;;;YAChC,IAAI,YAAY,GAAG,KAAK,CAAC;YACzB,IAAI,CAAA,MAAA,MAAA,MAAM,CAAC,OAAO,0CAAE,KAAK,0CAAE,QAAQ,MAAK,mBAAmB,EAAE;gBAC3D,YAAY,GAAG,IAAI,CAAC;gBACpB,YAAA,MAAM,CAAC,OAAO,CAAC,KAAK,EAAC,oBAAoB,uCAApB,oBAAoB,GAAK,YAAY,EAAC;gBAC3D,YAAA,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,cAAc,EAAC,WAAW,uCAAX,WAAW,GAAK;oBAClD,eAAe,EAAE,KAAK;oBACtB,YAAY,EAAE,KAAK;oBACnB,SAAS,EAAE,IAAI;oBACf,WAAW,EAAE,IAAI;iBAClB,EAAC;aACH;YAED,IAAI,CAAA,MAAA,MAAA,MAAM,CAAC,OAAO,0CAAE,KAAK,0CAAE,QAAQ,MAAK,sBAAsB,EAAE;gBAC9D,YAAY,GAAG,IAAI,CAAC;gBACpB,YAAA,MAAM,CAAC,OAAO,CAAC,KAAK,EAAC,oBAAoB,uCAApB,oBAAoB,GAAK,aAAa,EAAC;gBAC5D,YAAA,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,cAAc,EAAC,WAAW,uCAAX,WAAW,GAAK;oBAClD,WAAW,EAAE,GAAG,IAAI,oBAAoB;iBACzC,EAAC;aACH;YAED,IAAI,YAAY;gBAAE,IAAA,mCAA0B,EAAC,IAAI,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;QACnE,CAAC,CAAC,CAAC;QAEH,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;CAAA;AA5BD,wBA4BC;AAED,kBAAe,MAAM,CAAC"}
|
|
@@ -7,8 +7,8 @@ function update(tree) {
|
|
|
7
7
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
8
8
|
const projects = (0, devkit_1.getProjects)(tree);
|
|
9
9
|
projects.forEach((config) => {
|
|
10
|
-
var _a;
|
|
11
|
-
if (((_a = config.targets
|
|
10
|
+
var _a, _b;
|
|
11
|
+
if (((_b = (_a = config.targets) === null || _a === void 0 ? void 0 : _a.test) === null || _b === void 0 ? void 0 : _b.executor) !== '@nrwl/jest:jest')
|
|
12
12
|
return;
|
|
13
13
|
(0, devkit_1.visitNotIgnoredFiles)(tree, config.sourceRoot, (file) => {
|
|
14
14
|
if (!file.endsWith('.spec.ts'))
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"replace-testing-library-react-hook.js","sourceRoot":"","sources":["../../../../../../packages/react/src/migrations/update-14-0-0/replace-testing-library-react-hook.ts"],"names":[],"mappings":";;;;AAAA,yCAKsB;AAEtB,SAAsB,MAAM,CAAC,IAAU;;QACrC,MAAM,QAAQ,GAAG,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;QACnC,QAAQ,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;;YAC1B,IAAI,CAAA,MAAA,MAAM,CAAC,OAAO,
|
|
1
|
+
{"version":3,"file":"replace-testing-library-react-hook.js","sourceRoot":"","sources":["../../../../../../packages/react/src/migrations/update-14-0-0/replace-testing-library-react-hook.ts"],"names":[],"mappings":";;;;AAAA,yCAKsB;AAEtB,SAAsB,MAAM,CAAC,IAAU;;QACrC,MAAM,QAAQ,GAAG,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;QACnC,QAAQ,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;;YAC1B,IAAI,CAAA,MAAA,MAAA,MAAM,CAAC,OAAO,0CAAE,IAAI,0CAAE,QAAQ,MAAK,iBAAiB;gBAAE,OAAO;YAEjE,IAAA,6BAAoB,EAAC,IAAI,EAAE,MAAM,CAAC,UAAU,EAAE,CAAC,IAAI,EAAE,EAAE;gBACrD,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC;oBAAE,OAAO;gBAEvC,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,CAAC;gBAC3C,IAAI,OAAO,CAAC,QAAQ,CAAC,6BAA6B,CAAC,EAAE;oBACnD,IAAI,CAAC,KAAK,CACR,IAAI,EACJ,OAAO,CAAC,OAAO,CACb,+BAA+B,EAC/B,wBAAwB,CACzB,CACF,CAAC;iBACH;YACH,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,IAAA,0CAAiC,EAC/B,IAAI,EACJ,CAAC,8BAA8B,CAAC,EAChC,CAAC,8BAA8B,CAAC,CACjC,CAAC;IACJ,CAAC;CAAA;AA1BD,wBA0BC;AAED,kBAAe,MAAM,CAAC"}
|
|
@@ -9,8 +9,8 @@ function update(tree) {
|
|
|
9
9
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
10
10
|
const projects = (0, devkit_1.getProjects)(tree);
|
|
11
11
|
projects.forEach((config, name) => {
|
|
12
|
-
var _a;
|
|
13
|
-
const isReactProject = ((_a = config.targets
|
|
12
|
+
var _a, _b;
|
|
13
|
+
const isReactProject = ((_b = (_a = config.targets) === null || _a === void 0 ? void 0 : _a.build) === null || _b === void 0 ? void 0 : _b.executor) === '@nrwl/web:webpack' &&
|
|
14
14
|
/main\.(t|j)sx?$/.test(config.targets.build.options.main);
|
|
15
15
|
if (isReactProject) {
|
|
16
16
|
const sourcePath = config.targets.build.options.main;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-react-dom-render-for-v18.js","sourceRoot":"","sources":["../../../../../../packages/react/src/migrations/update-14-0-0/update-react-dom-render-for-v18.ts"],"names":[],"mappings":";;;;AAAA,yCAQsB;AACtB,oFAAgF;AAChF,iCAAiC;AAEjC,SAAsB,MAAM,CAAC,IAAU;;QACrC,MAAM,QAAQ,GAAG,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;QAEnC,QAAQ,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,IAAI,EAAE,EAAE;;YAChC,MAAM,cAAc,GAClB,CAAA,MAAA,MAAM,CAAC,OAAO,
|
|
1
|
+
{"version":3,"file":"update-react-dom-render-for-v18.js","sourceRoot":"","sources":["../../../../../../packages/react/src/migrations/update-14-0-0/update-react-dom-render-for-v18.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,20 +10,23 @@ function addRemoteToConfig(source, app) {
|
|
|
10
10
|
const remotesAssignment = assignments.find((s) => s.name.getText() === 'remotes');
|
|
11
11
|
if (remotesAssignment) {
|
|
12
12
|
const arrayExpression = remotesAssignment.initializer;
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
13
|
+
if (!arrayExpression.elements)
|
|
14
|
+
return [];
|
|
15
|
+
const lastElement = arrayExpression.elements[arrayExpression.elements.length - 1];
|
|
16
|
+
return [
|
|
17
|
+
lastElement
|
|
18
|
+
? {
|
|
16
19
|
type: devkit_1.ChangeType.Insert,
|
|
17
|
-
index:
|
|
20
|
+
index: lastElement.end,
|
|
18
21
|
text: `,`,
|
|
19
|
-
}
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
}
|
|
25
|
-
|
|
26
|
-
|
|
22
|
+
}
|
|
23
|
+
: null,
|
|
24
|
+
{
|
|
25
|
+
type: devkit_1.ChangeType.Insert,
|
|
26
|
+
index: remotesAssignment.end - 1,
|
|
27
|
+
text: `'${app}',\n`,
|
|
28
|
+
},
|
|
29
|
+
].filter(Boolean);
|
|
27
30
|
}
|
|
28
31
|
const binaryExpressions = (0, find_nodes_1.findNodes)(source, ts.SyntaxKind.BinaryExpression);
|
|
29
32
|
const exportExpression = binaryExpressions.find((b) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ast-utils.js","sourceRoot":"","sources":["../../../../../packages/react/src/module-federation/ast-utils.ts"],"names":[],"mappings":";;;AAAA,iCAAiC;AACjC,yCAAwD;AACxD,oFAAgF;AAChF,kDAI4B;AAE5B,SAAgB,iBAAiB,CAC/B,MAAqB,EACrB,GAAW;IAEX,MAAM,WAAW,GAAG,IAAA,sBAAS,EAC3B,MAAM,EACN,EAAE,CAAC,UAAU,CAAC,kBAAkB,CACN,CAAC;IAE7B,MAAM,iBAAiB,GAAG,WAAW,CAAC,IAAI,CACxC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,SAAS,CACtC,CAAC;IAEF,IAAI,iBAAiB,EAAE;QACrB,MAAM,eAAe,GACnB,iBAAiB,CAAC,WAAwC,CAAC;QAE7D,
|
|
1
|
+
{"version":3,"file":"ast-utils.js","sourceRoot":"","sources":["../../../../../packages/react/src/module-federation/ast-utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -93,16 +93,13 @@ function determineRemoteUrl(remote) {
|
|
|
93
93
|
}
|
|
94
94
|
const host = (_d = (_c = serveTarget.options) === null || _c === void 0 ? void 0 : _c.host) !== null && _d !== void 0 ? _d : '//localhost';
|
|
95
95
|
const port = (_f = (_e = serveTarget.options) === null || _e === void 0 ? void 0 : _e.port) !== null && _f !== void 0 ? _f : 4201;
|
|
96
|
-
return `${
|
|
96
|
+
return `${host.endsWith('/') ? host.slice(0, -1) : host}:${port}/remoteEntry.js`;
|
|
97
97
|
}
|
|
98
98
|
function mapRemotes(remotes) {
|
|
99
99
|
const mappedRemotes = {};
|
|
100
100
|
for (const remote of remotes) {
|
|
101
101
|
if (Array.isArray(remote)) {
|
|
102
102
|
let [remoteName, remoteLocation] = remote;
|
|
103
|
-
if (!remoteLocation.includes('@')) {
|
|
104
|
-
remoteLocation = `${remoteName}@${remoteLocation}`;
|
|
105
|
-
}
|
|
106
103
|
if (!remoteLocation.match(/remoteEntry\.(js|mjs)$/)) {
|
|
107
104
|
remoteLocation = `${remoteLocation.endsWith('/')
|
|
108
105
|
? remoteLocation.slice(0, -1)
|
|
@@ -149,11 +146,15 @@ function withModuleFederation(options) {
|
|
|
149
146
|
runtimeChunk: false,
|
|
150
147
|
minimize: false,
|
|
151
148
|
};
|
|
149
|
+
config.experiments = Object.assign(Object.assign({}, config.experiments), { outputModule: true });
|
|
152
150
|
const mappedRemotes = !options.remotes || options.remotes.length === 0
|
|
153
151
|
? {}
|
|
154
152
|
: mapRemotes(options.remotes);
|
|
155
153
|
config.plugins.push(new ModuleFederationPlugin({
|
|
156
154
|
name: options.name,
|
|
155
|
+
library: {
|
|
156
|
+
type: 'module',
|
|
157
|
+
},
|
|
157
158
|
filename: 'remoteEntry.js',
|
|
158
159
|
exposes: options.exposes,
|
|
159
160
|
remotes: mappedRemotes,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"with-module-federation.js","sourceRoot":"","sources":["../../../../../packages/react/src/module-federation/with-module-federation.ts"],"names":[],"mappings":";;;;AAAA,mDAAyE;AACzE,yCAMsB;AACtB,yEAGkD;AAElD,gEAAoE;
|
|
1
|
+
{"version":3,"file":"with-module-federation.js","sourceRoot":"","sources":["../../../../../packages/react/src/module-federation/with-module-federation.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.updateModuleFederationProject = void 0;
|
|
4
4
|
const devkit_1 = require("@nrwl/devkit");
|
|
5
5
|
function updateModuleFederationProject(host, options) {
|
|
6
|
-
const projectConfig = (0, devkit_1.readProjectConfiguration)(host, options.
|
|
6
|
+
const projectConfig = (0, devkit_1.readProjectConfiguration)(host, options.projectName);
|
|
7
7
|
projectConfig.targets.build.options = Object.assign(Object.assign({}, projectConfig.targets.build.options), { main: `${options.appProjectRoot}/src/main.ts`, webpackConfig: `${options.appProjectRoot}/webpack.config.js` });
|
|
8
8
|
projectConfig.targets.build.configurations.production = Object.assign(Object.assign({}, projectConfig.targets.build.configurations.production), { webpackConfig: `${options.appProjectRoot}/webpack.config.prod.js` });
|
|
9
9
|
projectConfig.targets.serve.executor =
|
|
@@ -14,19 +14,19 @@ function updateModuleFederationProject(host, options) {
|
|
|
14
14
|
executor: '@nrwl/web:file-server',
|
|
15
15
|
defaultConfiguration: 'development',
|
|
16
16
|
options: {
|
|
17
|
-
buildTarget: `${options.
|
|
17
|
+
buildTarget: `${options.projectName}:build`,
|
|
18
18
|
port: options.devServerPort,
|
|
19
19
|
},
|
|
20
20
|
configurations: {
|
|
21
21
|
development: {
|
|
22
|
-
buildTarget: `${options.
|
|
22
|
+
buildTarget: `${options.projectName}:build:development`,
|
|
23
23
|
},
|
|
24
24
|
production: {
|
|
25
|
-
buildTarget: `${options.
|
|
25
|
+
buildTarget: `${options.projectName}:build:production`,
|
|
26
26
|
},
|
|
27
27
|
},
|
|
28
28
|
};
|
|
29
|
-
(0, devkit_1.updateProjectConfiguration)(host, options.
|
|
29
|
+
(0, devkit_1.updateProjectConfiguration)(host, options.projectName, projectConfig);
|
|
30
30
|
}
|
|
31
31
|
exports.updateModuleFederationProject = updateModuleFederationProject;
|
|
32
32
|
//# sourceMappingURL=update-module-federation-project.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-module-federation-project.js","sourceRoot":"","sources":["../../../../../packages/react/src/rules/update-module-federation-project.ts"],"names":[],"mappings":";;;AAAA,yCAIsB;AAEtB,SAAgB,6BAA6B,CAC3C,IAAU,EACV,
|
|
1
|
+
{"version":3,"file":"update-module-federation-project.js","sourceRoot":"","sources":["../../../../../packages/react/src/rules/update-module-federation-project.ts"],"names":[],"mappings":";;;AAAA,yCAIsB;AAEtB,SAAgB,6BAA6B,CAC3C,IAAU,EACV,OAIC;IAED,MAAM,aAAa,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC;IAE1E,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;IAEF,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;IAEF,aAAa,CAAC,OAAO,CAAC,KAAK,CAAC,QAAQ;QAClC,0CAA0C,CAAC;IAC7C,aAAa,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,GAAG,OAAO,CAAC,aAAa,CAAC;IAEjE,uEAAuE;IACvE,aAAa,CAAC,OAAO,CAAC,cAAc,CAAC,GAAG;QACtC,QAAQ,EAAE,uBAAuB;QACjC,oBAAoB,EAAE,aAAa;QACnC,OAAO,EAAE;YACP,WAAW,EAAE,GAAG,OAAO,CAAC,WAAW,QAAQ;YAC3C,IAAI,EAAE,OAAO,CAAC,aAAa;SAC5B;QACD,cAAc,EAAE;YACd,WAAW,EAAE;gBACX,WAAW,EAAE,GAAG,OAAO,CAAC,WAAW,oBAAoB;aACxD;YACD,UAAU,EAAE;gBACV,WAAW,EAAE,GAAG,OAAO,CAAC,WAAW,mBAAmB;aACvD;SACF;KACF,CAAC;IAEF,IAAA,mCAA0B,EAAC,IAAI,EAAE,OAAO,CAAC,WAAW,EAAE,aAAa,CAAC,CAAC;AACvE,CAAC;AA5CD,sEA4CC"}
|
package/src/utils/versions.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.babelPluginStyledComponentsVersion = exports.eslintPluginReactHooksVersion = exports.eslintPluginReactVersion = exports.eslintPluginJsxA11yVersion = exports.eslintPluginImportVersion = exports.reactTestRendererVersion = exports.reactReduxVersion = exports.reduxjsToolkitVersion = exports.testingLibraryReactVersion = exports.typesReactRouterDomVersion = exports.reactRouterDomVersion = exports.styledJsxVersion = exports.emotionBabelPlugin = exports.emotionReactVersion = exports.emotionStyledVersion = exports.typesStyledComponentsVersion = exports.styledComponentsVersion = exports.typesNodeVersion = exports.typesReactIsVersion = exports.typesReactDomVersion = exports.typesReactVersion = exports.reactIsVersion = exports.reactDomVersion = exports.reactVersion = exports.nxVersion = void 0;
|
|
4
|
-
exports.nxVersion = '14.0.0-beta.
|
|
4
|
+
exports.nxVersion = '14.0.0-beta.4';
|
|
5
5
|
exports.reactVersion = '18.0.0';
|
|
6
6
|
exports.reactDomVersion = '18.0.0';
|
|
7
7
|
exports.reactIsVersion = '18.0.0';
|