@nx/cypress 16.0.0-beta.6 → 16.0.0-beta.8
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 +6 -6
- package/src/migrations/update-14-6-1/update-cypress-configs-presets.js +2 -1
- package/src/migrations/update-14-6-1/update-cypress-configs-presets.js.map +1 -1
- package/src/utils/find-target-options.d.ts +1 -0
- package/src/utils/find-target-options.js +7 -4
- package/src/utils/find-target-options.js.map +1 -1
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nx/cypress",
|
|
3
|
-
"version": "16.0.0-beta.
|
|
3
|
+
"version": "16.0.0-beta.8",
|
|
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/cypress": "16.0.0-beta.
|
|
38
|
-
"@nx/devkit": "16.0.0-beta.
|
|
39
|
-
"@nx/js": "16.0.0-beta.
|
|
40
|
-
"@nx/linter": "16.0.0-beta.
|
|
37
|
+
"@nrwl/cypress": "16.0.0-beta.8",
|
|
38
|
+
"@nx/devkit": "16.0.0-beta.8",
|
|
39
|
+
"@nx/js": "16.0.0-beta.8",
|
|
40
|
+
"@nx/linter": "16.0.0-beta.8",
|
|
41
41
|
"@phenomnomnominal/tsquery": "~5.0.1",
|
|
42
42
|
"detect-port": "^1.5.1",
|
|
43
43
|
"dotenv": "~10.0.0",
|
|
@@ -55,5 +55,5 @@
|
|
|
55
55
|
"access": "public"
|
|
56
56
|
},
|
|
57
57
|
"types": "./index.d.ts",
|
|
58
|
-
"gitHead": "
|
|
58
|
+
"gitHead": "200cf327337f17cea009d83e9055a628346b4084"
|
|
59
59
|
}
|
|
@@ -76,10 +76,11 @@ function addBuildTargetToConfig(tree, projectName, targetName, configName) {
|
|
|
76
76
|
const projectWithBuild = yield (0, find_target_options_1.findBuildConfig)(tree, {
|
|
77
77
|
project: projectName,
|
|
78
78
|
validExecutorNames: new Set(['@nrwl/web:webpack']),
|
|
79
|
+
skipGetOptions: true,
|
|
79
80
|
});
|
|
80
81
|
// didn't find the config so can't update. consumer should collect list of them and display a warning at the end
|
|
81
82
|
// no reason to fail since the preset will fallback to a default config so should still keep working.
|
|
82
|
-
if (!(projectWithBuild === null || projectWithBuild === void 0 ? void 0 : projectWithBuild.target)
|
|
83
|
+
if (!(projectWithBuild === null || projectWithBuild === void 0 ? void 0 : projectWithBuild.target)) {
|
|
83
84
|
return false;
|
|
84
85
|
}
|
|
85
86
|
const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, projectName);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-cypress-configs-presets.js","sourceRoot":"","sources":["../../../../../../packages/cypress/src/migrations/update-14-6-1/update-cypress-configs-presets.ts"],"names":[],"mappings":";;;;AAAA,uCAOoB;AACpB,6FAA0F;AAC1F,uDAAoD;AAGpD,iEAAsE;AACtE,yEAAkE;AAElE,SAAsB,2BAA2B,CAAC,IAAU;;QAC1D,IAAI,IAAA,yCAAuB,GAAE,GAAG,EAAE,EAAE;YAClC,OAAO;SACR;QAED,MAAM,8BAA8B,GAAG,IAAI,GAAG,EAAU,CAAC;QACzD,MAAM,WAAW,GAAG,EAAE,CAAC;QACvB,IAAA,+CAAsB,EACpB,IAAI,EACJ,uBAAuB,EACvB,CAAC,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,UAAU,EAAE,EAAE;;YAC/C,IAAI,OAAO,CAAC,aAAa,IAAI,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE;gBAC/D,YAAY,CAAC,IAAI,EAAE,OAAO,EAAE,UAAU,CAAC,CAAC;aACzC;YAED,MAAM,aAAa,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,WAAW,CAAC,CAAC;YAClE,MAAM,WAAW,GACf,OAAO,CAAC,WAAW;iBACnB,MAAA,MAAA,aAAa,CAAC,OAAO,CAAC,UAAU,CAAC,0CAAE,OAAO,0CAAE,WAAW,CAAA,CAAC;YAC1D,MAAM,eAAe,GACnB,OAAO,CAAC,eAAe;iBACvB,MAAA,MAAA,aAAa,CAAC,OAAO,CAAC,UAAU,CAAC,0CAAE,OAAO,0CAAE,eAAe,CAAA,CAAC;YAE9D,IAAI,CAAC,eAAe,IAAI,WAAW,KAAK,WAAW,EAAE;gBACnD,WAAW,CAAC,IAAI,CACd,sBAAsB,CACpB,IAAI,EACJ,WAAW,EACX,UAAU,EACV,UAAU,CACX,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,EAAE;oBACnB,IAAI,CAAC,SAAS,EAAE;wBACd,8BAA8B,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;qBACjD;gBACH,CAAC,CAAC,CACH,CAAC;aACH;QACH,CAAC,CACF,CAAC;QAEF,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE;YAC1B,wBAAwB,CAAC,IAAI,CAAC,CAAC;SAChC;QAED,MAAM,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;QAE/B,IAAI,8BAA8B,CAAC,IAAI,GAAG,CAAC,EAAE;YAC3C,eAAM,CAAC,IAAI,CACT,iGAAiG,CAClG,CAAC;YACF,eAAM,CAAC,IAAI,CAAC,KAAK,KAAK,CAAC,IAAI,CAAC,8BAA8B,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;YAC5E,eAAM,CAAC,IAAI,CAAC,IAAA,qBAAY,EAAA;;;;;;;KAOvB,CAAC,CAAC;SACJ;IACH,CAAC;CAAA;AA5DD,kEA4DC;AAED,SAAS,YAAY,CACnB,IAAU,EACV,OAA+B,EAC/B,UAA8B;IAE9B,IAAI,QAAQ,GAAG,iBAAO,CAAC,OAAO,CAC5B,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,aAAa,EAAE,OAAO,CAAC,EACzC,gBAAgB,EAChB,CAAC,IAAuB,EAAE,EAAE;QAC1B,6EAA6E;QAC7E,MAAM,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,CAAC;QAC7C,IAAI,UAAU,KAAK,aAAa,EAAE;YAChC,OAAO,yBAAyB,CAAC;SAClC;aAAM,IAAI,UAAU,KAAK,sBAAsB,EAAE;YAChD,OAAO,kCAAkC,CAAC;SAC3C;aAAM,IAAI,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,KAAK,0BAA0B,EAAE;YACnE,OAAO,UAAU,IAAI,UAAU,KAAK,gBAAgB,CAAC,cAAc;gBACjE,CAAC,CAAC,yDAAyD,UAAU,MAAM;gBAC3E,CAAC,CAAC,sCAAsC,CAAC;SAC5C;QACD,OAAO;IACT,CAAC,CACF,CAAC;IAEF,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,aAAa,EAAE,QAAQ,CAAC,CAAC;AAC9C,CAAC;AAED,SAAe,sBAAsB,CACnC,IAAU,EACV,WAAmB,EACnB,UAAkB,EAClB,UAAmB;;;QAEnB,MAAM,gBAAgB,GAAG,MAAM,IAAA,qCAAe,EAAC,IAAI,EAAE;YACnD,OAAO,EAAE,WAAW;YACpB,kBAAkB,EAAE,IAAI,GAAG,CAAC,CAAC,mBAAmB,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"update-cypress-configs-presets.js","sourceRoot":"","sources":["../../../../../../packages/cypress/src/migrations/update-14-6-1/update-cypress-configs-presets.ts"],"names":[],"mappings":"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"}
|
|
@@ -17,7 +17,7 @@ function findBuildConfig(tree, options) {
|
|
|
17
17
|
};
|
|
18
18
|
}
|
|
19
19
|
// check to see if there is a valid config in the given project
|
|
20
|
-
const selfProject = findTargetOptionsInProject(tree, graph, options.project, options
|
|
20
|
+
const selfProject = findTargetOptionsInProject(tree, graph, options.project, options);
|
|
21
21
|
if (selfProject) {
|
|
22
22
|
return selfProject;
|
|
23
23
|
}
|
|
@@ -63,7 +63,7 @@ function findInGraph(tree, graph, options) {
|
|
|
63
63
|
const parents = findParentsOfProject(graph, options.project);
|
|
64
64
|
const potentialTargets = [];
|
|
65
65
|
for (const parent of parents) {
|
|
66
|
-
const parentProject = findTargetOptionsInProject(tree, graph, parent.target, options
|
|
66
|
+
const parentProject = findTargetOptionsInProject(tree, graph, parent.target, options);
|
|
67
67
|
if (parentProject) {
|
|
68
68
|
potentialTargets.push(parentProject);
|
|
69
69
|
}
|
|
@@ -83,14 +83,17 @@ function findParentsOfProject(graph, projectName) {
|
|
|
83
83
|
? Object.values(reversedGraph.dependencies[projectName])
|
|
84
84
|
: [];
|
|
85
85
|
}
|
|
86
|
-
function findTargetOptionsInProject(tree, graph, projectName,
|
|
86
|
+
function findTargetOptionsInProject(tree, graph, projectName, options) {
|
|
87
87
|
const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, projectName);
|
|
88
|
+
const includes = options.validExecutorNames;
|
|
88
89
|
for (const targetName in projectConfig.targets) {
|
|
89
90
|
const targetConfig = projectConfig.targets[targetName];
|
|
90
91
|
if (includes.has(targetConfig.executor)) {
|
|
91
92
|
return {
|
|
92
93
|
target: `${projectName}:${targetName}`,
|
|
93
|
-
config:
|
|
94
|
+
config: !options.skipGetOptions
|
|
95
|
+
? (0, devkit_1.readTargetOptions)({ project: projectName, target: targetName }, createExecutorContext(graph, projectConfig.targets, projectName, targetName, null))
|
|
96
|
+
: null,
|
|
94
97
|
};
|
|
95
98
|
}
|
|
96
99
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"find-target-options.js","sourceRoot":"","sources":["../../../../../packages/cypress/src/utils/find-target-options.ts"],"names":[],"mappings":";;;;AAAA,uCAcoB;AACpB,gEAA6D;AAC7D,sEAA+F;
|
|
1
|
+
{"version":3,"file":"find-target-options.js","sourceRoot":"","sources":["../../../../../packages/cypress/src/utils/find-target-options.ts"],"names":[],"mappings":";;;;AAAA,uCAcoB;AACpB,gEAA6D;AAC7D,sEAA+F;AAkB/F,SAAsB,eAAe,CACnC,IAAU,EACV,OAA0B;;QAE1B,IAAI;YACF,qCAAqC;YACrC,MAAM,KAAK,GAAG,MAAM,IAAA,gCAAuB,GAAE,CAAC;YAC9C,IAAI,OAAO,CAAC,WAAW,EAAE;gBACvB,OAAO;oBACL,MAAM,EAAE,OAAO,CAAC,WAAW;oBAC3B,MAAM,EAAE,YAAY,CAAC,IAAI,EAAE,KAAK,EAAE,OAAO,CAAC;iBAC3C,CAAC;aACH;YACD,+DAA+D;YAC/D,MAAM,WAAW,GAAG,0BAA0B,CAC5C,IAAI,EACJ,KAAK,EACL,OAAO,CAAC,OAAO,EACf,OAAO,CACR,CAAC;YACF,IAAI,WAAW,EAAE;gBACf,OAAO,WAAW,CAAC;aACpB;YAED,6FAA6F;YAC7F,OAAO,MAAM,WAAW,CAAC,IAAI,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;SAChD;QAAC,OAAO,CAAC,EAAE;YACV,eAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YAChB,MAAM,IAAI,KAAK,CAAC,IAAA,qBAAY,EAAA;wBACR,OAAO,CAAC,OAAO;6BACV,OAAO,CAAC,WAAW;0BACtB,CAAC,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;SACrE;IACH,CAAC;CAAA;AAjCD,0CAiCC;AAED,SAAS,YAAY,CACnB,IAAU,EACV,KAAmB,EACnB,OAA0B;;IAE1B,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,GAAG,IAAA,0BAAiB,EAC1D,OAAO,CAAC,WAAW,CACpB,CAAC;IACF,MAAM,aAAa,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAC9D,MAAM,YAAY,GAAG,MAAA,MAAA,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,OAAO,0CAAG,MAAM,CAAC,0CAAE,QAAQ,CAAC;IAChE,IAAI,CAAC,OAAO,CAAC,kBAAkB,CAAC,GAAG,CAAC,YAAY,CAAC,EAAE;QACjD,eAAM,CAAC,KAAK,CAAC,IAAA,qBAAY,EAAA,iCACvB,OAAO,CAAC,WACV,eAAe,YAAY;;EAE7B,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,kBAAkB,CAAC;aACrC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC;aACvB,IAAI,CAAC,IAAI,CAAC;;;0CAG6B,OAAO,CAAC,WAAW;;;;;CAK5D,CAAC,CAAC;QACC,MAAM,IAAI,KAAK,CACb,8FAA8F,CAC/F,CAAC;KACH;IACD,MAAM,WAAW,GACf,aAAa,KAAI,MAAA,MAAA,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,OAAO,0CAAG,MAAM,CAAC,0CAAE,oBAAoB,CAAA,CAAC;IAE1E,OAAO,IAAA,0BAAiB,EACtB,EAAE,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,WAAW,EAAE,EAC/C,qBAAqB,CACnB,KAAK,EACL,aAAa,CAAC,OAAO,EACrB,OAAO,EACP,MAAM,EACN,WAAW,CACZ,CACF,CAAC;AACJ,CAAC;AAED,SAAe,WAAW,CACxB,IAAU,EACV,KAAmB,EACnB,OAA0B;;QAE1B,MAAM,OAAO,GAAG,oBAAoB,CAAC,KAAK,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;QAC7D,MAAM,gBAAgB,GAAG,EAAE,CAAC;QAE5B,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE;YAC5B,MAAM,aAAa,GAAG,0BAA0B,CAC9C,IAAI,EACJ,KAAK,EACL,MAAM,CAAC,MAAM,EACb,OAAO,CACR,CAAC;YACF,IAAI,aAAa,EAAE;gBACjB,gBAAgB,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;aACtC;SACF;QAED,IAAI,gBAAgB,CAAC,MAAM,GAAG,CAAC,EAAE;YAC/B,eAAM,CAAC,IAAI,CAAC,IAAA,qBAAY,EAAA,wCAAwC,OAAO,CAAC,OAAO,WAAW,gBAAgB,CAAC,MAAM;YACzG,gBAAgB,CAAC,CAAC,CAAC,CAAC,MAAM;;KAEjC,CAAC,CAAC;SACJ;QACD,OAAO,gBAAgB,CAAC,CAAC,CAAC,CAAC;IAC7B,CAAC;CAAA;AAED,SAAS,oBAAoB,CAC3B,KAAmB,EACnB,WAAmB;IAEnB,MAAM,aAAa,GAAG,IAAA,gBAAO,EAAC,KAAK,CAAC,CAAC;IACrC,OAAO,aAAa,CAAC,YAAY,CAAC,WAAW,CAAC;QAC5C,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC;QACxD,CAAC,CAAC,EAAE,CAAC;AACT,CAAC;AAED,SAAS,0BAA0B,CACjC,IAAU,EACV,KAAmB,EACnB,WAAmB,EACnB,OAA0B;IAE1B,MAAM,aAAa,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,WAAW,CAAC,CAAC;IAElE,MAAM,QAAQ,GAAG,OAAO,CAAC,kBAAkB,CAAC;IAE5C,KAAK,MAAM,UAAU,IAAI,aAAa,CAAC,OAAO,EAAE;QAC9C,MAAM,YAAY,GAAG,aAAa,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;QACvD,IAAI,QAAQ,CAAC,GAAG,CAAC,YAAY,CAAC,QAAQ,CAAC,EAAE;YACvC,OAAO;gBACL,MAAM,EAAE,GAAG,WAAW,IAAI,UAAU,EAAE;gBACtC,MAAM,EAAE,CAAC,OAAO,CAAC,cAAc;oBAC7B,CAAC,CAAC,IAAA,0BAAiB,EACf,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,EAAE,UAAU,EAAE,EAC5C,qBAAqB,CACnB,KAAK,EACL,aAAa,CAAC,OAAO,EACrB,WAAW,EACX,UAAU,EACV,IAAI,CACL,CACF;oBACH,CAAC,CAAC,IAAI;aACT,CAAC;SACH;KACF;AACH,CAAC;AAED,SAAS,qBAAqB,CAC5B,KAAmB,EACnB,OAA4C,EAC5C,WAAmB,EACnB,UAAkB,EAClB,iBAA0B;IAE1B,MAAM,mBAAmB,GAAG,IAAA,uBAAU,GAAE,CAAC;IACzC,MAAM,sBAAsB,GAC1B,IAAA,yDAAyC,EAAC,KAAK,CAAC,CAAC;IACnD,OAAO;QACL,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE;QAClB,YAAY,EAAE,KAAK;QACnB,MAAM,EAAE,OAAO,CAAC,UAAU,CAAC;QAC3B,UAAU;QACV,iBAAiB;QACjB,IAAI,EAAE,sBAAa;QACnB,SAAS,EAAE,KAAK;QAChB,WAAW;QACX,sBAAsB;QACtB,mBAAmB;QACnB,SAAS,kCACJ,sBAAsB,GACtB,mBAAmB,CACvB;KACF,CAAC;AACJ,CAAC"}
|