@nrwl/angular 14.4.1 → 14.5.0-beta.1
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/ng-package.json +2 -1
- package/package.json +10 -9
- package/src/executors/ng-packagr-lite/ng-packagr-adjustments/ts/cache-compiler-host.js +13 -6
- package/src/executors/ng-packagr-lite/ng-packagr-adjustments/ts/cache-compiler-host.js.map +1 -1
- package/src/executors/package/ng-packagr-adjustments/ts/cache-compiler-host.js +13 -6
- package/src/executors/package/ng-packagr-adjustments/ts/cache-compiler-host.js.map +1 -1
- package/src/generators/application/application.js +3 -1
- package/src/generators/application/application.js.map +1 -1
- package/src/generators/application/schema.d.ts +1 -0
- package/src/generators/application/schema.json +5 -0
- package/src/generators/component-cypress-spec/component-cypress-spec.js +8 -7
- 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/component-cypress-spec/schema.d.ts +1 -0
- package/src/generators/component-cypress-spec/schema.json +4 -0
- package/src/generators/library/lib/add-load-children.js +2 -31
- package/src/generators/library/lib/add-load-children.js.map +1 -1
- package/src/generators/library-secondary-entry-point/schema.json +4 -1
- 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/remote/remote.js +1 -1
- package/src/generators/remote/remote.js.map +1 -1
- package/src/generators/remote/schema.json +4 -1
- package/src/generators/setup-mf/schema.json +2 -1
- package/src/generators/stories/lib/component-info.d.ts +4 -2
- package/src/generators/stories/lib/component-info.js +34 -14
- package/src/generators/stories/lib/component-info.js.map +1 -1
- package/src/generators/stories/lib/entry-point.d.ts +7 -0
- package/src/generators/stories/lib/entry-point.js +65 -0
- package/src/generators/stories/lib/entry-point.js.map +1 -0
- package/src/generators/stories/lib/module-info.d.ts +2 -1
- package/src/generators/stories/lib/module-info.js +11 -4
- package/src/generators/stories/lib/module-info.js.map +1 -1
- package/src/generators/stories/schema.json +4 -2
- package/src/generators/stories/stories.js +8 -7
- package/src/generators/stories/stories.js.map +1 -1
- package/src/generators/storybook-configuration/schema.json +5 -2
- package/src/migrations/update-14-5-0/migrate-mfe-to-mf.js +4 -3
- package/src/migrations/update-14-5-0/migrate-mfe-to-mf.js.map +1 -1
- package/src/utils/mf/with-module-federation.js +1 -1
- package/src/utils/mf/with-module-federation.js.map +1 -1
- package/.eslintrc.json +0 -38
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,6 @@
|
|
|
3
3
|
All notable changes to this project will be documented in this file.
|
|
4
4
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
|
5
5
|
|
|
6
|
-
|
|
6
|
+
# [14.5.0-beta.1](https://github.com/nrwl/nx/compare/14.4.2...14.5.0-beta.1) (2022-07-14)
|
|
7
7
|
|
|
8
8
|
**Note:** Version bump only for package @nrwl/angular
|
package/ng-package.json
CHANGED
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nrwl/angular",
|
|
3
|
-
"version": "14.
|
|
3
|
+
"version": "14.5.0-beta.1",
|
|
4
4
|
"description": "The Nx Plugin for Angular contains executors, generators, and utilities for managing Angular applications and libraries within an Nx workspace. It provides: \n\n- Integration with libraries such as Storybook, Jest, ESLint, Tailwind CSS, Cypress, Karma, and Protractor. \n\n- Generators to help scaffold code quickly (like: Micro Frontends, Libraries, both internal to your codebase and publishable to npm) \n\n- Upgrading AngularJS applications \n\n- Single Component Application Modules (SCAMs) \n\n- NgRx helpers. \n\n- Utilities for automatic workspace refactoring.",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -65,13 +65,13 @@
|
|
|
65
65
|
},
|
|
66
66
|
"dependencies": {
|
|
67
67
|
"@angular-devkit/schematics": "~14.0.0",
|
|
68
|
-
"@nrwl/cypress": "14.
|
|
69
|
-
"@nrwl/devkit": "14.
|
|
70
|
-
"@nrwl/jest": "14.
|
|
71
|
-
"@nrwl/linter": "14.
|
|
72
|
-
"@nrwl/storybook": "14.
|
|
73
|
-
"@nrwl/web": "14.
|
|
74
|
-
"@nrwl/workspace": "14.
|
|
68
|
+
"@nrwl/cypress": "14.5.0-beta.1",
|
|
69
|
+
"@nrwl/devkit": "14.5.0-beta.1",
|
|
70
|
+
"@nrwl/jest": "14.5.0-beta.1",
|
|
71
|
+
"@nrwl/linter": "14.5.0-beta.1",
|
|
72
|
+
"@nrwl/storybook": "14.5.0-beta.1",
|
|
73
|
+
"@nrwl/web": "14.5.0-beta.1",
|
|
74
|
+
"@nrwl/workspace": "14.5.0-beta.1",
|
|
75
75
|
"@phenomnomnominal/tsquery": "4.1.1",
|
|
76
76
|
"@schematics/angular": "~14.0.0",
|
|
77
77
|
"chalk": "4.1.0",
|
|
@@ -79,6 +79,7 @@
|
|
|
79
79
|
"http-server": "^14.1.0",
|
|
80
80
|
"ignore": "^5.0.4",
|
|
81
81
|
"jasmine-marbles": "~0.8.4",
|
|
82
|
+
"magic-string": "~0.26.2",
|
|
82
83
|
"rxjs-for-await": "0.0.2",
|
|
83
84
|
"semver": "7.3.4",
|
|
84
85
|
"ts-node": "~10.8.0",
|
|
@@ -94,5 +95,5 @@
|
|
|
94
95
|
"fesm2015": "fesm2015/nrwl-angular.mjs",
|
|
95
96
|
"typings": "index.d.ts",
|
|
96
97
|
"sideEffects": false,
|
|
97
|
-
"gitHead": "
|
|
98
|
+
"gitHead": "63b74d2a5655c0c09131dfa24a0a024ca7360fca"
|
|
98
99
|
}
|
|
@@ -29,8 +29,9 @@ function cacheCompilerHost(graph, entryPoint, compilerOptions, moduleResolutionC
|
|
|
29
29
|
const node = getNode(fileName);
|
|
30
30
|
entryPoint.dependsOn(node);
|
|
31
31
|
};
|
|
32
|
-
const { flatModuleFile, entryFile } = entryPoint.data.entryPoint;
|
|
32
|
+
const { flatModuleFile, destinationPath, entryFile } = entryPoint.data.entryPoint;
|
|
33
33
|
const flatModuleFileDtsFilename = `${flatModuleFile}.d.ts`;
|
|
34
|
+
const flatModuleFileDtsPath = (0, path_1.ensureUnixPath)(path.join(destinationPath, flatModuleFileDtsFilename));
|
|
34
35
|
const hasIndexEntryFile = path.basename(entryFile.toLowerCase()) === 'index.ts';
|
|
35
36
|
return Object.assign(Object.assign({}, compilerHost), {
|
|
36
37
|
// ts specific
|
|
@@ -49,11 +50,17 @@ function cacheCompilerHost(graph, entryPoint, compilerOptions, moduleResolutionC
|
|
|
49
50
|
return cache.sourceFile;
|
|
50
51
|
}, writeFile: (fileName, data, writeByteOrderMark, onError, sourceFiles) => {
|
|
51
52
|
if (fileName.endsWith('.d.ts')) {
|
|
52
|
-
if (
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
53
|
+
if (fileName === flatModuleFileDtsPath) {
|
|
54
|
+
if (hasIndexEntryFile) {
|
|
55
|
+
// In case the entry file is index.ts, we should not emit the `d.ts` which are a re-export of the `index.ts`.
|
|
56
|
+
// Because it will cause a conflict.
|
|
57
|
+
return;
|
|
58
|
+
}
|
|
59
|
+
else {
|
|
60
|
+
// Rename file to index.d.ts so that TypeScript can resolve types without
|
|
61
|
+
// them needing to be referenced in the package.json manifest.
|
|
62
|
+
fileName = fileName.replace(flatModuleFileDtsFilename, 'index.d.ts');
|
|
63
|
+
}
|
|
57
64
|
}
|
|
58
65
|
// Rename file to index.d.ts so that TypeScript can resolve types without
|
|
59
66
|
// them needing to be referenced in the package.json manifest.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cache-compiler-host.js","sourceRoot":"","sources":["../../../../../../../../packages/angular/src/executors/ng-packagr-lite/ng-packagr-adjustments/ts/cache-compiler-host.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;;AAGH,mCAAoC;AAGpC,oDAAiD;AACjD,2DAA0E;AAC1E,oDAA2D;AAE3D,6BAA6B;AAC7B,iCAAiC;AAGjC,SAAgB,iBAAiB,CAC/B,KAAiB,EACjB,UAA0B,EAC1B,eAAgC,EAChC,qBAA+C,EAC/C,mBAAyC,EACzC,mBAA4D,EAC5D,mBAA8B,UAAU,CAAC,KAAK,CAAC,gBAAgB;IAE/D,MAAM,YAAY,GAAG,EAAE,CAAC,6BAA6B,CAAC,eAAe,CAAC,CAAC;IAEvE,MAAM,OAAO,GAAG,CAAC,QAAgB,EAAE,EAAE;QACnC,MAAM,OAAO,GAAG,IAAA,eAAO,EAAC,IAAA,qBAAc,EAAC,QAAQ,CAAC,CAAC,CAAC;QAClD,IAAI,IAAI,GAAG,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QAE9B,IAAI,CAAC,IAAI,EAAE;YACT,IAAI,GAAG,IAAI,WAAI,CAAC,OAAO,CAAC,CAAC;YACzB,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;SACjB;QAED,OAAO,IAAI,CAAC;IACd,CAAC,CAAC;IAEF,MAAM,WAAW,GAAG,CAAC,QAAgB,EAAE,EAAE;QACvC,MAAM,IAAI,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;QAC/B,UAAU,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;IAC7B,CAAC,CAAC;IAEF,MAAM,EAAE,cAAc,EAAE,SAAS,EAAE,
|
|
1
|
+
{"version":3,"file":"cache-compiler-host.js","sourceRoot":"","sources":["../../../../../../../../packages/angular/src/executors/ng-packagr-lite/ng-packagr-adjustments/ts/cache-compiler-host.ts"],"names":[],"mappings":"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"}
|
|
@@ -29,8 +29,9 @@ function cacheCompilerHost(graph, entryPoint, compilerOptions, moduleResolutionC
|
|
|
29
29
|
const node = getNode(fileName);
|
|
30
30
|
entryPoint.dependsOn(node);
|
|
31
31
|
};
|
|
32
|
-
const { flatModuleFile, entryFile } = entryPoint.data.entryPoint;
|
|
32
|
+
const { flatModuleFile, destinationPath, entryFile } = entryPoint.data.entryPoint;
|
|
33
33
|
const flatModuleFileDtsFilename = `${flatModuleFile}.d.ts`;
|
|
34
|
+
const flatModuleFileDtsPath = (0, path_1.ensureUnixPath)(path.join(destinationPath, flatModuleFileDtsFilename));
|
|
34
35
|
const hasIndexEntryFile = path.basename(entryFile.toLowerCase()) === 'index.ts';
|
|
35
36
|
return Object.assign(Object.assign({}, compilerHost), {
|
|
36
37
|
// ts specific
|
|
@@ -49,11 +50,17 @@ function cacheCompilerHost(graph, entryPoint, compilerOptions, moduleResolutionC
|
|
|
49
50
|
return cache.sourceFile;
|
|
50
51
|
}, writeFile: (fileName, data, writeByteOrderMark, onError, sourceFiles) => {
|
|
51
52
|
if (fileName.endsWith('.d.ts')) {
|
|
52
|
-
if (
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
53
|
+
if (fileName === flatModuleFileDtsPath) {
|
|
54
|
+
if (hasIndexEntryFile) {
|
|
55
|
+
// In case the entry file is index.ts, we should not emit the `d.ts` which are a re-export of the `index.ts`.
|
|
56
|
+
// Because it will cause a conflict.
|
|
57
|
+
return;
|
|
58
|
+
}
|
|
59
|
+
else {
|
|
60
|
+
// Rename file to index.d.ts so that TypeScript can resolve types without
|
|
61
|
+
// them needing to be referenced in the package.json manifest.
|
|
62
|
+
fileName = fileName.replace(flatModuleFileDtsFilename, 'index.d.ts');
|
|
63
|
+
}
|
|
57
64
|
}
|
|
58
65
|
// Rename file to index.d.ts so that TypeScript can resolve types without
|
|
59
66
|
// them needing to be referenced in the package.json manifest.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cache-compiler-host.js","sourceRoot":"","sources":["../../../../../../../../packages/angular/src/executors/package/ng-packagr-adjustments/ts/cache-compiler-host.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;;AAGH,mCAAoC;AAGpC,oDAAiD;AACjD,2DAA0E;AAC1E,oDAA2D;AAE3D,6BAA6B;AAC7B,iCAAiC;AAGjC,SAAgB,iBAAiB,CAC/B,KAAiB,EACjB,UAA0B,EAC1B,eAAgC,EAChC,qBAA+C,EAC/C,mBAAyC,EACzC,mBAA4D,EAC5D,mBAA8B,UAAU,CAAC,KAAK,CAAC,gBAAgB;IAE/D,MAAM,YAAY,GAAG,EAAE,CAAC,6BAA6B,CAAC,eAAe,CAAC,CAAC;IAEvE,MAAM,OAAO,GAAG,CAAC,QAAgB,EAAE,EAAE;QACnC,MAAM,OAAO,GAAG,IAAA,eAAO,EAAC,IAAA,qBAAc,EAAC,QAAQ,CAAC,CAAC,CAAC;QAClD,IAAI,IAAI,GAAG,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QAE9B,IAAI,CAAC,IAAI,EAAE;YACT,IAAI,GAAG,IAAI,WAAI,CAAC,OAAO,CAAC,CAAC;YACzB,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;SACjB;QAED,OAAO,IAAI,CAAC;IACd,CAAC,CAAC;IAEF,MAAM,WAAW,GAAG,CAAC,QAAgB,EAAE,EAAE;QACvC,MAAM,IAAI,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;QAC/B,UAAU,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;IAC7B,CAAC,CAAC;IAEF,MAAM,EAAE,cAAc,EAAE,SAAS,EAAE,
|
|
1
|
+
{"version":3,"file":"cache-compiler-host.js","sourceRoot":"","sources":["../../../../../../../../packages/angular/src/executors/package/ng-packagr-adjustments/ts/cache-compiler-host.ts"],"names":[],"mappings":"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"}
|
|
@@ -62,7 +62,9 @@ function applicationGenerator(host, schema) {
|
|
|
62
62
|
yield (0, lib_1.addUnitTestRunner)(host, options);
|
|
63
63
|
yield (0, lib_1.addE2e)(host, options);
|
|
64
64
|
(0, lib_1.updateEditorTsConfig)(host, options);
|
|
65
|
-
(
|
|
65
|
+
if (!options.skipDefaultProject) {
|
|
66
|
+
(0, lib_1.setDefaultProject)(host, options);
|
|
67
|
+
}
|
|
66
68
|
if (options.backendProject) {
|
|
67
69
|
(0, lib_1.addProxyConfig)(host, options);
|
|
68
70
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"application.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/application/application.ts"],"names":[],"mappings":";;;;AAAA,yCAKsB;AACtB,8DAAwE;AACxE,2DAAyE;AAEzE,uCAAoD;AACpD,qEAA0E;AAC1E,+BAiBe;AAGf,SAAsB,oBAAoB,CACxC,IAAU,EACV,MAAuB;;QAEvB,MAAM,OAAO,GAAG,IAAA,sBAAgB,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAE/C,MAAM,IAAA,2BAAoB,EAAC,IAAI,kCAC1B,OAAO,KACV,UAAU,EAAE,IAAI,IAChB,CAAC;QAEH,MAAM,mBAAmB,GAAG,IAAA,0CAA0B,EACpD,qBAAqB,EACrB,aAAa,CACd,CAAC;QACF,MAAM,mBAAmB,CAAC,IAAI,EAAE;YAC9B,IAAI,EAAE,OAAO,CAAC,IAAI;YAClB,WAAW,EAAE,OAAO,CAAC,WAAW;YAChC,cAAc,EAAE,OAAO,CAAC,cAAc;YACtC,MAAM,EAAE,OAAO,CAAC,MAAM;YACtB,SAAS,EAAE,OAAO,CAAC,SAAS;YAC5B,KAAK,EAAE,OAAO,CAAC,KAAK;YACpB,iBAAiB,EAAE,OAAO,CAAC,iBAAiB;YAC5C,OAAO,EAAE,KAAK;YACd,WAAW,EAAE,IAAI;YACjB,eAAe,EAAE,OAAO,CAAC,eAAe;SACzC,CAAC,CAAC;QAEH,IAAI,OAAO,CAAC,qBAAqB,KAAK,OAAO,CAAC,cAAc,EAAE;YAC5D,IAAA,gCAAuB,EACrB,IAAI,EACJ,OAAO,CAAC,qBAAqB,EAC7B,OAAO,CAAC,cAAc,CACvB,CAAC;SACH;QAED,IAAA,iBAAW,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAC3B,IAAA,uBAAiB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACjC,IAAA,gCAA0B,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAE1C,gCAAgC;QAChC,MAAM,yBAAyB,GAAG,IAAA,0CAA0B,EAC1D,qBAAqB,EACrB,WAAW,CACZ,CAAC;QACF,MAAM,yBAAyB,CAAC,IAAI,EAAE;YACpC,IAAI,EAAE,WAAW;YACjB,cAAc,EAAE,IAAI;YACpB,WAAW,EAAE,IAAI;YACjB,MAAM,EAAE,OAAO,CAAC,MAAM;YACtB,SAAS,EAAE,IAAI;YACf,KAAK,EAAE,OAAO,CAAC,KAAK;YACpB,IAAI,EAAE,IAAI;YACV,iBAAiB,EAAE,MAAM;YACzB,OAAO,EAAE,OAAO,CAAC,IAAI;SACtB,CAAC,CAAC;QACH,IAAA,+BAAyB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAEzC,IAAI,OAAO,CAAC,WAAW,EAAE;YACvB,MAAM,IAAA,uCAAsB,EAAC,IAAI,EAAE;gBACjC,OAAO,EAAE,OAAO,CAAC,IAAI;gBACrB,UAAU,EAAE,IAAI;gBAChB,eAAe,EAAE,OAAO,CAAC,eAAe;aACzC,CAAC,CAAC;SACJ;QAED,IAAI,OAAO,CAAC,cAAc,qCAAwB,EAAE;YAClD,IAAA,yBAAmB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;SACpC;QAED,IAAI,OAAO,CAAC,OAAO,EAAE;YACnB,IAAA,gCAA0B,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;SAC3C;QAED,IAAA,gBAAU,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAC1B,MAAM,IAAA,uBAAiB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACvC,MAAM,IAAA,YAAM,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAC5B,IAAA,0BAAoB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"application.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/application/application.ts"],"names":[],"mappings":"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"}
|
|
@@ -176,6 +176,11 @@
|
|
|
176
176
|
"type": "boolean",
|
|
177
177
|
"description": "Whether to configure Tailwind CSS for the application.",
|
|
178
178
|
"default": false
|
|
179
|
+
},
|
|
180
|
+
"skipDefaultProject": {
|
|
181
|
+
"description": "Skip setting the project as the default project. When `false` (the default), the project is set as the default project only if there is no default project already set.",
|
|
182
|
+
"type": "boolean",
|
|
183
|
+
"default": false
|
|
179
184
|
}
|
|
180
185
|
},
|
|
181
186
|
"additionalProperties": false,
|
|
@@ -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
|
-
const { cypressProject, projectName, projectPath, componentPath, componentFileName, componentName, } = options;
|
|
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
|
-
const destinationDir = (0, devkit_1.joinPathFragments)(e2eLibIntegrationFolderPath, componentPath);
|
|
15
|
-
const storyFile = (0, devkit_1.joinPathFragments)(destinationDir, `${componentFileName}
|
|
15
|
+
const destinationDir = (0, devkit_1.joinPathFragments)(e2eLibIntegrationFolderPath, specDirectory !== null && specDirectory !== void 0 ? specDirectory : componentPath);
|
|
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
|
|
@@ -34,6 +34,10 @@
|
|
|
34
34
|
"type": "string",
|
|
35
35
|
"description": "The Cypress project to generate the stories under. By default, inferred from `projectName`."
|
|
36
36
|
},
|
|
37
|
+
"specDirectory": {
|
|
38
|
+
"type": "string",
|
|
39
|
+
"description": "Directory where to place the generated spec file. By default matches the value of the `componentPath` option."
|
|
40
|
+
},
|
|
37
41
|
"skipFormat": {
|
|
38
42
|
"description": "Skip formatting files.",
|
|
39
43
|
"type": "boolean",
|
|
@@ -2,7 +2,6 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.addLoadChildren = void 0;
|
|
4
4
|
const devkit_1 = require("@nrwl/devkit");
|
|
5
|
-
const path = require("path");
|
|
6
5
|
const ts = require("typescript");
|
|
7
6
|
const ast_utils_1 = require("../../../utils/nx-devkit/ast-utils");
|
|
8
7
|
function addLoadChildren(host, options) {
|
|
@@ -10,36 +9,8 @@ function addLoadChildren(host, options) {
|
|
|
10
9
|
throw new Error(`Cannot find '${options.parentModule}'`);
|
|
11
10
|
}
|
|
12
11
|
const moduleSource = host.read(options.parentModule).toString('utf-8');
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
const tsConfig = findClosestTsConfigApp(host, options.parentModule);
|
|
16
|
-
if (tsConfig) {
|
|
17
|
-
const offset = (0, devkit_1.offsetFromRoot)(path.dirname(tsConfig));
|
|
18
|
-
(0, devkit_1.updateJson)(host, tsConfig, (json) => {
|
|
19
|
-
var _a;
|
|
20
|
-
json.include = (_a = json.include) !== null && _a !== void 0 ? _a : [];
|
|
21
|
-
json.include = [
|
|
22
|
-
...json.include,
|
|
23
|
-
`${offset}${options.projectRoot}/src/index.ts`,
|
|
24
|
-
];
|
|
25
|
-
return json;
|
|
26
|
-
});
|
|
27
|
-
}
|
|
28
|
-
else {
|
|
29
|
-
console.warn(`Unable to find tsconfig.json for ${options.parentModule}. Related \`includes\` for the tsconfig have not been updated.`);
|
|
30
|
-
}
|
|
12
|
+
const sourceFile = ts.createSourceFile(options.parentModule, moduleSource, ts.ScriptTarget.Latest, true);
|
|
13
|
+
(0, ast_utils_1.addRoute)(host, options.parentModule, sourceFile, `{path: '${(0, devkit_1.names)(options.fileName).fileName}', loadChildren: () => import('${options.importPath}').then(module => module.${options.moduleName})}`);
|
|
31
14
|
}
|
|
32
15
|
exports.addLoadChildren = addLoadChildren;
|
|
33
|
-
function findClosestTsConfigApp(host, parentModule) {
|
|
34
|
-
const dir = path.parse(parentModule).dir;
|
|
35
|
-
if (host.exists(`${dir}/tsconfig.app.json`)) {
|
|
36
|
-
return `${dir}/tsconfig.app.json`;
|
|
37
|
-
}
|
|
38
|
-
else if (dir != '') {
|
|
39
|
-
return findClosestTsConfigApp(host, dir);
|
|
40
|
-
}
|
|
41
|
-
else {
|
|
42
|
-
return null;
|
|
43
|
-
}
|
|
44
|
-
}
|
|
45
16
|
//# sourceMappingURL=add-load-children.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add-load-children.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/library/lib/add-load-children.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"add-load-children.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/library/lib/add-load-children.ts"],"names":[],"mappings":";;;AAAA,yCAA2C;AAC3C,iCAAiC;AACjC,kEAA8D;AAG9D,SAAgB,eAAe,CAAC,IAAU,EAAE,OAAyB;IACnE,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE;QACtC,MAAM,IAAI,KAAK,CAAC,gBAAgB,OAAO,CAAC,YAAY,GAAG,CAAC,CAAC;KAC1D;IAED,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,YAAY,CAAE,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;IACxE,MAAM,UAAU,GAAG,EAAE,CAAC,gBAAgB,CACpC,OAAO,CAAC,YAAY,EACpB,YAAY,EACZ,EAAE,CAAC,YAAY,CAAC,MAAM,EACtB,IAAI,CACL,CAAC;IAEF,IAAA,oBAAQ,EACN,IAAI,EACJ,OAAO,CAAC,YAAY,EACpB,UAAU,EACV,WACE,IAAA,cAAK,EAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,QAC1B,kCACE,OAAO,CAAC,UACV,4BAA4B,OAAO,CAAC,UAAU,IAAI,CACnD,CAAC;AACJ,CAAC;AAvBD,0CAuBC"}
|
|
@@ -20,7 +20,10 @@
|
|
|
20
20
|
"type": "string",
|
|
21
21
|
"description": "The name of the library to create the secondary entry point for.",
|
|
22
22
|
"x-prompt": "What library would you like to create the secondary entry point for?",
|
|
23
|
-
"pattern": "^[a-zA-Z].*$"
|
|
23
|
+
"pattern": "^[a-zA-Z].*$",
|
|
24
|
+
"$default": {
|
|
25
|
+
"$source": "projectName"
|
|
26
|
+
}
|
|
24
27
|
},
|
|
25
28
|
"skipModule": {
|
|
26
29
|
"type": "boolean",
|
|
@@ -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
|
}
|