@nrwl/angular 14.4.3 → 14.5.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/CHANGELOG.md +1 -1
- package/esm2020/src/runtime/nx/data-persistence.mjs +257 -181
- package/esm2020/src/runtime/nx/nx.module.mjs +3 -1
- package/fesm2015/nrwl-angular.mjs +258 -180
- package/fesm2015/nrwl-angular.mjs.map +1 -1
- package/fesm2020/nrwl-angular.mjs +258 -180
- package/fesm2020/nrwl-angular.mjs.map +1 -1
- package/ng-package.json +2 -1
- package/package.json +10 -9
- package/src/generators/component-cypress-spec/component-cypress-spec.js +6 -5
- package/src/generators/component-cypress-spec/component-cypress-spec.js.map +1 -1
- package/src/generators/component-cypress-spec/files/{__componentFileName__.spec.ts__tmpl__ → __componentFileName__.__fileExt__} +0 -0
- package/src/generators/ng-add/utilities/e2e.migrator.d.ts +14 -2
- package/src/generators/ng-add/utilities/e2e.migrator.js +274 -43
- package/src/generators/ng-add/utilities/e2e.migrator.js.map +1 -1
- package/src/generators/ng-add/utilities/file-change-recorder.d.ts +16 -0
- package/src/generators/ng-add/utilities/file-change-recorder.js +37 -0
- package/src/generators/ng-add/utilities/file-change-recorder.js.map +1 -0
- package/src/generators/ngrx/schema.d.ts +9 -1
- package/src/generators/ngrx/schema.json +4 -2
- package/src/runtime/nx/data-persistence.d.ts +256 -192
- package/src/runtime/nx/data-persistence.js +256 -180
- package/src/runtime/nx/data-persistence.js.map +1 -1
- package/src/runtime/nx/nx.module.d.ts +2 -0
- package/src/runtime/nx/nx.module.js +2 -0
- package/src/runtime/nx/nx.module.js.map +1 -1
- package/src/utils/mf/with-module-federation.js +4 -1
- package/src/utils/mf/with-module-federation.js.map +1 -1
|
@@ -3,16 +3,17 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.componentCypressSpecGenerator = void 0;
|
|
4
4
|
const devkit_1 = require("@nrwl/devkit");
|
|
5
5
|
const storybook_1 = require("../utils/storybook");
|
|
6
|
-
const get_component_selector_1 = require("./lib/get-component-selector");
|
|
7
6
|
const get_args_default_value_1 = require("./lib/get-args-default-value");
|
|
7
|
+
const get_component_selector_1 = require("./lib/get-component-selector");
|
|
8
8
|
function componentCypressSpecGenerator(tree, options) {
|
|
9
9
|
const { cypressProject, projectName, projectPath, componentPath, componentFileName, componentName, specDirectory, } = options;
|
|
10
10
|
const e2eProjectName = cypressProject || `${projectName}-e2e`;
|
|
11
|
-
const
|
|
12
|
-
const
|
|
11
|
+
const { sourceRoot, root } = (0, devkit_1.readProjectConfiguration)(tree, e2eProjectName);
|
|
12
|
+
const isCypressV10 = tree.exists((0, devkit_1.joinPathFragments)(root, 'cypress.config.ts'));
|
|
13
|
+
const e2eLibIntegrationFolderPath = (0, devkit_1.joinPathFragments)(sourceRoot, isCypressV10 ? 'e2e' : 'integration');
|
|
13
14
|
const templatesDir = (0, devkit_1.joinPathFragments)(__dirname, 'files');
|
|
14
15
|
const destinationDir = (0, devkit_1.joinPathFragments)(e2eLibIntegrationFolderPath, specDirectory !== null && specDirectory !== void 0 ? specDirectory : componentPath);
|
|
15
|
-
const storyFile = (0, devkit_1.joinPathFragments)(destinationDir, `${componentFileName}
|
|
16
|
+
const storyFile = (0, devkit_1.joinPathFragments)(destinationDir, `${componentFileName}.${isCypressV10 ? 'cy' : 'spec'}.ts`);
|
|
16
17
|
if (tree.exists(storyFile)) {
|
|
17
18
|
return;
|
|
18
19
|
}
|
|
@@ -25,7 +26,7 @@ function componentCypressSpecGenerator(tree, options) {
|
|
|
25
26
|
componentName,
|
|
26
27
|
componentSelector,
|
|
27
28
|
props,
|
|
28
|
-
|
|
29
|
+
fileExt: isCypressV10 ? 'cy.ts' : 'spec.ts',
|
|
29
30
|
});
|
|
30
31
|
if (!options.skipFormat) {
|
|
31
32
|
(0, devkit_1.formatFiles)(tree);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"component-cypress-spec.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/component-cypress-spec/component-cypress-spec.ts"],"names":[],"mappings":";;;AACA,yCAKsB;AACtB,kDAAuD;AACvD,
|
|
1
|
+
{"version":3,"file":"component-cypress-spec.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/component-cypress-spec/component-cypress-spec.ts"],"names":[],"mappings":";;;AACA,yCAKsB;AACtB,kDAAuD;AACvD,yEAAmE;AACnE,yEAAoE;AAGpE,SAAgB,6BAA6B,CAC3C,IAAU,EACV,OAA6C;IAE7C,MAAM,EACJ,cAAc,EACd,WAAW,EACX,WAAW,EACX,aAAa,EACb,iBAAiB,EACjB,aAAa,EACb,aAAa,GACd,GAAG,OAAO,CAAC;IACZ,MAAM,cAAc,GAAG,cAAc,IAAI,GAAG,WAAW,MAAM,CAAC;IAC9D,MAAM,EAAE,UAAU,EAAE,IAAI,EAAE,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,cAAc,CAAC,CAAC;IAC5E,MAAM,YAAY,GAAG,IAAI,CAAC,MAAM,CAC9B,IAAA,0BAAiB,EAAC,IAAI,EAAE,mBAAmB,CAAC,CAC7C,CAAC;IACF,MAAM,2BAA2B,GAAG,IAAA,0BAAiB,EACnD,UAAU,EACV,YAAY,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,aAAa,CACrC,CAAC;IAEF,MAAM,YAAY,GAAG,IAAA,0BAAiB,EAAC,SAAS,EAAE,OAAO,CAAC,CAAC;IAC3D,MAAM,cAAc,GAAG,IAAA,0BAAiB,EACtC,2BAA2B,EAC3B,aAAa,aAAb,aAAa,cAAb,aAAa,GAAI,aAAa,CAC/B,CAAC;IACF,MAAM,SAAS,GAAG,IAAA,0BAAiB,EACjC,cAAc,EACd,GAAG,iBAAiB,IAAI,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,KAAK,CAC1D,CAAC;IAEF,IAAI,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE;QAC1B,OAAO;KACR;IAED,MAAM,iBAAiB,GAAG,IAAA,0BAAiB,EACzC,WAAW,EACX,aAAa,EACb,GAAG,iBAAiB,KAAK,CAC1B,CAAC;IACF,MAAM,KAAK,GAAG,IAAA,6BAAiB,EAAC,IAAI,EAAE,iBAAiB,EAAE,4CAAmB,CAAC,CAAC;IAC9E,MAAM,iBAAiB,GAAG,IAAA,6CAAoB,EAAC,IAAI,EAAE,iBAAiB,CAAC,CAAC;IAExE,IAAA,sBAAa,EAAC,IAAI,EAAE,YAAY,EAAE,cAAc,EAAE;QAChD,WAAW;QACX,iBAAiB;QACjB,aAAa;QACb,iBAAiB;QACjB,KAAK;QACL,OAAO,EAAE,YAAY,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS;KAC5C,CAAC,CAAC;IAEH,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;QACvB,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;KACnB;AACH,CAAC;AAzDD,sEAyDC;AAED,kBAAe,6BAA6B,CAAC"}
|
|
File without changes
|
|
@@ -9,6 +9,8 @@ export declare class E2eMigrator extends ProjectMigrator<SupportedTargets> {
|
|
|
9
9
|
private appConfig;
|
|
10
10
|
private appName;
|
|
11
11
|
private isProjectUsingEsLint;
|
|
12
|
+
private cypressInstalledVersion;
|
|
13
|
+
private cypressPreset;
|
|
12
14
|
constructor(tree: Tree, options: GeneratorOptions, project: MigrationProjectConfiguration, lintTargetName: string | undefined, logger?: Logger);
|
|
13
15
|
migrate(): Promise<void>;
|
|
14
16
|
validate(): ValidationResult;
|
|
@@ -19,8 +21,18 @@ export declare class E2eMigrator extends ProjectMigrator<SupportedTargets> {
|
|
|
19
21
|
private updateCypressProjectConfiguration;
|
|
20
22
|
private updateE2eCypressTarget;
|
|
21
23
|
private updateCypressConfigFilePaths;
|
|
22
|
-
private
|
|
23
|
-
private
|
|
24
|
+
private cypressConfigGlobToNewGlob;
|
|
25
|
+
private cypressConfigSrcPathToNewPath;
|
|
26
|
+
private cypressConfigDistPathToNewPath;
|
|
27
|
+
private updateCypress10ConfigFile;
|
|
28
|
+
private updateCypressComponentConfig;
|
|
29
|
+
private updateCypressE2EConfig;
|
|
30
|
+
private updateCypressConfigNodeValue;
|
|
31
|
+
private isValidPathLikePropertyWithStringLiteralValue;
|
|
32
|
+
private normalizeNodeText;
|
|
33
|
+
private getOldCypressConfigFilePath;
|
|
34
|
+
private getDefaultCypressConfigFilePath;
|
|
35
|
+
private findCypressConfigFilePath;
|
|
24
36
|
private isCypressE2eProject;
|
|
25
37
|
private isProtractorE2eProject;
|
|
26
38
|
}
|
|
@@ -3,10 +3,16 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.E2eMigrator = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const cypress_1 = require("@nrwl/cypress");
|
|
6
|
+
const cypress_preset_1 = require("@nrwl/cypress/plugins/cypress-preset");
|
|
7
|
+
const cypress_version_1 = require("@nrwl/cypress/src/utils/cypress-version");
|
|
6
8
|
const devkit_1 = require("@nrwl/devkit");
|
|
7
9
|
const linter_1 = require("@nrwl/linter");
|
|
10
|
+
const ast_utils_1 = require("@nrwl/workspace/src/utilities/ast-utils");
|
|
8
11
|
const typescript_1 = require("@nrwl/workspace/src/utilities/typescript");
|
|
12
|
+
const tsquery_1 = require("@phenomnomnominal/tsquery");
|
|
9
13
|
const path_1 = require("path");
|
|
14
|
+
const typescript_2 = require("typescript");
|
|
15
|
+
const file_change_recorder_1 = require("./file-change-recorder");
|
|
10
16
|
const project_migrator_1 = require("./project.migrator");
|
|
11
17
|
const supportedTargets = {
|
|
12
18
|
e2e: {
|
|
@@ -17,6 +23,18 @@ const supportedTargets = {
|
|
|
17
23
|
],
|
|
18
24
|
},
|
|
19
25
|
};
|
|
26
|
+
const cypressConfig = {
|
|
27
|
+
v9OrLess: {
|
|
28
|
+
srcPaths: ['supportFile', 'supportFolder', 'fixturesFolder'],
|
|
29
|
+
distPaths: ['videosFolder', 'screenshotsFolder', 'downloadsFolder'],
|
|
30
|
+
globPatterns: ['excludeSpecPattern', 'specPattern'],
|
|
31
|
+
},
|
|
32
|
+
v10OrMore: {
|
|
33
|
+
srcPaths: ['supportFile', 'supportFolder', 'fixturesFolder'],
|
|
34
|
+
distPaths: ['videosFolder', 'screenshotsFolder', 'downloadsFolder'],
|
|
35
|
+
globPatterns: ['excludeSpecPattern', 'specPattern'],
|
|
36
|
+
},
|
|
37
|
+
};
|
|
20
38
|
class E2eMigrator extends project_migrator_1.ProjectMigrator {
|
|
21
39
|
constructor(tree, options, project, lintTargetName, logger) {
|
|
22
40
|
var _a;
|
|
@@ -93,14 +111,16 @@ class E2eMigrator extends project_migrator_1.ProjectMigrator {
|
|
|
93
111
|
}
|
|
94
112
|
if (this.isCypressE2eProject()) {
|
|
95
113
|
const configFile = (_a = this.projectConfig.targets[this.targetNames.e2e].options) === null || _a === void 0 ? void 0 : _a.configFile;
|
|
96
|
-
if (configFile === undefined &&
|
|
97
|
-
|
|
114
|
+
if (configFile === undefined && !this.getOldCypressConfigFilePath()) {
|
|
115
|
+
const expectedConfigFile = this.cypressInstalledVersion < 10
|
|
116
|
+
? 'cypress.json'
|
|
117
|
+
: 'cypress.config.{ts,js,mjs,cjs}';
|
|
98
118
|
return [
|
|
99
119
|
{
|
|
100
120
|
message: `The "e2e" target is using the "@cypress/schematic:cypress" builder but the "configFile" option is not specified ` +
|
|
101
|
-
`and a "
|
|
121
|
+
`and a "${expectedConfigFile}" file could not be found at the project root.`,
|
|
102
122
|
hint: `Make sure the "${this.appName}.architect.e2e.options.configFile" option is set to a valid path, ` +
|
|
103
|
-
`or that a "
|
|
123
|
+
`or that a "${expectedConfigFile}" file exists at the project root, ` +
|
|
104
124
|
`or remove the "${this.appName}.architect.e2e" target if it is not valid.`,
|
|
105
125
|
},
|
|
106
126
|
];
|
|
@@ -143,6 +163,7 @@ class E2eMigrator extends project_migrator_1.ProjectMigrator {
|
|
|
143
163
|
newSourceRoot });
|
|
144
164
|
}
|
|
145
165
|
else if (this.isCypressE2eProject()) {
|
|
166
|
+
this.cypressInstalledVersion = (0, cypress_version_1.installedCypressVersion)();
|
|
146
167
|
this.project = Object.assign(Object.assign({}, this.project), { name, oldSourceRoot: (0, devkit_1.joinPathFragments)(this.project.oldRoot, 'cypress'), newRoot,
|
|
147
168
|
newSourceRoot });
|
|
148
169
|
}
|
|
@@ -181,7 +202,7 @@ class E2eMigrator extends project_migrator_1.ProjectMigrator {
|
|
|
181
202
|
}
|
|
182
203
|
migrateCypressE2eProject() {
|
|
183
204
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
184
|
-
const oldCypressConfigFilePath = this.
|
|
205
|
+
const oldCypressConfigFilePath = this.getOldCypressConfigFilePath();
|
|
185
206
|
yield (0, cypress_1.cypressProjectGenerator)(this.tree, {
|
|
186
207
|
name: this.project.name,
|
|
187
208
|
project: this.appName,
|
|
@@ -203,28 +224,13 @@ class E2eMigrator extends project_migrator_1.ProjectMigrator {
|
|
|
203
224
|
});
|
|
204
225
|
}
|
|
205
226
|
updateOrCreateCypressConfigFile(configFile) {
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
cypressConfigFilePath = (0, devkit_1.joinPathFragments)(this.project.newRoot, (0, path_1.basename)(configFile));
|
|
209
|
-
this.updateCypressConfigFilePaths(configFile);
|
|
210
|
-
this.tree.delete(cypressConfigFilePath);
|
|
211
|
-
this.moveFile(configFile, cypressConfigFilePath);
|
|
212
|
-
}
|
|
213
|
-
else {
|
|
214
|
-
cypressConfigFilePath = (0, devkit_1.joinPathFragments)(this.project.newRoot, 'cypress.json');
|
|
215
|
-
(0, devkit_1.writeJson)(this.tree, cypressConfigFilePath, {
|
|
216
|
-
fileServerFolder: '.',
|
|
217
|
-
fixturesFolder: './src/fixtures',
|
|
218
|
-
integrationFolder: './src/integration',
|
|
219
|
-
modifyObstructiveCode: false,
|
|
220
|
-
supportFile: './src/support/index.ts',
|
|
221
|
-
pluginsFile: './src/plugins/index.ts',
|
|
222
|
-
video: true,
|
|
223
|
-
videosFolder: `../../dist/cypress/${this.project.newRoot}/videos`,
|
|
224
|
-
screenshotsFolder: `../../dist/cypress/${this.project.newRoot}/screenshots`,
|
|
225
|
-
chromeWebSecurity: false,
|
|
226
|
-
});
|
|
227
|
+
if (!configFile) {
|
|
228
|
+
return this.getDefaultCypressConfigFilePath();
|
|
227
229
|
}
|
|
230
|
+
const cypressConfigFilePath = (0, devkit_1.joinPathFragments)(this.project.newRoot, (0, path_1.basename)(configFile));
|
|
231
|
+
this.updateCypressConfigFilePaths(configFile);
|
|
232
|
+
this.tree.delete(cypressConfigFilePath);
|
|
233
|
+
this.moveFile(configFile, cypressConfigFilePath);
|
|
228
234
|
return cypressConfigFilePath;
|
|
229
235
|
}
|
|
230
236
|
updateCypressProjectConfiguration(cypressConfigPath) {
|
|
@@ -280,53 +286,278 @@ class E2eMigrator extends project_migrator_1.ProjectMigrator {
|
|
|
280
286
|
return updatedTarget;
|
|
281
287
|
}
|
|
282
288
|
updateCypressConfigFilePaths(configFilePath) {
|
|
283
|
-
|
|
289
|
+
if (this.cypressInstalledVersion >= 10) {
|
|
290
|
+
this.updateCypress10ConfigFile(configFilePath);
|
|
291
|
+
return;
|
|
292
|
+
}
|
|
293
|
+
const srcPaths = [
|
|
284
294
|
'integrationFolder',
|
|
285
295
|
'supportFile',
|
|
286
296
|
'pluginsFile',
|
|
287
297
|
'fixturesFolder',
|
|
288
298
|
];
|
|
289
|
-
const
|
|
290
|
-
const
|
|
299
|
+
const distPaths = ['videosFolder', 'screenshotsFolder'];
|
|
300
|
+
const globPatterns = ['ignoreTestFiles', 'testFiles'];
|
|
291
301
|
const cypressConfig = (0, devkit_1.readJson)(this.tree, configFilePath);
|
|
292
302
|
cypressConfig.fileServerFolder = '.';
|
|
293
|
-
|
|
294
|
-
if (cypressConfig[
|
|
295
|
-
cypressConfig[
|
|
303
|
+
srcPaths.forEach((path) => {
|
|
304
|
+
if (cypressConfig[path]) {
|
|
305
|
+
cypressConfig[path] = this.cypressConfigSrcPathToNewPath(cypressConfig[path]);
|
|
296
306
|
}
|
|
297
307
|
});
|
|
298
|
-
|
|
299
|
-
if (cypressConfig[
|
|
300
|
-
cypressConfig[
|
|
308
|
+
distPaths.forEach((path) => {
|
|
309
|
+
if (cypressConfig[path]) {
|
|
310
|
+
cypressConfig[path] = this.cypressConfigDistPathToNewPath(cypressConfig[path]);
|
|
301
311
|
}
|
|
302
312
|
});
|
|
303
|
-
|
|
313
|
+
globPatterns.forEach((stringOrArrayGlob) => {
|
|
304
314
|
if (!cypressConfig[stringOrArrayGlob]) {
|
|
305
315
|
return;
|
|
306
316
|
}
|
|
307
317
|
if (Array.isArray(cypressConfig[stringOrArrayGlob])) {
|
|
308
|
-
cypressConfig[stringOrArrayGlob] = cypressConfig[stringOrArrayGlob].map((glob) => this.
|
|
318
|
+
cypressConfig[stringOrArrayGlob] = cypressConfig[stringOrArrayGlob].map((glob) => this.cypressConfigGlobToNewGlob(glob));
|
|
309
319
|
}
|
|
310
320
|
else {
|
|
311
|
-
cypressConfig[stringOrArrayGlob] = this.
|
|
321
|
+
cypressConfig[stringOrArrayGlob] = this.cypressConfigGlobToNewGlob(cypressConfig[stringOrArrayGlob]);
|
|
312
322
|
}
|
|
313
323
|
});
|
|
314
324
|
(0, devkit_1.writeJson)(this.tree, configFilePath, cypressConfig);
|
|
315
325
|
}
|
|
316
|
-
|
|
317
|
-
return globPattern
|
|
326
|
+
cypressConfigGlobToNewGlob(globPattern) {
|
|
327
|
+
return globPattern
|
|
328
|
+
? globPattern.replace(new RegExp(`^(\\.\\/|\\/)?${(0, path_1.relative)(this.project.oldRoot, this.project.oldSourceRoot)}\\/`), 'src/')
|
|
329
|
+
: undefined;
|
|
330
|
+
}
|
|
331
|
+
cypressConfigSrcPathToNewPath(path) {
|
|
332
|
+
return path
|
|
333
|
+
? (0, devkit_1.joinPathFragments)('src', (0, path_1.relative)(this.project.oldSourceRoot, (0, devkit_1.joinPathFragments)(this.project.oldRoot, path)))
|
|
334
|
+
: undefined;
|
|
335
|
+
}
|
|
336
|
+
cypressConfigDistPathToNewPath(path) {
|
|
337
|
+
return path
|
|
338
|
+
? (0, devkit_1.joinPathFragments)('../../dist/cypress/', this.project.newRoot, (0, path_1.relative)(this.project.oldSourceRoot, (0, devkit_1.joinPathFragments)(this.project.oldRoot, path)))
|
|
339
|
+
: undefined;
|
|
340
|
+
}
|
|
341
|
+
updateCypress10ConfigFile(configFilePath) {
|
|
342
|
+
this.cypressPreset = (0, cypress_preset_1.nxE2EPreset)(this.project.newRoot);
|
|
343
|
+
const fileContent = this.tree.read(configFilePath, 'utf-8');
|
|
344
|
+
let sourceFile = tsquery_1.tsquery.ast(fileContent);
|
|
345
|
+
const recorder = new file_change_recorder_1.FileChangeRecorder(this.tree, configFilePath);
|
|
346
|
+
const defineConfigExpression = tsquery_1.tsquery.query(sourceFile, 'CallExpression:has(Identifier[name=defineConfig]) > ObjectLiteralExpression')[0];
|
|
347
|
+
if (!defineConfigExpression) {
|
|
348
|
+
this.logger.warn(`Could not find a "defineConfig" expression in "${configFilePath}". Skipping updating the Cypress configuration.`);
|
|
349
|
+
return;
|
|
350
|
+
}
|
|
351
|
+
let e2eNode;
|
|
352
|
+
let componentNode;
|
|
353
|
+
const globalConfig = {};
|
|
354
|
+
defineConfigExpression.forEachChild((node) => {
|
|
355
|
+
if ((0, typescript_2.isPropertyAssignment)(node) && node.name.getText() === 'component') {
|
|
356
|
+
componentNode = node;
|
|
357
|
+
return;
|
|
358
|
+
}
|
|
359
|
+
if ((0, typescript_2.isPropertyAssignment)(node) && node.name.getText() === 'e2e') {
|
|
360
|
+
e2eNode = node;
|
|
361
|
+
return;
|
|
362
|
+
}
|
|
363
|
+
if ((0, typescript_2.isPropertyAssignment)(node)) {
|
|
364
|
+
this.updateCypressConfigNodeValue(recorder, node, globalConfig);
|
|
365
|
+
}
|
|
366
|
+
});
|
|
367
|
+
this.updateCypressComponentConfig(componentNode, recorder);
|
|
368
|
+
this.updateCypressE2EConfig(configFilePath, defineConfigExpression, e2eNode, recorder, globalConfig);
|
|
369
|
+
recorder.applyChanges();
|
|
370
|
+
}
|
|
371
|
+
updateCypressComponentConfig(componentNode, recorder) {
|
|
372
|
+
if (!componentNode) {
|
|
373
|
+
return;
|
|
374
|
+
}
|
|
375
|
+
if (!(0, typescript_2.isObjectLiteralExpression)(componentNode.initializer)) {
|
|
376
|
+
this.logger.warn('The automatic migration only supports having an object literal in the "component" option of the Cypress configuration. ' +
|
|
377
|
+
`The configuration won't be updated. Please make sure to update any paths you may have in the "component" option ` +
|
|
378
|
+
'manually to point to the new location.');
|
|
379
|
+
return;
|
|
380
|
+
}
|
|
381
|
+
componentNode.initializer.properties.forEach((node) => {
|
|
382
|
+
if ((0, typescript_2.isPropertyAssignment)(node)) {
|
|
383
|
+
this.updateCypressConfigNodeValue(recorder, node);
|
|
384
|
+
}
|
|
385
|
+
});
|
|
386
|
+
}
|
|
387
|
+
updateCypressE2EConfig(configFilePath, defineConfigNode, e2eNode, recorder, _a) {
|
|
388
|
+
var globalConfig = tslib_1.__rest(_a, []);
|
|
389
|
+
const e2eConfig = {};
|
|
390
|
+
const presetSpreadAssignment = `...nxE2EPreset(__dirname),`;
|
|
391
|
+
if (!e2eNode) {
|
|
392
|
+
// add the e2e node with the preset and properties that need to overwrite
|
|
393
|
+
// the preset
|
|
394
|
+
const e2eAssignment = (0, devkit_1.stripIndents) `e2e: {
|
|
395
|
+
${presetSpreadAssignment}
|
|
396
|
+
${Object.entries(globalConfig)
|
|
397
|
+
.filter(([key, value]) => !e2eConfig[key] && value !== this.cypressPreset[key])
|
|
398
|
+
.map(([key, value]) => `${key}: '${value}'`)
|
|
399
|
+
.join(',\n')}
|
|
400
|
+
},`;
|
|
401
|
+
recorder.insertRight(defineConfigNode.getStart() + 1, e2eAssignment);
|
|
402
|
+
}
|
|
403
|
+
else {
|
|
404
|
+
if (!(0, typescript_2.isObjectLiteralExpression)(e2eNode.initializer)) {
|
|
405
|
+
this.logger.warn('The automatic migration only supports having an object literal in the "e2e" option of the Cypress configuration. ' +
|
|
406
|
+
`The configuration won't be updated. Please make sure to update any paths you might have in the "e2e" option ` +
|
|
407
|
+
'manually to point to the new location.');
|
|
408
|
+
return;
|
|
409
|
+
}
|
|
410
|
+
recorder.insertRight(e2eNode.initializer.getStart() + 1, presetSpreadAssignment);
|
|
411
|
+
e2eNode.initializer.properties.forEach((node) => {
|
|
412
|
+
if (!(0, typescript_2.isPropertyAssignment)(node)) {
|
|
413
|
+
return;
|
|
414
|
+
}
|
|
415
|
+
let change = { type: 'ignore' };
|
|
416
|
+
const property = this.normalizeNodeText(node.name.getText());
|
|
417
|
+
const oldValue = this.normalizeNodeText(node.initializer.getText());
|
|
418
|
+
e2eConfig[property] = oldValue;
|
|
419
|
+
const createChange = (newValue) => {
|
|
420
|
+
if (newValue === this.cypressPreset[property]) {
|
|
421
|
+
return { type: 'remove' };
|
|
422
|
+
}
|
|
423
|
+
return { type: 'replace', value: newValue };
|
|
424
|
+
};
|
|
425
|
+
if (this.isValidPathLikePropertyWithStringLiteralValue(node, cypressConfig.v10OrMore.srcPaths)) {
|
|
426
|
+
const newValue = this.cypressConfigSrcPathToNewPath(oldValue);
|
|
427
|
+
change = createChange(newValue);
|
|
428
|
+
}
|
|
429
|
+
else if (this.isValidPathLikePropertyWithStringLiteralValue(node, cypressConfig.v10OrMore.distPaths)) {
|
|
430
|
+
const newValue = this.cypressConfigDistPathToNewPath(oldValue);
|
|
431
|
+
change = createChange(newValue);
|
|
432
|
+
}
|
|
433
|
+
else if (this.isValidPathLikePropertyWithStringLiteralValue(node, cypressConfig.v10OrMore.globPatterns)) {
|
|
434
|
+
const newValue = this.cypressConfigGlobToNewGlob(oldValue);
|
|
435
|
+
change = createChange(newValue);
|
|
436
|
+
}
|
|
437
|
+
if (change.type === 'replace') {
|
|
438
|
+
recorder.replace(node.initializer, `'${change.value}'`);
|
|
439
|
+
e2eConfig[property] = change.value;
|
|
440
|
+
}
|
|
441
|
+
else if (change.type === 'remove') {
|
|
442
|
+
const trailingCommaMatch = recorder.originalContent
|
|
443
|
+
.slice(node.getEnd())
|
|
444
|
+
.match(/^\s*,/);
|
|
445
|
+
if (trailingCommaMatch) {
|
|
446
|
+
recorder.remove(node.getFullStart(), node.getEnd() + trailingCommaMatch[0].length);
|
|
447
|
+
}
|
|
448
|
+
else {
|
|
449
|
+
recorder.remove(node.getFullStart(), node.getEnd());
|
|
450
|
+
}
|
|
451
|
+
delete e2eConfig[property];
|
|
452
|
+
delete globalConfig[property];
|
|
453
|
+
}
|
|
454
|
+
});
|
|
455
|
+
// add any global config that was present and that would be overwritten
|
|
456
|
+
// by the preset
|
|
457
|
+
Object.entries(globalConfig).forEach(([key, value]) => {
|
|
458
|
+
if (e2eConfig[key] || value === this.cypressPreset[key]) {
|
|
459
|
+
return;
|
|
460
|
+
}
|
|
461
|
+
recorder.insertRight(e2eNode.initializer.getStart() + 1, `${key}: '${value}',`);
|
|
462
|
+
});
|
|
463
|
+
}
|
|
464
|
+
// apply changes so we can apply AST transformations
|
|
465
|
+
recorder.applyChanges();
|
|
466
|
+
const sourceFile = tsquery_1.tsquery.ast(recorder.content);
|
|
467
|
+
(0, ast_utils_1.insertImport)(this.tree, sourceFile, configFilePath, 'nxE2EPreset', '@nrwl/cypress/plugins/cypress-preset');
|
|
468
|
+
// update recorder with the new content from the file
|
|
469
|
+
recorder.setContentToFileContent();
|
|
470
|
+
}
|
|
471
|
+
updateCypressConfigNodeValue(recorder, node, configCollected) {
|
|
472
|
+
let newValue;
|
|
473
|
+
const oldValue = this.normalizeNodeText(node.initializer.getText());
|
|
474
|
+
if (this.isValidPathLikePropertyWithStringLiteralValue(node, cypressConfig.v10OrMore.srcPaths)) {
|
|
475
|
+
newValue = this.cypressConfigSrcPathToNewPath(oldValue);
|
|
476
|
+
}
|
|
477
|
+
else if (this.isValidPathLikePropertyWithStringLiteralValue(node, cypressConfig.v10OrMore.distPaths)) {
|
|
478
|
+
newValue = this.cypressConfigDistPathToNewPath(oldValue);
|
|
479
|
+
}
|
|
480
|
+
else if (this.isValidPathLikePropertyWithStringLiteralValue(node, cypressConfig.v10OrMore.globPatterns)) {
|
|
481
|
+
newValue = this.cypressConfigGlobToNewGlob(oldValue);
|
|
482
|
+
}
|
|
483
|
+
if (newValue) {
|
|
484
|
+
recorder.replace(node.initializer, `'${newValue}'`);
|
|
485
|
+
if (configCollected) {
|
|
486
|
+
configCollected[node.name.getText()] = newValue;
|
|
487
|
+
}
|
|
488
|
+
}
|
|
318
489
|
}
|
|
319
|
-
|
|
320
|
-
|
|
490
|
+
isValidPathLikePropertyWithStringLiteralValue(node, properties) {
|
|
491
|
+
if (!(0, typescript_2.isPropertyAssignment)(node)) {
|
|
492
|
+
// TODO(leo): handle more scenarios (spread assignments, etc)
|
|
493
|
+
return false;
|
|
494
|
+
}
|
|
495
|
+
const property = properties.find((p) => p === node.name.getText());
|
|
496
|
+
if (!property) {
|
|
497
|
+
return false;
|
|
498
|
+
}
|
|
499
|
+
if (node.initializer.kind === typescript_2.SyntaxKind.UndefinedKeyword ||
|
|
500
|
+
node.initializer.kind === typescript_2.SyntaxKind.NullKeyword ||
|
|
501
|
+
node.initializer.kind === typescript_2.SyntaxKind.FalseKeyword) {
|
|
502
|
+
return false;
|
|
503
|
+
}
|
|
504
|
+
if (!(0, typescript_2.isStringLiteralLike)(node.initializer)) {
|
|
505
|
+
if ((0, typescript_2.isTemplateExpression)(node.initializer)) {
|
|
506
|
+
this.logger.warn(`The "${node.name.getText()}" in the Cypress configuration file is set to a template expression ("${node.initializer.getText()}"). ` +
|
|
507
|
+
`This is not supported by the automatic migration and its value won't be automatically migrated. ` +
|
|
508
|
+
`Please make sure to update its value to match the new location if needed.`);
|
|
509
|
+
}
|
|
510
|
+
else {
|
|
511
|
+
this.logger.warn(`The "${node.name.getText()}" in the Cypress configuration file is not set to a string literal ("${node.initializer.getText()}"). ` +
|
|
512
|
+
`This is not supported by the automatic migration and its value won't be automatically migrated. ` +
|
|
513
|
+
`Please make sure to update its value to match the new location if needed.`);
|
|
514
|
+
}
|
|
515
|
+
return false;
|
|
516
|
+
}
|
|
517
|
+
return true;
|
|
518
|
+
}
|
|
519
|
+
normalizeNodeText(value) {
|
|
520
|
+
return value.replace(/['"`]/g, '');
|
|
521
|
+
}
|
|
522
|
+
getOldCypressConfigFilePath() {
|
|
523
|
+
let cypressConfig;
|
|
321
524
|
const configFileOption = this.projectConfig.targets.e2e.options.configFile;
|
|
322
525
|
if (configFileOption === false) {
|
|
323
|
-
cypressConfig =
|
|
526
|
+
cypressConfig = null;
|
|
324
527
|
}
|
|
325
528
|
else if (typeof configFileOption === 'string') {
|
|
326
529
|
cypressConfig = (0, path_1.basename)(configFileOption);
|
|
327
530
|
}
|
|
531
|
+
else {
|
|
532
|
+
cypressConfig = this.findCypressConfigFilePath(this.project.oldRoot);
|
|
533
|
+
}
|
|
328
534
|
return cypressConfig;
|
|
329
535
|
}
|
|
536
|
+
getDefaultCypressConfigFilePath() {
|
|
537
|
+
return this.cypressInstalledVersion < 10
|
|
538
|
+
? (0, devkit_1.joinPathFragments)(this.project.newRoot, 'cypress.json')
|
|
539
|
+
: (0, devkit_1.joinPathFragments)(this.project.newRoot, 'cypress.config.ts');
|
|
540
|
+
}
|
|
541
|
+
findCypressConfigFilePath(dir) {
|
|
542
|
+
if (this.cypressInstalledVersion < 10) {
|
|
543
|
+
return this.tree.exists((0, devkit_1.joinPathFragments)(dir, 'cypress.json'))
|
|
544
|
+
? (0, devkit_1.joinPathFragments)(dir, 'cypress.json')
|
|
545
|
+
: null;
|
|
546
|
+
}
|
|
547
|
+
// https://docs.cypress.io/guides/references/configuration#Configuration-File
|
|
548
|
+
const possibleFiles = [
|
|
549
|
+
(0, devkit_1.joinPathFragments)(dir, 'cypress.config.ts'),
|
|
550
|
+
(0, devkit_1.joinPathFragments)(dir, 'cypress.config.js'),
|
|
551
|
+
(0, devkit_1.joinPathFragments)(dir, 'cypress.config.mjs'),
|
|
552
|
+
(0, devkit_1.joinPathFragments)(dir, 'cypress.config.cjs'),
|
|
553
|
+
];
|
|
554
|
+
for (const file of possibleFiles) {
|
|
555
|
+
if (this.tree.exists(file)) {
|
|
556
|
+
return file;
|
|
557
|
+
}
|
|
558
|
+
}
|
|
559
|
+
return null;
|
|
560
|
+
}
|
|
330
561
|
isCypressE2eProject() {
|
|
331
562
|
return (this.projectConfig.targets[this.targetNames.e2e].executor ===
|
|
332
563
|
'@cypress/schematic:cypress');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"e2e.migrator.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/ng-add/utilities/e2e.migrator.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"e2e.migrator.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/ng-add/utilities/e2e.migrator.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
import type { Tree } from '@nrwl/devkit';
|
|
2
|
+
import type { Node } from 'typescript';
|
|
3
|
+
export declare class FileChangeRecorder {
|
|
4
|
+
private readonly tree;
|
|
5
|
+
private readonly filePath;
|
|
6
|
+
private mutableContent;
|
|
7
|
+
get content(): string;
|
|
8
|
+
get originalContent(): string;
|
|
9
|
+
constructor(tree: Tree, filePath: string);
|
|
10
|
+
applyChanges(): void;
|
|
11
|
+
insertLeft(index: number, content: string): void;
|
|
12
|
+
insertRight(index: number, content: string): void;
|
|
13
|
+
remove(index: number, length: number): void;
|
|
14
|
+
replace(node: Node, content: string): void;
|
|
15
|
+
setContentToFileContent(): void;
|
|
16
|
+
}
|
|
@@ -0,0 +1,37 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.FileChangeRecorder = void 0;
|
|
4
|
+
const magic_string_1 = require("magic-string");
|
|
5
|
+
class FileChangeRecorder {
|
|
6
|
+
constructor(tree, filePath) {
|
|
7
|
+
this.tree = tree;
|
|
8
|
+
this.filePath = filePath;
|
|
9
|
+
this.setContentToFileContent();
|
|
10
|
+
}
|
|
11
|
+
get content() {
|
|
12
|
+
return this.mutableContent.toString();
|
|
13
|
+
}
|
|
14
|
+
get originalContent() {
|
|
15
|
+
return this.mutableContent.original;
|
|
16
|
+
}
|
|
17
|
+
applyChanges() {
|
|
18
|
+
this.tree.write(this.filePath, this.mutableContent.toString());
|
|
19
|
+
}
|
|
20
|
+
insertLeft(index, content) {
|
|
21
|
+
this.mutableContent.appendLeft(index, content);
|
|
22
|
+
}
|
|
23
|
+
insertRight(index, content) {
|
|
24
|
+
this.mutableContent.appendRight(index, content);
|
|
25
|
+
}
|
|
26
|
+
remove(index, length) {
|
|
27
|
+
this.mutableContent.remove(index, length);
|
|
28
|
+
}
|
|
29
|
+
replace(node, content) {
|
|
30
|
+
this.mutableContent.overwrite(node.getStart(), node.getEnd(), content);
|
|
31
|
+
}
|
|
32
|
+
setContentToFileContent() {
|
|
33
|
+
this.mutableContent = new magic_string_1.default(this.tree.read(this.filePath, 'utf-8'));
|
|
34
|
+
}
|
|
35
|
+
}
|
|
36
|
+
exports.FileChangeRecorder = FileChangeRecorder;
|
|
37
|
+
//# sourceMappingURL=file-change-recorder.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"file-change-recorder.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/ng-add/utilities/file-change-recorder.ts"],"names":[],"mappings":";;;AACA,+CAAuC;AAGvC,MAAa,kBAAkB;IAU7B,YAA6B,IAAU,EAAmB,QAAgB;QAA7C,SAAI,GAAJ,IAAI,CAAM;QAAmB,aAAQ,GAAR,QAAQ,CAAQ;QACxE,IAAI,CAAC,uBAAuB,EAAE,CAAC;IACjC,CAAC;IATD,IAAI,OAAO;QACT,OAAO,IAAI,CAAC,cAAc,CAAC,QAAQ,EAAE,CAAC;IACxC,CAAC;IACD,IAAI,eAAe;QACjB,OAAO,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC;IACtC,CAAC;IAMD,YAAY;QACV,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,cAAc,CAAC,QAAQ,EAAE,CAAC,CAAC;IACjE,CAAC;IAED,UAAU,CAAC,KAAa,EAAE,OAAe;QACvC,IAAI,CAAC,cAAc,CAAC,UAAU,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;IACjD,CAAC;IAED,WAAW,CAAC,KAAa,EAAE,OAAe;QACxC,IAAI,CAAC,cAAc,CAAC,WAAW,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;IAClD,CAAC;IAED,MAAM,CAAC,KAAa,EAAE,MAAc;QAClC,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;IAC5C,CAAC;IAED,OAAO,CAAC,IAAU,EAAE,OAAe;QACjC,IAAI,CAAC,cAAc,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,IAAI,CAAC,MAAM,EAAE,EAAE,OAAO,CAAC,CAAC;IACzE,CAAC;IAED,uBAAuB;QACrB,IAAI,CAAC,cAAc,GAAG,IAAI,sBAAW,CACnC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,OAAO,CAAC,CACvC,CAAC;IACJ,CAAC;CACF;AAvCD,gDAuCC"}
|
|
@@ -3,12 +3,20 @@ export interface NgRxGeneratorOptions {
|
|
|
3
3
|
minimal: boolean;
|
|
4
4
|
module: string;
|
|
5
5
|
name: string;
|
|
6
|
-
useDataPersistence: boolean;
|
|
7
6
|
barrels?: boolean;
|
|
8
7
|
facade?: boolean;
|
|
9
8
|
root?: boolean;
|
|
10
9
|
skipFormat?: boolean;
|
|
11
10
|
skipImport?: boolean;
|
|
12
11
|
skipPackageJson?: boolean;
|
|
12
|
+
/**
|
|
13
|
+
* @deprecated This option is deprecated and will be removed in v15.
|
|
14
|
+
* Using the individual operators is recommended.
|
|
15
|
+
*/
|
|
16
|
+
useDataPersistence?: boolean;
|
|
17
|
+
/**
|
|
18
|
+
* @deprecated Always use the `creators` value. The `classes` syntax is
|
|
19
|
+
* deprecated and this option will be removed in v15.
|
|
20
|
+
*/
|
|
13
21
|
syntax?: 'classes' | 'creators';
|
|
14
22
|
}
|