@nrwl/cypress 13.10.0 → 14.0.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/README.md +1 -1
- package/package.json +4 -4
- package/src/generators/cypress-project/cypress-project.js +9 -3
- package/src/generators/cypress-project/cypress-project.js.map +1 -1
- package/src/generators/init/init.js +1 -5
- package/src/generators/init/init.js.map +1 -1
- package/src/utils/versions.js +1 -1
package/README.md
CHANGED
|
@@ -79,6 +79,6 @@ A few links to help you get started:
|
|
|
79
79
|
- [Official Nx YouTube Channel](https://www.youtube.com/c/Nrwl_io)
|
|
80
80
|
- [Blog Posts About Nx](https://blog.nrwl.io/nx/home)
|
|
81
81
|
|
|
82
|
-
<p style="text-align: center;"><a href="https://nx.dev/#learning-materials" target="_blank"><img src="https://raw.githubusercontent.com/nrwl/nx/master/images/nx-courses-and-videos.svg"
|
|
82
|
+
<p style="text-align: center;"><a href="https://nx.dev/#learning-materials" target="_blank" rel="noreferrer"><img src="https://raw.githubusercontent.com/nrwl/nx/master/images/nx-courses-and-videos.svg"
|
|
83
83
|
width="100%" alt="Nx - Smart, Fast and Extensible Build System"></a></p>
|
|
84
84
|
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nrwl/cypress",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "14.0.0-beta.0",
|
|
4
4
|
"description": "The Nx Plugin for Cypress contains executors and generators allowing your workspace to use the powerful Cypress integration testing capabilities.",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -33,9 +33,9 @@
|
|
|
33
33
|
"migrations": "./migrations.json"
|
|
34
34
|
},
|
|
35
35
|
"dependencies": {
|
|
36
|
-
"@nrwl/devkit": "
|
|
37
|
-
"@nrwl/linter": "
|
|
38
|
-
"@nrwl/workspace": "
|
|
36
|
+
"@nrwl/devkit": "14.0.0-beta.0",
|
|
37
|
+
"@nrwl/linter": "14.0.0-beta.0",
|
|
38
|
+
"@nrwl/workspace": "14.0.0-beta.0",
|
|
39
39
|
"@cypress/webpack-preprocessor": "^5.9.1",
|
|
40
40
|
"chalk": "4.1.0",
|
|
41
41
|
"enhanced-resolve": "^5.8.3",
|
|
@@ -27,7 +27,7 @@ function createFiles(tree, options) {
|
|
|
27
27
|
}
|
|
28
28
|
}
|
|
29
29
|
function addProject(tree, options) {
|
|
30
|
-
var _a;
|
|
30
|
+
var _a, _b, _c, _d;
|
|
31
31
|
let e2eProjectConfig;
|
|
32
32
|
if (options.baseUrl) {
|
|
33
33
|
e2eProjectConfig = {
|
|
@@ -49,7 +49,13 @@ function addProject(tree, options) {
|
|
|
49
49
|
}
|
|
50
50
|
else if (options.project) {
|
|
51
51
|
const project = (0, devkit_1.readProjectConfiguration)(tree, options.project);
|
|
52
|
-
|
|
52
|
+
if (!project.targets) {
|
|
53
|
+
devkit_1.logger.warn((0, devkit_1.stripIndents) `
|
|
54
|
+
NOTE: Project, "${options.project}", does not have any targets defined and a baseUrl was not provided. Nx will use
|
|
55
|
+
"${options.project}:serve" as the devServerTarget. But you may need to define this target within the project, "${options.project}".
|
|
56
|
+
`);
|
|
57
|
+
}
|
|
58
|
+
const devServerTarget = ((_a = project.targets) === null || _a === void 0 ? void 0 : _a.serve) && ((_c = (_b = project.targets) === null || _b === void 0 ? void 0 : _b.serve) === null || _c === void 0 ? void 0 : _c.defaultConfiguration)
|
|
53
59
|
? `${options.project}:serve:${project.targets.serve.defaultConfiguration}`
|
|
54
60
|
: `${options.project}:serve`;
|
|
55
61
|
e2eProjectConfig = {
|
|
@@ -77,7 +83,7 @@ function addProject(tree, options) {
|
|
|
77
83
|
else {
|
|
78
84
|
throw new Error(`Either project or baseUrl should be specified.`);
|
|
79
85
|
}
|
|
80
|
-
const detectedCypressVersion = (
|
|
86
|
+
const detectedCypressVersion = (_d = (0, cypress_version_1.installedCypressVersion)()) !== null && _d !== void 0 ? _d : versions_1.cypressVersion;
|
|
81
87
|
if (detectedCypressVersion < 7) {
|
|
82
88
|
e2eProjectConfig.targets.e2e.options.tsConfig = (0, devkit_1.joinPathFragments)(options.projectRoot, 'tsconfig.json');
|
|
83
89
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cypress-project.js","sourceRoot":"","sources":["../../../../../../packages/cypress/src/generators/cypress-project/cypress-project.ts"],"names":[],"mappings":";;;;AAAA,
|
|
1
|
+
{"version":3,"file":"cypress-project.js","sourceRoot":"","sources":["../../../../../../packages/cypress/src/generators/cypress-project/cypress-project.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,11 +4,7 @@ exports.cypressInitSchematic = exports.cypressInitGenerator = void 0;
|
|
|
4
4
|
const devkit_1 = require("@nrwl/devkit");
|
|
5
5
|
const versions_1 = require("../../utils/versions");
|
|
6
6
|
function updateDependencies(host) {
|
|
7
|
-
(0, devkit_1.
|
|
8
|
-
json.dependencies = json.dependencies || {};
|
|
9
|
-
delete json.dependencies['@nrwl/cypress'];
|
|
10
|
-
return json;
|
|
11
|
-
});
|
|
7
|
+
(0, devkit_1.removeDependenciesFromPackageJson)(host, ['@nrwl/cypress'], []);
|
|
12
8
|
return (0, devkit_1.addDependenciesToPackageJson)(host, {}, {
|
|
13
9
|
['@nrwl/cypress']: versions_1.nxVersion,
|
|
14
10
|
cypress: versions_1.cypressVersion,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../../../packages/cypress/src/generators/init/init.ts"],"names":[],"mappings":";;;AAAA,yCAKsB;
|
|
1
|
+
{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../../../packages/cypress/src/generators/init/init.ts"],"names":[],"mappings":";;;AAAA,yCAKsB;AACtB,mDAAiE;AAGjE,SAAS,kBAAkB,CAAC,IAAU;IACpC,IAAA,0CAAiC,EAAC,IAAI,EAAE,CAAC,eAAe,CAAC,EAAE,EAAE,CAAC,CAAC;IAE/D,OAAO,IAAA,qCAA4B,EACjC,IAAI,EACJ,EAAE,EACF;QACE,CAAC,eAAe,CAAC,EAAE,oBAAS;QAC5B,OAAO,EAAE,yBAAc;KACxB,CACF,CAAC;AACJ,CAAC;AAED,SAAgB,oBAAoB,CAAC,IAAU,EAAE,OAAe;IAC9D,OAAO,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC;AACxE,CAAC;AAFD,oDAEC;AAED,kBAAe,oBAAoB,CAAC;AACvB,QAAA,oBAAoB,GAAG,IAAA,2BAAkB,EAAC,oBAAoB,CAAC,CAAC"}
|
package/src/utils/versions.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.eslintPluginCypressVersion = exports.cypressVersion = exports.nxVersion = void 0;
|
|
4
|
-
exports.nxVersion = '
|
|
4
|
+
exports.nxVersion = '14.0.0-beta.0';
|
|
5
5
|
exports.cypressVersion = '^9.1.0';
|
|
6
6
|
exports.eslintPluginCypressVersion = '^2.10.3';
|
|
7
7
|
//# sourceMappingURL=versions.js.map
|