@nrwl/cypress 14.7.0-beta.1 → 14.7.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/CHANGELOG.md +1 -1
- package/migrations.json +6 -0
- package/package.json +5 -5
- package/plugins/cypress-preset.d.ts +11 -0
- package/plugins/cypress-preset.js +38 -1
- package/plugins/cypress-preset.js.map +1 -1
- package/src/executors/cypress/cypress.impl.js +13 -1
- package/src/executors/cypress/cypress.impl.js.map +1 -1
- package/src/generators/cypress-component-project/cypress-component-project.d.ts +2 -2
- package/src/generators/cypress-component-project/cypress-component-project.js +74 -11
- package/src/generators/cypress-component-project/cypress-component-project.js.map +1 -1
- package/src/generators/cypress-component-project/files/cypress/support/commands.ts__ext__ +1 -0
- package/src/generators/cypress-component-project/files/cypress/tsconfig.cy.json +16 -0
- package/src/generators/init/init.d.ts +1 -1
- package/src/generators/init/init.js +23 -5
- package/src/generators/init/init.js.map +1 -1
- package/src/migrations/update-14-7-0/update-cypress-version-if-10.d.ts +3 -0
- package/src/migrations/update-14-7-0/update-cypress-version-if-10.js +32 -0
- package/src/migrations/update-14-7-0/update-cypress-version-if-10.js.map +1 -0
- package/src/utils/ct-helpers.d.ts +13 -0
- package/src/utils/ct-helpers.js +33 -0
- package/src/utils/ct-helpers.js.map +1 -0
- package/src/utils/find-target-options.d.ts +1 -1
- package/src/utils/find-target-options.js +22 -14
- package/src/utils/find-target-options.js.map +1 -1
- package/src/utils/versions.d.ts +1 -1
- package/src/utils/versions.js +1 -1
- package/src/generators/cypress-component-project/files/tsconfig.cy.json +0 -16
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
|
-
# [14.7.0
|
|
6
|
+
# [14.7.0](https://github.com/nrwl/nx/compare/14.6.5...14.7.0) (2022-09-09)
|
|
7
7
|
|
|
8
8
|
**Note:** Version bump only for package @nrwl/cypress
|
package/migrations.json
CHANGED
|
@@ -36,6 +36,12 @@
|
|
|
36
36
|
"version": "14.6.1-beta.0",
|
|
37
37
|
"description": "Change Cypress e2e and component testing presets to use __filename instead of __dirname and include a devServerTarget for component testing.",
|
|
38
38
|
"factory": "./src/migrations/update-14-6-1/update-cypress-configs-presets"
|
|
39
|
+
},
|
|
40
|
+
"update-cypress-if-v10": {
|
|
41
|
+
"cli": "nx",
|
|
42
|
+
"version": "14.7.0-beta.0",
|
|
43
|
+
"description": "Update Cypress if using v10 to support latest component testing features",
|
|
44
|
+
"factory": "./src/migrations/update-14-7-0/update-cypress-version-if-10"
|
|
39
45
|
}
|
|
40
46
|
},
|
|
41
47
|
"packageJsonUpdates": {
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nrwl/cypress",
|
|
3
|
-
"version": "14.7.0
|
|
3
|
+
"version": "14.7.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",
|
|
@@ -36,9 +36,9 @@
|
|
|
36
36
|
"@babel/core": "^7.0.1",
|
|
37
37
|
"@babel/preset-env": "^7.0.0",
|
|
38
38
|
"@cypress/webpack-preprocessor": "^5.12.0",
|
|
39
|
-
"@nrwl/devkit": "14.7.0
|
|
40
|
-
"@nrwl/linter": "14.7.0
|
|
41
|
-
"@nrwl/workspace": "14.7.0
|
|
39
|
+
"@nrwl/devkit": "14.7.0",
|
|
40
|
+
"@nrwl/linter": "14.7.0",
|
|
41
|
+
"@nrwl/workspace": "14.7.0",
|
|
42
42
|
"@phenomnomnominal/tsquery": "4.1.1",
|
|
43
43
|
"babel-loader": "^8.0.2",
|
|
44
44
|
"chalk": "4.1.0",
|
|
@@ -61,5 +61,5 @@
|
|
|
61
61
|
"optional": true
|
|
62
62
|
}
|
|
63
63
|
},
|
|
64
|
-
"gitHead": "
|
|
64
|
+
"gitHead": "412658cc3d88de29668ca924f597f07cf0223517"
|
|
65
65
|
}
|
|
@@ -1,9 +1,18 @@
|
|
|
1
|
+
import { ExecutorContext, ProjectConfiguration, ProjectGraph, TargetConfiguration } from '@nrwl/devkit';
|
|
1
2
|
interface BaseCypressPreset {
|
|
2
3
|
videosFolder: string;
|
|
3
4
|
screenshotsFolder: string;
|
|
4
5
|
video: boolean;
|
|
5
6
|
chromeWebSecurity: boolean;
|
|
6
7
|
}
|
|
8
|
+
export interface NxComponentTestingOptions {
|
|
9
|
+
/**
|
|
10
|
+
* the component testing target name.
|
|
11
|
+
* this is only when customized away from the default value of `component-test`
|
|
12
|
+
* @example 'component-test'
|
|
13
|
+
*/
|
|
14
|
+
ctTargetName: string;
|
|
15
|
+
}
|
|
7
16
|
export declare function nxBaseCypressPreset(pathToConfig: string): BaseCypressPreset;
|
|
8
17
|
/**
|
|
9
18
|
* nx E2E Preset for Cypress
|
|
@@ -31,4 +40,6 @@ export declare function nxE2EPreset(pathToConfig: string): {
|
|
|
31
40
|
video: boolean;
|
|
32
41
|
chromeWebSecurity: boolean;
|
|
33
42
|
};
|
|
43
|
+
export declare function getProjectConfigByPath(graph: ProjectGraph, configPath: string): ProjectConfiguration;
|
|
44
|
+
export declare function createExecutorContext(graph: ProjectGraph, targets: Record<string, TargetConfiguration>, projectName: string, targetName: string, configurationName: string): ExecutorContext;
|
|
34
45
|
export {};
|
|
@@ -1,7 +1,9 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.nxE2EPreset = exports.nxBaseCypressPreset = void 0;
|
|
3
|
+
exports.createExecutorContext = exports.getProjectConfigByPath = exports.nxE2EPreset = exports.nxBaseCypressPreset = void 0;
|
|
4
4
|
const devkit_1 = require("@nrwl/devkit");
|
|
5
|
+
const runtime_lint_utils_1 = require("@nrwl/workspace/src/utils/runtime-lint-utils");
|
|
6
|
+
const project_graph_1 = require("nx/src/project-graph/project-graph");
|
|
5
7
|
const path_1 = require("path");
|
|
6
8
|
const fs_1 = require("fs");
|
|
7
9
|
function nxBaseCypressPreset(pathToConfig) {
|
|
@@ -42,4 +44,39 @@ function nxE2EPreset(pathToConfig) {
|
|
|
42
44
|
return Object.assign(Object.assign({}, nxBaseCypressPreset(pathToConfig)), { fileServerFolder: '.', supportFile: 'src/support/e2e.ts', specPattern: 'src/**/*.cy.{js,jsx,ts,tsx}', fixturesFolder: 'src/fixtures' });
|
|
43
45
|
}
|
|
44
46
|
exports.nxE2EPreset = nxE2EPreset;
|
|
47
|
+
function getProjectConfigByPath(graph, configPath) {
|
|
48
|
+
var _a, _b, _c;
|
|
49
|
+
var _d;
|
|
50
|
+
const configFileFromWorkspaceRoot = (0, path_1.relative)(devkit_1.workspaceRoot, configPath);
|
|
51
|
+
const normalizedPathFromWorkspaceRoot = (0, fs_1.lstatSync)(configPath).isFile()
|
|
52
|
+
? configFileFromWorkspaceRoot.replace((0, path_1.extname)(configPath), '')
|
|
53
|
+
: configFileFromWorkspaceRoot;
|
|
54
|
+
const mappedGraph = (0, runtime_lint_utils_1.mapProjectGraphFiles)(graph);
|
|
55
|
+
const componentTestingProjectName = mappedGraph.allFiles[normalizedPathFromWorkspaceRoot];
|
|
56
|
+
if (!componentTestingProjectName ||
|
|
57
|
+
!((_a = graph.nodes[componentTestingProjectName]) === null || _a === void 0 ? void 0 : _a.data)) {
|
|
58
|
+
throw new Error((0, devkit_1.stripIndents) `Unable to find the project configuration that includes ${normalizedPathFromWorkspaceRoot}.
|
|
59
|
+
Found project name? ${componentTestingProjectName}.
|
|
60
|
+
Graph has data? ${!!((_b = graph.nodes[componentTestingProjectName]) === null || _b === void 0 ? void 0 : _b.data)}`);
|
|
61
|
+
}
|
|
62
|
+
// make sure name is set since it can be undefined
|
|
63
|
+
(_c = (_d = graph.nodes[componentTestingProjectName].data).name) !== null && _c !== void 0 ? _c : (_d.name = componentTestingProjectName);
|
|
64
|
+
return graph.nodes[componentTestingProjectName].data;
|
|
65
|
+
}
|
|
66
|
+
exports.getProjectConfigByPath = getProjectConfigByPath;
|
|
67
|
+
function createExecutorContext(graph, targets, projectName, targetName, configurationName) {
|
|
68
|
+
const projectConfigs = (0, project_graph_1.readProjectsConfigurationFromProjectGraph)(graph);
|
|
69
|
+
return {
|
|
70
|
+
cwd: process.cwd(),
|
|
71
|
+
projectGraph: graph,
|
|
72
|
+
target: targets[targetName],
|
|
73
|
+
targetName,
|
|
74
|
+
configurationName,
|
|
75
|
+
root: devkit_1.workspaceRoot,
|
|
76
|
+
isVerbose: false,
|
|
77
|
+
projectName,
|
|
78
|
+
workspace: Object.assign(Object.assign({}, (0, devkit_1.readNxJson)()), projectConfigs),
|
|
79
|
+
};
|
|
80
|
+
}
|
|
81
|
+
exports.createExecutorContext = createExecutorContext;
|
|
45
82
|
//# sourceMappingURL=cypress-preset.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cypress-preset.js","sourceRoot":"","sources":["../../../../packages/cypress/plugins/cypress-preset.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"cypress-preset.js","sourceRoot":"","sources":["../../../../packages/cypress/plugins/cypress-preset.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,7 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
const tslib_1 = require("tslib");
|
|
4
4
|
const devkit_1 = require("@nrwl/devkit");
|
|
5
5
|
require("dotenv/config");
|
|
6
|
+
const fs_1 = require("fs");
|
|
6
7
|
const path_1 = require("path");
|
|
8
|
+
const ct_helpers_1 = require("../../utils/ct-helpers");
|
|
7
9
|
const cypress_version_1 = require("../../utils/cypress-version");
|
|
8
10
|
const Cypress = require('cypress'); // @NOTE: Importing via ES6 messes the whole test dependencies.
|
|
9
11
|
function cypressExecutor(options, context) {
|
|
@@ -41,12 +43,19 @@ function cypressExecutor(options, context) {
|
|
|
41
43
|
}
|
|
42
44
|
exports.default = cypressExecutor;
|
|
43
45
|
function normalizeOptions(options, context) {
|
|
46
|
+
var _a, _b, _c;
|
|
44
47
|
options.env = options.env || {};
|
|
45
48
|
if (options.tsConfig) {
|
|
46
49
|
const tsConfigPath = (0, path_1.join)(context.root, options.tsConfig);
|
|
47
50
|
options.env.tsConfig = tsConfigPath;
|
|
48
51
|
process.env.TS_NODE_PROJECT = tsConfigPath;
|
|
49
52
|
}
|
|
53
|
+
if (options.testingType === 'component') {
|
|
54
|
+
const project = (_b = (_a = context === null || context === void 0 ? void 0 : context.projectGraph) === null || _a === void 0 ? void 0 : _a.nodes) === null || _b === void 0 ? void 0 : _b[context.projectName];
|
|
55
|
+
if ((_c = project === null || project === void 0 ? void 0 : project.data) === null || _c === void 0 ? void 0 : _c.root) {
|
|
56
|
+
options.ctTailwindPath = (0, ct_helpers_1.getTempTailwindPath)(context);
|
|
57
|
+
}
|
|
58
|
+
}
|
|
50
59
|
checkSupportedBrowser(options);
|
|
51
60
|
warnDeprecatedHeadless(options);
|
|
52
61
|
warnDeprecatedCypressVersion();
|
|
@@ -137,7 +146,7 @@ function startDevServer(opts, context) {
|
|
|
137
146
|
function runCypress(baseUrl, opts) {
|
|
138
147
|
var _a;
|
|
139
148
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
140
|
-
// Cypress expects the folder where a
|
|
149
|
+
// Cypress expects the folder where a cypress config is present
|
|
141
150
|
const projectFolderPath = (0, path_1.dirname)(opts.cypressConfig);
|
|
142
151
|
const options = {
|
|
143
152
|
project: projectFolderPath,
|
|
@@ -178,6 +187,9 @@ function runCypress(baseUrl, opts) {
|
|
|
178
187
|
const result = yield (opts.watch
|
|
179
188
|
? Cypress.open(options)
|
|
180
189
|
: Cypress.run(options));
|
|
190
|
+
if (opts.ctTailwindPath && (0, fs_1.existsSync)(opts.ctTailwindPath)) {
|
|
191
|
+
(0, fs_1.unlinkSync)(opts.ctTailwindPath);
|
|
192
|
+
}
|
|
181
193
|
/**
|
|
182
194
|
* `cypress.open` is returning `0` and is not of the same type as `cypress.run`.
|
|
183
195
|
* `cypress.open` is the graphical UI, so it will be obvious to know what wasn't
|
|
@@ -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,+BAA+C;AAC/C,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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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Tree } from '@nrwl/devkit';
|
|
1
|
+
import { ProjectConfiguration, Tree } from '@nrwl/devkit';
|
|
2
2
|
import { CypressComponentProjectSchema } from './schema';
|
|
3
3
|
export declare function cypressComponentProject(tree: Tree, options: CypressComponentProjectSchema): Promise<() => void>;
|
|
4
|
-
export declare function
|
|
4
|
+
export declare function updateTsConfigForComponentTesting(tree: Tree, projectConfig: ProjectConfiguration): void;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports.updateTsConfigForComponentTesting = exports.cypressComponentProject = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const devkit_1 = require("@nrwl/devkit");
|
|
6
6
|
const cypress_version_1 = require("../../utils/cypress-version");
|
|
@@ -15,7 +15,8 @@ function cypressComponentProject(tree, options) {
|
|
|
15
15
|
const installDepsTask = updateDeps(tree);
|
|
16
16
|
addProjectFiles(tree, projectConfig, options);
|
|
17
17
|
addTargetToProject(tree, projectConfig, options);
|
|
18
|
-
|
|
18
|
+
updateNxJson(tree);
|
|
19
|
+
updateTsConfigForComponentTesting(tree, projectConfig);
|
|
19
20
|
if (!options.skipFormat) {
|
|
20
21
|
yield (0, devkit_1.formatFiles)(tree);
|
|
21
22
|
}
|
|
@@ -46,14 +47,76 @@ function addTargetToProject(tree, projectConfig, options) {
|
|
|
46
47
|
};
|
|
47
48
|
(0, devkit_1.updateProjectConfiguration)(tree, options.project, projectConfig);
|
|
48
49
|
}
|
|
49
|
-
function
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
50
|
+
function updateNxJson(tree) {
|
|
51
|
+
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
|
|
52
|
+
var _m, _o;
|
|
53
|
+
const workspaceConfiguration = (0, devkit_1.readWorkspaceConfiguration)(tree);
|
|
54
|
+
workspaceConfiguration.tasksRunnerOptions = Object.assign(Object.assign({}, workspaceConfiguration === null || workspaceConfiguration === void 0 ? void 0 : workspaceConfiguration.tasksRunnerOptions), { default: Object.assign(Object.assign({}, (_a = workspaceConfiguration === null || workspaceConfiguration === void 0 ? void 0 : workspaceConfiguration.tasksRunnerOptions) === null || _a === void 0 ? void 0 : _a.default), { options: Object.assign(Object.assign({}, (_c = (_b = workspaceConfiguration === null || workspaceConfiguration === void 0 ? void 0 : workspaceConfiguration.tasksRunnerOptions) === null || _b === void 0 ? void 0 : _b.default) === null || _c === void 0 ? void 0 : _c.options), { cacheableOperations: Array.from(new Set([
|
|
55
|
+
...((_g = (_f = (_e = (_d = workspaceConfiguration === null || workspaceConfiguration === void 0 ? void 0 : workspaceConfiguration.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 : []),
|
|
56
|
+
'component-test',
|
|
57
|
+
])) }) }) });
|
|
58
|
+
if (workspaceConfiguration.namedInputs) {
|
|
59
|
+
(_h = workspaceConfiguration.targetDefaults) !== null && _h !== void 0 ? _h : (workspaceConfiguration.targetDefaults = {});
|
|
60
|
+
const productionFileSet = (_j = workspaceConfiguration.namedInputs) === null || _j === void 0 ? void 0 : _j.production;
|
|
61
|
+
if (productionFileSet) {
|
|
62
|
+
workspaceConfiguration.namedInputs.production = Array.from(new Set([
|
|
63
|
+
...productionFileSet,
|
|
64
|
+
'!{projectRoot}/cypress/**/*',
|
|
65
|
+
'!{projectRoot}/**/*.cy.[jt]s?(x)',
|
|
66
|
+
'!{projectRoot}/cypress.config.[jt]s',
|
|
67
|
+
]));
|
|
68
|
+
}
|
|
69
|
+
(_k = (_m = workspaceConfiguration.targetDefaults)['component-test']) !== null && _k !== void 0 ? _k : (_m['component-test'] = {});
|
|
70
|
+
(_l = (_o = workspaceConfiguration.targetDefaults['component-test']).inputs) !== null && _l !== void 0 ? _l : (_o.inputs = [
|
|
71
|
+
'default',
|
|
72
|
+
productionFileSet ? '^production' : '^default',
|
|
73
|
+
]);
|
|
74
|
+
}
|
|
75
|
+
(0, devkit_1.updateWorkspaceConfiguration)(tree, workspaceConfiguration);
|
|
76
|
+
}
|
|
77
|
+
function updateTsConfigForComponentTesting(tree, projectConfig) {
|
|
78
|
+
const tsConfigPath = (0, devkit_1.joinPathFragments)(projectConfig.root, projectConfig.projectType === 'library'
|
|
79
|
+
? 'tsconfig.lib.json'
|
|
80
|
+
: 'tsconfig.app.json');
|
|
81
|
+
if (tree.exists(tsConfigPath)) {
|
|
82
|
+
(0, devkit_1.updateJson)(tree, tsConfigPath, (json) => {
|
|
83
|
+
const excluded = new Set([
|
|
84
|
+
...(json.exclude || []),
|
|
85
|
+
'cypress/**/*',
|
|
86
|
+
'cypress.config.ts',
|
|
87
|
+
'**/*.cy.ts',
|
|
88
|
+
'**/*.cy.js',
|
|
89
|
+
'**/*.cy.tsx',
|
|
90
|
+
'**/*.cy.jsx',
|
|
91
|
+
]);
|
|
92
|
+
json.exclude = Array.from(excluded);
|
|
93
|
+
return json;
|
|
94
|
+
});
|
|
95
|
+
}
|
|
96
|
+
const projectBaseTsConfig = (0, devkit_1.joinPathFragments)(projectConfig.root, 'tsconfig.json');
|
|
97
|
+
if (tree.exists(projectBaseTsConfig)) {
|
|
98
|
+
(0, devkit_1.updateJson)(tree, projectBaseTsConfig, (json) => {
|
|
99
|
+
if (json.references) {
|
|
100
|
+
const hasCyTsConfig = json.references.some((r) => r.path === './cypress/tsconfig.cy.json');
|
|
101
|
+
if (!hasCyTsConfig) {
|
|
102
|
+
json.references.push({ path: './cypress/tsconfig.cy.json' });
|
|
103
|
+
}
|
|
104
|
+
}
|
|
105
|
+
else {
|
|
106
|
+
const excluded = new Set([
|
|
107
|
+
...(json.exclude || []),
|
|
108
|
+
'cypress/**/*',
|
|
109
|
+
'cypress.config.ts',
|
|
110
|
+
'**/*.cy.ts',
|
|
111
|
+
'**/*.cy.js',
|
|
112
|
+
'**/*.cy.tsx',
|
|
113
|
+
'**/*.cy.jsx',
|
|
114
|
+
]);
|
|
115
|
+
json.exclude = Array.from(excluded);
|
|
116
|
+
}
|
|
117
|
+
return json;
|
|
118
|
+
});
|
|
119
|
+
}
|
|
57
120
|
}
|
|
58
|
-
exports.
|
|
121
|
+
exports.updateTsConfigForComponentTesting = updateTsConfigForComponentTesting;
|
|
59
122
|
//# sourceMappingURL=cypress-component-project.js.map
|
|
@@ -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,
|
|
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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"}
|
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
{
|
|
2
|
+
"extends": "../tsconfig.json",
|
|
3
|
+
"compilerOptions": {
|
|
4
|
+
"outDir": "../../../dist/out-tsc",
|
|
5
|
+
"module": "commonjs",
|
|
6
|
+
"types": ["cypress", "node"]
|
|
7
|
+
},
|
|
8
|
+
"include": [
|
|
9
|
+
"../cypress.config.ts",
|
|
10
|
+
"../**/*.cy.ts",
|
|
11
|
+
"../**/*.cy.tsx",
|
|
12
|
+
"../**/*.cy.js",
|
|
13
|
+
"../**/*.cy.jsx",
|
|
14
|
+
"../**/*.d.ts"
|
|
15
|
+
]
|
|
16
|
+
}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { Tree } from '@nrwl/devkit';
|
|
2
2
|
import { Schema } from './schema';
|
|
3
|
-
export declare function cypressInitGenerator(
|
|
3
|
+
export declare function cypressInitGenerator(tree: Tree, options: Schema): import("@nrwl/devkit").GeneratorCallback;
|
|
4
4
|
export default cypressInitGenerator;
|
|
5
5
|
export declare const cypressInitSchematic: (generatorOptions: Schema) => (tree: any, context: any) => Promise<any>;
|
|
@@ -3,16 +3,34 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.cypressInitSchematic = exports.cypressInitGenerator = void 0;
|
|
4
4
|
const devkit_1 = require("@nrwl/devkit");
|
|
5
5
|
const versions_1 = require("../../utils/versions");
|
|
6
|
-
function
|
|
7
|
-
|
|
8
|
-
|
|
6
|
+
function setupE2ETargetDefaults(tree) {
|
|
7
|
+
var _a, _b, _c, _d;
|
|
8
|
+
var _e, _f;
|
|
9
|
+
const workspaceConfiguration = (0, devkit_1.readWorkspaceConfiguration)(tree);
|
|
10
|
+
if (!workspaceConfiguration.namedInputs) {
|
|
11
|
+
return;
|
|
12
|
+
}
|
|
13
|
+
// E2e targets depend on all their project's sources + production sources of dependencies
|
|
14
|
+
(_a = workspaceConfiguration.targetDefaults) !== null && _a !== void 0 ? _a : (workspaceConfiguration.targetDefaults = {});
|
|
15
|
+
const productionFileSet = !!((_b = workspaceConfiguration.namedInputs) === null || _b === void 0 ? void 0 : _b.production);
|
|
16
|
+
(_c = (_e = workspaceConfiguration.targetDefaults).e2e) !== null && _c !== void 0 ? _c : (_e.e2e = {});
|
|
17
|
+
(_d = (_f = workspaceConfiguration.targetDefaults.e2e).inputs) !== null && _d !== void 0 ? _d : (_f.inputs = [
|
|
18
|
+
'default',
|
|
19
|
+
productionFileSet ? '^production' : '^default',
|
|
20
|
+
]);
|
|
21
|
+
(0, devkit_1.updateWorkspaceConfiguration)(tree, workspaceConfiguration);
|
|
22
|
+
}
|
|
23
|
+
function updateDependencies(tree) {
|
|
24
|
+
(0, devkit_1.removeDependenciesFromPackageJson)(tree, ['@nrwl/cypress'], []);
|
|
25
|
+
return (0, devkit_1.addDependenciesToPackageJson)(tree, {}, {
|
|
9
26
|
['@nrwl/cypress']: versions_1.nxVersion,
|
|
10
27
|
cypress: versions_1.cypressVersion,
|
|
11
28
|
'@types/node': versions_1.typesNodeVersion,
|
|
12
29
|
});
|
|
13
30
|
}
|
|
14
|
-
function cypressInitGenerator(
|
|
15
|
-
|
|
31
|
+
function cypressInitGenerator(tree, options) {
|
|
32
|
+
setupE2ETargetDefaults(tree);
|
|
33
|
+
return !options.skipPackageJson ? updateDependencies(tree) : () => { };
|
|
16
34
|
}
|
|
17
35
|
exports.cypressInitGenerator = cypressInitGenerator;
|
|
18
36
|
exports.default = cypressInitGenerator;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../../../packages/cypress/src/generators/init/init.ts"],"names":[],"mappings":";;;AAAA,
|
|
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,sBAAsB,GAAG,IAAA,mCAA0B,EAAC,IAAI,CAAC,CAAC;IAEhE,IAAI,CAAC,sBAAsB,CAAC,WAAW,EAAE;QACvC,OAAO;KACR;IAED,yFAAyF;IACzF,MAAA,sBAAsB,CAAC,cAAc,oCAArC,sBAAsB,CAAC,cAAc,GAAK,EAAE,EAAC;IAE7C,MAAM,iBAAiB,GAAG,CAAC,CAAC,CAAA,MAAA,sBAAsB,CAAC,WAAW,0CAAE,UAAU,CAAA,CAAC;IAC3E,YAAA,sBAAsB,CAAC,cAAc,EAAC,GAAG,uCAAH,GAAG,GAAK,EAAE,EAAC;IACjD,YAAA,sBAAsB,CAAC,cAAc,CAAC,GAAG,EAAC,MAAM,uCAAN,MAAM,GAAK;QACnD,SAAS;QACT,iBAAiB,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,UAAU;KAC/C,EAAC;IAEF,IAAA,qCAA4B,EAAC,IAAI,EAAE,sBAAsB,CAAC,CAAC;AAC7D,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"}
|
|
@@ -0,0 +1,32 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.updateCypressVersionIf10 = void 0;
|
|
4
|
+
const devkit_1 = require("@nrwl/devkit");
|
|
5
|
+
const workspace_1 = require("@nrwl/workspace");
|
|
6
|
+
const semver_1 = require("semver");
|
|
7
|
+
function updateCypressVersionIf10(tree) {
|
|
8
|
+
var _a;
|
|
9
|
+
const installedVersion = (_a = (0, devkit_1.readJson)(tree, 'package.json').devDependencies) === null || _a === void 0 ? void 0 : _a['cypress'];
|
|
10
|
+
if (!installedVersion) {
|
|
11
|
+
return;
|
|
12
|
+
}
|
|
13
|
+
const normalizedInstalledCypressVersion = (0, workspace_1.checkAndCleanWithSemver)('cypress', installedVersion);
|
|
14
|
+
// not using v10
|
|
15
|
+
if ((0, semver_1.lt)(normalizedInstalledCypressVersion, '10.0.0') ||
|
|
16
|
+
(0, semver_1.gte)(normalizedInstalledCypressVersion, '11.0.0')) {
|
|
17
|
+
return;
|
|
18
|
+
}
|
|
19
|
+
const ngComponentTestingVersion = '10.7.0';
|
|
20
|
+
if ((0, semver_1.lt)(normalizedInstalledCypressVersion, ngComponentTestingVersion)) {
|
|
21
|
+
(0, devkit_1.updateJson)(tree, 'package.json', (json) => {
|
|
22
|
+
json.devDependencies['cypress'] = `^${ngComponentTestingVersion}`;
|
|
23
|
+
return json;
|
|
24
|
+
});
|
|
25
|
+
return () => {
|
|
26
|
+
(0, devkit_1.installPackagesTask)(tree);
|
|
27
|
+
};
|
|
28
|
+
}
|
|
29
|
+
}
|
|
30
|
+
exports.updateCypressVersionIf10 = updateCypressVersionIf10;
|
|
31
|
+
exports.default = updateCypressVersionIf10;
|
|
32
|
+
//# sourceMappingURL=update-cypress-version-if-10.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"update-cypress-version-if-10.js","sourceRoot":"","sources":["../../../../../../packages/cypress/src/migrations/update-14-7-0/update-cypress-version-if-10.ts"],"names":[],"mappings":";;;AAAA,yCAMsB;AACtB,+CAA0D;AAC1D,mCAAiC;AAEjC,SAAgB,wBAAwB,CAAC,IAAU;;IACjD,MAAM,gBAAgB,GAAG,MAAA,IAAA,iBAAQ,EAAC,IAAI,EAAE,cAAc,CAAC,CAAC,eAAe,0CACrE,SAAS,CACV,CAAC;IAEF,IAAI,CAAC,gBAAgB,EAAE;QACrB,OAAO;KACR;IACD,MAAM,iCAAiC,GAAG,IAAA,mCAAuB,EAC/D,SAAS,EACT,gBAAgB,CACjB,CAAC;IAEF,gBAAgB;IAChB,IACE,IAAA,WAAE,EAAC,iCAAiC,EAAE,QAAQ,CAAC;QAC/C,IAAA,YAAG,EAAC,iCAAiC,EAAE,QAAQ,CAAC,EAChD;QACA,OAAO;KACR;IAED,MAAM,yBAAyB,GAAG,QAAQ,CAAC;IAE3C,IAAI,IAAA,WAAE,EAAC,iCAAiC,EAAE,yBAAyB,CAAC,EAAE;QACpE,IAAA,mBAAU,EAAC,IAAI,EAAE,cAAc,EAAE,CAAC,IAAI,EAAE,EAAE;YACxC,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,GAAG,IAAI,yBAAyB,EAAE,CAAC;YAClE,OAAO,IAAI,CAAC;QACd,CAAC,CAAC,CAAC;QACH,OAAO,GAAG,EAAE;YACV,IAAA,4BAAmB,EAAC,IAAI,CAAC,CAAC;QAC5B,CAAC,CAAC;KACH;AACH,CAAC;AAhCD,4DAgCC;AAED,kBAAe,wBAAwB,CAAC"}
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
import type { ExecutorContext } from 'nx/src/config/misc-interfaces';
|
|
2
|
+
import { ProjectGraph } from 'nx/src/config/project-graph';
|
|
3
|
+
/**
|
|
4
|
+
* return a path to a temp css file
|
|
5
|
+
* temp file is scoped to the project root
|
|
6
|
+
* i.e. <context.root>/tmp/<project-root>/ct-styles.css
|
|
7
|
+
*/
|
|
8
|
+
export declare function getTempTailwindPath(context: ExecutorContext): string;
|
|
9
|
+
/**
|
|
10
|
+
* also returns true if the ct project and build project are the same.
|
|
11
|
+
* i.e. component testing inside an app.
|
|
12
|
+
*/
|
|
13
|
+
export declare function isCtProjectUsingBuildProject(graph: ProjectGraph, parentProjectName: string, childProjectName: string): boolean;
|
|
@@ -0,0 +1,33 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.isCtProjectUsingBuildProject = exports.getTempTailwindPath = void 0;
|
|
4
|
+
const path_1 = require("path");
|
|
5
|
+
/**
|
|
6
|
+
* return a path to a temp css file
|
|
7
|
+
* temp file is scoped to the project root
|
|
8
|
+
* i.e. <context.root>/tmp/<project-root>/ct-styles.css
|
|
9
|
+
*/
|
|
10
|
+
function getTempTailwindPath(context) {
|
|
11
|
+
var _a;
|
|
12
|
+
if (!context.projectName) {
|
|
13
|
+
throw new Error('No project name found in context');
|
|
14
|
+
}
|
|
15
|
+
const project = context === null || context === void 0 ? void 0 : context.projectGraph.nodes[context.projectName];
|
|
16
|
+
if (!project) {
|
|
17
|
+
throw new Error(`No project found in project graph for ${context.projectName}`);
|
|
18
|
+
}
|
|
19
|
+
if ((_a = project === null || project === void 0 ? void 0 : project.data) === null || _a === void 0 ? void 0 : _a.root) {
|
|
20
|
+
return (0, path_1.join)(context.root, 'tmp', project.data.root, 'ct-styles.css');
|
|
21
|
+
}
|
|
22
|
+
}
|
|
23
|
+
exports.getTempTailwindPath = getTempTailwindPath;
|
|
24
|
+
/**
|
|
25
|
+
* also returns true if the ct project and build project are the same.
|
|
26
|
+
* i.e. component testing inside an app.
|
|
27
|
+
*/
|
|
28
|
+
function isCtProjectUsingBuildProject(graph, parentProjectName, childProjectName) {
|
|
29
|
+
return (parentProjectName === childProjectName ||
|
|
30
|
+
graph.dependencies[parentProjectName].some((p) => p.target === childProjectName));
|
|
31
|
+
}
|
|
32
|
+
exports.isCtProjectUsingBuildProject = isCtProjectUsingBuildProject;
|
|
33
|
+
//# sourceMappingURL=ct-helpers.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ct-helpers.js","sourceRoot":"","sources":["../../../../../packages/cypress/src/utils/ct-helpers.ts"],"names":[],"mappings":";;;AAEA,+BAA4B;AAE5B;;;;GAIG;AACH,SAAgB,mBAAmB,CAAC,OAAwB;;IAC1D,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE;QACxB,MAAM,IAAI,KAAK,CAAC,kCAAkC,CAAC,CAAC;KACrD;IACD,MAAM,OAAO,GAAG,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,YAAY,CAAC,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;IAEjE,IAAI,CAAC,OAAO,EAAE;QACZ,MAAM,IAAI,KAAK,CACb,yCAAyC,OAAO,CAAC,WAAW,EAAE,CAC/D,CAAC;KACH;IAED,IAAI,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,IAAI,0CAAE,IAAI,EAAE;QACvB,OAAO,IAAA,WAAI,EAAC,OAAO,CAAC,IAAI,EAAE,KAAK,EAAE,OAAO,CAAC,IAAI,CAAC,IAAI,EAAE,eAAe,CAAC,CAAC;KACtE;AACH,CAAC;AAfD,kDAeC;AAED;;;GAGG;AACH,SAAgB,4BAA4B,CAC1C,KAAmB,EACnB,iBAAyB,EACzB,gBAAwB;IAExB,OAAO,CACL,iBAAiB,KAAK,gBAAgB;QACtC,KAAK,CAAC,YAAY,CAAC,iBAAiB,CAAC,CAAC,IAAI,CACxC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,gBAAgB,CACrC,CACF,CAAC;AACJ,CAAC;AAXD,oEAWC"}
|
|
@@ -9,7 +9,7 @@ interface FindTargetOptions {
|
|
|
9
9
|
validExecutorNames: Set<string>;
|
|
10
10
|
}
|
|
11
11
|
interface FoundTarget {
|
|
12
|
-
config
|
|
12
|
+
config?: TargetConfiguration;
|
|
13
13
|
target: string;
|
|
14
14
|
}
|
|
15
15
|
export declare function findBuildConfig(tree: Tree, options: FindTargetOptions): Promise<FoundTarget>;
|
|
@@ -6,21 +6,29 @@ const devkit_1 = require("@nrwl/devkit");
|
|
|
6
6
|
const project_graph_1 = require("nx/src/project-graph/project-graph");
|
|
7
7
|
function findBuildConfig(tree, options) {
|
|
8
8
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
9
|
+
try {
|
|
10
|
+
// attempt to use the provided target
|
|
11
|
+
const graph = yield (0, devkit_1.createProjectGraphAsync)();
|
|
12
|
+
if (options.buildTarget) {
|
|
13
|
+
return {
|
|
14
|
+
target: options.buildTarget,
|
|
15
|
+
config: findInTarget(tree, graph, options),
|
|
16
|
+
};
|
|
17
|
+
}
|
|
18
|
+
// check to see if there is a valid config in the given project
|
|
19
|
+
const selfProject = findTargetOptionsInProject(tree, graph, options.project, options.validExecutorNames);
|
|
20
|
+
if (selfProject) {
|
|
21
|
+
return selfProject;
|
|
22
|
+
}
|
|
23
|
+
// attempt to find any projects with the valid config in the graph that consumes this project
|
|
24
|
+
return yield findInGraph(tree, graph, options);
|
|
16
25
|
}
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
26
|
+
catch (e) {
|
|
27
|
+
throw new Error((0, devkit_1.stripIndents) `Error trying to find build configuration. Try manually specifying the build target with the --build-target flag.
|
|
28
|
+
Provided project? ${options.project}
|
|
29
|
+
Provided build target? ${options.buildTarget}
|
|
30
|
+
Provided Executors? ${[...options.validExecutorNames].join(', ')}`);
|
|
21
31
|
}
|
|
22
|
-
// attempt to find any projects with the valid config in the graph that consumes this project
|
|
23
|
-
return yield findInGraph(tree, graph, options);
|
|
24
32
|
});
|
|
25
33
|
}
|
|
26
34
|
exports.findBuildConfig = findBuildConfig;
|
|
@@ -42,7 +50,7 @@ function findInGraph(tree, graph, options) {
|
|
|
42
50
|
}
|
|
43
51
|
}
|
|
44
52
|
if (potentialTargets.length > 1) {
|
|
45
|
-
devkit_1.logger.warn((0, devkit_1.stripIndents) `Multiple potential targets found for ${options.project}. Found ${potentialTargets.length}.
|
|
53
|
+
devkit_1.logger.warn((0, devkit_1.stripIndents) `Multiple potential targets found for ${options.project}. Found ${potentialTargets.length}.
|
|
46
54
|
Using ${potentialTargets[0].target}.
|
|
47
55
|
To specify a different target use the --build-target flag.
|
|
48
56
|
`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"find-target-options.js","sourceRoot":"","sources":["../../../../../packages/cypress/src/utils/find-target-options.ts"],"names":[],"mappings":";;;;AAAA,yCAesB;AACtB,sEAA+F;AAiB/F,SAAsB,eAAe,CACnC,IAAU,EACV,OAA0B;;QAE1B,qCAAqC;
|
|
1
|
+
{"version":3,"file":"find-target-options.js","sourceRoot":"","sources":["../../../../../packages/cypress/src/utils/find-target-options.ts"],"names":[],"mappings":"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"}
|
package/src/utils/versions.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
export declare const nxVersion: any;
|
|
2
2
|
export declare const eslintPluginCypressVersion = "^2.10.3";
|
|
3
3
|
export declare const typesNodeVersion = "16.11.7";
|
|
4
|
-
export declare const cypressVersion = "^10.
|
|
4
|
+
export declare const cypressVersion = "^10.7.0";
|
|
5
5
|
export declare const cypressWebpackVersion = "^2.0.0";
|
|
6
6
|
export declare const webpackHttpPluginVersion = "^5.5.0";
|
package/src/utils/versions.js
CHANGED
|
@@ -4,7 +4,7 @@ exports.webpackHttpPluginVersion = exports.cypressWebpackVersion = exports.cypre
|
|
|
4
4
|
exports.nxVersion = require('../../package.json').version;
|
|
5
5
|
exports.eslintPluginCypressVersion = '^2.10.3';
|
|
6
6
|
exports.typesNodeVersion = '16.11.7';
|
|
7
|
-
exports.cypressVersion = '^10.
|
|
7
|
+
exports.cypressVersion = '^10.7.0';
|
|
8
8
|
exports.cypressWebpackVersion = '^2.0.0';
|
|
9
9
|
exports.webpackHttpPluginVersion = '^5.5.0';
|
|
10
10
|
//# sourceMappingURL=versions.js.map
|
|
@@ -1,16 +0,0 @@
|
|
|
1
|
-
{
|
|
2
|
-
"extends": "./tsconfig.json",
|
|
3
|
-
"compilerOptions": {
|
|
4
|
-
"outDir": "../../dist/out-tsc",
|
|
5
|
-
"module": "commonjs",
|
|
6
|
-
"types": ["cypress", "node"]
|
|
7
|
-
},
|
|
8
|
-
"include": [
|
|
9
|
-
"cypress.config.ts",
|
|
10
|
-
"**/*.cy.ts",
|
|
11
|
-
"**/*.cy.tsx",
|
|
12
|
-
"**/*.cy.js",
|
|
13
|
-
"**/*.cy.jsx",
|
|
14
|
-
"**/*.d.ts"
|
|
15
|
-
]
|
|
16
|
-
}
|