@nrwl/cypress 15.8.0-beta.1 → 15.8.0-beta.2
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/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nrwl/cypress",
|
|
3
|
-
"version": "15.8.0-beta.
|
|
3
|
+
"version": "15.8.0-beta.2",
|
|
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": {
|
|
@@ -34,10 +34,10 @@
|
|
|
34
34
|
"migrations": "./migrations.json"
|
|
35
35
|
},
|
|
36
36
|
"dependencies": {
|
|
37
|
-
"@nrwl/devkit": "15.8.0-beta.
|
|
38
|
-
"@nrwl/js": "15.8.0-beta.
|
|
39
|
-
"@nrwl/linter": "15.8.0-beta.
|
|
40
|
-
"@nrwl/workspace": "15.8.0-beta.
|
|
37
|
+
"@nrwl/devkit": "15.8.0-beta.2",
|
|
38
|
+
"@nrwl/js": "15.8.0-beta.2",
|
|
39
|
+
"@nrwl/linter": "15.8.0-beta.2",
|
|
40
|
+
"@nrwl/workspace": "15.8.0-beta.2",
|
|
41
41
|
"@phenomnomnominal/tsquery": "4.1.1",
|
|
42
42
|
"dotenv": "~10.0.0",
|
|
43
43
|
"semver": "7.3.4"
|
|
@@ -54,5 +54,5 @@
|
|
|
54
54
|
"access": "public"
|
|
55
55
|
},
|
|
56
56
|
"types": "./index.d.ts",
|
|
57
|
-
"gitHead": "
|
|
57
|
+
"gitHead": "5a67ea3e0f445870130c2e9110f07062a47c22bf"
|
|
58
58
|
}
|
|
@@ -9,32 +9,39 @@ const ct_helpers_1 = require("../../utils/ct-helpers");
|
|
|
9
9
|
const cypress_version_1 = require("../../utils/cypress-version");
|
|
10
10
|
const Cypress = require('cypress'); // @NOTE: Importing via ES6 messes the whole test dependencies.
|
|
11
11
|
function cypressExecutor(options, context) {
|
|
12
|
-
var e_1,
|
|
12
|
+
var _a, e_1, _b, _c;
|
|
13
13
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
14
14
|
options = normalizeOptions(options, context);
|
|
15
15
|
// this is used by cypress component testing presets to build the executor contexts with the correct configuration options.
|
|
16
16
|
process.env.NX_CYPRESS_TARGET_CONFIGURATION = context.configurationName;
|
|
17
17
|
let success;
|
|
18
18
|
try {
|
|
19
|
-
for (var
|
|
20
|
-
|
|
19
|
+
for (var _d = true, _e = tslib_1.__asyncValues(startDevServer(options, context)), _f; _f = yield _e.next(), _a = _f.done, !_a;) {
|
|
20
|
+
_c = _f.value;
|
|
21
|
+
_d = false;
|
|
21
22
|
try {
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
23
|
+
const baseUrl = _c;
|
|
24
|
+
try {
|
|
25
|
+
success = yield runCypress(baseUrl, options);
|
|
26
|
+
if (!options.watch)
|
|
27
|
+
break;
|
|
28
|
+
}
|
|
29
|
+
catch (e) {
|
|
30
|
+
devkit_1.logger.error(e.message);
|
|
31
|
+
success = false;
|
|
32
|
+
if (!options.watch)
|
|
33
|
+
break;
|
|
34
|
+
}
|
|
25
35
|
}
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
success = false;
|
|
29
|
-
if (!options.watch)
|
|
30
|
-
break;
|
|
36
|
+
finally {
|
|
37
|
+
_d = true;
|
|
31
38
|
}
|
|
32
39
|
}
|
|
33
40
|
}
|
|
34
41
|
catch (e_1_1) { e_1 = { error: e_1_1 }; }
|
|
35
42
|
finally {
|
|
36
43
|
try {
|
|
37
|
-
if (
|
|
44
|
+
if (!_d && !_a && (_b = _e.return)) yield _b.call(_e);
|
|
38
45
|
}
|
|
39
46
|
finally { if (e_1) throw e_1.error; }
|
|
40
47
|
}
|
|
@@ -109,7 +116,7 @@ A generator to migrate from v8 to v10 is provided. See https://nx.dev/cypress/v1
|
|
|
109
116
|
function startDevServer(opts, context) {
|
|
110
117
|
var _a, _b, _c;
|
|
111
118
|
return tslib_1.__asyncGenerator(this, arguments, function* startDevServer_1() {
|
|
112
|
-
var e_2,
|
|
119
|
+
var _d, e_2, _e, _f;
|
|
113
120
|
// no dev server, return the provisioned base url
|
|
114
121
|
if (!opts.devServerTarget || opts.skipServe) {
|
|
115
122
|
yield yield tslib_1.__await(opts.baseUrl);
|
|
@@ -119,27 +126,34 @@ function startDevServer(opts, context) {
|
|
|
119
126
|
const devServerTargetOpts = (0, devkit_1.readTargetOptions)({ project, target, configuration }, context);
|
|
120
127
|
const targetSupportsWatchOpt = Object.keys(devServerTargetOpts).includes('watch');
|
|
121
128
|
try {
|
|
122
|
-
for (var
|
|
129
|
+
for (var _g = true, _h = tslib_1.__asyncValues(yield tslib_1.__await((0, devkit_1.runExecutor)({ project, target, configuration },
|
|
123
130
|
// @NOTE: Do not forward watch option if not supported by the target dev server,
|
|
124
131
|
// this is relevant for running Cypress against dev server target that does not support this option,
|
|
125
132
|
// for instance @nguniversal/builders:ssr-dev-server.
|
|
126
|
-
targetSupportsWatchOpt ? { watch: opts.watch } : {}, context))),
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
!output.
|
|
132
|
-
|
|
133
|
-
(
|
|
134
|
-
|
|
133
|
+
targetSupportsWatchOpt ? { watch: opts.watch } : {}, context))), _j; _j = yield tslib_1.__await(_h.next()), _d = _j.done, !_d;) {
|
|
134
|
+
_f = _j.value;
|
|
135
|
+
_g = false;
|
|
136
|
+
try {
|
|
137
|
+
const output = _f;
|
|
138
|
+
if (!output.success && !opts.watch)
|
|
139
|
+
throw new Error('Could not compile application files');
|
|
140
|
+
if (!opts.baseUrl &&
|
|
141
|
+
!output.baseUrl &&
|
|
142
|
+
!((_a = output.info) === null || _a === void 0 ? void 0 : _a.baseUrl) &&
|
|
143
|
+
((_b = output.info) === null || _b === void 0 ? void 0 : _b.port)) {
|
|
144
|
+
output.baseUrl = `http://localhost:${output.info.port}`;
|
|
145
|
+
}
|
|
146
|
+
yield yield tslib_1.__await(opts.baseUrl || output.baseUrl || ((_c = output.info) === null || _c === void 0 ? void 0 : _c.baseUrl));
|
|
147
|
+
}
|
|
148
|
+
finally {
|
|
149
|
+
_g = true;
|
|
135
150
|
}
|
|
136
|
-
yield yield tslib_1.__await(opts.baseUrl || output.baseUrl || ((_c = output.info) === null || _c === void 0 ? void 0 : _c.baseUrl));
|
|
137
151
|
}
|
|
138
152
|
}
|
|
139
153
|
catch (e_2_1) { e_2 = { error: e_2_1 }; }
|
|
140
154
|
finally {
|
|
141
155
|
try {
|
|
142
|
-
if (
|
|
156
|
+
if (!_g && !_d && (_e = _h.return)) yield tslib_1.__await(_e.call(_h));
|
|
143
157
|
}
|
|
144
158
|
finally { if (e_2) throw e_2.error; }
|
|
145
159
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cypress.impl.js","sourceRoot":"","sources":["../../../../../../packages/cypress/src/executors/cypress/cypress.impl.ts"],"names":[],"mappings":";;;AAAA,yCAOsB;AACtB,yBAAuB;AACvB,2BAA4C;AAC5C,+BAA+C;AAC/C,uDAA6D;AAC7D,iEAAsE;AAEtE,MAAM,OAAO,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,+DAA+D;AAuCnG,SAA8B,eAAe,CAC3C,OAA+B,EAC/B,OAAwB;;;QAExB,OAAO,GAAG,gBAAgB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QAC7C,2HAA2H;QAC3H,OAAO,CAAC,GAAG,CAAC,+BAA+B,GAAG,OAAO,CAAC,iBAAiB,CAAC;QACxE,IAAI,OAAO,CAAC;;YAEZ,KAA4B,
|
|
1
|
+
{"version":3,"file":"cypress.impl.js","sourceRoot":"","sources":["../../../../../../packages/cypress/src/executors/cypress/cypress.impl.ts"],"names":[],"mappings":"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"}
|