@nrwl/cypress 15.0.2 → 15.0.4
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 +5 -5
- package/src/generators/cypress-component-project/files/cypress/tsconfig.cy.json +1 -1
- package/src/generators/migrate-to-cypress-ten/conversion.util.js +17 -12
- package/src/generators/migrate-to-cypress-ten/conversion.util.js.map +1 -1
- package/src/generators/migrate-to-cypress-ten/migrate-to-cypress-ten.js +30 -6
- package/src/generators/migrate-to-cypress-ten/migrate-to-cypress-ten.js.map +1 -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.0.
|
|
6
|
+
## [15.0.4](https://github.com/nrwl/nx/compare/15.0.3...15.0.4) (2022-10-27)
|
|
7
7
|
|
|
8
8
|
**Note:** Version bump only for package @nrwl/cypress
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nrwl/cypress",
|
|
3
|
-
"version": "15.0.
|
|
3
|
+
"version": "15.0.4",
|
|
4
4
|
"private": false,
|
|
5
5
|
"description": "The Nx Plugin for Cypress contains executors and generators allowing your workspace to use the powerful Cypress integration testing capabilities.",
|
|
6
6
|
"repository": {
|
|
@@ -37,9 +37,9 @@
|
|
|
37
37
|
"@babel/core": "^7.0.1",
|
|
38
38
|
"@babel/preset-env": "^7.0.0",
|
|
39
39
|
"@cypress/webpack-preprocessor": "^5.12.0",
|
|
40
|
-
"@nrwl/devkit": "15.0.
|
|
41
|
-
"@nrwl/linter": "15.0.
|
|
42
|
-
"@nrwl/workspace": "15.0.
|
|
40
|
+
"@nrwl/devkit": "15.0.4",
|
|
41
|
+
"@nrwl/linter": "15.0.4",
|
|
42
|
+
"@nrwl/workspace": "15.0.4",
|
|
43
43
|
"@phenomnomnominal/tsquery": "4.1.1",
|
|
44
44
|
"babel-loader": "^8.0.2",
|
|
45
45
|
"chalk": "4.1.0",
|
|
@@ -64,5 +64,5 @@
|
|
|
64
64
|
"access": "public"
|
|
65
65
|
},
|
|
66
66
|
"types": "./index.d.ts",
|
|
67
|
-
"gitHead": "
|
|
67
|
+
"gitHead": "3b9cb7f190284ee348aa7d6528e0c4b3c8c217f3"
|
|
68
68
|
}
|
|
@@ -15,15 +15,19 @@ const validFilesEndingsToUpdate = [
|
|
|
15
15
|
'.cjs',
|
|
16
16
|
];
|
|
17
17
|
function findCypressConfigs(tree, projectConfig, target, config) {
|
|
18
|
-
var _a, _b, _c, _d, _e
|
|
18
|
+
var _a, _b, _c, _d, _e;
|
|
19
19
|
const cypressConfigPathJson = ((_c = (_b = (_a = projectConfig.targets[target]) === null || _a === void 0 ? void 0 : _a.configurations) === null || _b === void 0 ? void 0 : _b[config]) === null || _c === void 0 ? void 0 : _c.cypressConfig) ||
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
20
|
+
((_e = (_d = projectConfig.targets[target]) === null || _d === void 0 ? void 0 : _d.options) === null || _e === void 0 ? void 0 : _e.cypressConfig);
|
|
21
|
+
// make sure it's a json file, since it could have been updated to ts file from previous configuration migration
|
|
22
|
+
if (!cypressConfigPathJson || (0, path_1.extname)(cypressConfigPathJson) !== '.json') {
|
|
23
|
+
return {
|
|
24
|
+
cypressConfigPathJson: null,
|
|
25
|
+
cypressConfigPathTs: null,
|
|
26
|
+
};
|
|
27
|
+
}
|
|
28
|
+
const cypressConfigPathTs = (0, devkit_1.joinPathFragments)((0, path_1.dirname)(cypressConfigPathJson),
|
|
25
29
|
// create matching ts config for custom cypress config if present
|
|
26
|
-
cypressConfigPathJson.endsWith('cypress.json')
|
|
30
|
+
(cypressConfigPathJson === null || cypressConfigPathJson === void 0 ? void 0 : cypressConfigPathJson.endsWith('cypress.json'))
|
|
27
31
|
? 'cypress.config.ts' //default
|
|
28
32
|
: `${(0, path_1.basename)(cypressConfigPathJson, (0, path_1.extname)(cypressConfigPathJson))}.config.ts`);
|
|
29
33
|
return {
|
|
@@ -128,16 +132,17 @@ function updateProjectPaths(tree, projectConfig, { cypressConfigTs, cypressConfi
|
|
|
128
132
|
// tree.rename doesn't work on directories must update each file within
|
|
129
133
|
// the directory to the new directory
|
|
130
134
|
(0, devkit_1.visitNotIgnoredFiles)(tree, projectConfig.sourceRoot, (path) => {
|
|
131
|
-
|
|
135
|
+
const normalizedPath = (0, devkit_1.normalizePath)(path);
|
|
136
|
+
if (!normalizedPath.includes(oldIntegrationFolder)) {
|
|
132
137
|
return;
|
|
133
138
|
}
|
|
134
|
-
const fileName = (0, path_1.basename)(
|
|
135
|
-
let newPath =
|
|
139
|
+
const fileName = (0, path_1.basename)(normalizedPath);
|
|
140
|
+
let newPath = normalizedPath.replace(oldIntegrationFolder, newIntegrationFolder);
|
|
136
141
|
if (fileName.includes('.spec.')) {
|
|
137
142
|
newPath = newPath.replace('.spec.', '.cy.');
|
|
138
143
|
}
|
|
139
|
-
if (newPath !==
|
|
140
|
-
tree.rename(
|
|
144
|
+
if (newPath !== normalizedPath && tree.exists(normalizedPath)) {
|
|
145
|
+
tree.rename(normalizedPath, newPath);
|
|
141
146
|
}
|
|
142
147
|
// if they weren't using the supportFile then there is no need to update the imports.
|
|
143
148
|
if (shouldUpdateSupportFileImports &&
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"conversion.util.js","sourceRoot":"","sources":["../../../../../../packages/cypress/src/generators/migrate-to-cypress-ten/conversion.util.ts"],"names":[],"mappings":";;;;AAAA,
|
|
1
|
+
{"version":3,"file":"conversion.util.js","sourceRoot":"","sources":["../../../../../../packages/cypress/src/generators/migrate-to-cypress-ten/conversion.util.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,27 +10,43 @@ const conversion_util_1 = require("./conversion.util");
|
|
|
10
10
|
function migrateCypressProject(tree) {
|
|
11
11
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
12
12
|
(0, cypress_version_1.assertMinimumCypressVersion)(8);
|
|
13
|
+
// keep history of cypress configs as some workspaces share configs
|
|
14
|
+
// if we don't have the already migrated configs
|
|
15
|
+
// it prevents us from being able to rename files for those projects
|
|
16
|
+
const previousCypressConfigs = new Map();
|
|
13
17
|
(0, executor_options_utils_1.forEachExecutorOptions)(tree, '@nrwl/cypress:cypress', (currentValue, projectName, target, configuration) => {
|
|
14
|
-
var _a, _b, _c, _d, _e, _f;
|
|
18
|
+
var _a, _b, _c, _d, _e, _f, _g;
|
|
15
19
|
try {
|
|
16
20
|
const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, projectName);
|
|
17
21
|
const { cypressConfigPathJson, cypressConfigPathTs } = (0, conversion_util_1.findCypressConfigs)(tree, projectConfig, target, configuration);
|
|
22
|
+
if (!cypressConfigPathJson && !cypressConfigPathTs) {
|
|
23
|
+
return;
|
|
24
|
+
}
|
|
18
25
|
// a matching cypress ts file hasn't been made yet. need to migrate.
|
|
19
26
|
if (tree.exists(cypressConfigPathJson) &&
|
|
20
27
|
!tree.exists(cypressConfigPathTs)) {
|
|
21
28
|
let cypressConfigs = (0, conversion_util_1.createNewCypressConfig)(tree, projectConfig, cypressConfigPathJson);
|
|
22
|
-
(0, conversion_util_1.updateProjectPaths)(tree, projectConfig, cypressConfigs);
|
|
23
29
|
cypressConfigs = (0, conversion_util_1.updatePluginFile)(tree, projectConfig, cypressConfigs);
|
|
24
30
|
(0, conversion_util_1.writeNewConfig)(tree, cypressConfigPathTs, cypressConfigs);
|
|
25
|
-
|
|
26
|
-
((_f = (_e = (_d = projectConfig.targets) === null || _d === void 0 ? void 0 : _d[target]) === null || _e === void 0 ? void 0 : _e.options) === null || _f === void 0 ? void 0 : _f.tsConfig) ||
|
|
27
|
-
(0, devkit_1.joinPathFragments)(projectConfig.root, 'tsconfig.json'), cypressConfigPathTs);
|
|
31
|
+
previousCypressConfigs.set(cypressConfigPathJson, cypressConfigs);
|
|
28
32
|
tree.delete(cypressConfigPathJson);
|
|
29
33
|
}
|
|
30
34
|
// ts file has been made and matching json file has been removed only need to update the project config
|
|
31
35
|
if (!tree.exists(cypressConfigPathJson) &&
|
|
32
36
|
tree.exists(cypressConfigPathTs)) {
|
|
33
|
-
|
|
37
|
+
const cypressConfigs = previousCypressConfigs.get(cypressConfigPathJson);
|
|
38
|
+
(0, conversion_util_1.updateProjectPaths)(tree, projectConfig, cypressConfigs);
|
|
39
|
+
(0, conversion_util_1.addConfigToTsConfig)(tree, (configuration
|
|
40
|
+
? (_d = (_c = (_b = (_a = projectConfig.targets) === null || _a === void 0 ? void 0 : _a[target]) === null || _b === void 0 ? void 0 : _b.configurations) === null || _c === void 0 ? void 0 : _c[configuration]) === null || _d === void 0 ? void 0 : _d.tsConfig
|
|
41
|
+
: (_g = (_f = (_e = projectConfig.targets) === null || _e === void 0 ? void 0 : _e[target]) === null || _f === void 0 ? void 0 : _f.options) === null || _g === void 0 ? void 0 : _g.tsConfig) ||
|
|
42
|
+
(0, devkit_1.joinPathFragments)(projectConfig.root, 'tsconfig.json'), cypressConfigPathTs);
|
|
43
|
+
if (configuration) {
|
|
44
|
+
projectConfig.targets[target].configurations[configuration] = Object.assign(Object.assign({}, projectConfig.targets[target].configurations[configuration]), { cypressConfig: cypressConfigPathTs });
|
|
45
|
+
}
|
|
46
|
+
else {
|
|
47
|
+
projectConfig.targets[target].options = Object.assign(Object.assign({}, projectConfig.targets[target].options), { cypressConfig: cypressConfigPathTs });
|
|
48
|
+
}
|
|
49
|
+
projectConfig.targets[target].options.testingType = 'e2e';
|
|
34
50
|
(0, devkit_1.updateProjectConfiguration)(tree, projectName, projectConfig);
|
|
35
51
|
}
|
|
36
52
|
}
|
|
@@ -48,6 +64,14 @@ https://nx.dev/cypress/v10-migration-guide
|
|
|
48
64
|
return json;
|
|
49
65
|
});
|
|
50
66
|
yield (0, devkit_1.formatFiles)(tree);
|
|
67
|
+
if (tree.exists('cypress.json')) {
|
|
68
|
+
devkit_1.logger.warn((0, devkit_1.stripIndents) `A root cypress.json file was found.
|
|
69
|
+
You should remove this file as it will cause an error when running Cypress.
|
|
70
|
+
If you want to share options between Cypress projects.
|
|
71
|
+
You can create a root ts file and import it into each project's cypress config file.
|
|
72
|
+
More Info: https://github.com/nrwl/nx/issues/11512#issuecomment-1213420638
|
|
73
|
+
`);
|
|
74
|
+
}
|
|
51
75
|
return () => {
|
|
52
76
|
(0, devkit_1.installPackagesTask)(tree);
|
|
53
77
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"migrate-to-cypress-ten.js","sourceRoot":"","sources":["../../../../../../packages/cypress/src/generators/migrate-to-cypress-ten/migrate-to-cypress-ten.ts"],"names":[],"mappings":";;;;AAAA,6EAAsF;AACtF,yCAWsB;AACtB,iGAA8F;
|
|
1
|
+
{"version":3,"file":"migrate-to-cypress-ten.js","sourceRoot":"","sources":["../../../../../../packages/cypress/src/generators/migrate-to-cypress-ten/migrate-to-cypress-ten.ts"],"names":[],"mappings":"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"}
|