@nrwl/react 15.4.2 → 15.4.3-beta.1

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 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.4.2](https://github.com/nrwl/nx/compare/15.4.1...15.4.2) (2022-12-27)
6
+ ## [15.4.3-beta.1](https://github.com/nrwl/nx/compare/15.4.2...15.4.3-beta.1) (2022-12-30)
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.4.2",
3
+ "version": "15.4.3-beta.1",
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,9 +31,9 @@
31
31
  "migrations": "./migrations.json"
32
32
  },
33
33
  "dependencies": {
34
- "@nrwl/devkit": "15.4.2",
35
- "@nrwl/linter": "15.4.2",
36
- "@nrwl/workspace": "15.4.2",
34
+ "@nrwl/devkit": "15.4.3-beta.1",
35
+ "@nrwl/linter": "15.4.3-beta.1",
36
+ "@nrwl/workspace": "15.4.3-beta.1",
37
37
  "@phenomnomnominal/tsquery": "4.1.1",
38
38
  "chalk": "4.1.0",
39
39
  "enquirer": "~2.3.6",
@@ -44,5 +44,5 @@
44
44
  "access": "public"
45
45
  },
46
46
  "types": "./index.d.ts",
47
- "gitHead": "f038a34d4e0ca83ca9e6ca2be4aba12a3e435346"
47
+ "gitHead": "c783ac5e9a001b95c58ad88dbd5cecd6a610078a"
48
48
  }
@@ -1,4 +1,14 @@
1
1
  import { NxComponentTestingOptions } from '@nrwl/cypress/plugins/cypress-preset';
2
+ declare type ViteDevServer = {
3
+ framework: 'react';
4
+ bundler: 'vite';
5
+ viteConfig?: any;
6
+ };
7
+ declare type WebpackDevServer = {
8
+ framework: 'react';
9
+ bundler: 'webpack';
10
+ webpackConfig?: any;
11
+ };
2
12
  /**
3
13
  * React nx preset for Cypress Component Testing
4
14
  *
@@ -19,14 +29,10 @@ import { NxComponentTestingOptions } from '@nrwl/cypress/plugins/cypress-preset'
19
29
  */
20
30
  export declare function nxComponentTestingPreset(pathToConfig: string, options?: NxComponentTestingOptions): {
21
31
  specPattern: string;
22
- devServer: {
23
- framework?: 'react';
24
- bundler?: 'vite' | 'webpack';
25
- viteConfig?: any;
26
- webpackConfig?: any;
27
- };
32
+ devServer: ViteDevServer | WebpackDevServer;
28
33
  videosFolder: string;
29
34
  screenshotsFolder: string;
30
35
  video: boolean;
31
36
  chromeWebSecurity: boolean;
32
37
  };
38
+ export {};
@@ -1,6 +1,7 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.nxComponentTestingPreset = void 0;
4
+ const tslib_1 = require("tslib");
4
5
  const cypress_preset_1 = require("@nrwl/cypress/plugins/cypress-preset");
5
6
  const devkit_1 = require("@nrwl/devkit");
6
7
  const ct_helpers_1 = require("@nrwl/cypress/src/utils/ct-helpers");
@@ -23,7 +24,7 @@ const ct_helpers_1 = require("@nrwl/cypress/src/utils/ct-helpers");
23
24
  * @param options override options
24
25
  */
25
26
  function nxComponentTestingPreset(pathToConfig, options) {
26
- if (options.bundler === 'vite') {
27
+ if ((options === null || options === void 0 ? void 0 : options.bundler) === 'vite') {
27
28
  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
29
  }
29
30
  let webpackConfig;
@@ -54,13 +55,7 @@ function nxComponentTestingPreset(pathToConfig, options) {
54
55
  compiler: 'babel',
55
56
  });
56
57
  }
57
- return Object.assign(Object.assign({}, (0, cypress_preset_1.nxBaseCypressPreset)(pathToConfig)), { specPattern: 'src/**/*.cy.{js,jsx,ts,tsx}', devServer: {
58
- // cypress uses string union type,
59
- // need to use const to prevent typing to string
60
- framework: 'react',
61
- bundler: 'webpack',
62
- webpackConfig,
63
- } });
58
+ return Object.assign(Object.assign({}, (0, cypress_preset_1.nxBaseCypressPreset)(pathToConfig)), { specPattern: 'src/**/*.cy.{js,jsx,ts,tsx}', devServer: Object.assign(Object.assign({}, { framework: 'react', bundler: 'webpack' }), { webpackConfig }) });
64
59
  }
65
60
  exports.nxComponentTestingPreset = nxComponentTestingPreset;
66
61
  /**
@@ -91,7 +86,7 @@ function withSchemaDefaults(target, context) {
91
86
  }
92
87
  function buildTargetWebpack(graph, buildTarget, componentTestingProjectName) {
93
88
  var _a, _b;
94
- const parsed = (0, devkit_1.parseTargetString)(buildTarget);
89
+ const parsed = (0, devkit_1.parseTargetString)(buildTarget, graph);
95
90
  const buildableProjectConfig = (_a = graph.nodes[parsed.project]) === null || _a === void 0 ? void 0 : _a.data;
96
91
  const ctProjectConfig = (_b = graph.nodes[componentTestingProjectName]) === null || _b === void 0 ? void 0 : _b.data;
97
92
  if (!buildableProjectConfig || !ctProjectConfig) {
@@ -106,34 +101,30 @@ function buildTargetWebpack(graph, buildTarget, componentTestingProjectName) {
106
101
  const { resolveCustomWebpackConfig, } = require('@nrwl/webpack/src/utils/webpack/custom-webpack');
107
102
  const { getWebpackConfig, } = require('@nrwl/webpack/src/executors/webpack/lib/get-webpack-config');
108
103
  const options = normalizeOptions(withSchemaDefaults(parsed, context), devkit_1.workspaceRoot, buildableProjectConfig.sourceRoot);
109
- const isScriptOptimizeOn = typeof options.optimization === 'boolean'
110
- ? options.optimization
111
- : options.optimization && options.optimization.scripts
112
- ? options.optimization.scripts
113
- : false;
114
- let customWebpack;
115
104
  if (options.webpackConfig) {
105
+ let customWebpack;
106
+ const isScriptOptimizeOn = typeof options.optimization === 'boolean'
107
+ ? options.optimization
108
+ : options.optimization && options.optimization.scripts
109
+ ? options.optimization.scripts
110
+ : false;
116
111
  customWebpack = resolveCustomWebpackConfig(options.webpackConfig, options.tsConfig);
117
- if (typeof customWebpack.then === 'function') {
118
- // cypress configs have to be sync.
119
- // TODO(caleb): there might be a workaround with setUpNodeEvents preprocessor?
120
- devkit_1.logger.warn((0, devkit_1.stripIndents) `Nx React Component Testing Preset currently doesn't support custom async webpack configs.
121
- Skipping the custom webpack config option '${options.webpackConfig}'`);
122
- customWebpack = null;
123
- }
124
- }
125
- const defaultWebpack = getWebpackConfig(context, options, true, isScriptOptimizeOn, {
126
- root: ctProjectConfig.root,
127
- sourceRoot: ctProjectConfig.sourceRoot,
128
- configuration: parsed.configuration,
129
- });
130
- if (customWebpack) {
131
- return customWebpack(defaultWebpack, {
132
- options,
133
- context,
134
- configuration: parsed.configuration,
112
+ return () => tslib_1.__awaiter(this, void 0, void 0, function* () {
113
+ customWebpack = yield customWebpack;
114
+ const defaultWebpack = getWebpackConfig(context, options, true, isScriptOptimizeOn, {
115
+ root: ctProjectConfig.root,
116
+ sourceRoot: ctProjectConfig.sourceRoot,
117
+ configuration: parsed.configuration,
118
+ });
119
+ if (customWebpack) {
120
+ return yield customWebpack(defaultWebpack, {
121
+ options,
122
+ context,
123
+ configuration: parsed.configuration,
124
+ });
125
+ }
126
+ return defaultWebpack;
135
127
  });
136
128
  }
137
- return defaultWebpack;
138
129
  }
139
130
  //# sourceMappingURL=index.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../packages/react/plugins/component-testing/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../packages/react/plugins/component-testing/index.ts"],"names":[],"mappings":"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"}
@@ -4,5 +4,5 @@ import { nxComponentTestingPreset } from '@nrwl/react/plugins/component-testing'
4
4
  export default defineConfig({
5
5
  component: nxComponentTestingPreset(__filename, {
6
6
  bundler: '<%= bundler %>'
7
- }) as any,
8
- });
7
+ }),
8
+ });
@@ -16,7 +16,7 @@ function addFiles(tree, projectConfig, options, found) {
16
16
  if (tree.exists(cypressConfigPath)) {
17
17
  tree.delete(cypressConfigPath);
18
18
  }
19
- const actualBundler = getBundler(found, tree);
19
+ const actualBundler = yield getBundler(found, tree);
20
20
  if (options.bundler && options.bundler !== actualBundler) {
21
21
  devkit_1.logger.warn(`You have specified ${options.bundler} as the bundler but this project is configured to use ${actualBundler}.
22
22
  This may cause errors. If you are seeing errors, try removing the --bundler option.`);
@@ -48,14 +48,16 @@ function addFiles(tree, projectConfig, options, found) {
48
48
  exports.addFiles = addFiles;
49
49
  function getBundler(found, tree) {
50
50
  var _a, _b, _c;
51
- if (found.target && ((_a = found.config) === null || _a === void 0 ? void 0 : _a.executor)) {
52
- return found.config.executor === '@nrwl/vite:build' ? 'vite' : 'webpack';
53
- }
54
- const { target, project } = (0, devkit_1.parseTargetString)(found.target);
55
- const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, project);
56
- return ((_c = (_b = projectConfig === null || projectConfig === void 0 ? void 0 : projectConfig.targets) === null || _b === void 0 ? void 0 : _b[target]) === null || _c === void 0 ? void 0 : _c.executor) === '@nrwl/vite:build'
57
- ? 'vite'
58
- : 'webpack';
51
+ return tslib_1.__awaiter(this, void 0, void 0, function* () {
52
+ if (found.target && ((_a = found.config) === null || _a === void 0 ? void 0 : _a.executor)) {
53
+ return found.config.executor === '@nrwl/vite:build' ? 'vite' : 'webpack';
54
+ }
55
+ const { target, project } = (0, devkit_1.parseTargetString)(found.target, yield (0, devkit_1.createProjectGraphAsync)());
56
+ const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, project);
57
+ return ((_c = (_b = projectConfig === null || projectConfig === void 0 ? void 0 : projectConfig.targets) === null || _b === void 0 ? void 0 : _b[target]) === null || _c === void 0 ? void 0 : _c.executor) === '@nrwl/vite:build'
58
+ ? 'vite'
59
+ : 'webpack';
60
+ });
59
61
  }
60
62
  function isComponent(tree, filePath) {
61
63
  if (isSpecFile.test(filePath) || !allowedFileExt.test(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":"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"}
1
+ {"version":3,"file":"add-files.js","sourceRoot":"","sources":["../../../../../../../packages/react/src/generators/cypress-component-configuration/lib/add-files.ts"],"names":[],"mappings":"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"}
@@ -35,7 +35,7 @@ export declare const typesExpressVersion = "4.17.14";
35
35
  export declare const isbotVersion = "^3.6.5";
36
36
  export declare const corsVersion = "~2.8.5";
37
37
  export declare const typesCorsVersion = "~2.8.12";
38
- export declare const moduleFederationNodeVersion = "~0.9.6";
38
+ export declare const moduleFederationNodeVersion = "~0.9.9";
39
39
  export declare const lessVersion = "3.12.2";
40
40
  export declare const sassVersion = "^1.55.0";
41
41
  export declare const stylusVersion = "^0.55.0";
@@ -40,7 +40,7 @@ exports.typesExpressVersion = '4.17.14';
40
40
  exports.isbotVersion = '^3.6.5';
41
41
  exports.corsVersion = '~2.8.5';
42
42
  exports.typesCorsVersion = '~2.8.12';
43
- exports.moduleFederationNodeVersion = '~0.9.6';
43
+ exports.moduleFederationNodeVersion = '~0.9.9';
44
44
  // style preprocessors
45
45
  exports.lessVersion = '3.12.2';
46
46
  exports.sassVersion = '^1.55.0';