@nrwl/angular 15.8.0-beta.2 → 15.8.0-beta.4
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/migrations.json +68 -0
- package/package.json +9 -9
- package/src/builders/module-federation-dev-ssr/schema.d.ts +1 -1
- package/src/builders/module-federation-dev-ssr/schema.json +2 -1
- package/src/generators/application/angular-v14/lib/convert-to-standalone-app.js +3 -0
- package/src/generators/application/angular-v14/lib/convert-to-standalone-app.js.map +1 -1
- package/src/generators/application/lib/convert-to-standalone-app.js +3 -0
- package/src/generators/application/lib/convert-to-standalone-app.js.map +1 -1
- package/src/generators/application/lib/root-router-config.js +2 -1
- package/src/generators/application/lib/root-router-config.js.map +1 -1
- package/src/generators/application/lib/update-app-component-template.js +2 -1
- package/src/generators/application/lib/update-app-component-template.js.map +1 -1
- package/src/generators/application/lib/update-component-spec.js +2 -1
- package/src/generators/application/lib/update-component-spec.js.map +1 -1
- package/src/generators/application/lib/update-nx-component-template.js +2 -1
- package/src/generators/application/lib/update-nx-component-template.js.map +1 -1
- package/src/generators/component/lib/entry-point.js +2 -0
- package/src/generators/component/lib/entry-point.js.map +1 -1
- package/src/generators/component-story/files/__componentFileName__.stories.ts__tmpl__ +9 -15
- package/src/generators/convert-to-with-mf/lib/check-name-matches.js +2 -0
- package/src/generators/convert-to-with-mf/lib/check-name-matches.js.map +1 -1
- package/src/generators/convert-to-with-mf/lib/check-shared-npm-packages.js +2 -0
- package/src/generators/convert-to-with-mf/lib/check-shared-npm-packages.js.map +1 -1
- package/src/generators/convert-to-with-mf/lib/is-host-remote-config.js +4 -0
- package/src/generators/convert-to-with-mf/lib/is-host-remote-config.js.map +1 -1
- package/src/generators/convert-to-with-mf/lib/parse-ast-webpack-config.js +2 -0
- package/src/generators/convert-to-with-mf/lib/parse-ast-webpack-config.js.map +1 -1
- package/src/generators/init/angular-v14/init.js +34 -23
- package/src/generators/init/angular-v14/init.js.map +1 -1
- package/src/generators/init/init.js +35 -24
- package/src/generators/init/init.js.map +1 -1
- package/src/generators/karma-project/lib/generate-karma-project-files.js +2 -0
- package/src/generators/karma-project/lib/generate-karma-project-files.js.map +1 -1
- package/src/generators/library/lib/add-children.js +2 -1
- package/src/generators/library/lib/add-children.js.map +1 -1
- package/src/generators/library/lib/add-lazy-loaded-router-configuration.js +2 -1
- package/src/generators/library/lib/add-lazy-loaded-router-configuration.js.map +1 -1
- package/src/generators/library/lib/add-load-children.js +2 -1
- package/src/generators/library/lib/add-load-children.js.map +1 -1
- package/src/generators/library/lib/add-router-configuration.js +2 -1
- package/src/generators/library/lib/add-router-configuration.js.map +1 -1
- package/src/generators/ng-add/migrators/projects/e2e.migrator.js +3 -0
- package/src/generators/ng-add/migrators/projects/e2e.migrator.js.map +1 -1
- package/src/generators/setup-mf/lib/add-remote-to-host.js +2 -1
- package/src/generators/setup-mf/lib/add-remote-to-host.js.map +1 -1
- package/src/generators/setup-ssr/lib/update-app-module.js +2 -0
- package/src/generators/setup-ssr/lib/update-app-module.js.map +1 -1
- package/src/generators/storybook-configuration/lib/generate-storybook-configuration.js +1 -2
- package/src/generators/storybook-configuration/lib/generate-storybook-configuration.js.map +1 -1
- package/src/generators/utils/storybook-ast/module-info.js +2 -0
- package/src/generators/utils/storybook-ast/module-info.js.map +1 -1
- package/src/migrations/update-15-8-0/update-angular-cli.d.ts +2 -0
- package/src/migrations/update-15-8-0/update-angular-cli.js +27 -0
- package/src/migrations/update-15-8-0/update-angular-cli.js.map +1 -0
- package/src/utils/nx-devkit/ast-utils.js +13 -11
- package/src/utils/nx-devkit/ast-utils.js.map +1 -1
- package/src/utils/nx-devkit/route-utils.js +4 -1
- package/src/utils/nx-devkit/route-utils.js.map +1 -1
- package/src/utils/versions.d.ts +4 -4
- package/src/utils/versions.js +4 -4
|
@@ -22,6 +22,8 @@ function angularInitGenerator(tree, rawOptions) {
|
|
|
22
22
|
yield previousGenerator.default(tree, rawOptions);
|
|
23
23
|
return;
|
|
24
24
|
}
|
|
25
|
+
const tasks = [];
|
|
26
|
+
const options = normalizeOptions(rawOptions);
|
|
25
27
|
const peerDepsToInstall = [
|
|
26
28
|
'@angular-devkit/core',
|
|
27
29
|
'@angular-devkit/schematics',
|
|
@@ -33,19 +35,26 @@ function angularInitGenerator(tree, rawOptions) {
|
|
|
33
35
|
const packageVersion = (0, version_utils_1.getInstalledPackageVersion)(tree, pkg);
|
|
34
36
|
if (!packageVersion) {
|
|
35
37
|
devkitVersion !== null && devkitVersion !== void 0 ? devkitVersion : (devkitVersion = (_a = (0, version_utils_1.getInstalledPackageVersion)(tree, '@angular-devkit/build-angular')) !== null && _a !== void 0 ? _a : versions_1.angularDevkitVersion);
|
|
36
|
-
|
|
38
|
+
try {
|
|
39
|
+
(0, devkit_1.ensurePackage)(pkg, devkitVersion);
|
|
40
|
+
}
|
|
41
|
+
catch (_b) {
|
|
42
|
+
// @schematics/angular cannot be required so this fails but this will still allow wrapping the schematic later on
|
|
43
|
+
}
|
|
44
|
+
if (!options.skipPackageJson) {
|
|
45
|
+
tasks.push((0, devkit_1.addDependenciesToPackageJson)(tree, {}, { [pkg]: devkitVersion }));
|
|
46
|
+
}
|
|
37
47
|
}
|
|
38
48
|
});
|
|
39
|
-
const options = normalizeOptions(rawOptions);
|
|
40
49
|
setDefaults(tree, options);
|
|
41
|
-
yield (0, js_1.initGenerator)(tree, Object.assign(Object.assign({}, options), { tsConfigName: options.rootProject ? 'tsconfig.json' : 'tsconfig.base.json', js: false, skipFormat: true }));
|
|
42
|
-
|
|
50
|
+
const jsTask = yield (0, js_1.initGenerator)(tree, Object.assign(Object.assign({}, options), { tsConfigName: options.rootProject ? 'tsconfig.json' : 'tsconfig.base.json', js: false, skipFormat: true }));
|
|
51
|
+
tasks.push(jsTask);
|
|
43
52
|
if (!options.skipPackageJson) {
|
|
44
53
|
tasks.push(updateDependencies(tree));
|
|
45
54
|
}
|
|
46
55
|
const unitTestTask = yield addUnitTestRunner(tree, options);
|
|
47
56
|
tasks.push(unitTestTask);
|
|
48
|
-
const e2eTask = addE2ETestRunner(tree, options);
|
|
57
|
+
const e2eTask = yield addE2ETestRunner(tree, options);
|
|
49
58
|
tasks.push(e2eTask);
|
|
50
59
|
addGitIgnoreEntry(tree, '.angular');
|
|
51
60
|
if (!options.skipFormat) {
|
|
@@ -121,25 +130,27 @@ function addUnitTestRunner(tree, options) {
|
|
|
121
130
|
});
|
|
122
131
|
}
|
|
123
132
|
function addE2ETestRunner(tree, options) {
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
133
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
134
|
+
switch (options.e2eTestRunner) {
|
|
135
|
+
case test_runners_1.E2eTestRunner.Protractor:
|
|
136
|
+
return !options.skipPackageJson
|
|
137
|
+
? (0, version_utils_1.addDependenciesToPackageJsonIfDontExist)(tree, {}, {
|
|
138
|
+
protractor: versions_1.protractorVersion,
|
|
139
|
+
'jasmine-core': versions_1.jasmineCoreVersion,
|
|
140
|
+
'jasmine-spec-reporter': versions_1.jasmineSpecReporterVersion,
|
|
141
|
+
'ts-node': versions_1.tsNodeVersion,
|
|
142
|
+
'@types/jasmine': versions_1.typesJasmineVersion,
|
|
143
|
+
'@types/jasminewd2': versions_1.typesJasminewd2Version,
|
|
144
|
+
})
|
|
145
|
+
: () => { };
|
|
146
|
+
case test_runners_1.E2eTestRunner.Cypress:
|
|
147
|
+
return (0, cypress_1.cypressInitGenerator)(tree, {
|
|
148
|
+
skipPackageJson: options.skipPackageJson,
|
|
149
|
+
});
|
|
150
|
+
default:
|
|
151
|
+
return () => { };
|
|
152
|
+
}
|
|
153
|
+
});
|
|
143
154
|
}
|
|
144
155
|
function addGitIgnoreEntry(host, entry) {
|
|
145
156
|
if (host.exists('.gitignore')) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/init/init.ts"],"names":[],"mappings":";;;;AAAA,2CAAqD;AACrD,
|
|
1
|
+
{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/init/init.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,6 +4,7 @@ exports.generateKarmaProjectFiles = void 0;
|
|
|
4
4
|
const devkit_1 = require("@nrwl/devkit");
|
|
5
5
|
const version_utils_1 = require("../../utils/version-utils");
|
|
6
6
|
const v14_test_file_1 = require("./v14-test-file");
|
|
7
|
+
const ensure_typescript_1 = require("@nrwl/js/src/utils/typescript/ensure-typescript");
|
|
7
8
|
function generateKarmaProjectFiles(tree, project) {
|
|
8
9
|
const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, project);
|
|
9
10
|
(0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, '..', 'files', 'common'), projectConfig.root, {
|
|
@@ -44,6 +45,7 @@ function isUsingConfigSetInBaseKarmaConfig(tree) {
|
|
|
44
45
|
if (!tree.exists('karma.conf.js')) {
|
|
45
46
|
return false;
|
|
46
47
|
}
|
|
48
|
+
(0, ensure_typescript_1.ensureTypescript)();
|
|
47
49
|
const { tsquery } = require('@phenomnomnominal/tsquery');
|
|
48
50
|
const CONFIG_SET_SELECTOR = 'PropertyAccessExpression:has(Identifier[name=config], Identifier[name=set])';
|
|
49
51
|
const ast = tsquery.ast(tree.read('karma.conf.js', 'utf-8'));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generate-karma-project-files.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/karma-project/lib/generate-karma-project-files.ts"],"names":[],"mappings":";;;AACA,yCAMsB;AACtB,6DAA2E;AAC3E,mDAA8C;
|
|
1
|
+
{"version":3,"file":"generate-karma-project-files.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/karma-project/lib/generate-karma-project-files.ts"],"names":[],"mappings":";;;AACA,yCAMsB;AACtB,6DAA2E;AAC3E,mDAA8C;AAC9C,uFAAmF;AAEnF,SAAgB,yBAAyB,CAAC,IAAU,EAAE,OAAe;IACnE,MAAM,aAAa,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAC9D,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,0BAAiB,EAAC,SAAS,EAAE,IAAI,EAAE,OAAO,EAAE,QAAQ,CAAC,EACrD,aAAa,CAAC,IAAI,EAClB;QACE,IAAI,EAAE,EAAE;QACR,WAAW,EAAE,aAAa,CAAC,IAAI;QAC/B,cAAc,EAAE,IAAA,uBAAc,EAAC,aAAa,CAAC,IAAI,CAAC;KACnD,CACF,CAAC;IAEF,IAAI,aAAa,CAAC,IAAI,KAAK,EAAE,IAAI,aAAa,CAAC,IAAI,KAAK,GAAG,EAAE;QAC3D,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,0BAAiB,EAAC,SAAS,EAAE,IAAI,EAAE,OAAO,EAAE,cAAc,CAAC,EAC3D,aAAa,CAAC,IAAI,EAClB;YACE,IAAI,EAAE,EAAE;YACR,WAAW,EAAE,OAAO;SACrB,CACF,CAAC;KACH;SAAM,IAAI,4BAA4B,CAAC,IAAI,CAAC,EAAE;QAC7C,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,0BAAiB,EACf,SAAS,EACT,IAAI,EACJ,OAAO,EACP,6BAA6B,CAC9B,EACD,aAAa,CAAC,IAAI,EAClB;YACE,IAAI,EAAE,EAAE;YACR,WAAW,EAAE,aAAa,CAAC,IAAI;YAC/B,cAAc,EAAE,IAAA,uBAAc,EAAC,aAAa,CAAC,IAAI,CAAC;YAClD,wBAAwB,EAAE,iCAAiC,CAAC,IAAI,CAAC;SAClE,CACF,CAAC;KACH;IAED,MAAM,uBAAuB,GAAG,IAAA,8CAA8B,EAAC,IAAI,CAAC,CAAC;IACrE,IAAI,uBAAuB,CAAC,KAAK,KAAK,EAAE,EAAE;QACxC,IAAI,CAAC,KAAK,CACR,IAAA,0BAAiB,EAAC,aAAa,CAAC,UAAU,EAAE,SAAS,CAAC,EACtD,IAAA,2BAAW,EAAC,EAAE,SAAS,EAAE,aAAa,CAAC,WAAW,KAAK,SAAS,EAAE,CAAC,CACpE,CAAC;KACH;AACH,CAAC;AAjDD,8DAiDC;AAED,SAAS,4BAA4B,CAAC,IAAU;IAC9C,MAAM,QAAQ,GAAG,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IACnC,KAAK,MAAM,CAAC,EAAE,OAAO,CAAC,IAAI,QAAQ,EAAE;QAClC,IAAI,OAAO,CAAC,IAAI,KAAK,GAAG,IAAI,OAAO,CAAC,IAAI,KAAK,EAAE,EAAE;YAC/C,OAAO,IAAI,CAAC;SACb;KACF;IAED,OAAO,KAAK,CAAC;AACf,CAAC;AAED,SAAS,iCAAiC,CAAC,IAAU;IACnD,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,EAAE;QACjC,OAAO,KAAK,CAAC;KACd;IACD,IAAA,oCAAgB,GAAE,CAAC;IACnB,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,2BAA2B,CAAC,CAAC;IAEzD,MAAM,mBAAmB,GACvB,6EAA6E,CAAC;IAEhF,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC,CAAC;IAC7D,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,EAAE,mBAAmB,EAAE,EAAE,gBAAgB,EAAE,IAAI,EAAE,CAAC,CAAC;IAE5E,OAAO,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC;AAC1B,CAAC"}
|
|
@@ -5,13 +5,14 @@ const devkit_1 = require("@nrwl/devkit");
|
|
|
5
5
|
const ast_utils_1 = require("@nrwl/workspace/src/utilities/ast-utils");
|
|
6
6
|
const ast_utils_2 = require("../../../utils/nx-devkit/ast-utils");
|
|
7
7
|
const route_utils_1 = require("../../../utils/nx-devkit/route-utils");
|
|
8
|
+
const ensure_typescript_1 = require("@nrwl/js/src/utils/typescript/ensure-typescript");
|
|
8
9
|
let tsModule;
|
|
9
10
|
function addChildren(tree, options) {
|
|
10
11
|
if (!tree.exists(options.parent)) {
|
|
11
12
|
throw new Error(`Cannot find '${options.parent}'`);
|
|
12
13
|
}
|
|
13
14
|
if (!tsModule) {
|
|
14
|
-
tsModule =
|
|
15
|
+
tsModule = (0, ensure_typescript_1.ensureTypescript)();
|
|
15
16
|
}
|
|
16
17
|
const routeFileSource = tree.read(options.parent, 'utf-8');
|
|
17
18
|
const constName = options.standalone
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add-children.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/library/lib/add-children.ts"],"names":[],"mappings":";;;AAAA,yCAA2C;AAC3C,uEAAuE;AACvE,kEAAuE;AAEvE,sEAAgE;
|
|
1
|
+
{"version":3,"file":"add-children.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/library/lib/add-children.ts"],"names":[],"mappings":";;;AAAA,yCAA2C;AAC3C,uEAAuE;AACvE,kEAAuE;AAEvE,sEAAgE;AAChE,uFAAmF;AAEnF,IAAI,QAAqC,CAAC;AAE1C,SAAgB,WAAW,CACzB,IAAU,EACV,OAA2C;IAE3C,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE;QAChC,MAAM,IAAI,KAAK,CAAC,gBAAgB,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC;KACpD;IACD,IAAI,CAAC,QAAQ,EAAE;QACb,QAAQ,GAAG,IAAA,oCAAgB,GAAE,CAAC;KAC/B;IAED,MAAM,eAAe,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC3D,MAAM,SAAS,GAAG,OAAO,CAAC,UAAU;QAClC,CAAC,CAAC,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC,YAAY,QAAQ;QAC7C,CAAC,CAAC,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,YAAY,QAAQ,CAAC;IACpD,MAAM,UAAU,GAAG,OAAO,CAAC,UAAU,CAAC;IACtC,IAAI,UAAU,GAAG,QAAQ,CAAC,gBAAgB,CACxC,OAAO,CAAC,MAAM,EACd,eAAe,EACf,QAAQ,CAAC,YAAY,CAAC,MAAM,EAC5B,IAAI,CACL,CAAC;IAEF,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;QACvB,UAAU,GAAG,IAAA,6BAAiB,EAC5B,IAAI,EACJ,UAAU,EACV,OAAO,CAAC,MAAM,EACd,OAAO,CAAC,UAAU,CACnB,CAAC;KACH;IAED,UAAU,GAAG,IAAA,wBAAY,EACvB,IAAI,EACJ,UAAU,EACV,OAAO,CAAC,MAAM,EACd,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,UAAU,KAAK,SAAS,EAAE,EACtE,UAAU,CACX,CAAC;IAEF,MAAM,KAAK,GAAG,YACZ,IAAA,cAAK,EAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,QAC1B,gBAAgB,SAAS,IAAI,CAAC;IAE9B,IAAA,sBAAQ,EAAC,IAAI,EAAE,OAAO,CAAC,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,SAAS,EAAE,UAAU,CAAC,CAAC;AACtE,CAAC;AA7CD,kCA6CC"}
|
|
@@ -5,10 +5,11 @@ const devkit_1 = require("@nrwl/devkit");
|
|
|
5
5
|
const ast_utils_1 = require("@nrwl/workspace/src/utilities/ast-utils");
|
|
6
6
|
const ast_utils_2 = require("../../../utils/nx-devkit/ast-utils");
|
|
7
7
|
const path_1 = require("path");
|
|
8
|
+
const ensure_typescript_1 = require("@nrwl/js/src/utils/typescript/ensure-typescript");
|
|
8
9
|
let tsModule;
|
|
9
10
|
function addLazyLoadedRouterConfiguration(tree, options) {
|
|
10
11
|
if (!tsModule) {
|
|
11
|
-
tsModule =
|
|
12
|
+
tsModule = (0, ensure_typescript_1.ensureTypescript)();
|
|
12
13
|
}
|
|
13
14
|
const constName = `${(0, devkit_1.names)(options.fileName).propertyName}Routes`;
|
|
14
15
|
tree.write((0, devkit_1.joinPathFragments)((0, path_1.dirname)(options.modulePath), 'lib.routes.ts'), `import { Route } from '@angular/router';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add-lazy-loaded-router-configuration.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/library/lib/add-lazy-loaded-router-configuration.ts"],"names":[],"mappings":";;;AAAA,yCAA8D;AAC9D,uEAAuE;AACvE,kEAAuE;AAEvE,+BAA+B;
|
|
1
|
+
{"version":3,"file":"add-lazy-loaded-router-configuration.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/library/lib/add-lazy-loaded-router-configuration.ts"],"names":[],"mappings":";;;AAAA,yCAA8D;AAC9D,uEAAuE;AACvE,kEAAuE;AAEvE,+BAA+B;AAC/B,uFAAmF;AAEnF,IAAI,QAAqC,CAAC;AAE1C,SAAgB,gCAAgC,CAC9C,IAAU,EACV,OAA2C;IAE3C,IAAI,CAAC,QAAQ,EAAE;QACb,QAAQ,GAAG,IAAA,oCAAgB,GAAE,CAAC;KAC/B;IACD,MAAM,SAAS,GAAG,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,YAAY,QAAQ,CAAC;IAClE,IAAI,CAAC,KAAK,CACR,IAAA,0BAAiB,EAAC,IAAA,cAAO,EAAC,OAAO,CAAC,UAAU,CAAC,EAAE,eAAe,CAAC,EAC/D;;eAEW,SAAS,wFAAwF,CAC7G,CAAC;IAEF,MAAM,eAAe,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;IAC/D,IAAI,UAAU,GAAG,QAAQ,CAAC,gBAAgB,CACxC,OAAO,CAAC,UAAU,EAClB,eAAe,EACf,QAAQ,CAAC,YAAY,CAAC,MAAM,EAC5B,IAAI,CACL,CAAC;IACF,UAAU,GAAG,IAAA,6BAAiB,EAC5B,IAAI,EACJ,UAAU,EACV,OAAO,CAAC,UAAU,EAClB;4BACwB,SAAS,IAAI,CACtC,CAAC;IAEF,UAAU,GAAG,IAAA,wBAAY,EACvB,IAAI,EACJ,UAAU,EACV,OAAO,CAAC,UAAU,EAClB,cAAc,EACd,iBAAiB,CAClB,CAAC;IACF,UAAU,GAAG,IAAA,wBAAY,EACvB,IAAI,EACJ,UAAU,EACV,OAAO,CAAC,UAAU,EAClB,SAAS,EACT,cAAc,CACf,CAAC;IAEF,MAAM,WAAW,GAAG,IAAA,0BAAiB,EAAC,OAAO,CAAC,WAAW,EAAE,cAAc,CAAC,CAAC;IAC3E,MAAM,iBAAiB,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;IAC1D,IAAI,CAAC,KAAK,CACR,WAAW,EACX,GAAG,iBAAiB;oCACY,CACjC,CAAC;AACJ,CAAC;AApDD,4EAoDC"}
|
|
@@ -3,13 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.addLoadChildren = void 0;
|
|
4
4
|
const devkit_1 = require("@nrwl/devkit");
|
|
5
5
|
const route_utils_1 = require("../../../utils/nx-devkit/route-utils");
|
|
6
|
+
const ensure_typescript_1 = require("@nrwl/js/src/utils/typescript/ensure-typescript");
|
|
6
7
|
let tsModule;
|
|
7
8
|
function addLoadChildren(tree, options) {
|
|
8
9
|
if (!tree.exists(options.parent)) {
|
|
9
10
|
throw new Error(`Cannot find '${options.parent}'`);
|
|
10
11
|
}
|
|
11
12
|
if (!tsModule) {
|
|
12
|
-
tsModule =
|
|
13
|
+
tsModule = (0, ensure_typescript_1.ensureTypescript)();
|
|
13
14
|
}
|
|
14
15
|
const moduleSource = tree.read(options.parent, 'utf-8');
|
|
15
16
|
const sourceFile = tsModule.createSourceFile(options.parent, moduleSource, tsModule.ScriptTarget.Latest, true);
|
|
@@ -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,yCAA2C;AAE3C,sEAAgE;
|
|
1
|
+
{"version":3,"file":"add-load-children.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/library/lib/add-load-children.ts"],"names":[],"mappings":";;;AAAA,yCAA2C;AAE3C,sEAAgE;AAChE,uFAAmF;AAEnF,IAAI,QAAqC,CAAC;AAE1C,SAAgB,eAAe,CAC7B,IAAU,EACV,OAA2C;IAE3C,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE;QAChC,MAAM,IAAI,KAAK,CAAC,gBAAgB,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC;KACpD;IACD,IAAI,CAAC,QAAQ,EAAE;QACb,QAAQ,GAAG,IAAA,oCAAgB,GAAE,CAAC;KAC/B;IAED,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACxD,MAAM,UAAU,GAAG,QAAQ,CAAC,gBAAgB,CAC1C,OAAO,CAAC,MAAM,EACd,YAAY,EACZ,QAAQ,CAAC,YAAY,CAAC,MAAM,EAC5B,IAAI,CACL,CAAC;IAEF,MAAM,KAAK,GAAG,WACZ,IAAA,cAAK,EAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,QAC1B,kCAAkC,OAAO,CAAC,UAAU,kBAClD,OAAO,CAAC,UAAU;QAChB,CAAC,CAAC,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC,YAAY,QAAQ;QAC7C,CAAC,CAAC,OAAO,CAAC,UACd,IAAI,CAAC;IAEL,IAAA,sBAAQ,EAAC,IAAI,EAAE,OAAO,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;AACxC,CAAC;AA5BD,0CA4BC"}
|
|
@@ -5,10 +5,11 @@ const devkit_1 = require("@nrwl/devkit");
|
|
|
5
5
|
const ast_utils_1 = require("@nrwl/workspace/src/utilities/ast-utils");
|
|
6
6
|
const ast_utils_2 = require("../../../utils/nx-devkit/ast-utils");
|
|
7
7
|
const path_1 = require("path");
|
|
8
|
+
const ensure_typescript_1 = require("@nrwl/js/src/utils/typescript/ensure-typescript");
|
|
8
9
|
let tsModule;
|
|
9
10
|
function addRouterConfiguration(tree, options) {
|
|
10
11
|
if (!tsModule) {
|
|
11
|
-
tsModule =
|
|
12
|
+
tsModule = (0, ensure_typescript_1.ensureTypescript)();
|
|
12
13
|
}
|
|
13
14
|
const constName = `${(0, devkit_1.names)(options.fileName).propertyName}Routes`;
|
|
14
15
|
const moduleSource = tree.read(options.modulePath, 'utf-8');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add-router-configuration.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/library/lib/add-router-configuration.ts"],"names":[],"mappings":";;;AACA,yCAAwD;AACxD,uEAAuE;AACvE,kEAAuE;AAEvE,+BAA+B;
|
|
1
|
+
{"version":3,"file":"add-router-configuration.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/library/lib/add-router-configuration.ts"],"names":[],"mappings":";;;AACA,yCAAwD;AACxD,uEAAuE;AACvE,kEAAuE;AAEvE,+BAA+B;AAC/B,uFAAmF;AAEnF,IAAI,QAAqC,CAAC;AAE1C,SAAgB,sBAAsB,CACpC,IAAU,EACV,OAA2C;IAE3C,IAAI,CAAC,QAAQ,EAAE;QACb,QAAQ,GAAG,IAAA,oCAAgB,GAAE,CAAC;KAC/B;IACD,MAAM,SAAS,GAAG,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,YAAY,QAAQ,CAAC;IAClE,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;IAC5D,IAAI,gBAAgB,GAAG,QAAQ,CAAC,gBAAgB,CAC9C,OAAO,CAAC,UAAU,EAClB,YAAY,EACZ,QAAQ,CAAC,YAAY,CAAC,MAAM,EAC5B,IAAI,CACL,CAAC;IAEF,gBAAgB,GAAG,IAAA,6BAAiB,EAClC,IAAI,EACJ,gBAAgB,EAChB,OAAO,CAAC,UAAU,EAClB,cAAc,CACf,CAAC;IACF,gBAAgB,GAAG,IAAA,wBAAY,EAC7B,IAAI,EACJ,gBAAgB,EAChB,OAAO,CAAC,UAAU,EAClB,qBAAqB,EACrB,iBAAiB,CAClB,CAAC;IACF,gBAAgB,GAAG,IAAA,wBAAY,EAC7B,IAAI,EACJ,gBAAgB,EAChB,OAAO,CAAC,UAAU,EAClB,SAAS,EACT,cAAc,CACf,CAAC;IAEF,IAAI,CAAC,KAAK,CACR,IAAA,0BAAiB,EAAC,IAAA,cAAO,EAAC,OAAO,CAAC,UAAU,CAAC,EAAE,eAAe,CAAC,EAC/D;;eAEW,SAAS,iBAAiB,CACtC,CAAC;IAEF,MAAM,WAAW,GAAG,IAAA,0BAAiB,EAAC,OAAO,CAAC,WAAW,EAAE,cAAc,CAAC,CAAC;IAC3E,MAAM,iBAAiB,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;IAC1D,IAAI,CAAC,KAAK,CACR,WAAW,EACX,GAAG,iBAAiB;oCACY,CACjC,CAAC;AACJ,CAAC;AAnDD,wDAmDC"}
|
|
@@ -13,6 +13,7 @@ const path_1 = require("path");
|
|
|
13
13
|
const typescript_1 = require("typescript");
|
|
14
14
|
const utilities_1 = require("../../utilities");
|
|
15
15
|
const project_migrator_1 = require("./project.migrator");
|
|
16
|
+
const ensure_typescript_1 = require("@nrwl/js/src/utils/typescript/ensure-typescript");
|
|
16
17
|
const supportedTargets = {
|
|
17
18
|
e2e: {
|
|
18
19
|
acceptMultipleDefinitions: true,
|
|
@@ -349,6 +350,7 @@ class E2eMigrator extends project_migrator_1.ProjectMigrator {
|
|
|
349
350
|
: undefined;
|
|
350
351
|
}
|
|
351
352
|
updateCypress10ConfigFile(configFilePath) {
|
|
353
|
+
(0, ensure_typescript_1.ensureTypescript)();
|
|
352
354
|
const { tsquery } = require('@phenomnomnominal/tsquery');
|
|
353
355
|
this.cypressPreset = (0, cypress_preset_1.nxE2EPreset)(configFilePath);
|
|
354
356
|
const fileContent = this.tree.read(configFilePath, 'utf-8');
|
|
@@ -397,6 +399,7 @@ class E2eMigrator extends project_migrator_1.ProjectMigrator {
|
|
|
397
399
|
}
|
|
398
400
|
updateCypressE2EConfig(configFilePath, defineConfigNode, e2eNode, recorder, _a) {
|
|
399
401
|
var globalConfig = tslib_1.__rest(_a, []);
|
|
402
|
+
(0, ensure_typescript_1.ensureTypescript)();
|
|
400
403
|
const { tsquery } = require('@phenomnomnominal/tsquery');
|
|
401
404
|
const e2eConfig = {};
|
|
402
405
|
const presetSpreadAssignment = `...nxE2EPreset(__dirname),`;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"e2e.migrator.js","sourceRoot":"","sources":["../../../../../../../../packages/angular/src/generators/ng-add/migrators/projects/e2e.migrator.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"e2e.migrator.js","sourceRoot":"","sources":["../../../../../../../../packages/angular/src/generators/ng-add/migrators/projects/e2e.migrator.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,6 +5,7 @@ const devkit_1 = require("@nrwl/devkit");
|
|
|
5
5
|
const tsquery_1 = require("@phenomnomnominal/tsquery");
|
|
6
6
|
const ast_utils_1 = require("@nrwl/workspace/src/utilities/ast-utils");
|
|
7
7
|
const route_utils_1 = require("../../../utils/nx-devkit/route-utils");
|
|
8
|
+
const ensure_typescript_1 = require("@nrwl/js/src/utils/typescript/ensure-typescript");
|
|
8
9
|
let tsModule;
|
|
9
10
|
function checkIsCommaNeeded(mfRemoteText) {
|
|
10
11
|
const remoteText = mfRemoteText.replace(/\s+/g, '');
|
|
@@ -60,7 +61,7 @@ function addRemoteToDynamicHost(tree, options, pathToMfManifest) {
|
|
|
60
61
|
// TODO(colum): future work: allow dev to pass to path to routing module
|
|
61
62
|
function addLazyLoadedRouteToHostAppModule(tree, options, hostFederationType) {
|
|
62
63
|
if (!tsModule) {
|
|
63
|
-
tsModule =
|
|
64
|
+
tsModule = (0, ensure_typescript_1.ensureTypescript)();
|
|
64
65
|
}
|
|
65
66
|
const hostAppConfig = (0, devkit_1.readProjectConfiguration)(tree, options.host);
|
|
66
67
|
const pathToHostRootRouting = `${hostAppConfig.sourceRoot}/app/app.routes.ts`;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add-remote-to-host.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/setup-mf/lib/add-remote-to-host.ts"],"names":[],"mappings":";;;AAAA,yCAOsB;AAEtB,uDAAoD;AAGpD,uEAAuE;AACvE,sEAAgE;
|
|
1
|
+
{"version":3,"file":"add-remote-to-host.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/setup-mf/lib/add-remote-to-host.ts"],"names":[],"mappings":";;;AAAA,yCAOsB;AAEtB,uDAAoD;AAGpD,uEAAuE;AACvE,sEAAgE;AAChE,uFAAmF;AAEnF,IAAI,QAAqC,CAAC;AAE1C,SAAgB,kBAAkB,CAAC,YAAoB;IACrD,MAAM,UAAU,GAAG,YAAY,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;IACpD,OAAO,CAAC,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC;QAC/B,CAAC,CAAC,UAAU,KAAK,IAAI;YACnB,CAAC,CAAC,KAAK;YACP,CAAC,CAAC,IAAI;QACR,CAAC,CAAC,KAAK,CAAC;AACZ,CAAC;AAPD,gDAOC;AAED,SAAgB,eAAe,CAAC,IAAU,EAAE,OAAe;IACzD,IAAI,OAAO,CAAC,IAAI,EAAE;QAChB,MAAM,WAAW,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;QACjE,MAAM,gBAAgB,GAAG,IAAA,0BAAiB,EACxC,WAAW,CAAC,UAAU,EACtB,wCAAwC,CACzC,CAAC;QACF,MAAM,kBAAkB,GAAG,2BAA2B,CACpD,IAAI,EACJ,gBAAgB,CACjB,CAAC;QAEF,IAAI,kBAAkB,KAAK,QAAQ,EAAE;YACnC,qBAAqB,CAAC,IAAI,EAAE,OAAO,EAAE,WAAW,CAAC,CAAC;SACnD;aAAM,IAAI,kBAAkB,KAAK,SAAS,EAAE;YAC3C,sBAAsB,CAAC,IAAI,EAAE,OAAO,EAAE,gBAAgB,CAAC,CAAC;SACzD;QAED,MAAM,mBAAmB,GAAG,IAAA,0BAAiB,EAC3C,WAAW,CAAC,UAAU,EACtB,cAAc,CACf,CAAC;QAEF,MAAM,sBAAsB,GAC1B,CAAC,IAAI,CAAC,MAAM,CAAC,mBAAmB,CAAC;YAC/B,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,mBAAmB,EAAE,OAAO,CAAC;YACzC,CAAC,CAAC,EAAE,CAAC;YACP,qBAAqB,OAAO,CAAC,OAAO,IAClC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,QAClC,IAAI,CAAC;QACP,IAAI,CAAC,KAAK,CAAC,mBAAmB,EAAE,sBAAsB,CAAC,CAAC;QAExD,iCAAiC,CAAC,IAAI,EAAE,OAAO,EAAE,kBAAkB,CAAC,CAAC;KACtE;AACH,CAAC;AAlCD,0CAkCC;AAED,SAAS,2BAA2B,CAClC,IAAU,EACV,gBAAwB;IAExB,OAAO,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,QAAQ,CAAC;AAC9D,CAAC;AAED,SAAS,qBAAqB,CAC5B,IAAU,EACV,OAAe,EACf,WAAiC;IAEjC,MAAM,gBAAgB,GAAG,IAAA,0BAAiB,EACxC,WAAW,CAAC,IAAI,EAChB,6BAA6B,CAC9B,CAAC;IAEF,IAAI,CAAC,gBAAgB,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC,EAAE;QACvD,MAAM,IAAI,KAAK,CACb,kCAAkC,OAAO,CAAC,IAAI,kJAAkJ,CACjM,CAAC;KACH;IAED,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE,OAAO,CAAC,CAAC;IAC1D,MAAM,UAAU,GAAG,iBAAO,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;IAC7C,MAAM,aAAa,GAAG,IAAA,iBAAO,EAC3B,UAAU,EACV,mDAAmD,EACnD,EAAE,gBAAgB,EAAE,IAAI,EAAE,CAC3B,CAAC,CAAC,CAA2B,CAAC;IAE/B,MAAM,kBAAkB,GAAG,aAAa,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IACtD,MAAM,aAAa,GAAG,kBAAkB,CAAC,aAAa,CAAC,OAAO,EAAE,CAAC,CAAC;IAElE,MAAM,aAAa,GAAG,GAAG,YAAY,CAAC,KAAK,CAAC,CAAC,EAAE,kBAAkB,CAAC,GAChE,aAAa,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EACxB,IAAI,OAAO,CAAC,OAAO,KAAK,YAAY,CAAC,KAAK,CAAC,kBAAkB,CAAC,EAAE,CAAC;IAEjE,IAAI,CAAC,KAAK,CAAC,gBAAgB,EAAE,aAAa,CAAC,CAAC;AAC9C,CAAC;AAED,SAAS,sBAAsB,CAC7B,IAAU,EACV,OAAe,EACf,gBAAwB;IAExB,IAAA,mBAAU,EAAC,IAAI,EAAE,gBAAgB,EAAE,CAAC,QAAQ,EAAE,EAAE;QAC9C,uCACK,QAAQ,KACX,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,oBAAoB,OAAO,CAAC,IAAI,EAAE,IACrD;IACJ,CAAC,CAAC,CAAC;AACL,CAAC;AAED,wEAAwE;AACxE,SAAS,iCAAiC,CACxC,IAAU,EACV,OAAe,EACf,kBAAwC;IAExC,IAAI,CAAC,QAAQ,EAAE;QACb,QAAQ,GAAG,IAAA,oCAAgB,GAAE,CAAC;KAC/B;IACD,MAAM,aAAa,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IAEnE,MAAM,qBAAqB,GAAG,GAAG,aAAa,CAAC,UAAU,oBAAoB,CAAC;IAE9E,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,qBAAqB,CAAC,EAAE;QACvC,OAAO;KACR;IAED,MAAM,mBAAmB,GAAG,IAAI,CAAC,IAAI,CAAC,qBAAqB,EAAE,OAAO,CAAC,CAAC;IAEtE,IAAI,UAAU,GAAG,QAAQ,CAAC,gBAAgB,CACxC,qBAAqB,EACrB,mBAAmB,EACnB,QAAQ,CAAC,YAAY,CAAC,MAAM,EAC5B,IAAI,CACL,CAAC;IAEF,IAAI,kBAAkB,KAAK,SAAS,EAAE;QACpC,UAAU,GAAG,IAAA,wBAAY,EACvB,IAAI,EACJ,UAAU,EACV,qBAAqB,EACrB,kBAAkB,EAClB,kBAAkB,CACnB,CAAC;KACH;IAED,MAAM,aAAa,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC;IAC/D,MAAM,cAAc,GAAG,OAAO,CAAC,UAAU;QACvC,CAAC,CAAC,cAAc;QAChB,CAAC,CAAC,mBAAmB,CAAC;IACxB,MAAM,UAAU,GACd,kBAAkB,KAAK,SAAS;QAC9B,CAAC,CAAC,qBAAqB,OAAO,CAAC,OAAO,SAAS,aAAa,IAAI;QAChE,CAAC,CAAC,WAAW,OAAO,CAAC,OAAO,IAAI,aAAa,IAAI,CAAC;IAEtD,IAAA,sBAAQ,EACN,IAAI,EACJ,qBAAqB,EACrB;aACS,OAAO,CAAC,OAAO;0BACF,UAAU,gBAAgB,cAAc;MAC5D,CACH,CAAC;IAEF,MAAM,0BAA0B,GAAG,IAAA,0BAAiB,EAClD,aAAa,CAAC,UAAU,EACxB,wBAAwB,CACzB,CAAC;IACF,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,0BAA0B,EAAE,OAAO,CAAC,CAAC;IACpE,IACE,YAAY,CAAC,QAAQ,CAAC,0BAA0B,CAAC;QACjD,YAAY,CAAC,QAAQ,CAAC,OAAO,CAAC,EAC9B;QACA,MAAM,qBAAqB,GAAG,YAAY,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QAC5D,MAAM,eAAe,GAAG,GAAG,YAAY,CAAC,KAAK,CAC3C,CAAC,EACD,qBAAqB,CACtB,sBAAsB,OAAO,CAAC,OAAO,KACpC,IAAA,cAAK,EAAC,OAAO,CAAC,OAAO,CAAC,CAAC,SACzB,cAAc,YAAY,CAAC,KAAK,CAAC,qBAAqB,CAAC,EAAE,CAAC;QAC1D,IAAI,CAAC,KAAK,CAAC,0BAA0B,EAAE,eAAe,CAAC,CAAC;KACzD;AACH,CAAC"}
|
|
@@ -2,7 +2,9 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.updateAppModule = void 0;
|
|
4
4
|
const devkit_1 = require("@nrwl/devkit");
|
|
5
|
+
const ensure_typescript_1 = require("@nrwl/js/src/utils/typescript/ensure-typescript");
|
|
5
6
|
function updateAppModule(tree, schema) {
|
|
7
|
+
(0, ensure_typescript_1.ensureTypescript)();
|
|
6
8
|
const { tsquery } = require('@phenomnomnominal/tsquery');
|
|
7
9
|
// read the content of app module
|
|
8
10
|
const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, schema.project);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-app-module.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/setup-ssr/lib/update-app-module.ts"],"names":[],"mappings":";;;AACA,yCAA2E;
|
|
1
|
+
{"version":3,"file":"update-app-module.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/setup-ssr/lib/update-app-module.ts"],"names":[],"mappings":";;;AACA,yCAA2E;AAE3E,uFAAmF;AAEnF,SAAgB,eAAe,CAAC,IAAU,EAAE,MAAc;IACxD,IAAA,oCAAgB,GAAE,CAAC;IACnB,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,2BAA2B,CAAC,CAAC;IACzD,iCAAiC;IACjC,MAAM,aAAa,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC;IACrE,MAAM,eAAe,GAAG,IAAA,0BAAiB,EACvC,aAAa,CAAC,UAAU,EACxB,mBAAmB,CACpB,CAAC;IACF,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC;IAEzD,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;IACtC,MAAM,wBAAwB,GAAG,OAAO,CACtC,GAAG,EACH,0GAA0G,EAC1G,EAAE,gBAAgB,EAAE,IAAI,EAAE,CAC3B,CAAC;IAEF,IAAI,wBAAwB,CAAC,MAAM,KAAK,CAAC,EAAE;QACzC,MAAM,IAAI,KAAK,CACb,+CAA+C,eAAe,kCAAkC,CACjG,CAAC;KACH;IAED,MAAM,iBAAiB,GAAG,wBAAwB,CAAC,CAAC,CAAC,CAAC;IAEtD,MAAM,eAAe,GAAG,GAAG,YAAY,CAAC,KAAK,CAC3C,CAAC,EACD,iBAAiB,CAAC,MAAM,EAAE,CAC3B,mCAAmC,MAAM,CAAC,KAAK,OAAO,YAAY,CAAC,KAAK,CACvE,iBAAiB,CAAC,MAAM,EAAE,EAC1B,YAAY,CAAC,MAAM,CACpB,EAAE,CAAC;IAEJ,IAAI,CAAC,KAAK,CAAC,eAAe,EAAE,eAAe,CAAC,CAAC;AAC/C,CAAC;AAnCD,0CAmCC"}
|
|
@@ -6,8 +6,7 @@ const devkit_1 = require("@nrwl/devkit");
|
|
|
6
6
|
const versions_1 = require("../../../utils/versions");
|
|
7
7
|
function generateStorybookConfiguration(tree, options) {
|
|
8
8
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
9
|
-
(0, devkit_1.ensurePackage)(
|
|
10
|
-
const { configurationGenerator } = yield Promise.resolve().then(() => require('@nrwl/storybook'));
|
|
9
|
+
const { configurationGenerator } = (0, devkit_1.ensurePackage)('@nrwl/storybook', versions_1.nxVersion);
|
|
11
10
|
return yield configurationGenerator(tree, {
|
|
12
11
|
name: options.name,
|
|
13
12
|
uiFramework: '@storybook/angular',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generate-storybook-configuration.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/storybook-configuration/lib/generate-storybook-configuration.ts"],"names":[],"mappings":";;;;AAAA,yCAAsE;AAEtE,sDAAoD;AAEpD,SAAsB,8BAA8B,CAClD,IAAU,EACV,OAAsC;;QAEtC,
|
|
1
|
+
{"version":3,"file":"generate-storybook-configuration.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/storybook-configuration/lib/generate-storybook-configuration.ts"],"names":[],"mappings":";;;;AAAA,yCAAsE;AAEtE,sDAAoD;AAEpD,SAAsB,8BAA8B,CAClD,IAAU,EACV,OAAsC;;QAEtC,MAAM,EAAE,sBAAsB,EAAE,GAAG,IAAA,sBAAa,EAC9C,iBAAiB,EACjB,oBAAS,CACV,CAAC;QACF,OAAO,MAAM,sBAAsB,CAAC,IAAI,EAAE;YACxC,IAAI,EAAE,OAAO,CAAC,IAAI;YAClB,WAAW,EAAE,oBAAoB;YACjC,gBAAgB,EAAE,OAAO,CAAC,gBAAgB;YAC1C,MAAM,EAAE,OAAO,CAAC,MAAM;YACtB,gBAAgB,EAAE,OAAO,CAAC,gBAAgB;YAC1C,eAAe,EAAE,OAAO,CAAC,eAAe;YACxC,mBAAmB,EAAE,OAAO,CAAC,mBAAmB;YAChD,2BAA2B,EAAE,OAAO,CAAC,2BAA2B;SACjE,CAAC,CAAC;IACL,CAAC;CAAA;AAlBD,wEAkBC"}
|
|
@@ -6,6 +6,7 @@ const typescript_1 = require("nx/src/utils/typescript");
|
|
|
6
6
|
const path_1 = require("path");
|
|
7
7
|
const typescript_2 = require("typescript");
|
|
8
8
|
const ast_utils_1 = require("../../../utils/nx-devkit/ast-utils");
|
|
9
|
+
const ensure_typescript_1 = require("@nrwl/js/src/utils/typescript/ensure-typescript");
|
|
9
10
|
function getModuleDeclaredComponents(file, moduleFilePath, projectName) {
|
|
10
11
|
const ngModuleDecorator = getNgModuleDecorator(file, moduleFilePath);
|
|
11
12
|
const declarationsPropertyAssignment = getNgModuleDeclarationsPropertyAssignment(ngModuleDecorator, moduleFilePath, projectName);
|
|
@@ -37,6 +38,7 @@ function getModuleFilePaths(tree, entryPoint) {
|
|
|
37
38
|
}
|
|
38
39
|
exports.getModuleFilePaths = getModuleFilePaths;
|
|
39
40
|
function hasNgModule(tree, filePath) {
|
|
41
|
+
(0, ensure_typescript_1.ensureTypescript)();
|
|
40
42
|
const { tsquery } = require('@phenomnomnominal/tsquery');
|
|
41
43
|
const fileContent = tree.read(filePath, 'utf-8');
|
|
42
44
|
const ast = tsquery.ast(fileContent);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"module-info.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/utils/storybook-ast/module-info.ts"],"names":[],"mappings":";;;AACA,yCAKsB;AACtB,wDAAoD;AACpD,+BAA+B;AAO/B,2CAAwC;AACxC,kEAA0E;
|
|
1
|
+
{"version":3,"file":"module-info.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/utils/storybook-ast/module-info.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,27 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const tslib_1 = require("tslib");
|
|
4
|
+
const devkit_1 = require("@nrwl/devkit");
|
|
5
|
+
const angularCliVersion = '~15.2.0';
|
|
6
|
+
function default_1(tree) {
|
|
7
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
8
|
+
let shouldFormat = false;
|
|
9
|
+
(0, devkit_1.updateJson)(tree, 'package.json', (json) => {
|
|
10
|
+
var _a, _b;
|
|
11
|
+
if ((_a = json.devDependencies) === null || _a === void 0 ? void 0 : _a['@angular/cli']) {
|
|
12
|
+
json.devDependencies['@angular/cli'] = angularCliVersion;
|
|
13
|
+
shouldFormat = true;
|
|
14
|
+
}
|
|
15
|
+
else if ((_b = json.dependencies) === null || _b === void 0 ? void 0 : _b['@angular/cli']) {
|
|
16
|
+
json.dependencies['@angular/cli'] = angularCliVersion;
|
|
17
|
+
shouldFormat = true;
|
|
18
|
+
}
|
|
19
|
+
return json;
|
|
20
|
+
});
|
|
21
|
+
if (shouldFormat) {
|
|
22
|
+
yield (0, devkit_1.formatFiles)(tree);
|
|
23
|
+
}
|
|
24
|
+
});
|
|
25
|
+
}
|
|
26
|
+
exports.default = default_1;
|
|
27
|
+
//# sourceMappingURL=update-angular-cli.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"update-angular-cli.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/migrations/update-15-8-0/update-angular-cli.ts"],"names":[],"mappings":";;;AAAA,yCAA6D;AAE7D,MAAM,iBAAiB,GAAG,SAAS,CAAC;AAEpC,mBAA+B,IAAU;;QACvC,IAAI,YAAY,GAAG,KAAK,CAAC;QAEzB,IAAA,mBAAU,EAAC,IAAI,EAAE,cAAc,EAAE,CAAC,IAAI,EAAE,EAAE;;YACxC,IAAI,MAAA,IAAI,CAAC,eAAe,0CAAG,cAAc,CAAC,EAAE;gBAC1C,IAAI,CAAC,eAAe,CAAC,cAAc,CAAC,GAAG,iBAAiB,CAAC;gBACzD,YAAY,GAAG,IAAI,CAAC;aACrB;iBAAM,IAAI,MAAA,IAAI,CAAC,YAAY,0CAAG,cAAc,CAAC,EAAE;gBAC9C,IAAI,CAAC,YAAY,CAAC,cAAc,CAAC,GAAG,iBAAiB,CAAC;gBACtD,YAAY,GAAG,IAAI,CAAC;aACrB;YAED,OAAO,IAAI,CAAC;QACd,CAAC,CAAC,CAAC;QAEH,IAAI,YAAY,EAAE;YAChB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;IACH,CAAC;CAAA;AAlBD,4BAkBC"}
|