@nx/react 16.0.0-beta.5 → 16.0.0-beta.7
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/package.json +7 -7
- package/src/generators/application/application.js +23 -0
- package/src/generators/application/application.js.map +1 -1
- package/src/generators/application/files/style-css-module/src/app/__fileName__.tsx__tmpl__ +2 -2
- package/src/generators/application/files/style-global-css/src/app/__fileName__.tsx__tmpl__ +2 -2
- package/src/generators/application/files/style-none/src/app/__fileName__.tsx__tmpl__ +2 -2
- package/src/generators/application/files/style-styled-jsx/src/app/__fileName__.tsx__tmpl__ +3 -3
- package/src/generators/cypress-component-configuration/cypress-component-configuration.js +12 -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 +2 -2
- package/src/generators/cypress-component-configuration/lib/add-files.js +3 -36
- package/src/generators/cypress-component-configuration/lib/add-files.js.map +1 -1
- package/src/generators/library/library.js +1 -1
- package/src/generators/library/library.js.map +1 -1
- package/src/utils/ct-utils.d.ts +12 -0
- package/src/utils/ct-utils.js +63 -0
- package/src/utils/ct-utils.js.map +1 -0
- package/src/utils/versions.d.ts +1 -0
- package/src/utils/versions.js +2 -1
- package/src/utils/versions.js.map +1 -1
- package/src/generators/cypress-component-configuration/lib/update-configs.d.ts +0 -7
- package/src/generators/cypress-component-configuration/lib/update-configs.js +0 -32
- package/src/generators/cypress-component-configuration/lib/update-configs.js.map +0 -1
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nx/react",
|
|
3
|
-
"version": "16.0.0-beta.
|
|
3
|
+
"version": "16.0.0-beta.7",
|
|
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,11 +31,11 @@
|
|
|
31
31
|
"migrations": "./migrations.json"
|
|
32
32
|
},
|
|
33
33
|
"dependencies": {
|
|
34
|
-
"@nrwl/react": "16.0.0-beta.
|
|
35
|
-
"@nx/devkit": "16.0.0-beta.
|
|
36
|
-
"@nx/js": "16.0.0-beta.
|
|
37
|
-
"@nx/linter": "16.0.0-beta.
|
|
38
|
-
"@nx/web": "16.0.0-beta.
|
|
34
|
+
"@nrwl/react": "16.0.0-beta.7",
|
|
35
|
+
"@nx/devkit": "16.0.0-beta.7",
|
|
36
|
+
"@nx/js": "16.0.0-beta.7",
|
|
37
|
+
"@nx/linter": "16.0.0-beta.7",
|
|
38
|
+
"@nx/web": "16.0.0-beta.7",
|
|
39
39
|
"@phenomnomnominal/tsquery": "~5.0.1",
|
|
40
40
|
"@svgr/webpack": "^6.1.2",
|
|
41
41
|
"chalk": "^4.1.0",
|
|
@@ -46,5 +46,5 @@
|
|
|
46
46
|
"access": "public"
|
|
47
47
|
},
|
|
48
48
|
"types": "./index.d.ts",
|
|
49
|
-
"gitHead": "
|
|
49
|
+
"gitHead": "eb477479bf73bca940323a66e486221f00006c0f"
|
|
50
50
|
}
|
|
@@ -20,6 +20,7 @@ const versions_1 = require("../../utils/versions");
|
|
|
20
20
|
const install_common_dependencies_1 = require("./lib/install-common-dependencies");
|
|
21
21
|
const create_ts_config_1 = require("../../utils/create-ts-config");
|
|
22
22
|
const add_swc_dependencies_1 = require("@nx/js/src/utils/swc/add-swc-dependencies");
|
|
23
|
+
const chalk = require("chalk");
|
|
23
24
|
function addLinting(host, options) {
|
|
24
25
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
25
26
|
const tasks = [];
|
|
@@ -131,6 +132,28 @@ function applicationGenerator(host, schema) {
|
|
|
131
132
|
const routingTask = (0, add_routing_1.addRouting)(host, options);
|
|
132
133
|
tasks.push(routingTask);
|
|
133
134
|
(0, set_defaults_1.setDefaults)(host, options);
|
|
135
|
+
if (options.bundler === 'rspack' && options.style === 'styled-jsx') {
|
|
136
|
+
devkit_1.logger.warn(`${chalk.bold('styled-jsx')} is not supported by ${chalk.bold('Rspack')}. We've added ${chalk.bold('babel-loader')} to your project, but using babel will slow down your build.`);
|
|
137
|
+
tasks.push((0, devkit_1.addDependenciesToPackageJson)(host, {}, { 'babel-loader': versions_1.babelLoaderVersion }));
|
|
138
|
+
host.write((0, devkit_1.joinPathFragments)(options.appProjectRoot, 'rspack.config.js'), (0, devkit_1.stripIndents) `
|
|
139
|
+
const { composePlugins, withNx, withWeb } = require('@nrwl/rspack');
|
|
140
|
+
module.exports = composePlugins(withNx(), withWeb(), (config) => {
|
|
141
|
+
config.module.rules.push({
|
|
142
|
+
test: /\\.[jt]sx$/i,
|
|
143
|
+
use: [
|
|
144
|
+
{
|
|
145
|
+
loader: 'babel-loader',
|
|
146
|
+
options: {
|
|
147
|
+
presets: ['@babel/preset-typescript'],
|
|
148
|
+
plugins: ['styled-jsx/babel'],
|
|
149
|
+
},
|
|
150
|
+
},
|
|
151
|
+
],
|
|
152
|
+
});
|
|
153
|
+
return config;
|
|
154
|
+
});
|
|
155
|
+
`);
|
|
156
|
+
}
|
|
134
157
|
if (!options.skipFormat) {
|
|
135
158
|
yield (0, devkit_1.formatFiles)(host);
|
|
136
159
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"application.js","sourceRoot":"","sources":["../../../../../../packages/react/src/generators/application/application.ts"],"names":[],"mappings":";;;;AAAA,2CAG0B;AAE1B,6EAAwE;AACxE,iEAA4D;AAC5D,+DAA2D;AAC3D,mDAAwD;AACxD,mDAA+C;AAC/C,6CAAyC;AACzC,mDAA+C;AAC/C,qDAAiD;AACjD,iFAAkF;AAClF,
|
|
1
|
+
{"version":3,"file":"application.js","sourceRoot":"","sources":["../../../../../../packages/react/src/generators/application/application.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,7 +14,7 @@ export class App extends Component {
|
|
|
14
14
|
export function App() {
|
|
15
15
|
<% } %>
|
|
16
16
|
return (
|
|
17
|
-
|
|
17
|
+
<div>
|
|
18
18
|
<% if (!minimal) { %>
|
|
19
19
|
<NxWelcome title="<%= projectName %>"/>
|
|
20
20
|
<% } else { %>
|
|
@@ -23,7 +23,7 @@ export function App() {
|
|
|
23
23
|
Welcome <%= projectName %> 👋
|
|
24
24
|
</h1>
|
|
25
25
|
<% } %>
|
|
26
|
-
|
|
26
|
+
</div>);
|
|
27
27
|
<% if (classComponent) { %>
|
|
28
28
|
}
|
|
29
29
|
}
|
|
@@ -13,7 +13,7 @@ export class App extends Component {
|
|
|
13
13
|
export function App() {
|
|
14
14
|
<% } %>
|
|
15
15
|
return (
|
|
16
|
-
|
|
16
|
+
<div>
|
|
17
17
|
<% if (!minimal) { %>
|
|
18
18
|
<NxWelcome title="<%= projectName %>"/>
|
|
19
19
|
<% } else { %>
|
|
@@ -22,7 +22,7 @@ export function App() {
|
|
|
22
22
|
Welcome <%= projectName %> 👋
|
|
23
23
|
</h1>
|
|
24
24
|
<% } %>
|
|
25
|
-
|
|
25
|
+
</div>);
|
|
26
26
|
<% if (classComponent) { %>
|
|
27
27
|
}
|
|
28
28
|
}
|
|
@@ -12,7 +12,7 @@ export class App extends Component {
|
|
|
12
12
|
export function App() {
|
|
13
13
|
<% } %>
|
|
14
14
|
return (
|
|
15
|
-
|
|
15
|
+
<div>
|
|
16
16
|
<% if (!minimal) { %>
|
|
17
17
|
<NxWelcome title="<%= projectName %>"/>
|
|
18
18
|
<% } else { %>
|
|
@@ -21,7 +21,7 @@ export function App() {
|
|
|
21
21
|
Welcome <%= projectName %> 👋
|
|
22
22
|
</h1>
|
|
23
23
|
<% } %>
|
|
24
|
-
|
|
24
|
+
</div>);
|
|
25
25
|
<% if (classComponent) { %>
|
|
26
26
|
}
|
|
27
27
|
}
|
|
@@ -12,9 +12,9 @@ export class App extends Component {
|
|
|
12
12
|
export function App() {
|
|
13
13
|
<% } %>
|
|
14
14
|
return (
|
|
15
|
-
|
|
15
|
+
<div>
|
|
16
16
|
<style jsx>{`/** your style here **/`}</style>
|
|
17
|
-
|
|
17
|
+
</div>
|
|
18
18
|
);
|
|
19
19
|
|
|
20
20
|
<% if (classComponent) { %>
|
|
@@ -26,4 +26,4 @@ export function App() {
|
|
|
26
26
|
|
|
27
27
|
export default App;
|
|
28
28
|
|
|
29
|
-
<% if (inSourceTests === true) { %> <%- inSourceVitestTests %> <% } %>
|
|
29
|
+
<% if (inSourceTests === true) { %> <%- inSourceVitestTests %> <% } %>
|
|
@@ -5,7 +5,7 @@ const tslib_1 = require("tslib");
|
|
|
5
5
|
const devkit_1 = require("@nx/devkit");
|
|
6
6
|
const versions_1 = require("../../utils/versions");
|
|
7
7
|
const add_files_1 = require("./lib/add-files");
|
|
8
|
-
const
|
|
8
|
+
const ct_utils_1 = require("../../utils/ct-utils");
|
|
9
9
|
/**
|
|
10
10
|
* This is for using cypresses own Component testing, if you want to use test
|
|
11
11
|
* storybook components then use componentCypressGenerator instead.
|
|
@@ -19,9 +19,18 @@ function cypressComponentConfigGenerator(tree, options) {
|
|
|
19
19
|
project: options.project,
|
|
20
20
|
skipFormat: true,
|
|
21
21
|
});
|
|
22
|
-
const found = yield (0,
|
|
22
|
+
const found = yield (0, ct_utils_1.addCTTargetWithBuildTarget)(tree, {
|
|
23
|
+
project: options.project,
|
|
24
|
+
buildTarget: options.buildTarget,
|
|
25
|
+
validExecutorNames: new Set([
|
|
26
|
+
'@nx/webpack:webpack',
|
|
27
|
+
'@nx/vite:build',
|
|
28
|
+
'@nrwl/webpack:webpack',
|
|
29
|
+
'@nrwl/vite:build',
|
|
30
|
+
]),
|
|
31
|
+
});
|
|
23
32
|
yield (0, add_files_1.addFiles)(tree, projectConfig, options, found);
|
|
24
|
-
if (options.skipFormat) {
|
|
33
|
+
if (!options.skipFormat) {
|
|
25
34
|
yield (0, devkit_1.formatFiles)(tree);
|
|
26
35
|
}
|
|
27
36
|
return () => {
|
package/src/generators/cypress-component-configuration/cypress-component-configuration.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cypress-component-configuration.js","sourceRoot":"","sources":["../../../../../../packages/react/src/generators/cypress-component-configuration/cypress-component-configuration.ts"],"names":[],"mappings":";;;;AAAA,uCAKoB;AACpB,mDAAiD;AACjD,+CAA2C;AAC3C,
|
|
1
|
+
{"version":3,"file":"cypress-component-configuration.js","sourceRoot":"","sources":["../../../../../../packages/react/src/generators/cypress-component-configuration/cypress-component-configuration.ts"],"names":[],"mappings":";;;;AAAA,uCAKoB;AACpB,mDAAiD;AACjD,+CAA2C;AAC3C,mDAA+E;AAG/E;;;;GAIG;AACH,SAAsB,+BAA+B,CACnD,IAAU,EACV,OAA4C;;QAE5C,MAAM,EAAE,uBAAuB,EAAE,GAAG,IAAA,sBAAa,EAAC,aAAa,EAAE,oBAAS,CAAC,CAAC;QAC5E,MAAM,aAAa,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;QACtE,MAAM,WAAW,GAAG,MAAM,uBAAuB,CAAC,IAAI,EAAE;YACtD,OAAO,EAAE,OAAO,CAAC,OAAO;YACxB,UAAU,EAAE,IAAI;SACjB,CAAC,CAAC;QAEH,MAAM,KAAK,GAAgB,MAAM,IAAA,qCAA0B,EAAC,IAAI,EAAE;YAChE,OAAO,EAAE,OAAO,CAAC,OAAO;YACxB,WAAW,EAAE,OAAO,CAAC,WAAW;YAChC,kBAAkB,EAAE,IAAI,GAAG,CAAS;gBAClC,qBAAqB;gBACrB,gBAAgB;gBAChB,uBAAuB;gBACvB,kBAAkB;aACnB,CAAC;SACH,CAAC,CAAC;QAEH,MAAM,IAAA,oBAAQ,EAAC,IAAI,EAAE,aAAa,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC;QAEpD,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;YACvB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;QAED,OAAO,GAAG,EAAE;YACV,WAAW,EAAE,CAAC;QAChB,CAAC,CAAC;IACJ,CAAC;CAAA;AA/BD,0EA+BC;AAED,kBAAe,+BAA+B,CAAC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
import { ProjectConfiguration, Tree } from '@nx/devkit';
|
|
2
|
-
import { CypressComponentConfigurationSchema } from '../schema';
|
|
3
|
-
import { FoundTarget } from '
|
|
2
|
+
import type { CypressComponentConfigurationSchema } from '../schema';
|
|
3
|
+
import { FoundTarget } from '../../../utils/ct-utils';
|
|
4
4
|
export declare function addFiles(tree: Tree, projectConfig: ProjectConfiguration, options: CypressComponentConfigurationSchema, found: FoundTarget): Promise<void>;
|
|
@@ -4,12 +4,8 @@ exports.addFiles = void 0;
|
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const devkit_1 = require("@nx/devkit");
|
|
6
6
|
const versions_1 = require("nx/src/utils/versions");
|
|
7
|
-
const ast_utils_1 = require("../../../utils/ast-utils");
|
|
8
7
|
const component_test_1 = require("../../component-test/component-test");
|
|
9
|
-
const
|
|
10
|
-
let tsModule;
|
|
11
|
-
const allowedFileExt = new RegExp(/\.[jt]sx?/g);
|
|
12
|
-
const isSpecFile = new RegExp(/(spec|test)\./g);
|
|
8
|
+
const ct_utils_1 = require("../../../utils/ct-utils");
|
|
13
9
|
function addFiles(tree, projectConfig, options, found) {
|
|
14
10
|
var _a;
|
|
15
11
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
@@ -17,7 +13,7 @@ function addFiles(tree, projectConfig, options, found) {
|
|
|
17
13
|
if (tree.exists(cypressConfigPath)) {
|
|
18
14
|
tree.delete(cypressConfigPath);
|
|
19
15
|
}
|
|
20
|
-
const actualBundler = yield
|
|
16
|
+
const actualBundler = yield (0, ct_utils_1.getBundlerFromTarget)(found, tree);
|
|
21
17
|
if (options.bundler && options.bundler !== actualBundler) {
|
|
22
18
|
devkit_1.logger.warn(`You have specified ${options.bundler} as the bundler but this project is configured to use ${actualBundler}.
|
|
23
19
|
This may cause errors. If you are seeing errors, try removing the --bundler option.`);
|
|
@@ -33,7 +29,7 @@ function addFiles(tree, projectConfig, options, found) {
|
|
|
33
29
|
if (options.generateTests) {
|
|
34
30
|
const filePaths = [];
|
|
35
31
|
(0, devkit_1.visitNotIgnoredFiles)(tree, projectConfig.sourceRoot, (filePath) => {
|
|
36
|
-
if (isComponent(tree, filePath)) {
|
|
32
|
+
if ((0, ct_utils_1.isComponent)(tree, filePath)) {
|
|
37
33
|
filePaths.push(filePath);
|
|
38
34
|
}
|
|
39
35
|
});
|
|
@@ -47,33 +43,4 @@ function addFiles(tree, projectConfig, options, found) {
|
|
|
47
43
|
});
|
|
48
44
|
}
|
|
49
45
|
exports.addFiles = addFiles;
|
|
50
|
-
function getBundler(found, tree) {
|
|
51
|
-
var _a, _b, _c, _d, _e;
|
|
52
|
-
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
53
|
-
if (found.target && ((_a = found.config) === null || _a === void 0 ? void 0 : _a.executor)) {
|
|
54
|
-
return found.config.executor === '@nx/vite:build' ||
|
|
55
|
-
found.config.executor === '@nrwl/vite:build'
|
|
56
|
-
? 'vite'
|
|
57
|
-
: 'webpack';
|
|
58
|
-
}
|
|
59
|
-
const { target, project } = (0, devkit_1.parseTargetString)(found.target, yield (0, devkit_1.createProjectGraphAsync)());
|
|
60
|
-
const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, project);
|
|
61
|
-
return ((_c = (_b = projectConfig === null || projectConfig === void 0 ? void 0 : projectConfig.targets) === null || _b === void 0 ? void 0 : _b[target]) === null || _c === void 0 ? void 0 : _c.executor) === '@nx/vite:build' ||
|
|
62
|
-
((_e = (_d = projectConfig === null || projectConfig === void 0 ? void 0 : projectConfig.targets) === null || _d === void 0 ? void 0 : _d[target]) === null || _e === void 0 ? void 0 : _e.executor) === '@nrwl/vite:build'
|
|
63
|
-
? 'vite'
|
|
64
|
-
: 'webpack';
|
|
65
|
-
});
|
|
66
|
-
}
|
|
67
|
-
function isComponent(tree, filePath) {
|
|
68
|
-
if (!tsModule) {
|
|
69
|
-
tsModule = (0, ensure_typescript_1.ensureTypescript)();
|
|
70
|
-
}
|
|
71
|
-
if (isSpecFile.test(filePath) || !allowedFileExt.test(filePath)) {
|
|
72
|
-
return false;
|
|
73
|
-
}
|
|
74
|
-
const content = tree.read(filePath, 'utf-8');
|
|
75
|
-
const sourceFile = tsModule.createSourceFile(filePath, content, tsModule.ScriptTarget.Latest, true);
|
|
76
|
-
const cmpDeclaration = (0, ast_utils_1.getComponentNode)(sourceFile);
|
|
77
|
-
return !!cmpDeclaration;
|
|
78
|
-
}
|
|
79
46
|
//# sourceMappingURL=add-files.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add-files.js","sourceRoot":"","sources":["../../../../../../../packages/react/src/generators/cypress-component-configuration/lib/add-files.ts"],"names":[],"mappings":";;;;AAAA,
|
|
1
|
+
{"version":3,"file":"add-files.js","sourceRoot":"","sources":["../../../../../../../packages/react/src/generators/cypress-component-configuration/lib/add-files.ts"],"names":[],"mappings":";;;;AAAA,uCAQoB;AACpB,oDAAkD;AAClD,wEAA6E;AAE7E,sDAIiC;AAEjC,SAAsB,QAAQ,CAC5B,IAAU,EACV,aAAmC,EACnC,OAA4C,EAC5C,KAAkB;;;QAElB,MAAM,iBAAiB,GAAG,IAAA,0BAAiB,EACzC,aAAa,CAAC,IAAI,EAClB,mBAAmB,CACpB,CAAC;QACF,IAAI,IAAI,CAAC,MAAM,CAAC,iBAAiB,CAAC,EAAE;YAClC,IAAI,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC;SAChC;QAED,MAAM,aAAa,GAAG,MAAM,IAAA,+BAAoB,EAAC,KAAK,EAAE,IAAI,CAAC,CAAC;QAE9D,IAAI,OAAO,CAAC,OAAO,IAAI,OAAO,CAAC,OAAO,KAAK,aAAa,EAAE;YACxD,eAAM,CAAC,IAAI,CACT,sBAAsB,OAAO,CAAC,OAAO,yDAAyD,aAAa;0FACvB,CACrF,CAAC;SACH;QAED,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,0BAAiB,EAAC,SAAS,EAAE,IAAI,EAAE,OAAO,CAAC,EAC3C,aAAa,CAAC,IAAI,EAClB;YACE,GAAG,EAAE,EAAE;YACP,OAAO,EAAE,MAAA,OAAO,CAAC,OAAO,mCAAI,aAAa;SAC1C,CACF,CAAC;QAEF,IACE,OAAO,CAAC,OAAO,KAAK,SAAS;YAC7B,CAAC,CAAC,OAAO,CAAC,OAAO,IAAI,aAAa,KAAK,SAAS,CAAC,EACjD;YACA,IAAA,qCAA4B,EAAC,IAAI,EAAE,EAAE,EAAE,EAAE,aAAa,EAAE,oBAAS,EAAE,CAAC,CAAC;SACtE;QAED,IAAI,OAAO,CAAC,aAAa,EAAE;YACzB,MAAM,SAAS,GAAG,EAAE,CAAC;YACrB,IAAA,6BAAoB,EAAC,IAAI,EAAE,aAAa,CAAC,UAAU,EAAE,CAAC,QAAQ,EAAE,EAAE;gBAChE,IAAI,IAAA,sBAAW,EAAC,IAAI,EAAE,QAAQ,CAAC,EAAE;oBAC/B,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;iBAC1B;YACH,CAAC,CAAC,CAAC;YAEH,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE;gBAChC,MAAM,IAAA,uCAAsB,EAAC,IAAI,EAAE;oBACjC,OAAO,EAAE,OAAO,CAAC,OAAO;oBACxB,aAAa,EAAE,QAAQ;iBACxB,CAAC,CAAC;aACJ;SACF;;CACF;AAvDD,4BAuDC"}
|
|
@@ -26,7 +26,7 @@ function libraryGenerator(host, schema) {
|
|
|
26
26
|
if (!options.component) {
|
|
27
27
|
options.style = 'none';
|
|
28
28
|
}
|
|
29
|
-
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' }));
|
|
29
|
+
const initTask = yield (0, init_1.default)(host, Object.assign(Object.assign({}, options), { e2eTestRunner: 'none', skipFormat: true, skipBabelConfig: options.bundler === 'vite' || options.compiler === 'swc', skipHelperLibs: options.bundler === 'vite' }));
|
|
30
30
|
tasks.push(initTask);
|
|
31
31
|
(0, devkit_1.addProjectConfiguration)(host, options.name, {
|
|
32
32
|
root: options.projectRoot,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"library.js","sourceRoot":"","sources":["../../../../../../packages/react/src/generators/library/library.ts"],"names":[],"mappings":";;;;AAAA,uCAUoB;AAEpB,+BAAyC;AAEzC,mDAAiD;AACjD,sDAAwD;AACxD,uCAAyC;AAEzC,uDAAiE;AACjE,+DAA2D;AAC3D,2EAAqE;AACrE,mDAA+C;AAC/C,+DAA0D;AAC1D,qDAAiD;AACjD,mEAAmE;AACnE,mFAA8E;AAC9E,qDAAiD;AAEjD,SAAsB,gBAAgB,CAAC,IAAU,EAAE,MAAc;;QAC/D,MAAM,KAAK,GAAwB,EAAE,CAAC;QAEtC,MAAM,OAAO,GAAG,IAAA,oCAAgB,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAC/C,IAAI,OAAO,CAAC,WAAW,KAAK,IAAI,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE;YACtD,MAAM,IAAI,KAAK,CACb,oJAAoJ,CACrJ,CAAC;SACH;QACD,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE;YACtB,OAAO,CAAC,KAAK,GAAG,MAAM,CAAC;SACxB;QAED,MAAM,QAAQ,GAAG,MAAM,IAAA,cAAa,EAAC,IAAI,kCACpC,OAAO,KACV,aAAa,EAAE,MAAM,EACrB,UAAU,EAAE,IAAI,EAChB,eAAe,EAAE,OAAO,CAAC,OAAO,KAAK,MAAM,
|
|
1
|
+
{"version":3,"file":"library.js","sourceRoot":"","sources":["../../../../../../packages/react/src/generators/library/library.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
import { TargetConfiguration, Tree } from '@nx/devkit';
|
|
2
|
+
export interface FoundTarget {
|
|
3
|
+
config?: TargetConfiguration;
|
|
4
|
+
target: string;
|
|
5
|
+
}
|
|
6
|
+
export declare function addCTTargetWithBuildTarget(tree: Tree, options: {
|
|
7
|
+
project: string;
|
|
8
|
+
buildTarget: string;
|
|
9
|
+
validExecutorNames: Set<string>;
|
|
10
|
+
}): Promise<FoundTarget>;
|
|
11
|
+
export declare function getBundlerFromTarget(found: FoundTarget, tree: Tree): Promise<'vite' | 'webpack'>;
|
|
12
|
+
export declare function isComponent(tree: Tree, filePath: string): boolean;
|
|
@@ -0,0 +1,63 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.isComponent = exports.getBundlerFromTarget = exports.addCTTargetWithBuildTarget = void 0;
|
|
4
|
+
const tslib_1 = require("tslib");
|
|
5
|
+
const devkit_1 = require("@nx/devkit");
|
|
6
|
+
const ensure_typescript_1 = require("@nx/js/src/utils/typescript/ensure-typescript");
|
|
7
|
+
const ast_utils_1 = require("./ast-utils");
|
|
8
|
+
let tsModule;
|
|
9
|
+
const allowedFileExt = new RegExp(/\.[jt]sx?/g);
|
|
10
|
+
const isSpecFile = new RegExp(/(spec|test)\./g);
|
|
11
|
+
function addCTTargetWithBuildTarget(tree, options) {
|
|
12
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
13
|
+
const { findBuildConfig } = yield Promise.resolve().then(() => require('@nx/cypress/src/utils/find-target-options'));
|
|
14
|
+
const found = yield findBuildConfig(tree, {
|
|
15
|
+
project: options.project,
|
|
16
|
+
buildTarget: options.buildTarget,
|
|
17
|
+
validExecutorNames: options.validExecutorNames,
|
|
18
|
+
});
|
|
19
|
+
assertValidConfig(found === null || found === void 0 ? void 0 : found.config);
|
|
20
|
+
const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, options.project);
|
|
21
|
+
projectConfig.targets['component-test'].options = Object.assign(Object.assign({}, projectConfig.targets['component-test'].options), { devServerTarget: found.target, skipServe: true });
|
|
22
|
+
(0, devkit_1.updateProjectConfiguration)(tree, options.project, projectConfig);
|
|
23
|
+
return found;
|
|
24
|
+
});
|
|
25
|
+
}
|
|
26
|
+
exports.addCTTargetWithBuildTarget = addCTTargetWithBuildTarget;
|
|
27
|
+
function assertValidConfig(config) {
|
|
28
|
+
if (!config) {
|
|
29
|
+
throw new Error('Unable to find a valid build configuration. Try passing in a target for an app. --build-target=<project>:<target>[:<configuration>]');
|
|
30
|
+
}
|
|
31
|
+
}
|
|
32
|
+
function getBundlerFromTarget(found, tree) {
|
|
33
|
+
var _a, _b, _c;
|
|
34
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
35
|
+
if (found.target && ((_a = found.config) === null || _a === void 0 ? void 0 : _a.executor)) {
|
|
36
|
+
return found.config.executor === '@nrwl/vite:build' ||
|
|
37
|
+
found.config.executor === '@nx/vite:build'
|
|
38
|
+
? 'vite'
|
|
39
|
+
: 'webpack';
|
|
40
|
+
}
|
|
41
|
+
const { target, project } = (0, devkit_1.parseTargetString)(found.target, yield (0, devkit_1.createProjectGraphAsync)());
|
|
42
|
+
const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, project);
|
|
43
|
+
const executor = (_c = (_b = projectConfig === null || projectConfig === void 0 ? void 0 : projectConfig.targets) === null || _b === void 0 ? void 0 : _b[target]) === null || _c === void 0 ? void 0 : _c.executor;
|
|
44
|
+
return executor === '@nrwl/vite:build' || executor === '@nx/vite:build'
|
|
45
|
+
? 'vite'
|
|
46
|
+
: 'webpack';
|
|
47
|
+
});
|
|
48
|
+
}
|
|
49
|
+
exports.getBundlerFromTarget = getBundlerFromTarget;
|
|
50
|
+
function isComponent(tree, filePath) {
|
|
51
|
+
if (!tsModule) {
|
|
52
|
+
tsModule = (0, ensure_typescript_1.ensureTypescript)();
|
|
53
|
+
}
|
|
54
|
+
if (isSpecFile.test(filePath) || !allowedFileExt.test(filePath)) {
|
|
55
|
+
return false;
|
|
56
|
+
}
|
|
57
|
+
const content = tree.read(filePath, 'utf-8');
|
|
58
|
+
const sourceFile = tsModule.createSourceFile(filePath, content, tsModule.ScriptTarget.Latest, true);
|
|
59
|
+
const cmpDeclaration = (0, ast_utils_1.getComponentNode)(sourceFile);
|
|
60
|
+
return !!cmpDeclaration;
|
|
61
|
+
}
|
|
62
|
+
exports.isComponent = isComponent;
|
|
63
|
+
//# sourceMappingURL=ct-utils.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ct-utils.js","sourceRoot":"","sources":["../../../../../packages/react/src/utils/ct-utils.ts"],"names":[],"mappings":";;;;AAAA,uCAOoB;AACpB,qFAAiF;AACjF,2CAA+C;AAE/C,IAAI,QAAqC,CAAC;AAE1C,MAAM,cAAc,GAAG,IAAI,MAAM,CAAC,YAAY,CAAC,CAAC;AAChD,MAAM,UAAU,GAAG,IAAI,MAAM,CAAC,gBAAgB,CAAC,CAAC;AAOhD,SAAsB,0BAA0B,CAC9C,IAAU,EACV,OAIC;;QAED,MAAM,EAAE,eAAe,EAAE,GAAG,2CAC1B,2CAA2C,EAC5C,CAAC;QACF,MAAM,KAAK,GAAG,MAAM,eAAe,CAAC,IAAI,EAAE;YACxC,OAAO,EAAE,OAAO,CAAC,OAAO;YACxB,WAAW,EAAE,OAAO,CAAC,WAAW;YAChC,kBAAkB,EAAE,OAAO,CAAC,kBAAkB;SAC/C,CAAC,CAAC;QAEH,iBAAiB,CAAC,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,MAAM,CAAC,CAAC;QAEjC,MAAM,aAAa,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;QACtE,aAAa,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC,OAAO,mCAC1C,aAAa,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC,OAAO,KAClD,eAAe,EAAE,KAAK,CAAC,MAAM,EAC7B,SAAS,EAAE,IAAI,GAChB,CAAC;QACF,IAAA,mCAA0B,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC;QAEjE,OAAO,KAAK,CAAC;IACf,CAAC;CAAA;AA5BD,gEA4BC;AAED,SAAS,iBAAiB,CAAC,MAAe;IACxC,IAAI,CAAC,MAAM,EAAE;QACX,MAAM,IAAI,KAAK,CACb,qIAAqI,CACtI,CAAC;KACH;AACH,CAAC;AACD,SAAsB,oBAAoB,CACxC,KAAkB,EAClB,IAAU;;;QAEV,IAAI,KAAK,CAAC,MAAM,KAAI,MAAA,KAAK,CAAC,MAAM,0CAAE,QAAQ,CAAA,EAAE;YAC1C,OAAO,KAAK,CAAC,MAAM,CAAC,QAAQ,KAAK,kBAAkB;gBACjD,KAAK,CAAC,MAAM,CAAC,QAAQ,KAAK,gBAAgB;gBAC1C,CAAC,CAAC,MAAM;gBACR,CAAC,CAAC,SAAS,CAAC;SACf;QAED,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,IAAA,0BAAiB,EAC3C,KAAK,CAAC,MAAM,EACZ,MAAM,IAAA,gCAAuB,GAAE,CAChC,CAAC;QACF,MAAM,aAAa,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAC9D,MAAM,QAAQ,GAAG,MAAA,MAAA,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,OAAO,0CAAG,MAAM,CAAC,0CAAE,QAAQ,CAAC;QAC5D,OAAO,QAAQ,KAAK,kBAAkB,IAAI,QAAQ,KAAK,gBAAgB;YACrE,CAAC,CAAC,MAAM;YACR,CAAC,CAAC,SAAS,CAAC;;CACf;AApBD,oDAoBC;AAED,SAAgB,WAAW,CAAC,IAAU,EAAE,QAAgB;IACtD,IAAI,CAAC,QAAQ,EAAE;QACb,QAAQ,GAAG,IAAA,oCAAgB,GAAE,CAAC;KAC/B;IAED,IAAI,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE;QAC/D,OAAO,KAAK,CAAC;KACd;IAED,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IAC7C,MAAM,UAAU,GAAG,QAAQ,CAAC,gBAAgB,CAC1C,QAAQ,EACR,OAAO,EACP,QAAQ,CAAC,YAAY,CAAC,MAAM,EAC5B,IAAI,CACL,CAAC;IAEF,MAAM,cAAc,GAAG,IAAA,4BAAgB,EAAC,UAAU,CAAC,CAAC;IACpD,OAAO,CAAC,CAAC,cAAc,CAAC;AAC1B,CAAC;AAnBD,kCAmBC"}
|
package/src/utils/versions.d.ts
CHANGED
|
@@ -4,6 +4,7 @@ export declare const reactVersion = "18.2.0";
|
|
|
4
4
|
export declare const reactDomVersion = "18.2.0";
|
|
5
5
|
export declare const reactIsVersion = "18.2.0";
|
|
6
6
|
export declare const swcLoaderVersion = "0.1.15";
|
|
7
|
+
export declare const babelLoaderVersion = "^9.1.2";
|
|
7
8
|
export declare const typesReactVersion = "18.0.28";
|
|
8
9
|
export declare const typesReactDomVersion = "18.0.11";
|
|
9
10
|
export declare const typesReactIsVersion = "17.0.3";
|
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.typesReactRouterDomVersion = 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.swcLoaderVersion = exports.reactIsVersion = exports.reactDomVersion = exports.reactVersion = exports.nxRspackVersion = exports.nxVersion = void 0;
|
|
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.typesReactRouterDomVersion = 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 = '*';
|
|
@@ -8,6 +8,7 @@ exports.reactVersion = '18.2.0';
|
|
|
8
8
|
exports.reactDomVersion = '18.2.0';
|
|
9
9
|
exports.reactIsVersion = '18.2.0';
|
|
10
10
|
exports.swcLoaderVersion = '0.1.15';
|
|
11
|
+
exports.babelLoaderVersion = '^9.1.2';
|
|
11
12
|
exports.typesReactVersion = '18.0.28';
|
|
12
13
|
exports.typesReactDomVersion = '18.0.11';
|
|
13
14
|
exports.typesReactIsVersion = '17.0.3';
|
|
@@ -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,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,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,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"}
|
|
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,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,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"}
|
|
@@ -1,7 +0,0 @@
|
|
|
1
|
-
import { TargetConfiguration, Tree } from '@nx/devkit';
|
|
2
|
-
import { CypressComponentConfigurationSchema } from '../schema';
|
|
3
|
-
export interface FoundTarget {
|
|
4
|
-
config?: TargetConfiguration;
|
|
5
|
-
target: string;
|
|
6
|
-
}
|
|
7
|
-
export declare function updateProjectConfig(tree: Tree, options: CypressComponentConfigurationSchema): Promise<FoundTarget>;
|
|
@@ -1,32 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.updateProjectConfig = void 0;
|
|
4
|
-
const tslib_1 = require("tslib");
|
|
5
|
-
const devkit_1 = require("@nx/devkit");
|
|
6
|
-
function updateProjectConfig(tree, options) {
|
|
7
|
-
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
8
|
-
const { findBuildConfig } = yield Promise.resolve().then(() => require('@nx/cypress/src/utils/find-target-options'));
|
|
9
|
-
const found = yield findBuildConfig(tree, {
|
|
10
|
-
project: options.project,
|
|
11
|
-
buildTarget: options.buildTarget,
|
|
12
|
-
validExecutorNames: new Set([
|
|
13
|
-
'@nx/webpack:webpack',
|
|
14
|
-
'@nx/vite:build',
|
|
15
|
-
'@nrwl/webpack:webpack',
|
|
16
|
-
'@nrwl/vite:build',
|
|
17
|
-
]),
|
|
18
|
-
});
|
|
19
|
-
assetValidConfig(found === null || found === void 0 ? void 0 : found.config);
|
|
20
|
-
const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, options.project);
|
|
21
|
-
projectConfig.targets['component-test'].options = Object.assign(Object.assign({}, projectConfig.targets['component-test'].options), { devServerTarget: found.target, skipServe: true });
|
|
22
|
-
(0, devkit_1.updateProjectConfiguration)(tree, options.project, projectConfig);
|
|
23
|
-
return found;
|
|
24
|
-
});
|
|
25
|
-
}
|
|
26
|
-
exports.updateProjectConfig = updateProjectConfig;
|
|
27
|
-
function assetValidConfig(config) {
|
|
28
|
-
if (!config) {
|
|
29
|
-
throw new Error('Unable to find a valid build configuration. Try passing in a target for a React app. --build-target=<project>:<target>[:<configuration>]');
|
|
30
|
-
}
|
|
31
|
-
}
|
|
32
|
-
//# sourceMappingURL=update-configs.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"update-configs.js","sourceRoot":"","sources":["../../../../../../../packages/react/src/generators/cypress-component-configuration/lib/update-configs.ts"],"names":[],"mappings":";;;;AAAA,uCAKoB;AAQpB,SAAsB,mBAAmB,CACvC,IAAU,EACV,OAA4C;;QAE5C,MAAM,EAAE,eAAe,EAAE,GAAG,2CAC1B,2CAA2C,EAC5C,CAAC;QACF,MAAM,KAAK,GAAG,MAAM,eAAe,CAAC,IAAI,EAAE;YACxC,OAAO,EAAE,OAAO,CAAC,OAAO;YACxB,WAAW,EAAE,OAAO,CAAC,WAAW;YAChC,kBAAkB,EAAE,IAAI,GAAG,CAAS;gBAClC,qBAAqB;gBACrB,gBAAgB;gBAChB,uBAAuB;gBACvB,kBAAkB;aACnB,CAAC;SACH,CAAC,CAAC;QAEH,gBAAgB,CAAC,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,MAAM,CAAC,CAAC;QAEhC,MAAM,aAAa,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;QACtE,aAAa,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC,OAAO,mCAC1C,aAAa,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC,OAAO,KAClD,eAAe,EAAE,KAAK,CAAC,MAAM,EAC7B,SAAS,EAAE,IAAI,GAChB,CAAC;QACF,IAAA,mCAA0B,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC;QAEjE,OAAO,KAAK,CAAC;IACf,CAAC;CAAA;AA7BD,kDA6BC;AAED,SAAS,gBAAgB,CAAC,MAAe;IACvC,IAAI,CAAC,MAAM,EAAE;QACX,MAAM,IAAI,KAAK,CACb,0IAA0I,CAC3I,CAAC;KACH;AACH,CAAC"}
|