@nrwl/react 15.3.0-beta.3 → 15.3.0-beta.5
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/CHANGELOG.md +1 -1
- package/index.d.ts +1 -1
- package/index.js +2 -1
- package/index.js.map +1 -1
- package/package.json +12 -12
- package/src/generators/application/application.js +19 -6
- package/src/generators/application/application.js.map +1 -1
- package/src/generators/application/files/common-vite/{index.html → index.html__tmpl__} +2 -1
- package/src/generators/application/files/common-vite/{src → public}/favicon.ico +0 -0
- package/src/generators/application/lib/add-cypress.js +1 -1
- package/src/generators/application/lib/add-cypress.js.map +1 -1
- package/src/generators/application/lib/normalize-options.d.ts +1 -1
- package/src/generators/application/lib/normalize-options.js +17 -12
- package/src/generators/application/lib/normalize-options.js.map +1 -1
- package/src/generators/application/lib/set-defaults.js +1 -1
- package/src/generators/application/lib/set-defaults.js.map +1 -1
- package/src/generators/application/schema.d.ts +5 -3
- package/src/generators/application/schema.json +7 -1
- package/src/generators/host/files/module-federation-ssr/module-federation.server.config.js__tmpl__ +13 -0
- package/src/generators/host/files/module-federation-ssr/webpack.server.config.js__tmpl__ +8 -0
- package/src/generators/host/host.d.ts +2 -2
- package/src/generators/host/host.js +18 -1
- package/src/generators/host/host.js.map +1 -1
- package/src/generators/host/lib/add-module-federation-files.js +1 -1
- package/src/generators/host/lib/add-module-federation-files.js.map +1 -1
- package/src/generators/host/lib/setup-ssr-for-host.d.ts +6 -0
- package/src/generators/host/lib/setup-ssr-for-host.js +25 -0
- package/src/generators/host/lib/setup-ssr-for-host.js.map +1 -0
- package/src/generators/host/schema.d.ts +15 -14
- package/src/generators/host/schema.json +5 -0
- package/src/generators/init/schema.d.ts +1 -0
- package/src/generators/init/schema.json +5 -0
- package/src/generators/library/files/{lib → common}/.babelrc__tmpl__ +0 -0
- package/src/generators/library/files/{lib → common}/README.md +0 -0
- package/src/generators/library/files/common/package.json__tmpl__ +12 -0
- package/src/generators/library/files/{lib → common}/src/index.ts__tmpl__ +0 -0
- package/src/generators/library/files/{lib → common}/tsconfig.json__tmpl__ +0 -0
- package/src/generators/library/files/{lib → common}/tsconfig.lib.json__tmpl__ +0 -0
- package/src/generators/library/files/vite/package.json__tmpl__ +12 -0
- package/src/generators/library/lib/normalize-options.d.ts +4 -0
- package/src/generators/library/lib/normalize-options.js +47 -0
- package/src/generators/library/lib/normalize-options.js.map +1 -0
- package/src/generators/library/library.d.ts +2 -0
- package/src/generators/library/library.js +29 -41
- package/src/generators/library/library.js.map +1 -1
- package/src/generators/library/schema.d.ts +19 -17
- package/src/generators/library/schema.json +14 -4
- package/src/generators/remote/files/module-federation-ssr/module-federation.server.config.js__tmpl__ +13 -0
- package/src/generators/remote/files/module-federation-ssr/webpack.server.config.js__tmpl__ +8 -0
- package/src/generators/remote/lib/setup-ssr-for-remote.d.ts +4 -0
- package/src/generators/remote/lib/setup-ssr-for-remote.js +21 -0
- package/src/generators/remote/lib/setup-ssr-for-remote.js.map +1 -0
- package/src/generators/remote/remote.d.ts +2 -2
- package/src/generators/remote/remote.js +17 -2
- package/src/generators/remote/remote.js.map +1 -1
- package/src/generators/remote/schema.d.ts +14 -13
- package/src/generators/remote/schema.json +5 -0
- package/src/generators/setup-ssr/files/server.ts__tmpl__ +11 -7
- package/src/generators/setup-ssr/files/tsconfig.server.json__tmpl__ +2 -1
- package/src/generators/setup-ssr/schema.d.ts +2 -1
- package/src/generators/setup-ssr/schema.json +9 -0
- package/src/generators/setup-ssr/setup-ssr.js +39 -10
- package/src/generators/setup-ssr/setup-ssr.js.map +1 -1
- package/src/generators/storybook-configuration/configuration.js +14 -3
- package/src/generators/storybook-configuration/configuration.js.map +1 -1
- package/src/generators/storybook-configuration/schema.d.ts +1 -0
- package/src/generators/storybook-configuration/schema.json +7 -2
- package/src/utils/ast-utils.d.ts +1 -0
- package/src/utils/ast-utils.js +24 -1
- package/src/utils/ast-utils.js.map +1 -1
- package/src/utils/lint.d.ts +26 -0
- package/src/utils/lint.js +10 -1
- package/src/utils/lint.js.map +1 -1
- package/src/utils/versions.d.ts +4 -1
- package/src/utils/versions.js +6 -2
- package/src/utils/versions.js.map +1 -1
- package/src/generators/application/files/common-vite/public/.gitkeep +0 -0
- package/src/generators/application/files/common-vite/src/polyfills.ts__tmpl__ +0 -7
- package/src/generators/library/files/lib/package.json__tmpl__ +0 -4
|
@@ -2,24 +2,38 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.setupSsrSchematic = exports.setupSsrGenerator = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
|
+
const ts = require("typescript");
|
|
5
6
|
const devkit_1 = require("@nrwl/devkit");
|
|
7
|
+
const init_1 = require("../init/init");
|
|
6
8
|
const versions_1 = require("../../utils/versions");
|
|
9
|
+
const ast_utils_1 = require("../../utils/ast-utils");
|
|
10
|
+
function readEntryFile(host, path) {
|
|
11
|
+
const content = host.read(path, 'utf-8');
|
|
12
|
+
return {
|
|
13
|
+
content,
|
|
14
|
+
source: ts.createSourceFile(path, content, ts.ScriptTarget.Latest, true),
|
|
15
|
+
};
|
|
16
|
+
}
|
|
7
17
|
function setupSsrGenerator(tree, options) {
|
|
8
|
-
var _a, _b, _c;
|
|
18
|
+
var _a, _b, _c, _d, _e;
|
|
9
19
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
20
|
+
yield (0, init_1.default)(tree, {});
|
|
10
21
|
const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, options.project);
|
|
11
22
|
const projectRoot = projectConfig.root;
|
|
12
23
|
const appImportCandidates = [
|
|
13
|
-
options.appComponentImportPath,
|
|
24
|
+
(_a = options.appComponentImportPath) !== null && _a !== void 0 ? _a : 'app/app',
|
|
14
25
|
'app',
|
|
15
26
|
'App',
|
|
16
27
|
'app/App',
|
|
17
28
|
'App/App',
|
|
18
|
-
]
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
29
|
+
].map((importPath) => {
|
|
30
|
+
return {
|
|
31
|
+
importPath,
|
|
32
|
+
filePath: (0, devkit_1.joinPathFragments)(projectConfig.sourceRoot || projectConfig.root, `${importPath}.tsx`),
|
|
33
|
+
};
|
|
34
|
+
});
|
|
35
|
+
const appComponentInfo = appImportCandidates.find((candidate) => tree.exists(candidate.filePath));
|
|
36
|
+
if (!appComponentInfo) {
|
|
23
37
|
throw new Error(`Cannot find an import path for <App/> component. Try passing setting --appComponentImportPath option.`);
|
|
24
38
|
}
|
|
25
39
|
if (!projectConfig.targets.build || !projectConfig.targets.serve) {
|
|
@@ -28,7 +42,7 @@ function setupSsrGenerator(tree, options) {
|
|
|
28
42
|
if (projectConfig.targets.server) {
|
|
29
43
|
throw new Error(`Project ${options.project} already has a server target.`);
|
|
30
44
|
}
|
|
31
|
-
const originalOutputPath = (
|
|
45
|
+
const originalOutputPath = (_c = (_b = projectConfig.targets.build) === null || _b === void 0 ? void 0 : _b.options) === null || _c === void 0 ? void 0 : _c.outputPath;
|
|
32
46
|
if (!originalOutputPath) {
|
|
33
47
|
throw new Error(`Project ${options.project} does not contain a outputPath for the build target.`);
|
|
34
48
|
}
|
|
@@ -98,7 +112,7 @@ function setupSsrGenerator(tree, options) {
|
|
|
98
112
|
} });
|
|
99
113
|
(0, devkit_1.updateProjectConfiguration)(tree, options.project, projectConfig);
|
|
100
114
|
const workspace = (0, devkit_1.readWorkspaceConfiguration)(tree);
|
|
101
|
-
if (((
|
|
115
|
+
if (((_d = workspace.tasksRunnerOptions) === null || _d === void 0 ? void 0 : _d.default) &&
|
|
102
116
|
!workspace.tasksRunnerOptions.default.options.cacheableOperations['server']) {
|
|
103
117
|
workspace.tasksRunnerOptions.default.options.cacheableOperations = [
|
|
104
118
|
...workspace.tasksRunnerOptions.default.options.cacheableOperations,
|
|
@@ -107,15 +121,30 @@ function setupSsrGenerator(tree, options) {
|
|
|
107
121
|
}
|
|
108
122
|
(0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files'), projectRoot, {
|
|
109
123
|
tmpl: '',
|
|
110
|
-
|
|
124
|
+
extraInclude: ((_e = options.extraInclude) === null || _e === void 0 ? void 0 : _e.length) > 0
|
|
125
|
+
? `"${options.extraInclude.join('", "')}",`
|
|
126
|
+
: '',
|
|
127
|
+
appComponentImport: appComponentInfo.importPath,
|
|
111
128
|
browserBuildOutputPath: projectConfig.targets.build.options.outputPath,
|
|
112
129
|
});
|
|
130
|
+
// Add <StaticRouter> to server main if needed.
|
|
131
|
+
// TODO: need to read main.server.tsx not main.tsx.
|
|
132
|
+
const appContent = tree.read(appComponentInfo.filePath, 'utf-8');
|
|
133
|
+
const isRouterPresent = appContent.match(/react-router-dom/);
|
|
134
|
+
if (isRouterPresent) {
|
|
135
|
+
const serverEntry = (0, devkit_1.joinPathFragments)(projectRoot, 'src/main.server.tsx');
|
|
136
|
+
const { content, source } = readEntryFile(tree, serverEntry);
|
|
137
|
+
const changes = (0, devkit_1.applyChangesToString)(content, (0, ast_utils_1.addStaticRouter)(serverEntry, source));
|
|
138
|
+
tree.write(serverEntry, changes);
|
|
139
|
+
}
|
|
113
140
|
(0, devkit_1.updateWorkspaceConfiguration)(tree, workspace);
|
|
114
141
|
const installTask = (0, devkit_1.addDependenciesToPackageJson)(tree, {
|
|
115
142
|
express: versions_1.expressVersion,
|
|
116
143
|
isbot: versions_1.isbotVersion,
|
|
144
|
+
cors: versions_1.corsVersion,
|
|
117
145
|
}, {
|
|
118
146
|
'@types/express': versions_1.typesExpressVersion,
|
|
147
|
+
'@types/cors': versions_1.typesCorsVersion,
|
|
119
148
|
});
|
|
120
149
|
yield (0, devkit_1.formatFiles)(tree);
|
|
121
150
|
return installTask;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setup-ssr.js","sourceRoot":"","sources":["../../../../../../packages/react/src/generators/setup-ssr/setup-ssr.ts"],"names":[],"mappings":";;;;AAAA,
|
|
1
|
+
{"version":3,"file":"setup-ssr.js","sourceRoot":"","sources":["../../../../../../packages/react/src/generators/setup-ssr/setup-ssr.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,9 +8,8 @@ const storybook_1 = require("@nrwl/storybook");
|
|
|
8
8
|
const project_name_1 = require("@nrwl/cypress/src/utils/project-name");
|
|
9
9
|
function generateStories(host, schema) {
|
|
10
10
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
11
|
-
const
|
|
12
|
-
const
|
|
13
|
-
const cypressProject = (0, project_name_1.getE2eProjectName)(schema.name, libRoot, schema.cypressDirectory);
|
|
11
|
+
const projectConfig = (0, devkit_1.readProjectConfiguration)(host, schema.name);
|
|
12
|
+
const cypressProject = (0, project_name_1.getE2eProjectName)(schema.name, projectConfig.root, schema.cypressDirectory);
|
|
14
13
|
yield (0, stories_1.default)(host, {
|
|
15
14
|
project: schema.name,
|
|
16
15
|
generateCypressSpecs: schema.configureCypress && schema.generateCypressSpecs,
|
|
@@ -21,7 +20,18 @@ function generateStories(host, schema) {
|
|
|
21
20
|
});
|
|
22
21
|
}
|
|
23
22
|
function storybookConfigurationGenerator(host, schema) {
|
|
23
|
+
var _a;
|
|
24
24
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
25
|
+
let bundler = schema.bundler;
|
|
26
|
+
const projectConfig = (0, devkit_1.readProjectConfiguration)(host, schema.name);
|
|
27
|
+
if (projectConfig.projectType === 'application' &&
|
|
28
|
+
((_a = projectConfig.targets['build']) === null || _a === void 0 ? void 0 : _a.executor) === '@nrwl/vite:build') {
|
|
29
|
+
bundler = 'vite';
|
|
30
|
+
if (schema.bundler !== 'vite') {
|
|
31
|
+
devkit_1.logger.info(`The project ${schema.name} is set up to use Vite. So
|
|
32
|
+
Storybook will be configured to use Vite as well.`);
|
|
33
|
+
}
|
|
34
|
+
}
|
|
25
35
|
const installTask = yield (0, storybook_1.configurationGenerator)(host, {
|
|
26
36
|
name: schema.name,
|
|
27
37
|
uiFramework: '@storybook/react',
|
|
@@ -31,6 +41,7 @@ function storybookConfigurationGenerator(host, schema) {
|
|
|
31
41
|
cypressDirectory: schema.cypressDirectory,
|
|
32
42
|
standaloneConfig: schema.standaloneConfig,
|
|
33
43
|
tsConfiguration: schema.tsConfiguration,
|
|
44
|
+
bundler,
|
|
34
45
|
});
|
|
35
46
|
if (schema.generateStories) {
|
|
36
47
|
yield generateStories(host, schema);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"configuration.js","sourceRoot":"","sources":["../../../../../../packages/react/src/generators/storybook-configuration/configuration.ts"],"names":[],"mappings":";;;;AACA,gDAAkD;AAClD,
|
|
1
|
+
{"version":3,"file":"configuration.js","sourceRoot":"","sources":["../../../../../../packages/react/src/generators/storybook-configuration/configuration.ts"],"names":[],"mappings":";;;;AACA,gDAAkD;AAClD,yCAKsB;AACtB,+CAAyD;AACzD,uEAAyE;AAEzE,SAAe,eAAe,CAAC,IAAU,EAAE,MAAgC;;QACzE,MAAM,aAAa,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC;QAClE,MAAM,cAAc,GAAG,IAAA,gCAAiB,EACtC,MAAM,CAAC,IAAI,EACX,aAAa,CAAC,IAAI,EAClB,MAAM,CAAC,gBAAgB,CACxB,CAAC;QACF,MAAM,IAAA,iBAAgB,EAAC,IAAI,EAAE;YAC3B,OAAO,EAAE,MAAM,CAAC,IAAI;YACpB,oBAAoB,EAClB,MAAM,CAAC,gBAAgB,IAAI,MAAM,CAAC,oBAAoB;YACxD,EAAE,EAAE,MAAM,CAAC,EAAE;YACb,cAAc;YACd,WAAW,EAAE,MAAM,CAAC,WAAW;SAChC,CAAC,CAAC;IACL,CAAC;CAAA;AAED,SAAsB,+BAA+B,CACnD,IAAU,EACV,MAAgC;;;QAEhC,IAAI,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC;QAC7B,MAAM,aAAa,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC;QAElE,IACE,aAAa,CAAC,WAAW,KAAK,aAAa;YAC3C,CAAA,MAAA,aAAa,CAAC,OAAO,CAAC,OAAO,CAAC,0CAAE,QAAQ,MAAK,kBAAkB,EAC/D;YACA,OAAO,GAAG,MAAM,CAAC;YACjB,IAAI,MAAM,CAAC,OAAO,KAAK,MAAM,EAAE;gBAC7B,eAAM,CAAC,IAAI,CACT,eAAe,MAAM,CAAC,IAAI;wDACsB,CACjD,CAAC;aACH;SACF;QAED,MAAM,WAAW,GAAG,MAAM,IAAA,kCAAsB,EAAC,IAAI,EAAE;YACrD,IAAI,EAAE,MAAM,CAAC,IAAI;YACjB,WAAW,EAAE,kBAAkB;YAC/B,gBAAgB,EAAE,MAAM,CAAC,gBAAgB;YACzC,EAAE,EAAE,MAAM,CAAC,EAAE;YACb,MAAM,EAAE,MAAM,CAAC,MAAM;YACrB,gBAAgB,EAAE,MAAM,CAAC,gBAAgB;YACzC,gBAAgB,EAAE,MAAM,CAAC,gBAAgB;YACzC,eAAe,EAAE,MAAM,CAAC,eAAe;YACvC,OAAO;SACR,CAAC,CAAC;QAEH,IAAI,MAAM,CAAC,eAAe,EAAE;YAC1B,MAAM,eAAe,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;SACrC;QAED,OAAO,WAAW,CAAC;;CACpB;AArCD,0EAqCC;AAED,kBAAe,+BAA+B,CAAC;AAClC,QAAA,+BAA+B,GAAG,IAAA,2BAAkB,EAC/D,+BAA+B,CAChC,CAAC"}
|
|
@@ -76,8 +76,13 @@
|
|
|
76
76
|
},
|
|
77
77
|
"configureTestRunner": {
|
|
78
78
|
"type": "boolean",
|
|
79
|
-
"description": "Add a Storybook Test-Runner target."
|
|
80
|
-
|
|
79
|
+
"description": "Add a Storybook Test-Runner target."
|
|
80
|
+
},
|
|
81
|
+
"bundler": {
|
|
82
|
+
"description": "The Storybook builder to use.",
|
|
83
|
+
"enum": ["vite", "webpack"],
|
|
84
|
+
"x-prompt": "Which Storybook builder do you want to use?",
|
|
85
|
+
"default": "webpack"
|
|
81
86
|
}
|
|
82
87
|
},
|
|
83
88
|
"required": ["name"],
|
package/src/utils/ast-utils.d.ts
CHANGED
|
@@ -18,6 +18,7 @@ export declare function addRoute(sourcePath: string, source: ts.SourceFile, opti
|
|
|
18
18
|
moduleName: string;
|
|
19
19
|
}): StringChange[];
|
|
20
20
|
export declare function addBrowserRouter(sourcePath: string, source: ts.SourceFile): StringChange[];
|
|
21
|
+
export declare function addStaticRouter(sourcePath: string, source: ts.SourceFile): StringChange[];
|
|
21
22
|
export declare function addReduxStoreToMain(sourcePath: string, source: ts.SourceFile): StringChange[];
|
|
22
23
|
export declare function updateReduxStore(sourcePath: string, source: ts.SourceFile, feature: {
|
|
23
24
|
keyName: string;
|
package/src/utils/ast-utils.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.getComponentPropsInterface = exports.getComponentNode = exports.updateReduxStore = exports.addReduxStoreToMain = exports.addBrowserRouter = exports.addRoute = exports.addInitialRoutes = exports.isTag = exports.findClosestOpening = exports.findElements = exports.findComponentImportPath = exports.findDefaultClassOrFunction = exports.findDefaultExportIdentifier = exports.findExportDeclarationsForJsx = exports.findDefaultExportDeclaration = exports.findDefaultExport = exports.findMainRenderStatement = exports.addImport = void 0;
|
|
3
|
+
exports.getComponentPropsInterface = exports.getComponentNode = exports.updateReduxStore = exports.addReduxStoreToMain = exports.addStaticRouter = exports.addBrowserRouter = exports.addRoute = exports.addInitialRoutes = exports.isTag = exports.findClosestOpening = exports.findElements = exports.findComponentImportPath = exports.findDefaultClassOrFunction = exports.findDefaultExportIdentifier = exports.findExportDeclarationsForJsx = exports.findDefaultExportDeclaration = exports.findDefaultExport = exports.findMainRenderStatement = exports.addImport = void 0;
|
|
4
4
|
const ts = require("typescript");
|
|
5
5
|
const typescript_1 = require("nx/src/utils/typescript");
|
|
6
6
|
const devkit_1 = require("@nrwl/devkit");
|
|
@@ -307,6 +307,29 @@ function addBrowserRouter(sourcePath, source) {
|
|
|
307
307
|
}
|
|
308
308
|
}
|
|
309
309
|
exports.addBrowserRouter = addBrowserRouter;
|
|
310
|
+
function addStaticRouter(sourcePath, source) {
|
|
311
|
+
const app = findElements(source, 'App')[0];
|
|
312
|
+
if (app) {
|
|
313
|
+
return [
|
|
314
|
+
...addImport(source, `import { StaticRouter } from 'react-router-dom/server';`),
|
|
315
|
+
{
|
|
316
|
+
type: devkit_1.ChangeType.Insert,
|
|
317
|
+
index: app.getStart(),
|
|
318
|
+
text: `<StaticRouter location={req.url}>`,
|
|
319
|
+
},
|
|
320
|
+
{
|
|
321
|
+
type: devkit_1.ChangeType.Insert,
|
|
322
|
+
index: app.getEnd(),
|
|
323
|
+
text: `</StaticRouter>`,
|
|
324
|
+
},
|
|
325
|
+
];
|
|
326
|
+
}
|
|
327
|
+
else {
|
|
328
|
+
devkit_1.logger.warn(`Could not find App component in ${sourcePath}; Skipping add <StaticRouter>`);
|
|
329
|
+
return [];
|
|
330
|
+
}
|
|
331
|
+
}
|
|
332
|
+
exports.addStaticRouter = addStaticRouter;
|
|
310
333
|
function addReduxStoreToMain(sourcePath, source) {
|
|
311
334
|
const renderStmt = findMainRenderStatement(source);
|
|
312
335
|
if (!renderStmt) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ast-utils.js","sourceRoot":"","sources":["../../../../../packages/react/src/utils/ast-utils.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"ast-utils.js","sourceRoot":"","sources":["../../../../../packages/react/src/utils/ast-utils.ts"],"names":[],"mappings":"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"}
|
package/src/utils/lint.d.ts
CHANGED
|
@@ -8,4 +8,30 @@ export declare const extraEslintDependencies: {
|
|
|
8
8
|
'eslint-plugin-react-hooks': string;
|
|
9
9
|
};
|
|
10
10
|
};
|
|
11
|
+
export declare const extendReactEslintJson: (json: Linter.Config) => {
|
|
12
|
+
ignorePatterns?: string | string[];
|
|
13
|
+
root?: boolean;
|
|
14
|
+
$schema?: string;
|
|
15
|
+
env?: {
|
|
16
|
+
[name: string]: boolean;
|
|
17
|
+
};
|
|
18
|
+
globals?: {
|
|
19
|
+
[name: string]: boolean | "readonly" | "readable" | "writable" | "writeable";
|
|
20
|
+
};
|
|
21
|
+
noInlineConfig?: boolean;
|
|
22
|
+
overrides?: Linter.ConfigOverride<Linter.RulesRecord>[];
|
|
23
|
+
parser?: string;
|
|
24
|
+
parserOptions?: Linter.ParserOptions;
|
|
25
|
+
plugins?: string[];
|
|
26
|
+
processor?: string;
|
|
27
|
+
reportUnusedDisableDirectives?: boolean;
|
|
28
|
+
settings?: {
|
|
29
|
+
[name: string]: any;
|
|
30
|
+
};
|
|
31
|
+
rules?: Partial<Linter.RulesRecord>;
|
|
32
|
+
extends: string[];
|
|
33
|
+
};
|
|
34
|
+
/**
|
|
35
|
+
* @deprecated Use {@link extendReactEslintJson} instead.
|
|
36
|
+
*/
|
|
11
37
|
export declare const createReactEslintJson: (projectRoot: string, setParserOptionsProject: boolean) => Linter.Config;
|
package/src/utils/lint.js
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.createReactEslintJson = exports.extraEslintDependencies = void 0;
|
|
3
|
+
exports.createReactEslintJson = exports.extendReactEslintJson = exports.extraEslintDependencies = void 0;
|
|
4
|
+
const tslib_1 = require("tslib");
|
|
4
5
|
const devkit_1 = require("@nrwl/devkit");
|
|
5
6
|
const versions_1 = require("./versions");
|
|
6
7
|
exports.extraEslintDependencies = {
|
|
@@ -12,6 +13,14 @@ exports.extraEslintDependencies = {
|
|
|
12
13
|
'eslint-plugin-react-hooks': versions_1.eslintPluginReactHooksVersion,
|
|
13
14
|
},
|
|
14
15
|
};
|
|
16
|
+
const extendReactEslintJson = (json) => {
|
|
17
|
+
const { extends: pluginExtends } = json, config = tslib_1.__rest(json, ["extends"]);
|
|
18
|
+
return Object.assign({ extends: ['plugin:@nrwl/nx/react', ...(pluginExtends || [])] }, config);
|
|
19
|
+
};
|
|
20
|
+
exports.extendReactEslintJson = extendReactEslintJson;
|
|
21
|
+
/**
|
|
22
|
+
* @deprecated Use {@link extendReactEslintJson} instead.
|
|
23
|
+
*/
|
|
15
24
|
const createReactEslintJson = (projectRoot, setParserOptionsProject) => ({
|
|
16
25
|
extends: [
|
|
17
26
|
'plugin:@nrwl/nx/react',
|
package/src/utils/lint.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lint.js","sourceRoot":"","sources":["../../../../../packages/react/src/utils/lint.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"lint.js","sourceRoot":"","sources":["../../../../../packages/react/src/utils/lint.ts"],"names":[],"mappings":";;;;AAAA,yCAA8C;AAE9C,yCAKoB;AAEP,QAAA,uBAAuB,GAAG;IACrC,YAAY,EAAE,EAAE;IAChB,eAAe,EAAE;QACf,sBAAsB,EAAE,oCAAyB;QACjD,wBAAwB,EAAE,qCAA0B;QACpD,qBAAqB,EAAE,mCAAwB;QAC/C,2BAA2B,EAAE,wCAA6B;KAC3D;CACF,CAAC;AAEK,MAAM,qBAAqB,GAAG,CAAC,IAAmB,EAAE,EAAE;IAC3D,MAAM,EAAE,OAAO,EAAE,aAAa,KAAgB,IAAI,EAAf,MAAM,kBAAK,IAAI,EAA5C,WAAqC,CAAO,CAAC;IAEnD,uBACE,OAAO,EAAE,CAAC,uBAAuB,EAAE,GAAG,CAAC,aAAa,IAAI,EAAE,CAAC,CAAC,IACzD,MAAM,EACT;AACJ,CAAC,CAAC;AAPW,QAAA,qBAAqB,yBAOhC;AAEF;;GAEG;AACI,MAAM,qBAAqB,GAAG,CACnC,WAAmB,EACnB,uBAAgC,EACjB,EAAE,CAAC,CAAC;IACnB,OAAO,EAAE;QACP,uBAAuB;QACvB,GAAG,IAAA,uBAAc,EAAC,WAAW,CAAC,gBAAgB;KAC/C;IACD,cAAc,EAAE,CAAC,OAAO,CAAC;IACzB,SAAS,EAAE;QACT;YACE,KAAK,EAAE,CAAC,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC;YACzC;;;;;;;;;;;;eAYG;YACH,aAAa,EAAE,CAAC,uBAAuB;gBACrC,CAAC,CAAC,SAAS;gBACX,CAAC,CAAC;oBACE,OAAO,EAAE,CAAC,GAAG,WAAW,mBAAmB,CAAC;iBAC7C;YACL;;;eAGG;YACH,KAAK,EAAE,EAAE;SACV;QACD;YACE,KAAK,EAAE,CAAC,MAAM,EAAE,OAAO,CAAC;YACxB,KAAK,EAAE,EAAE;SACV;QACD;YACE,KAAK,EAAE,CAAC,MAAM,EAAE,OAAO,CAAC;YACxB,KAAK,EAAE,EAAE;SACV;KACF;CACF,CAAC,CAAC;AA7CU,QAAA,qBAAqB,yBA6C/B"}
|
package/src/utils/versions.d.ts
CHANGED
|
@@ -27,6 +27,9 @@ export declare const tsLibVersion = "^2.3.0";
|
|
|
27
27
|
export declare const postcssVersion = "8.4.19";
|
|
28
28
|
export declare const tailwindcssVersion = "3.2.4";
|
|
29
29
|
export declare const autoprefixerVersion = "10.4.13";
|
|
30
|
-
export declare const expressVersion = "
|
|
30
|
+
export declare const expressVersion = "~4.18.2";
|
|
31
31
|
export declare const typesExpressVersion = "4.17.14";
|
|
32
32
|
export declare const isbotVersion = "^3.6.5";
|
|
33
|
+
export declare const corsVersion = "~2.8.5";
|
|
34
|
+
export declare const typesCorsVersion = "~2.8.12";
|
|
35
|
+
export declare const moduleFederationNodeVersion = "~0.9.6";
|
package/src/utils/versions.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
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.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;
|
|
3
|
+
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.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
4
|
exports.nxVersion = require('../../package.json').version;
|
|
5
5
|
exports.reactVersion = '18.2.0';
|
|
6
6
|
exports.reactDomVersion = '18.2.0';
|
|
@@ -31,7 +31,11 @@ exports.tsLibVersion = '^2.3.0';
|
|
|
31
31
|
exports.postcssVersion = '8.4.19';
|
|
32
32
|
exports.tailwindcssVersion = '3.2.4';
|
|
33
33
|
exports.autoprefixerVersion = '10.4.13';
|
|
34
|
-
|
|
34
|
+
// SSR and Module Federation
|
|
35
|
+
exports.expressVersion = '~4.18.2';
|
|
35
36
|
exports.typesExpressVersion = '4.17.14';
|
|
36
37
|
exports.isbotVersion = '^3.6.5';
|
|
38
|
+
exports.corsVersion = '~2.8.5';
|
|
39
|
+
exports.typesCorsVersion = '~2.8.12';
|
|
40
|
+
exports.moduleFederationNodeVersion = '~0.9.6';
|
|
37
41
|
//# 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;AAElD,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,QAAQ,CAAC;AAChC,QAAA,mBAAmB,GAAG,QAAQ,CAAC;AAE/B,QAAA,gBAAgB,GAAG,SAAS,CAAC;AAE7B,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,OAAO,CAAC;AAChC,QAAA,0BAA0B,GAAG,OAAO,CAAC;AAErC,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,SAAS,CAAC;AACrC,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;
|
|
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;AAElD,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,QAAQ,CAAC;AAChC,QAAA,mBAAmB,GAAG,QAAQ,CAAC;AAE/B,QAAA,gBAAgB,GAAG,SAAS,CAAC;AAE7B,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,OAAO,CAAC;AAChC,QAAA,0BAA0B,GAAG,OAAO,CAAC;AAErC,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,SAAS,CAAC;AACrC,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"}
|
|
File without changes
|