@nrwl/react 15.3.0-beta.9 → 15.3.0
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/migrations.json +12 -0
- package/package.json +6 -25
- package/plugins/component-testing/index.d.ts +1 -0
- package/plugins/component-testing/index.js +6 -5
- package/plugins/component-testing/index.js.map +1 -1
- package/src/executors/module-federation-dev-server/module-federation-dev-server.impl.d.ts +5 -1
- package/src/executors/module-federation-dev-server/module-federation-dev-server.impl.js +3 -4
- package/src/executors/module-federation-dev-server/module-federation-dev-server.impl.js.map +1 -1
- package/src/generators/application/application.js +24 -6
- package/src/generators/application/application.js.map +1 -1
- package/src/generators/application/files/common/tsconfig.app.json__tmpl__ +2 -2
- package/src/generators/application/files/common-vite/tsconfig.app.json__tmpl__ +2 -2
- package/src/generators/application/lib/add-cypress.js +5 -2
- package/src/generators/application/lib/add-cypress.js.map +1 -1
- package/src/generators/application/lib/add-jest.js +5 -2
- package/src/generators/application/lib/add-jest.js.map +1 -1
- package/src/generators/application/lib/create-application-files.js +4 -10
- package/src/generators/application/lib/create-application-files.js.map +1 -1
- package/src/generators/application/lib/install-common-dependencies.d.ts +3 -0
- package/src/generators/application/lib/install-common-dependencies.js +29 -0
- package/src/generators/application/lib/install-common-dependencies.js.map +1 -0
- package/src/generators/application/lib/set-defaults.js +10 -1
- package/src/generators/application/lib/set-defaults.js.map +1 -1
- package/src/generators/component/files/__fileName__.tsx__tmpl__ +1 -1
- package/src/generators/component-test/component-test.d.ts +1 -1
- package/src/generators/component-test/component-test.js +15 -10
- package/src/generators/component-test/component-test.js.map +1 -1
- package/src/generators/cypress-component-configuration/cypress-component-configuration.js +5 -3
- package/src/generators/cypress-component-configuration/cypress-component-configuration.js.map +1 -1
- package/src/generators/cypress-component-configuration/lib/add-files.d.ts +1 -1
- package/src/generators/cypress-component-configuration/lib/add-files.js +20 -13
- package/src/generators/cypress-component-configuration/lib/add-files.js.map +1 -1
- package/src/generators/cypress-component-configuration/lib/update-configs.js +2 -2
- package/src/generators/cypress-component-configuration/lib/update-configs.js.map +1 -1
- package/src/generators/init/init.js +28 -6
- package/src/generators/init/init.js.map +1 -1
- package/src/generators/library/files/common/tsconfig.lib.json__tmpl__ +2 -2
- package/src/generators/library/files/vite/README.md +7 -0
- package/src/generators/library/files/vite/tsconfig.lib.json__tmpl__ +14 -0
- package/src/generators/library/lib/add-linting.d.ts +3 -0
- package/src/generators/library/lib/add-linting.js +38 -0
- package/src/generators/library/lib/add-linting.js.map +1 -0
- package/src/generators/library/lib/add-rollup-build-target.d.ts +3 -0
- package/src/generators/library/lib/add-rollup-build-target.js +55 -0
- package/src/generators/library/lib/add-rollup-build-target.js.map +1 -0
- package/src/generators/library/lib/create-files.d.ts +3 -0
- package/src/generators/library/lib/create-files.js +26 -0
- package/src/generators/library/lib/create-files.js.map +1 -0
- package/src/generators/library/lib/install-common-dependencies.d.ts +3 -0
- package/src/generators/library/lib/install-common-dependencies.js +30 -0
- package/src/generators/library/lib/install-common-dependencies.js.map +1 -0
- package/src/generators/library/lib/maybe-js.d.ts +2 -0
- package/src/generators/library/lib/maybe-js.js +10 -0
- package/src/generators/library/lib/maybe-js.js.map +1 -0
- package/src/generators/library/lib/normalize-options.d.ts +1 -2
- package/src/generators/library/lib/normalize-options.js +2 -2
- package/src/generators/library/lib/normalize-options.js.map +1 -1
- package/src/generators/library/lib/update-app-routes.d.ts +3 -0
- package/src/generators/library/lib/update-app-routes.js +58 -0
- package/src/generators/library/lib/update-app-routes.js.map +1 -0
- package/src/generators/library/lib/update-base-tsconfig.d.ts +3 -0
- package/src/generators/library/lib/update-base-tsconfig.js +24 -0
- package/src/generators/library/lib/update-base-tsconfig.js.map +1 -0
- package/src/generators/library/library.d.ts +0 -12
- package/src/generators/library/library.js +42 -191
- package/src/generators/library/library.js.map +1 -1
- package/src/generators/library/schema.d.ts +16 -2
- package/src/generators/library/schema.json +7 -5
- package/src/generators/setup-ssr/schema.json +4 -4
- package/src/generators/stories/stories.d.ts +1 -1
- package/src/generators/stories/stories.js +23 -19
- package/src/generators/stories/stories.js.map +1 -1
- package/src/generators/storybook-configuration/configuration.js +10 -7
- package/src/generators/storybook-configuration/configuration.js.map +1 -1
- package/src/generators/storybook-configuration/schema.json +1 -3
- package/src/migrations/update-15-3-0/install-webpack-rollup-dependencies.d.ts +3 -0
- package/src/migrations/update-15-3-0/install-webpack-rollup-dependencies.js +37 -0
- package/src/migrations/update-15-3-0/install-webpack-rollup-dependencies.js.map +1 -0
- package/src/migrations/update-15-3-0/update-rollup-executor.d.ts +3 -0
- package/src/migrations/update-15-3-0/update-rollup-executor.js +17 -0
- package/src/migrations/update-15-3-0/update-rollup-executor.js.map +1 -0
- package/src/utils/create-ts-config.d.ts +8 -0
- package/src/utils/create-ts-config.js +49 -0
- package/src/utils/create-ts-config.js.map +1 -0
- package/src/utils/versions.d.ts +6 -0
- package/src/utils/versions.js +8 -1
- package/src/utils/versions.js.map +1 -1
- package/src/generators/application/files/common/tsconfig.json__tmpl__ +0 -17
- package/src/generators/application/files/common-vite/tsconfig.json__tmpl__ +0 -29
- package/src/generators/library/files/common/tsconfig.json__tmpl__ +0 -17
- package/src/migrations/utils/rules.d.ts +0 -2
- package/src/migrations/utils/rules.js +0 -15
- package/src/migrations/utils/rules.js.map +0 -1
- package/src/migrations/utils/testing.d.ts +0 -6
- package/src/migrations/utils/testing.js +0 -76
- package/src/migrations/utils/testing.js.map +0 -1
|
@@ -1,17 +1,5 @@
|
|
|
1
1
|
import { GeneratorCallback, Tree } from '@nrwl/devkit';
|
|
2
2
|
import { Schema } from './schema';
|
|
3
|
-
export interface NormalizedSchema extends Schema {
|
|
4
|
-
name: string;
|
|
5
|
-
fileName: string;
|
|
6
|
-
projectRoot: string;
|
|
7
|
-
routePath: string;
|
|
8
|
-
projectDirectory: string;
|
|
9
|
-
parsedTags: string[];
|
|
10
|
-
appMain?: string;
|
|
11
|
-
appSourceRoot?: string;
|
|
12
|
-
libsDir?: string;
|
|
13
|
-
unitTestRunner: 'jest' | 'vitest' | 'none';
|
|
14
|
-
}
|
|
15
3
|
export declare function libraryGenerator(host: Tree, schema: Schema): Promise<GeneratorCallback>;
|
|
16
4
|
export default libraryGenerator;
|
|
17
5
|
export declare const librarySchematic: (generatorOptions: Schema) => (tree: any, context: any) => Promise<any>;
|
|
@@ -3,21 +3,19 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.librarySchematic = exports.libraryGenerator = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const devkit_1 = require("@nrwl/devkit");
|
|
6
|
-
const path_1 = require("nx/src/utils/path");
|
|
7
|
-
const jest_1 = require("@nrwl/jest");
|
|
8
|
-
const versions_1 = require("@nrwl/js/src/utils/versions");
|
|
9
|
-
const linter_1 = require("@nrwl/linter");
|
|
10
6
|
const run_tasks_in_serial_1 = require("@nrwl/workspace/src/utilities/run-tasks-in-serial");
|
|
11
|
-
const
|
|
12
|
-
const ts = require("typescript");
|
|
13
|
-
const ast_utils_1 = require("../../utils/ast-utils");
|
|
14
|
-
const lint_1 = require("../../utils/lint");
|
|
15
|
-
const versions_2 = require("../../utils/versions");
|
|
7
|
+
const versions_1 = require("../../utils/versions");
|
|
16
8
|
const component_1 = require("../component/component");
|
|
17
9
|
const init_1 = require("../init/init");
|
|
18
10
|
const jest_utils_1 = require("../../utils/jest-utils");
|
|
19
|
-
const vite_1 = require("@nrwl/vite");
|
|
20
11
|
const normalize_options_1 = require("./lib/normalize-options");
|
|
12
|
+
const add_rollup_build_target_1 = require("./lib/add-rollup-build-target");
|
|
13
|
+
const add_linting_1 = require("./lib/add-linting");
|
|
14
|
+
const update_app_routes_1 = require("./lib/update-app-routes");
|
|
15
|
+
const create_files_1 = require("./lib/create-files");
|
|
16
|
+
const update_base_tsconfig_1 = require("./lib/update-base-tsconfig");
|
|
17
|
+
const create_ts_config_1 = require("../../utils/create-ts-config");
|
|
18
|
+
const install_common_dependencies_1 = require("./lib/install-common-dependencies");
|
|
21
19
|
function libraryGenerator(host, schema) {
|
|
22
20
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
23
21
|
const tasks = [];
|
|
@@ -28,17 +26,27 @@ function libraryGenerator(host, schema) {
|
|
|
28
26
|
if (!options.component) {
|
|
29
27
|
options.style = 'none';
|
|
30
28
|
}
|
|
29
|
+
(0, create_ts_config_1.extractTsConfigBase)(host);
|
|
31
30
|
const initTask = yield (0, init_1.default)(host, Object.assign(Object.assign({}, options), { e2eTestRunner: 'none', skipFormat: true, skipBabelConfig: options.bundler === 'vite', skipHelperLibs: options.bundler === 'vite' }));
|
|
32
31
|
tasks.push(initTask);
|
|
33
|
-
|
|
34
|
-
|
|
32
|
+
(0, devkit_1.addProjectConfiguration)(host, options.name, {
|
|
33
|
+
root: options.projectRoot,
|
|
34
|
+
sourceRoot: (0, devkit_1.joinPathFragments)(options.projectRoot, 'src'),
|
|
35
|
+
projectType: 'library',
|
|
36
|
+
tags: options.parsedTags,
|
|
37
|
+
targets: {},
|
|
38
|
+
}, options.standaloneConfig);
|
|
39
|
+
const lintTask = yield (0, add_linting_1.addLinting)(host, options);
|
|
35
40
|
tasks.push(lintTask);
|
|
36
|
-
createFiles(host, options);
|
|
41
|
+
(0, create_files_1.createFiles)(host, options);
|
|
37
42
|
if (!options.skipTsConfig) {
|
|
38
|
-
updateBaseTsConfig(host, options);
|
|
43
|
+
(0, update_base_tsconfig_1.updateBaseTsConfig)(host, options);
|
|
39
44
|
}
|
|
45
|
+
// Set up build target
|
|
40
46
|
if (options.buildable && options.bundler === 'vite') {
|
|
41
|
-
|
|
47
|
+
yield (0, devkit_1.ensurePackage)(host, '@nrwl/vite', versions_1.nxVersion);
|
|
48
|
+
const { viteConfigurationGenerator } = yield Promise.resolve().then(() => require('@nrwl/vite'));
|
|
49
|
+
const viteTask = yield viteConfigurationGenerator(host, {
|
|
42
50
|
uiFramework: 'react',
|
|
43
51
|
project: options.name,
|
|
44
52
|
newProject: true,
|
|
@@ -48,8 +56,15 @@ function libraryGenerator(host, schema) {
|
|
|
48
56
|
});
|
|
49
57
|
tasks.push(viteTask);
|
|
50
58
|
}
|
|
59
|
+
else if (options.buildable && options.bundler === 'rollup') {
|
|
60
|
+
const rollupTask = yield (0, add_rollup_build_target_1.addRollupBuildTarget)(host, options);
|
|
61
|
+
tasks.push(rollupTask);
|
|
62
|
+
}
|
|
63
|
+
// Set up test target
|
|
51
64
|
if (options.unitTestRunner === 'jest') {
|
|
52
|
-
|
|
65
|
+
yield (0, devkit_1.ensurePackage)(host, '@nrwl/jest', versions_1.nxVersion);
|
|
66
|
+
const { jestProjectGenerator } = yield Promise.resolve().then(() => require('@nrwl/jest'));
|
|
67
|
+
const jestTask = yield jestProjectGenerator(host, Object.assign(Object.assign({}, options), { project: options.name, setupFile: 'none', supportTsx: true, skipSerializers: true, compiler: options.compiler }));
|
|
53
68
|
tasks.push(jestTask);
|
|
54
69
|
const jestConfigPath = (0, devkit_1.joinPathFragments)(options.projectRoot, options.js ? 'jest.config.js' : 'jest.config.ts');
|
|
55
70
|
if (options.compiler === 'babel' && host.exists(jestConfigPath)) {
|
|
@@ -60,9 +75,12 @@ function libraryGenerator(host, schema) {
|
|
|
60
75
|
else if (options.unitTestRunner === 'vitest' &&
|
|
61
76
|
options.bundler !== 'vite' // tests are already configured if bundler is vite
|
|
62
77
|
) {
|
|
63
|
-
|
|
78
|
+
yield (0, devkit_1.ensurePackage)(host, '@nrwl/vite', versions_1.nxVersion);
|
|
79
|
+
const { vitestGenerator } = yield Promise.resolve().then(() => require('@nrwl/vite'));
|
|
80
|
+
const vitestTask = yield vitestGenerator(host, {
|
|
64
81
|
uiFramework: 'react',
|
|
65
82
|
project: options.name,
|
|
83
|
+
coverageProvider: 'c8',
|
|
66
84
|
inSourceTests: options.inSourceTests,
|
|
67
85
|
});
|
|
68
86
|
tasks.push(vitestTask);
|
|
@@ -83,16 +101,16 @@ function libraryGenerator(host, schema) {
|
|
|
83
101
|
tasks.push(componentTask);
|
|
84
102
|
}
|
|
85
103
|
if (options.publishable || options.buildable) {
|
|
86
|
-
|
|
104
|
+
(0, devkit_1.updateJson)(host, `${options.projectRoot}/package.json`, (json) => {
|
|
105
|
+
json.name = options.importPath;
|
|
106
|
+
return json;
|
|
107
|
+
});
|
|
87
108
|
}
|
|
88
109
|
if (!options.skipPackageJson) {
|
|
89
|
-
const
|
|
90
|
-
|
|
91
|
-
'react-dom': versions_2.reactDomVersion,
|
|
92
|
-
}, options.compiler === 'swc' ? { '@swc/core': versions_1.swcCoreVersion } : {});
|
|
93
|
-
tasks.push(installTask);
|
|
110
|
+
const installReactTask = yield (0, install_common_dependencies_1.installCommonDependencies)(host, options);
|
|
111
|
+
tasks.push(installReactTask);
|
|
94
112
|
}
|
|
95
|
-
const routeTask = updateAppRoutes(host, options);
|
|
113
|
+
const routeTask = (0, update_app_routes_1.updateAppRoutes)(host, options);
|
|
96
114
|
tasks.push(routeTask);
|
|
97
115
|
if (!options.skipFormat) {
|
|
98
116
|
yield (0, devkit_1.formatFiles)(host);
|
|
@@ -101,173 +119,6 @@ function libraryGenerator(host, schema) {
|
|
|
101
119
|
});
|
|
102
120
|
}
|
|
103
121
|
exports.libraryGenerator = libraryGenerator;
|
|
104
|
-
function addLinting(host, options) {
|
|
105
|
-
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
106
|
-
if (options.linter === linter_1.Linter.EsLint) {
|
|
107
|
-
const lintTask = yield (0, linter_1.lintProjectGenerator)(host, {
|
|
108
|
-
linter: options.linter,
|
|
109
|
-
project: options.name,
|
|
110
|
-
tsConfigPaths: [
|
|
111
|
-
(0, devkit_1.joinPathFragments)(options.projectRoot, 'tsconfig.lib.json'),
|
|
112
|
-
],
|
|
113
|
-
unitTestRunner: options.unitTestRunner,
|
|
114
|
-
eslintFilePatterns: [`${options.projectRoot}/**/*.{ts,tsx,js,jsx}`],
|
|
115
|
-
skipFormat: true,
|
|
116
|
-
skipPackageJson: options.skipPackageJson,
|
|
117
|
-
});
|
|
118
|
-
(0, devkit_1.updateJson)(host, (0, devkit_1.joinPathFragments)(options.projectRoot, '.eslintrc.json'), lint_1.extendReactEslintJson);
|
|
119
|
-
let installTask = () => { };
|
|
120
|
-
if (!options.skipPackageJson) {
|
|
121
|
-
installTask = yield (0, devkit_1.addDependenciesToPackageJson)(host, lint_1.extraEslintDependencies.dependencies, lint_1.extraEslintDependencies.devDependencies);
|
|
122
|
-
}
|
|
123
|
-
return (0, run_tasks_in_serial_1.runTasksInSerial)(lintTask, installTask);
|
|
124
|
-
}
|
|
125
|
-
else {
|
|
126
|
-
return () => { };
|
|
127
|
-
}
|
|
128
|
-
});
|
|
129
|
-
}
|
|
130
|
-
function addProject(host, options) {
|
|
131
|
-
var _a;
|
|
132
|
-
const targets = {};
|
|
133
|
-
if (options.publishable || options.buildable) {
|
|
134
|
-
const { libsDir } = (0, devkit_1.getWorkspaceLayout)(host);
|
|
135
|
-
const external = [];
|
|
136
|
-
if (options.style === '@emotion/styled') {
|
|
137
|
-
external.push('@emotion/react/jsx-runtime');
|
|
138
|
-
}
|
|
139
|
-
else {
|
|
140
|
-
external.push('react/jsx-runtime');
|
|
141
|
-
}
|
|
142
|
-
targets.build = {
|
|
143
|
-
executor: '@nrwl/web:rollup',
|
|
144
|
-
outputs: ['{options.outputPath}'],
|
|
145
|
-
options: {
|
|
146
|
-
outputPath: libsDir !== '.'
|
|
147
|
-
? `dist/${libsDir}/${options.projectDirectory}`
|
|
148
|
-
: `dist/${options.projectDirectory}`,
|
|
149
|
-
tsConfig: `${options.projectRoot}/tsconfig.lib.json`,
|
|
150
|
-
project: `${options.projectRoot}/package.json`,
|
|
151
|
-
entryFile: maybeJs(options, `${options.projectRoot}/src/index.ts`),
|
|
152
|
-
external,
|
|
153
|
-
rollupConfig: `@nrwl/react/plugins/bundle-rollup`,
|
|
154
|
-
compiler: (_a = options.compiler) !== null && _a !== void 0 ? _a : 'babel',
|
|
155
|
-
assets: [
|
|
156
|
-
{
|
|
157
|
-
glob: `${options.projectRoot}/README.md`,
|
|
158
|
-
input: '.',
|
|
159
|
-
output: '.',
|
|
160
|
-
},
|
|
161
|
-
],
|
|
162
|
-
},
|
|
163
|
-
};
|
|
164
|
-
}
|
|
165
|
-
(0, devkit_1.addProjectConfiguration)(host, options.name, {
|
|
166
|
-
root: options.projectRoot,
|
|
167
|
-
sourceRoot: (0, devkit_1.joinPathFragments)(options.projectRoot, 'src'),
|
|
168
|
-
projectType: 'library',
|
|
169
|
-
tags: options.parsedTags,
|
|
170
|
-
targets,
|
|
171
|
-
}, options.standaloneConfig);
|
|
172
|
-
}
|
|
173
|
-
function updateTsConfig(tree, options) {
|
|
174
|
-
(0, devkit_1.updateJson)(tree, (0, devkit_1.joinPathFragments)(options.projectRoot, 'tsconfig.json'), (json) => {
|
|
175
|
-
if (options.strict) {
|
|
176
|
-
json.compilerOptions = Object.assign(Object.assign({}, json.compilerOptions), { forceConsistentCasingInFileNames: true, strict: true, noImplicitOverride: true, noPropertyAccessFromIndexSignature: true, noImplicitReturns: true, noFallthroughCasesInSwitch: true });
|
|
177
|
-
}
|
|
178
|
-
return json;
|
|
179
|
-
});
|
|
180
|
-
}
|
|
181
|
-
function updateBaseTsConfig(host, options) {
|
|
182
|
-
(0, devkit_1.updateJson)(host, (0, typescript_1.getRootTsConfigPathInTree)(host), (json) => {
|
|
183
|
-
const c = json.compilerOptions;
|
|
184
|
-
c.paths = c.paths || {};
|
|
185
|
-
delete c.paths[options.name];
|
|
186
|
-
if (c.paths[options.importPath]) {
|
|
187
|
-
throw new Error(`You already have a library using the import path "${options.importPath}". Make sure to specify a unique one.`);
|
|
188
|
-
}
|
|
189
|
-
const { libsDir } = (0, devkit_1.getWorkspaceLayout)(host);
|
|
190
|
-
c.paths[options.importPath] = [
|
|
191
|
-
maybeJs(options, (0, devkit_1.joinPathFragments)(libsDir, `${options.projectDirectory}/src/index.ts`)),
|
|
192
|
-
];
|
|
193
|
-
return json;
|
|
194
|
-
});
|
|
195
|
-
}
|
|
196
|
-
function createFiles(host, options) {
|
|
197
|
-
const substitutions = Object.assign(Object.assign(Object.assign({}, options), (0, devkit_1.names)(options.name)), { tmpl: '', offsetFromRoot: (0, devkit_1.offsetFromRoot)(options.projectRoot), rootTsConfigPath: (0, typescript_1.getRelativePathToRootTsConfig)(host, options.projectRoot) });
|
|
198
|
-
(0, devkit_1.generateFiles)(host, (0, devkit_1.joinPathFragments)(__dirname, './files/common'), options.projectRoot, substitutions);
|
|
199
|
-
if (options.bundler === 'vite') {
|
|
200
|
-
(0, devkit_1.generateFiles)(host, (0, devkit_1.joinPathFragments)(__dirname, './files/vite'), options.projectRoot, substitutions);
|
|
201
|
-
if (host.exists((0, devkit_1.joinPathFragments)(options.projectRoot, '.babelrc'))) {
|
|
202
|
-
host.delete((0, devkit_1.joinPathFragments)(options.projectRoot, '.babelrc'));
|
|
203
|
-
}
|
|
204
|
-
}
|
|
205
|
-
if (!options.publishable && !options.buildable) {
|
|
206
|
-
host.delete(`${options.projectRoot}/package.json`);
|
|
207
|
-
}
|
|
208
|
-
if (options.js) {
|
|
209
|
-
(0, devkit_1.toJS)(host);
|
|
210
|
-
}
|
|
211
|
-
updateTsConfig(host, options);
|
|
212
|
-
}
|
|
213
|
-
function updateAppRoutes(host, options) {
|
|
214
|
-
if (!options.appMain || !options.appSourceRoot) {
|
|
215
|
-
return () => { };
|
|
216
|
-
}
|
|
217
|
-
const { content, source } = readComponent(host, options.appMain);
|
|
218
|
-
const componentImportPath = (0, ast_utils_1.findComponentImportPath)('App', source);
|
|
219
|
-
if (!componentImportPath) {
|
|
220
|
-
throw new Error(`Could not find App component in ${options.appMain} (Hint: you can omit --appProject, or make sure App exists)`);
|
|
221
|
-
}
|
|
222
|
-
const appComponentPath = (0, devkit_1.joinPathFragments)(options.appSourceRoot, maybeJs(options, `${componentImportPath}.tsx`));
|
|
223
|
-
const routerTask = (0, devkit_1.addDependenciesToPackageJson)(host, { 'react-router-dom': versions_2.reactRouterDomVersion }, { '@types/react-router-dom': versions_2.typesReactRouterDomVersion });
|
|
224
|
-
// addBrowserRouterToMain
|
|
225
|
-
const isRouterPresent = content.match(/react-router-dom/);
|
|
226
|
-
if (!isRouterPresent) {
|
|
227
|
-
const changes = (0, devkit_1.applyChangesToString)(content, (0, ast_utils_1.addBrowserRouter)(options.appMain, source));
|
|
228
|
-
host.write(options.appMain, changes);
|
|
229
|
-
}
|
|
230
|
-
// addInitialAppRoutes
|
|
231
|
-
{
|
|
232
|
-
const { content: componentContent, source: componentSource } = readComponent(host, appComponentPath);
|
|
233
|
-
const isComponentRouterPresent = componentContent.match(/react-router-dom/);
|
|
234
|
-
if (!isComponentRouterPresent) {
|
|
235
|
-
const changes = (0, devkit_1.applyChangesToString)(componentContent, (0, ast_utils_1.addInitialRoutes)(appComponentPath, componentSource));
|
|
236
|
-
host.write(appComponentPath, changes);
|
|
237
|
-
}
|
|
238
|
-
}
|
|
239
|
-
// addNewAppRoute
|
|
240
|
-
{
|
|
241
|
-
const { content: componentContent, source: componentSource } = readComponent(host, appComponentPath);
|
|
242
|
-
const { npmScope } = (0, devkit_1.getWorkspaceLayout)(host);
|
|
243
|
-
const changes = (0, devkit_1.applyChangesToString)(componentContent, (0, ast_utils_1.addRoute)(appComponentPath, componentSource, {
|
|
244
|
-
routePath: options.routePath,
|
|
245
|
-
componentName: (0, devkit_1.names)(options.name).className,
|
|
246
|
-
moduleName: (0, path_1.getImportPath)(npmScope, options.projectDirectory),
|
|
247
|
-
}));
|
|
248
|
-
host.write(appComponentPath, changes);
|
|
249
|
-
}
|
|
250
|
-
return routerTask;
|
|
251
|
-
}
|
|
252
|
-
function readComponent(host, path) {
|
|
253
|
-
if (!host.exists(path)) {
|
|
254
|
-
throw new Error(`Cannot find ${path}`);
|
|
255
|
-
}
|
|
256
|
-
const content = host.read(path, 'utf-8');
|
|
257
|
-
const source = ts.createSourceFile(path, content, ts.ScriptTarget.Latest, true);
|
|
258
|
-
return { content, source };
|
|
259
|
-
}
|
|
260
|
-
function updateLibPackageNpmScope(host, options) {
|
|
261
|
-
return (0, devkit_1.updateJson)(host, `${options.projectRoot}/package.json`, (json) => {
|
|
262
|
-
json.name = options.importPath;
|
|
263
|
-
return json;
|
|
264
|
-
});
|
|
265
|
-
}
|
|
266
|
-
function maybeJs(options, path) {
|
|
267
|
-
return options.js && (path.endsWith('.ts') || path.endsWith('.tsx'))
|
|
268
|
-
? path.replace(/\.tsx?$/, '.js')
|
|
269
|
-
: path;
|
|
270
|
-
}
|
|
271
122
|
exports.default = libraryGenerator;
|
|
272
123
|
exports.librarySchematic = (0, devkit_1.convertNxGenerator)(libraryGenerator);
|
|
273
124
|
//# sourceMappingURL=library.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"library.js","sourceRoot":"","sources":["../../../../../../packages/react/src/generators/library/library.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"library.js","sourceRoot":"","sources":["../../../../../../packages/react/src/generators/library/library.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,10 +1,10 @@
|
|
|
1
|
-
import { Linter } from '@nrwl/linter';
|
|
1
|
+
import type { Linter } from '@nrwl/linter';
|
|
2
2
|
import { SupportedStyles } from '../../../typings/style';
|
|
3
3
|
|
|
4
4
|
export interface Schema {
|
|
5
5
|
appProject?: string;
|
|
6
6
|
buildable?: boolean;
|
|
7
|
-
bundler?: 'rollup' | 'vite';
|
|
7
|
+
bundler?: 'none' | 'rollup' | 'vite';
|
|
8
8
|
compiler?: 'babel' | 'swc';
|
|
9
9
|
component?: boolean;
|
|
10
10
|
directory?: string;
|
|
@@ -28,3 +28,17 @@ export interface Schema {
|
|
|
28
28
|
unitTestRunner?: 'jest' | 'vitest' | 'none';
|
|
29
29
|
minimal?: boolean;
|
|
30
30
|
}
|
|
31
|
+
|
|
32
|
+
export interface NormalizedSchema extends Schema {
|
|
33
|
+
js: boolean;
|
|
34
|
+
name: string;
|
|
35
|
+
fileName: string;
|
|
36
|
+
projectRoot: string;
|
|
37
|
+
routePath: string;
|
|
38
|
+
projectDirectory: string;
|
|
39
|
+
parsedTags: string[];
|
|
40
|
+
appMain?: string;
|
|
41
|
+
appSourceRoot?: string;
|
|
42
|
+
libsDir?: string;
|
|
43
|
+
unitTestRunner: 'jest' | 'vitest' | 'none';
|
|
44
|
+
}
|
|
@@ -125,7 +125,8 @@
|
|
|
125
125
|
"buildable": {
|
|
126
126
|
"type": "boolean",
|
|
127
127
|
"default": false,
|
|
128
|
-
"description": "Generate a buildable library.
|
|
128
|
+
"description": "Generate a buildable library that uses rollup to bundle. Use 'bundler' option instead for greater control (none, vite, rollup).",
|
|
129
|
+
"x-deprecated": true
|
|
129
130
|
},
|
|
130
131
|
"importPath": {
|
|
131
132
|
"type": "string",
|
|
@@ -162,15 +163,16 @@
|
|
|
162
163
|
},
|
|
163
164
|
"bundler": {
|
|
164
165
|
"type": "string",
|
|
165
|
-
"description": "The bundler to use.",
|
|
166
|
-
"enum": ["vite", "rollup"],
|
|
167
|
-
"
|
|
166
|
+
"description": "The bundler to use. Choosing 'none' means this library is not buildable.",
|
|
167
|
+
"enum": ["none", "vite", "rollup"],
|
|
168
|
+
"default": "none",
|
|
169
|
+
"x-prompt": "Which bundler would you like to use to build the library? Choose 'none' to skip build setup."
|
|
168
170
|
},
|
|
169
171
|
"compiler": {
|
|
170
172
|
"type": "string",
|
|
171
173
|
"enum": ["babel", "swc"],
|
|
172
174
|
"default": "babel",
|
|
173
|
-
"description": "Which compiler to use.
|
|
175
|
+
"description": "Which compiler to use. Only applies to `bundler: 'rollup'`."
|
|
174
176
|
},
|
|
175
177
|
"skipPackageJson": {
|
|
176
178
|
"description": "Do not add dependencies to `package.json`.",
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
{
|
|
2
2
|
"$schema": "http://json-schema.org/schema",
|
|
3
|
-
"$id": "
|
|
3
|
+
"$id": "GeneratorReactSSRSetup",
|
|
4
4
|
"cli": "nx",
|
|
5
|
-
"title": "Generate
|
|
6
|
-
"description": "Create the additional configuration required to enable SSR via
|
|
5
|
+
"title": "Generate SSR setup for a React app",
|
|
6
|
+
"description": "Create the additional configuration required to enable SSR via Express for a React application.",
|
|
7
7
|
"type": "object",
|
|
8
8
|
"properties": {
|
|
9
9
|
"project": {
|
|
@@ -18,7 +18,7 @@
|
|
|
18
18
|
},
|
|
19
19
|
"appComponentImportPath": {
|
|
20
20
|
"type": "string",
|
|
21
|
-
"description": "The import path of the <App
|
|
21
|
+
"description": "The import path of the <App/ > component, relative to project sourceRoot.",
|
|
22
22
|
"default": "app/app"
|
|
23
23
|
},
|
|
24
24
|
"serverPort": {
|
|
@@ -6,7 +6,7 @@ export interface StorybookStoriesSchema {
|
|
|
6
6
|
cypressProject?: string;
|
|
7
7
|
ignorePaths?: string[];
|
|
8
8
|
}
|
|
9
|
-
export declare function projectRootPath(config: ProjectConfiguration): string
|
|
9
|
+
export declare function projectRootPath(tree: Tree, config: ProjectConfiguration): Promise<string>;
|
|
10
10
|
export declare function containsComponentDeclaration(tree: Tree, componentPath: string): boolean;
|
|
11
11
|
export declare function createAllStories(tree: Tree, projectName: string, generateCypressSpecs: boolean, js: boolean, cypressProject?: string, ignorePaths?: string[]): Promise<void>;
|
|
12
12
|
export declare function storiesGenerator(host: Tree, schema: StorybookStoriesSchema): Promise<void>;
|
|
@@ -8,26 +8,28 @@ const ast_utils_1 = require("../../utils/ast-utils");
|
|
|
8
8
|
const ts = require("typescript");
|
|
9
9
|
const devkit_1 = require("@nrwl/devkit");
|
|
10
10
|
const path_1 = require("path");
|
|
11
|
-
const utilities_1 = require("@nrwl/storybook/src/utils/utilities");
|
|
12
11
|
const minimatch = require("minimatch");
|
|
13
|
-
function projectRootPath(config) {
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
if (
|
|
18
|
-
|
|
19
|
-
|
|
12
|
+
function projectRootPath(tree, config) {
|
|
13
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
14
|
+
const { findStorybookAndBuildTargetsAndCompiler } = yield Promise.resolve().then(() => require('@nrwl/storybook/src/utils/utilities'));
|
|
15
|
+
let projectDir;
|
|
16
|
+
if (config.projectType === 'application') {
|
|
17
|
+
const { nextBuildTarget } = findStorybookAndBuildTargetsAndCompiler(config.targets);
|
|
18
|
+
if (!!nextBuildTarget) {
|
|
19
|
+
// Next.js apps
|
|
20
|
+
projectDir = 'components';
|
|
21
|
+
}
|
|
22
|
+
else {
|
|
23
|
+
// apps/test-app/src/app
|
|
24
|
+
projectDir = 'app';
|
|
25
|
+
}
|
|
20
26
|
}
|
|
21
|
-
else {
|
|
22
|
-
//
|
|
23
|
-
projectDir = '
|
|
27
|
+
else if (config.projectType == 'library') {
|
|
28
|
+
// libs/test-lib/src/lib
|
|
29
|
+
projectDir = 'lib';
|
|
24
30
|
}
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
// libs/test-lib/src/lib
|
|
28
|
-
projectDir = 'lib';
|
|
29
|
-
}
|
|
30
|
-
return (0, devkit_1.joinPathFragments)(config.sourceRoot, projectDir);
|
|
31
|
+
return (0, devkit_1.joinPathFragments)(config.sourceRoot, projectDir);
|
|
32
|
+
});
|
|
31
33
|
}
|
|
32
34
|
exports.projectRootPath = projectRootPath;
|
|
33
35
|
function containsComponentDeclaration(tree, componentPath) {
|
|
@@ -43,11 +45,13 @@ function containsComponentDeclaration(tree, componentPath) {
|
|
|
43
45
|
exports.containsComponentDeclaration = containsComponentDeclaration;
|
|
44
46
|
function createAllStories(tree, projectName, generateCypressSpecs, js, cypressProject, ignorePaths) {
|
|
45
47
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
48
|
+
const { isTheFileAStory } = yield Promise.resolve().then(() => require('@nrwl/storybook/src/utils/utilities'));
|
|
46
49
|
const projects = (0, devkit_1.getProjects)(tree);
|
|
47
50
|
const projectConfiguration = projects.get(projectName);
|
|
48
51
|
const { sourceRoot, root } = projectConfiguration;
|
|
49
52
|
let componentPaths = [];
|
|
50
|
-
|
|
53
|
+
const projectPath = yield projectRootPath(tree, projectConfiguration);
|
|
54
|
+
(0, devkit_1.visitNotIgnoredFiles)(tree, projectPath, (path) => {
|
|
51
55
|
// Ignore private files starting with "_".
|
|
52
56
|
if ((0, path_1.basename)(path).startsWith('_'))
|
|
53
57
|
return;
|
|
@@ -57,7 +61,7 @@ function createAllStories(tree, projectName, generateCypressSpecs, js, cypressPr
|
|
|
57
61
|
(path.endsWith('.js') && !path.endsWith('.spec.js')) ||
|
|
58
62
|
(path.endsWith('.jsx') && !path.endsWith('.spec.jsx'))) {
|
|
59
63
|
// Check if file is NOT a story (either ts/tsx or js/jsx)
|
|
60
|
-
if (!
|
|
64
|
+
if (!isTheFileAStory(tree, path)) {
|
|
61
65
|
// Since the file is not a story
|
|
62
66
|
// Let's see if the .stories.* file exists
|
|
63
67
|
const ext = path.slice(path.lastIndexOf('.'));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stories.js","sourceRoot":"","sources":["../../../../../../packages/react/src/generators/stories/stories.ts"],"names":[],"mappings":";;;;AAAA,wEAAyE;AACzE,6FAA6F;AAC7F,qDAG+B;AAC/B,iCAAiC;AACjC,yCAQsB;AACtB,+BAAsC;AACtC,
|
|
1
|
+
{"version":3,"file":"stories.js","sourceRoot":"","sources":["../../../../../../packages/react/src/generators/stories/stories.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,12 +4,13 @@ exports.storybookConfigurationSchematic = exports.storybookConfigurationGenerato
|
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const stories_1 = require("../stories/stories");
|
|
6
6
|
const devkit_1 = require("@nrwl/devkit");
|
|
7
|
-
const
|
|
8
|
-
const project_name_1 = require("@nrwl/cypress/src/utils/project-name");
|
|
7
|
+
const versions_1 = require("../../utils/versions");
|
|
9
8
|
function generateStories(host, schema) {
|
|
10
9
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
10
|
+
yield (0, devkit_1.ensurePackage)(host, '@nrwl/cypress', versions_1.nxVersion);
|
|
11
|
+
const { getE2eProjectName } = yield Promise.resolve().then(() => require('@nrwl/cypress/src/utils/project-name'));
|
|
11
12
|
const projectConfig = (0, devkit_1.readProjectConfiguration)(host, schema.name);
|
|
12
|
-
const cypressProject =
|
|
13
|
+
const cypressProject = getE2eProjectName(schema.name, projectConfig.root, schema.cypressDirectory);
|
|
13
14
|
yield (0, stories_1.default)(host, {
|
|
14
15
|
project: schema.name,
|
|
15
16
|
generateCypressSpecs: schema.configureCypress && schema.generateCypressSpecs,
|
|
@@ -20,19 +21,21 @@ function generateStories(host, schema) {
|
|
|
20
21
|
});
|
|
21
22
|
}
|
|
22
23
|
function storybookConfigurationGenerator(host, schema) {
|
|
23
|
-
var _a;
|
|
24
|
+
var _a, _b;
|
|
24
25
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
25
|
-
|
|
26
|
+
yield (0, devkit_1.ensurePackage)(host, '@nrwl/storybook', versions_1.nxVersion);
|
|
27
|
+
const { configurationGenerator } = yield Promise.resolve().then(() => require('@nrwl/storybook'));
|
|
28
|
+
let bundler = (_a = schema.bundler) !== null && _a !== void 0 ? _a : 'webpack';
|
|
26
29
|
const projectConfig = (0, devkit_1.readProjectConfiguration)(host, schema.name);
|
|
27
30
|
if (projectConfig.projectType === 'application' &&
|
|
28
|
-
((
|
|
31
|
+
((_b = projectConfig.targets['build']) === null || _b === void 0 ? void 0 : _b.executor) === '@nrwl/vite:build') {
|
|
29
32
|
bundler = 'vite';
|
|
30
33
|
if (schema.bundler !== 'vite') {
|
|
31
34
|
devkit_1.logger.info(`The project ${schema.name} is set up to use Vite. So
|
|
32
35
|
Storybook will be configured to use Vite as well.`);
|
|
33
36
|
}
|
|
34
37
|
}
|
|
35
|
-
const installTask = yield
|
|
38
|
+
const installTask = yield configurationGenerator(host, {
|
|
36
39
|
name: schema.name,
|
|
37
40
|
uiFramework: '@storybook/react',
|
|
38
41
|
configureCypress: schema.configureCypress,
|
|
@@ -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,yCAMsB;AACtB,mDAAiD;AAEjD,SAAe,eAAe,CAAC,IAAU,EAAE,MAAgC;;QACzE,MAAM,IAAA,sBAAa,EAAC,IAAI,EAAE,eAAe,EAAE,oBAAS,CAAC,CAAC;QACtD,MAAM,EAAE,iBAAiB,EAAE,GAAG,2CAC5B,sCAAsC,EACvC,CAAC;QACF,MAAM,aAAa,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC;QAClE,MAAM,cAAc,GAAG,iBAAiB,CACtC,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,MAAM,IAAA,sBAAa,EAAC,IAAI,EAAE,iBAAiB,EAAE,oBAAS,CAAC,CAAC;QACxD,MAAM,EAAE,sBAAsB,EAAE,GAAG,2CAAa,iBAAiB,EAAC,CAAC;QAEnE,IAAI,OAAO,GAAG,MAAA,MAAM,CAAC,OAAO,mCAAI,SAAS,CAAC;QAC1C,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,sBAAsB,CAAC,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;AAxCD,0EAwCC;AAED,kBAAe,+BAA+B,CAAC;AAClC,QAAA,+BAA+B,GAAG,IAAA,2BAAkB,EAC/D,+BAA+B,CAChC,CAAC"}
|
|
@@ -80,9 +80,7 @@
|
|
|
80
80
|
},
|
|
81
81
|
"bundler": {
|
|
82
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"
|
|
83
|
+
"enum": ["vite", "webpack"]
|
|
86
84
|
}
|
|
87
85
|
},
|
|
88
86
|
"required": ["name"],
|