@nx/react 16.3.0-beta.0 → 16.3.0-beta.11
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/migrations.json +21 -2
- package/package.json +8 -8
- package/src/executors/module-federation-dev-server/module-federation-dev-server.impl.d.ts +3 -3
- package/src/executors/module-federation-dev-server/module-federation-dev-server.impl.js +75 -23
- package/src/executors/module-federation-dev-server/module-federation-dev-server.impl.js.map +1 -1
- package/src/generators/application/lib/add-routing.js +1 -1
- package/src/generators/application/lib/add-routing.js.map +1 -1
- package/src/generators/application/schema.json +2 -3
- package/src/generators/component/component.js +1 -1
- package/src/generators/component/component.js.map +1 -1
- package/src/generators/library/lib/update-app-routes.js +3 -1
- package/src/generators/library/lib/update-app-routes.js.map +1 -1
- package/src/generators/redux/files/__directory__/__fileName__.slice.spec.ts__tmpl__ +10 -7
- package/src/generators/redux/files/__directory__/__fileName__.slice.ts__tmpl__ +3 -3
- package/src/migrations/update-16-3-0/remove-types-react-router-dom-package.d.ts +2 -0
- package/src/migrations/update-16-3-0/remove-types-react-router-dom-package.js +12 -0
- package/src/migrations/update-16-3-0/remove-types-react-router-dom-package.js.map +1 -0
- package/src/utils/versions.d.ts +2 -3
- package/src/utils/versions.js +3 -4
- package/src/utils/versions.js.map +1 -1
package/migrations.json
CHANGED
|
@@ -95,6 +95,12 @@
|
|
|
95
95
|
"version": "16.2.0-beta.0",
|
|
96
96
|
"description": "Remove react-test-renderer from package.json",
|
|
97
97
|
"implementation": "./src/migrations/update-16-2-0-remove-package/update-16-2-0-remove-package"
|
|
98
|
+
},
|
|
99
|
+
"remove-types-react-router-dom": {
|
|
100
|
+
"cli": "nx",
|
|
101
|
+
"version": "16.3.0-beta.2",
|
|
102
|
+
"description": "Remove @types/react-router-dom from package.json",
|
|
103
|
+
"implementation": "./src/migrations/update-16-3-0/remove-types-react-router-dom-package"
|
|
98
104
|
}
|
|
99
105
|
},
|
|
100
106
|
"packageJsonUpdates": {
|
|
@@ -799,8 +805,8 @@
|
|
|
799
805
|
}
|
|
800
806
|
}
|
|
801
807
|
},
|
|
802
|
-
"
|
|
803
|
-
"version": "
|
|
808
|
+
"15.8.0": {
|
|
809
|
+
"version": "15.8.0-beta.0",
|
|
804
810
|
"packages": {
|
|
805
811
|
"@types/react": {
|
|
806
812
|
"version": "18.0.28",
|
|
@@ -871,6 +877,19 @@
|
|
|
871
877
|
"alwaysAddToPackageJson": false
|
|
872
878
|
}
|
|
873
879
|
}
|
|
880
|
+
},
|
|
881
|
+
"16.3.0": {
|
|
882
|
+
"version": "16.3.0-beta.2",
|
|
883
|
+
"packages": {
|
|
884
|
+
"react-router-dom": {
|
|
885
|
+
"version": "6.11.2",
|
|
886
|
+
"alwaysAddToPackageJson": false
|
|
887
|
+
},
|
|
888
|
+
"@svgr/rollup": {
|
|
889
|
+
"version": "^8.0.1",
|
|
890
|
+
"alwaysAddToPackageJson": false
|
|
891
|
+
}
|
|
892
|
+
}
|
|
874
893
|
}
|
|
875
894
|
}
|
|
876
895
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nx/react",
|
|
3
|
-
"version": "16.3.0-beta.
|
|
3
|
+
"version": "16.3.0-beta.11",
|
|
4
4
|
"private": false,
|
|
5
5
|
"description": "The React plugin for Nx 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.",
|
|
6
6
|
"repository": {
|
|
@@ -31,13 +31,13 @@
|
|
|
31
31
|
"migrations": "./migrations.json"
|
|
32
32
|
},
|
|
33
33
|
"dependencies": {
|
|
34
|
-
"@nrwl/react": "16.3.0-beta.
|
|
35
|
-
"@nx/devkit": "16.3.0-beta.
|
|
36
|
-
"@nx/js": "16.3.0-beta.
|
|
37
|
-
"@nx/linter": "16.3.0-beta.
|
|
38
|
-
"@nx/web": "16.3.0-beta.
|
|
34
|
+
"@nrwl/react": "16.3.0-beta.11",
|
|
35
|
+
"@nx/devkit": "16.3.0-beta.11",
|
|
36
|
+
"@nx/js": "16.3.0-beta.11",
|
|
37
|
+
"@nx/linter": "16.3.0-beta.11",
|
|
38
|
+
"@nx/web": "16.3.0-beta.11",
|
|
39
39
|
"@phenomnomnominal/tsquery": "~5.0.1",
|
|
40
|
-
"@svgr/webpack": "^
|
|
40
|
+
"@svgr/webpack": "^8.0.1",
|
|
41
41
|
"chalk": "^4.1.0",
|
|
42
42
|
"file-loader": "^6.2.0",
|
|
43
43
|
"minimatch": "3.0.5"
|
|
@@ -46,5 +46,5 @@
|
|
|
46
46
|
"access": "public"
|
|
47
47
|
},
|
|
48
48
|
"types": "./index.d.ts",
|
|
49
|
-
"gitHead": "
|
|
49
|
+
"gitHead": "6b9d24c7b65961c10ba21f1e62ffe06477d02394"
|
|
50
50
|
}
|
|
@@ -4,8 +4,8 @@ type ModuleFederationDevServerOptions = WebDevServerOptions & {
|
|
|
4
4
|
devRemotes?: string | string[];
|
|
5
5
|
skipRemotes?: string[];
|
|
6
6
|
};
|
|
7
|
-
export default function moduleFederationDevServer(options: ModuleFederationDevServerOptions, context: ExecutorContext):
|
|
8
|
-
baseUrl: string;
|
|
7
|
+
export default function moduleFederationDevServer(options: ModuleFederationDevServerOptions, context: ExecutorContext): AsyncIterableIterator<{
|
|
9
8
|
success: boolean;
|
|
10
|
-
|
|
9
|
+
baseUrl?: string;
|
|
10
|
+
}>;
|
|
11
11
|
export {};
|
|
@@ -4,12 +4,15 @@ const tslib_1 = require("tslib");
|
|
|
4
4
|
const devkit_1 = require("@nx/devkit");
|
|
5
5
|
const dev_server_impl_1 = require("@nx/webpack/src/executors/dev-server/dev-server.impl");
|
|
6
6
|
const path_1 = require("path");
|
|
7
|
-
const chalk = require("chalk");
|
|
8
7
|
const async_iterable_1 = require("@nx/devkit/src/utils/async-iterable");
|
|
8
|
+
const chalk = require("chalk");
|
|
9
|
+
const wait_for_port_open_1 = require("@nx/web/src/utils/wait-for-port-open");
|
|
10
|
+
const find_matching_projects_1 = require("nx/src/utils/find-matching-projects");
|
|
11
|
+
const child_process_1 = require("child_process");
|
|
9
12
|
function moduleFederationDevServer(options, context) {
|
|
10
13
|
var _a, _b;
|
|
11
14
|
return tslib_1.__asyncGenerator(this, arguments, function* moduleFederationDevServer_1() {
|
|
12
|
-
|
|
15
|
+
const currIter = (0, dev_server_impl_1.default)(options, context);
|
|
13
16
|
const p = context.projectsConfigurations.projects[context.projectName];
|
|
14
17
|
const moduleFederationConfigPath = (0, path_1.join)(context.root, p.root, 'module-federation.config.js');
|
|
15
18
|
let moduleFederationConfig;
|
|
@@ -17,38 +20,87 @@ function moduleFederationDevServer(options, context) {
|
|
|
17
20
|
moduleFederationConfig = require(moduleFederationConfigPath);
|
|
18
21
|
}
|
|
19
22
|
catch (_c) {
|
|
20
|
-
|
|
21
|
-
throw new Error(`Could not load ${moduleFederationConfigPath}. Was this project generated with "@nx/react:host"?`);
|
|
23
|
+
throw new Error(`Could not load ${moduleFederationConfigPath}. Was this project generated with "@nx/react:host"?\nSee: https://nx.dev/recipes/module-federation/faster-builds`);
|
|
22
24
|
}
|
|
23
|
-
const remotesToSkip = new Set((_a = options.skipRemotes) !== null && _a !== void 0 ? _a : []);
|
|
25
|
+
const remotesToSkip = new Set((0, find_matching_projects_1.findMatchingProjects)((_a = options.skipRemotes) !== null && _a !== void 0 ? _a : [], context.projectGraph.nodes));
|
|
24
26
|
const knownRemotes = ((_b = moduleFederationConfig.remotes) !== null && _b !== void 0 ? _b : []).filter((r) => {
|
|
25
27
|
const validRemote = Array.isArray(r) ? r[0] : r;
|
|
26
28
|
return !remotesToSkip.has(validRemote);
|
|
27
29
|
});
|
|
30
|
+
const remotePorts = knownRemotes.map((r) => context.projectGraph.nodes[r].data.targets['serve'].options.port);
|
|
28
31
|
const devServeApps = !options.devRemotes
|
|
29
32
|
? []
|
|
30
33
|
: Array.isArray(options.devRemotes)
|
|
31
|
-
? options.devRemotes
|
|
32
|
-
: [options.devRemotes];
|
|
34
|
+
? (0, find_matching_projects_1.findMatchingProjects)(options.devRemotes, context.projectGraph.nodes)
|
|
35
|
+
: (0, find_matching_projects_1.findMatchingProjects)([options.devRemotes], context.projectGraph.nodes);
|
|
36
|
+
devkit_1.logger.info(`NX Starting module federation dev-server for ${chalk.bold(context.projectName)} with ${knownRemotes.length} remotes`);
|
|
37
|
+
const nxBin = require.resolve('nx');
|
|
38
|
+
const devRemoteIters = [];
|
|
39
|
+
let isCollectingStaticRemoteOutput = true;
|
|
33
40
|
for (const app of knownRemotes) {
|
|
34
|
-
const
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
41
|
+
const appName = Array.isArray(app) ? app[0] : app;
|
|
42
|
+
if (devServeApps.includes(appName)) {
|
|
43
|
+
devRemoteIters.push(yield tslib_1.__await((0, devkit_1.runExecutor)({
|
|
44
|
+
project: appName,
|
|
45
|
+
target: 'serve',
|
|
46
|
+
configuration: context.configurationName,
|
|
47
|
+
}, {
|
|
48
|
+
watch: true,
|
|
49
|
+
}, context)));
|
|
50
|
+
}
|
|
51
|
+
else {
|
|
52
|
+
let outWithErr = [];
|
|
53
|
+
const staticProcess = (0, child_process_1.fork)(nxBin, [
|
|
54
|
+
'run',
|
|
55
|
+
`${appName}:serve-static${context.configurationName ? `:${context.configurationName}` : ''}`,
|
|
56
|
+
], {
|
|
57
|
+
cwd: context.root,
|
|
58
|
+
stdio: ['ignore', 'pipe', 'pipe', 'ipc'],
|
|
59
|
+
});
|
|
60
|
+
staticProcess.stdout.on('data', (data) => {
|
|
61
|
+
if (isCollectingStaticRemoteOutput) {
|
|
62
|
+
outWithErr.push(data.toString());
|
|
63
|
+
}
|
|
64
|
+
else {
|
|
65
|
+
outWithErr = null;
|
|
66
|
+
staticProcess.stdout.removeAllListeners('data');
|
|
67
|
+
}
|
|
68
|
+
});
|
|
69
|
+
staticProcess.stderr.on('data', (data) => devkit_1.logger.info(data.toString()));
|
|
70
|
+
staticProcess.on('exit', (code) => {
|
|
71
|
+
if (code !== 0) {
|
|
72
|
+
devkit_1.logger.info(outWithErr.join(''));
|
|
73
|
+
throw new Error(`Remote failed to start. See above for errors.`);
|
|
74
|
+
}
|
|
75
|
+
});
|
|
76
|
+
process.on('SIGTERM', () => staticProcess.kill('SIGTERM'));
|
|
77
|
+
process.on('exit', () => staticProcess.kill('SIGTERM'));
|
|
78
|
+
}
|
|
43
79
|
}
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
80
|
+
return yield tslib_1.__await(yield tslib_1.__await(yield* tslib_1.__asyncDelegator(tslib_1.__asyncValues((0, async_iterable_1.combineAsyncIterables)(currIter, ...devRemoteIters, (0, async_iterable_1.createAsyncIterable)(({ next, done }) => tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
81
|
+
if (remotePorts.length === 0) {
|
|
82
|
+
done();
|
|
83
|
+
return;
|
|
84
|
+
}
|
|
85
|
+
try {
|
|
86
|
+
yield Promise.all(remotePorts.map((port) =>
|
|
87
|
+
// Allow 20 minutes for each remote to start, which is plenty of time but we can tweak it later if needed.
|
|
88
|
+
// Most remotes should start in under 1 minute.
|
|
89
|
+
(0, wait_for_port_open_1.waitForPortOpen)(port, {
|
|
90
|
+
retries: 480,
|
|
91
|
+
retryDelay: 2500,
|
|
92
|
+
})));
|
|
93
|
+
isCollectingStaticRemoteOutput = false;
|
|
94
|
+
devkit_1.logger.info(`NX All remotes started, server ready at http://localhost:${options.port}`);
|
|
95
|
+
next({ success: true, baseUrl: `http://localhost:${options.port}` });
|
|
96
|
+
}
|
|
97
|
+
catch (_d) {
|
|
98
|
+
throw new Error(`Timed out waiting for remote to start. Check above for any errors.`);
|
|
99
|
+
}
|
|
100
|
+
finally {
|
|
101
|
+
done();
|
|
50
102
|
}
|
|
51
|
-
})))));
|
|
103
|
+
})))))));
|
|
52
104
|
});
|
|
53
105
|
}
|
|
54
106
|
exports.default = moduleFederationDevServer;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"module-federation-dev-server.impl.js","sourceRoot":"","sources":["../../../../../../packages/react/src/executors/module-federation-dev-server/module-federation-dev-server.impl.ts"],"names":[],"mappings":";;;AAAA,uCAAkE;AAClE,0FAAqF;AAErF,+BAA4B;AAC5B,+BAA+B;AAC/B,
|
|
1
|
+
{"version":3,"file":"module-federation-dev-server.impl.js","sourceRoot":"","sources":["../../../../../../packages/react/src/executors/module-federation-dev-server/module-federation-dev-server.impl.ts"],"names":[],"mappings":";;;AAAA,uCAAkE;AAClE,0FAAqF;AAErF,+BAA4B;AAC5B,wEAG6C;AAC7C,+BAA+B;AAC/B,6EAAuE;AACvE,gFAA2E;AAC3E,iDAAqC;AAOrC,SAA+B,yBAAyB,CACtD,OAAyC,EACzC,OAAwB;;;QAExB,MAAM,QAAQ,GAAG,IAAA,yBAAiB,EAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QACrD,MAAM,CAAC,GAAG,OAAO,CAAC,sBAAsB,CAAC,QAAQ,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;QAEvE,MAAM,0BAA0B,GAAG,IAAA,WAAI,EACrC,OAAO,CAAC,IAAI,EACZ,CAAC,CAAC,IAAI,EACN,6BAA6B,CAC9B,CAAC;QAEF,IAAI,sBAA2B,CAAC;QAChC,IAAI;YACF,sBAAsB,GAAG,OAAO,CAAC,0BAA0B,CAAC,CAAC;SAC9D;QAAC,WAAM;YACN,MAAM,IAAI,KAAK,CACb,kBAAkB,0BAA0B,kHAAkH,CAC/J,CAAC;SACH;QAED,MAAM,aAAa,GAAG,IAAI,GAAG,CAC3B,IAAA,6CAAoB,EAAC,MAAA,OAAO,CAAC,WAAW,mCAAI,EAAE,EAAE,OAAO,CAAC,YAAY,CAAC,KAAK,CAAC,CAC5E,CAAC;QACF,MAAM,YAAY,GAAG,CAAC,MAAA,sBAAsB,CAAC,OAAO,mCAAI,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE;YACvE,MAAM,WAAW,GAAG,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YAChD,OAAO,CAAC,aAAa,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;QACzC,CAAC,CAAC,CAAC;QACH,MAAM,WAAW,GAAG,YAAY,CAAC,GAAG,CAClC,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,IAAI,CACxE,CAAC;QAEF,MAAM,YAAY,GAAG,CAAC,OAAO,CAAC,UAAU;YACtC,CAAC,CAAC,EAAE;YACJ,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC;gBACnC,CAAC,CAAC,IAAA,6CAAoB,EAAC,OAAO,CAAC,UAAU,EAAE,OAAO,CAAC,YAAY,CAAC,KAAK,CAAC;gBACtE,CAAC,CAAC,IAAA,6CAAoB,EAAC,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,OAAO,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;QAE3E,eAAM,CAAC,IAAI,CACT,gDAAgD,KAAK,CAAC,IAAI,CACxD,OAAO,CAAC,WAAW,CACpB,SAAS,YAAY,CAAC,MAAM,UAAU,CACxC,CAAC;QAEF,MAAM,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QACpC,MAAM,cAAc,GAA0C,EAAE,CAAC;QACjE,IAAI,8BAA8B,GAAG,IAAI,CAAC;QAE1C,KAAK,MAAM,GAAG,IAAI,YAAY,EAAE;YAC9B,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;YAClD,IAAI,YAAY,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE;gBAClC,cAAc,CAAC,IAAI,CACjB,sBAAM,IAAA,oBAAW,EACf;oBACE,OAAO,EAAE,OAAO;oBAChB,MAAM,EAAE,OAAO;oBACf,aAAa,EAAE,OAAO,CAAC,iBAAiB;iBACzC,EACD;oBACE,KAAK,EAAE,IAAI;iBACZ,EACD,OAAO,CACR,CAAA,CACF,CAAC;aACH;iBAAM;gBACL,IAAI,UAAU,GAAoB,EAAE,CAAC;gBACrC,MAAM,aAAa,GAAG,IAAA,oBAAI,EACxB,KAAK,EACL;oBACE,KAAK;oBACL,GAAG,OAAO,gBACR,OAAO,CAAC,iBAAiB,CAAC,CAAC,CAAC,IAAI,OAAO,CAAC,iBAAiB,EAAE,CAAC,CAAC,CAAC,EAChE,EAAE;iBACH,EACD;oBACE,GAAG,EAAE,OAAO,CAAC,IAAI;oBACjB,KAAK,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,CAAC;iBACzC,CACF,CAAC;gBACF,aAAa,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE;oBACvC,IAAI,8BAA8B,EAAE;wBAClC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;qBAClC;yBAAM;wBACL,UAAU,GAAG,IAAI,CAAC;wBAClB,aAAa,CAAC,MAAM,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC;qBACjD;gBACH,CAAC,CAAC,CAAC;gBACH,aAAa,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,eAAM,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC;gBACxE,aAAa,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE;oBAChC,IAAI,IAAI,KAAK,CAAC,EAAE;wBACd,eAAM,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC;wBACjC,MAAM,IAAI,KAAK,CAAC,+CAA+C,CAAC,CAAC;qBAClE;gBACH,CAAC,CAAC,CAAC;gBACH,OAAO,CAAC,EAAE,CAAC,SAAS,EAAE,GAAG,EAAE,CAAC,aAAa,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC;gBAC3D,OAAO,CAAC,EAAE,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC,aAAa,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC;aACzD;SACF;QAED,6BAAO,sBAAA,KAAK,CAAC,CAAC,yBAAA,sBAAA,IAAA,sCAAqB,EACjC,QAAQ,EACR,GAAG,cAAc,EACjB,IAAA,oCAAmB,EACjB,CAAO,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,EAAE;YACvB,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC,EAAE;gBAC5B,IAAI,EAAE,CAAC;gBACP,OAAO;aACR;YACD,IAAI;gBACF,MAAM,OAAO,CAAC,GAAG,CACf,WAAW,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;gBACvB,0GAA0G;gBAC1G,+CAA+C;gBAC/C,IAAA,oCAAe,EAAC,IAAI,EAAE;oBACpB,OAAO,EAAE,GAAG;oBACZ,UAAU,EAAE,IAAI;iBACjB,CAAC,CACH,CACF,CAAC;gBACF,8BAA8B,GAAG,KAAK,CAAC;gBACvC,eAAM,CAAC,IAAI,CACT,4DAA4D,OAAO,CAAC,IAAI,EAAE,CAC3E,CAAC;gBACF,IAAI,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,oBAAoB,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;aACtE;YAAC,WAAM;gBACN,MAAM,IAAI,KAAK,CACb,oEAAoE,CACrE,CAAC;aACH;oBAAS;gBACR,IAAI,EAAE,CAAC;aACR;QACH,CAAC,CAAA,CACF,CACF,CAAA,CAAA,CAAA,EAAC;;CACH;AAvID,4CAuIC"}
|
|
@@ -19,7 +19,7 @@ function addRouting(host, options) {
|
|
|
19
19
|
const changes = (0, devkit_1.applyChangesToString)(appFileContent, (0, ast_utils_1.addInitialRoutes)(appPath, appSource));
|
|
20
20
|
host.write(appPath, changes);
|
|
21
21
|
if (!options.skipPackageJson) {
|
|
22
|
-
return (0, devkit_1.addDependenciesToPackageJson)(host, { 'react-router-dom': versions_1.reactRouterDomVersion }, {
|
|
22
|
+
return (0, devkit_1.addDependenciesToPackageJson)(host, { 'react-router-dom': versions_1.reactRouterDomVersion }, {});
|
|
23
23
|
}
|
|
24
24
|
return () => { };
|
|
25
25
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add-routing.js","sourceRoot":"","sources":["../../../../../../../packages/react/src/generators/application/lib/add-routing.ts"],"names":[],"mappings":";;;AAAA,wDAA4D;AAE5D,
|
|
1
|
+
{"version":3,"file":"add-routing.js","sourceRoot":"","sources":["../../../../../../../packages/react/src/generators/application/lib/add-routing.ts"],"names":[],"mappings":";;;AAAA,wDAA4D;AAE5D,sDAAgE;AAChE,uCAKoB;AACpB,qFAAiF;AAEjF,IAAI,QAAqC,CAAC;AAE1C,SAAgB,UAAU,CAAC,IAAU,EAAE,OAAyB;IAC9D,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE;QACpB,OAAO,GAAG,EAAE,GAAE,CAAC,CAAC;KACjB;IAED,IAAI,CAAC,QAAQ,EAAE;QACb,QAAQ,GAAG,IAAA,oCAAgB,GAAE,CAAC;KAC/B;IACD,MAAM,OAAO,GAAG,IAAA,0BAAiB,EAC/B,OAAO,CAAC,cAAc,EACtB,OAAO,CAAC,OAAO,EAAE,WAAW,OAAO,CAAC,QAAQ,MAAM,CAAC,CACpD,CAAC;IACF,MAAM,cAAc,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IACnD,MAAM,SAAS,GAAG,QAAQ,CAAC,gBAAgB,CACzC,OAAO,EACP,cAAc,EACd,QAAQ,CAAC,YAAY,CAAC,MAAM,EAC5B,IAAI,CACL,CAAC;IAEF,MAAM,OAAO,GAAG,IAAA,6BAAoB,EAClC,cAAc,EACd,IAAA,4BAAgB,EAAC,OAAO,EAAE,SAAS,CAAC,CACrC,CAAC;IACF,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAE7B,IAAI,CAAC,OAAO,CAAC,eAAe,EAAE;QAC5B,OAAO,IAAA,qCAA4B,EACjC,IAAI,EACJ,EAAE,kBAAkB,EAAE,gCAAqB,EAAE,EAC7C,EAAE,CACH,CAAC;KACH;IAED,OAAO,GAAG,EAAE,GAAE,CAAC,CAAC;AAClB,CAAC;AAnCD,gCAmCC;AAED,SAAS,OAAO,CAAC,OAAyB,EAAE,IAAY;IACtD,OAAO,OAAO,CAAC,EAAE,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;QAClE,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,KAAK,CAAC;QAChC,CAAC,CAAC,IAAI,CAAC;AACX,CAAC"}
|
|
@@ -28,8 +28,7 @@
|
|
|
28
28
|
"index": 0
|
|
29
29
|
},
|
|
30
30
|
"x-prompt": "What name would you like to use for the application?",
|
|
31
|
-
"pattern": "^[a-zA-Z].*$"
|
|
32
|
-
"x-priority": "important"
|
|
31
|
+
"pattern": "^[a-zA-Z].*$"
|
|
33
32
|
},
|
|
34
33
|
"directory": {
|
|
35
34
|
"description": "The directory of the new application.",
|
|
@@ -191,6 +190,6 @@
|
|
|
191
190
|
"default": false
|
|
192
191
|
}
|
|
193
192
|
},
|
|
194
|
-
"required": [],
|
|
193
|
+
"required": ["name"],
|
|
195
194
|
"examplesFile": "../../../docs/application-examples.md"
|
|
196
195
|
}
|
|
@@ -19,7 +19,7 @@ function componentGenerator(host, schema) {
|
|
|
19
19
|
tasks.push(styledTask);
|
|
20
20
|
addExportsToBarrel(host, options);
|
|
21
21
|
if (options.routing) {
|
|
22
|
-
const routingTask = (0, devkit_1.addDependenciesToPackageJson)(host, { 'react-router-dom': versions_1.reactRouterDomVersion }, {
|
|
22
|
+
const routingTask = (0, devkit_1.addDependenciesToPackageJson)(host, { 'react-router-dom': versions_1.reactRouterDomVersion }, {});
|
|
23
23
|
tasks.push(routingTask);
|
|
24
24
|
}
|
|
25
25
|
if (!options.skipFormat) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"component.js","sourceRoot":"","sources":["../../../../../../packages/react/src/generators/component/component.ts"],"names":[],"mappings":";;;;AAAA,uCAcoB;AAEpB,iFAAkF;AAClF,qDAAyD;AACzD,qDAAkD;AAClD,yGAAiG;AACjG,
|
|
1
|
+
{"version":3,"file":"component.js","sourceRoot":"","sources":["../../../../../../packages/react/src/generators/component/component.ts"],"names":[],"mappings":"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"}
|
|
@@ -19,7 +19,9 @@ function updateAppRoutes(host, options) {
|
|
|
19
19
|
throw new Error(`Could not find App component in ${options.appMain} (Hint: you can omit --appProject, or make sure App exists)`);
|
|
20
20
|
}
|
|
21
21
|
const appComponentPath = (0, devkit_1.joinPathFragments)(options.appSourceRoot, (0, maybe_js_1.maybeJs)(options, `${componentImportPath}.tsx`));
|
|
22
|
-
const routerTask = (0, devkit_1.addDependenciesToPackageJson)(host, {
|
|
22
|
+
const routerTask = (0, devkit_1.addDependenciesToPackageJson)(host, {
|
|
23
|
+
'react-router-dom': versions_1.reactRouterDomVersion,
|
|
24
|
+
}, {});
|
|
23
25
|
// addBrowserRouterToMain
|
|
24
26
|
const isRouterPresent = content.match(/react-router-dom/);
|
|
25
27
|
if (!isRouterPresent) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-app-routes.js","sourceRoot":"","sources":["../../../../../../../packages/react/src/generators/library/lib/update-app-routes.ts"],"names":[],"mappings":";;;AAAA,uCAMoB;AAIpB,wDAIkC;AAClC,wDAA4D;AAC5D,yCAAqC;AACrC,
|
|
1
|
+
{"version":3,"file":"update-app-routes.js","sourceRoot":"","sources":["../../../../../../../packages/react/src/generators/library/lib/update-app-routes.ts"],"names":[],"mappings":";;;AAAA,uCAMoB;AAIpB,wDAIkC;AAClC,wDAA4D;AAC5D,yCAAqC;AACrC,sDAAgE;AAChE,qFAAiF;AACjF,sEAAiE;AAEjE,IAAI,QAAqC,CAAC;AAE1C,SAAgB,eAAe,CAAC,IAAU,EAAE,OAAyB;IACnE,IAAI,CAAC,OAAO,CAAC,OAAO,IAAI,CAAC,OAAO,CAAC,aAAa,EAAE;QAC9C,OAAO,GAAG,EAAE,GAAE,CAAC,CAAC;KACjB;IAED,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,aAAa,CAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;IAEjE,MAAM,mBAAmB,GAAG,IAAA,mCAAuB,EAAC,KAAK,EAAE,MAAM,CAAC,CAAC;IAEnE,IAAI,CAAC,mBAAmB,EAAE;QACxB,MAAM,IAAI,KAAK,CACb,mCAAmC,OAAO,CAAC,OAAO,6DAA6D,CAChH,CAAC;KACH;IAED,MAAM,gBAAgB,GAAG,IAAA,0BAAiB,EACxC,OAAO,CAAC,aAAa,EACrB,IAAA,kBAAO,EAAC,OAAO,EAAE,GAAG,mBAAmB,MAAM,CAAC,CAC/C,CAAC;IAEF,MAAM,UAAU,GAAG,IAAA,qCAA4B,EAC7C,IAAI,EACJ;QACE,kBAAkB,EAAE,gCAAqB;KAC1C,EACD,EAAE,CACH,CAAC;IAEF,yBAAyB;IACzB,MAAM,eAAe,GAAG,OAAO,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC;IAC1D,IAAI,CAAC,eAAe,EAAE;QACpB,MAAM,OAAO,GAAG,IAAA,6BAAoB,EAClC,OAAO,EACP,IAAA,4BAAgB,EAAC,OAAO,CAAC,OAAO,EAAE,MAAM,CAAC,CAC1C,CAAC;QACF,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;KACtC;IAED,sBAAsB;IACtB;QACE,MAAM,EAAE,OAAO,EAAE,gBAAgB,EAAE,MAAM,EAAE,eAAe,EAAE,GAC1D,aAAa,CAAC,IAAI,EAAE,gBAAgB,CAAC,CAAC;QACxC,MAAM,wBAAwB,GAAG,gBAAgB,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC;QAC5E,IAAI,CAAC,wBAAwB,EAAE;YAC7B,MAAM,OAAO,GAAG,IAAA,6BAAoB,EAClC,gBAAgB,EAChB,IAAA,4BAAgB,EAAC,gBAAgB,EAAE,eAAe,CAAC,CACpD,CAAC;YACF,IAAI,CAAC,KAAK,CAAC,gBAAgB,EAAE,OAAO,CAAC,CAAC;SACvC;KACF;IAED,iBAAiB;IACjB;QACE,MAAM,EAAE,OAAO,EAAE,gBAAgB,EAAE,MAAM,EAAE,eAAe,EAAE,GAC1D,aAAa,CAAC,IAAI,EAAE,gBAAgB,CAAC,CAAC;QACxC,MAAM,OAAO,GAAG,IAAA,6BAAoB,EAClC,gBAAgB,EAChB,IAAA,oBAAQ,EAAC,gBAAgB,EAAE,eAAe,EAAE;YAC1C,SAAS,EAAE,OAAO,CAAC,SAAS;YAC5B,aAAa,EAAE,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC,SAAS;YAC5C,UAAU,EAAE,IAAA,+BAAa,EAAC,IAAI,EAAE,OAAO,CAAC,gBAAgB,CAAC;SAC1D,CAAC,CACH,CAAC;QACF,IAAI,CAAC,KAAK,CAAC,gBAAgB,EAAE,OAAO,CAAC,CAAC;KACvC;IAED,OAAO,UAAU,CAAC;AACpB,CAAC;AApED,0CAoEC;AAED,SAAS,aAAa,CACpB,IAAU,EACV,IAAY;IAEZ,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE;QACtB,MAAM,IAAI,KAAK,CAAC,eAAe,IAAI,EAAE,CAAC,CAAC;KACxC;IACD,IAAI,CAAC,QAAQ,EAAE;QACb,QAAQ,GAAG,IAAA,oCAAgB,GAAE,CAAC;KAC/B;IAED,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAEzC,MAAM,MAAM,GAAG,QAAQ,CAAC,gBAAgB,CACtC,IAAI,EACJ,OAAO,EACP,QAAQ,CAAC,YAAY,CAAC,MAAM,EAC5B,IAAI,CACL,CAAC;IAEF,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC;AAC7B,CAAC"}
|
|
@@ -10,43 +10,46 @@ describe('<%= propertyName %> reducer', () => {
|
|
|
10
10
|
expect(<%= propertyName %>Reducer(undefined, { type: '' })).toEqual(expected);
|
|
11
11
|
});
|
|
12
12
|
|
|
13
|
-
it('should handle fetch<%= className %>
|
|
13
|
+
it('should handle fetch<%= className %>', () => {
|
|
14
14
|
let state = <%= propertyName %>Reducer(
|
|
15
15
|
undefined,
|
|
16
|
-
fetch<%= className %>.pending(
|
|
16
|
+
fetch<%= className %>.pending('')
|
|
17
17
|
);
|
|
18
18
|
|
|
19
19
|
expect(state).toEqual(
|
|
20
20
|
expect.objectContaining({
|
|
21
21
|
loadingStatus: 'loading',
|
|
22
22
|
error: null,
|
|
23
|
-
entities: {}
|
|
23
|
+
entities: {},
|
|
24
|
+
ids: []
|
|
24
25
|
})
|
|
25
26
|
);
|
|
26
27
|
|
|
27
28
|
state = <%= propertyName %>Reducer(
|
|
28
29
|
state,
|
|
29
|
-
fetch<%= className %>.fulfilled([{ id: 1 }],
|
|
30
|
+
fetch<%= className %>.fulfilled([{ id: 1 }], '')
|
|
30
31
|
);
|
|
31
32
|
|
|
32
33
|
expect(state).toEqual(
|
|
33
34
|
expect.objectContaining({
|
|
34
35
|
loadingStatus: 'loaded',
|
|
35
36
|
error: null,
|
|
36
|
-
entities: { 1: { id: 1 } }
|
|
37
|
+
entities: { 1: { id: 1 } },
|
|
38
|
+
ids: [1]
|
|
37
39
|
})
|
|
38
40
|
);
|
|
39
41
|
|
|
40
42
|
state = <%= propertyName %>Reducer(
|
|
41
43
|
state,
|
|
42
|
-
fetch<%= className %>.rejected(new Error('Uh oh'),
|
|
44
|
+
fetch<%= className %>.rejected(new Error('Uh oh'), '')
|
|
43
45
|
);
|
|
44
46
|
|
|
45
47
|
expect(state).toEqual(
|
|
46
48
|
expect.objectContaining({
|
|
47
49
|
loadingStatus: 'error',
|
|
48
50
|
error: 'Uh oh',
|
|
49
|
-
entities: { 1: { id: 1 } }
|
|
51
|
+
entities: { 1: { id: 1 } },
|
|
52
|
+
ids: [1]
|
|
50
53
|
})
|
|
51
54
|
);
|
|
52
55
|
});
|
|
@@ -18,7 +18,7 @@ export interface <%= className %>Entity {
|
|
|
18
18
|
|
|
19
19
|
export interface <%= className %>State extends EntityState<<%= className %>Entity> {
|
|
20
20
|
loadingStatus: 'not loaded' | 'loading' | 'loaded' | 'error';
|
|
21
|
-
error
|
|
21
|
+
error?: string | null;
|
|
22
22
|
}
|
|
23
23
|
|
|
24
24
|
export const <%= propertyName %>Adapter = createEntityAdapter<<%= className %>Entity>();
|
|
@@ -40,7 +40,7 @@ export const <%= propertyName %>Adapter = createEntityAdapter<<%= className %>En
|
|
|
40
40
|
* }, [dispatch]);
|
|
41
41
|
* ```
|
|
42
42
|
*/
|
|
43
|
-
export const fetch<%= className %> = createAsyncThunk(
|
|
43
|
+
export const fetch<%= className %> = createAsyncThunk<<%= className %>Entity[]>(
|
|
44
44
|
'<%= propertyName %>/fetchStatus',
|
|
45
45
|
async (_, thunkAPI) => {
|
|
46
46
|
/**
|
|
@@ -122,7 +122,7 @@ export const <%= propertyName %>Actions = <%= propertyName %>Slice.actions;
|
|
|
122
122
|
*/
|
|
123
123
|
const { selectAll, selectEntities } = <%= propertyName %>Adapter.getSelectors();
|
|
124
124
|
|
|
125
|
-
export const get<%= className %>State = (rootState:
|
|
125
|
+
export const get<%= className %>State = (rootState: {[<%= constantName %>_FEATURE_KEY]: <%= className %>State }): <%= className %>State => rootState[<%= constantName %>_FEATURE_KEY];
|
|
126
126
|
|
|
127
127
|
export const selectAll<%= className %> = createSelector(get<%= className %>State, selectAll);
|
|
128
128
|
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const tslib_1 = require("tslib");
|
|
4
|
+
const devkit_1 = require("@nx/devkit");
|
|
5
|
+
function removePackage(tree) {
|
|
6
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
7
|
+
(0, devkit_1.removeDependenciesFromPackageJson)(tree, [], ['react-test-renderer']);
|
|
8
|
+
yield (0, devkit_1.formatFiles)(tree);
|
|
9
|
+
});
|
|
10
|
+
}
|
|
11
|
+
exports.default = removePackage;
|
|
12
|
+
//# sourceMappingURL=remove-types-react-router-dom-package.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"remove-types-react-router-dom-package.js","sourceRoot":"","sources":["../../../../../../packages/react/src/migrations/update-16-3-0/remove-types-react-router-dom-package.ts"],"names":[],"mappings":";;;AAAA,uCAIoB;AAEpB,SAA8B,aAAa,CAAC,IAAU;;QACpD,IAAA,0CAAiC,EAAC,IAAI,EAAE,EAAE,EAAE,CAAC,qBAAqB,CAAC,CAAC,CAAC;QACrE,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;CAAA;AAHD,gCAGC"}
|
package/src/utils/versions.d.ts
CHANGED
|
@@ -16,8 +16,7 @@ export declare const emotionStyledVersion = "11.10.6";
|
|
|
16
16
|
export declare const emotionReactVersion = "11.10.6";
|
|
17
17
|
export declare const emotionBabelPlugin = "11.10.6";
|
|
18
18
|
export declare const styledJsxVersion = "5.1.2";
|
|
19
|
-
export declare const reactRouterDomVersion = "6.
|
|
20
|
-
export declare const typesReactRouterDomVersion = "5.3.3";
|
|
19
|
+
export declare const reactRouterDomVersion = "6.11.2";
|
|
21
20
|
export declare const testingLibraryReactVersion = "14.0.0";
|
|
22
21
|
export declare const reduxjsToolkitVersion = "1.9.3";
|
|
23
22
|
export declare const reactReduxVersion = "8.0.5";
|
|
@@ -41,4 +40,4 @@ export declare const lessVersion = "3.12.2";
|
|
|
41
40
|
export declare const sassVersion = "^1.55.0";
|
|
42
41
|
export declare const stylusVersion = "^0.55.0";
|
|
43
42
|
export declare const rollupPluginUrlVersion = "^7.0.0";
|
|
44
|
-
export declare const svgrRollupVersion = "^
|
|
43
|
+
export declare const svgrRollupVersion = "^8.0.1";
|
package/src/utils/versions.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.svgrRollupVersion = exports.rollupPluginUrlVersion = exports.stylusVersion = exports.sassVersion = exports.lessVersion = exports.moduleFederationNodeVersion = exports.typesCorsVersion = exports.corsVersion = exports.isbotVersion = exports.typesExpressVersion = exports.expressVersion = exports.autoprefixerVersion = exports.tailwindcssVersion = exports.postcssVersion = exports.tsLibVersion = exports.babelPluginStyledComponentsVersion = exports.eslintPluginReactHooksVersion = exports.eslintPluginReactVersion = exports.eslintPluginJsxA11yVersion = exports.eslintPluginImportVersion = exports.reactTestRendererVersion = exports.reactReduxVersion = exports.reduxjsToolkitVersion = exports.testingLibraryReactVersion = exports.
|
|
3
|
+
exports.svgrRollupVersion = exports.rollupPluginUrlVersion = exports.stylusVersion = exports.sassVersion = exports.lessVersion = exports.moduleFederationNodeVersion = exports.typesCorsVersion = exports.corsVersion = exports.isbotVersion = exports.typesExpressVersion = exports.expressVersion = exports.autoprefixerVersion = exports.tailwindcssVersion = exports.postcssVersion = exports.tsLibVersion = exports.babelPluginStyledComponentsVersion = exports.eslintPluginReactHooksVersion = exports.eslintPluginReactVersion = exports.eslintPluginJsxA11yVersion = exports.eslintPluginImportVersion = exports.reactTestRendererVersion = exports.reactReduxVersion = exports.reduxjsToolkitVersion = exports.testingLibraryReactVersion = exports.reactRouterDomVersion = exports.styledJsxVersion = exports.emotionBabelPlugin = exports.emotionReactVersion = exports.emotionStyledVersion = exports.typesStyledComponentsVersion = exports.styledComponentsVersion = exports.babelPresetReactVersion = exports.typesNodeVersion = exports.typesReactIsVersion = exports.typesReactDomVersion = exports.typesReactVersion = exports.babelLoaderVersion = exports.swcLoaderVersion = exports.reactIsVersion = exports.reactDomVersion = exports.reactVersion = exports.nxRspackVersion = exports.nxVersion = void 0;
|
|
4
4
|
exports.nxVersion = require('../../package.json').version;
|
|
5
5
|
// Always pull the latest version until we merge rspack plugin into the repo.
|
|
6
6
|
exports.nxRspackVersion = '*';
|
|
@@ -21,8 +21,7 @@ exports.emotionReactVersion = '11.10.6';
|
|
|
21
21
|
exports.emotionBabelPlugin = '11.10.6';
|
|
22
22
|
// WARNING: This needs to be in sync with Next.js' dependency or else there might be issues.
|
|
23
23
|
exports.styledJsxVersion = '5.1.2';
|
|
24
|
-
exports.reactRouterDomVersion = '6.
|
|
25
|
-
exports.typesReactRouterDomVersion = '5.3.3';
|
|
24
|
+
exports.reactRouterDomVersion = '6.11.2';
|
|
26
25
|
exports.testingLibraryReactVersion = '14.0.0';
|
|
27
26
|
exports.reduxjsToolkitVersion = '1.9.3';
|
|
28
27
|
exports.reactReduxVersion = '8.0.5';
|
|
@@ -49,5 +48,5 @@ exports.sassVersion = '^1.55.0';
|
|
|
49
48
|
exports.stylusVersion = '^0.55.0';
|
|
50
49
|
// rollup plugins (if needed)
|
|
51
50
|
exports.rollupPluginUrlVersion = '^7.0.0';
|
|
52
|
-
exports.svgrRollupVersion = '^
|
|
51
|
+
exports.svgrRollupVersion = '^8.0.1';
|
|
53
52
|
//# sourceMappingURL=versions.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"versions.js","sourceRoot":"","sources":["../../../../../packages/react/src/utils/versions.ts"],"names":[],"mappings":";;;AAAa,QAAA,SAAS,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC,OAAO,CAAC;AAE/D,6EAA6E;AAChE,QAAA,eAAe,GAAG,GAAG,CAAC;AAEtB,QAAA,YAAY,GAAG,QAAQ,CAAC;AACxB,QAAA,eAAe,GAAG,QAAQ,CAAC;AAC3B,QAAA,cAAc,GAAG,QAAQ,CAAC;AAC1B,QAAA,gBAAgB,GAAG,QAAQ,CAAC;AAC5B,QAAA,kBAAkB,GAAG,QAAQ,CAAC;AAC9B,QAAA,iBAAiB,GAAG,SAAS,CAAC;AAC9B,QAAA,oBAAoB,GAAG,SAAS,CAAC;AACjC,QAAA,mBAAmB,GAAG,QAAQ,CAAC;AAE/B,QAAA,gBAAgB,GAAG,SAAS,CAAC;AAE7B,QAAA,uBAAuB,GAAG,SAAS,CAAC;AAEpC,QAAA,uBAAuB,GAAG,OAAO,CAAC;AAClC,QAAA,4BAA4B,GAAG,QAAQ,CAAC;AAExC,QAAA,oBAAoB,GAAG,SAAS,CAAC;AACjC,QAAA,mBAAmB,GAAG,SAAS,CAAC;AAChC,QAAA,kBAAkB,GAAG,SAAS,CAAC;AAE5C,4FAA4F;AAC/E,QAAA,gBAAgB,GAAG,OAAO,CAAC;AAE3B,QAAA,qBAAqB,GAAG,
|
|
1
|
+
{"version":3,"file":"versions.js","sourceRoot":"","sources":["../../../../../packages/react/src/utils/versions.ts"],"names":[],"mappings":";;;AAAa,QAAA,SAAS,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC,OAAO,CAAC;AAE/D,6EAA6E;AAChE,QAAA,eAAe,GAAG,GAAG,CAAC;AAEtB,QAAA,YAAY,GAAG,QAAQ,CAAC;AACxB,QAAA,eAAe,GAAG,QAAQ,CAAC;AAC3B,QAAA,cAAc,GAAG,QAAQ,CAAC;AAC1B,QAAA,gBAAgB,GAAG,QAAQ,CAAC;AAC5B,QAAA,kBAAkB,GAAG,QAAQ,CAAC;AAC9B,QAAA,iBAAiB,GAAG,SAAS,CAAC;AAC9B,QAAA,oBAAoB,GAAG,SAAS,CAAC;AACjC,QAAA,mBAAmB,GAAG,QAAQ,CAAC;AAE/B,QAAA,gBAAgB,GAAG,SAAS,CAAC;AAE7B,QAAA,uBAAuB,GAAG,SAAS,CAAC;AAEpC,QAAA,uBAAuB,GAAG,OAAO,CAAC;AAClC,QAAA,4BAA4B,GAAG,QAAQ,CAAC;AAExC,QAAA,oBAAoB,GAAG,SAAS,CAAC;AACjC,QAAA,mBAAmB,GAAG,SAAS,CAAC;AAChC,QAAA,kBAAkB,GAAG,SAAS,CAAC;AAE5C,4FAA4F;AAC/E,QAAA,gBAAgB,GAAG,OAAO,CAAC;AAE3B,QAAA,qBAAqB,GAAG,QAAQ,CAAC;AAEjC,QAAA,0BAA0B,GAAG,QAAQ,CAAC;AAEtC,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;AAE9C,QAAA,YAAY,GAAG,QAAQ,CAAC;AAExB,QAAA,cAAc,GAAG,QAAQ,CAAC;AAC1B,QAAA,kBAAkB,GAAG,OAAO,CAAC;AAC7B,QAAA,mBAAmB,GAAG,SAAS,CAAC;AAE7C,4BAA4B;AACf,QAAA,cAAc,GAAG,SAAS,CAAC;AAC3B,QAAA,mBAAmB,GAAG,SAAS,CAAC;AAChC,QAAA,YAAY,GAAG,QAAQ,CAAC;AACxB,QAAA,WAAW,GAAG,QAAQ,CAAC;AACvB,QAAA,gBAAgB,GAAG,SAAS,CAAC;AAC7B,QAAA,2BAA2B,GAAG,QAAQ,CAAC;AAEpD,sBAAsB;AACT,QAAA,WAAW,GAAG,QAAQ,CAAC;AACvB,QAAA,WAAW,GAAG,SAAS,CAAC;AACxB,QAAA,aAAa,GAAG,SAAS,CAAC;AAEvC,6BAA6B;AAChB,QAAA,sBAAsB,GAAG,QAAQ,CAAC;AAClC,QAAA,iBAAiB,GAAG,QAAQ,CAAC"}
|