@nrwl/cypress 15.4.4 → 15.4.5
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/executors/cypress/cypress.impl.d.ts +6 -0
- package/src/executors/cypress/cypress.impl.js.map +1 -1
- package/src/executors/cypress/schema.json +3 -3
- package/src/generators/cypress-component-project/cypress-component-project.js +12 -12
- package/src/generators/cypress-component-project/cypress-component-project.js.map +1 -1
- package/src/generators/cypress-project/cypress-project.js +2 -1
- package/src/generators/cypress-project/cypress-project.js.map +1 -1
- package/src/generators/init/init.js +7 -7
- package/src/generators/init/init.js.map +1 -1
- package/src/migrations/update-15-0-0/add-cypress-inputs.js +7 -8
- package/src/migrations/update-15-0-0/add-cypress-inputs.js.map +1 -1
- package/src/utils/ct-helpers.js +6 -2
- package/src/utils/ct-helpers.js.map +1 -1
- package/src/utils/find-target-options.js +6 -2
- package/src/utils/find-target-options.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.4.
|
|
6
|
+
## [15.4.5](https://github.com/nrwl/nx/compare/15.4.4...15.4.5) (2023-01-06)
|
|
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.4.
|
|
3
|
+
"version": "15.4.5",
|
|
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,9 +34,9 @@
|
|
|
34
34
|
"migrations": "./migrations.json"
|
|
35
35
|
},
|
|
36
36
|
"dependencies": {
|
|
37
|
-
"@nrwl/devkit": "15.4.
|
|
38
|
-
"@nrwl/linter": "15.4.
|
|
39
|
-
"@nrwl/workspace": "15.4.
|
|
37
|
+
"@nrwl/devkit": "15.4.5",
|
|
38
|
+
"@nrwl/linter": "15.4.5",
|
|
39
|
+
"@nrwl/workspace": "15.4.5",
|
|
40
40
|
"@phenomnomnominal/tsquery": "4.1.1",
|
|
41
41
|
"chalk": "4.1.0",
|
|
42
42
|
"dotenv": "~10.0.0",
|
|
@@ -54,5 +54,5 @@
|
|
|
54
54
|
"access": "public"
|
|
55
55
|
},
|
|
56
56
|
"types": "./index.d.ts",
|
|
57
|
-
"gitHead": "
|
|
57
|
+
"gitHead": "0827694421806c23d678806a1a616352bbd2177d"
|
|
58
58
|
}
|
|
@@ -9,6 +9,9 @@ export interface CypressExecutorOptions extends Json {
|
|
|
9
9
|
tsConfig?: string;
|
|
10
10
|
devServerTarget?: string;
|
|
11
11
|
headed?: boolean;
|
|
12
|
+
/**
|
|
13
|
+
* @deprecated use watch instead
|
|
14
|
+
**/
|
|
12
15
|
headless?: boolean;
|
|
13
16
|
exit?: boolean;
|
|
14
17
|
key?: string;
|
|
@@ -18,6 +21,9 @@ export interface CypressExecutorOptions extends Json {
|
|
|
18
21
|
browser?: string;
|
|
19
22
|
env?: Record<string, string>;
|
|
20
23
|
spec?: string;
|
|
24
|
+
/**
|
|
25
|
+
* @deprecated no longer used since cypress supports typescript out of the box
|
|
26
|
+
**/
|
|
21
27
|
copyFiles?: string;
|
|
22
28
|
ciBuildId?: string | number;
|
|
23
29
|
group?: string;
|
|
@@ -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;
|
|
1
|
+
{"version":3,"file":"cypress.impl.js","sourceRoot":"","sources":["../../../../../../packages/cypress/src/executors/cypress/cypress.impl.ts"],"names":[],"mappings":"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"}
|
|
@@ -48,9 +48,9 @@
|
|
|
48
48
|
},
|
|
49
49
|
"headless": {
|
|
50
50
|
"type": "boolean",
|
|
51
|
-
"description": "Hide the browser instead of running headed
|
|
51
|
+
"description": "Hide the browser instead of running headed.",
|
|
52
52
|
"default": false,
|
|
53
|
-
"x-deprecated":
|
|
53
|
+
"x-deprecated": "Cypress runs headless by default. Use the --watch flag to control head/headless behavior instead."
|
|
54
54
|
},
|
|
55
55
|
"exit": {
|
|
56
56
|
"type": "boolean",
|
|
@@ -90,7 +90,7 @@
|
|
|
90
90
|
"copyFiles": {
|
|
91
91
|
"type": "string",
|
|
92
92
|
"description": "A regex string that is used to choose what additional integration files to copy to the dist folder.",
|
|
93
|
-
"x-deprecated":
|
|
93
|
+
"x-deprecated": "No longer used since cypress supports typescript out of the box. If specified, it will be ignored."
|
|
94
94
|
},
|
|
95
95
|
"ciBuildId": {
|
|
96
96
|
"oneOf": [
|
|
@@ -15,7 +15,7 @@ function cypressComponentProject(tree, options) {
|
|
|
15
15
|
const installDepsTask = updateDeps(tree, options);
|
|
16
16
|
addProjectFiles(tree, projectConfig, options);
|
|
17
17
|
addTargetToProject(tree, projectConfig, options);
|
|
18
|
-
|
|
18
|
+
updateNxJsonConfiguration(tree);
|
|
19
19
|
updateTsConfigForComponentTesting(tree, projectConfig);
|
|
20
20
|
if (!options.skipFormat) {
|
|
21
21
|
yield (0, devkit_1.formatFiles)(tree);
|
|
@@ -52,32 +52,32 @@ function addTargetToProject(tree, projectConfig, options) {
|
|
|
52
52
|
};
|
|
53
53
|
(0, devkit_1.updateProjectConfiguration)(tree, options.project, projectConfig);
|
|
54
54
|
}
|
|
55
|
-
function
|
|
55
|
+
function updateNxJsonConfiguration(tree) {
|
|
56
56
|
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
|
|
57
57
|
var _m, _o;
|
|
58
|
-
const
|
|
59
|
-
|
|
60
|
-
...((_g = (_f = (_e = (_d =
|
|
58
|
+
const nxJson = (0, devkit_1.readNxJson)(tree);
|
|
59
|
+
nxJson.tasksRunnerOptions = Object.assign(Object.assign({}, nxJson === null || nxJson === void 0 ? void 0 : nxJson.tasksRunnerOptions), { default: Object.assign(Object.assign({}, (_a = nxJson === null || nxJson === void 0 ? void 0 : nxJson.tasksRunnerOptions) === null || _a === void 0 ? void 0 : _a.default), { options: Object.assign(Object.assign({}, (_c = (_b = nxJson === null || nxJson === void 0 ? void 0 : nxJson.tasksRunnerOptions) === null || _b === void 0 ? void 0 : _b.default) === null || _c === void 0 ? void 0 : _c.options), { cacheableOperations: Array.from(new Set([
|
|
60
|
+
...((_g = (_f = (_e = (_d = nxJson === null || nxJson === void 0 ? void 0 : nxJson.tasksRunnerOptions) === null || _d === void 0 ? void 0 : _d.default) === null || _e === void 0 ? void 0 : _e.options) === null || _f === void 0 ? void 0 : _f.cacheableOperations) !== null && _g !== void 0 ? _g : []),
|
|
61
61
|
'component-test',
|
|
62
62
|
])) }) }) });
|
|
63
|
-
if (
|
|
64
|
-
(_h =
|
|
65
|
-
const productionFileSet = (_j =
|
|
63
|
+
if (nxJson.namedInputs) {
|
|
64
|
+
(_h = nxJson.targetDefaults) !== null && _h !== void 0 ? _h : (nxJson.targetDefaults = {});
|
|
65
|
+
const productionFileSet = (_j = nxJson.namedInputs) === null || _j === void 0 ? void 0 : _j.production;
|
|
66
66
|
if (productionFileSet) {
|
|
67
|
-
|
|
67
|
+
nxJson.namedInputs.production = Array.from(new Set([
|
|
68
68
|
...productionFileSet,
|
|
69
69
|
'!{projectRoot}/cypress/**/*',
|
|
70
70
|
'!{projectRoot}/**/*.cy.[jt]s?(x)',
|
|
71
71
|
'!{projectRoot}/cypress.config.[jt]s',
|
|
72
72
|
]));
|
|
73
73
|
}
|
|
74
|
-
(_k = (_m =
|
|
75
|
-
(_l = (_o =
|
|
74
|
+
(_k = (_m = nxJson.targetDefaults)['component-test']) !== null && _k !== void 0 ? _k : (_m['component-test'] = {});
|
|
75
|
+
(_l = (_o = nxJson.targetDefaults['component-test']).inputs) !== null && _l !== void 0 ? _l : (_o.inputs = [
|
|
76
76
|
'default',
|
|
77
77
|
productionFileSet ? '^production' : '^default',
|
|
78
78
|
]);
|
|
79
79
|
}
|
|
80
|
-
(0, devkit_1.
|
|
80
|
+
(0, devkit_1.updateNxJson)(tree, nxJson);
|
|
81
81
|
}
|
|
82
82
|
function updateTsConfigForComponentTesting(tree, projectConfig) {
|
|
83
83
|
const tsConfigPath = (0, devkit_1.joinPathFragments)(projectConfig.root, projectConfig.projectType === 'library'
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cypress-component-project.js","sourceRoot":"","sources":["../../../../../../packages/cypress/src/generators/cypress-component-project/cypress-component-project.ts"],"names":[],"mappings":";;;;AAAA,yCAasB;AACtB,iEAAsE;AAEtE,mDAK8B;AAG9B,SAAsB,uBAAuB,CAC3C,IAAU,EACV,OAAsC;;QAEtC,MAAM,SAAS,GAAG,IAAA,yCAAuB,GAAE,CAAC;QAC5C,IAAI,SAAS,IAAI,SAAS,GAAG,EAAE,EAAE;YAC/B,MAAM,IAAI,KAAK,CACb,sJAAsJ,CACvJ,CAAC;SACH;QAED,MAAM,aAAa,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;QAEtE,MAAM,eAAe,GAAG,UAAU,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAElD,eAAe,CAAC,IAAI,EAAE,aAAa,EAAE,OAAO,CAAC,CAAC;QAC9C,kBAAkB,CAAC,IAAI,EAAE,aAAa,EAAE,OAAO,CAAC,CAAC;QACjD,
|
|
1
|
+
{"version":3,"file":"cypress-component-project.js","sourceRoot":"","sources":["../../../../../../packages/cypress/src/generators/cypress-component-project/cypress-component-project.ts"],"names":[],"mappings":"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"}
|
|
@@ -227,7 +227,8 @@ function normalizeOptions(host, options) {
|
|
|
227
227
|
}
|
|
228
228
|
if ((maybeRootProject === null || maybeRootProject === void 0 ? void 0 : maybeRootProject.root) === '.' ||
|
|
229
229
|
// should still check to see if we are in a standalone based workspace
|
|
230
|
-
|
|
230
|
+
(!maybeRootProject &&
|
|
231
|
+
Array.from(projects.values()).some((config) => config.root === '.'))) {
|
|
231
232
|
projectName = options.name;
|
|
232
233
|
projectRoot = options.name;
|
|
233
234
|
isRootProject = true;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cypress-project.js","sourceRoot":"","sources":["../../../../../../packages/cypress/src/generators/cypress-project/cypress-project.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"cypress-project.js","sourceRoot":"","sources":["../../../../../../packages/cypress/src/generators/cypress-project/cypress-project.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,19 +6,19 @@ const versions_1 = require("../../utils/versions");
|
|
|
6
6
|
function setupE2ETargetDefaults(tree) {
|
|
7
7
|
var _a, _b, _c, _d;
|
|
8
8
|
var _e, _f;
|
|
9
|
-
const
|
|
10
|
-
if (!
|
|
9
|
+
const nxJson = (0, devkit_1.readNxJson)(tree);
|
|
10
|
+
if (!nxJson.namedInputs) {
|
|
11
11
|
return;
|
|
12
12
|
}
|
|
13
13
|
// E2e targets depend on all their project's sources + production sources of dependencies
|
|
14
|
-
(_a =
|
|
15
|
-
const productionFileSet = !!((_b =
|
|
16
|
-
(_c = (_e =
|
|
17
|
-
(_d = (_f =
|
|
14
|
+
(_a = nxJson.targetDefaults) !== null && _a !== void 0 ? _a : (nxJson.targetDefaults = {});
|
|
15
|
+
const productionFileSet = !!((_b = nxJson.namedInputs) === null || _b === void 0 ? void 0 : _b.production);
|
|
16
|
+
(_c = (_e = nxJson.targetDefaults).e2e) !== null && _c !== void 0 ? _c : (_e.e2e = {});
|
|
17
|
+
(_d = (_f = nxJson.targetDefaults.e2e).inputs) !== null && _d !== void 0 ? _d : (_f.inputs = [
|
|
18
18
|
'default',
|
|
19
19
|
productionFileSet ? '^production' : '^default',
|
|
20
20
|
]);
|
|
21
|
-
(0, devkit_1.
|
|
21
|
+
(0, devkit_1.updateNxJson)(tree, nxJson);
|
|
22
22
|
}
|
|
23
23
|
function updateDependencies(tree) {
|
|
24
24
|
(0, devkit_1.removeDependenciesFromPackageJson)(tree, ['@nrwl/cypress'], []);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../../../packages/cypress/src/generators/init/init.ts"],"names":[],"mappings":";;;AAAA,yCAOsB;AACtB,mDAI8B;AAG9B,SAAS,sBAAsB,CAAC,IAAU;;;IACxC,MAAM,
|
|
1
|
+
{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../../../packages/cypress/src/generators/init/init.ts"],"names":[],"mappings":";;;AAAA,yCAOsB;AACtB,mDAI8B;AAG9B,SAAS,sBAAsB,CAAC,IAAU;;;IACxC,MAAM,MAAM,GAAG,IAAA,mBAAU,EAAC,IAAI,CAAC,CAAC;IAEhC,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE;QACvB,OAAO;KACR;IAED,yFAAyF;IACzF,MAAA,MAAM,CAAC,cAAc,oCAArB,MAAM,CAAC,cAAc,GAAK,EAAE,EAAC;IAE7B,MAAM,iBAAiB,GAAG,CAAC,CAAC,CAAA,MAAA,MAAM,CAAC,WAAW,0CAAE,UAAU,CAAA,CAAC;IAC3D,YAAA,MAAM,CAAC,cAAc,EAAC,GAAG,uCAAH,GAAG,GAAK,EAAE,EAAC;IACjC,YAAA,MAAM,CAAC,cAAc,CAAC,GAAG,EAAC,MAAM,uCAAN,MAAM,GAAK;QACnC,SAAS;QACT,iBAAiB,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,UAAU;KAC/C,EAAC;IAEF,IAAA,qBAAY,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;AAC7B,CAAC;AAED,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;QACvB,aAAa,EAAE,2BAAgB;KAChC,CACF,CAAC;AACJ,CAAC;AAED,SAAgB,oBAAoB,CAAC,IAAU,EAAE,OAAe;IAC9D,sBAAsB,CAAC,IAAI,CAAC,CAAC;IAC7B,OAAO,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC;AACxE,CAAC;AAHD,oDAGC;AAED,kBAAe,oBAAoB,CAAC;AACvB,QAAA,oBAAoB,GAAG,IAAA,2BAAkB,EAAC,oBAAoB,CAAC,CAAC"}
|
|
@@ -7,11 +7,11 @@ function default_1(tree) {
|
|
|
7
7
|
var _a, _b, _c, _d;
|
|
8
8
|
var _e;
|
|
9
9
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
10
|
-
const
|
|
10
|
+
const nxJson = (0, devkit_1.readNxJson)(tree);
|
|
11
11
|
const { cypressTargets, hasComponentTesting } = getCypressTargetNames(tree);
|
|
12
|
-
const hasProductionFileset = !!((_a =
|
|
12
|
+
const hasProductionFileset = !!((_a = nxJson.namedInputs) === null || _a === void 0 ? void 0 : _a.production);
|
|
13
13
|
if (hasComponentTesting && hasProductionFileset && cypressTargets.size > 0) {
|
|
14
|
-
const productionFileset = new Set(
|
|
14
|
+
const productionFileset = new Set(nxJson.namedInputs.production);
|
|
15
15
|
for (const exclusion of [
|
|
16
16
|
'!{projectRoot}/cypress/**/*',
|
|
17
17
|
'!{projectRoot}/**/*.cy.[jt]s?(x)',
|
|
@@ -19,18 +19,17 @@ function default_1(tree) {
|
|
|
19
19
|
]) {
|
|
20
20
|
productionFileset.add(exclusion);
|
|
21
21
|
}
|
|
22
|
-
|
|
23
|
-
Array.from(productionFileset);
|
|
22
|
+
nxJson.namedInputs.production = Array.from(productionFileset);
|
|
24
23
|
}
|
|
25
24
|
for (const targetName of cypressTargets) {
|
|
26
|
-
(_b =
|
|
27
|
-
const cypressTargetDefaults = ((_c = (_e =
|
|
25
|
+
(_b = nxJson.targetDefaults) !== null && _b !== void 0 ? _b : (nxJson.targetDefaults = {});
|
|
26
|
+
const cypressTargetDefaults = ((_c = (_e = nxJson.targetDefaults)[targetName]) !== null && _c !== void 0 ? _c : (_e[targetName] = {}));
|
|
28
27
|
(_d = cypressTargetDefaults.inputs) !== null && _d !== void 0 ? _d : (cypressTargetDefaults.inputs = [
|
|
29
28
|
'default',
|
|
30
29
|
hasProductionFileset ? '^production' : '^default',
|
|
31
30
|
]);
|
|
32
31
|
}
|
|
33
|
-
(0, devkit_1.
|
|
32
|
+
(0, devkit_1.updateNxJson)(tree, nxJson);
|
|
34
33
|
yield (0, devkit_1.formatFiles)(tree);
|
|
35
34
|
});
|
|
36
35
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add-cypress-inputs.js","sourceRoot":"","sources":["../../../../../../packages/cypress/src/migrations/update-15-0-0/add-cypress-inputs.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"add-cypress-inputs.js","sourceRoot":"","sources":["../../../../../../packages/cypress/src/migrations/update-15-0-0/add-cypress-inputs.ts"],"names":[],"mappings":";;;AAAA,yCAA2E;AAC3E,iGAA8F;AAG9F,mBAA+B,IAAU;;;;QACvC,MAAM,MAAM,GAAG,IAAA,mBAAU,EAAC,IAAI,CAAC,CAAC;QAEhC,MAAM,EAAE,cAAc,EAAE,mBAAmB,EAAE,GAAG,qBAAqB,CAAC,IAAI,CAAC,CAAC;QAC5E,MAAM,oBAAoB,GAAG,CAAC,CAAC,CAAA,MAAA,MAAM,CAAC,WAAW,0CAAE,UAAU,CAAA,CAAC;QAE9D,IAAI,mBAAmB,IAAI,oBAAoB,IAAI,cAAc,CAAC,IAAI,GAAG,CAAC,EAAE;YAC1E,MAAM,iBAAiB,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;YACjE,KAAK,MAAM,SAAS,IAAI;gBACtB,6BAA6B;gBAC7B,kCAAkC;gBAClC,qCAAqC;aACtC,EAAE;gBACD,iBAAiB,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;aAClC;YACD,MAAM,CAAC,WAAW,CAAC,UAAU,GAAG,KAAK,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;SAC/D;QAED,KAAK,MAAM,UAAU,IAAI,cAAc,EAAE;YACvC,MAAA,MAAM,CAAC,cAAc,oCAArB,MAAM,CAAC,cAAc,GAAK,EAAE,EAAC;YAC7B,MAAM,qBAAqB,GAAG,aAAC,MAAM,CAAC,cAAc,EAAC,UAAU,wCAAV,UAAU,IAAM,EAAE,EAAC,CAAC;YAEzE,MAAA,qBAAqB,CAAC,MAAM,oCAA5B,qBAAqB,CAAC,MAAM,GAAK;gBAC/B,SAAS;gBACT,oBAAoB,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,UAAU;aAClD,EAAC;SACH;QAED,IAAA,qBAAY,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAE3B,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;;CACzB;AA/BD,4BA+BC;AAED,SAAS,qBAAqB,CAAC,IAAU;IACvC,MAAM,cAAc,GAAG,IAAI,GAAG,EAAU,CAAC;IACzC,IAAI,mBAAmB,GAAG,KAAK,CAAC;IAChC,IAAA,+CAAsB,EACpB,IAAI,EACJ,uBAAuB,EACvB,CAAC,OAAO,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE;QACtB,cAAc,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QAC3B,IAAI,OAAO,CAAC,WAAW,KAAK,WAAW,EAAE;YACvC,mBAAmB,GAAG,IAAI,CAAC;SAC5B;IACH,CAAC,CACF,CAAC;IACF,OAAO,EAAE,cAAc,EAAE,mBAAmB,EAAE,CAAC;AACjD,CAAC"}
|
package/src/utils/ct-helpers.js
CHANGED
|
@@ -6,6 +6,7 @@ const path_1 = require("path");
|
|
|
6
6
|
const fs_1 = require("fs");
|
|
7
7
|
const find_project_for_path_1 = require("nx/src/project-graph/utils/find-project-for-path");
|
|
8
8
|
const project_graph_1 = require("nx/src/project-graph/project-graph");
|
|
9
|
+
const file_utils_1 = require("nx/src/project-graph/file-utils");
|
|
9
10
|
exports.CY_FILE_MATCHER = new RegExp(/\.cy\.[tj]sx?$/);
|
|
10
11
|
/**
|
|
11
12
|
* return a path to a temp css file
|
|
@@ -56,7 +57,8 @@ function getProjectConfigByPath(graph, configPath) {
|
|
|
56
57
|
}
|
|
57
58
|
exports.getProjectConfigByPath = getProjectConfigByPath;
|
|
58
59
|
function createExecutorContext(graph, targets, projectName, targetName, configurationName) {
|
|
59
|
-
const
|
|
60
|
+
const projectsConfigurations = (0, project_graph_1.readProjectsConfigurationFromProjectGraph)(graph);
|
|
61
|
+
const nxJsonConfiguration = (0, file_utils_1.readNxJson)();
|
|
60
62
|
return {
|
|
61
63
|
cwd: process.cwd(),
|
|
62
64
|
projectGraph: graph,
|
|
@@ -66,7 +68,9 @@ function createExecutorContext(graph, targets, projectName, targetName, configur
|
|
|
66
68
|
root: devkit_1.workspaceRoot,
|
|
67
69
|
isVerbose: false,
|
|
68
70
|
projectName,
|
|
69
|
-
|
|
71
|
+
projectsConfigurations,
|
|
72
|
+
nxJsonConfiguration,
|
|
73
|
+
workspace: Object.assign(Object.assign({}, nxJsonConfiguration), projectsConfigurations),
|
|
70
74
|
};
|
|
71
75
|
}
|
|
72
76
|
exports.createExecutorContext = createExecutorContext;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ct-helpers.js","sourceRoot":"","sources":["../../../../../packages/cypress/src/utils/ct-helpers.ts"],"names":[],"mappings":";;;AACA,
|
|
1
|
+
{"version":3,"file":"ct-helpers.js","sourceRoot":"","sources":["../../../../../packages/cypress/src/utils/ct-helpers.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.findBuildConfig = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const devkit_1 = require("@nrwl/devkit");
|
|
6
|
+
const file_utils_1 = require("nx/src/project-graph/file-utils");
|
|
6
7
|
const project_graph_1 = require("nx/src/project-graph/project-graph");
|
|
7
8
|
function findBuildConfig(tree, options) {
|
|
8
9
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
@@ -95,7 +96,8 @@ function findTargetOptionsInProject(tree, graph, projectName, includes) {
|
|
|
95
96
|
}
|
|
96
97
|
}
|
|
97
98
|
function createExecutorContext(graph, targets, projectName, targetName, configurationName) {
|
|
98
|
-
const
|
|
99
|
+
const nxJsonConfiguration = (0, file_utils_1.readNxJson)();
|
|
100
|
+
const projectsConfigurations = (0, project_graph_1.readProjectsConfigurationFromProjectGraph)(graph);
|
|
99
101
|
return {
|
|
100
102
|
cwd: process.cwd(),
|
|
101
103
|
projectGraph: graph,
|
|
@@ -105,7 +107,9 @@ function createExecutorContext(graph, targets, projectName, targetName, configur
|
|
|
105
107
|
root: devkit_1.workspaceRoot,
|
|
106
108
|
isVerbose: false,
|
|
107
109
|
projectName,
|
|
108
|
-
|
|
110
|
+
projectsConfigurations,
|
|
111
|
+
nxJsonConfiguration,
|
|
112
|
+
workspace: Object.assign(Object.assign({}, projectsConfigurations), nxJsonConfiguration),
|
|
109
113
|
};
|
|
110
114
|
}
|
|
111
115
|
//# sourceMappingURL=find-target-options.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"find-target-options.js","sourceRoot":"","sources":["../../../../../packages/cypress/src/utils/find-target-options.ts"],"names":[],"mappings":";;;;AAAA,
|
|
1
|
+
{"version":3,"file":"find-target-options.js","sourceRoot":"","sources":["../../../../../packages/cypress/src/utils/find-target-options.ts"],"names":[],"mappings":"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"}
|