@nrwl/angular 14.5.0-beta.0 → 14.5.0-beta.3
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/generators.json +2 -2
- package/ng-package.json +2 -1
- package/package.json +10 -9
- package/src/executors/ng-packagr-lite/ng-packagr-adjustments/ng-package/entry-point/write-package.transform.js +19 -1
- package/src/executors/ng-packagr-lite/ng-packagr-adjustments/ng-package/entry-point/write-package.transform.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 +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/convert-to-with-mf/schema.json +1 -1
- package/src/generators/init/init.js +1 -1
- package/src/generators/init/init.js.map +1 -1
- 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/ngrx/schema.d.ts +9 -1
- package/src/generators/ngrx/schema.json +4 -2
- 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/schema.json +4 -2
- 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/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
- package/src/utils/versions.d.ts +1 -0
- package/src/utils/versions.js +2 -1
- package/src/utils/versions.js.map +1 -1
|
@@ -53,6 +53,18 @@ const nxWritePackageTransform = (options) => (0, transform_1.transformFromPromis
|
|
|
53
53
|
throw error;
|
|
54
54
|
}
|
|
55
55
|
}
|
|
56
|
+
else if (options.watch) {
|
|
57
|
+
// update the watch version of the primary entry point `package.json` file.
|
|
58
|
+
// this is needed because of Webpack's 5 `cachemanagedpaths`
|
|
59
|
+
// https://github.com/ng-packagr/ng-packagr/issues/2069
|
|
60
|
+
const primary = ngPackageNode.data.primary;
|
|
61
|
+
const packageJsonPath = path.join(primary.destinationPath, 'package.json');
|
|
62
|
+
if (yield (0, fs_1.exists)(packageJsonPath)) {
|
|
63
|
+
const packageJson = JSON.parse(yield (0, fs_1.readFile)(packageJsonPath, { encoding: 'utf8' }));
|
|
64
|
+
packageJson.version = generateWatchVersion();
|
|
65
|
+
yield (0, fs_1.writeFile)(path.join(primary.destinationPath, 'package.json'), JSON.stringify(packageJson, undefined, 2));
|
|
66
|
+
}
|
|
67
|
+
}
|
|
56
68
|
devkit_1.logger.info(`Built ${ngEntryPoint.moduleId}`);
|
|
57
69
|
return graph;
|
|
58
70
|
}));
|
|
@@ -158,7 +170,7 @@ function writePackageJson(entryPoint, pkg, additionalProperties, isWatchMode) {
|
|
|
158
170
|
if (isWatchMode) {
|
|
159
171
|
// Needed because of Webpack's 5 `cachemanagedpaths`
|
|
160
172
|
// https://github.com/angular/angular-cli/issues/20962
|
|
161
|
-
packageJson.version =
|
|
173
|
+
packageJson.version = generateWatchVersion();
|
|
162
174
|
}
|
|
163
175
|
if (!((_a = packageJson.peerDependencies) === null || _a === void 0 ? void 0 : _a.tslib) &&
|
|
164
176
|
!((_b = packageJson.dependencies) === null || _b === void 0 ? void 0 : _b.tslib)) {
|
|
@@ -269,4 +281,10 @@ function generatePackageExports({ destinationPath, packageJson }, graph) {
|
|
|
269
281
|
}
|
|
270
282
|
return exports;
|
|
271
283
|
}
|
|
284
|
+
/**
|
|
285
|
+
* Generates a new version for the package `package.json` when runing in watch mode.
|
|
286
|
+
*/
|
|
287
|
+
function generateWatchVersion() {
|
|
288
|
+
return `0.0.0-watch+${Date.now()}`;
|
|
289
|
+
}
|
|
272
290
|
//# sourceMappingURL=write-package.transform.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"write-package.transform.js","sourceRoot":"","sources":["../../../../../../../../../packages/angular/src/executors/ng-packagr-lite/ng-packagr-adjustments/ng-package/entry-point/write-package.transform.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;;AAEH,yCAAsC;AAEtC,oDAAiD;AACjD,8DAAsE;AAEtE,2DAOyC;AAGzC,
|
|
1
|
+
{"version":3,"file":"write-package.transform.js","sourceRoot":"","sources":["../../../../../../../../../packages/angular/src/executors/ng-packagr-lite/ng-packagr-adjustments/ng-package/entry-point/write-package.transform.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
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
|
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
"cli": "nx",
|
|
5
5
|
"title": "Convert to withModuleFederation Generator Options Schema",
|
|
6
6
|
"type": "object",
|
|
7
|
-
"description": "Converts an old micro frontend configuration to use the new withModuleFederation helper. It will run successfully if the following conditions are met: \n - Is either a host or remote application \n - Shared npm package configurations have not been modified \n - Name used to identify the Micro Frontend application matches the project name \n\n
|
|
7
|
+
"description": "Converts an old micro frontend configuration to use the new withModuleFederation helper. It will run successfully if the following conditions are met: \n - Is either a host or remote application \n - Shared npm package configurations have not been modified \n - Name used to identify the Micro Frontend application matches the project name \n\n{% callout type=\"warning\" title=\"Overrides\" %}This generator will overwrite your webpack config. If you have additional custom configuration in your config file, it will be lost!{% /callout %}.",
|
|
8
8
|
"additionalProperties": false,
|
|
9
9
|
"properties": {
|
|
10
10
|
"project": {
|
|
@@ -76,7 +76,7 @@ function updateDependencies(host) {
|
|
|
76
76
|
'@angular/platform-browser-dynamic': versions_1.angularVersion,
|
|
77
77
|
'@angular/router': versions_1.angularVersion,
|
|
78
78
|
rxjs: versions_1.rxjsVersion,
|
|
79
|
-
tslib:
|
|
79
|
+
tslib: versions_1.tsLibVersion,
|
|
80
80
|
'zone.js': '~0.11.4',
|
|
81
81
|
}, {
|
|
82
82
|
'@angular/cli': versions_1.angularDevkitVersion,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/init/init.ts"],"names":[],"mappings":";;;;AAAA,2CAAqD;AACrD,yCAA+D;AAC/D,yCAMsB;AACtB,qCAA+C;AAC/C,yCAAsC;AACtC,2FAAqF;AAErF,
|
|
1
|
+
{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/init/init.ts"],"names":[],"mappings":"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"}
|
|
@@ -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
|
}
|