@nrwl/react 15.3.0-beta.10 → 15.3.0-beta.12
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 -26
- 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 +16 -6
- package/src/generators/application/application.js.map +1 -1
- 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/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/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 +32 -0
- package/src/generators/library/lib/create-files.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 +1 -1
- 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 +40 -190
- package/src/generators/library/library.js.map +1 -1
- package/src/generators/library/schema.d.ts +15 -1
- 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 +7 -4
- package/src/generators/storybook-configuration/configuration.js.map +1 -1
- 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 +38 -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/versions.d.ts +3 -0
- package/src/utils/versions.js +4 -1
- package/src/utils/versions.js.map +1 -1
- 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
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,6 @@
|
|
|
3
3
|
All notable changes to this project will be documented in this file.
|
|
4
4
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
|
5
5
|
|
|
6
|
-
# [15.3.0-beta.
|
|
6
|
+
# [15.3.0-beta.12](https://github.com/nrwl/nx/compare/15.2.0...15.3.0-beta.12) (2022-12-01)
|
|
7
7
|
|
|
8
8
|
**Note:** Version bump only for package @nrwl/react
|
package/migrations.json
CHANGED
|
@@ -65,6 +65,18 @@
|
|
|
65
65
|
"version": "14.6.0-beta.0",
|
|
66
66
|
"description": "Update babel-jest to include the @nrwl/react/babel preset in project jest config",
|
|
67
67
|
"factory": "./src/migrations/update-14-6-0/add-preset-jest-config"
|
|
68
|
+
},
|
|
69
|
+
"update-rollup-executor": {
|
|
70
|
+
"cli": "nx",
|
|
71
|
+
"version": "15.3.0-beta.0",
|
|
72
|
+
"description": "Update projects using @nrwl/web:rollup to @nrwl/rollup:rollup for build.",
|
|
73
|
+
"factory": "./src/migrations/update-15-3-0/update-rollup-executor"
|
|
74
|
+
},
|
|
75
|
+
"install-webpack-rollup-dependencies": {
|
|
76
|
+
"cli": "nx",
|
|
77
|
+
"version": "15.3.0-beta.0",
|
|
78
|
+
"description": "Install new dependencies for React projects using Webpack or Rollup.",
|
|
79
|
+
"factory": "./src/migrations/update-15-3-0/install-webpack-rollup-dependencies"
|
|
68
80
|
}
|
|
69
81
|
},
|
|
70
82
|
"packageJsonUpdates": {
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nrwl/react",
|
|
3
|
-
"version": "15.3.0-beta.
|
|
3
|
+
"version": "15.3.0-beta.12",
|
|
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,36 +31,16 @@
|
|
|
31
31
|
"migrations": "./migrations.json"
|
|
32
32
|
},
|
|
33
33
|
"dependencies": {
|
|
34
|
-
"@
|
|
35
|
-
"@
|
|
36
|
-
"@nrwl/
|
|
37
|
-
"@nrwl/devkit": "15.3.0-beta.10",
|
|
38
|
-
"@nrwl/jest": "15.3.0-beta.10",
|
|
39
|
-
"@nrwl/js": "15.3.0-beta.10",
|
|
40
|
-
"@nrwl/linter": "15.3.0-beta.10",
|
|
41
|
-
"@nrwl/storybook": "15.3.0-beta.10",
|
|
42
|
-
"@nrwl/vite": "15.3.0-beta.10",
|
|
43
|
-
"@nrwl/web": "15.3.0-beta.10",
|
|
44
|
-
"@nrwl/webpack": "15.3.0-beta.10",
|
|
45
|
-
"@nrwl/workspace": "15.3.0-beta.10",
|
|
46
|
-
"@phenomnomnominal/tsquery": "4.1.1",
|
|
47
|
-
"@pmmmwh/react-refresh-webpack-plugin": "^0.5.7",
|
|
48
|
-
"@svgr/webpack": "^6.1.2",
|
|
34
|
+
"@nrwl/devkit": "15.3.0-beta.12",
|
|
35
|
+
"@nrwl/linter": "15.3.0-beta.12",
|
|
36
|
+
"@nrwl/workspace": "15.3.0-beta.12",
|
|
49
37
|
"chalk": "4.1.0",
|
|
50
|
-
"css-loader": "^6.4.0",
|
|
51
38
|
"minimatch": "3.0.5",
|
|
52
|
-
"
|
|
53
|
-
"semver": "7.3.4",
|
|
54
|
-
"style-loader": "^3.3.0",
|
|
55
|
-
"stylus": "^0.55.0",
|
|
56
|
-
"stylus-loader": "^7.1.0",
|
|
57
|
-
"url-loader": "^4.1.1",
|
|
58
|
-
"webpack": "^5.75.0",
|
|
59
|
-
"webpack-merge": "^5.8.0"
|
|
39
|
+
"semver": "7.3.4"
|
|
60
40
|
},
|
|
61
41
|
"publishConfig": {
|
|
62
42
|
"access": "public"
|
|
63
43
|
},
|
|
64
44
|
"types": "./index.d.ts",
|
|
65
|
-
"gitHead": "
|
|
45
|
+
"gitHead": "cded83b2c5bf3e4252c03d4dbcbb5b203b0faed0"
|
|
66
46
|
}
|
|
@@ -4,5 +4,9 @@ declare type ModuleFederationDevServerOptions = WebDevServerOptions & {
|
|
|
4
4
|
devRemotes?: string | string[];
|
|
5
5
|
skipRemotes?: string[];
|
|
6
6
|
};
|
|
7
|
-
export default function moduleFederationDevServer(options: ModuleFederationDevServerOptions, context: ExecutorContext): AsyncGenerator<
|
|
7
|
+
export default function moduleFederationDevServer(options: ModuleFederationDevServerOptions, context: ExecutorContext): AsyncGenerator<{
|
|
8
|
+
baseUrl: string;
|
|
9
|
+
emittedFiles: import("../../../../../build/packages/webpack/src/utils/models").EmittedFile[];
|
|
10
|
+
success: boolean;
|
|
11
|
+
}, any, undefined>;
|
|
8
12
|
export {};
|
|
@@ -5,8 +5,7 @@ const devkit_1 = require("@nrwl/devkit");
|
|
|
5
5
|
const dev_server_impl_1 = require("@nrwl/webpack/src/executors/dev-server/dev-server.impl");
|
|
6
6
|
const path_1 = require("path");
|
|
7
7
|
const chalk = require("chalk");
|
|
8
|
-
const
|
|
9
|
-
const tap_async_iteratable_1 = require("@nrwl/js/src/utils/async-iterable/tap-async-iteratable");
|
|
8
|
+
const async_iterable_1 = require("@nrwl/devkit/src/utils/async-iterable");
|
|
10
9
|
function moduleFederationDevServer(options, context) {
|
|
11
10
|
var _a, _b;
|
|
12
11
|
return tslib_1.__asyncGenerator(this, arguments, function* moduleFederationDevServer_1() {
|
|
@@ -31,7 +30,7 @@ function moduleFederationDevServer(options, context) {
|
|
|
31
30
|
for (const app of knownRemotes) {
|
|
32
31
|
const [appName] = Array.isArray(app) ? app : [app];
|
|
33
32
|
const isDev = devServeApps.includes(appName);
|
|
34
|
-
iter = (0,
|
|
33
|
+
iter = (0, async_iterable_1.combineAsyncIterableIterators)(iter, yield tslib_1.__await((0, devkit_1.runExecutor)({
|
|
35
34
|
project: appName,
|
|
36
35
|
target: isDev ? 'serve' : 'serve-static',
|
|
37
36
|
configuration: context.configurationName,
|
|
@@ -40,7 +39,7 @@ function moduleFederationDevServer(options, context) {
|
|
|
40
39
|
}, context)));
|
|
41
40
|
}
|
|
42
41
|
let numAwaiting = knownRemotes.length + 1; // remotes + host
|
|
43
|
-
return yield tslib_1.__await(yield tslib_1.__await(yield* tslib_1.__asyncDelegator(tslib_1.__asyncValues((0,
|
|
42
|
+
return yield tslib_1.__await(yield tslib_1.__await(yield* tslib_1.__asyncDelegator(tslib_1.__asyncValues((0, async_iterable_1.tapAsyncIterable)(iter, (x) => {
|
|
44
43
|
var _a, _b;
|
|
45
44
|
numAwaiting--;
|
|
46
45
|
if (numAwaiting === 0) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"module-federation-dev-server.impl.js","sourceRoot":"","sources":["../../../../../../packages/react/src/executors/module-federation-dev-server/module-federation-dev-server.impl.ts"],"names":[],"mappings":";;;AAAA,yCAAoE;AACpE,4FAAuF;AAEvF,+BAA4B;AAC5B,+BAA+B;AAC/B,
|
|
1
|
+
{"version":3,"file":"module-federation-dev-server.impl.js","sourceRoot":"","sources":["../../../../../../packages/react/src/executors/module-federation-dev-server/module-federation-dev-server.impl.ts"],"names":[],"mappings":";;;AAAA,yCAAoE;AACpE,4FAAuF;AAEvF,+BAA4B;AAC5B,+BAA+B;AAC/B,0EAG+C;AAO/C,SAA+B,yBAAyB,CACtD,OAAyC,EACzC,OAAwB;;;QAExB,IAAI,IAAI,GAAG,IAAA,yBAAiB,EAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QAC/C,MAAM,CAAC,GAAG,OAAO,CAAC,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;QAE1D,MAAM,0BAA0B,GAAG,IAAA,WAAI,EACrC,OAAO,CAAC,IAAI,EACZ,CAAC,CAAC,IAAI,EACN,6BAA6B,CAC9B,CAAC;QAEF,IAAI,sBAA2B,CAAC;QAChC,IAAI;YACF,sBAAsB,GAAG,OAAO,CAAC,0BAA0B,CAAC,CAAC;SAC9D;QAAC,WAAM;YACN,kCAAkC;YAClC,MAAM,IAAI,KAAK,CACb,kBAAkB,0BAA0B,uDAAuD,CACpG,CAAC;SACH;QAED,MAAM,aAAa,GAAG,IAAI,GAAG,CAAC,MAAA,OAAO,CAAC,WAAW,mCAAI,EAAE,CAAC,CAAC;QACzD,MAAM,YAAY,GAAG,CAAC,MAAA,sBAAsB,CAAC,OAAO,mCAAI,EAAE,CAAC,CAAC,MAAM,CAChE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,CAC7B,CAAC;QAEF,MAAM,YAAY,GAAG,CAAC,OAAO,CAAC,UAAU;YACtC,CAAC,CAAC,EAAE;YACJ,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC;gBACnC,CAAC,CAAC,OAAO,CAAC,UAAU;gBACpB,CAAC,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;QAEzB,KAAK,MAAM,GAAG,IAAI,YAAY,EAAE;YAC9B,MAAM,CAAC,OAAO,CAAC,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;YACnD,MAAM,KAAK,GAAG,YAAY,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;YAC7C,IAAI,GAAG,IAAA,8CAA6B,EAClC,IAAI,EACJ,sBAAM,IAAA,oBAAW,EACf;gBACE,OAAO,EAAE,OAAO;gBAChB,MAAM,EAAE,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,cAAc;gBACxC,aAAa,EAAE,OAAO,CAAC,iBAAiB;aACzC,EACD;gBACE,KAAK,EAAE,KAAK;aACb,EACD,OAAO,CACR,CAAA,CACF,CAAC;SACH;QAED,IAAI,WAAW,GAAG,YAAY,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,iBAAiB;QAC5D,6BAAO,sBAAA,KAAK,CAAC,CAAC,yBAAA,sBAAA,IAAA,iCAAgB,EAAC,IAAI,EAAE,CAAC,CAAC,EAAE,EAAE;;YACzC,WAAW,EAAE,CAAC;YACd,IAAI,WAAW,KAAK,CAAC,EAAE;gBACrB,eAAM,CAAC,IAAI,CACT,KAAK,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,aAAa,MAAA,OAAO,CAAC,IAAI,mCAAI,WAAW,IAC/D,MAAA,OAAO,CAAC,IAAI,mCAAI,IAClB,EAAE,CACH,CAAC;aACH;QACH,CAAC,CAAC,CAAA,CAAA,CAAA,EAAC;;CACJ;AAhED,4CAgEC"}
|
|
@@ -16,10 +16,8 @@ const devkit_1 = require("@nrwl/devkit");
|
|
|
16
16
|
const run_tasks_in_serial_1 = require("@nrwl/workspace/src/utilities/run-tasks-in-serial");
|
|
17
17
|
const init_1 = require("../init/init");
|
|
18
18
|
const linter_1 = require("@nrwl/linter");
|
|
19
|
-
const versions_1 = require("@nrwl/js/src/utils/versions");
|
|
20
|
-
const versions_2 = require("@nrwl/webpack/src/utils/versions");
|
|
21
|
-
const vite_1 = require("@nrwl/vite");
|
|
22
19
|
const lint_project_1 = require("@nrwl/linter/src/generators/lint-project/lint-project");
|
|
20
|
+
const versions_1 = require("../../utils/versions");
|
|
23
21
|
function addLinting(host, options) {
|
|
24
22
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
25
23
|
const tasks = [];
|
|
@@ -40,7 +38,7 @@ function addLinting(host, options) {
|
|
|
40
38
|
tasks.push(lintTask);
|
|
41
39
|
(0, devkit_1.updateJson)(host, (0, devkit_1.joinPathFragments)(options.appProjectRoot, '.eslintrc.json'), lint_1.extendReactEslintJson);
|
|
42
40
|
const installTask = yield (0, devkit_1.addDependenciesToPackageJson)(host, lint_1.extraEslintDependencies.dependencies, Object.assign(Object.assign({}, lint_1.extraEslintDependencies.devDependencies), (options.compiler === 'swc'
|
|
43
|
-
? { '@swc/core': versions_1.swcCoreVersion, 'swc-loader':
|
|
41
|
+
? { '@swc/core': versions_1.swcCoreVersion, 'swc-loader': versions_1.swcLoaderVersion }
|
|
44
42
|
: {})));
|
|
45
43
|
tasks.push(installTask);
|
|
46
44
|
}
|
|
@@ -56,10 +54,12 @@ function applicationGenerator(host, schema) {
|
|
|
56
54
|
(0, create_application_files_1.createApplicationFiles)(host, options);
|
|
57
55
|
(0, add_project_1.addProject)(host, options);
|
|
58
56
|
if (options.bundler === 'vite') {
|
|
57
|
+
yield (0, devkit_1.ensurePackage)(host, '@nrwl/vite', versions_1.nxVersion);
|
|
58
|
+
const { viteConfigurationGenerator } = yield Promise.resolve().then(() => require('@nrwl/vite'));
|
|
59
59
|
// We recommend users use `import.meta.env.MODE` and other variables in their code to differentiate between production and development.
|
|
60
60
|
// See: https://vitejs.dev/guide/env-and-mode.html
|
|
61
61
|
host.delete((0, devkit_1.joinPathFragments)(options.appProjectRoot, 'src/environments'));
|
|
62
|
-
const viteTask = yield
|
|
62
|
+
const viteTask = yield viteConfigurationGenerator(host, {
|
|
63
63
|
uiFramework: 'react',
|
|
64
64
|
project: options.projectName,
|
|
65
65
|
newProject: true,
|
|
@@ -67,8 +67,18 @@ function applicationGenerator(host, schema) {
|
|
|
67
67
|
});
|
|
68
68
|
tasks.push(viteTask);
|
|
69
69
|
}
|
|
70
|
+
else if (options.bundler === 'webpack') {
|
|
71
|
+
yield (0, devkit_1.ensurePackage)(host, '@nrwl/webpack', versions_1.nxVersion);
|
|
72
|
+
const { webpackInitGenerator } = yield Promise.resolve().then(() => require('@nrwl/webpack'));
|
|
73
|
+
const webpackInitTask = yield webpackInitGenerator(host, {
|
|
74
|
+
uiFramework: 'react',
|
|
75
|
+
});
|
|
76
|
+
tasks.push(webpackInitTask);
|
|
77
|
+
}
|
|
70
78
|
if (options.bundler !== 'vite' && options.unitTestRunner === 'vitest') {
|
|
71
|
-
|
|
79
|
+
yield (0, devkit_1.ensurePackage)(host, '@nrwl/vite', versions_1.nxVersion);
|
|
80
|
+
const { vitestGenerator } = yield Promise.resolve().then(() => require('@nrwl/vite'));
|
|
81
|
+
const vitestTask = yield vitestGenerator(host, {
|
|
72
82
|
uiFramework: 'react',
|
|
73
83
|
project: options.projectName,
|
|
74
84
|
inSourceTests: options.inSourceTests,
|
|
@@ -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,mDAA+C;AAC/C,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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"}
|
|
@@ -2,13 +2,16 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.addCypress = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
|
-
const
|
|
5
|
+
const devkit_1 = require("@nrwl/devkit");
|
|
6
|
+
const versions_1 = require("../../../utils/versions");
|
|
6
7
|
function addCypress(host, options) {
|
|
7
8
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
8
9
|
if (options.e2eTestRunner !== 'cypress') {
|
|
9
10
|
return () => { };
|
|
10
11
|
}
|
|
11
|
-
|
|
12
|
+
yield (0, devkit_1.ensurePackage)(host, '@nrwl/cypress', versions_1.nxVersion);
|
|
13
|
+
const { cypressProjectGenerator } = yield Promise.resolve().then(() => require('@nrwl/cypress'));
|
|
14
|
+
return yield cypressProjectGenerator(host, Object.assign(Object.assign({}, options), { name: options.e2eProjectName, directory: options.directory, project: options.projectName, rootProject: options.rootProject }));
|
|
12
15
|
});
|
|
13
16
|
}
|
|
14
17
|
exports.addCypress = addCypress;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add-cypress.js","sourceRoot":"","sources":["../../../../../../../packages/react/src/generators/application/lib/add-cypress.ts"],"names":[],"mappings":";;;;AAAA,
|
|
1
|
+
{"version":3,"file":"add-cypress.js","sourceRoot":"","sources":["../../../../../../../packages/react/src/generators/application/lib/add-cypress.ts"],"names":[],"mappings":";;;;AAAA,yCAAmD;AACnD,sDAAoD;AAGpD,SAAsB,UAAU,CAAC,IAAU,EAAE,OAAyB;;QACpE,IAAI,OAAO,CAAC,aAAa,KAAK,SAAS,EAAE;YACvC,OAAO,GAAG,EAAE,GAAE,CAAC,CAAC;SACjB;QACD,MAAM,IAAA,sBAAa,EAAC,IAAI,EAAE,eAAe,EAAE,oBAAS,CAAC,CAAC;QACtD,MAAM,EAAE,uBAAuB,EAAE,GAAG,2CAAa,eAAe,EAAC,CAAC;QAElE,OAAO,MAAM,uBAAuB,CAAC,IAAI,kCACpC,OAAO,KACV,IAAI,EAAE,OAAO,CAAC,cAAc,EAC5B,SAAS,EAAE,OAAO,CAAC,SAAS,EAC5B,OAAO,EAAE,OAAO,CAAC,WAAW,EAC5B,WAAW,EAAE,OAAO,CAAC,WAAW,IAChC,CAAC;IACL,CAAC;CAAA;AAdD,gCAcC"}
|
|
@@ -2,13 +2,16 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.addJest = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
|
-
const
|
|
5
|
+
const devkit_1 = require("@nrwl/devkit");
|
|
6
|
+
const versions_1 = require("../../../utils/versions");
|
|
6
7
|
function addJest(host, options) {
|
|
7
8
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
9
|
+
yield (0, devkit_1.ensurePackage)(host, '@nrwl/jest', versions_1.nxVersion);
|
|
10
|
+
const { jestProjectGenerator } = yield Promise.resolve().then(() => require('@nrwl/jest'));
|
|
8
11
|
if (options.unitTestRunner !== 'jest') {
|
|
9
12
|
return () => { };
|
|
10
13
|
}
|
|
11
|
-
return yield
|
|
14
|
+
return yield jestProjectGenerator(host, Object.assign(Object.assign({}, options), { project: options.projectName, supportTsx: true, skipSerializers: true, setupFile: 'none', compiler: options.compiler, rootProject: options.rootProject }));
|
|
12
15
|
});
|
|
13
16
|
}
|
|
14
17
|
exports.addJest = addJest;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add-jest.js","sourceRoot":"","sources":["../../../../../../../packages/react/src/generators/application/lib/add-jest.ts"],"names":[],"mappings":";;;;
|
|
1
|
+
{"version":3,"file":"add-jest.js","sourceRoot":"","sources":["../../../../../../../packages/react/src/generators/application/lib/add-jest.ts"],"names":[],"mappings":";;;;AAAA,yCAAmD;AAEnD,sDAAoD;AAEpD,SAAsB,OAAO,CAAC,IAAU,EAAE,OAAyB;;QACjE,MAAM,IAAA,sBAAa,EAAC,IAAI,EAAE,YAAY,EAAE,oBAAS,CAAC,CAAC;QACnD,MAAM,EAAE,oBAAoB,EAAE,GAAG,2CAAa,YAAY,EAAC,CAAC;QAE5D,IAAI,OAAO,CAAC,cAAc,KAAK,MAAM,EAAE;YACrC,OAAO,GAAG,EAAE,GAAE,CAAC,CAAC;SACjB;QAED,OAAO,MAAM,oBAAoB,CAAC,IAAI,kCACjC,OAAO,KACV,OAAO,EAAE,OAAO,CAAC,WAAW,EAC5B,UAAU,EAAE,IAAI,EAChB,eAAe,EAAE,IAAI,EACrB,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,OAAO,CAAC,QAAQ,EAC1B,WAAW,EAAE,OAAO,CAAC,WAAW,IAChC,CAAC;IACL,CAAC;CAAA;AAjBD,0BAiBC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
import { Tree } from '@nrwl/devkit';
|
|
2
2
|
import { ComponentTestSchema } from './schema';
|
|
3
|
-
export declare function componentTestGenerator(tree: Tree, options: ComponentTestSchema): void
|
|
3
|
+
export declare function componentTestGenerator(tree: Tree, options: ComponentTestSchema): Promise<void>;
|
|
4
4
|
export default componentTestGenerator;
|
|
@@ -1,22 +1,27 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.componentTestGenerator = void 0;
|
|
4
|
-
const
|
|
4
|
+
const tslib_1 = require("tslib");
|
|
5
5
|
const devkit_1 = require("@nrwl/devkit");
|
|
6
6
|
const path_1 = require("path");
|
|
7
7
|
const ts = require("typescript");
|
|
8
8
|
const ast_utils_1 = require("../../utils/ast-utils");
|
|
9
9
|
const component_props_1 = require("../../utils/component-props");
|
|
10
|
+
const versions_1 = require("../../utils/versions");
|
|
10
11
|
function componentTestGenerator(tree, options) {
|
|
11
|
-
(0,
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
12
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
13
|
+
yield (0, devkit_1.ensurePackage)(tree, '@nrwl/cypress', versions_1.nxVersion);
|
|
14
|
+
const { assertMinimumCypressVersion } = yield Promise.resolve().then(() => require('@nrwl/cypress/src/utils/cypress-version'));
|
|
15
|
+
assertMinimumCypressVersion(10);
|
|
16
|
+
const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, options.project);
|
|
17
|
+
const normalizedPath = options.componentPath.startsWith(projectConfig.sourceRoot)
|
|
18
|
+
? (0, path_1.relative)(projectConfig.sourceRoot, options.componentPath)
|
|
19
|
+
: options.componentPath;
|
|
20
|
+
const componentPath = (0, devkit_1.joinPathFragments)(projectConfig.sourceRoot, normalizedPath);
|
|
21
|
+
if (tree.exists(componentPath)) {
|
|
22
|
+
generateSpecsForComponents(tree, componentPath);
|
|
23
|
+
}
|
|
24
|
+
});
|
|
20
25
|
}
|
|
21
26
|
exports.componentTestGenerator = componentTestGenerator;
|
|
22
27
|
function generateSpecsForComponents(tree, filePath) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"component-test.js","sourceRoot":"","sources":["../../../../../../packages/react/src/generators/component-test/component-test.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"component-test.js","sourceRoot":"","sources":["../../../../../../packages/react/src/generators/component-test/component-test.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,8 +2,8 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.cypressComponentConfigGenerator = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
|
-
const cypress_1 = require("@nrwl/cypress");
|
|
6
5
|
const devkit_1 = require("@nrwl/devkit");
|
|
6
|
+
const versions_1 = require("../../utils/versions");
|
|
7
7
|
const add_files_1 = require("./lib/add-files");
|
|
8
8
|
const update_configs_1 = require("./lib/update-configs");
|
|
9
9
|
/**
|
|
@@ -13,13 +13,15 @@ const update_configs_1 = require("./lib/update-configs");
|
|
|
13
13
|
*/
|
|
14
14
|
function cypressComponentConfigGenerator(tree, options) {
|
|
15
15
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
16
|
+
yield (0, devkit_1.ensurePackage)(tree, '@nrwl/cypress', versions_1.nxVersion);
|
|
17
|
+
const { cypressComponentProject } = yield Promise.resolve().then(() => require('@nrwl/cypress'));
|
|
16
18
|
const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, options.project);
|
|
17
|
-
const installTask = yield
|
|
19
|
+
const installTask = yield cypressComponentProject(tree, {
|
|
18
20
|
project: options.project,
|
|
19
21
|
skipFormat: true,
|
|
20
22
|
});
|
|
21
23
|
yield (0, update_configs_1.updateProjectConfig)(tree, options);
|
|
22
|
-
(0, add_files_1.addFiles)(tree, projectConfig, options);
|
|
24
|
+
yield (0, add_files_1.addFiles)(tree, projectConfig, options);
|
|
23
25
|
if (options.skipFormat) {
|
|
24
26
|
yield (0, devkit_1.formatFiles)(tree);
|
|
25
27
|
}
|
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,
|
|
1
|
+
{"version":3,"file":"cypress-component-configuration.js","sourceRoot":"","sources":["../../../../../../packages/react/src/generators/cypress-component-configuration/cypress-component-configuration.ts"],"names":[],"mappings":";;;;AAAA,yCAKsB;AACtB,mDAAiD;AACjD,+CAA2C;AAC3C,yDAA2D;AAG3D;;;;GAIG;AACH,SAAsB,+BAA+B,CACnD,IAAU,EACV,OAA4C;;QAE5C,MAAM,IAAA,sBAAa,EAAC,IAAI,EAAE,eAAe,EAAE,oBAAS,CAAC,CAAC;QACtD,MAAM,EAAE,uBAAuB,EAAE,GAAG,2CAAa,eAAe,EAAC,CAAC;QAClE,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,IAAA,oCAAmB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACzC,MAAM,IAAA,oBAAQ,EAAC,IAAI,EAAE,aAAa,EAAE,OAAO,CAAC,CAAC;QAC7C,IAAI,OAAO,CAAC,UAAU,EAAE;YACtB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;QAED,OAAO,GAAG,EAAE;YACV,WAAW,EAAE,CAAC;QAChB,CAAC,CAAC;IACJ,CAAC;CAAA;AArBD,0EAqBC;AAED,kBAAe,+BAA+B,CAAC"}
|
|
@@ -1,3 +1,3 @@
|
|
|
1
1
|
import { ProjectConfiguration, Tree } from '@nrwl/devkit';
|
|
2
2
|
import { CypressComponentConfigurationSchema } from '../schema';
|
|
3
|
-
export declare function addFiles(tree: Tree, projectConfig: ProjectConfiguration, options: CypressComponentConfigurationSchema): void
|
|
3
|
+
export declare function addFiles(tree: Tree, projectConfig: ProjectConfiguration, options: CypressComponentConfigurationSchema): Promise<void>;
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.addFiles = void 0;
|
|
4
|
+
const tslib_1 = require("tslib");
|
|
4
5
|
const devkit_1 = require("@nrwl/devkit");
|
|
5
6
|
const ts = require("typescript");
|
|
6
7
|
const ast_utils_1 = require("../../../utils/ast-utils");
|
|
@@ -8,23 +9,29 @@ const component_test_1 = require("../../component-test/component-test");
|
|
|
8
9
|
const allowedFileExt = new RegExp(/\.[jt]sx?/g);
|
|
9
10
|
const isSpecFile = new RegExp(/(spec|test)\./g);
|
|
10
11
|
function addFiles(tree, projectConfig, options) {
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
tree.
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
12
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
13
|
+
const cypressConfigPath = (0, devkit_1.joinPathFragments)(projectConfig.root, 'cypress.config.ts');
|
|
14
|
+
if (tree.exists(cypressConfigPath)) {
|
|
15
|
+
tree.delete(cypressConfigPath);
|
|
16
|
+
}
|
|
17
|
+
(0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, '..', 'files'), projectConfig.root, {
|
|
18
|
+
tpl: '',
|
|
19
|
+
});
|
|
20
|
+
if (options.generateTests) {
|
|
21
|
+
const filePaths = [];
|
|
22
|
+
(0, devkit_1.visitNotIgnoredFiles)(tree, projectConfig.sourceRoot, (filePath) => {
|
|
23
|
+
if (isComponent(tree, filePath)) {
|
|
24
|
+
filePaths.push(filePath);
|
|
25
|
+
}
|
|
26
|
+
});
|
|
27
|
+
for (const filePath of filePaths) {
|
|
28
|
+
yield (0, component_test_1.componentTestGenerator)(tree, {
|
|
22
29
|
project: options.project,
|
|
23
30
|
componentPath: filePath,
|
|
24
31
|
});
|
|
25
32
|
}
|
|
26
|
-
}
|
|
27
|
-
}
|
|
33
|
+
}
|
|
34
|
+
});
|
|
28
35
|
}
|
|
29
36
|
exports.addFiles = addFiles;
|
|
30
37
|
function isComponent(tree, filePath) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add-files.js","sourceRoot":"","sources":["../../../../../../../packages/react/src/generators/cypress-component-configuration/lib/add-files.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"add-files.js","sourceRoot":"","sources":["../../../../../../../packages/react/src/generators/cypress-component-configuration/lib/add-files.ts"],"names":[],"mappings":";;;;AAAA,yCAMsB;AACtB,iCAAiC;AACjC,wDAA4D;AAC5D,wEAA6E;AAG7E,MAAM,cAAc,GAAG,IAAI,MAAM,CAAC,YAAY,CAAC,CAAC;AAChD,MAAM,UAAU,GAAG,IAAI,MAAM,CAAC,gBAAgB,CAAC,CAAC;AAEhD,SAAsB,QAAQ,CAC5B,IAAU,EACV,aAAmC,EACnC,OAA4C;;QAE5C,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,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,0BAAiB,EAAC,SAAS,EAAE,IAAI,EAAE,OAAO,CAAC,EAC3C,aAAa,CAAC,IAAI,EAClB;YACE,GAAG,EAAE,EAAE;SACR,CACF,CAAC;QAEF,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,WAAW,CAAC,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;IACH,CAAC;CAAA;AArCD,4BAqCC;AAED,SAAS,WAAW,CAAC,IAAU,EAAE,QAAgB;IAC/C,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,EAAE,CAAC,gBAAgB,CACpC,QAAQ,EACR,OAAO,EACP,EAAE,CAAC,YAAY,CAAC,MAAM,EACtB,IAAI,CACL,CAAC;IAEF,MAAM,cAAc,GAAG,IAAA,4BAAgB,EAAC,UAAU,CAAC,CAAC;IACpD,OAAO,CAAC,CAAC,cAAc,CAAC;AAC1B,CAAC"}
|
|
@@ -2,11 +2,11 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.updateProjectConfig = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
|
-
const find_target_options_1 = require("@nrwl/cypress/src/utils/find-target-options");
|
|
6
5
|
const devkit_1 = require("@nrwl/devkit");
|
|
7
6
|
function updateProjectConfig(tree, options) {
|
|
8
7
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
9
|
-
const
|
|
8
|
+
const { findBuildConfig } = yield Promise.resolve().then(() => require('@nrwl/cypress/src/utils/find-target-options'));
|
|
9
|
+
const found = yield findBuildConfig(tree, {
|
|
10
10
|
project: options.project,
|
|
11
11
|
buildTarget: options.buildTarget,
|
|
12
12
|
validExecutorNames: new Set([
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-configs.js","sourceRoot":"","sources":["../../../../../../../packages/react/src/generators/cypress-component-configuration/lib/update-configs.ts"],"names":[],"mappings":";;;;AAAA,
|
|
1
|
+
{"version":3,"file":"update-configs.js","sourceRoot":"","sources":["../../../../../../../packages/react/src/generators/cypress-component-configuration/lib/update-configs.ts"],"names":[],"mappings":";;;;AAAA,yCAIsB;AAGtB,SAAsB,mBAAmB,CACvC,IAAU,EACV,OAA4C;;QAE5C,MAAM,EAAE,eAAe,EAAE,GAAG,2CAC1B,6CAA6C,EAC9C,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,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;IACnE,CAAC;CAAA;AAzBD,kDAyBC;AAED,SAAS,gBAAgB,CAAC,MAAe;IACvC,IAAI,CAAC,MAAM,EAAE;QACX,MAAM,IAAI,KAAK,CACb,0IAA0I,CAC3I,CAAC;KACH;AACH,CAAC"}
|
|
@@ -2,9 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.reactInitSchematic = exports.reactInitGenerator = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
|
-
const cypress_1 = require("@nrwl/cypress");
|
|
6
5
|
const devkit_1 = require("@nrwl/devkit");
|
|
7
|
-
const web_1 = require("@nrwl/web");
|
|
8
6
|
const run_tasks_in_serial_1 = require("@nrwl/workspace/src/utilities/run-tasks-in-serial");
|
|
9
7
|
const versions_1 = require("../../utils/versions");
|
|
10
8
|
function setDefault(host) {
|
|
@@ -34,17 +32,41 @@ function updateDependencies(host, schema) {
|
|
|
34
32
|
'react-test-renderer': versions_1.reactTestRendererVersion,
|
|
35
33
|
});
|
|
36
34
|
}
|
|
35
|
+
function initRootBabelConfig(tree, schema) {
|
|
36
|
+
var _a;
|
|
37
|
+
if (tree.exists('/babel.config.json') || tree.exists('/babel.config.js')) {
|
|
38
|
+
return;
|
|
39
|
+
}
|
|
40
|
+
if (!schema.skipBabelConfig) {
|
|
41
|
+
(0, devkit_1.writeJson)(tree, '/babel.config.json', {
|
|
42
|
+
babelrcRoots: ['*'], // Make sure .babelrc files other than root can be loaded in a monorepo
|
|
43
|
+
});
|
|
44
|
+
}
|
|
45
|
+
const workspaceConfiguration = (0, devkit_1.readWorkspaceConfiguration)(tree);
|
|
46
|
+
if ((_a = workspaceConfiguration.namedInputs) === null || _a === void 0 ? void 0 : _a.sharedGlobals) {
|
|
47
|
+
workspaceConfiguration.namedInputs.sharedGlobals.push('{workspaceRoot}/babel.config.json');
|
|
48
|
+
}
|
|
49
|
+
(0, devkit_1.updateWorkspaceConfiguration)(tree, workspaceConfiguration);
|
|
50
|
+
}
|
|
37
51
|
function reactInitGenerator(host, schema) {
|
|
38
52
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
39
53
|
const tasks = [];
|
|
40
54
|
setDefault(host);
|
|
41
55
|
if (!schema.e2eTestRunner || schema.e2eTestRunner === 'cypress') {
|
|
42
|
-
|
|
56
|
+
yield (0, devkit_1.ensurePackage)(host, '@nrwl/cypress', versions_1.nxVersion);
|
|
57
|
+
const { cypressInitGenerator } = yield Promise.resolve().then(() => require('@nrwl/cypress'));
|
|
58
|
+
const cypressTask = cypressInitGenerator(host, {});
|
|
43
59
|
tasks.push(cypressTask);
|
|
44
60
|
}
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
61
|
+
if (!schema.skipPackageJson && !schema.skipBabelConfig) {
|
|
62
|
+
const installBabelTask = (0, devkit_1.addDependenciesToPackageJson)(host, {}, {
|
|
63
|
+
'@babel/preset-react': versions_1.babelPresetReactVersion,
|
|
64
|
+
});
|
|
65
|
+
tasks.push(installBabelTask);
|
|
66
|
+
}
|
|
67
|
+
if (!schema.skipBabelConfig) {
|
|
68
|
+
initRootBabelConfig(host, schema);
|
|
69
|
+
}
|
|
48
70
|
if (!schema.skipPackageJson) {
|
|
49
71
|
const installTask = updateDependencies(host, schema);
|
|
50
72
|
tasks.push(installTask);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../../../packages/react/src/generators/init/init.ts"],"names":[],"mappings":";;;;AAAA,
|
|
1
|
+
{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../../../packages/react/src/generators/init/init.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,38 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.addLinting = void 0;
|
|
4
|
+
const tslib_1 = require("tslib");
|
|
5
|
+
const linter_1 = require("@nrwl/linter");
|
|
6
|
+
const path_1 = require("nx/src/utils/path");
|
|
7
|
+
const json_1 = require("nx/src/generators/utils/json");
|
|
8
|
+
const devkit_1 = require("@nrwl/devkit");
|
|
9
|
+
const run_tasks_in_serial_1 = require("@nrwl/workspace/src/utilities/run-tasks-in-serial");
|
|
10
|
+
const lint_1 = require("../../../utils/lint");
|
|
11
|
+
function addLinting(host, options) {
|
|
12
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
13
|
+
if (options.linter === linter_1.Linter.EsLint) {
|
|
14
|
+
const lintTask = yield (0, linter_1.lintProjectGenerator)(host, {
|
|
15
|
+
linter: options.linter,
|
|
16
|
+
project: options.name,
|
|
17
|
+
tsConfigPaths: [
|
|
18
|
+
(0, path_1.joinPathFragments)(options.projectRoot, 'tsconfig.lib.json'),
|
|
19
|
+
],
|
|
20
|
+
unitTestRunner: options.unitTestRunner,
|
|
21
|
+
eslintFilePatterns: [`${options.projectRoot}/**/*.{ts,tsx,js,jsx}`],
|
|
22
|
+
skipFormat: true,
|
|
23
|
+
skipPackageJson: options.skipPackageJson,
|
|
24
|
+
});
|
|
25
|
+
(0, json_1.updateJson)(host, (0, path_1.joinPathFragments)(options.projectRoot, '.eslintrc.json'), lint_1.extendReactEslintJson);
|
|
26
|
+
let installTask = () => { };
|
|
27
|
+
if (!options.skipPackageJson) {
|
|
28
|
+
installTask = yield (0, devkit_1.addDependenciesToPackageJson)(host, lint_1.extraEslintDependencies.dependencies, lint_1.extraEslintDependencies.devDependencies);
|
|
29
|
+
}
|
|
30
|
+
return (0, run_tasks_in_serial_1.runTasksInSerial)(lintTask, installTask);
|
|
31
|
+
}
|
|
32
|
+
else {
|
|
33
|
+
return () => { };
|
|
34
|
+
}
|
|
35
|
+
});
|
|
36
|
+
}
|
|
37
|
+
exports.addLinting = addLinting;
|
|
38
|
+
//# sourceMappingURL=add-linting.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"add-linting.js","sourceRoot":"","sources":["../../../../../../../packages/react/src/generators/library/lib/add-linting.ts"],"names":[],"mappings":";;;;AACA,yCAA4D;AAC5D,4CAAsD;AACtD,uDAA0D;AAC1D,yCAA4D;AAC5D,2FAAqF;AAGrF,8CAG6B;AAE7B,SAAsB,UAAU,CAAC,IAAU,EAAE,OAAyB;;QACpE,IAAI,OAAO,CAAC,MAAM,KAAK,eAAM,CAAC,MAAM,EAAE;YACpC,MAAM,QAAQ,GAAG,MAAM,IAAA,6BAAoB,EAAC,IAAI,EAAE;gBAChD,MAAM,EAAE,OAAO,CAAC,MAAM;gBACtB,OAAO,EAAE,OAAO,CAAC,IAAI;gBACrB,aAAa,EAAE;oBACb,IAAA,wBAAiB,EAAC,OAAO,CAAC,WAAW,EAAE,mBAAmB,CAAC;iBAC5D;gBACD,cAAc,EAAE,OAAO,CAAC,cAAc;gBACtC,kBAAkB,EAAE,CAAC,GAAG,OAAO,CAAC,WAAW,uBAAuB,CAAC;gBACnE,UAAU,EAAE,IAAI;gBAChB,eAAe,EAAE,OAAO,CAAC,eAAe;aACzC,CAAC,CAAC;YAEH,IAAA,iBAAU,EACR,IAAI,EACJ,IAAA,wBAAiB,EAAC,OAAO,CAAC,WAAW,EAAE,gBAAgB,CAAC,EACxD,4BAAqB,CACtB,CAAC;YAEF,IAAI,WAAW,GAAG,GAAG,EAAE,GAAE,CAAC,CAAC;YAC3B,IAAI,CAAC,OAAO,CAAC,eAAe,EAAE;gBAC5B,WAAW,GAAG,MAAM,IAAA,qCAA4B,EAC9C,IAAI,EACJ,8BAAuB,CAAC,YAAY,EACpC,8BAAuB,CAAC,eAAe,CACxC,CAAC;aACH;YAED,OAAO,IAAA,sCAAgB,EAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;SAChD;aAAM;YACL,OAAO,GAAG,EAAE,GAAE,CAAC,CAAC;SACjB;IACH,CAAC;CAAA;AAjCD,gCAiCC"}
|