@nrwl/cypress 13.1.1 → 13.2.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/README.md +1 -1
- package/package.json +5 -5
- package/plugins/preprocessor.js +1 -1
- package/plugins/preprocessor.js.map +1 -1
- package/src/executors/cypress/compat.js +1 -1
- package/src/executors/cypress/compat.js.map +1 -1
- package/src/executors/cypress/cypress.impl.js +21 -21
- package/src/executors/cypress/cypress.impl.js.map +1 -1
- package/src/generators/convert-tslint-to-eslint/convert-tslint-to-eslint.js +7 -7
- package/src/generators/convert-tslint-to-eslint/convert-tslint-to-eslint.js.map +1 -1
- package/src/generators/cypress-project/cypress-project.js +27 -25
- package/src/generators/cypress-project/cypress-project.js.map +1 -1
- package/src/generators/init/init.js +3 -3
- package/src/generators/init/init.js.map +1 -1
- package/src/migrations/update-12-8-0/remove-typescript-plugin.js +11 -11
- package/src/migrations/update-12-8-0/remove-typescript-plugin.js.map +1 -1
- package/src/migrations/update-8-1-0/update-8-1-0.js +4 -4
- package/src/migrations/update-8-1-0/update-8-1-0.js.map +1 -1
- package/src/migrations/update-8-10-0/update-8-10-0.js +3 -3
- package/src/migrations/update-8-10-0/update-8-10-0.js.map +1 -1
- package/src/migrations/update-8-12-0/update-8-12-0.js +3 -3
- package/src/migrations/update-8-12-0/update-8-12-0.js.map +1 -1
- package/src/migrations/update-8-2-0/update-8-2-0.js +27 -27
- package/src/migrations/update-8-2-0/update-8-2-0.js.map +1 -1
- package/src/migrations/update-9-4-0/add-cypress-eslint-plugin-9-4-0.js +10 -10
- package/src/migrations/update-9-4-0/add-cypress-eslint-plugin-9-4-0.js.map +1 -1
- package/src/plugins/preprocessor.js +3 -3
- package/src/plugins/preprocessor.js.map +1 -1
- package/src/utils/project-name.js +1 -1
- package/src/utils/project-name.js.map +1 -1
- package/src/utils/testing.js +2 -2
- package/src/utils/testing.js.map +1 -1
- package/src/utils/versions.js +1 -1
package/README.md
CHANGED
|
@@ -116,6 +116,6 @@ Even though Nx isn't technology specific, we provide 3 separate flavours of the
|
|
|
116
116
|
|
|
117
117
|
# Engage with the Core Team and the Community
|
|
118
118
|
|
|
119
|
-
- [Nx
|
|
119
|
+
- [The Nx Show Playlist on YouTube](https://www.youtube.com/playlist?list=PLakNactNC1dE8KLQ5zd3fQwu_yQHjTmR5). It's a regular YouTube stream where we talk all things Nx. Join the stream, ask questions, etc.
|
|
120
120
|
- [Follow Nx on Twitter](https://twitter.com/NxDevTools)
|
|
121
121
|
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nrwl/cypress",
|
|
3
|
-
"version": "13.
|
|
3
|
+
"version": "13.2.0-beta.2",
|
|
4
4
|
"description": "Cypress plugin for Nx",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -33,9 +33,9 @@
|
|
|
33
33
|
"migrations": "./migrations.json"
|
|
34
34
|
},
|
|
35
35
|
"dependencies": {
|
|
36
|
-
"@nrwl/devkit": "13.
|
|
37
|
-
"@nrwl/linter": "13.
|
|
38
|
-
"@nrwl/workspace": "13.
|
|
36
|
+
"@nrwl/devkit": "13.2.0-beta.2",
|
|
37
|
+
"@nrwl/linter": "13.2.0-beta.2",
|
|
38
|
+
"@nrwl/workspace": "13.2.0-beta.2",
|
|
39
39
|
"@cypress/webpack-preprocessor": "^5.9.1",
|
|
40
40
|
"chalk": "4.1.0",
|
|
41
41
|
"enhanced-resolve": "^5.8.3",
|
|
@@ -45,7 +45,7 @@
|
|
|
45
45
|
"webpack-node-externals": "^3.0.0",
|
|
46
46
|
"fork-ts-checker-webpack-plugin": "6.2.10",
|
|
47
47
|
"rxjs": "^6.5.4",
|
|
48
|
-
"tslib": "^2.
|
|
48
|
+
"tslib": "^2.3.0",
|
|
49
49
|
"yargs-parser": "20.0.0"
|
|
50
50
|
},
|
|
51
51
|
"peerDependencies": {
|
package/plugins/preprocessor.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const tslib_1 = require("tslib");
|
|
4
|
-
tslib_1.__exportStar(require("../src/plugins/preprocessor"), exports);
|
|
4
|
+
(0, tslib_1.__exportStar)(require("../src/plugins/preprocessor"), exports);
|
|
5
5
|
//# sourceMappingURL=preprocessor.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"preprocessor.js","sourceRoot":"","sources":["../../../../packages/cypress/plugins/preprocessor.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"preprocessor.js","sourceRoot":"","sources":["../../../../packages/cypress/plugins/preprocessor.ts"],"names":[],"mappings":";;;AAAA,2EAA4C"}
|
|
@@ -2,5 +2,5 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const devkit_1 = require("@nrwl/devkit");
|
|
4
4
|
const cypress_impl_1 = require("./cypress.impl");
|
|
5
|
-
exports.default = devkit_1.convertNxExecutor(cypress_impl_1.default);
|
|
5
|
+
exports.default = (0, devkit_1.convertNxExecutor)(cypress_impl_1.default);
|
|
6
6
|
//# sourceMappingURL=compat.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compat.js","sourceRoot":"","sources":["../../../../../../packages/cypress/src/executors/cypress/compat.ts"],"names":[],"mappings":";;AAAA,yCAAiD;AAEjD,iDAA4D;AAE5D,kBAAe,0BAAiB,
|
|
1
|
+
{"version":3,"file":"compat.js","sourceRoot":"","sources":["../../../../../../packages/cypress/src/executors/cypress/compat.ts"],"names":[],"mappings":";;AAAA,yCAAiD;AAEjD,iDAA4D;AAE5D,kBAAe,IAAA,0BAAiB,EAAC,sBAAe,CAAC,CAAC"}
|
|
@@ -8,11 +8,11 @@ const devkit_1 = require("@nrwl/devkit");
|
|
|
8
8
|
const Cypress = require('cypress'); // @NOTE: Importing via ES6 messes the whole test dependencies.
|
|
9
9
|
function cypressExecutor(options, context) {
|
|
10
10
|
var e_1, _a;
|
|
11
|
-
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
11
|
+
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
12
12
|
options = normalizeOptions(options, context);
|
|
13
13
|
let success;
|
|
14
14
|
try {
|
|
15
|
-
for (var _b = tslib_1.__asyncValues(startDevServer(options, context)), _c; _c = yield _b.next(), !_c.done;) {
|
|
15
|
+
for (var _b = (0, tslib_1.__asyncValues)(startDevServer(options, context)), _c; _c = yield _b.next(), !_c.done;) {
|
|
16
16
|
const baseUrl = _c.value;
|
|
17
17
|
try {
|
|
18
18
|
success = yield runCypress(baseUrl, options);
|
|
@@ -41,7 +41,7 @@ exports.default = cypressExecutor;
|
|
|
41
41
|
function normalizeOptions(options, context) {
|
|
42
42
|
options.env = options.env || {};
|
|
43
43
|
if (options.tsConfig) {
|
|
44
|
-
const tsConfigPath = path_1.join(context.root, options.tsConfig);
|
|
44
|
+
const tsConfigPath = (0, path_1.join)(context.root, options.tsConfig);
|
|
45
45
|
options.env.tsConfig = tsConfigPath;
|
|
46
46
|
process.env.TS_NODE_PROJECT = tsConfigPath;
|
|
47
47
|
}
|
|
@@ -54,8 +54,8 @@ function checkSupportedBrowser({ browser }) {
|
|
|
54
54
|
if (!browser) {
|
|
55
55
|
return;
|
|
56
56
|
}
|
|
57
|
-
if (cypress_version_1.installedCypressVersion() >= 4 && browser == 'canary') {
|
|
58
|
-
devkit_1.logger.warn(devkit_1.stripIndents `
|
|
57
|
+
if ((0, cypress_version_1.installedCypressVersion)() >= 4 && browser == 'canary') {
|
|
58
|
+
devkit_1.logger.warn((0, devkit_1.stripIndents) `
|
|
59
59
|
Warning:
|
|
60
60
|
You are using a browser that is not supported by cypress v4+.
|
|
61
61
|
|
|
@@ -65,9 +65,9 @@ function checkSupportedBrowser({ browser }) {
|
|
|
65
65
|
return;
|
|
66
66
|
}
|
|
67
67
|
const supportedV3Browsers = ['electron', 'chrome', 'canary', 'chromium'];
|
|
68
|
-
if (cypress_version_1.installedCypressVersion() <= 3 &&
|
|
68
|
+
if ((0, cypress_version_1.installedCypressVersion)() <= 3 &&
|
|
69
69
|
!supportedV3Browsers.includes(browser)) {
|
|
70
|
-
devkit_1.logger.warn(devkit_1.stripIndents `
|
|
70
|
+
devkit_1.logger.warn((0, devkit_1.stripIndents) `
|
|
71
71
|
Warning:
|
|
72
72
|
You are using a browser that is not supported by cypress v3.
|
|
73
73
|
`);
|
|
@@ -75,43 +75,43 @@ function checkSupportedBrowser({ browser }) {
|
|
|
75
75
|
}
|
|
76
76
|
}
|
|
77
77
|
function warnDeprecatedHeadless({ headless }) {
|
|
78
|
-
if (cypress_version_1.installedCypressVersion() < 8 || headless === undefined) {
|
|
78
|
+
if ((0, cypress_version_1.installedCypressVersion)() < 8 || headless === undefined) {
|
|
79
79
|
return;
|
|
80
80
|
}
|
|
81
81
|
if (headless) {
|
|
82
|
-
const deprecatedMsg = devkit_1.stripIndents `
|
|
82
|
+
const deprecatedMsg = (0, devkit_1.stripIndents) `
|
|
83
83
|
NOTE:
|
|
84
84
|
You can now remove the use of the '--headless' flag during 'cypress run' as this is the default for all browsers.`;
|
|
85
85
|
devkit_1.logger.warn(deprecatedMsg);
|
|
86
86
|
}
|
|
87
87
|
}
|
|
88
88
|
function startDevServer(opts, context) {
|
|
89
|
-
return tslib_1.__asyncGenerator(this, arguments, function* startDevServer_1() {
|
|
89
|
+
return (0, tslib_1.__asyncGenerator)(this, arguments, function* startDevServer_1() {
|
|
90
90
|
var e_2, _a;
|
|
91
91
|
// no dev server, return the provisioned base url
|
|
92
92
|
if (!opts.devServerTarget || opts.skipServe) {
|
|
93
|
-
yield yield tslib_1.__await(opts.baseUrl);
|
|
94
|
-
return yield tslib_1.__await(void 0);
|
|
93
|
+
yield yield (0, tslib_1.__await)(opts.baseUrl);
|
|
94
|
+
return yield (0, tslib_1.__await)(void 0);
|
|
95
95
|
}
|
|
96
|
-
const { project, target, configuration } = devkit_1.parseTargetString(opts.devServerTarget);
|
|
97
|
-
const devServerTargetOpts = devkit_1.readTargetOptions({ project, target, configuration }, context);
|
|
96
|
+
const { project, target, configuration } = (0, devkit_1.parseTargetString)(opts.devServerTarget);
|
|
97
|
+
const devServerTargetOpts = (0, devkit_1.readTargetOptions)({ project, target, configuration }, context);
|
|
98
98
|
const targetSupportsWatchOpt = Object.keys(devServerTargetOpts).includes('watch');
|
|
99
99
|
try {
|
|
100
|
-
for (var _b = tslib_1.__asyncValues(yield tslib_1.__await(devkit_1.runExecutor({ project, target, configuration },
|
|
100
|
+
for (var _b = (0, tslib_1.__asyncValues)(yield (0, tslib_1.__await)((0, devkit_1.runExecutor)({ project, target, configuration },
|
|
101
101
|
// @NOTE: Do not forward watch option if not supported by the target dev server,
|
|
102
102
|
// this is relevant for running Cypress against dev server target that does not support this option,
|
|
103
103
|
// for instance @nguniversal/builders:ssr-dev-server.
|
|
104
|
-
targetSupportsWatchOpt ? { watch: opts.watch } : {}, context))), _c; _c = yield tslib_1.__await(_b.next()), !_c.done;) {
|
|
104
|
+
targetSupportsWatchOpt ? { watch: opts.watch } : {}, context))), _c; _c = yield (0, tslib_1.__await)(_b.next()), !_c.done;) {
|
|
105
105
|
const output = _c.value;
|
|
106
106
|
if (!output.success && !opts.watch)
|
|
107
107
|
throw new Error('Could not compile application files');
|
|
108
|
-
yield yield tslib_1.__await(opts.baseUrl || output.baseUrl);
|
|
108
|
+
yield yield (0, tslib_1.__await)(opts.baseUrl || output.baseUrl);
|
|
109
109
|
}
|
|
110
110
|
}
|
|
111
111
|
catch (e_2_1) { e_2 = { error: e_2_1 }; }
|
|
112
112
|
finally {
|
|
113
113
|
try {
|
|
114
|
-
if (_c && !_c.done && (_a = _b.return)) yield tslib_1.__await(_a.call(_b));
|
|
114
|
+
if (_c && !_c.done && (_a = _b.return)) yield (0, tslib_1.__await)(_a.call(_b));
|
|
115
115
|
}
|
|
116
116
|
finally { if (e_2) throw e_2.error; }
|
|
117
117
|
}
|
|
@@ -123,12 +123,12 @@ function startDevServer(opts, context) {
|
|
|
123
123
|
* If `watch` is `true`: Open Cypress in the interactive GUI to interact directly with the application.
|
|
124
124
|
*/
|
|
125
125
|
function runCypress(baseUrl, opts) {
|
|
126
|
-
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
126
|
+
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
127
127
|
// Cypress expects the folder where a `cypress.json` is present
|
|
128
|
-
const projectFolderPath = path_1.dirname(opts.cypressConfig);
|
|
128
|
+
const projectFolderPath = (0, path_1.dirname)(opts.cypressConfig);
|
|
129
129
|
const options = {
|
|
130
130
|
project: projectFolderPath,
|
|
131
|
-
configFile: path_1.basename(opts.cypressConfig),
|
|
131
|
+
configFile: (0, path_1.basename)(opts.cypressConfig),
|
|
132
132
|
};
|
|
133
133
|
// If not, will use the `baseUrl` normally from `cypress.json`
|
|
134
134
|
if (baseUrl) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cypress.impl.js","sourceRoot":"","sources":["../../../../../../packages/cypress/src/executors/cypress/cypress.impl.ts"],"names":[],"mappings":";;;AAAA,yBAAuB;AACvB,+BAA+C;AAC/C,iEAAsE;AACtE,yCAOsB;AAEtB,MAAM,OAAO,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,+DAA+D;AA6BnG,SAA8B,eAAe,CAC3C,OAA+B,EAC/B,OAAwB;;;QAExB,OAAO,GAAG,gBAAgB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QAE7C,IAAI,OAAO,CAAC;;YACZ,KAA4B,IAAA,KAAA,
|
|
1
|
+
{"version":3,"file":"cypress.impl.js","sourceRoot":"","sources":["../../../../../../packages/cypress/src/executors/cypress/cypress.impl.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,7 +6,7 @@ const devkit_1 = require("@nrwl/devkit");
|
|
|
6
6
|
const linter_1 = require("@nrwl/linter");
|
|
7
7
|
const cypress_project_1 = require("../cypress-project/cypress-project");
|
|
8
8
|
function conversionGenerator(host, options) {
|
|
9
|
-
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
9
|
+
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
10
10
|
/**
|
|
11
11
|
* The ProjectConverter instance encapsulates all the standard operations we need
|
|
12
12
|
* to perform in order to convert a project from TSLint to ESLint, as well as some
|
|
@@ -21,8 +21,8 @@ function conversionGenerator(host, options) {
|
|
|
21
21
|
host,
|
|
22
22
|
projectName: options.project,
|
|
23
23
|
ignoreExistingTslintConfig: options.ignoreExistingTslintConfig,
|
|
24
|
-
eslintInitializer: ({ projectName, projectConfig }) => tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
25
|
-
yield cypress_project_1.addLinter(host, {
|
|
24
|
+
eslintInitializer: ({ projectName, projectConfig }) => (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
25
|
+
yield (0, cypress_project_1.addLinter)(host, {
|
|
26
26
|
linter: 'eslint',
|
|
27
27
|
projectName,
|
|
28
28
|
projectRoot: projectConfig.root,
|
|
@@ -60,7 +60,7 @@ function conversionGenerator(host, options) {
|
|
|
60
60
|
*/
|
|
61
61
|
projectConverter.removeProjectTSLintFile();
|
|
62
62
|
// Only project shouldn't be added as a default
|
|
63
|
-
const { project } = options, defaults = tslib_1.__rest(options, ["project"]);
|
|
63
|
+
const { project } = options, defaults = (0, tslib_1.__rest)(options, ["project"]);
|
|
64
64
|
/**
|
|
65
65
|
* Store user preferences for the collection
|
|
66
66
|
*/
|
|
@@ -74,9 +74,9 @@ function conversionGenerator(host, options) {
|
|
|
74
74
|
uninstallTSLintTask = projectConverter.removeTSLintFromWorkspace();
|
|
75
75
|
}
|
|
76
76
|
if (!options.skipFormat) {
|
|
77
|
-
yield devkit_1.formatFiles(host);
|
|
77
|
+
yield (0, devkit_1.formatFiles)(host);
|
|
78
78
|
}
|
|
79
|
-
return () => tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
79
|
+
return () => (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
80
80
|
yield eslintInitInstallTask();
|
|
81
81
|
yield rootConfigInstallTask();
|
|
82
82
|
yield projectConfigInstallTask();
|
|
@@ -85,7 +85,7 @@ function conversionGenerator(host, options) {
|
|
|
85
85
|
});
|
|
86
86
|
}
|
|
87
87
|
exports.conversionGenerator = conversionGenerator;
|
|
88
|
-
exports.conversionSchematic = devkit_1.convertNxGenerator(conversionGenerator);
|
|
88
|
+
exports.conversionSchematic = (0, devkit_1.convertNxGenerator)(conversionGenerator);
|
|
89
89
|
/**
|
|
90
90
|
* Remove any @angular-eslint rules that were applied as a result of converting prior codelyzer
|
|
91
91
|
* rules, because they are only relevant for Angular projects.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"convert-tslint-to-eslint.js","sourceRoot":"","sources":["../../../../../../packages/cypress/src/generators/convert-tslint-to-eslint/convert-tslint-to-eslint.ts"],"names":[],"mappings":";;;;AAAA,yCAKsB;AACtB,yCAA6E;AAE7E,wEAG4C;AAE5C,SAAsB,mBAAmB,CACvC,IAAU,EACV,OAAoC;;QAEpC;;;;;;;;;WASG;QACH,MAAM,gBAAgB,GAAG,IAAI,yBAAgB,CAAC;YAC5C,IAAI;YACJ,WAAW,EAAE,OAAO,CAAC,OAAO;YAC5B,0BAA0B,EAAE,OAAO,CAAC,0BAA0B;YAC9D,iBAAiB,EAAE,CAAO,EAAE,WAAW,EAAE,aAAa,EAAE,EAAE,EAAE;gBAC1D,MAAM,2BAAS,
|
|
1
|
+
{"version":3,"file":"convert-tslint-to-eslint.js","sourceRoot":"","sources":["../../../../../../packages/cypress/src/generators/convert-tslint-to-eslint/convert-tslint-to-eslint.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,25 +10,26 @@ const versions_1 = require("../../utils/versions");
|
|
|
10
10
|
const project_name_1 = require("../../utils/project-name");
|
|
11
11
|
const cypress_version_1 = require("../../utils/cypress-version");
|
|
12
12
|
function createFiles(tree, options) {
|
|
13
|
-
devkit_1.generateFiles(tree, path_1.join(__dirname, './files'), options.projectRoot, Object.assign(Object.assign({ tmpl: '' }, options), { project: options.project || 'Project', ext: options.js ? 'js' : 'ts', offsetFromRoot: devkit_1.offsetFromRoot(options.projectRoot) }));
|
|
14
|
-
const cypressVersion = cypress_version_1.installedCypressVersion();
|
|
13
|
+
(0, devkit_1.generateFiles)(tree, (0, path_1.join)(__dirname, './files'), options.projectRoot, Object.assign(Object.assign({ tmpl: '' }, options), { project: options.project || 'Project', ext: options.js ? 'js' : 'ts', offsetFromRoot: (0, devkit_1.offsetFromRoot)(options.projectRoot) }));
|
|
14
|
+
const cypressVersion = (0, cypress_version_1.installedCypressVersion)();
|
|
15
15
|
if (!cypressVersion || cypressVersion >= 7) {
|
|
16
|
-
tree.delete(path_1.join(options.projectRoot, 'src/plugins/index.js'));
|
|
16
|
+
tree.delete((0, path_1.join)(options.projectRoot, 'src/plugins/index.js'));
|
|
17
17
|
}
|
|
18
18
|
else {
|
|
19
|
-
devkit_1.updateJson(tree, path_1.join(options.projectRoot, 'cypress.json'), (json) => {
|
|
19
|
+
(0, devkit_1.updateJson)(tree, (0, path_1.join)(options.projectRoot, 'cypress.json'), (json) => {
|
|
20
20
|
json.pluginsFile = './src/plugins/index';
|
|
21
21
|
return json;
|
|
22
22
|
});
|
|
23
23
|
}
|
|
24
24
|
if (options.js) {
|
|
25
|
-
devkit_1.toJS(tree);
|
|
25
|
+
(0, devkit_1.toJS)(tree);
|
|
26
26
|
}
|
|
27
27
|
}
|
|
28
28
|
function addProject(tree, options) {
|
|
29
|
+
var _a;
|
|
29
30
|
let devServerTarget = `${options.project}:serve`;
|
|
30
31
|
if (options.project) {
|
|
31
|
-
const project = devkit_1.readProjectConfiguration(tree, options.project);
|
|
32
|
+
const project = (0, devkit_1.readProjectConfiguration)(tree, options.project);
|
|
32
33
|
devServerTarget =
|
|
33
34
|
project.targets.serve && project.targets.serve.defaultConfiguration
|
|
34
35
|
? `${options.project}:serve:${project.targets.serve.defaultConfiguration}`
|
|
@@ -36,13 +37,13 @@ function addProject(tree, options) {
|
|
|
36
37
|
}
|
|
37
38
|
const project = {
|
|
38
39
|
root: options.projectRoot,
|
|
39
|
-
sourceRoot: devkit_1.joinPathFragments(options.projectRoot, 'src'),
|
|
40
|
+
sourceRoot: (0, devkit_1.joinPathFragments)(options.projectRoot, 'src'),
|
|
40
41
|
projectType: 'application',
|
|
41
42
|
targets: {
|
|
42
43
|
e2e: {
|
|
43
44
|
executor: '@nrwl/cypress:cypress',
|
|
44
45
|
options: {
|
|
45
|
-
cypressConfig: devkit_1.joinPathFragments(options.projectRoot, 'cypress.json'),
|
|
46
|
+
cypressConfig: (0, devkit_1.joinPathFragments)(options.projectRoot, 'cypress.json'),
|
|
46
47
|
devServerTarget,
|
|
47
48
|
},
|
|
48
49
|
configurations: {
|
|
@@ -55,21 +56,22 @@ function addProject(tree, options) {
|
|
|
55
56
|
tags: [],
|
|
56
57
|
implicitDependencies: options.project ? [options.project] : undefined,
|
|
57
58
|
};
|
|
58
|
-
|
|
59
|
-
|
|
59
|
+
const detectedCypressVersion = (_a = (0, cypress_version_1.installedCypressVersion)()) !== null && _a !== void 0 ? _a : versions_1.cypressVersion;
|
|
60
|
+
if (detectedCypressVersion < 7) {
|
|
61
|
+
project.targets.e2e.options.tsConfig = (0, devkit_1.joinPathFragments)(options.projectRoot, 'tsconfig.json');
|
|
60
62
|
}
|
|
61
|
-
devkit_1.addProjectConfiguration(tree, options.projectName, project, options.standaloneConfig);
|
|
63
|
+
(0, devkit_1.addProjectConfiguration)(tree, options.projectName, project, options.standaloneConfig);
|
|
62
64
|
}
|
|
63
65
|
function addLinter(host, options) {
|
|
64
|
-
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
66
|
+
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
65
67
|
if (options.linter === linter_1.Linter.None) {
|
|
66
68
|
return () => { };
|
|
67
69
|
}
|
|
68
|
-
const installTask = yield linter_1.lintProjectGenerator(host, {
|
|
70
|
+
const installTask = yield (0, linter_1.lintProjectGenerator)(host, {
|
|
69
71
|
project: options.projectName,
|
|
70
72
|
linter: options.linter,
|
|
71
73
|
skipFormat: true,
|
|
72
|
-
tsConfigPaths: [devkit_1.joinPathFragments(options.projectRoot, 'tsconfig.json')],
|
|
74
|
+
tsConfigPaths: [(0, devkit_1.joinPathFragments)(options.projectRoot, 'tsconfig.json')],
|
|
73
75
|
eslintFilePatterns: [
|
|
74
76
|
`${options.projectRoot}/**/*.${options.js ? 'js' : '{js,ts}'}`,
|
|
75
77
|
],
|
|
@@ -78,8 +80,8 @@ function addLinter(host, options) {
|
|
|
78
80
|
if (!options.linter || options.linter !== linter_1.Linter.EsLint) {
|
|
79
81
|
return installTask;
|
|
80
82
|
}
|
|
81
|
-
const installTask2 = devkit_1.addDependenciesToPackageJson(host, {}, { 'eslint-plugin-cypress': versions_1.eslintPluginCypressVersion });
|
|
82
|
-
devkit_1.updateJson(host, path_1.join(options.projectRoot, '.eslintrc.json'), (json) => {
|
|
83
|
+
const installTask2 = (0, devkit_1.addDependenciesToPackageJson)(host, {}, { 'eslint-plugin-cypress': versions_1.eslintPluginCypressVersion });
|
|
84
|
+
(0, devkit_1.updateJson)(host, (0, path_1.join)(options.projectRoot, '.eslintrc.json'), (json) => {
|
|
83
85
|
json.extends = ['plugin:cypress/recommended', ...json.extends];
|
|
84
86
|
json.overrides = [
|
|
85
87
|
/**
|
|
@@ -114,7 +116,7 @@ function addLinter(host, options) {
|
|
|
114
116
|
rules: {},
|
|
115
117
|
},
|
|
116
118
|
];
|
|
117
|
-
if (cypress_version_1.installedCypressVersion() < 7) {
|
|
119
|
+
if ((0, cypress_version_1.installedCypressVersion)() < 7) {
|
|
118
120
|
/**
|
|
119
121
|
* We need this override because we enabled allowJS in the tsconfig to allow for JS based Cypress tests.
|
|
120
122
|
* That however leads to issues with the CommonJS Cypress plugin file.
|
|
@@ -129,33 +131,33 @@ function addLinter(host, options) {
|
|
|
129
131
|
}
|
|
130
132
|
return json;
|
|
131
133
|
});
|
|
132
|
-
return run_tasks_in_serial_1.runTasksInSerial(installTask, installTask2);
|
|
134
|
+
return (0, run_tasks_in_serial_1.runTasksInSerial)(installTask, installTask2);
|
|
133
135
|
});
|
|
134
136
|
}
|
|
135
137
|
exports.addLinter = addLinter;
|
|
136
138
|
function cypressProjectGenerator(host, schema) {
|
|
137
|
-
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
139
|
+
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
138
140
|
const options = normalizeOptions(host, schema);
|
|
139
141
|
createFiles(host, options);
|
|
140
142
|
addProject(host, options);
|
|
141
143
|
const installTask = yield addLinter(host, options);
|
|
142
144
|
if (!options.skipFormat) {
|
|
143
|
-
yield devkit_1.formatFiles(host);
|
|
145
|
+
yield (0, devkit_1.formatFiles)(host);
|
|
144
146
|
}
|
|
145
147
|
return installTask;
|
|
146
148
|
});
|
|
147
149
|
}
|
|
148
150
|
exports.cypressProjectGenerator = cypressProjectGenerator;
|
|
149
151
|
function normalizeOptions(host, options) {
|
|
150
|
-
const { appsDir } = devkit_1.getWorkspaceLayout(host);
|
|
151
|
-
const projectName = project_name_1.filePathPrefix(options.directory ? `${options.directory}-${options.name}` : options.name);
|
|
152
|
+
const { appsDir } = (0, devkit_1.getWorkspaceLayout)(host);
|
|
153
|
+
const projectName = (0, project_name_1.filePathPrefix)(options.directory ? `${options.directory}-${options.name}` : options.name);
|
|
152
154
|
const projectRoot = options.directory
|
|
153
|
-
? devkit_1.joinPathFragments(appsDir, devkit_1.names(options.directory).fileName, options.name)
|
|
154
|
-
: devkit_1.joinPathFragments(appsDir, options.name);
|
|
155
|
+
? (0, devkit_1.joinPathFragments)(appsDir, (0, devkit_1.names)(options.directory).fileName, options.name)
|
|
156
|
+
: (0, devkit_1.joinPathFragments)(appsDir, options.name);
|
|
155
157
|
options.linter = options.linter || linter_1.Linter.EsLint;
|
|
156
158
|
return Object.assign(Object.assign({}, options), { projectName,
|
|
157
159
|
projectRoot });
|
|
158
160
|
}
|
|
159
161
|
exports.default = cypressProjectGenerator;
|
|
160
|
-
exports.cypressProjectSchematic = devkit_1.convertNxGenerator(cypressProjectGenerator);
|
|
162
|
+
exports.cypressProjectSchematic = (0, devkit_1.convertNxGenerator)(cypressProjectGenerator);
|
|
161
163
|
//# sourceMappingURL=cypress-project.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cypress-project.js","sourceRoot":"","sources":["../../../../../../packages/cypress/src/generators/cypress-project/cypress-project.ts"],"names":[],"mappings":";;;;AAAA,yCAesB;AACtB,yCAA4D;AAC5D,2FAAqF;AAErF,+BAA4B;AAG5B,
|
|
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,12 +4,12 @@ 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
|
-
devkit_1.updateJson(host, 'package.json', (json) => {
|
|
7
|
+
(0, devkit_1.updateJson)(host, 'package.json', (json) => {
|
|
8
8
|
json.dependencies = json.dependencies || {};
|
|
9
9
|
delete json.dependencies['@nrwl/cypress'];
|
|
10
10
|
return json;
|
|
11
11
|
});
|
|
12
|
-
return devkit_1.addDependenciesToPackageJson(host, {}, {
|
|
12
|
+
return (0, devkit_1.addDependenciesToPackageJson)(host, {}, {
|
|
13
13
|
['@nrwl/cypress']: versions_1.nxVersion,
|
|
14
14
|
cypress: versions_1.cypressVersion,
|
|
15
15
|
});
|
|
@@ -19,5 +19,5 @@ function cypressInitGenerator(host) {
|
|
|
19
19
|
}
|
|
20
20
|
exports.cypressInitGenerator = cypressInitGenerator;
|
|
21
21
|
exports.default = cypressInitGenerator;
|
|
22
|
-
exports.cypressInitSchematic = devkit_1.convertNxGenerator(cypressInitGenerator);
|
|
22
|
+
exports.cypressInitSchematic = (0, devkit_1.convertNxGenerator)(cypressInitGenerator);
|
|
23
23
|
//# sourceMappingURL=init.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../../../packages/cypress/src/generators/init/init.ts"],"names":[],"mappings":";;;AAAA,yCAKsB;AAEtB,mDAAiE;AAEjE,SAAS,kBAAkB,CAAC,IAAU;IACpC,mBAAU,
|
|
1
|
+
{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../../../packages/cypress/src/generators/init/init.ts"],"names":[],"mappings":";;;AAAA,yCAKsB;AAEtB,mDAAiE;AAEjE,SAAS,kBAAkB,CAAC,IAAU;IACpC,IAAA,mBAAU,EAAC,IAAI,EAAE,cAAc,EAAE,CAAC,IAAI,EAAE,EAAE;QACxC,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,YAAY,IAAI,EAAE,CAAC;QAC5C,OAAO,IAAI,CAAC,YAAY,CAAC,eAAe,CAAC,CAAC;QAE1C,OAAO,IAAI,CAAC;IACd,CAAC,CAAC,CAAC;IACH,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;IAC7C,OAAO,kBAAkB,CAAC,IAAI,CAAC,CAAC;AAClC,CAAC;AAFD,oDAEC;AAED,kBAAe,oBAAoB,CAAC;AACvB,QAAA,oBAAoB,GAAG,IAAA,2BAAkB,EAAC,oBAAoB,CAAC,CAAC"}
|
|
@@ -6,13 +6,13 @@ const typescript_1 = require("typescript");
|
|
|
6
6
|
const path_1 = require("path");
|
|
7
7
|
const cypress_version_1 = require("../../utils/cypress-version");
|
|
8
8
|
function removeTypescriptPlugin(tree) {
|
|
9
|
-
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
10
|
-
const cypressVersion = cypress_version_1.installedCypressVersion();
|
|
9
|
+
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
10
|
+
const cypressVersion = (0, cypress_version_1.installedCypressVersion)();
|
|
11
11
|
if (cypressVersion < 7) {
|
|
12
12
|
console.warn(`Cypress v${cypressVersion} is installed. This migration was skipped. Please rerun this migration after updating to Cypress 7.`);
|
|
13
13
|
return;
|
|
14
14
|
}
|
|
15
|
-
for (const [_, proj] of devkit_1.getProjects(tree)) {
|
|
15
|
+
for (const [_, proj] of (0, devkit_1.getProjects)(tree)) {
|
|
16
16
|
const cypressTargets = getCypressTargets(proj);
|
|
17
17
|
if (cypressTargets.length <= 0) {
|
|
18
18
|
continue;
|
|
@@ -20,9 +20,9 @@ function removeTypescriptPlugin(tree) {
|
|
|
20
20
|
for (const target of cypressTargets) {
|
|
21
21
|
const cypressConfigs = getCypressConfigs(target);
|
|
22
22
|
for (const config of cypressConfigs) {
|
|
23
|
-
const cypressConfig = devkit_1.readJson(tree, config);
|
|
23
|
+
const cypressConfig = (0, devkit_1.readJson)(tree, config);
|
|
24
24
|
if (cypressConfig.pluginsFile) {
|
|
25
|
-
let pluginPath = path_1.join(path_1.dirname(config), cypressConfig.pluginsFile);
|
|
25
|
+
let pluginPath = (0, path_1.join)((0, path_1.dirname)(config), cypressConfig.pluginsFile);
|
|
26
26
|
if (!tree.exists(pluginPath)) {
|
|
27
27
|
pluginPath = ['.js', '.ts']
|
|
28
28
|
.map((ext) => pluginPath + ext)
|
|
@@ -33,23 +33,23 @@ function removeTypescriptPlugin(tree) {
|
|
|
33
33
|
}
|
|
34
34
|
}
|
|
35
35
|
}
|
|
36
|
-
yield devkit_1.formatFiles(tree);
|
|
36
|
+
yield (0, devkit_1.formatFiles)(tree);
|
|
37
37
|
});
|
|
38
38
|
}
|
|
39
39
|
exports.default = removeTypescriptPlugin;
|
|
40
40
|
function removePreprocessor(tree, pluginPath) {
|
|
41
41
|
const pluginContents = tree.read(pluginPath, 'utf-8');
|
|
42
|
-
const sourceFile = typescript_1.createSourceFile(pluginPath, pluginContents, typescript_1.ScriptTarget.ESNext, true);
|
|
42
|
+
const sourceFile = (0, typescript_1.createSourceFile)(pluginPath, pluginContents, typescript_1.ScriptTarget.ESNext, true);
|
|
43
43
|
const deletions = [];
|
|
44
44
|
const callback = (node) => {
|
|
45
45
|
// Look for the invocation of preprocessTypescript
|
|
46
|
-
if (typescript_1.isCallExpression(node) &&
|
|
47
|
-
typescript_1.isIdentifier(node.expression) &&
|
|
46
|
+
if ((0, typescript_1.isCallExpression)(node) &&
|
|
47
|
+
(0, typescript_1.isIdentifier)(node.expression) &&
|
|
48
48
|
node.expression.getText(sourceFile) === 'preprocessTypescript' &&
|
|
49
49
|
node.arguments.length < 2) {
|
|
50
50
|
// Get the Statement that the function call belongs to
|
|
51
51
|
let n = node.parent;
|
|
52
|
-
while (!typescript_1.isExpressionStatement(n) && n === sourceFile) {
|
|
52
|
+
while (!(0, typescript_1.isExpressionStatement)(n) && n === sourceFile) {
|
|
53
53
|
n = n.parent;
|
|
54
54
|
}
|
|
55
55
|
deletions.push({
|
|
@@ -67,7 +67,7 @@ function removePreprocessor(tree, pluginPath) {
|
|
|
67
67
|
node.forEachChild((child) => recurse(child));
|
|
68
68
|
}
|
|
69
69
|
// Remove the preprocessor from the file
|
|
70
|
-
tree.write(pluginPath, devkit_1.applyChangesToString(pluginContents, deletions));
|
|
70
|
+
tree.write(pluginPath, (0, devkit_1.applyChangesToString)(pluginContents, deletions));
|
|
71
71
|
}
|
|
72
72
|
function getCypressConfigs(target) {
|
|
73
73
|
if (!target.configurations && !target.options.cypressConfig) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"remove-typescript-plugin.js","sourceRoot":"","sources":["../../../../../../packages/cypress/src/migrations/update-12-8-0/remove-typescript-plugin.ts"],"names":[],"mappings":";;;AAAA,yCAUsB;AACtB,2CAOoB;AACpB,+BAAqC;AACrC,iEAAsE;AAEtE,SAA8B,sBAAsB,CAAC,IAAU;;QAC7D,MAAM,cAAc,GAAG,yCAAuB,
|
|
1
|
+
{"version":3,"file":"remove-typescript-plugin.js","sourceRoot":"","sources":["../../../../../../packages/cypress/src/migrations/update-12-8-0/remove-typescript-plugin.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,20 +4,20 @@ const schematics_1 = require("@angular-devkit/schematics");
|
|
|
4
4
|
const workspace_1 = require("@nrwl/workspace");
|
|
5
5
|
const literals_1 = require("@angular-devkit/core/src/utils/literals");
|
|
6
6
|
function displayInformation(host, context) {
|
|
7
|
-
context.logger.info(literals_1.stripIndents `Cypress has been updated to a version that improves network speed by 300%!
|
|
7
|
+
context.logger.info((0, literals_1.stripIndents) `Cypress has been updated to a version that improves network speed by 300%!
|
|
8
8
|
|
|
9
9
|
Additionally, this resolves an issue where '@types/jquery' needed to be temporarily included in your 'package.json'.
|
|
10
10
|
If you're not using '@types/jquery' in your project otherwise, you may now remove it from your 'devDependencies'.`);
|
|
11
11
|
}
|
|
12
12
|
function default_1() {
|
|
13
|
-
return schematics_1.chain([
|
|
14
|
-
workspace_1.updateJsonInTree('package.json', (json) => {
|
|
13
|
+
return (0, schematics_1.chain)([
|
|
14
|
+
(0, workspace_1.updateJsonInTree)('package.json', (json) => {
|
|
15
15
|
json.devDependencies = json.devDependencies || {};
|
|
16
16
|
json.devDependencies = Object.assign(Object.assign({}, json.devDependencies), { cypress: '~3.3.1' });
|
|
17
17
|
return json;
|
|
18
18
|
}),
|
|
19
19
|
displayInformation,
|
|
20
|
-
workspace_1.formatFiles(),
|
|
20
|
+
(0, workspace_1.formatFiles)(),
|
|
21
21
|
]);
|
|
22
22
|
}
|
|
23
23
|
exports.default = default_1;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-8-1-0.js","sourceRoot":"","sources":["../../../../../../packages/cypress/src/migrations/update-8-1-0/update-8-1-0.ts"],"names":[],"mappings":";;AAAA,2DAKoC;AACpC,+CAAgE;AAChE,sEAAuE;AAEvE,SAAS,kBAAkB,CAAC,IAAU,EAAE,OAAyB;IAC/D,OAAO,CAAC,MAAM,CAAC,IAAI,CACjB,uBAAY,
|
|
1
|
+
{"version":3,"file":"update-8-1-0.js","sourceRoot":"","sources":["../../../../../../packages/cypress/src/migrations/update-8-1-0/update-8-1-0.ts"],"names":[],"mappings":";;AAAA,2DAKoC;AACpC,+CAAgE;AAChE,sEAAuE;AAEvE,SAAS,kBAAkB,CAAC,IAAU,EAAE,OAAyB;IAC/D,OAAO,CAAC,MAAM,CAAC,IAAI,CACjB,IAAA,uBAAY,EAAA;;;wHAGwG,CACrH,CAAC;AACJ,CAAC;AAED;IACE,OAAO,IAAA,kBAAK,EAAC;QACX,IAAA,4BAAgB,EAAC,cAAc,EAAE,CAAC,IAAI,EAAE,EAAE;YACxC,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC,eAAe,IAAI,EAAE,CAAC;YAElD,IAAI,CAAC,eAAe,mCACf,IAAI,CAAC,eAAe,KACvB,OAAO,EAAE,QAAQ,GAClB,CAAC;YAEF,OAAO,IAAI,CAAC;QACd,CAAC,CAAC;QACF,kBAAkB;QAClB,IAAA,uBAAW,GAAE;KACd,CAAC,CAAC;AACL,CAAC;AAfD,4BAeC"}
|
|
@@ -4,9 +4,9 @@ const workspace_1 = require("@nrwl/workspace");
|
|
|
4
4
|
const path_1 = require("path");
|
|
5
5
|
const schematics_1 = require("@angular-devkit/schematics");
|
|
6
6
|
exports.default = () => {
|
|
7
|
-
return schematics_1.chain([
|
|
8
|
-
workspace_1.updatePackagesInPackageJson(path_1.join(__dirname, '../../../migrations.json'), '8.10.0'),
|
|
9
|
-
workspace_1.formatFiles(),
|
|
7
|
+
return (0, schematics_1.chain)([
|
|
8
|
+
(0, workspace_1.updatePackagesInPackageJson)((0, path_1.join)(__dirname, '../../../migrations.json'), '8.10.0'),
|
|
9
|
+
(0, workspace_1.formatFiles)(),
|
|
10
10
|
]);
|
|
11
11
|
};
|
|
12
12
|
//# sourceMappingURL=update-8-10-0.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-8-10-0.js","sourceRoot":"","sources":["../../../../../../packages/cypress/src/migrations/update-8-10-0/update-8-10-0.ts"],"names":[],"mappings":";;AAAA,+CAA2E;AAE3E,+BAA4B;AAC5B,2DAAmD;AAEnD,kBAAe,GAAG,EAAE;IAClB,OAAO,kBAAK,
|
|
1
|
+
{"version":3,"file":"update-8-10-0.js","sourceRoot":"","sources":["../../../../../../packages/cypress/src/migrations/update-8-10-0/update-8-10-0.ts"],"names":[],"mappings":";;AAAA,+CAA2E;AAE3E,+BAA4B;AAC5B,2DAAmD;AAEnD,kBAAe,GAAG,EAAE;IAClB,OAAO,IAAA,kBAAK,EAAC;QACX,IAAA,uCAA2B,EACzB,IAAA,WAAI,EAAC,SAAS,EAAE,0BAA0B,CAAC,EAC3C,QAAQ,CACT;QACD,IAAA,uBAAW,GAAE;KACd,CAAC,CAAC;AACL,CAAC,CAAC"}
|
|
@@ -4,9 +4,9 @@ const workspace_1 = require("@nrwl/workspace");
|
|
|
4
4
|
const path_1 = require("path");
|
|
5
5
|
const schematics_1 = require("@angular-devkit/schematics");
|
|
6
6
|
exports.default = () => {
|
|
7
|
-
return schematics_1.chain([
|
|
8
|
-
workspace_1.updatePackagesInPackageJson(path_1.join(__dirname, '../../../migrations.json'), '8.12.0'),
|
|
9
|
-
workspace_1.formatFiles(),
|
|
7
|
+
return (0, schematics_1.chain)([
|
|
8
|
+
(0, workspace_1.updatePackagesInPackageJson)((0, path_1.join)(__dirname, '../../../migrations.json'), '8.12.0'),
|
|
9
|
+
(0, workspace_1.formatFiles)(),
|
|
10
10
|
]);
|
|
11
11
|
};
|
|
12
12
|
//# sourceMappingURL=update-8-12-0.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-8-12-0.js","sourceRoot":"","sources":["../../../../../../packages/cypress/src/migrations/update-8-12-0/update-8-12-0.ts"],"names":[],"mappings":";;AAAA,+CAA2E;AAE3E,+BAA4B;AAC5B,2DAAmD;AAEnD,kBAAe,GAAG,EAAE;IAClB,OAAO,kBAAK,
|
|
1
|
+
{"version":3,"file":"update-8-12-0.js","sourceRoot":"","sources":["../../../../../../packages/cypress/src/migrations/update-8-12-0/update-8-12-0.ts"],"names":[],"mappings":";;AAAA,+CAA2E;AAE3E,+BAA4B;AAC5B,2DAAmD;AAEnD,kBAAe,GAAG,EAAE;IAClB,OAAO,IAAA,kBAAK,EAAC;QACX,IAAA,uCAA2B,EACzB,IAAA,WAAI,EAAC,SAAS,EAAE,0BAA0B,CAAC,EAC3C,QAAQ,CACT;QACD,IAAA,uBAAW,GAAE;KACd,CAAC,CAAC;AACL,CAAC,CAAC"}
|
|
@@ -8,9 +8,9 @@ const typescript_1 = require("typescript");
|
|
|
8
8
|
const path_1 = require("path");
|
|
9
9
|
const core_1 = require("@angular-devkit/core");
|
|
10
10
|
function updateCypressJson(host, context) {
|
|
11
|
-
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
11
|
+
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
12
12
|
const rules = [];
|
|
13
|
-
const workspace = yield workspace_1.getWorkspace(host);
|
|
13
|
+
const workspace = yield (0, workspace_1.getWorkspace)(host);
|
|
14
14
|
workspace.projects.forEach((project) => {
|
|
15
15
|
project.targets.forEach((target) => {
|
|
16
16
|
if (target.builder !== '@nrwl/cypress:cypress') {
|
|
@@ -24,14 +24,14 @@ function updateCypressJson(host, context) {
|
|
|
24
24
|
};
|
|
25
25
|
const updatedCypressJsons = new Set();
|
|
26
26
|
updatedCypressJsons.add(target.options.cypressConfig);
|
|
27
|
-
rules.push(workspace_1.updateJsonInTree(target.options.cypressConfig, (json) => {
|
|
27
|
+
rules.push((0, workspace_1.updateJsonInTree)(target.options.cypressConfig, (json) => {
|
|
28
28
|
function getUpdatedPath(path) {
|
|
29
29
|
if (typeof path !== 'string') {
|
|
30
30
|
return path;
|
|
31
31
|
}
|
|
32
|
-
return `./${core_1.normalize(path_1.relative(path_1.dirname(target.options.cypressConfig), path_1.relative(`./${tsConfig.options.outDir}`, path_1.join(path_1.dirname(target.options.cypressConfig), path))))}`;
|
|
32
|
+
return `./${(0, core_1.normalize)((0, path_1.relative)((0, path_1.dirname)(target.options.cypressConfig), (0, path_1.relative)(`./${tsConfig.options.outDir}`, (0, path_1.join)((0, path_1.dirname)(target.options.cypressConfig), path))))}`;
|
|
33
33
|
}
|
|
34
|
-
const tsConfig = typescript_1.parseJsonConfigFileContent(typescript_1.parseConfigFileTextToJson(target.options.tsConfig, host.read(target.options.tsConfig).toString()).config, parseConfigHost, path_1.dirname(target.options.tsConfig));
|
|
34
|
+
const tsConfig = (0, typescript_1.parseJsonConfigFileContent)((0, typescript_1.parseConfigFileTextToJson)(target.options.tsConfig, host.read(target.options.tsConfig).toString()).config, parseConfigHost, (0, path_1.dirname)(target.options.tsConfig));
|
|
35
35
|
json.fileServerFolder = getUpdatedPath(json.fileServerFolder);
|
|
36
36
|
json.fixturesFolder = getUpdatedPath(json.fixturesFolder);
|
|
37
37
|
json.integrationFolder = getUpdatedPath(json.integrationFolder);
|
|
@@ -42,16 +42,16 @@ function updateCypressJson(host, context) {
|
|
|
42
42
|
Object.values(target.configurations).forEach((config) => {
|
|
43
43
|
if (config.cypressConfig &&
|
|
44
44
|
!updatedCypressJsons.has(config.cypressConfig)) {
|
|
45
|
-
rules.push(workspace_1.updateJsonInTree(config.cypressConfig, (json) => {
|
|
45
|
+
rules.push((0, workspace_1.updateJsonInTree)(config.cypressConfig, (json) => {
|
|
46
46
|
function getUpdatedPath(path) {
|
|
47
47
|
if (typeof path !== 'string') {
|
|
48
48
|
return path;
|
|
49
49
|
}
|
|
50
|
-
return `./${path_1.relative(path_1.dirname(config.cypressConfig), path_1.relative(`./${tsConfig.options.outDir}`, path_1.join(path_1.dirname(config.cypressConfig), path)))}`;
|
|
50
|
+
return `./${(0, path_1.relative)((0, path_1.dirname)(config.cypressConfig), (0, path_1.relative)(`./${tsConfig.options.outDir}`, (0, path_1.join)((0, path_1.dirname)(config.cypressConfig), path)))}`;
|
|
51
51
|
}
|
|
52
|
-
const tsConfig = typescript_1.parseJsonConfigFileContent(typescript_1.parseConfigFileTextToJson(config.tsConfig || target.options.tsConfig, host
|
|
52
|
+
const tsConfig = (0, typescript_1.parseJsonConfigFileContent)((0, typescript_1.parseConfigFileTextToJson)(config.tsConfig || target.options.tsConfig, host
|
|
53
53
|
.read(config.tsConfig || target.options.tsConfig)
|
|
54
|
-
.toString()).config, parseConfigHost, path_1.dirname(config.tsConfig || target.options.tsConfig));
|
|
54
|
+
.toString()).config, parseConfigHost, (0, path_1.dirname)(config.tsConfig || target.options.tsConfig));
|
|
55
55
|
json.fileServerFolder = getUpdatedPath(json.fileServerFolder);
|
|
56
56
|
json.fixturesFolder = getUpdatedPath(json.fixturesFolder);
|
|
57
57
|
json.integrationFolder = getUpdatedPath(json.integrationFolder);
|
|
@@ -63,12 +63,12 @@ function updateCypressJson(host, context) {
|
|
|
63
63
|
});
|
|
64
64
|
});
|
|
65
65
|
});
|
|
66
|
-
return schematics_1.chain(rules);
|
|
66
|
+
return (0, schematics_1.chain)(rules);
|
|
67
67
|
});
|
|
68
68
|
}
|
|
69
69
|
function updatePlugins(host, context) {
|
|
70
|
-
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
71
|
-
const workspace = yield workspace_1.getWorkspace(host);
|
|
70
|
+
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
71
|
+
const workspace = yield (0, workspace_1.getWorkspace)(host);
|
|
72
72
|
workspace.projects.forEach((project) => {
|
|
73
73
|
project.targets.forEach((target) => {
|
|
74
74
|
if (target.builder !== '@nrwl/cypress:cypress') {
|
|
@@ -78,45 +78,45 @@ function updatePlugins(host, context) {
|
|
|
78
78
|
if (!config.cypressConfig) {
|
|
79
79
|
return;
|
|
80
80
|
}
|
|
81
|
-
const cypressConfig = workspace_1.readJsonInTree(host, config.cypressConfig);
|
|
81
|
+
const cypressConfig = (0, workspace_1.readJsonInTree)(host, config.cypressConfig);
|
|
82
82
|
if (typeof cypressConfig.pluginsFile !== 'string') {
|
|
83
83
|
return;
|
|
84
84
|
}
|
|
85
|
-
const pluginFile = path_1.join(path_1.dirname(config.cypressConfig), `${cypressConfig.pluginsFile.replace(/\.js$/, '')}.ts`);
|
|
85
|
+
const pluginFile = (0, path_1.join)((0, path_1.dirname)(config.cypressConfig), `${cypressConfig.pluginsFile.replace(/\.js$/, '')}.ts`);
|
|
86
86
|
const newPluginFile = pluginFile.replace(/\.ts$/, '.js');
|
|
87
87
|
if (!host.exists(pluginFile)) {
|
|
88
88
|
return;
|
|
89
89
|
}
|
|
90
|
-
const result = typescript_1.transpileModule(host.read(pluginFile).toString(), {
|
|
90
|
+
const result = (0, typescript_1.transpileModule)(host.read(pluginFile).toString(), {
|
|
91
91
|
compilerOptions: {
|
|
92
92
|
module: typescript_1.ModuleKind.CommonJS,
|
|
93
93
|
},
|
|
94
94
|
});
|
|
95
95
|
host.create(newPluginFile, result.outputText);
|
|
96
96
|
host.delete(pluginFile);
|
|
97
|
-
const sourceFile = typescript_1.createSourceFile(newPluginFile, result.outputText, typescript_1.ScriptTarget.Latest);
|
|
97
|
+
const sourceFile = (0, typescript_1.createSourceFile)(newPluginFile, result.outputText, typescript_1.ScriptTarget.Latest);
|
|
98
98
|
const recorder = host.beginUpdate(newPluginFile);
|
|
99
99
|
recorder.insertLeft(0, `const { preprocessTypescript } = require('@nrwl/cypress/plugins/preprocessor');`);
|
|
100
100
|
sourceFile.statements.forEach((statement) => {
|
|
101
|
-
if (typescript_1.isExpressionStatement(statement) &&
|
|
102
|
-
typescript_1.isBinaryExpression(statement.expression) &&
|
|
103
|
-
typescript_1.isPropertyAccessExpression(statement.expression.left) &&
|
|
104
|
-
typescript_1.isIdentifier(statement.expression.left.expression) &&
|
|
101
|
+
if ((0, typescript_1.isExpressionStatement)(statement) &&
|
|
102
|
+
(0, typescript_1.isBinaryExpression)(statement.expression) &&
|
|
103
|
+
(0, typescript_1.isPropertyAccessExpression)(statement.expression.left) &&
|
|
104
|
+
(0, typescript_1.isIdentifier)(statement.expression.left.expression) &&
|
|
105
105
|
statement.expression.left.expression.escapedText === 'module' &&
|
|
106
|
-
typescript_1.isIdentifier(statement.expression.left.name) &&
|
|
106
|
+
(0, typescript_1.isIdentifier)(statement.expression.left.name) &&
|
|
107
107
|
statement.expression.left.name.escapedText === 'exports' &&
|
|
108
|
-
(typescript_1.isFunctionExpression(statement.expression.right) ||
|
|
109
|
-
typescript_1.isArrowFunction(statement.expression.right)) &&
|
|
108
|
+
((0, typescript_1.isFunctionExpression)(statement.expression.right) ||
|
|
109
|
+
(0, typescript_1.isArrowFunction)(statement.expression.right)) &&
|
|
110
110
|
statement.expression.right.parameters.length >= 2) {
|
|
111
|
-
if (typescript_1.isBlock(statement.expression.right.body)) {
|
|
111
|
+
if ((0, typescript_1.isBlock)(statement.expression.right.body)) {
|
|
112
112
|
const onParamName = statement.expression.right.parameters[0].name.getText(sourceFile);
|
|
113
113
|
const configParamName = statement.expression.right.parameters[1].name.getText(sourceFile);
|
|
114
|
-
recorder.insertLeft(statement.expression.right.body.statements.end, literals_1.stripIndents `
|
|
114
|
+
recorder.insertLeft(statement.expression.right.body.statements.end, (0, literals_1.stripIndents) `
|
|
115
115
|
${onParamName}('file:preprocessor', preprocessTypescript(${configParamName}))
|
|
116
116
|
`);
|
|
117
117
|
}
|
|
118
118
|
else {
|
|
119
|
-
context.logger.warn(literals_1.stripIndents `
|
|
119
|
+
context.logger.warn((0, literals_1.stripIndents) `
|
|
120
120
|
We could not update ${pluginFile} with our new preprocessor
|
|
121
121
|
`);
|
|
122
122
|
}
|
|
@@ -129,7 +129,7 @@ function updatePlugins(host, context) {
|
|
|
129
129
|
});
|
|
130
130
|
}
|
|
131
131
|
function default_1() {
|
|
132
|
-
return schematics_1.chain([updateCypressJson, updatePlugins, workspace_1.formatFiles()]);
|
|
132
|
+
return (0, schematics_1.chain)([updateCypressJson, updatePlugins, (0, workspace_1.formatFiles)()]);
|
|
133
133
|
}
|
|
134
134
|
exports.default = default_1;
|
|
135
135
|
//# sourceMappingURL=update-8-2-0.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-8-2-0.js","sourceRoot":"","sources":["../../../../../../packages/cypress/src/migrations/update-8-2-0/update-8-2-0.ts"],"names":[],"mappings":";;;AAAA,2DAKoC;AACpC,+CAKyB;AACzB,sEAAuE;AACvE,2CAeoB;AACpB,+BAA+C;AAC/C,+CAAiD;AAEjD,SAAe,iBAAiB,CAAC,IAAU,EAAE,OAAyB;;QACpE,MAAM,KAAK,GAAW,EAAE,CAAC;QACzB,MAAM,SAAS,GAAG,MAAM,wBAAY,
|
|
1
|
+
{"version":3,"file":"update-8-2-0.js","sourceRoot":"","sources":["../../../../../../packages/cypress/src/migrations/update-8-2-0/update-8-2-0.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,12 +4,12 @@ const tslib_1 = require("tslib");
|
|
|
4
4
|
const schematics_1 = require("@angular-devkit/schematics");
|
|
5
5
|
const workspace_1 = require("@nrwl/workspace");
|
|
6
6
|
function addCypressPluginToEslintrc(host) {
|
|
7
|
-
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
7
|
+
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
8
8
|
const rules = [];
|
|
9
|
-
const { devDependencies } = workspace_1.readJsonInTree(host, 'package.json');
|
|
9
|
+
const { devDependencies } = (0, workspace_1.readJsonInTree)(host, 'package.json');
|
|
10
10
|
const eslintrcFilePaths = [];
|
|
11
11
|
if (devDependencies && devDependencies['@nrwl/cypress']) {
|
|
12
|
-
const workspace = workspace_1.readWorkspace(host);
|
|
12
|
+
const workspace = (0, workspace_1.readWorkspace)(host);
|
|
13
13
|
Object.values(workspace.projects).forEach((project) => {
|
|
14
14
|
Object.values(project.architect).forEach((target) => {
|
|
15
15
|
if (target.builder !== '@nrwl/cypress:cypress') {
|
|
@@ -21,7 +21,7 @@ function addCypressPluginToEslintrc(host) {
|
|
|
21
21
|
});
|
|
22
22
|
});
|
|
23
23
|
eslintrcFilePaths.forEach((eslintrcFilePath) => {
|
|
24
|
-
rules.push(workspace_1.updateJsonInTree(eslintrcFilePath, (json) => {
|
|
24
|
+
rules.push((0, workspace_1.updateJsonInTree)(eslintrcFilePath, (json) => {
|
|
25
25
|
if (json.extends) {
|
|
26
26
|
if (!Array.isArray(json.extends)) {
|
|
27
27
|
json.extends = [json.extends];
|
|
@@ -32,23 +32,23 @@ function addCypressPluginToEslintrc(host) {
|
|
|
32
32
|
}));
|
|
33
33
|
});
|
|
34
34
|
}
|
|
35
|
-
return schematics_1.chain(rules);
|
|
35
|
+
return (0, schematics_1.chain)(rules);
|
|
36
36
|
});
|
|
37
37
|
}
|
|
38
38
|
exports.default = () => {
|
|
39
39
|
return (host) => {
|
|
40
40
|
var _a, _b;
|
|
41
|
-
const packageJson = workspace_1.readJsonInTree(host, 'package.json');
|
|
41
|
+
const packageJson = (0, workspace_1.readJsonInTree)(host, 'package.json');
|
|
42
42
|
if (((_a = packageJson.devDependencies) === null || _a === void 0 ? void 0 : _a.eslint) ||
|
|
43
43
|
((_b = packageJson.dependencies) === null || _b === void 0 ? void 0 : _b.eslint)) {
|
|
44
|
-
return schematics_1.chain([
|
|
45
|
-
workspace_1.addDepsToPackageJson({}, { 'eslint-plugin-cypress': '^2.10.3' }),
|
|
44
|
+
return (0, schematics_1.chain)([
|
|
45
|
+
(0, workspace_1.addDepsToPackageJson)({}, { 'eslint-plugin-cypress': '^2.10.3' }),
|
|
46
46
|
addCypressPluginToEslintrc,
|
|
47
|
-
workspace_1.formatFiles(),
|
|
47
|
+
(0, workspace_1.formatFiles)(),
|
|
48
48
|
]);
|
|
49
49
|
}
|
|
50
50
|
else {
|
|
51
|
-
return schematics_1.noop();
|
|
51
|
+
return (0, schematics_1.noop)();
|
|
52
52
|
}
|
|
53
53
|
};
|
|
54
54
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add-cypress-eslint-plugin-9-4-0.js","sourceRoot":"","sources":["../../../../../../packages/cypress/src/migrations/update-9-4-0/add-cypress-eslint-plugin-9-4-0.ts"],"names":[],"mappings":";;;AAAA,2DAAqE;AACrE,+CAMyB;AAEzB,SAAe,0BAA0B,CAAC,IAAU;;QAClD,MAAM,KAAK,GAAW,EAAE,CAAC;QACzB,MAAM,EAAE,eAAe,EAAE,GAAG,0BAAc,
|
|
1
|
+
{"version":3,"file":"add-cypress-eslint-plugin-9-4-0.js","sourceRoot":"","sources":["../../../../../../packages/cypress/src/migrations/update-9-4-0/add-cypress-eslint-plugin-9-4-0.ts"],"names":[],"mappings":";;;AAAA,2DAAqE;AACrE,+CAMyB;AAEzB,SAAe,0BAA0B,CAAC,IAAU;;QAClD,MAAM,KAAK,GAAW,EAAE,CAAC;QACzB,MAAM,EAAE,eAAe,EAAE,GAAG,IAAA,0BAAc,EAAC,IAAI,EAAE,cAAc,CAAC,CAAC;QAEjE,MAAM,iBAAiB,GAAG,EAAE,CAAC;QAC7B,IAAI,eAAe,IAAI,eAAe,CAAC,eAAe,CAAC,EAAE;YACvD,MAAM,SAAS,GAAG,IAAA,yBAAa,EAAC,IAAI,CAAC,CAAC;YACtC,MAAM,CAAC,MAAM,CAAM,SAAS,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;gBACzD,MAAM,CAAC,MAAM,CAAM,OAAO,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;oBACvD,IAAI,MAAM,CAAC,OAAO,KAAK,uBAAuB,EAAE;wBAC9C,OAAO;qBACR;oBAED,IAAI,IAAI,CAAC,MAAM,CAAC,GAAG,OAAO,CAAC,IAAI,YAAY,CAAC,EAAE;wBAC5C,iBAAiB,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,IAAI,YAAY,CAAC,CAAC;qBACrD;gBACH,CAAC,CAAC,CAAC;YACL,CAAC,CAAC,CAAC;YAEH,iBAAiB,CAAC,OAAO,CAAC,CAAC,gBAAgB,EAAE,EAAE;gBAC7C,KAAK,CAAC,IAAI,CACR,IAAA,4BAAgB,EAAC,gBAA0B,EAAE,CAAC,IAAI,EAAE,EAAE;oBACpD,IAAI,IAAI,CAAC,OAAO,EAAE;wBAChB,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE;4BAChC,IAAI,CAAC,OAAO,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;yBAC/B;wBAED,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,4BAA4B,CAAC,CAAC;qBACjD;oBAED,OAAO,IAAI,CAAC;gBACd,CAAC,CAAC,CACH,CAAC;YACJ,CAAC,CAAC,CAAC;SACJ;QAED,OAAO,IAAA,kBAAK,EAAC,KAAK,CAAC,CAAC;IACtB,CAAC;CAAA;AAED,kBAAe,GAAG,EAAE;IAClB,OAAO,CAAC,IAAU,EAAE,EAAE;;QACpB,MAAM,WAAW,GAAG,IAAA,0BAAc,EAAC,IAAI,EAAE,cAAc,CAAC,CAAC;QACzD,IACE,CAAA,MAAA,WAAW,CAAC,eAAe,0CAAE,MAAM;aACnC,MAAA,WAAW,CAAC,YAAY,0CAAE,MAAM,CAAA,EAChC;YACA,OAAO,IAAA,kBAAK,EAAC;gBACX,IAAA,gCAAoB,EAAC,EAAE,EAAE,EAAE,uBAAuB,EAAE,SAAS,EAAE,CAAC;gBAChE,0BAA0B;gBAC1B,IAAA,uBAAW,GAAE;aACd,CAAC,CAAC;SACJ;aAAM;YACL,OAAO,IAAA,iBAAI,GAAE,CAAC;SACf;IACH,CAAC,CAAC;AACJ,CAAC,CAAC"}
|
|
@@ -12,15 +12,15 @@ const nodeExternals = require("webpack-node-externals");
|
|
|
12
12
|
* @deprecated This function is no longer necessary and will be removed in Nx 14
|
|
13
13
|
*/
|
|
14
14
|
function preprocessTypescript(config, customizeWebpackConfig) {
|
|
15
|
-
if (cypress_version_1.installedCypressVersion() >= 7) {
|
|
16
|
-
console.log(devkit_1.stripIndents `
|
|
15
|
+
if ((0, cypress_version_1.installedCypressVersion)() >= 7) {
|
|
16
|
+
console.log((0, devkit_1.stripIndents) `
|
|
17
17
|
preprocessTypescript is now deprecated since Cypress has added typescript support.
|
|
18
18
|
If you would still like preprocess files with webpack, use the "@cypress/webpack-preprocessor" package.`);
|
|
19
19
|
}
|
|
20
20
|
if (!config.env.tsConfig) {
|
|
21
21
|
throw new Error('Please provide an absolute path to a tsconfig.json as cypressConfig.env.tsConfig');
|
|
22
22
|
}
|
|
23
|
-
return (file) => tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
23
|
+
return (file) => (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
24
24
|
const webpackOptions = customizeWebpackConfig
|
|
25
25
|
? customizeWebpackConfig(getWebpackConfig(config))
|
|
26
26
|
: getWebpackConfig(config);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"preprocessor.js","sourceRoot":"","sources":["../../../../../packages/cypress/src/plugins/preprocessor.ts"],"names":[],"mappings":";;;;AAAA,oDAAoD;AACpD,iFAAoE;AACpE,6EAA8E;AAC9E,yCAA4C;AAC5C,6EAAkF;AAClF,wDAAyD;AAEzD;;GAEG;AACH,SAAgB,oBAAoB,CAClC,MAAW,EACX,sBAAoD;IAEpD,IAAI,yCAAuB,
|
|
1
|
+
{"version":3,"file":"preprocessor.js","sourceRoot":"","sources":["../../../../../packages/cypress/src/plugins/preprocessor.ts"],"names":[],"mappings":";;;;AAAA,oDAAoD;AACpD,iFAAoE;AACpE,6EAA8E;AAC9E,yCAA4C;AAC5C,6EAAkF;AAClF,wDAAyD;AAEzD;;GAEG;AACH,SAAgB,oBAAoB,CAClC,MAAW,EACX,sBAAoD;IAEpD,IAAI,IAAA,yCAAuB,GAAE,IAAI,CAAC,EAAE;QAClC,OAAO,CAAC,GAAG,CAAC,IAAA,qBAAY,EAAA;;4GAEgF,CAAC,CAAC;KAC3G;IAED,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,QAAQ,EAAE;QACxB,MAAM,IAAI,KAAK,CACb,kFAAkF,CACnF,CAAC;KACH;IAED,OAAO,CAAO,IAAI,EAAE,EAAE;QACpB,MAAM,cAAc,GAAG,sBAAsB;YAC3C,CAAC,CAAC,sBAAsB,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC;YAClD,CAAC,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC;QAC7B,OAAO,EAAE,CAAC,EAAE,cAAc,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC;IACtC,CAAC,CAAA,CAAC;AACJ,CAAC;AAtBD,oDAsBC;AAED,SAAgB,gBAAgB,CAAC,MAAW;IAC1C,MAAM,UAAU,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;IAC1D,OAAO;QACL,OAAO,EAAE;YACP,UAAU;YACV,OAAO,EAAE;gBACP,IAAI,mDAAmB,CAAC;oBACtB,UAAU,EAAE,MAAM,CAAC,GAAG,CAAC,QAAQ;oBAC/B,UAAU;iBACX,CAAC;aACH;SACF;QACD,MAAM,EAAE;YACN,KAAK,EAAE;gBACL;oBACE,IAAI,EAAE,cAAc;oBACpB,MAAM,EAAE,OAAO,CAAC,OAAO,CAAC,WAAW,CAAC;oBACpC,OAAO,EAAE,CAAC,cAAc,CAAC;oBACzB,OAAO,EAAE;wBACP,UAAU,EAAE,MAAM,CAAC,GAAG,CAAC,QAAQ;wBAC/B,mDAAmD;wBACnD,oBAAoB,EAAE,IAAI;wBAC1B,aAAa,EAAE,IAAI;qBACpB;iBACF;aACF;SACF;QACD,OAAO,EAAE;YACP,IAAI,0BAA0B,CAAC;gBAC7B,UAAU,EAAE;oBACV,OAAO,EAAE,IAAI;oBACb,UAAU,EAAE,MAAM,CAAC,GAAG,CAAC,QAAQ;iBAChC;aACF,CAAC;SACH;QACD,SAAS,EAAE,CAAC,aAAa,EAAE,CAAC;KAC7B,CAAC;AACJ,CAAC;AArCD,4CAqCC"}
|
|
@@ -14,7 +14,7 @@ function getE2eProjectName(targetProjectName, targetLibRoot, cypressDirectory) {
|
|
|
14
14
|
}
|
|
15
15
|
exports.getE2eProjectName = getE2eProjectName;
|
|
16
16
|
function filePathPrefix(directory) {
|
|
17
|
-
return `${devkit_1.names(directory).fileName}`.replace(new RegExp('/', 'g'), '-');
|
|
17
|
+
return `${(0, devkit_1.names)(directory).fileName}`.replace(new RegExp('/', 'g'), '-');
|
|
18
18
|
}
|
|
19
19
|
exports.filePathPrefix = filePathPrefix;
|
|
20
20
|
//# sourceMappingURL=project-name.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"project-name.js","sourceRoot":"","sources":["../../../../../packages/cypress/src/utils/project-name.ts"],"names":[],"mappings":";;;AAAA,yCAAqC;AAErC,SAAgB,kBAAkB,CAAC,OAAe;IAChD,OAAO,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;AACtD,CAAC;AAFD,gDAEC;AAED,SAAgB,iBAAiB,CAC/B,iBAAyB,EACzB,aAAqB,EACrB,gBAAyB;IAEzB,IAAI,gBAAgB,EAAE;QACpB,OAAO,GAAG,cAAc,CAAC,gBAAgB,CAAC,IAAI,kBAAkB,CAC9D,aAAa,CACd,MAAM,CAAC;KACT;IACD,OAAO,GAAG,iBAAiB,MAAM,CAAC;AACpC,CAAC;AAXD,8CAWC;AAED,SAAgB,cAAc,CAAC,SAAiB;IAC9C,OAAO,GAAG,cAAK,
|
|
1
|
+
{"version":3,"file":"project-name.js","sourceRoot":"","sources":["../../../../../packages/cypress/src/utils/project-name.ts"],"names":[],"mappings":";;;AAAA,yCAAqC;AAErC,SAAgB,kBAAkB,CAAC,OAAe;IAChD,OAAO,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;AACtD,CAAC;AAFD,gDAEC;AAED,SAAgB,iBAAiB,CAC/B,iBAAyB,EACzB,aAAqB,EACrB,gBAAyB;IAEzB,IAAI,gBAAgB,EAAE;QACpB,OAAO,GAAG,cAAc,CAAC,gBAAgB,CAAC,IAAI,kBAAkB,CAC9D,aAAa,CACd,MAAM,CAAC;KACT;IACD,OAAO,GAAG,iBAAiB,MAAM,CAAC;AACpC,CAAC;AAXD,8CAWC;AAED,SAAgB,cAAc,CAAC,SAAiB;IAC9C,OAAO,GAAG,IAAA,cAAK,EAAC,SAAS,CAAC,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,IAAI,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,GAAG,CAAC,CAAC;AAC3E,CAAC;AAFD,wCAEC"}
|
package/src/utils/testing.js
CHANGED
|
@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.runMigration = exports.callRule = exports.runSchematic = void 0;
|
|
4
4
|
const path_1 = require("path");
|
|
5
5
|
const testing_1 = require("@angular-devkit/schematics/testing");
|
|
6
|
-
const testRunner = new testing_1.SchematicTestRunner('@nrwl/cypress', path_1.join(__dirname, '../../generators.json'));
|
|
7
|
-
const migrationRunner = new testing_1.SchematicTestRunner('@nrwl/cypress/migrations', path_1.join(__dirname, '../../migrations.json'));
|
|
6
|
+
const testRunner = new testing_1.SchematicTestRunner('@nrwl/cypress', (0, path_1.join)(__dirname, '../../generators.json'));
|
|
7
|
+
const migrationRunner = new testing_1.SchematicTestRunner('@nrwl/cypress/migrations', (0, path_1.join)(__dirname, '../../migrations.json'));
|
|
8
8
|
function runSchematic(schematicName, options, tree) {
|
|
9
9
|
return testRunner.runSchematicAsync(schematicName, options, tree).toPromise();
|
|
10
10
|
}
|
package/src/utils/testing.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"testing.js","sourceRoot":"","sources":["../../../../../packages/cypress/src/utils/testing.ts"],"names":[],"mappings":";;;AAAA,+BAA4B;AAC5B,gEAAyE;AAGzE,MAAM,UAAU,GAAG,IAAI,6BAAmB,CACxC,eAAe,EACf,WAAI,
|
|
1
|
+
{"version":3,"file":"testing.js","sourceRoot":"","sources":["../../../../../packages/cypress/src/utils/testing.ts"],"names":[],"mappings":";;;AAAA,+BAA4B;AAC5B,gEAAyE;AAGzE,MAAM,UAAU,GAAG,IAAI,6BAAmB,CACxC,eAAe,EACf,IAAA,WAAI,EAAC,SAAS,EAAE,uBAAuB,CAAC,CACzC,CAAC;AAEF,MAAM,eAAe,GAAG,IAAI,6BAAmB,CAC7C,0BAA0B,EAC1B,IAAA,WAAI,EAAC,SAAS,EAAE,uBAAuB,CAAC,CACzC,CAAC;AAEF,SAAgB,YAAY,CAAC,aAAqB,EAAE,OAAY,EAAE,IAAU;IAC1E,OAAO,UAAU,CAAC,iBAAiB,CAAC,aAAa,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC,SAAS,EAAE,CAAC;AAChF,CAAC;AAFD,oCAEC;AAED,SAAgB,QAAQ,CAAC,IAAU,EAAE,IAAU;IAC7C,OAAO,UAAU,CAAC,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,SAAS,EAAE,CAAC;AACrD,CAAC;AAFD,4BAEC;AAED,SAAgB,YAAY,CAAC,aAAqB,EAAE,OAAY,EAAE,IAAU;IAC1E,OAAO,eAAe;SACnB,iBAAiB,CAAC,aAAa,EAAE,OAAO,EAAE,IAAI,CAAC;SAC/C,SAAS,EAAE,CAAC;AACjB,CAAC;AAJD,oCAIC"}
|
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 = '13.
|
|
4
|
+
exports.nxVersion = '13.2.0-beta.2';
|
|
5
5
|
exports.cypressVersion = '^8.3.0';
|
|
6
6
|
exports.eslintPluginCypressVersion = '^2.10.3';
|
|
7
7
|
//# sourceMappingURL=versions.js.map
|