@nrwl/react 15.3.0-beta.9 → 15.3.0-rc.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
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-
|
|
6
|
+
# [15.3.0-rc.0](https://github.com/nrwl/nx/compare/15.2.0...15.3.0-rc.0) (2022-12-05)
|
|
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-
|
|
3
|
+
"version": "15.3.0-rc.0",
|
|
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,17 @@
|
|
|
31
31
|
"migrations": "./migrations.json"
|
|
32
32
|
},
|
|
33
33
|
"dependencies": {
|
|
34
|
-
"@
|
|
35
|
-
"@
|
|
36
|
-
"@nrwl/
|
|
37
|
-
"@nrwl/devkit": "15.3.0-beta.9",
|
|
38
|
-
"@nrwl/jest": "15.3.0-beta.9",
|
|
39
|
-
"@nrwl/js": "15.3.0-beta.9",
|
|
40
|
-
"@nrwl/linter": "15.3.0-beta.9",
|
|
41
|
-
"@nrwl/storybook": "15.3.0-beta.9",
|
|
42
|
-
"@nrwl/vite": "15.3.0-beta.9",
|
|
43
|
-
"@nrwl/web": "15.3.0-beta.9",
|
|
44
|
-
"@nrwl/webpack": "15.3.0-beta.9",
|
|
45
|
-
"@nrwl/workspace": "15.3.0-beta.9",
|
|
34
|
+
"@nrwl/devkit": "15.3.0-rc.0",
|
|
35
|
+
"@nrwl/linter": "15.3.0-rc.0",
|
|
36
|
+
"@nrwl/workspace": "15.3.0-rc.0",
|
|
46
37
|
"@phenomnomnominal/tsquery": "4.1.1",
|
|
47
|
-
"@pmmmwh/react-refresh-webpack-plugin": "^0.5.7",
|
|
48
|
-
"@svgr/webpack": "^6.1.2",
|
|
49
38
|
"chalk": "4.1.0",
|
|
50
|
-
"css-loader": "^6.4.0",
|
|
51
39
|
"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"
|
|
40
|
+
"semver": "7.3.4"
|
|
60
41
|
},
|
|
61
42
|
"publishConfig": {
|
|
62
43
|
"access": "public"
|
|
63
44
|
},
|
|
64
45
|
"types": "./index.d.ts",
|
|
65
|
-
"gitHead": "
|
|
46
|
+
"gitHead": "5d910c0f1a9ec3ba6d7ebd78072af5cc5caf86c5"
|
|
66
47
|
}
|
|
@@ -18,6 +18,7 @@ import { NxComponentTestingOptions } from '@nrwl/cypress/plugins/cypress-preset'
|
|
|
18
18
|
* @param options override options
|
|
19
19
|
*/
|
|
20
20
|
export declare function nxComponentTestingPreset(pathToConfig: string, options?: NxComponentTestingOptions): {
|
|
21
|
+
specPattern: string;
|
|
21
22
|
devServer: {
|
|
22
23
|
readonly framework: "react";
|
|
23
24
|
readonly bundler: "webpack";
|
|
@@ -7,6 +7,7 @@ const normalize_options_1 = require("@nrwl/webpack/src/executors/webpack/lib/nor
|
|
|
7
7
|
const get_webpack_config_1 = require("@nrwl/webpack/src/executors/webpack/lib/get-webpack-config");
|
|
8
8
|
const custom_webpack_1 = require("@nrwl/webpack/src/utils/webpack/custom-webpack");
|
|
9
9
|
const webpack_fallback_1 = require("./webpack-fallback");
|
|
10
|
+
const ct_helpers_1 = require("@nrwl/cypress/src/utils/ct-helpers");
|
|
10
11
|
/**
|
|
11
12
|
* React nx preset for Cypress Component Testing
|
|
12
13
|
*
|
|
@@ -29,10 +30,10 @@ function nxComponentTestingPreset(pathToConfig, options) {
|
|
|
29
30
|
let webpackConfig;
|
|
30
31
|
try {
|
|
31
32
|
const graph = (0, devkit_1.readCachedProjectGraph)();
|
|
32
|
-
const { targets: ctTargets, name: ctProjectName } = (0,
|
|
33
|
+
const { targets: ctTargets, name: ctProjectName } = (0, ct_helpers_1.getProjectConfigByPath)(graph, pathToConfig);
|
|
33
34
|
const ctTargetName = (options === null || options === void 0 ? void 0 : options.ctTargetName) || 'component-test';
|
|
34
35
|
const ctConfigurationName = process.env.NX_CYPRESS_TARGET_CONFIGURATION;
|
|
35
|
-
const ctExecutorContext = (0,
|
|
36
|
+
const ctExecutorContext = (0, ct_helpers_1.createExecutorContext)(graph, ctTargets, ctProjectName, ctTargetName, ctConfigurationName);
|
|
36
37
|
const ctExecutorOptions = (0, devkit_1.readTargetOptions)({
|
|
37
38
|
project: ctProjectName,
|
|
38
39
|
target: ctTargetName,
|
|
@@ -49,11 +50,11 @@ function nxComponentTestingPreset(pathToConfig, options) {
|
|
|
49
50
|
Falling back to default webpack config.`);
|
|
50
51
|
devkit_1.logger.warn(e);
|
|
51
52
|
webpackConfig = (0, webpack_fallback_1.buildBaseWebpackConfig)({
|
|
52
|
-
tsConfigPath: 'tsconfig.cy.json',
|
|
53
|
+
tsConfigPath: 'cypress/tsconfig.cy.json',
|
|
53
54
|
compiler: 'babel',
|
|
54
55
|
});
|
|
55
56
|
}
|
|
56
|
-
return Object.assign(Object.assign({}, (0, cypress_preset_1.nxBaseCypressPreset)(pathToConfig)), { devServer: {
|
|
57
|
+
return Object.assign(Object.assign({}, (0, cypress_preset_1.nxBaseCypressPreset)(pathToConfig)), { specPattern: 'src/**/*.cy.{js,jsx,ts,tsx}', devServer: {
|
|
57
58
|
// cypress uses string union type,
|
|
58
59
|
// need to use const to prevent typing to string
|
|
59
60
|
framework: 'react',
|
|
@@ -100,7 +101,7 @@ function buildTargetWebpack(graph, buildTarget, componentTestingProjectName) {
|
|
|
100
101
|
Has component config? ${!!ctProjectConfig}
|
|
101
102
|
`);
|
|
102
103
|
}
|
|
103
|
-
const context = (0,
|
|
104
|
+
const context = (0, ct_helpers_1.createExecutorContext)(graph, buildableProjectConfig.targets, parsed.project, parsed.target, parsed.target);
|
|
104
105
|
const options = (0, normalize_options_1.normalizeOptions)(withSchemaDefaults(parsed, context), devkit_1.workspaceRoot, buildableProjectConfig.sourceRoot);
|
|
105
106
|
const isScriptOptimizeOn = typeof options.optimization === 'boolean'
|
|
106
107
|
? options.optimization
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../packages/react/plugins/component-testing/index.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../packages/react/plugins/component-testing/index.ts"],"names":[],"mappings":";;;AAAA,yEAG8C;AAE9C,yCAUsB;AAEtB,iGAA6F;AAC7F,mGAA8F;AAC9F,mFAA4F;AAC5F,yDAA4D;AAC5D,mEAG4C;AAE5C;;;;;;;;;;;;;;;;;GAiBG;AACH,SAAgB,wBAAwB,CACtC,YAAoB,EACpB,OAAmC;IAEnC,IAAI,aAAa,CAAC;IAClB,IAAI;QACF,MAAM,KAAK,GAAG,IAAA,+BAAsB,GAAE,CAAC;QACvC,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,IAAI,EAAE,aAAa,EAAE,GAAG,IAAA,mCAAsB,EACxE,KAAK,EACL,YAAY,CACb,CAAC;QACF,MAAM,YAAY,GAAG,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,YAAY,KAAI,gBAAgB,CAAC;QAC/D,MAAM,mBAAmB,GAAG,OAAO,CAAC,GAAG,CAAC,+BAA+B,CAAC;QAExE,MAAM,iBAAiB,GAAG,IAAA,kCAAqB,EAC7C,KAAK,EACL,SAAS,EACT,aAAa,EACb,YAAY,EACZ,mBAAmB,CACpB,CAAC;QAEF,MAAM,iBAAiB,GAAG,IAAA,0BAAiB,EACzC;YACE,OAAO,EAAE,aAAa;YACtB,MAAM,EAAE,YAAY;YACpB,aAAa,EAAE,mBAAmB;SACnC,EACD,iBAAiB,CAClB,CAAC;QAEF,MAAM,WAAW,GAAG,iBAAiB,CAAC,eAAe,CAAC;QAEtD,IAAI,CAAC,WAAW,EAAE;YAChB,MAAM,IAAI,KAAK,CACb,gEAAgE,YAAY,oBAAoB,aAAa,WAAW,CACzH,CAAC;SACH;QAED,aAAa,GAAG,kBAAkB,CAAC,KAAK,EAAE,WAAW,EAAE,aAAa,CAAC,CAAC;KACvE;IAAC,OAAO,CAAC,EAAE;QACV,eAAM,CAAC,IAAI,CACT,IAAA,qBAAY,EAAA;8CAC4B,CACzC,CAAC;QACF,eAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACf,aAAa,GAAG,IAAA,yCAAsB,EAAC;YACrC,YAAY,EAAE,0BAA0B;YACxC,QAAQ,EAAE,OAAO;SAClB,CAAC,CAAC;KACJ;IACD,uCACK,IAAA,oCAAmB,EAAC,YAAY,CAAC,KACpC,WAAW,EAAE,6BAA6B,EAC1C,SAAS,EAAE;YACT,kCAAkC;YAClC,gDAAgD;YAChD,SAAS,EAAE,OAAO;YAClB,OAAO,EAAE,SAAS;YAClB,aAAa;SACL,IACV;AACJ,CAAC;AA9DD,4DA8DC;AAED;;GAEG;AACH,SAAS,kBAAkB,CACzB,MAAc,EACd,OAAwB;;IAExB,MAAM,OAAO,GAAG,IAAA,0BAAiB,EAAyB,MAAM,EAAE,OAAO,CAAC,CAAC;IAE3E,MAAA,OAAO,CAAC,QAAQ,oCAAhB,OAAO,CAAC,QAAQ,GAAK,OAAO,EAAC;IAC7B,MAAA,OAAO,CAAC,gBAAgB,oCAAxB,OAAO,CAAC,gBAAgB,GAAK,IAAI,EAAC;IAClC,MAAA,OAAO,CAAC,WAAW,oCAAnB,OAAO,CAAC,WAAW,GAAK,IAAI,EAAC;IAC7B,MAAA,OAAO,CAAC,WAAW,oCAAnB,OAAO,CAAC,WAAW,GAAK,IAAI,EAAC;IAC7B,MAAA,OAAO,CAAC,YAAY,oCAApB,OAAO,CAAC,YAAY,GAAK,IAAI,EAAC;IAC9B,MAAA,OAAO,CAAC,SAAS,oCAAjB,OAAO,CAAC,SAAS,GAAK,IAAI,EAAC;IAC3B,MAAA,OAAO,CAAC,MAAM,oCAAd,OAAO,CAAC,MAAM,GAAK,EAAE,EAAC;IACtB,MAAA,OAAO,CAAC,OAAO,oCAAf,OAAO,CAAC,OAAO,GAAK,EAAE,EAAC;IACvB,MAAA,OAAO,CAAC,MAAM,oCAAd,OAAO,CAAC,MAAM,GAAK,EAAE,EAAC;IACtB,MAAA,OAAO,CAAC,OAAO,oCAAf,OAAO,CAAC,OAAO,GAAK,EAAE,EAAC;IACvB,MAAA,OAAO,CAAC,WAAW,oCAAnB,OAAO,CAAC,WAAW,GAAK,IAAI,EAAC;IAC7B,MAAA,OAAO,CAAC,aAAa,oCAArB,OAAO,CAAC,aAAa,GAAK,MAAM,EAAC;IACjC,MAAA,OAAO,CAAC,UAAU,oCAAlB,OAAO,CAAC,UAAU,GAAK,IAAI,EAAC;IAC5B,MAAA,OAAO,CAAC,WAAW,oCAAnB,OAAO,CAAC,WAAW,GAAK,IAAI,EAAC;IAC7B,MAAA,OAAO,CAAC,UAAU,oCAAlB,OAAO,CAAC,UAAU,GAAK,CAAC,EAAC;IACzB,MAAA,OAAO,CAAC,gBAAgB,oCAAxB,OAAO,CAAC,gBAAgB,GAAK,EAAE,EAAC;IAChC,MAAA,OAAO,CAAC,mBAAmB,oCAA3B,OAAO,CAAC,mBAAmB,GAAK,IAAI,EAAC;IACrC,MAAA,OAAO,CAAC,iBAAiB,oCAAzB,OAAO,CAAC,iBAAiB,GAAK,IAAI,EAAC;IACnC,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,SAAS,kBAAkB,CACzB,KAAmB,EACnB,WAAmB,EACnB,2BAAmC;;IAEnC,MAAM,MAAM,GAAG,IAAA,0BAAiB,EAAC,WAAW,CAAC,CAAC;IAE9C,MAAM,sBAAsB,GAAG,MAAA,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,0CAAE,IAAI,CAAC;IACjE,MAAM,eAAe,GAAG,MAAA,KAAK,CAAC,KAAK,CAAC,2BAA2B,CAAC,0CAAE,IAAI,CAAC;IAEvE,IAAI,CAAC,sBAAsB,IAAI,CAAC,eAAe,EAAE;QAC/C,MAAM,IAAI,KAAK,CAAC,IAAA,qBAAY,EAAA;0BACN,WAAW;wBACb,CAAC,CAAC,sBAAsB;4BACpB,CAAC,CAAC,eAAe;KACxC,CAAC,CAAC;KACJ;IACD,MAAM,OAAO,GAAG,IAAA,kCAAqB,EACnC,KAAK,EACL,sBAAsB,CAAC,OAAO,EAC9B,MAAM,CAAC,OAAO,EACd,MAAM,CAAC,MAAM,EACb,MAAM,CAAC,MAAM,CACd,CAAC;IAEF,MAAM,OAAO,GAAG,IAAA,oCAAgB,EAC9B,kBAAkB,CAAC,MAAM,EAAE,OAAO,CAAC,EACnC,sBAAa,EACb,sBAAsB,CAAC,UAAW,CACnC,CAAC;IAEF,MAAM,kBAAkB,GACtB,OAAO,OAAO,CAAC,YAAY,KAAK,SAAS;QACvC,CAAC,CAAC,OAAO,CAAC,YAAY;QACtB,CAAC,CAAC,OAAO,CAAC,YAAY,IAAI,OAAO,CAAC,YAAY,CAAC,OAAO;YACtD,CAAC,CAAC,OAAO,CAAC,YAAY,CAAC,OAAO;YAC9B,CAAC,CAAC,KAAK,CAAC;IAEZ,IAAI,aAAa,CAAC;IAClB,IAAI,OAAO,CAAC,aAAa,EAAE;QACzB,aAAa,GAAG,IAAA,2CAA0B,EACxC,OAAO,CAAC,aAAa,EACrB,OAAO,CAAC,QAAQ,CACjB,CAAC;QAEF,IAAI,OAAO,aAAa,CAAC,IAAI,KAAK,UAAU,EAAE;YAC5C,mCAAmC;YACnC,8EAA8E;YAC9E,eAAM,CAAC,IAAI,CAAC,IAAA,qBAAY,EAAA;mDACqB,OAAO,CAAC,aAAa,GAAG,CAAC,CAAC;YACvE,aAAa,GAAG,IAAI,CAAC;SACtB;KACF;IAED,MAAM,cAAc,GAAG,IAAA,qCAAgB,EACrC,OAAO,EACP,OAAO,EACP,IAAI,EACJ,kBAAkB,EAClB;QACE,IAAI,EAAE,eAAe,CAAC,IAAI;QAC1B,UAAU,EAAE,eAAe,CAAC,UAAU;QACtC,aAAa,EAAE,MAAM,CAAC,aAAa;KACpC,CACF,CAAC;IAEF,IAAI,aAAa,EAAE;QACjB,OAAO,aAAa,CAAC,cAAc,EAAE;YACnC,OAAO;YACP,OAAO;YACP,aAAa,EAAE,MAAM,CAAC,aAAa;SACpC,CAAC,CAAC;KACJ;IACD,OAAO,cAAc,CAAC;AACxB,CAAC"}
|
|
@@ -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,10 @@ 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");
|
|
21
|
+
const install_common_dependencies_1 = require("./lib/install-common-dependencies");
|
|
22
|
+
const create_ts_config_1 = require("../../utils/create-ts-config");
|
|
23
23
|
function addLinting(host, options) {
|
|
24
24
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
25
25
|
const tasks = [];
|
|
@@ -40,7 +40,7 @@ function addLinting(host, options) {
|
|
|
40
40
|
tasks.push(lintTask);
|
|
41
41
|
(0, devkit_1.updateJson)(host, (0, devkit_1.joinPathFragments)(options.appProjectRoot, '.eslintrc.json'), lint_1.extendReactEslintJson);
|
|
42
42
|
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':
|
|
43
|
+
? { '@swc/core': versions_1.swcCoreVersion, 'swc-loader': versions_1.swcLoaderVersion }
|
|
44
44
|
: {})));
|
|
45
45
|
tasks.push(installTask);
|
|
46
46
|
}
|
|
@@ -53,13 +53,18 @@ function applicationGenerator(host, schema) {
|
|
|
53
53
|
const options = (0, normalize_options_1.normalizeOptions)(host, schema);
|
|
54
54
|
const initTask = yield (0, init_1.default)(host, Object.assign(Object.assign({}, options), { skipFormat: true, skipBabelConfig: options.bundler === 'vite', skipHelperLibs: options.bundler === 'vite' }));
|
|
55
55
|
tasks.push(initTask);
|
|
56
|
+
if (!options.rootProject) {
|
|
57
|
+
(0, create_ts_config_1.extractTsConfigBase)(host);
|
|
58
|
+
}
|
|
56
59
|
(0, create_application_files_1.createApplicationFiles)(host, options);
|
|
57
60
|
(0, add_project_1.addProject)(host, options);
|
|
58
61
|
if (options.bundler === 'vite') {
|
|
62
|
+
yield (0, devkit_1.ensurePackage)(host, '@nrwl/vite', versions_1.nxVersion);
|
|
63
|
+
const { viteConfigurationGenerator } = yield Promise.resolve().then(() => require('@nrwl/vite'));
|
|
59
64
|
// We recommend users use `import.meta.env.MODE` and other variables in their code to differentiate between production and development.
|
|
60
65
|
// See: https://vitejs.dev/guide/env-and-mode.html
|
|
61
66
|
host.delete((0, devkit_1.joinPathFragments)(options.appProjectRoot, 'src/environments'));
|
|
62
|
-
const viteTask = yield
|
|
67
|
+
const viteTask = yield viteConfigurationGenerator(host, {
|
|
63
68
|
uiFramework: 'react',
|
|
64
69
|
project: options.projectName,
|
|
65
70
|
newProject: true,
|
|
@@ -67,9 +72,20 @@ function applicationGenerator(host, schema) {
|
|
|
67
72
|
});
|
|
68
73
|
tasks.push(viteTask);
|
|
69
74
|
}
|
|
75
|
+
else if (options.bundler === 'webpack') {
|
|
76
|
+
yield (0, devkit_1.ensurePackage)(host, '@nrwl/webpack', versions_1.nxVersion);
|
|
77
|
+
const { webpackInitGenerator } = yield Promise.resolve().then(() => require('@nrwl/webpack'));
|
|
78
|
+
const webpackInitTask = yield webpackInitGenerator(host, {
|
|
79
|
+
uiFramework: 'react',
|
|
80
|
+
});
|
|
81
|
+
tasks.push(webpackInitTask);
|
|
82
|
+
}
|
|
70
83
|
if (options.bundler !== 'vite' && options.unitTestRunner === 'vitest') {
|
|
71
|
-
|
|
84
|
+
yield (0, devkit_1.ensurePackage)(host, '@nrwl/vite', versions_1.nxVersion);
|
|
85
|
+
const { vitestGenerator } = yield Promise.resolve().then(() => require('@nrwl/vite'));
|
|
86
|
+
const vitestTask = yield vitestGenerator(host, {
|
|
72
87
|
uiFramework: 'react',
|
|
88
|
+
coverageProvider: 'c8',
|
|
73
89
|
project: options.projectName,
|
|
74
90
|
inSourceTests: options.inSourceTests,
|
|
75
91
|
});
|
|
@@ -89,6 +105,8 @@ function applicationGenerator(host, schema) {
|
|
|
89
105
|
}
|
|
90
106
|
// Handle tsconfig.spec.json for jest or vitest
|
|
91
107
|
(0, update_jest_config_1.updateSpecConfig)(host, options);
|
|
108
|
+
const stylePreprocessorTask = (0, install_common_dependencies_1.installCommonDependencies)(host, options);
|
|
109
|
+
tasks.push(stylePreprocessorTask);
|
|
92
110
|
const styledTask = (0, add_styled_dependencies_1.addStyledModuleDependencies)(host, options.styledModule);
|
|
93
111
|
tasks.push(styledTask);
|
|
94
112
|
const routingTask = (0, add_routing_1.addRouting)(host, options);
|
|
@@ -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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"}
|
|
@@ -9,6 +9,6 @@
|
|
|
9
9
|
"<%= offsetFromRoot %>node_modules/@nrwl/react/typings/cssmodule.d.ts",
|
|
10
10
|
"<%= offsetFromRoot %>node_modules/@nrwl/react/typings/image.d.ts"
|
|
11
11
|
],
|
|
12
|
-
"exclude": ["jest.config.ts","
|
|
13
|
-
"include": ["
|
|
12
|
+
"exclude": ["jest.config.ts","src/**/*.spec.ts", "src/**/*.test.ts", "src/**/*.spec.tsx", "src/**/*.test.tsx", "src/**/*.spec.js", "src/**/*.test.js", "src/**/*.spec.jsx", "src/**/*.test.jsx"],
|
|
13
|
+
"include": ["src/**/*.js", "src/**/*.jsx", "src/**/*.ts", "src/**/*.tsx"]
|
|
14
14
|
}
|
|
@@ -9,6 +9,6 @@
|
|
|
9
9
|
"<%= offsetFromRoot %>node_modules/@nrwl/react/typings/cssmodule.d.ts",
|
|
10
10
|
"<%= offsetFromRoot %>node_modules/@nrwl/react/typings/image.d.ts"
|
|
11
11
|
],
|
|
12
|
-
"exclude": ["
|
|
13
|
-
"include": ["
|
|
12
|
+
"exclude": ["src/**/*.spec.ts", "src/**/*.test.ts", "src/**/*.spec.tsx", "src/**/*.test.tsx", "src/**/*.spec.js", "src/**/*.test.js", "src/**/*.spec.jsx", "src/**/*.test.jsx"],
|
|
13
|
+
"include": ["src/**/*.js", "src/**/*.jsx", "src/**/*.ts", "src/**/*.tsx"]
|
|
14
14
|
}
|
|
@@ -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"}
|
|
@@ -4,14 +4,7 @@ exports.createApplicationFiles = void 0;
|
|
|
4
4
|
const devkit_1 = require("@nrwl/devkit");
|
|
5
5
|
const path_1 = require("path");
|
|
6
6
|
const typescript_1 = require("@nrwl/workspace/src/utilities/typescript");
|
|
7
|
-
|
|
8
|
-
(0, devkit_1.updateJson)(host, (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'tsconfig.json'), (json) => {
|
|
9
|
-
if (options.strict) {
|
|
10
|
-
json.compilerOptions = Object.assign(Object.assign({}, json.compilerOptions), { forceConsistentCasingInFileNames: true, strict: true, noImplicitOverride: true, noPropertyAccessFromIndexSignature: true, noImplicitReturns: true, noFallthroughCasesInSwitch: true });
|
|
11
|
-
}
|
|
12
|
-
return json;
|
|
13
|
-
});
|
|
14
|
-
}
|
|
7
|
+
const create_ts_config_1 = require("../../../utils/create-ts-config");
|
|
15
8
|
function createApplicationFiles(host, options) {
|
|
16
9
|
let styleSolutionSpecificAppFiles;
|
|
17
10
|
if (options.styledModule && options.style !== 'styled-jsx') {
|
|
@@ -29,7 +22,8 @@ function createApplicationFiles(host, options) {
|
|
|
29
22
|
else {
|
|
30
23
|
styleSolutionSpecificAppFiles = '../files/css-module';
|
|
31
24
|
}
|
|
32
|
-
const
|
|
25
|
+
const relativePathToRootTsConfig = (0, typescript_1.getRelativePathToRootTsConfig)(host, options.appProjectRoot);
|
|
26
|
+
const templateVariables = Object.assign(Object.assign(Object.assign({}, (0, devkit_1.names)(options.name)), options), { tmpl: '', offsetFromRoot: (0, devkit_1.offsetFromRoot)(options.appProjectRoot) });
|
|
33
27
|
(0, devkit_1.generateFiles)(host, (0, path_1.join)(__dirname, options.bundler === 'vite' ? '../files/common-vite' : '../files/common'), options.appProjectRoot, templateVariables);
|
|
34
28
|
if (options.unitTestRunner === 'none' ||
|
|
35
29
|
(options.unitTestRunner === 'vitest' && options.inSourceTests == true)) {
|
|
@@ -50,7 +44,7 @@ function createApplicationFiles(host, options) {
|
|
|
50
44
|
if (options.js) {
|
|
51
45
|
(0, devkit_1.toJS)(host);
|
|
52
46
|
}
|
|
53
|
-
|
|
47
|
+
(0, create_ts_config_1.createTsConfig)(host, options.appProjectRoot, 'app', options, relativePathToRootTsConfig);
|
|
54
48
|
}
|
|
55
49
|
exports.createApplicationFiles = createApplicationFiles;
|
|
56
50
|
//# sourceMappingURL=create-application-files.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create-application-files.js","sourceRoot":"","sources":["../../../../../../../packages/react/src/generators/application/lib/create-application-files.ts"],"names":[],"mappings":";;;AACA,yCAQsB;AACtB,+BAA4B;AAC5B,yEAAyF;
|
|
1
|
+
{"version":3,"file":"create-application-files.js","sourceRoot":"","sources":["../../../../../../../packages/react/src/generators/application/lib/create-application-files.ts"],"names":[],"mappings":";;;AACA,yCAQsB;AACtB,+BAA4B;AAC5B,yEAAyF;AACzF,sEAAiE;AAEjE,SAAgB,sBAAsB,CAAC,IAAU,EAAE,OAAyB;IAC1E,IAAI,6BAAqC,CAAC;IAC1C,IAAI,OAAO,CAAC,YAAY,IAAI,OAAO,CAAC,KAAK,KAAK,YAAY,EAAE;QAC1D,6BAA6B,GAAG,wBAAwB,CAAC;KAC1D;SAAM,IAAI,OAAO,CAAC,KAAK,KAAK,YAAY,EAAE;QACzC,6BAA6B,GAAG,qBAAqB,CAAC;KACvD;SAAM,IAAI,OAAO,CAAC,KAAK,KAAK,MAAM,EAAE;QACnC,6BAA6B,GAAG,eAAe,CAAC;KACjD;SAAM,IAAI,OAAO,CAAC,SAAS,EAAE;QAC5B,6BAA6B,GAAG,qBAAqB,CAAC;KACvD;SAAM;QACL,6BAA6B,GAAG,qBAAqB,CAAC;KACvD;IAED,MAAM,0BAA0B,GAAG,IAAA,0CAA6B,EAC9D,IAAI,EACJ,OAAO,CAAC,cAAc,CACvB,CAAC;IACF,MAAM,iBAAiB,iDAClB,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,GACnB,OAAO,KACV,IAAI,EAAE,EAAE,EACR,cAAc,EAAE,IAAA,uBAAc,EAAC,OAAO,CAAC,cAAc,CAAC,GACvD,CAAC;IAEF,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,WAAI,EACF,SAAS,EACT,OAAO,CAAC,OAAO,KAAK,MAAM,CAAC,CAAC,CAAC,sBAAsB,CAAC,CAAC,CAAC,iBAAiB,CACxE,EACD,OAAO,CAAC,cAAc,EACtB,iBAAiB,CAClB,CAAC;IAEF,IACE,OAAO,CAAC,cAAc,KAAK,MAAM;QACjC,CAAC,OAAO,CAAC,cAAc,KAAK,QAAQ,IAAI,OAAO,CAAC,aAAa,IAAI,IAAI,CAAC,EACtE;QACA,IAAI,CAAC,MAAM,CACT,GAAG,OAAO,CAAC,cAAc,YAAY,OAAO,CAAC,QAAQ,WAAW,CACjE,CAAC;KACH;IACD,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,WAAI,EAAC,SAAS,EAAE,6BAA6B,CAAC,EAC9C,OAAO,CAAC,cAAc,EACtB,iBAAiB,CAClB,CAAC;IAEF,IAAI,OAAO,CAAC,cAAc,KAAK,QAAQ,IAAI,OAAO,CAAC,aAAa,IAAI,IAAI,EAAE;QACxE,IAAI,mBAAmB,GAAG,IAAI;aAC3B,IAAI,CAAC,GAAG,OAAO,CAAC,cAAc,YAAY,OAAO,CAAC,QAAQ,MAAM,CAAC;aACjE,QAAQ,EAAE,CAAC;QACd,mBAAmB,IAAI;;;;;KAKtB,CAAC;KACH;IAED,IAAI,OAAO,CAAC,EAAE,EAAE;QACd,IAAA,aAAI,EAAC,IAAI,CAAC,CAAC;KACZ;IAED,IAAA,iCAAc,EACZ,IAAI,EACJ,OAAO,CAAC,cAAc,EACtB,KAAK,EACL,OAAO,EACP,0BAA0B,CAC3B,CAAC;AACJ,CAAC;AAzED,wDAyEC"}
|
|
@@ -0,0 +1,29 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.installCommonDependencies = void 0;
|
|
4
|
+
const devkit_1 = require("@nrwl/devkit");
|
|
5
|
+
const versions_1 = require("../../../utils/versions");
|
|
6
|
+
function installCommonDependencies(host, options) {
|
|
7
|
+
let devDependencies = null;
|
|
8
|
+
// Vite requires style preprocessors to be installed manually.
|
|
9
|
+
// `@nrwl/webpack` installs them automatically for now.
|
|
10
|
+
// TODO(jack): Once we clean up webpack we can remove this check
|
|
11
|
+
if (options.bundler === 'vite' || options.unitTestRunner === 'vitest') {
|
|
12
|
+
switch (options.style) {
|
|
13
|
+
case 'scss':
|
|
14
|
+
devDependencies = { sass: versions_1.sassVersion };
|
|
15
|
+
break;
|
|
16
|
+
case 'less':
|
|
17
|
+
devDependencies = { less: versions_1.lessVersion };
|
|
18
|
+
break;
|
|
19
|
+
case 'styl':
|
|
20
|
+
devDependencies = { stylus: versions_1.stylusVersion };
|
|
21
|
+
break;
|
|
22
|
+
}
|
|
23
|
+
}
|
|
24
|
+
return devDependencies
|
|
25
|
+
? (0, devkit_1.addDependenciesToPackageJson)(host, {}, devDependencies)
|
|
26
|
+
: function noop() { };
|
|
27
|
+
}
|
|
28
|
+
exports.installCommonDependencies = installCommonDependencies;
|
|
29
|
+
//# sourceMappingURL=install-common-dependencies.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"install-common-dependencies.js","sourceRoot":"","sources":["../../../../../../../packages/react/src/generators/application/lib/install-common-dependencies.ts"],"names":[],"mappings":";;;AAAA,yCAAkE;AAClE,sDAIiC;AAGjC,SAAgB,yBAAyB,CACvC,IAAU,EACV,OAAyB;IAEzB,IAAI,eAAe,GAAG,IAAI,CAAC;IAE3B,8DAA8D;IAC9D,uDAAuD;IACvD,gEAAgE;IAChE,IAAI,OAAO,CAAC,OAAO,KAAK,MAAM,IAAI,OAAO,CAAC,cAAc,KAAK,QAAQ,EAAE;QACrE,QAAQ,OAAO,CAAC,KAAK,EAAE;YACrB,KAAK,MAAM;gBACT,eAAe,GAAG,EAAE,IAAI,EAAE,sBAAW,EAAE,CAAC;gBACxC,MAAM;YACR,KAAK,MAAM;gBACT,eAAe,GAAG,EAAE,IAAI,EAAE,sBAAW,EAAE,CAAC;gBACxC,MAAM;YACR,KAAK,MAAM;gBACT,eAAe,GAAG,EAAE,MAAM,EAAE,wBAAa,EAAE,CAAC;gBAC5C,MAAM;SACT;KACF;IAED,OAAO,eAAe;QACpB,CAAC,CAAC,IAAA,qCAA4B,EAAC,IAAI,EAAE,EAAE,EAAE,eAAe,CAAC;QACzD,CAAC,CAAC,SAAS,IAAI,KAAI,CAAC,CAAC;AACzB,CAAC;AA1BD,8DA0BC"}
|
|
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.setDefaults = void 0;
|
|
4
4
|
const devkit_1 = require("@nrwl/devkit");
|
|
5
5
|
function setDefaults(host, options) {
|
|
6
|
+
var _a;
|
|
6
7
|
if (options.skipWorkspaceJson) {
|
|
7
8
|
return;
|
|
8
9
|
}
|
|
@@ -14,7 +15,15 @@ function setDefaults(host, options) {
|
|
|
14
15
|
workspace.generators['@nrwl/react'] =
|
|
15
16
|
workspace.generators['@nrwl/react'] || {};
|
|
16
17
|
const prev = Object.assign({}, workspace.generators['@nrwl/react']);
|
|
17
|
-
|
|
18
|
+
const appDefaults = Object.assign({ style: options.style, linter: options.linter, bundler: options.bundler }, prev.application);
|
|
19
|
+
const componentDefaults = Object.assign({ style: options.style }, prev.component);
|
|
20
|
+
const libDefaults = Object.assign({ style: options.style, linter: options.linter }, prev.library);
|
|
21
|
+
// Future react libs should use same test runner as the app.
|
|
22
|
+
if (options.unitTestRunner === 'vitest') {
|
|
23
|
+
// Note: We don't set bundler: 'vite' for libraries because that means they are buildable.
|
|
24
|
+
(_a = libDefaults.unitTestRunner) !== null && _a !== void 0 ? _a : (libDefaults.unitTestRunner = 'vitest');
|
|
25
|
+
}
|
|
26
|
+
workspace.generators = Object.assign(Object.assign({}, workspace.generators), { '@nrwl/react': Object.assign(Object.assign({}, prev), { application: appDefaults, component: componentDefaults, library: libDefaults }) });
|
|
18
27
|
(0, devkit_1.updateWorkspaceConfiguration)(host, workspace);
|
|
19
28
|
}
|
|
20
29
|
exports.setDefaults = setDefaults;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"set-defaults.js","sourceRoot":"","sources":["../../../../../../../packages/react/src/generators/application/lib/set-defaults.ts"],"names":[],"mappings":";;;AAAA,yCAIsB;AAGtB,SAAgB,WAAW,CAAC,IAAU,EAAE,OAAyB
|
|
1
|
+
{"version":3,"file":"set-defaults.js","sourceRoot":"","sources":["../../../../../../../packages/react/src/generators/application/lib/set-defaults.ts"],"names":[],"mappings":";;;AAAA,yCAIsB;AAGtB,SAAgB,WAAW,CAAC,IAAU,EAAE,OAAyB;;IAC/D,IAAI,OAAO,CAAC,iBAAiB,EAAE;QAC7B,OAAO;KACR;IAED,MAAM,SAAS,GAAG,IAAA,mCAA0B,EAAC,IAAI,CAAC,CAAC;IAEnD,IAAI,CAAC,OAAO,CAAC,kBAAkB,IAAI,CAAC,SAAS,CAAC,cAAc,EAAE;QAC5D,SAAS,CAAC,cAAc,GAAG,OAAO,CAAC,WAAW,CAAC;KAChD;IAED,SAAS,CAAC,UAAU,GAAG,SAAS,CAAC,UAAU,IAAI,EAAE,CAAC;IAClD,SAAS,CAAC,UAAU,CAAC,aAAa,CAAC;QACjC,SAAS,CAAC,UAAU,CAAC,aAAa,CAAC,IAAI,EAAE,CAAC;IAE5C,MAAM,IAAI,qBAAQ,SAAS,CAAC,UAAU,CAAC,aAAa,CAAC,CAAE,CAAC;IAExD,MAAM,WAAW,mBACf,KAAK,EAAE,OAAO,CAAC,KAAK,EACpB,MAAM,EAAE,OAAO,CAAC,MAAM,EACtB,OAAO,EAAE,OAAO,CAAC,OAAO,IACrB,IAAI,CAAC,WAAW,CACpB,CAAC;IACF,MAAM,iBAAiB,mBACrB,KAAK,EAAE,OAAO,CAAC,KAAK,IACjB,IAAI,CAAC,SAAS,CAClB,CAAC;IACF,MAAM,WAAW,mBACf,KAAK,EAAE,OAAO,CAAC,KAAK,EACpB,MAAM,EAAE,OAAO,CAAC,MAAM,IACnB,IAAI,CAAC,OAAO,CAChB,CAAC;IACF,4DAA4D;IAC5D,IAAI,OAAO,CAAC,cAAc,KAAK,QAAQ,EAAE;QACvC,0FAA0F;QAC1F,MAAA,WAAW,CAAC,cAAc,oCAA1B,WAAW,CAAC,cAAc,GAAK,QAAQ,EAAC;KACzC;IACD,SAAS,CAAC,UAAU,mCACf,SAAS,CAAC,UAAU,KACvB,aAAa,kCACR,IAAI,KACP,WAAW,EAAE,WAAW,EACxB,SAAS,EAAE,iBAAiB,EAC5B,OAAO,EAAE,WAAW,MAEvB,CAAC;IAEF,IAAA,qCAA4B,EAAC,IAAI,EAAE,SAAS,CAAC,CAAC;AAChD,CAAC;AAhDD,kCAgDC"}
|
|
@@ -14,7 +14,7 @@ import { Route, Link } from 'react-router-dom';
|
|
|
14
14
|
import styled from '<%= styledModule %>';
|
|
15
15
|
<% } else {
|
|
16
16
|
var wrapper = 'div';
|
|
17
|
-
var extras = globalCss ? '' : " className={styles['container']}";
|
|
17
|
+
var extras = globalCss || styledModule === 'styled-jsx' ? '' : " className={styles['container']}";
|
|
18
18
|
%>
|
|
19
19
|
<%- style !== 'styled-jsx' ? globalCss ? `import './${fileName}.${style}';` : `import styles from './${fileName}.module.${style}';`: '' %>
|
|
20
20
|
<% }
|
|
@@ -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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"}
|