@nrwl/angular 15.8.0-beta.0 → 15.8.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/generators.d.ts +0 -1
- package/generators.js +0 -1
- package/generators.js.map +1 -1
- package/generators.json +0 -11
- package/mf/mf.d.ts +1 -1
- package/mf/mf.js +2 -1
- package/mf/mf.js.map +1 -1
- package/ng-package.json +2 -1
- package/package.json +10 -8
- package/src/builders/module-federation-dev-server/module-federation-dev-server.impl.js +14 -1
- package/src/builders/module-federation-dev-server/module-federation-dev-server.impl.js.map +1 -1
- package/src/builders/module-federation-dev-server/schema.d.ts +1 -0
- package/src/builders/module-federation-dev-server/schema.json +4 -0
- package/src/builders/module-federation-dev-ssr/module-federation-dev-ssr.impl.js +13 -1
- package/src/builders/module-federation-dev-ssr/module-federation-dev-ssr.impl.js.map +1 -1
- package/src/builders/module-federation-dev-ssr/schema.d.ts +1 -0
- package/src/builders/module-federation-dev-ssr/schema.json +4 -0
- package/src/builders/utilities/module-federation.d.ts +1 -1
- package/src/builders/utilities/module-federation.js +5 -6
- package/src/builders/utilities/module-federation.js.map +1 -1
- package/src/builders/webpack-browser/webpack-browser.impl.d.ts +1 -1
- package/src/executors/utilities/angular-version-utils.d.ts +1 -1
- package/src/generators/add-linting/add-linting.js +2 -1
- package/src/generators/add-linting/add-linting.js.map +1 -1
- package/src/generators/add-linting/angular-v14/lib/create-eslint-configuration.d.ts +1 -1
- package/src/generators/add-linting/lib/create-eslint-configuration.d.ts +1 -1
- package/src/generators/application/angular-v14/lib/convert-to-standalone-app.js +6 -5
- package/src/generators/application/angular-v14/lib/convert-to-standalone-app.js.map +1 -1
- package/src/generators/application/angular-v14/lib/create-files.js.map +1 -1
- package/src/generators/application/angular-v14/lib/update-component-spec.js +5 -2
- package/src/generators/application/angular-v14/lib/update-component-spec.js.map +1 -1
- package/src/generators/application/angular-v14/lib/update-config-files.js +2 -2
- package/src/generators/application/angular-v14/lib/update-config-files.js.map +1 -1
- package/src/generators/application/angular-v14/lib/update-e2e-project.js +2 -2
- package/src/generators/application/angular-v14/lib/update-e2e-project.js.map +1 -1
- package/src/generators/application/application.d.ts +2 -2
- package/src/generators/application/application.js +12 -1
- package/src/generators/application/application.js.map +1 -1
- package/src/generators/application/lib/convert-to-standalone-app.js +6 -5
- package/src/generators/application/lib/convert-to-standalone-app.js.map +1 -1
- package/src/generators/application/lib/create-files.js +2 -2
- package/src/generators/application/lib/create-files.js.map +1 -1
- package/src/generators/application/lib/root-router-config.js +5 -2
- package/src/generators/application/lib/root-router-config.js.map +1 -1
- package/src/generators/application/lib/update-app-component-template.d.ts +1 -1
- package/src/generators/application/lib/update-app-component-template.js +18 -12
- package/src/generators/application/lib/update-app-component-template.js.map +1 -1
- package/src/generators/application/lib/update-component-spec.js +5 -2
- package/src/generators/application/lib/update-component-spec.js.map +1 -1
- package/src/generators/application/lib/update-config-files.js +2 -2
- package/src/generators/application/lib/update-config-files.js.map +1 -1
- package/src/generators/application/lib/update-e2e-project.js +2 -2
- package/src/generators/application/lib/update-e2e-project.js.map +1 -1
- package/src/generators/application/lib/update-nx-component-template.js +7 -4
- package/src/generators/application/lib/update-nx-component-template.js.map +1 -1
- package/src/generators/application/schema.json +1 -1
- package/src/generators/component/lib/entry-point.js +3 -3
- package/src/generators/component/lib/entry-point.js.map +1 -1
- package/src/generators/convert-to-with-mf/lib/check-name-matches.js +3 -3
- 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 +5 -5
- 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.d.ts +2 -2
- package/src/generators/convert-to-with-mf/lib/is-host-remote-config.js +8 -6
- 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.d.ts +1 -1
- package/src/generators/convert-to-with-mf/lib/parse-ast-webpack-config.js +2 -2
- package/src/generators/convert-to-with-mf/lib/parse-ast-webpack-config.js.map +1 -1
- package/src/generators/host/host.js +2 -1
- package/src/generators/host/host.js.map +1 -1
- package/src/generators/init/angular-v14/init.js +10 -4
- package/src/generators/init/angular-v14/init.js.map +1 -1
- package/src/generators/init/angular-v14/schema.d.ts +1 -0
- package/src/generators/init/init.js +12 -5
- package/src/generators/init/init.js.map +1 -1
- package/src/generators/init/schema.d.ts +1 -0
- package/src/generators/karma/karma.js +2 -1
- package/src/generators/karma/karma.js.map +1 -1
- package/src/generators/karma-project/lib/generate-karma-project-files.js +3 -3
- package/src/generators/karma-project/lib/generate-karma-project-files.js.map +1 -1
- package/src/generators/library/lib/add-children.js +5 -2
- package/src/generators/library/lib/add-children.js.map +1 -1
- package/src/generators/library/lib/add-lazy-loaded-router-configuration.js +5 -2
- package/src/generators/library/lib/add-lazy-loaded-router-configuration.js.map +1 -1
- package/src/generators/library/lib/add-load-children.js +5 -2
- package/src/generators/library/lib/add-load-children.js.map +1 -1
- package/src/generators/library/lib/add-router-configuration.js +5 -2
- package/src/generators/library/lib/add-router-configuration.js.map +1 -1
- package/src/generators/library/lib/update-project.js +2 -2
- package/src/generators/library/lib/update-project.js.map +1 -1
- package/src/generators/library/lib/update-tsconfig.js +2 -17
- package/src/generators/library/lib/update-tsconfig.js.map +1 -1
- package/src/generators/library/library.d.ts +2 -2
- package/src/generators/library/library.js +5 -3
- package/src/generators/library/library.js.map +1 -1
- package/src/generators/library-secondary-entry-point/lib/add-path-mapping.js +2 -2
- package/src/generators/library-secondary-entry-point/lib/add-path-mapping.js.map +1 -1
- package/src/generators/ng-add/migrators/builders/angular-devkit-karma.migrator.js +2 -2
- package/src/generators/ng-add/migrators/builders/angular-devkit-karma.migrator.js.map +1 -1
- package/src/generators/ng-add/migrators/builders/angular-devkit-ng-packagr.migrator.js +2 -2
- package/src/generators/ng-add/migrators/builders/angular-devkit-ng-packagr.migrator.js.map +1 -1
- package/src/generators/ng-add/migrators/builders/builder-migrator-class.type.d.ts +1 -1
- package/src/generators/ng-add/migrators/projects/app.migrator.d.ts +1 -1
- package/src/generators/ng-add/migrators/projects/app.migrator.js +2 -2
- package/src/generators/ng-add/migrators/projects/app.migrator.js.map +1 -1
- package/src/generators/ng-add/migrators/projects/e2e.migrator.d.ts +1 -1
- package/src/generators/ng-add/migrators/projects/e2e.migrator.js +21 -20
- package/src/generators/ng-add/migrators/projects/e2e.migrator.js.map +1 -1
- package/src/generators/ng-add/migrators/projects/project.migrator.js +3 -3
- package/src/generators/ng-add/migrators/projects/project.migrator.js.map +1 -1
- package/src/generators/ng-add/utilities/file-change-recorder.js +5 -5
- package/src/generators/ng-add/utilities/file-change-recorder.js.map +1 -1
- package/src/generators/ng-add/utilities/types.d.ts +8 -8
- package/src/generators/ng-add/utilities/workspace.js +3 -3
- package/src/generators/ng-add/utilities/workspace.js.map +1 -1
- package/src/generators/ngrx/lib/normalize-options.d.ts +1 -1
- package/src/generators/remote/remote.js +2 -2
- package/src/generators/remote/remote.js.map +1 -1
- package/src/generators/setup-mf/lib/add-remote-to-host.js +5 -2
- package/src/generators/setup-mf/lib/add-remote-to-host.js.map +1 -1
- package/src/generators/setup-ssr/lib/update-app-module.js +3 -3
- package/src/generators/setup-ssr/lib/update-app-module.js.map +1 -1
- package/src/generators/storybook-configuration/lib/generate-storybook-configuration.js +1 -1
- package/src/generators/storybook-configuration/lib/generate-storybook-configuration.js.map +1 -1
- package/src/generators/utils/create-ts-config.d.ts +1 -1
- package/src/generators/utils/create-ts-config.js +4 -4
- package/src/generators/utils/create-ts-config.js.map +1 -1
- package/src/generators/utils/export-scam.d.ts +1 -1
- package/src/generators/utils/file-info.d.ts +2 -2
- package/src/generators/utils/insert-ngmodule-import.d.ts +1 -1
- package/src/generators/utils/storybook-ast/entry-point.d.ts +1 -1
- package/src/generators/utils/storybook-ast/module-info.js +3 -3
- package/src/generators/utils/storybook-ast/module-info.js.map +1 -1
- package/src/generators/utils/storybook-ast/storybook-inputs.d.ts +1 -1
- package/src/generators/utils/types.d.ts +1 -1
- package/src/generators/web-worker/lib/update-tsconfig.js +2 -2
- package/src/generators/web-worker/lib/update-tsconfig.js.map +1 -1
- package/src/runtime/nx/data-persistence.d.ts +4 -4
- package/src/utils/backward-compatible-versions.d.ts +3 -3
- package/src/utils/nx-devkit/ast-utils.d.ts +2 -2
- package/src/utils/nx-devkit/ast-utils.js +78 -43
- package/src/utils/nx-devkit/ast-utils.js.map +1 -1
- package/src/utils/nx-devkit/route-utils.js +14 -10
- package/src/utils/nx-devkit/route-utils.js.map +1 -1
- package/src/utils/versions.d.ts +1 -1
- package/src/utils/versions.js +1 -1
- package/src/generators/change-storybook-targets/change-storybook-targets.d.ts +0 -4
- package/src/generators/change-storybook-targets/change-storybook-targets.js +0 -19
- package/src/generators/change-storybook-targets/change-storybook-targets.js.map +0 -1
- package/src/generators/change-storybook-targets/compat.d.ts +0 -2
- package/src/generators/change-storybook-targets/compat.js +0 -6
- package/src/generators/change-storybook-targets/compat.js.map +0 -1
- package/src/generators/change-storybook-targets/schema.d.ts +0 -3
- package/src/generators/change-storybook-targets/schema.json +0 -19
|
@@ -6,6 +6,7 @@ const cypress_1 = require("@nrwl/cypress");
|
|
|
6
6
|
const devkit_1 = require("@nrwl/devkit");
|
|
7
7
|
const jest_1 = require("@nrwl/jest");
|
|
8
8
|
const linter_1 = require("@nrwl/linter");
|
|
9
|
+
const js_1 = require("@nrwl/js");
|
|
9
10
|
const run_tasks_in_serial_1 = require("@nrwl/workspace/src/utilities/run-tasks-in-serial");
|
|
10
11
|
const backward_compatible_versions_1 = require("../../../utils/backward-compatible-versions");
|
|
11
12
|
const test_runners_1 = require("../../../utils/test-runners");
|
|
@@ -15,6 +16,8 @@ function angularInitGenerator(host, rawOptions) {
|
|
|
15
16
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
16
17
|
const options = normalizeOptions(rawOptions);
|
|
17
18
|
setDefaults(host, options);
|
|
19
|
+
yield (0, js_1.initGenerator)(host, Object.assign(Object.assign({}, options), { tsConfigName: options.rootProject ? 'tsconfig.json' : 'tsconfig.base.json', js: false, skipFormat: true }));
|
|
20
|
+
const tasks = [];
|
|
18
21
|
const peerDepsToInstall = [
|
|
19
22
|
'@angular-devkit/core',
|
|
20
23
|
'@angular-devkit/schematics',
|
|
@@ -29,16 +32,18 @@ function angularInitGenerator(host, rawOptions) {
|
|
|
29
32
|
(0, devkit_1.ensurePackage)(host, pkg, devkitVersion);
|
|
30
33
|
}
|
|
31
34
|
});
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
+
if (!options.skipPackageJson) {
|
|
36
|
+
tasks.push(updateDependencies(host));
|
|
37
|
+
}
|
|
35
38
|
const unitTestTask = yield addUnitTestRunner(host, options);
|
|
39
|
+
tasks.push(unitTestTask);
|
|
36
40
|
const e2eTask = addE2ETestRunner(host, options);
|
|
41
|
+
tasks.push(e2eTask);
|
|
37
42
|
addGitIgnoreEntry(host, '.angular');
|
|
38
43
|
if (!options.skipFormat) {
|
|
39
44
|
yield (0, devkit_1.formatFiles)(host);
|
|
40
45
|
}
|
|
41
|
-
return (0, run_tasks_in_serial_1.runTasksInSerial)(
|
|
46
|
+
return (0, run_tasks_in_serial_1.runTasksInSerial)(...tasks);
|
|
42
47
|
});
|
|
43
48
|
}
|
|
44
49
|
exports.angularInitGenerator = angularInitGenerator;
|
|
@@ -52,6 +57,7 @@ function normalizeOptions(options) {
|
|
|
52
57
|
skipPackageJson: (_e = options.skipPackageJson) !== null && _e !== void 0 ? _e : false,
|
|
53
58
|
style: (_f = options.style) !== null && _f !== void 0 ? _f : 'css',
|
|
54
59
|
unitTestRunner: (_g = options.unitTestRunner) !== null && _g !== void 0 ? _g : test_runners_1.UnitTestRunner.Jest,
|
|
60
|
+
rootProject: options.rootProject,
|
|
55
61
|
};
|
|
56
62
|
}
|
|
57
63
|
function setDefaults(host, options) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/init/angular-v14/init.ts"],"names":[],"mappings":";;;;AAAA,2CAAqD;AACrD,yCAQsB;AACtB,qCAA+C;AAC/C,yCAAsC;AACtC,2FAAqF;AACrF,8FAAyF;AACzF,8DAA4E;AAC5E,6CAAmD;AACnD,6DAGmC;AAGnC,SAAsB,oBAAoB,CACxC,IAAU,EACV,UAAkB;;QAElB,MAAM,OAAO,GAAG,gBAAgB,CAAC,UAAU,CAAC,CAAC;QAC7C,WAAW,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/init/angular-v14/init.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,6 +6,7 @@ const cypress_1 = require("@nrwl/cypress");
|
|
|
6
6
|
const devkit_1 = require("@nrwl/devkit");
|
|
7
7
|
const jest_1 = require("@nrwl/jest");
|
|
8
8
|
const linter_1 = require("@nrwl/linter");
|
|
9
|
+
const js_1 = require("@nrwl/js");
|
|
9
10
|
const run_tasks_in_serial_1 = require("@nrwl/workspace/src/utilities/run-tasks-in-serial");
|
|
10
11
|
const path_1 = require("path");
|
|
11
12
|
const test_runners_1 = require("../../utils/test-runners");
|
|
@@ -14,9 +15,10 @@ const karma_1 = require("../karma/karma");
|
|
|
14
15
|
const version_utils_1 = require("../utils/version-utils");
|
|
15
16
|
function angularInitGenerator(tree, rawOptions) {
|
|
16
17
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
18
|
+
var _a;
|
|
17
19
|
const generatorDirectory = (0, version_utils_1.getGeneratorDirectoryForInstalledAngularVersion)(tree);
|
|
18
20
|
if (generatorDirectory) {
|
|
19
|
-
let previousGenerator = yield
|
|
21
|
+
let previousGenerator = yield (_a = (0, path_1.join)(__dirname, generatorDirectory, 'init'), Promise.resolve().then(() => require(_a)));
|
|
20
22
|
yield previousGenerator.default(tree, rawOptions);
|
|
21
23
|
return;
|
|
22
24
|
}
|
|
@@ -36,16 +38,20 @@ function angularInitGenerator(tree, rawOptions) {
|
|
|
36
38
|
});
|
|
37
39
|
const options = normalizeOptions(rawOptions);
|
|
38
40
|
setDefaults(tree, options);
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
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
|
+
const tasks = [];
|
|
43
|
+
if (!options.skipPackageJson) {
|
|
44
|
+
tasks.push(updateDependencies(tree));
|
|
45
|
+
}
|
|
42
46
|
const unitTestTask = yield addUnitTestRunner(tree, options);
|
|
47
|
+
tasks.push(unitTestTask);
|
|
43
48
|
const e2eTask = addE2ETestRunner(tree, options);
|
|
49
|
+
tasks.push(e2eTask);
|
|
44
50
|
addGitIgnoreEntry(tree, '.angular');
|
|
45
51
|
if (!options.skipFormat) {
|
|
46
52
|
yield (0, devkit_1.formatFiles)(tree);
|
|
47
53
|
}
|
|
48
|
-
return (0, run_tasks_in_serial_1.runTasksInSerial)(
|
|
54
|
+
return (0, run_tasks_in_serial_1.runTasksInSerial)(...tasks);
|
|
49
55
|
});
|
|
50
56
|
}
|
|
51
57
|
exports.angularInitGenerator = angularInitGenerator;
|
|
@@ -59,6 +65,7 @@ function normalizeOptions(options) {
|
|
|
59
65
|
skipPackageJson: (_e = options.skipPackageJson) !== null && _e !== void 0 ? _e : false,
|
|
60
66
|
style: (_f = options.style) !== null && _f !== void 0 ? _f : 'css',
|
|
61
67
|
unitTestRunner: (_g = options.unitTestRunner) !== null && _g !== void 0 ? _g : test_runners_1.UnitTestRunner.Jest,
|
|
68
|
+
rootProject: options.rootProject,
|
|
62
69
|
};
|
|
63
70
|
}
|
|
64
71
|
function setDefaults(host, options) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/init/init.ts"],"names":[],"mappings":";;;;AAAA,2CAAqD;AACrD,yCAQsB;AACtB,qCAA+C;AAC/C,yCAAsC;AACtC,2FAAqF;AACrF,+BAA4B;AAC5B,2DAAyE;AACzE,mDAa8B;AAC9B,0CAAgD;AAChD,0DAIgC;AAGhC,SAAsB,oBAAoB,CACxC,IAAU,EACV,UAAkB
|
|
1
|
+
{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/init/init.ts"],"names":[],"mappings":";;;;AAAA,2CAAqD;AACrD,yCAQsB;AACtB,qCAA+C;AAC/C,yCAAsC;AACtC,iCAA4D;AAC5D,2FAAqF;AACrF,+BAA4B;AAC5B,2DAAyE;AACzE,mDAa8B;AAC9B,0CAAgD;AAChD,0DAIgC;AAGhC,SAAsB,oBAAoB,CACxC,IAAU,EACV,UAAkB;;;QAElB,MAAM,kBAAkB,GACtB,IAAA,+DAA+C,EAAC,IAAI,CAAC,CAAC;QACxD,IAAI,kBAAkB,EAAE;YACtB,IAAI,iBAAiB,GAAG,YACtB,IAAA,WAAI,EAAC,SAAS,EAAE,kBAAkB,EAAE,MAAM,CAAC,4CAC5C,CAAC;YACF,MAAM,iBAAiB,CAAC,OAAO,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;YAClD,OAAO;SACR;QAED,MAAM,iBAAiB,GAAG;YACxB,sBAAsB;YACtB,4BAA4B;YAC5B,qBAAqB;SACtB,CAAC;QACF,IAAI,aAAqB,CAAC;QAC1B,iBAAiB,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;;YAChC,MAAM,cAAc,GAAG,IAAA,0CAA0B,EAAC,IAAI,EAAE,GAAG,CAAC,CAAC;YAE7D,IAAI,CAAC,cAAc,EAAE;gBACnB,aAAa,aAAb,aAAa,cAAb,aAAa,IAAb,aAAa,GACX,MAAA,IAAA,0CAA0B,EAAC,IAAI,EAAE,+BAA+B,CAAC,mCACjE,+BAAoB,EAAC;gBACvB,IAAA,sBAAa,EAAC,IAAI,EAAE,GAAG,EAAE,aAAa,CAAC,CAAC;aACzC;QACH,CAAC,CAAC,CAAC;QAEH,MAAM,OAAO,GAAG,gBAAgB,CAAC,UAAU,CAAC,CAAC;QAC7C,WAAW,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAC3B,MAAM,IAAA,kBAAe,EAAC,IAAI,kCACrB,OAAO,KACV,YAAY,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,oBAAoB,EAC1E,EAAE,EAAE,KAAK,EACT,UAAU,EAAE,IAAI,IAChB,CAAC;QAEH,MAAM,KAAK,GAAwB,EAAE,CAAC;QAEtC,IAAI,CAAC,OAAO,CAAC,eAAe,EAAE;YAC5B,KAAK,CAAC,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC,CAAC;SACtC;QACD,MAAM,YAAY,GAAG,MAAM,iBAAiB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAC5D,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QACzB,MAAM,OAAO,GAAG,gBAAgB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAChD,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAEpB,iBAAiB,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;QAEpC,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;YACvB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;QAED,OAAO,IAAA,sCAAgB,EAAC,GAAG,KAAK,CAAC,CAAC;IACpC,CAAC;CAAA;AAzDD,oDAyDC;AAED,SAAS,gBAAgB,CAAC,OAAe;;IACvC,OAAO;QACL,aAAa,EAAE,MAAA,OAAO,CAAC,aAAa,mCAAI,4BAAa,CAAC,OAAO;QAC7D,MAAM,EAAE,MAAA,OAAO,CAAC,MAAM,mCAAI,eAAM,CAAC,MAAM;QACvC,UAAU,EAAE,MAAA,OAAO,CAAC,UAAU,mCAAI,KAAK;QACvC,WAAW,EAAE,MAAA,OAAO,CAAC,WAAW,mCAAI,KAAK;QACzC,eAAe,EAAE,MAAA,OAAO,CAAC,eAAe,mCAAI,KAAK;QACjD,KAAK,EAAE,MAAA,OAAO,CAAC,KAAK,mCAAI,KAAK;QAC7B,cAAc,EAAE,MAAA,OAAO,CAAC,cAAc,mCAAI,6BAAc,CAAC,IAAI;QAC7D,WAAW,EAAE,OAAO,CAAC,WAAW;KACjC,CAAC;AACJ,CAAC;AAED,SAAS,WAAW,CAAC,IAAU,EAAE,OAAe;IAC9C,MAAM,MAAM,GAAG,IAAA,mBAAU,EAAC,IAAI,CAAC,CAAC;IAEhC,MAAM,CAAC,UAAU,GAAG,MAAM,CAAC,UAAU,IAAI,EAAE,CAAC;IAC5C,MAAM,CAAC,UAAU,CAAC,2BAA2B,CAAC,mBAC5C,KAAK,EAAE,OAAO,CAAC,KAAK,EACpB,MAAM,EAAE,OAAO,CAAC,MAAM,EACtB,cAAc,EAAE,OAAO,CAAC,cAAc,EACtC,aAAa,EAAE,OAAO,CAAC,aAAa,IACjC,CAAC,MAAM,CAAC,UAAU,CAAC,2BAA2B,CAAC,IAAI,EAAE,CAAC,CAC1D,CAAC;IACF,MAAM,CAAC,UAAU,CAAC,uBAAuB,CAAC,mBACxC,MAAM,EAAE,OAAO,CAAC,MAAM,EACtB,cAAc,EAAE,OAAO,CAAC,cAAc,IACnC,CAAC,MAAM,CAAC,UAAU,CAAC,uBAAuB,CAAC,IAAI,EAAE,CAAC,CACtD,CAAC;IACF,MAAM,CAAC,UAAU,CAAC,yBAAyB,CAAC,mBAC1C,KAAK,EAAE,OAAO,CAAC,KAAK,IACjB,CAAC,MAAM,CAAC,UAAU,CAAC,yBAAyB,CAAC,IAAI,EAAE,CAAC,CACxD,CAAC;IAEF,IAAA,qBAAY,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;AAC7B,CAAC;AAED,SAAS,kBAAkB,CAAC,IAAU;;IACpC,MAAM,uBAAuB,GAC3B,MAAA,IAAA,0CAA0B,EAAC,IAAI,EAAE,eAAe,CAAC,mCAAI,yBAAc,CAAC;IACtE,MAAM,6BAA6B,GACjC,MAAA,IAAA,0CAA0B,EAAC,IAAI,EAAE,+BAA+B,CAAC,mCACjE,+BAAoB,CAAC;IAEvB,OAAO,IAAA,uDAAuC,EAC5C,IAAI,EACJ;QACE,qBAAqB,EAAE,uBAAuB;QAC9C,iBAAiB,EAAE,uBAAuB;QAC1C,mBAAmB,EAAE,uBAAuB;QAC5C,eAAe,EAAE,uBAAuB;QACxC,gBAAgB,EAAE,uBAAuB;QACzC,2BAA2B,EAAE,uBAAuB;QACpD,mCAAmC,EAAE,uBAAuB;QAC5D,iBAAiB,EAAE,uBAAuB;QAC1C,IAAI,EAAE,sBAAW;QACjB,KAAK,EAAE,uBAAY;QACnB,SAAS,EAAE,wBAAa;KACzB,EACD;QACE,cAAc,EAAE,6BAA6B;QAC7C,uBAAuB,EAAE,uBAAuB;QAChD,2BAA2B,EAAE,uBAAuB;QACpD,+BAA+B,EAAE,6BAA6B;KAC/D,CACF,CAAC;AACJ,CAAC;AAED,SAAe,iBAAiB,CAC9B,IAAU,EACV,OAAe;;QAEf,QAAQ,OAAO,CAAC,cAAc,EAAE;YAC9B,KAAK,6BAAc,CAAC,KAAK;gBACvB,OAAO,MAAM,IAAA,sBAAc,EAAC,IAAI,EAAE;oBAChC,eAAe,EAAE,OAAO,CAAC,eAAe;iBACzC,CAAC,CAAC;YACL,KAAK,6BAAc,CAAC,IAAI;gBACtB,IAAI,CAAC,OAAO,CAAC,eAAe,EAAE;oBAC5B,IAAA,uDAAuC,EACrC,IAAI,EACJ,EAAE,EACF;wBACE,qBAAqB,EAAE,mCAAwB;qBAChD,CACF,CAAC;iBACH;gBAED,OAAO,IAAA,wBAAiB,EAAC,IAAI,EAAE;oBAC7B,eAAe,EAAE,OAAO,CAAC,eAAe;iBACzC,CAAC,CAAC;YACL;gBACE,OAAO,GAAG,EAAE,GAAE,CAAC,CAAC;SACnB;IACH,CAAC;CAAA;AAED,SAAS,gBAAgB,CAAC,IAAU,EAAE,OAAe;IACnD,QAAQ,OAAO,CAAC,aAAa,EAAE;QAC7B,KAAK,4BAAa,CAAC,UAAU;YAC3B,OAAO,CAAC,OAAO,CAAC,eAAe;gBAC7B,CAAC,CAAC,IAAA,uDAAuC,EACrC,IAAI,EACJ,EAAE,EACF;oBACE,UAAU,EAAE,4BAAiB;oBAC7B,cAAc,EAAE,6BAAkB;oBAClC,uBAAuB,EAAE,qCAA0B;oBACnD,SAAS,EAAE,wBAAa;oBACxB,gBAAgB,EAAE,8BAAmB;oBACrC,mBAAmB,EAAE,iCAAsB;iBAC5C,CACF;gBACH,CAAC,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC;QACf,KAAK,4BAAa,CAAC,OAAO;YACxB,OAAO,IAAA,8BAAoB,EAAC,IAAI,EAAE;gBAChC,eAAe,EAAE,OAAO,CAAC,eAAe;aACzC,CAAC,CAAC;QACL;YACE,OAAO,GAAG,EAAE,GAAE,CAAC,CAAC;KACnB;AACH,CAAC;AAED,SAAS,iBAAiB,CAAC,IAAU,EAAE,KAAa;IAClD,IAAI,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,EAAE;QAC7B,IAAI,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;QAC/C,IAAI,eAAe,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE;YACjC,OAAO;SACR;QAED,OAAO,GAAG,GAAG,OAAO,KAAK,KAAK,IAAI,CAAC;QACnC,IAAI,CAAC,KAAK,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;KACnC;SAAM;QACL,eAAM,CAAC,IAAI,CAAC,yCAAyC,CAAC,CAAC;KACxD;AACH,CAAC;AAED,kBAAe,oBAAoB,CAAC"}
|
|
@@ -34,9 +34,10 @@ function addTestInputs(tree) {
|
|
|
34
34
|
}
|
|
35
35
|
function karmaGenerator(tree, options) {
|
|
36
36
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
37
|
+
var _a;
|
|
37
38
|
const generatorDirectory = (0, version_utils_1.getGeneratorDirectoryForInstalledAngularVersion)(tree);
|
|
38
39
|
if (generatorDirectory) {
|
|
39
|
-
let previousGenerator = yield
|
|
40
|
+
let previousGenerator = yield (_a = (0, path_1.join)(__dirname, generatorDirectory, 'karma'), Promise.resolve().then(() => require(_a)));
|
|
40
41
|
yield previousGenerator.default(tree, options);
|
|
41
42
|
return;
|
|
42
43
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"karma.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/karma/karma.ts"],"names":[],"mappings":";;;;AACA,yCAMsB;AACtB,+BAA4B;AAC5B,mDAU8B;AAC9B,0DAGgC;AAGhC,SAAS,aAAa,CAAC,IAAU;;;IAC/B,MAAM,MAAM,GAAG,IAAA,mBAAU,EAAC,IAAI,CAAC,CAAC;IAEhC,MAAM,iBAAiB,GAAG,MAAA,MAAM,CAAC,WAAW,0CAAE,UAAU,CAAC;IACzD,IAAI,iBAAiB,EAAE;QACrB,iBAAiB,CAAC,IAAI;QACpB,6CAA6C;QAC7C,gCAAgC;QAChC,4BAA4B;QAC5B,mCAAmC;QACnC,uBAAuB;QACvB,8BAA8B,CAC/B,CAAC;QACF,iBAAiB;QACjB,MAAM,CAAC,WAAW,CAAC,UAAU,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,iBAAiB,CAAC,CAAC,CAAC;KACxE;IAED,0FAA0F;IAC1F,MAAA,MAAM,CAAC,cAAc,oCAArB,MAAM,CAAC,cAAc,GAAK,EAAE,EAAC;IAC7B,YAAA,MAAM,CAAC,cAAc,EAAC,IAAI,uCAAJ,IAAI,GAAK,EAAE,EAAC;IAClC,YAAA,MAAM,CAAC,cAAc,CAAC,IAAI,EAAC,MAAM,uCAAN,MAAM,GAAK;QACpC,SAAS;QACT,iBAAiB,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,UAAU;KAC/C,EAAC;IACF,MAAM,CAAC,cAAc,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,+BAA+B,CAAC,CAAC;IAExE,IAAA,qBAAY,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;AAC7B,CAAC;AAED,SAAsB,cAAc,CAAC,IAAU,EAAE,OAAyB
|
|
1
|
+
{"version":3,"file":"karma.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/karma/karma.ts"],"names":[],"mappings":";;;;AACA,yCAMsB;AACtB,+BAA4B;AAC5B,mDAU8B;AAC9B,0DAGgC;AAGhC,SAAS,aAAa,CAAC,IAAU;;;IAC/B,MAAM,MAAM,GAAG,IAAA,mBAAU,EAAC,IAAI,CAAC,CAAC;IAEhC,MAAM,iBAAiB,GAAG,MAAA,MAAM,CAAC,WAAW,0CAAE,UAAU,CAAC;IACzD,IAAI,iBAAiB,EAAE;QACrB,iBAAiB,CAAC,IAAI;QACpB,6CAA6C;QAC7C,gCAAgC;QAChC,4BAA4B;QAC5B,mCAAmC;QACnC,uBAAuB;QACvB,8BAA8B,CAC/B,CAAC;QACF,iBAAiB;QACjB,MAAM,CAAC,WAAW,CAAC,UAAU,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,iBAAiB,CAAC,CAAC,CAAC;KACxE;IAED,0FAA0F;IAC1F,MAAA,MAAM,CAAC,cAAc,oCAArB,MAAM,CAAC,cAAc,GAAK,EAAE,EAAC;IAC7B,YAAA,MAAM,CAAC,cAAc,EAAC,IAAI,uCAAJ,IAAI,GAAK,EAAE,EAAC;IAClC,YAAA,MAAM,CAAC,cAAc,CAAC,IAAI,EAAC,MAAM,uCAAN,MAAM,GAAK;QACpC,SAAS;QACT,iBAAiB,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,UAAU;KAC/C,EAAC;IACF,MAAM,CAAC,cAAc,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,+BAA+B,CAAC,CAAC;IAExE,IAAA,qBAAY,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;AAC7B,CAAC;AAED,SAAsB,cAAc,CAAC,IAAU,EAAE,OAAyB;;;QACxE,MAAM,kBAAkB,GACtB,IAAA,+DAA+C,EAAC,IAAI,CAAC,CAAC;QACxD,IAAI,kBAAkB,EAAE;YACtB,IAAI,iBAAiB,GAAG,YACtB,IAAA,WAAI,EAAC,SAAS,EAAE,kBAAkB,EAAE,OAAO,CAAC,4CAC7C,CAAC;YACF,MAAM,iBAAiB,CAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YAC/C,OAAO;SACR;QACD,MAAM,WAAW,GAAG,IAAA,iBAAQ,EAAC,IAAI,EAAE,cAAc,CAAC,CAAC;QAEnD,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,EAAE;YACjC,IAAA,sBAAa,EAAC,IAAI,EAAE,IAAA,0BAAiB,EAAC,SAAS,EAAE,OAAO,CAAC,EAAE,GAAG,EAAE;gBAC9D,IAAI,EAAE,EAAE;aACT,CAAC,CAAC;YAEH,aAAa,CAAC,IAAI,CAAC,CAAC;SACrB;QAED,IAAI,OAAO,CAAC,eAAe,IAAI,WAAW,CAAC,eAAe,CAAC,OAAO,CAAC,EAAE;YACnE,OAAO,GAAG,EAAE,GAAE,CAAC,CAAC;SACjB;QAED,OAAO,IAAA,uDAAuC,EAC5C,IAAI,EACJ,EAAE,EACF;YACE,KAAK,EAAE,uBAAY;YACnB,uBAAuB,EAAE,qCAA0B;YACnD,gBAAgB,EAAE,+BAAoB;YACtC,eAAe,EAAE,8BAAmB;YACpC,6BAA6B,EAAE,0CAA+B;YAC9D,cAAc,EAAE,6BAAkB;YAClC,uBAAuB,EAAE,qCAA0B;YACnD,gBAAgB,EAAE,8BAAmB;YACrC,aAAa,EAAE,2BAAgB;SAChC,CACF,CAAC;IACJ,CAAC;CAAA;AAvCD,wCAuCC;AAED,kBAAe,cAAc,CAAC"}
|
|
@@ -2,7 +2,6 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.generateKarmaProjectFiles = void 0;
|
|
4
4
|
const devkit_1 = require("@nrwl/devkit");
|
|
5
|
-
const tsquery_1 = require("@phenomnomnominal/tsquery");
|
|
6
5
|
const version_utils_1 = require("../../utils/version-utils");
|
|
7
6
|
const v14_test_file_1 = require("./v14-test-file");
|
|
8
7
|
function generateKarmaProjectFiles(tree, project) {
|
|
@@ -45,9 +44,10 @@ function isUsingConfigSetInBaseKarmaConfig(tree) {
|
|
|
45
44
|
if (!tree.exists('karma.conf.js')) {
|
|
46
45
|
return false;
|
|
47
46
|
}
|
|
47
|
+
const { tsquery } = require('@phenomnomnominal/tsquery');
|
|
48
48
|
const CONFIG_SET_SELECTOR = 'PropertyAccessExpression:has(Identifier[name=config], Identifier[name=set])';
|
|
49
|
-
const ast =
|
|
50
|
-
const nodes =
|
|
49
|
+
const ast = tsquery.ast(tree.read('karma.conf.js', 'utf-8'));
|
|
50
|
+
const nodes = tsquery(ast, CONFIG_SET_SELECTOR, { visitAllChildren: true });
|
|
51
51
|
return nodes.length > 0;
|
|
52
52
|
}
|
|
53
53
|
//# sourceMappingURL=generate-karma-project-files.js.map
|
|
@@ -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,
|
|
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;AAE9C,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,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"}
|
|
@@ -3,19 +3,22 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.addChildren = void 0;
|
|
4
4
|
const devkit_1 = require("@nrwl/devkit");
|
|
5
5
|
const ast_utils_1 = require("@nrwl/workspace/src/utilities/ast-utils");
|
|
6
|
-
const ts = require("typescript");
|
|
7
6
|
const ast_utils_2 = require("../../../utils/nx-devkit/ast-utils");
|
|
8
7
|
const route_utils_1 = require("../../../utils/nx-devkit/route-utils");
|
|
8
|
+
let tsModule;
|
|
9
9
|
function addChildren(tree, options) {
|
|
10
10
|
if (!tree.exists(options.parent)) {
|
|
11
11
|
throw new Error(`Cannot find '${options.parent}'`);
|
|
12
12
|
}
|
|
13
|
+
if (!tsModule) {
|
|
14
|
+
tsModule = require('typescript');
|
|
15
|
+
}
|
|
13
16
|
const routeFileSource = tree.read(options.parent, 'utf-8');
|
|
14
17
|
const constName = options.standalone
|
|
15
18
|
? `${(0, devkit_1.names)(options.name).propertyName}Routes`
|
|
16
19
|
: `${(0, devkit_1.names)(options.fileName).propertyName}Routes`;
|
|
17
20
|
const importPath = options.importPath;
|
|
18
|
-
let sourceFile =
|
|
21
|
+
let sourceFile = tsModule.createSourceFile(options.parent, routeFileSource, tsModule.ScriptTarget.Latest, true);
|
|
19
22
|
if (!options.standalone) {
|
|
20
23
|
sourceFile = (0, ast_utils_2.addImportToModule)(tree, sourceFile, options.parent, options.moduleName);
|
|
21
24
|
}
|
|
@@ -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,
|
|
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;AAEhE,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,OAAO,CAAC,YAAY,CAAC,CAAC;KAClC;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"}
|
|
@@ -3,16 +3,19 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.addLazyLoadedRouterConfiguration = void 0;
|
|
4
4
|
const devkit_1 = require("@nrwl/devkit");
|
|
5
5
|
const ast_utils_1 = require("@nrwl/workspace/src/utilities/ast-utils");
|
|
6
|
-
const ts = require("typescript");
|
|
7
6
|
const ast_utils_2 = require("../../../utils/nx-devkit/ast-utils");
|
|
8
7
|
const path_1 = require("path");
|
|
8
|
+
let tsModule;
|
|
9
9
|
function addLazyLoadedRouterConfiguration(tree, options) {
|
|
10
|
+
if (!tsModule) {
|
|
11
|
+
tsModule = require('typescript');
|
|
12
|
+
}
|
|
10
13
|
const constName = `${(0, devkit_1.names)(options.fileName).propertyName}Routes`;
|
|
11
14
|
tree.write((0, devkit_1.joinPathFragments)((0, path_1.dirname)(options.modulePath), 'lib.routes.ts'), `import { Route } from '@angular/router';
|
|
12
15
|
|
|
13
16
|
export const ${constName}: Route[] = [/* {path: '', pathMatch: 'full', component: InsertYourComponentHere} */];`);
|
|
14
17
|
const routeFileSource = tree.read(options.modulePath, 'utf-8');
|
|
15
|
-
let sourceFile =
|
|
18
|
+
let sourceFile = tsModule.createSourceFile(options.modulePath, routeFileSource, tsModule.ScriptTarget.Latest, true);
|
|
16
19
|
sourceFile = (0, ast_utils_2.addImportToModule)(tree, sourceFile, options.modulePath, `
|
|
17
20
|
RouterModule.forChild(${constName}) `);
|
|
18
21
|
sourceFile = (0, ast_utils_1.insertImport)(tree, sourceFile, options.modulePath, 'RouterModule', '@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,
|
|
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;AAE/B,IAAI,QAAqC,CAAC;AAE1C,SAAgB,gCAAgC,CAC9C,IAAU,EACV,OAA2C;IAE3C,IAAI,CAAC,QAAQ,EAAE;QACb,QAAQ,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC;KAClC;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"}
|
|
@@ -2,14 +2,17 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.addLoadChildren = void 0;
|
|
4
4
|
const devkit_1 = require("@nrwl/devkit");
|
|
5
|
-
const ts = require("typescript");
|
|
6
5
|
const route_utils_1 = require("../../../utils/nx-devkit/route-utils");
|
|
6
|
+
let tsModule;
|
|
7
7
|
function addLoadChildren(tree, options) {
|
|
8
8
|
if (!tree.exists(options.parent)) {
|
|
9
9
|
throw new Error(`Cannot find '${options.parent}'`);
|
|
10
10
|
}
|
|
11
|
+
if (!tsModule) {
|
|
12
|
+
tsModule = require('typescript');
|
|
13
|
+
}
|
|
11
14
|
const moduleSource = tree.read(options.parent, 'utf-8');
|
|
12
|
-
const sourceFile =
|
|
15
|
+
const sourceFile = tsModule.createSourceFile(options.parent, moduleSource, tsModule.ScriptTarget.Latest, true);
|
|
13
16
|
const route = `{path: '${(0, devkit_1.names)(options.fileName).fileName}', loadChildren: () => import('${options.importPath}').then(m => m.${options.standalone
|
|
14
17
|
? `${(0, devkit_1.names)(options.name).propertyName}Routes`
|
|
15
18
|
: options.moduleName})}`;
|
|
@@ -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;
|
|
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;AAEhE,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,OAAO,CAAC,YAAY,CAAC,CAAC;KAClC;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"}
|
|
@@ -3,13 +3,16 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.addRouterConfiguration = void 0;
|
|
4
4
|
const devkit_1 = require("@nrwl/devkit");
|
|
5
5
|
const ast_utils_1 = require("@nrwl/workspace/src/utilities/ast-utils");
|
|
6
|
-
const ts = require("typescript");
|
|
7
6
|
const ast_utils_2 = require("../../../utils/nx-devkit/ast-utils");
|
|
8
7
|
const path_1 = require("path");
|
|
8
|
+
let tsModule;
|
|
9
9
|
function addRouterConfiguration(tree, options) {
|
|
10
|
+
if (!tsModule) {
|
|
11
|
+
tsModule = require('typescript');
|
|
12
|
+
}
|
|
10
13
|
const constName = `${(0, devkit_1.names)(options.fileName).propertyName}Routes`;
|
|
11
14
|
const moduleSource = tree.read(options.modulePath, 'utf-8');
|
|
12
|
-
let moduleSourceFile =
|
|
15
|
+
let moduleSourceFile = tsModule.createSourceFile(options.modulePath, moduleSource, tsModule.ScriptTarget.Latest, true);
|
|
13
16
|
moduleSourceFile = (0, ast_utils_2.addImportToModule)(tree, moduleSourceFile, options.modulePath, `RouterModule`);
|
|
14
17
|
moduleSourceFile = (0, ast_utils_1.insertImport)(tree, moduleSourceFile, options.modulePath, 'RouterModule, Route', '@angular/router');
|
|
15
18
|
moduleSourceFile = (0, ast_utils_1.insertImport)(tree, moduleSourceFile, options.modulePath, constName, './lib.routes');
|
|
@@ -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,
|
|
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;AAE/B,IAAI,QAAqC,CAAC;AAE1C,SAAgB,sBAAsB,CACpC,IAAU,EACV,OAA2C;IAE3C,IAAI,CAAC,QAAQ,EAAE;QACb,QAAQ,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC;KAClC;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"}
|
|
@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.updateProject = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const devkit_1 = require("@nrwl/devkit");
|
|
6
|
-
const
|
|
6
|
+
const js_1 = require("@nrwl/js");
|
|
7
7
|
const cli_config_utils_1 = require("@nrwl/workspace/src/utils/cli-config-utils");
|
|
8
8
|
const update_ng_package_1 = require("./update-ng-package");
|
|
9
9
|
const path_1 = require("path");
|
|
@@ -87,7 +87,7 @@ function updateFiles(host, options) {
|
|
|
87
87
|
`);
|
|
88
88
|
}
|
|
89
89
|
function createFiles(host, options) {
|
|
90
|
-
(0, devkit_1.generateFiles)(host, (0, path_1.join)(__dirname, '../files/lib'), options.projectRoot, Object.assign(Object.assign({}, options), { rootTsConfigPath: (0,
|
|
90
|
+
(0, devkit_1.generateFiles)(host, (0, path_1.join)(__dirname, '../files/lib'), options.projectRoot, Object.assign(Object.assign({}, options), { rootTsConfigPath: (0, js_1.getRelativePathToRootTsConfig)(host, options.projectRoot), tpl: '' }));
|
|
91
91
|
}
|
|
92
92
|
function fixProjectWorkspaceConfig(host, options) {
|
|
93
93
|
let project = (0, devkit_1.readProjectConfiguration)(host, options.name);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-project.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/library/lib/update-project.ts"],"names":[],"mappings":";;;;AAAA,yCASsB;AACtB,
|
|
1
|
+
{"version":3,"file":"update-project.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/library/lib/update-project.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,22 +2,8 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.updateTsConfig = void 0;
|
|
4
4
|
const devkit_1 = require("@nrwl/devkit");
|
|
5
|
-
const
|
|
5
|
+
const js_1 = require("@nrwl/js");
|
|
6
6
|
const create_ts_config_1 = require("../../utils/create-ts-config");
|
|
7
|
-
function updateRootConfig(host, options) {
|
|
8
|
-
(0, devkit_1.updateJson)(host, (0, typescript_1.getRootTsConfigPathInTree)(host), (json) => {
|
|
9
|
-
const c = json.compilerOptions;
|
|
10
|
-
c.paths = c.paths || {};
|
|
11
|
-
delete c.paths[options.name];
|
|
12
|
-
if (c.paths[options.importPath]) {
|
|
13
|
-
throw new Error(`You already have a library using the import path "${options.importPath}". Make sure to specify a unique one.`);
|
|
14
|
-
}
|
|
15
|
-
c.paths[options.importPath] = [
|
|
16
|
-
(0, devkit_1.joinPathFragments)(options.projectRoot, '/src/index.ts'),
|
|
17
|
-
];
|
|
18
|
-
return json;
|
|
19
|
-
});
|
|
20
|
-
}
|
|
21
7
|
function updateProjectConfig(host, options) {
|
|
22
8
|
(0, devkit_1.updateJson)(host, `${options.projectRoot}/tsconfig.lib.json`, (json) => {
|
|
23
9
|
json.include = ['src/**/*.ts'];
|
|
@@ -32,7 +18,7 @@ function updateProjectConfig(host, options) {
|
|
|
32
18
|
return json;
|
|
33
19
|
});
|
|
34
20
|
// tsconfig.json
|
|
35
|
-
(0, create_ts_config_1.createTsConfig)(host, options.projectRoot, 'lib', options, (0,
|
|
21
|
+
(0, create_ts_config_1.createTsConfig)(host, options.projectRoot, 'lib', options, (0, js_1.getRelativePathToRootTsConfig)(host, options.projectRoot));
|
|
36
22
|
}
|
|
37
23
|
function updateProjectIvyConfig(host, options) {
|
|
38
24
|
if (options.buildable || options.publishable) {
|
|
@@ -45,7 +31,6 @@ function updateProjectIvyConfig(host, options) {
|
|
|
45
31
|
}
|
|
46
32
|
function updateTsConfig(host, options) {
|
|
47
33
|
(0, create_ts_config_1.extractTsConfigBase)(host);
|
|
48
|
-
updateRootConfig(host, options);
|
|
49
34
|
updateProjectConfig(host, options);
|
|
50
35
|
updateProjectIvyConfig(host, options);
|
|
51
36
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-tsconfig.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/library/lib/update-tsconfig.ts"],"names":[],"mappings":";;;AACA,
|
|
1
|
+
{"version":3,"file":"update-tsconfig.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/library/lib/update-tsconfig.ts"],"names":[],"mappings":";;;AACA,yCAA0C;AAC1C,iCAAyD;AAEzD,mEAGsC;AAEtC,SAAS,mBAAmB,CAC1B,IAAU,EACV,OAA2C;IAE3C,IAAA,mBAAU,EAAC,IAAI,EAAE,GAAG,OAAO,CAAC,WAAW,oBAAoB,EAAE,CAAC,IAAI,EAAE,EAAE;QACpE,IAAI,CAAC,OAAO,GAAG,CAAC,aAAa,CAAC,CAAC;QAC/B,IAAI,CAAC,OAAO,GAAG;YACb,GAAG,IAAI,GAAG,CAAC;gBACT,GAAG,CAAC,IAAI,CAAC,OAAO,IAAI,EAAE,CAAC;gBACvB,gBAAgB;gBAChB,kBAAkB;gBAClB,kBAAkB;aACnB,CAAC;SACH,CAAC;QACF,OAAO,IAAI,CAAC;IACd,CAAC,CAAC,CAAC;IAEH,gBAAgB;IAChB,IAAA,iCAAc,EACZ,IAAI,EACJ,OAAO,CAAC,WAAW,EACnB,KAAK,EACL,OAAO,EACP,IAAA,kCAA6B,EAAC,IAAI,EAAE,OAAO,CAAC,WAAW,CAAC,CACzD,CAAC;AACJ,CAAC;AAED,SAAS,sBAAsB,CAC7B,IAAU,EACV,OAA2C;IAE3C,IAAI,OAAO,CAAC,SAAS,IAAI,OAAO,CAAC,WAAW,EAAE;QAC5C,OAAO,IAAA,mBAAU,EACf,IAAI,EACJ,GAAG,OAAO,CAAC,WAAW,yBAAyB,EAC/C,CAAC,IAAI,EAAE,EAAE;YACP,IAAI,CAAC,sBAAsB,CAAC,iBAAiB,CAAC;gBAC5C,OAAO,CAAC,eAAe,KAAK,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC;YAC7D,OAAO,IAAI,CAAC;QACd,CAAC,CACF,CAAC;KACH;AACH,CAAC;AAED,SAAgB,cAAc,CAC5B,IAAU,EACV,OAA2C;IAE3C,IAAA,sCAAmB,EAAC,IAAI,CAAC,CAAC;IAC1B,mBAAmB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IACnC,sBAAsB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;AACxC,CAAC;AAPD,wCAOC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Tree } from '@nrwl/devkit';
|
|
1
|
+
import { GeneratorCallback, Tree } from '@nrwl/devkit';
|
|
2
2
|
import { Schema } from './schema';
|
|
3
|
-
export declare function libraryGenerator(tree: Tree, schema: Schema): Promise<
|
|
3
|
+
export declare function libraryGenerator(tree: Tree, schema: Schema): Promise<GeneratorCallback>;
|
|
4
4
|
export default libraryGenerator;
|
|
@@ -5,6 +5,7 @@ const tslib_1 = require("tslib");
|
|
|
5
5
|
const devkit_1 = require("@nrwl/devkit");
|
|
6
6
|
const jest_1 = require("@nrwl/jest");
|
|
7
7
|
const linter_1 = require("@nrwl/linter");
|
|
8
|
+
const js_1 = require("@nrwl/js");
|
|
8
9
|
const semver_1 = require("semver");
|
|
9
10
|
const init_1 = require("../../generators/init/init");
|
|
10
11
|
const test_runners_1 = require("../../utils/test-runners");
|
|
@@ -19,7 +20,6 @@ const add_standalone_component_1 = require("./lib/add-standalone-component");
|
|
|
19
20
|
const enable_strict_type_checking_1 = require("./lib/enable-strict-type-checking");
|
|
20
21
|
const normalize_options_1 = require("./lib/normalize-options");
|
|
21
22
|
const update_lib_package_npm_scope_1 = require("./lib/update-lib-package-npm-scope");
|
|
22
|
-
const update_project_1 = require("./lib/update-project");
|
|
23
23
|
const update_tsconfig_1 = require("./lib/update-tsconfig");
|
|
24
24
|
function libraryGenerator(tree, schema) {
|
|
25
25
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
@@ -38,7 +38,7 @@ function libraryGenerator(tree, schema) {
|
|
|
38
38
|
throw new Error(`The "--standalone" option is not supported in Angular versions < 14.1.0.`);
|
|
39
39
|
}
|
|
40
40
|
const options = (0, normalize_options_1.normalizeOptions)(tree, schema);
|
|
41
|
-
const { libraryOptions
|
|
41
|
+
const { libraryOptions } = options;
|
|
42
42
|
yield (0, init_1.default)(tree, Object.assign(Object.assign({}, libraryOptions), { skipFormat: true, e2eTestRunner: test_runners_1.E2eTestRunner.None }));
|
|
43
43
|
const { wrapAngularDevkitSchematic } = require('@nrwl/devkit/ngcli-adapter');
|
|
44
44
|
const runAngularLibrarySchematic = wrapAngularDevkitSchematic('@schematics/angular', 'library');
|
|
@@ -53,7 +53,8 @@ function libraryGenerator(tree, schema) {
|
|
|
53
53
|
if (libraryOptions.ngCliSchematicLibRoot !== libraryOptions.projectRoot) {
|
|
54
54
|
(0, devkit_1.moveFilesToNewDirectory)(tree, libraryOptions.ngCliSchematicLibRoot, libraryOptions.projectRoot);
|
|
55
55
|
}
|
|
56
|
-
yield (
|
|
56
|
+
const { updateProject } = yield Promise.resolve().then(() => require('./lib/update-project'));
|
|
57
|
+
yield updateProject(tree, libraryOptions);
|
|
57
58
|
(0, update_tsconfig_1.updateTsConfig)(tree, libraryOptions);
|
|
58
59
|
yield addUnitTestRunner(tree, libraryOptions);
|
|
59
60
|
updateNpmScopeIfBuildableOrPublishable(tree, libraryOptions);
|
|
@@ -78,6 +79,7 @@ function libraryGenerator(tree, schema) {
|
|
|
78
79
|
});
|
|
79
80
|
(0, dependencies_1.addBuildableLibrariesPostCssDependencies)(tree);
|
|
80
81
|
}
|
|
82
|
+
(0, js_1.updateRootTsConfig)(tree, Object.assign(Object.assign({}, libraryOptions), { js: false }));
|
|
81
83
|
if (!libraryOptions.skipFormat) {
|
|
82
84
|
yield (0, devkit_1.formatFiles)(tree);
|
|
83
85
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"library.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/library/library.ts"],"names":[],"mappings":";;;;AAAA,
|
|
1
|
+
{"version":3,"file":"library.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/library/library.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,9 +2,9 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.addPathMapping = void 0;
|
|
4
4
|
const devkit_1 = require("@nrwl/devkit");
|
|
5
|
-
const
|
|
5
|
+
const js_1 = require("@nrwl/js");
|
|
6
6
|
function addPathMapping(tree, options) {
|
|
7
|
-
(0, devkit_1.updateJson)(tree, (0,
|
|
7
|
+
(0, devkit_1.updateJson)(tree, (0, js_1.getRootTsConfigPathInTree)(tree), (json) => {
|
|
8
8
|
const c = json.compilerOptions;
|
|
9
9
|
c.paths = c.paths || {};
|
|
10
10
|
c.paths[options.secondaryEntryPoint] = [
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add-path-mapping.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/library-secondary-entry-point/lib/add-path-mapping.ts"],"names":[],"mappings":";;;AAAA,yCAAgD;AAChD,
|
|
1
|
+
{"version":3,"file":"add-path-mapping.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/library-secondary-entry-point/lib/add-path-mapping.ts"],"names":[],"mappings":";;;AAAA,yCAAgD;AAChD,iCAAqD;AAGrD,SAAgB,cAAc,CAC5B,IAAU,EACV,OAAmC;IAEnC,IAAA,mBAAU,EAAC,IAAI,EAAE,IAAA,8BAAyB,EAAC,IAAI,CAAC,EAAE,CAAC,IAAI,EAAE,EAAE;QACzD,MAAM,CAAC,GAAG,IAAI,CAAC,eAAe,CAAC;QAC/B,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,KAAK,IAAI,EAAE,CAAC;QACxB,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,mBAAmB,CAAC,GAAG;YACrC,GAAG,OAAO,CAAC,cAAc,CAAC,IAAI,IAAI,OAAO,CAAC,IAAI,eAAe;SAC9D,CAAC;QAEF,OAAO,IAAI,CAAC;IACd,CAAC,CAAC,CAAC;AACL,CAAC;AAbD,wCAaC"}
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.AngularDevkitKarmaMigrator = void 0;
|
|
4
4
|
const devkit_1 = require("@nrwl/devkit");
|
|
5
|
-
const
|
|
5
|
+
const js_1 = require("@nrwl/js");
|
|
6
6
|
const path_1 = require("path");
|
|
7
7
|
const builder_migrator_1 = require("./builder.migrator");
|
|
8
8
|
class AngularDevkitKarmaMigrator extends builder_migrator_1.BuilderMigrator {
|
|
@@ -71,7 +71,7 @@ class AngularDevkitKarmaMigrator extends builder_migrator_1.BuilderMigrator {
|
|
|
71
71
|
this.logger.warn(`The tsConfig file "${originalTsConfigPath}" specified in the "${targetName}" target could not be found. Skipping updating the tsConfig file.`);
|
|
72
72
|
return;
|
|
73
73
|
}
|
|
74
|
-
this.updateTsConfigFile(target.options.tsConfig, (0,
|
|
74
|
+
this.updateTsConfigFile(target.options.tsConfig, (0, js_1.getRootTsConfigPathInTree)(this.tree), (0, devkit_1.offsetFromRoot)(this.projectConfig.root));
|
|
75
75
|
}
|
|
76
76
|
}
|
|
77
77
|
exports.AngularDevkitKarmaMigrator = AngularDevkitKarmaMigrator;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"angular-devkit-karma.migrator.js","sourceRoot":"","sources":["../../../../../../../../packages/angular/src/generators/ng-add/migrators/builders/angular-devkit-karma.migrator.ts"],"names":[],"mappings":";;;AAKA,yCAIsB;AACtB,
|
|
1
|
+
{"version":3,"file":"angular-devkit-karma.migrator.js","sourceRoot":"","sources":["../../../../../../../../packages/angular/src/generators/ng-add/migrators/builders/angular-devkit-karma.migrator.ts"],"names":[],"mappings":"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"}
|