@nrwl/react 15.3.2 → 15.4.0-beta.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/package.json +6 -5
- package/plugins/component-testing/index.d.ts +4 -3
- package/plugins/component-testing/index.js +11 -8
- package/plugins/component-testing/index.js.map +1 -1
- package/plugins/component-testing/webpack-fallback.js +1 -1
- package/plugins/component-testing/webpack-fallback.js.map +1 -1
- package/src/executors/module-federation-dev-server/module-federation-dev-server.impl.js +1 -1
- package/src/executors/module-federation-dev-server/module-federation-dev-server.impl.js.map +1 -1
- package/src/executors/module-federation-ssr-dev-server/module-federation-ssr-dev-server.impl.d.ts +1 -5
- package/src/executors/module-federation-ssr-dev-server/module-federation-ssr-dev-server.impl.js +26 -7
- package/src/executors/module-federation-ssr-dev-server/module-federation-ssr-dev-server.impl.js.map +1 -1
- package/src/generators/application/application.js +2 -1
- package/src/generators/application/application.js.map +1 -1
- package/src/generators/application/files/common/src/app/__fileName__.spec.tsx__tmpl__ +1 -17
- package/src/generators/application/files/common-vite/src/app/__fileName__.spec.tsx__tmpl__ +1 -17
- package/src/generators/application/files/css-module/src/app/__fileName__.tsx__tmpl__ +2 -0
- package/src/generators/application/files/global-css/src/app/__fileName__.tsx__tmpl__ +2 -0
- package/src/generators/application/files/none/src/app/__fileName__.tsx__tmpl__ +2 -0
- package/src/generators/application/files/styled-jsx/src/app/__fileName__.tsx__tmpl__ +2 -0
- package/src/generators/application/files/styled-module/src/app/__fileName__.tsx__tmpl__ +2 -0
- package/src/generators/application/lib/add-cypress.js +1 -1
- package/src/generators/application/lib/add-cypress.js.map +1 -1
- package/src/generators/application/lib/create-application-files.js +4 -12
- package/src/generators/application/lib/create-application-files.js.map +1 -1
- package/src/generators/application/lib/get-app-tests.d.ts +2 -0
- package/src/generators/application/lib/get-app-tests.js +22 -0
- package/src/generators/application/lib/get-app-tests.js.map +1 -0
- package/src/generators/application/lib/set-defaults.js +0 -6
- package/src/generators/application/lib/set-defaults.js.map +1 -1
- package/src/generators/component/component.js +8 -3
- package/src/generators/component/component.js.map +1 -1
- package/src/generators/component/files/__fileName__.spec.tsx__tmpl__ +1 -4
- package/src/generators/component/files/__fileName__.tsx__tmpl__ +2 -0
- package/src/generators/component/get-component-tests.d.ts +2 -0
- package/src/generators/component/get-component-tests.js +13 -0
- package/src/generators/component/get-component-tests.js.map +1 -0
- package/src/generators/component/noramlized-schema.d.ts +8 -0
- package/src/generators/component/noramlized-schema.js +3 -0
- package/src/generators/component/noramlized-schema.js.map +1 -0
- package/src/generators/component/schema.d.ts +1 -0
- package/src/generators/component/schema.json +5 -0
- package/src/generators/cypress-component-configuration/cypress-component-configuration.js +2 -2
- package/src/generators/cypress-component-configuration/cypress-component-configuration.js.map +1 -1
- package/src/generators/cypress-component-configuration/files/cypress.config.ts__tpl__ +4 -2
- package/src/generators/cypress-component-configuration/lib/add-files.d.ts +2 -1
- package/src/generators/cypress-component-configuration/lib/add-files.js +24 -1
- package/src/generators/cypress-component-configuration/lib/add-files.js.map +1 -1
- package/src/generators/cypress-component-configuration/lib/update-configs.d.ts +6 -2
- package/src/generators/cypress-component-configuration/lib/update-configs.js +1 -0
- package/src/generators/cypress-component-configuration/lib/update-configs.js.map +1 -1
- package/src/generators/cypress-component-configuration/schema.d.ts +1 -0
- package/src/generators/cypress-component-configuration/schema.json +6 -0
- package/src/generators/host/files/module-federation/webpack.config.prod.js__tmpl__ +5 -5
- package/src/generators/host/files/module-federation-ssr/server.ts__tmpl__ +28 -0
- package/src/generators/host/host.js +1 -0
- package/src/generators/host/host.js.map +1 -1
- package/src/generators/host/lib/setup-ssr-for-host.js +5 -2
- package/src/generators/host/lib/setup-ssr-for-host.js.map +1 -1
- package/src/generators/host/schema.json +2 -1
- package/src/generators/library/lib/normalize-options.js +14 -4
- package/src/generators/library/lib/normalize-options.js.map +1 -1
- package/src/generators/library/lib/set-defaults.d.ts +3 -0
- package/src/generators/library/lib/set-defaults.js +17 -0
- package/src/generators/library/lib/set-defaults.js.map +1 -0
- package/src/generators/library/library.js +16 -1
- package/src/generators/library/library.js.map +1 -1
- package/src/generators/remote/files/module-federation-ssr/server.ts__tmpl__ +45 -0
- package/src/generators/remote/lib/setup-ssr-for-remote.js +13 -1
- package/src/generators/remote/lib/setup-ssr-for-remote.js.map +1 -1
- package/src/generators/remote/remote.js +1 -0
- package/src/generators/remote/remote.js.map +1 -1
- package/src/generators/remote/schema.json +2 -1
- package/src/generators/setup-ssr/files/server.ts__tmpl__ +1 -1
- package/src/generators/setup-ssr/setup-ssr.js +1 -0
- package/src/generators/setup-ssr/setup-ssr.js.map +1 -1
- package/src/module-federation/with-module-federation-ssr.js +2 -2
- package/src/module-federation/with-module-federation-ssr.js.map +1 -1
- package/src/module-federation/with-module-federation.js +2 -2
- package/src/module-federation/with-module-federation.js.map +1 -1
- package/src/utils/ast-utils.js +1 -1
- package/src/utils/ast-utils.js.map +1 -1
- package/src/utils/get-in-source-vitest-tests-template.d.ts +1 -0
- package/src/utils/get-in-source-vitest-tests-template.js +22 -0
- package/src/utils/get-in-source-vitest-tests-template.js.map +1 -0
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
|
-
|
|
6
|
+
# [15.4.0-beta.0](https://github.com/nrwl/nx/compare/15.3.3...15.4.0-beta.0) (2022-12-16)
|
|
7
7
|
|
|
8
8
|
**Note:** Version bump only for package @nrwl/react
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nrwl/react",
|
|
3
|
-
"version": "15.
|
|
3
|
+
"version": "15.4.0-beta.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,11 +31,12 @@
|
|
|
31
31
|
"migrations": "./migrations.json"
|
|
32
32
|
},
|
|
33
33
|
"dependencies": {
|
|
34
|
-
"@nrwl/devkit": "15.
|
|
35
|
-
"@nrwl/linter": "15.
|
|
36
|
-
"@nrwl/workspace": "15.
|
|
34
|
+
"@nrwl/devkit": "15.4.0-beta.0",
|
|
35
|
+
"@nrwl/linter": "15.4.0-beta.0",
|
|
36
|
+
"@nrwl/workspace": "15.4.0-beta.0",
|
|
37
37
|
"@phenomnomnominal/tsquery": "4.1.1",
|
|
38
38
|
"chalk": "4.1.0",
|
|
39
|
+
"enquirer": "~2.3.6",
|
|
39
40
|
"minimatch": "3.0.5",
|
|
40
41
|
"semver": "7.3.4"
|
|
41
42
|
},
|
|
@@ -43,5 +44,5 @@
|
|
|
43
44
|
"access": "public"
|
|
44
45
|
},
|
|
45
46
|
"types": "./index.d.ts",
|
|
46
|
-
"gitHead": "
|
|
47
|
+
"gitHead": "b94c7e58706ce3b2e70876b648c0b19bf649e01c"
|
|
47
48
|
}
|
|
@@ -20,9 +20,10 @@ import { NxComponentTestingOptions } from '@nrwl/cypress/plugins/cypress-preset'
|
|
|
20
20
|
export declare function nxComponentTestingPreset(pathToConfig: string, options?: NxComponentTestingOptions): {
|
|
21
21
|
specPattern: string;
|
|
22
22
|
devServer: {
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
23
|
+
framework?: 'react';
|
|
24
|
+
bundler?: 'vite' | 'webpack';
|
|
25
|
+
viteConfig?: any;
|
|
26
|
+
webpackConfig?: any;
|
|
26
27
|
};
|
|
27
28
|
videosFolder: string;
|
|
28
29
|
screenshotsFolder: string;
|
|
@@ -3,10 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.nxComponentTestingPreset = void 0;
|
|
4
4
|
const cypress_preset_1 = require("@nrwl/cypress/plugins/cypress-preset");
|
|
5
5
|
const devkit_1 = require("@nrwl/devkit");
|
|
6
|
-
const normalize_options_1 = require("@nrwl/webpack/src/executors/webpack/lib/normalize-options");
|
|
7
|
-
const get_webpack_config_1 = require("@nrwl/webpack/src/executors/webpack/lib/get-webpack-config");
|
|
8
|
-
const custom_webpack_1 = require("@nrwl/webpack/src/utils/webpack/custom-webpack");
|
|
9
|
-
const webpack_fallback_1 = require("./webpack-fallback");
|
|
10
6
|
const ct_helpers_1 = require("@nrwl/cypress/src/utils/ct-helpers");
|
|
11
7
|
/**
|
|
12
8
|
* React nx preset for Cypress Component Testing
|
|
@@ -27,6 +23,9 @@ const ct_helpers_1 = require("@nrwl/cypress/src/utils/ct-helpers");
|
|
|
27
23
|
* @param options override options
|
|
28
24
|
*/
|
|
29
25
|
function nxComponentTestingPreset(pathToConfig, options) {
|
|
26
|
+
if (options.bundler === 'vite') {
|
|
27
|
+
return Object.assign(Object.assign({}, (0, cypress_preset_1.nxBaseCypressPreset)(pathToConfig)), { specPattern: 'src/**/*.cy.{js,jsx,ts,tsx}', devServer: Object.assign({}, { framework: 'react', bundler: 'vite' }) });
|
|
28
|
+
}
|
|
30
29
|
let webpackConfig;
|
|
31
30
|
try {
|
|
32
31
|
const graph = (0, devkit_1.readCachedProjectGraph)();
|
|
@@ -49,7 +48,8 @@ function nxComponentTestingPreset(pathToConfig, options) {
|
|
|
49
48
|
devkit_1.logger.warn((0, devkit_1.stripIndents) `Unable to build a webpack config with the project graph.
|
|
50
49
|
Falling back to default webpack config.`);
|
|
51
50
|
devkit_1.logger.warn(e);
|
|
52
|
-
|
|
51
|
+
const { buildBaseWebpackConfig } = require('./webpack-fallback');
|
|
52
|
+
webpackConfig = buildBaseWebpackConfig({
|
|
53
53
|
tsConfigPath: 'cypress/tsconfig.cy.json',
|
|
54
54
|
compiler: 'babel',
|
|
55
55
|
});
|
|
@@ -102,7 +102,10 @@ function buildTargetWebpack(graph, buildTarget, componentTestingProjectName) {
|
|
|
102
102
|
`);
|
|
103
103
|
}
|
|
104
104
|
const context = (0, ct_helpers_1.createExecutorContext)(graph, buildableProjectConfig.targets, parsed.project, parsed.target, parsed.target);
|
|
105
|
-
const
|
|
105
|
+
const { normalizeOptions, } = require('@nrwl/webpack/src/executors/webpack/lib/normalize-options');
|
|
106
|
+
const { resolveCustomWebpackConfig, } = require('@nrwl/webpack/src/utils/webpack/custom-webpack');
|
|
107
|
+
const { getWebpackConfig, } = require('@nrwl/webpack/src/executors/webpack/lib/get-webpack-config');
|
|
108
|
+
const options = normalizeOptions(withSchemaDefaults(parsed, context), devkit_1.workspaceRoot, buildableProjectConfig.sourceRoot);
|
|
106
109
|
const isScriptOptimizeOn = typeof options.optimization === 'boolean'
|
|
107
110
|
? options.optimization
|
|
108
111
|
: options.optimization && options.optimization.scripts
|
|
@@ -110,7 +113,7 @@ function buildTargetWebpack(graph, buildTarget, componentTestingProjectName) {
|
|
|
110
113
|
: false;
|
|
111
114
|
let customWebpack;
|
|
112
115
|
if (options.webpackConfig) {
|
|
113
|
-
customWebpack =
|
|
116
|
+
customWebpack = resolveCustomWebpackConfig(options.webpackConfig, options.tsConfig);
|
|
114
117
|
if (typeof customWebpack.then === 'function') {
|
|
115
118
|
// cypress configs have to be sync.
|
|
116
119
|
// TODO(caleb): there might be a workaround with setUpNodeEvents preprocessor?
|
|
@@ -119,7 +122,7 @@ function buildTargetWebpack(graph, buildTarget, componentTestingProjectName) {
|
|
|
119
122
|
customWebpack = null;
|
|
120
123
|
}
|
|
121
124
|
}
|
|
122
|
-
const defaultWebpack =
|
|
125
|
+
const defaultWebpack = getWebpackConfig(context, options, true, isScriptOptimizeOn, {
|
|
123
126
|
root: ctProjectConfig.root,
|
|
124
127
|
sourceRoot: ctProjectConfig.sourceRoot,
|
|
125
128
|
configuration: parsed.configuration,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../packages/react/plugins/component-testing/index.ts"],"names":[],"mappings":";;;AAAA,yEAG8C;AAE9C,yCAUsB;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../packages/react/plugins/component-testing/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.buildBaseWebpackConfig = void 0;
|
|
4
|
-
const get_webpack_config_1 = require("@nrwl/webpack/src/executors/webpack/lib/get-webpack-config");
|
|
5
4
|
const tsconfig_paths_webpack_plugin_1 = require("tsconfig-paths-webpack-plugin");
|
|
5
|
+
const get_webpack_config_1 = require("@nrwl/webpack/src/executors/webpack/lib/get-webpack-config");
|
|
6
6
|
function buildBaseWebpackConfig({ tsConfigPath = 'tsconfig.cy.json', compiler = 'babel', }) {
|
|
7
7
|
const extensions = ['.ts', '.tsx', '.mjs', '.js', '.jsx'];
|
|
8
8
|
const config = {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"webpack-fallback.js","sourceRoot":"","sources":["../../../../../packages/react/plugins/component-testing/webpack-fallback.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"webpack-fallback.js","sourceRoot":"","sources":["../../../../../packages/react/plugins/component-testing/webpack-fallback.ts"],"names":[],"mappings":"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"}
|
|
@@ -30,7 +30,7 @@ function moduleFederationDevServer(options, context) {
|
|
|
30
30
|
for (const app of knownRemotes) {
|
|
31
31
|
const [appName] = Array.isArray(app) ? app : [app];
|
|
32
32
|
const isDev = devServeApps.includes(appName);
|
|
33
|
-
iter = (0, async_iterable_1.
|
|
33
|
+
iter = (0, async_iterable_1.combineAsyncIterables)(iter, yield tslib_1.__await((0, devkit_1.runExecutor)({
|
|
34
34
|
project: appName,
|
|
35
35
|
target: isDev ? 'serve' : 'serve-static',
|
|
36
36
|
configuration: context.configurationName,
|
|
@@ -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,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,
|
|
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,sCAAqB,EAC1B,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"}
|
package/src/executors/module-federation-ssr-dev-server/module-federation-ssr-dev-server.impl.d.ts
CHANGED
|
@@ -5,9 +5,5 @@ declare type ModuleFederationDevServerOptions = WebSsrDevServerOptions & {
|
|
|
5
5
|
skipRemotes?: string[];
|
|
6
6
|
host: string;
|
|
7
7
|
};
|
|
8
|
-
export default function moduleFederationSsrDevServer(options: ModuleFederationDevServerOptions, context: ExecutorContext): AsyncGenerator<
|
|
9
|
-
baseUrl: string;
|
|
10
|
-
success: boolean;
|
|
11
|
-
options: import("@nrwl/webpack/src/executors/ssr-dev-server/schema").TargetOptions;
|
|
12
|
-
}, any, undefined>;
|
|
8
|
+
export default function moduleFederationSsrDevServer(options: ModuleFederationDevServerOptions, context: ExecutorContext): AsyncGenerator<any, any, undefined>;
|
|
13
9
|
export {};
|
package/src/executors/module-federation-ssr-dev-server/module-federation-ssr-dev-server.impl.js
CHANGED
|
@@ -6,6 +6,7 @@ const ssr_dev_server_impl_1 = require("@nrwl/webpack/src/executors/ssr-dev-serve
|
|
|
6
6
|
const path_1 = require("path");
|
|
7
7
|
const chalk = require("chalk");
|
|
8
8
|
const async_iterable_1 = require("@nrwl/devkit/src/utils/async-iterable");
|
|
9
|
+
const child_process_1 = require("child_process");
|
|
9
10
|
function moduleFederationSsrDevServer(options, context) {
|
|
10
11
|
var _a, _b;
|
|
11
12
|
return tslib_1.__asyncGenerator(this, arguments, function* moduleFederationSsrDevServer_1() {
|
|
@@ -30,13 +31,31 @@ function moduleFederationSsrDevServer(options, context) {
|
|
|
30
31
|
for (const app of knownRemotes) {
|
|
31
32
|
const [appName] = Array.isArray(app) ? app : [app];
|
|
32
33
|
const isDev = devServeApps.includes(appName);
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
34
|
+
const remoteServeIter = isDev
|
|
35
|
+
? yield tslib_1.__await((0, devkit_1.runExecutor)({
|
|
36
|
+
project: appName,
|
|
37
|
+
target: 'serve',
|
|
38
|
+
configuration: context.configurationName,
|
|
39
|
+
}, {
|
|
40
|
+
watch: isDev,
|
|
41
|
+
}, context))
|
|
42
|
+
: (0, async_iterable_1.mapAsyncIterable)((0, async_iterable_1.createAsyncIterable)(({ next, done }) => tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
43
|
+
const remoteProject = context.workspace.projects[appName];
|
|
44
|
+
const remoteServerOutput = (0, path_1.join)(devkit_1.workspaceRoot, remoteProject.targets.server.options.outputPath, 'main.js');
|
|
45
|
+
(0, child_process_1.execSync)(`npx nx run ${appName}:server${context.configurationName ? `:${context.configurationName}` : ''}`, { stdio: 'inherit' });
|
|
46
|
+
const child = (0, child_process_1.fork)(remoteServerOutput, {
|
|
47
|
+
env: {
|
|
48
|
+
PORT: remoteProject.targets['serve-browser'].options.port,
|
|
49
|
+
},
|
|
50
|
+
});
|
|
51
|
+
child.on('message', (msg) => {
|
|
52
|
+
if (msg === 'nx.server.ready') {
|
|
53
|
+
next(true);
|
|
54
|
+
done();
|
|
55
|
+
}
|
|
56
|
+
});
|
|
57
|
+
})), (x) => x);
|
|
58
|
+
iter = (0, async_iterable_1.combineAsyncIterables)(iter, remoteServeIter);
|
|
40
59
|
}
|
|
41
60
|
let numAwaiting = knownRemotes.length + 1; // remotes + host
|
|
42
61
|
return yield tslib_1.__await(yield tslib_1.__await(yield* tslib_1.__asyncDelegator(tslib_1.__asyncValues((0, async_iterable_1.tapAsyncIterable)(iter, (x) => {
|
package/src/executors/module-federation-ssr-dev-server/module-federation-ssr-dev-server.impl.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"module-federation-ssr-dev-server.impl.js","sourceRoot":"","sources":["../../../../../../packages/react/src/executors/module-federation-ssr-dev-server/module-federation-ssr-dev-server.impl.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"module-federation-ssr-dev-server.impl.js","sourceRoot":"","sources":["../../../../../../packages/react/src/executors/module-federation-ssr-dev-server/module-federation-ssr-dev-server.impl.ts"],"names":[],"mappings":";;;AAAA,yCAKsB;AACtB,wGAAkG;AAElG,+BAA4B;AAC5B,+BAA+B;AAC/B,0EAK+C;AAC/C,iDAA+C;AAQ/C,SAA+B,4BAA4B,CACzD,OAAyC,EACzC,OAAwB;;;QAExB,IAAI,IAAI,GAAQ,IAAA,6BAAoB,EAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QACvD,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,MAAM,eAAe,GAAG,KAAK;gBAC3B,CAAC,CAAC,sBAAM,IAAA,oBAAW,EACf;oBACE,OAAO,EAAE,OAAO;oBAChB,MAAM,EAAE,OAAO;oBACf,aAAa,EAAE,OAAO,CAAC,iBAAiB;iBACzC,EACD;oBACE,KAAK,EAAE,KAAK;iBACb,EACD,OAAO,CACR,CAAA;gBACH,CAAC,CAAC,IAAA,iCAAgB,EACd,IAAA,oCAAmB,EAAC,CAAO,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,EAAE;oBAC3C,MAAM,aAAa,GAAG,OAAO,CAAC,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;oBAC1D,MAAM,kBAAkB,GAAG,IAAA,WAAI,EAC7B,sBAAa,EACb,aAAa,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,UAAU,EAC/C,SAAS,CACV,CAAC;oBACF,IAAA,wBAAQ,EACN,cAAc,OAAO,UACnB,OAAO,CAAC,iBAAiB,CAAC,CAAC,CAAC,IAAI,OAAO,CAAC,iBAAiB,EAAE,CAAC,CAAC,CAAC,EAChE,EAAE,EACF,EAAE,KAAK,EAAE,SAAS,EAAE,CACrB,CAAC;oBACF,MAAM,KAAK,GAAG,IAAA,oBAAI,EAAC,kBAAkB,EAAE;wBACrC,GAAG,EAAE;4BACH,IAAI,EAAE,aAAa,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC,OAAO,CAAC,IAAI;yBAC1D;qBACF,CAAC,CAAC;oBAEH,KAAK,CAAC,EAAE,CAAC,SAAS,EAAE,CAAC,GAAG,EAAE,EAAE;wBAC1B,IAAI,GAAG,KAAK,iBAAiB,EAAE;4BAC7B,IAAI,CAAC,IAAI,CAAC,CAAC;4BACX,IAAI,EAAE,CAAC;yBACR;oBACH,CAAC,CAAC,CAAC;gBACL,CAAC,CAAA,CAAC,EACF,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CACT,CAAC;YAEN,IAAI,GAAG,IAAA,sCAAqB,EAAC,IAAI,EAAE,eAAe,CAAC,CAAC;SACrD;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;AA7FD,+CA6FC"}
|
|
@@ -68,7 +68,8 @@ function applicationGenerator(host, schema) {
|
|
|
68
68
|
uiFramework: 'react',
|
|
69
69
|
project: options.projectName,
|
|
70
70
|
newProject: true,
|
|
71
|
-
includeVitest:
|
|
71
|
+
includeVitest: options.unitTestRunner === 'vitest',
|
|
72
|
+
inSourceTests: options.inSourceTests,
|
|
72
73
|
});
|
|
73
74
|
tasks.push(viteTask);
|
|
74
75
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"application.js","sourceRoot":"","sources":["../../../../../../packages/react/src/generators/application/application.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"application.js","sourceRoot":"","sources":["../../../../../../packages/react/src/generators/application/application.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,21 +6,5 @@ import { BrowserRouter } from 'react-router-dom';
|
|
|
6
6
|
import App from './<%= fileName %>';
|
|
7
7
|
|
|
8
8
|
describe('App', () => {
|
|
9
|
-
|
|
10
|
-
<% if (routing) { %>
|
|
11
|
-
const { baseElement } = render(<BrowserRouter><App /></BrowserRouter>);
|
|
12
|
-
<% } else { %>
|
|
13
|
-
const { baseElement } = render(<App />);
|
|
14
|
-
<% } %>
|
|
15
|
-
expect(baseElement).toBeTruthy();
|
|
16
|
-
});
|
|
17
|
-
|
|
18
|
-
it('should have a greeting as the title', () => {
|
|
19
|
-
<% if (routing) { %>
|
|
20
|
-
const { getByText } = render(<BrowserRouter><App /></BrowserRouter>);
|
|
21
|
-
<% } else { %>
|
|
22
|
-
const { getByText } = render(<App />);
|
|
23
|
-
<% } %>
|
|
24
|
-
expect(getByText(/Welcome <%= projectName %>/gi)).toBeTruthy();
|
|
25
|
-
});
|
|
9
|
+
<%- appTests %>
|
|
26
10
|
});
|
|
@@ -6,21 +6,5 @@ import { BrowserRouter } from 'react-router-dom';
|
|
|
6
6
|
import App from './<%= fileName %>';
|
|
7
7
|
|
|
8
8
|
describe('App', () => {
|
|
9
|
-
|
|
10
|
-
<% if (routing) { %>
|
|
11
|
-
const { baseElement } = render(<BrowserRouter><App /></BrowserRouter>);
|
|
12
|
-
<% } else { %>
|
|
13
|
-
const { baseElement } = render(<App />);
|
|
14
|
-
<% } %>
|
|
15
|
-
expect(baseElement).toBeTruthy();
|
|
16
|
-
});
|
|
17
|
-
|
|
18
|
-
it('should have a greeting as the title', () => {
|
|
19
|
-
<% if (routing) { %>
|
|
20
|
-
const { getByText } = render(<BrowserRouter><App /></BrowserRouter>);
|
|
21
|
-
<% } else { %>
|
|
22
|
-
const { getByText } = render(<App />);
|
|
23
|
-
<% } %>
|
|
24
|
-
expect(getByText(/Welcome <%= projectName %>/gi)).toBeTruthy();
|
|
25
|
-
});
|
|
9
|
+
<%- appTests %>
|
|
26
10
|
});
|
|
@@ -11,7 +11,7 @@ function addCypress(host, options) {
|
|
|
11
11
|
}
|
|
12
12
|
yield (0, devkit_1.ensurePackage)(host, '@nrwl/cypress', versions_1.nxVersion);
|
|
13
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 }));
|
|
14
|
+
return yield cypressProjectGenerator(host, Object.assign(Object.assign({}, options), { name: options.e2eProjectName, directory: options.directory, project: options.projectName, rootProject: options.rootProject, bundler: options.bundler }));
|
|
15
15
|
});
|
|
16
16
|
}
|
|
17
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,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,
|
|
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,EAChC,OAAO,EAAE,OAAO,CAAC,OAAO,IACxB,CAAC;IACL,CAAC;CAAA;AAfD,gCAeC"}
|
|
@@ -5,6 +5,8 @@ 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
7
|
const create_ts_config_1 = require("../../../utils/create-ts-config");
|
|
8
|
+
const get_in_source_vitest_tests_template_1 = require("../../../utils/get-in-source-vitest-tests-template");
|
|
9
|
+
const get_app_tests_1 = require("./get-app-tests");
|
|
8
10
|
function createApplicationFiles(host, options) {
|
|
9
11
|
let styleSolutionSpecificAppFiles;
|
|
10
12
|
if (options.styledModule && options.style !== 'styled-jsx') {
|
|
@@ -23,24 +25,14 @@ function createApplicationFiles(host, options) {
|
|
|
23
25
|
styleSolutionSpecificAppFiles = '../files/css-module';
|
|
24
26
|
}
|
|
25
27
|
const relativePathToRootTsConfig = (0, typescript_1.getRelativePathToRootTsConfig)(host, options.appProjectRoot);
|
|
26
|
-
const
|
|
28
|
+
const appTests = (0, get_app_tests_1.getAppTests)(options);
|
|
29
|
+
const templateVariables = Object.assign(Object.assign(Object.assign({}, (0, devkit_1.names)(options.name)), options), { tmpl: '', offsetFromRoot: (0, devkit_1.offsetFromRoot)(options.appProjectRoot), appTests, inSourceVitestTests: (0, get_in_source_vitest_tests_template_1.getInSourceVitestTestsTemplate)(appTests) });
|
|
27
30
|
(0, devkit_1.generateFiles)(host, (0, path_1.join)(__dirname, options.bundler === 'vite' ? '../files/common-vite' : '../files/common'), options.appProjectRoot, templateVariables);
|
|
28
31
|
if (options.unitTestRunner === 'none' ||
|
|
29
32
|
(options.unitTestRunner === 'vitest' && options.inSourceTests == true)) {
|
|
30
33
|
host.delete(`${options.appProjectRoot}/src/app/${options.fileName}.spec.tsx`);
|
|
31
34
|
}
|
|
32
35
|
(0, devkit_1.generateFiles)(host, (0, path_1.join)(__dirname, styleSolutionSpecificAppFiles), options.appProjectRoot, templateVariables);
|
|
33
|
-
if (options.unitTestRunner === 'vitest' && options.inSourceTests == true) {
|
|
34
|
-
let originalAppContents = host
|
|
35
|
-
.read(`${options.appProjectRoot}/src/app/${options.fileName}.tsx`)
|
|
36
|
-
.toString();
|
|
37
|
-
originalAppContents += `
|
|
38
|
-
if (import.meta.vitest) {
|
|
39
|
-
// add tests related to your file here
|
|
40
|
-
// For more information please visit the Vitest docs site here: https://vitest.dev/guide/in-source.html
|
|
41
|
-
}
|
|
42
|
-
`;
|
|
43
|
-
}
|
|
44
36
|
if (options.js) {
|
|
45
37
|
(0, devkit_1.toJS)(host);
|
|
46
38
|
}
|
|
@@ -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,
|
|
1
|
+
{"version":3,"file":"create-application-files.js","sourceRoot":"","sources":["../../../../../../../packages/react/src/generators/application/lib/create-application-files.ts"],"names":[],"mappings":";;;AACA,yCAAgF;AAChF,+BAA4B;AAC5B,yEAAyF;AACzF,sEAAiE;AACjE,4GAAoG;AACpG,mDAA8C;AAE9C,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,QAAQ,GAAG,IAAA,2BAAW,EAAC,OAAO,CAAC,CAAC;IACtC,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,EACtD,QAAQ,EACR,mBAAmB,EAAE,IAAA,oEAA8B,EAAC,QAAQ,CAAC,GAC9D,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,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;AAhED,wDAgEC"}
|
|
@@ -0,0 +1,22 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.getAppTests = void 0;
|
|
4
|
+
function getAppTests(options) {
|
|
5
|
+
return `
|
|
6
|
+
it('should render successfully', () => {
|
|
7
|
+
${options.routing
|
|
8
|
+
? 'const { baseElement } = render(<BrowserRouter><App /></BrowserRouter>);'
|
|
9
|
+
: 'const { baseElement } = render(<App />);'}
|
|
10
|
+
expect(baseElement).toBeTruthy();
|
|
11
|
+
});
|
|
12
|
+
|
|
13
|
+
it('should have a greeting as the title', () => {
|
|
14
|
+
${options.routing
|
|
15
|
+
? 'const { getByText } = render(<BrowserRouter><App /></BrowserRouter>);'
|
|
16
|
+
: 'const { getByText } = render(<App />);'}
|
|
17
|
+
expect(getByText(/Welcome ${options.projectName}/gi)).toBeTruthy();
|
|
18
|
+
});
|
|
19
|
+
`;
|
|
20
|
+
}
|
|
21
|
+
exports.getAppTests = getAppTests;
|
|
22
|
+
//# sourceMappingURL=get-app-tests.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"get-app-tests.js","sourceRoot":"","sources":["../../../../../../../packages/react/src/generators/application/lib/get-app-tests.ts"],"names":[],"mappings":";;;AAEA,SAAgB,WAAW,CAAC,OAAyB;IACnD,OAAO;;IAGL,OAAO,CAAC,OAAO;QACb,CAAC,CAAC,yEAAyE;QAC3E,CAAC,CAAC,0CACN;;;;;IAME,OAAO,CAAC,OAAO;QACb,CAAC,CAAC,uEAAuE;QACzE,CAAC,CAAC,wCACN;8BAC4B,OAAO,CAAC,WAAW;;CAEhD,CAAC;AACF,CAAC;AApBD,kCAoBC"}
|
|
@@ -3,7 +3,6 @@ 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;
|
|
7
6
|
if (options.skipWorkspaceJson) {
|
|
8
7
|
return;
|
|
9
8
|
}
|
|
@@ -18,11 +17,6 @@ function setDefaults(host, options) {
|
|
|
18
17
|
const appDefaults = Object.assign({ style: options.style, linter: options.linter, bundler: options.bundler }, prev.application);
|
|
19
18
|
const componentDefaults = Object.assign({ style: options.style }, prev.component);
|
|
20
19
|
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
20
|
workspace.generators = Object.assign(Object.assign({}, workspace.generators), { '@nrwl/react': Object.assign(Object.assign({}, prev), { application: appDefaults, component: componentDefaults, library: libDefaults }) });
|
|
27
21
|
(0, devkit_1.updateWorkspaceConfiguration)(host, workspace);
|
|
28
22
|
}
|
|
@@ -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;IAEF,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;AA5CD,kCA4CC"}
|
|
@@ -8,7 +8,9 @@ const ts = require("typescript");
|
|
|
8
8
|
const add_styled_dependencies_1 = require("../../rules/add-styled-dependencies");
|
|
9
9
|
const assertion_1 = require("../../utils/assertion");
|
|
10
10
|
const ast_utils_1 = require("../../utils/ast-utils");
|
|
11
|
+
const get_in_source_vitest_tests_template_1 = require("../../utils/get-in-source-vitest-tests-template");
|
|
11
12
|
const versions_1 = require("../../utils/versions");
|
|
13
|
+
const get_component_tests_1 = require("./get-component-tests");
|
|
12
14
|
function componentGenerator(host, schema) {
|
|
13
15
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
14
16
|
const options = yield normalizeOptions(host, schema);
|
|
@@ -28,10 +30,12 @@ function componentGenerator(host, schema) {
|
|
|
28
30
|
exports.componentGenerator = componentGenerator;
|
|
29
31
|
function createComponentFiles(host, options) {
|
|
30
32
|
const componentDir = (0, devkit_1.joinPathFragments)(options.projectSourceRoot, options.directory);
|
|
31
|
-
|
|
33
|
+
const componentTests = (0, get_component_tests_1.getComponentTests)(options);
|
|
34
|
+
(0, devkit_1.generateFiles)(host, (0, devkit_1.joinPathFragments)(__dirname, './files'), componentDir, Object.assign(Object.assign({}, options), { componentTests, inSourceVitestTests: (0, get_in_source_vitest_tests_template_1.getInSourceVitestTestsTemplate)(componentTests), tmpl: '' }));
|
|
32
35
|
for (const c of host.listChanges()) {
|
|
33
36
|
let deleteFile = false;
|
|
34
|
-
if (options.skipTests
|
|
37
|
+
if ((options.skipTests || options.inSourceTests) &&
|
|
38
|
+
/.*spec.tsx/.test(c.path)) {
|
|
35
39
|
deleteFile = true;
|
|
36
40
|
}
|
|
37
41
|
if ((options.styledModule || !options.hasStyles) &&
|
|
@@ -67,7 +71,7 @@ function addExportsToBarrel(host, options) {
|
|
|
67
71
|
}
|
|
68
72
|
}
|
|
69
73
|
function normalizeOptions(host, options) {
|
|
70
|
-
var _a, _b, _c, _d;
|
|
74
|
+
var _a, _b, _c, _d, _e;
|
|
71
75
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
72
76
|
assertValidOptions(options);
|
|
73
77
|
const { className, fileName } = (0, devkit_1.names)(options.name);
|
|
@@ -88,6 +92,7 @@ function normalizeOptions(host, options) {
|
|
|
88
92
|
options.classComponent = (_b = options.classComponent) !== null && _b !== void 0 ? _b : false;
|
|
89
93
|
options.routing = (_c = options.routing) !== null && _c !== void 0 ? _c : false;
|
|
90
94
|
options.globalCss = (_d = options.globalCss) !== null && _d !== void 0 ? _d : false;
|
|
95
|
+
options.inSourceTests = (_e = options.inSourceTests) !== null && _e !== void 0 ? _e : false;
|
|
91
96
|
return Object.assign(Object.assign({}, options), { directory,
|
|
92
97
|
styledModule, hasStyles: options.style !== 'none', className, fileName: componentFileName, projectSourceRoot });
|
|
93
98
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"component.js","sourceRoot":"","sources":["../../../../../../packages/react/src/generators/component/component.ts"],"names":[],"mappings":";;;;AAAA,yCAasB;AACtB,2FAAqF;AACrF,iCAAiC;AACjC,iFAAkF;AAClF,qDAAyD;AACzD,qDAAkD;AAClD,mDAG8B;
|
|
1
|
+
{"version":3,"file":"component.js","sourceRoot":"","sources":["../../../../../../packages/react/src/generators/component/component.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,8 +3,5 @@ import { render } from '@testing-library/react';
|
|
|
3
3
|
import <%= className %> from './<%= fileName %>';
|
|
4
4
|
|
|
5
5
|
describe('<%= className %>', () => {
|
|
6
|
-
|
|
7
|
-
const { baseElement } = render(< <%= className %> />);
|
|
8
|
-
expect(baseElement).toBeTruthy();
|
|
9
|
-
});
|
|
6
|
+
<%- componentTests %>
|
|
10
7
|
});
|