@nrwl/react 14.7.0-beta.0 → 14.7.0-beta.3

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
- # [14.7.0-beta.0](https://github.com/nrwl/nx/compare/14.6.3...14.7.0-beta.0) (2022-09-06)
6
+ # [14.7.0-beta.3](https://github.com/nrwl/nx/compare/14.6.3...14.7.0-beta.3) (2022-09-09)
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": "14.7.0-beta.0",
3
+ "version": "14.7.0-beta.3",
4
4
  "description": "The React plugin 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.",
5
5
  "repository": {
6
6
  "type": "git",
@@ -32,14 +32,14 @@
32
32
  "dependencies": {
33
33
  "@babel/core": "^7.15.0",
34
34
  "@babel/preset-react": "^7.14.5",
35
- "@nrwl/cypress": "14.7.0-beta.0",
36
- "@nrwl/devkit": "14.7.0-beta.0",
37
- "@nrwl/jest": "14.7.0-beta.0",
38
- "@nrwl/js": "14.7.0-beta.0",
39
- "@nrwl/linter": "14.7.0-beta.0",
40
- "@nrwl/storybook": "14.7.0-beta.0",
41
- "@nrwl/web": "14.7.0-beta.0",
42
- "@nrwl/workspace": "14.7.0-beta.0",
35
+ "@nrwl/cypress": "14.7.0-beta.3",
36
+ "@nrwl/devkit": "14.7.0-beta.3",
37
+ "@nrwl/jest": "14.7.0-beta.3",
38
+ "@nrwl/js": "14.7.0-beta.3",
39
+ "@nrwl/linter": "14.7.0-beta.3",
40
+ "@nrwl/storybook": "14.7.0-beta.3",
41
+ "@nrwl/web": "14.7.0-beta.3",
42
+ "@nrwl/workspace": "14.7.0-beta.3",
43
43
  "@pmmmwh/react-refresh-webpack-plugin": "^0.5.7",
44
44
  "@svgr/webpack": "^6.1.2",
45
45
  "chalk": "4.1.0",
@@ -54,5 +54,5 @@
54
54
  "webpack": "^5.58.1",
55
55
  "webpack-merge": "^5.8.0"
56
56
  },
57
- "gitHead": "8c78beaa74c0c0c4d1c7a3512b6e9e18843bbd5a"
57
+ "gitHead": "6d0c6a83d42145984bafc9dd904c6885eaa53865"
58
58
  }
@@ -1,11 +1,4 @@
1
- export interface ReactComponentTestingOptions {
2
- /**
3
- * the component testing target name.
4
- * this is only when customized away from the default value of `component-test`
5
- * @example 'component-test'
6
- */
7
- ctTargetName: string;
8
- }
1
+ import { NxComponentTestingOptions } from '@nrwl/cypress/plugins/cypress-preset';
9
2
  /**
10
3
  * React nx preset for Cypress Component Testing
11
4
  *
@@ -24,7 +17,7 @@ export interface ReactComponentTestingOptions {
24
17
  * @param pathToConfig will be used for loading project options and to construct the output paths for videos and screenshots
25
18
  * @param options override options
26
19
  */
27
- export declare function nxComponentTestingPreset(pathToConfig: string, options?: ReactComponentTestingOptions): {
20
+ export declare function nxComponentTestingPreset(pathToConfig: string, options?: NxComponentTestingOptions): {
28
21
  devServer: {
29
22
  readonly framework: "react";
30
23
  readonly bundler: "webpack";
@@ -5,10 +5,6 @@ const cypress_preset_1 = require("@nrwl/cypress/plugins/cypress-preset");
5
5
  const devkit_1 = require("@nrwl/devkit");
6
6
  const normalize_1 = require("@nrwl/web/src/utils/normalize");
7
7
  const web_config_1 = require("@nrwl/web/src/utils/web.config");
8
- const runtime_lint_utils_1 = require("@nrwl/workspace/src/utils/runtime-lint-utils");
9
- const fs_1 = require("fs");
10
- const project_graph_1 = require("nx/src/project-graph/project-graph");
11
- const path_1 = require("path");
12
8
  const webpack_fallback_1 = require("./webpack-fallback");
13
9
  /**
14
10
  * React nx preset for Cypress Component Testing
@@ -32,10 +28,10 @@ function nxComponentTestingPreset(pathToConfig, options) {
32
28
  let webpackConfig;
33
29
  try {
34
30
  const graph = (0, devkit_1.readCachedProjectGraph)();
35
- const { targets: ctTargets, name: ctProjectName } = getConfigByPath(graph, pathToConfig);
31
+ const { targets: ctTargets, name: ctProjectName } = (0, cypress_preset_1.getProjectConfigByPath)(graph, pathToConfig);
36
32
  const ctTargetName = (options === null || options === void 0 ? void 0 : options.ctTargetName) || 'component-test';
37
33
  const ctConfigurationName = process.env.NX_CYPRESS_TARGET_CONFIGURATION;
38
- const ctExecutorContext = createExecutorContext(graph, ctTargets, ctProjectName, ctTargetName, ctConfigurationName);
34
+ const ctExecutorContext = (0, cypress_preset_1.createExecutorContext)(graph, ctTargets, ctProjectName, ctTargetName, ctConfigurationName);
39
35
  const ctExecutorOptions = (0, devkit_1.readTargetOptions)({
40
36
  project: ctProjectName,
41
37
  target: ctTargetName,
@@ -103,7 +99,7 @@ function buildTargetWebpack(graph, buildTarget, componentTestingProjectName) {
103
99
  Has component config? ${!!ctProjectConfig}
104
100
  `);
105
101
  }
106
- const options = (0, normalize_1.normalizeWebBuildOptions)(withSchemaDefaults(parsed, createExecutorContext(graph, buildableProjectConfig.targets, parsed.project, parsed.target, parsed.target)), devkit_1.workspaceRoot, buildableProjectConfig.sourceRoot);
102
+ const options = (0, normalize_1.normalizeWebBuildOptions)(withSchemaDefaults(parsed, (0, cypress_preset_1.createExecutorContext)(graph, buildableProjectConfig.targets, parsed.project, parsed.target, parsed.target)), devkit_1.workspaceRoot, buildableProjectConfig.sourceRoot);
107
103
  const isScriptOptimizeOn = typeof options.optimization === 'boolean'
108
104
  ? options.optimization
109
105
  : options.optimization && options.optimization.scripts
@@ -111,37 +107,4 @@ function buildTargetWebpack(graph, buildTarget, componentTestingProjectName) {
111
107
  : false;
112
108
  return (0, web_config_1.getWebConfig)(devkit_1.workspaceRoot, ctProjectConfig.root, ctProjectConfig.sourceRoot, options, true, isScriptOptimizeOn, parsed.configuration);
113
109
  }
114
- function getConfigByPath(graph, configPath) {
115
- var _a, _b, _c;
116
- var _d;
117
- const configFileFromWorkspaceRoot = (0, path_1.relative)(devkit_1.workspaceRoot, configPath);
118
- const normalizedPathFromWorkspaceRoot = (0, fs_1.lstatSync)(configPath).isFile()
119
- ? configFileFromWorkspaceRoot.replace((0, path_1.extname)(configPath), '')
120
- : configFileFromWorkspaceRoot;
121
- const mappedGraph = (0, runtime_lint_utils_1.mapProjectGraphFiles)(graph);
122
- const componentTestingProjectName = mappedGraph.allFiles[normalizedPathFromWorkspaceRoot];
123
- if (!componentTestingProjectName ||
124
- !((_a = graph.nodes[componentTestingProjectName]) === null || _a === void 0 ? void 0 : _a.data)) {
125
- throw new Error((0, devkit_1.stripIndents) `Unable to find the project configuration that includes ${normalizedPathFromWorkspaceRoot}.
126
- Found project name? ${componentTestingProjectName}.
127
- Graph has data? ${!!((_b = graph.nodes[componentTestingProjectName]) === null || _b === void 0 ? void 0 : _b.data)}`);
128
- }
129
- // make sure name is set since it can be undefined
130
- (_c = (_d = graph.nodes[componentTestingProjectName].data).name) !== null && _c !== void 0 ? _c : (_d.name = componentTestingProjectName);
131
- return graph.nodes[componentTestingProjectName].data;
132
- }
133
- function createExecutorContext(graph, targets, projectName, targetName, configurationName) {
134
- const projectConfigs = (0, project_graph_1.readProjectsConfigurationFromProjectGraph)(graph);
135
- return {
136
- cwd: process.cwd(),
137
- projectGraph: graph,
138
- target: targets[targetName],
139
- targetName,
140
- configurationName,
141
- root: devkit_1.workspaceRoot,
142
- isVerbose: false,
143
- projectName,
144
- workspace: Object.assign(Object.assign({}, (0, devkit_1.readNxJson)()), projectConfigs),
145
- };
146
- }
147
110
  //# 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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"}
@@ -20,7 +20,6 @@ function cypressComponentConfigGenerator(tree, options) {
20
20
  });
21
21
  yield (0, update_configs_1.updateProjectConfig)(tree, options);
22
22
  (0, add_files_1.addFiles)(tree, projectConfig, options);
23
- (0, update_configs_1.updateTsConfig)(tree, projectConfig);
24
23
  if (options.skipFormat) {
25
24
  yield (0, devkit_1.formatFiles)(tree);
26
25
  }
@@ -1 +1 @@
1
- {"version":3,"file":"cypress-component-configuration.js","sourceRoot":"","sources":["../../../../../../packages/react/src/generators/cypress-component-configuration/cypress-component-configuration.ts"],"names":[],"mappings":";;;;AAAA,2CAAwD;AACxD,yCAA2E;AAC3E,+CAA2C;AAC3C,yDAA2E;AAG3E;;;;GAIG;AACH,SAAsB,+BAA+B,CACnD,IAAU,EACV,OAA4C;;QAE5C,MAAM,aAAa,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;QACtE,MAAM,WAAW,GAAG,MAAM,IAAA,iCAAuB,EAAC,IAAI,EAAE;YACtD,OAAO,EAAE,OAAO,CAAC,OAAO;YACxB,UAAU,EAAE,IAAI;SACjB,CAAC,CAAC;QAEH,MAAM,IAAA,oCAAmB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACzC,IAAA,oBAAQ,EAAC,IAAI,EAAE,aAAa,EAAE,OAAO,CAAC,CAAC;QACvC,IAAA,+BAAc,EAAC,IAAI,EAAE,aAAa,CAAC,CAAC;QACpC,IAAI,OAAO,CAAC,UAAU,EAAE;YACtB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;QAED,OAAO,GAAG,EAAE;YACV,WAAW,EAAE,CAAC;QAChB,CAAC,CAAC;IACJ,CAAC;CAAA;AApBD,0EAoBC;AAED,kBAAe,+BAA+B,CAAC"}
1
+ {"version":3,"file":"cypress-component-configuration.js","sourceRoot":"","sources":["../../../../../../packages/react/src/generators/cypress-component-configuration/cypress-component-configuration.ts"],"names":[],"mappings":";;;;AAAA,2CAAwD;AACxD,yCAA2E;AAC3E,+CAA2C;AAC3C,yDAA2D;AAG3D;;;;GAIG;AACH,SAAsB,+BAA+B,CACnD,IAAU,EACV,OAA4C;;QAE5C,MAAM,aAAa,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;QACtE,MAAM,WAAW,GAAG,MAAM,IAAA,iCAAuB,EAAC,IAAI,EAAE;YACtD,OAAO,EAAE,OAAO,CAAC,OAAO;YACxB,UAAU,EAAE,IAAI;SACjB,CAAC,CAAC;QAEH,MAAM,IAAA,oCAAmB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACzC,IAAA,oBAAQ,EAAC,IAAI,EAAE,aAAa,EAAE,OAAO,CAAC,CAAC;QACvC,IAAI,OAAO,CAAC,UAAU,EAAE;YACtB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;QAED,OAAO,GAAG,EAAE;YACV,WAAW,EAAE,CAAC;QAChB,CAAC,CAAC;IACJ,CAAC;CAAA;AAnBD,0EAmBC;AAED,kBAAe,+BAA+B,CAAC"}
@@ -1,4 +1,3 @@
1
- import { ProjectConfiguration, Tree } from '@nrwl/devkit';
1
+ import { Tree } from '@nrwl/devkit';
2
2
  import { CypressComponentConfigurationSchema } from '../schema';
3
- export declare function updateTsConfig(tree: Tree, projectConfig: ProjectConfiguration): void;
4
3
  export declare function updateProjectConfig(tree: Tree, options: CypressComponentConfigurationSchema): Promise<void>;
@@ -1,54 +1,9 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.updateProjectConfig = exports.updateTsConfig = void 0;
3
+ exports.updateProjectConfig = void 0;
4
4
  const tslib_1 = require("tslib");
5
5
  const find_target_options_1 = require("@nrwl/cypress/src/utils/find-target-options");
6
6
  const devkit_1 = require("@nrwl/devkit");
7
- function updateTsConfig(tree, projectConfig) {
8
- const tsConfigPath = (0, devkit_1.joinPathFragments)(projectConfig.root, projectConfig.projectType === 'library'
9
- ? 'tsconfig.lib.json'
10
- : 'tsconfig.app.json');
11
- if (tree.exists(tsConfigPath)) {
12
- (0, devkit_1.updateJson)(tree, tsConfigPath, (json) => {
13
- const excluded = new Set([
14
- ...(json.exclude || []),
15
- 'cypress/**/*',
16
- 'cypress.config.ts',
17
- '**/*.cy.ts',
18
- '**/*.cy.js',
19
- '**/*.cy.tsx',
20
- '**/*.cy.jsx',
21
- ]);
22
- json.exclude = Array.from(excluded);
23
- return json;
24
- });
25
- }
26
- const projectBaseTsConfig = (0, devkit_1.joinPathFragments)(projectConfig.root, 'tsconfig.json');
27
- if (tree.exists(projectBaseTsConfig)) {
28
- (0, devkit_1.updateJson)(tree, projectBaseTsConfig, (json) => {
29
- if (json.references) {
30
- const hasCyTsConfig = json.references.some((r) => r.path === './tsconfig.cy.json');
31
- if (!hasCyTsConfig) {
32
- json.references.push({ path: './tsconfig.cy.json' });
33
- }
34
- }
35
- else {
36
- const excluded = new Set([
37
- ...(json.exclude || []),
38
- 'cypress/**/*',
39
- 'cypress.config.ts',
40
- '**/*.cy.ts',
41
- '**/*.cy.js',
42
- '**/*.cy.tsx',
43
- '**/*.cy.jsx',
44
- ]);
45
- json.exclude = Array.from(excluded);
46
- }
47
- return json;
48
- });
49
- }
50
- }
51
- exports.updateTsConfig = updateTsConfig;
52
7
  function updateProjectConfig(tree, options) {
53
8
  return tslib_1.__awaiter(this, void 0, void 0, function* () {
54
9
  const found = yield (0, find_target_options_1.findBuildConfig)(tree, {
@@ -1 +1 @@
1
- {"version":3,"file":"update-configs.js","sourceRoot":"","sources":["../../../../../../../packages/react/src/generators/cypress-component-configuration/lib/update-configs.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"update-configs.js","sourceRoot":"","sources":["../../../../../../../packages/react/src/generators/cypress-component-configuration/lib/update-configs.ts"],"names":[],"mappings":";;;;AAAA,qFAA8E;AAC9E,yCAOsB;AAGtB,SAAsB,mBAAmB,CACvC,IAAU,EACV,OAA4C;;QAE5C,MAAM,KAAK,GAAG,MAAM,IAAA,qCAAe,EAAC,IAAI,EAAE;YACxC,OAAO,EAAE,OAAO,CAAC,OAAO;YACxB,WAAW,EAAE,OAAO,CAAC,WAAW;YAChC,kBAAkB,EAAE,IAAI,GAAG,CAAS,CAAC,mBAAmB,CAAC,CAAC;SAC3D,CAAC,CAAC;QAEH,gBAAgB,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QAE/B,MAAM,aAAa,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;QACtE,aAAa,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC,OAAO,mCAC1C,aAAa,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC,OAAO,KAClD,eAAe,EAAE,KAAK,CAAC,MAAM,EAC7B,SAAS,EAAE,IAAI,GAChB,CAAC;QACF,IAAA,mCAA0B,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC;IACnE,CAAC;CAAA;AAnBD,kDAmBC;AAED,SAAS,gBAAgB,CAAC,MAAe;IACvC,IAAI,CAAC,MAAM,EAAE;QACX,MAAM,IAAI,KAAK,CACb,0IAA0I,CAC3I,CAAC;KACH;AACH,CAAC"}