@nrwl/cypress 13.10.0-beta.2 → 13.10.0-beta.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +4 -4
- package/plugins/preprocessor.js +1 -1
- package/plugins/preprocessor.js.map +1 -1
- package/src/executors/cypress/cypress.impl.js +10 -10
- package/src/executors/cypress/cypress.impl.js.map +1 -1
- package/src/executors/cypress/hasher.js +1 -1
- package/src/generators/convert-tslint-to-eslint/convert-tslint-to-eslint.js +4 -4
- package/src/generators/convert-tslint-to-eslint/convert-tslint-to-eslint.js.map +1 -1
- package/src/generators/cypress-project/cypress-project.js +2 -2
- package/src/migrations/update-12-8-0/remove-typescript-plugin.js +1 -1
- package/src/migrations/update-8-2-0/update-8-2-0.js +2 -2
- package/src/migrations/update-9-4-0/add-cypress-eslint-plugin-9-4-0.js +1 -1
- package/src/plugins/preprocessor.js +1 -1
- package/src/utils/versions.js +1 -1
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nrwl/cypress",
|
|
3
|
-
"version": "13.10.0-beta.
|
|
3
|
+
"version": "13.10.0-beta.5",
|
|
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.10.0-beta.
|
|
37
|
-
"@nrwl/linter": "13.10.0-beta.
|
|
38
|
-
"@nrwl/workspace": "13.10.0-beta.
|
|
36
|
+
"@nrwl/devkit": "13.10.0-beta.5",
|
|
37
|
+
"@nrwl/linter": "13.10.0-beta.5",
|
|
38
|
+
"@nrwl/workspace": "13.10.0-beta.5",
|
|
39
39
|
"@cypress/webpack-preprocessor": "^5.9.1",
|
|
40
40
|
"chalk": "4.1.0",
|
|
41
41
|
"enhanced-resolve": "^5.8.3",
|
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
|
-
|
|
4
|
+
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,sEAA4C"}
|
|
@@ -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
|
|
11
|
+
return 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 =
|
|
15
|
+
for (var _b = 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);
|
|
@@ -86,32 +86,32 @@ function warnDeprecatedHeadless({ headless }) {
|
|
|
86
86
|
}
|
|
87
87
|
}
|
|
88
88
|
function startDevServer(opts, context) {
|
|
89
|
-
return
|
|
89
|
+
return 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
|
|
94
|
-
return yield
|
|
93
|
+
yield yield tslib_1.__await(opts.baseUrl);
|
|
94
|
+
return yield tslib_1.__await(void 0);
|
|
95
95
|
}
|
|
96
96
|
const { project, target, configuration } = (0, devkit_1.parseTargetString)(opts.devServerTarget);
|
|
97
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 =
|
|
100
|
+
for (var _b = tslib_1.__asyncValues(yield 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
|
|
104
|
+
targetSupportsWatchOpt ? { watch: opts.watch } : {}, context))), _c; _c = yield 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
|
|
108
|
+
yield yield 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
|
|
114
|
+
if (_c && !_c.done && (_a = _b.return)) yield tslib_1.__await(_a.call(_b));
|
|
115
115
|
}
|
|
116
116
|
finally { if (e_2) throw e_2.error; }
|
|
117
117
|
}
|
|
@@ -124,7 +124,7 @@ function startDevServer(opts, context) {
|
|
|
124
124
|
*/
|
|
125
125
|
function runCypress(baseUrl, opts) {
|
|
126
126
|
var _a;
|
|
127
|
-
return
|
|
127
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
128
128
|
// Cypress expects the folder where a `cypress.json` is present
|
|
129
129
|
const projectFolderPath = (0, path_1.dirname)(opts.cypressConfig);
|
|
130
130
|
const options = {
|
|
@@ -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;AA8BnG,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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"}
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const tslib_1 = require("tslib");
|
|
4
4
|
function run(task, context) {
|
|
5
|
-
return
|
|
5
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
6
6
|
const cypressPluginConfig = context.workspaceConfig.pluginsConfig
|
|
7
7
|
? context.workspaceConfig.pluginsConfig['@nrwl/cypress']
|
|
8
8
|
: undefined;
|
|
@@ -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
|
|
9
|
+
return 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,7 +21,7 @@ function conversionGenerator(host, options) {
|
|
|
21
21
|
host,
|
|
22
22
|
projectName: options.project,
|
|
23
23
|
ignoreExistingTslintConfig: options.ignoreExistingTslintConfig,
|
|
24
|
-
eslintInitializer: ({ projectName, projectConfig }) =>
|
|
24
|
+
eslintInitializer: ({ projectName, projectConfig }) => tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
25
25
|
yield (0, cypress_project_1.addLinter)(host, {
|
|
26
26
|
linter: 'eslint',
|
|
27
27
|
projectName,
|
|
@@ -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 =
|
|
63
|
+
const { project } = options, defaults = tslib_1.__rest(options, ["project"]);
|
|
64
64
|
/**
|
|
65
65
|
* Store user preferences for the collection
|
|
66
66
|
*/
|
|
@@ -76,7 +76,7 @@ function conversionGenerator(host, options) {
|
|
|
76
76
|
if (!options.skipFormat) {
|
|
77
77
|
yield (0, devkit_1.formatFiles)(host);
|
|
78
78
|
}
|
|
79
|
-
return () =>
|
|
79
|
+
return () => tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
80
80
|
yield eslintInitInstallTask();
|
|
81
81
|
yield rootConfigInstallTask();
|
|
82
82
|
yield projectConfigInstallTask();
|
|
@@ -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,IAAA,2BAAS,EAAC,IAAI,EAAE;oBACpB,MAAM,EAAE,QAAQ;oBAChB,WAAW;oBACX,WAAW,EAAE,aAAa,CAAC,IAAI;oBAC/B;;;;uBAIG;oBACH,uBAAuB,EAAE,IAAI;oBAC7B,UAAU,EAAE,OAAO,CAAC,UAAU;iBACP,CAAC,CAAC;YAC7B,CAAC,CAAA;SACF,CAAC,CAAC;QAEH;;;;WAIG;QACH,MAAM,sBAAsB,GAAG,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC;QAE7D;;;WAGG;QACH,MAAM,qBAAqB,GAAG,MAAM,gBAAgB,CAAC,UAAU,EAAE,CAAC;QAElE;;WAEG;QACH,MAAM,qBAAqB,GAAG,MAAM,gBAAgB,CAAC,uBAAuB,CAC1E,CAAC,IAAI,EAAE,EAAE,CAAC,2BAA2B,CAAC,IAAI,CAAC,EAC3C,sBAAsB,CACvB,CAAC;QAEF;;WAEG;QACH,MAAM,wBAAwB,GAAG,MAAM,gBAAgB,CAAC,oBAAoB,CAC1E,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CACf,CAAC;QAEF;;WAEG;QACH,gBAAgB,CAAC,uBAAuB,EAAE,CAAC;QAE3C,+CAA+C;QAC/C,MAAM,EAAE,OAAO,KAAkB,OAAO,EAApB,QAAQ,
|
|
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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"}
|
|
@@ -84,7 +84,7 @@ function addProject(tree, options) {
|
|
|
84
84
|
(0, devkit_1.addProjectConfiguration)(tree, options.projectName, e2eProjectConfig, options.standaloneConfig);
|
|
85
85
|
}
|
|
86
86
|
function addLinter(host, options) {
|
|
87
|
-
return
|
|
87
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
88
88
|
if (options.linter === linter_1.Linter.None) {
|
|
89
89
|
return () => { };
|
|
90
90
|
}
|
|
@@ -160,7 +160,7 @@ function addLinter(host, options) {
|
|
|
160
160
|
}
|
|
161
161
|
exports.addLinter = addLinter;
|
|
162
162
|
function cypressProjectGenerator(host, schema) {
|
|
163
|
-
return
|
|
163
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
164
164
|
const options = normalizeOptions(host, schema);
|
|
165
165
|
createFiles(host, options);
|
|
166
166
|
addProject(host, options);
|
|
@@ -6,7 +6,7 @@ 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
|
|
9
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
10
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.`);
|
|
@@ -8,7 +8,7 @@ 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
|
|
11
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
12
12
|
const rules = [];
|
|
13
13
|
const workspace = yield (0, workspace_1.getWorkspace)(host);
|
|
14
14
|
workspace.projects.forEach((project) => {
|
|
@@ -67,7 +67,7 @@ function updateCypressJson(host, context) {
|
|
|
67
67
|
});
|
|
68
68
|
}
|
|
69
69
|
function updatePlugins(host, context) {
|
|
70
|
-
return
|
|
70
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
71
71
|
const workspace = yield (0, workspace_1.getWorkspace)(host);
|
|
72
72
|
workspace.projects.forEach((project) => {
|
|
73
73
|
project.targets.forEach((target) => {
|
|
@@ -4,7 +4,7 @@ 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
|
|
7
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
8
8
|
const rules = [];
|
|
9
9
|
const { devDependencies } = (0, workspace_1.readJsonInTree)(host, 'package.json');
|
|
10
10
|
const eslintrcFilePaths = [];
|
|
@@ -20,7 +20,7 @@ function preprocessTypescript(config, customizeWebpackConfig) {
|
|
|
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) =>
|
|
23
|
+
return (file) => tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
24
24
|
const webpackOptions = customizeWebpackConfig
|
|
25
25
|
? customizeWebpackConfig(getWebpackConfig(config))
|
|
26
26
|
: getWebpackConfig(config);
|
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.10.0-beta.
|
|
4
|
+
exports.nxVersion = '13.10.0-beta.5';
|
|
5
5
|
exports.cypressVersion = '^9.1.0';
|
|
6
6
|
exports.eslintPluginCypressVersion = '^2.10.3';
|
|
7
7
|
//# sourceMappingURL=versions.js.map
|