@nrwl/angular 15.3.0-beta.11 → 15.3.0-beta.13
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/fesm2015/nrwl-angular-mf.mjs +1 -0
- package/fesm2015/nrwl-angular-testing.mjs +1 -0
- package/fesm2015/nrwl-angular.mjs +1 -0
- package/fesm2020/nrwl-angular-mf.mjs +1 -0
- package/fesm2020/nrwl-angular-testing.mjs +1 -0
- package/fesm2020/nrwl-angular.mjs +1 -0
- package/package.json +8 -9
- package/plugins/component-testing.js +1 -1
- package/plugins/component-testing.js.map +1 -1
- package/src/generators/add-linting/add-linting.js +8 -0
- package/src/generators/add-linting/add-linting.js.map +1 -1
- package/src/generators/add-linting/angular-v14/add-linting.d.ts +4 -0
- package/src/generators/add-linting/angular-v14/add-linting.js +41 -0
- package/src/generators/add-linting/angular-v14/add-linting.js.map +1 -0
- package/src/generators/add-linting/angular-v14/lib/add-angular-eslint-dependencies.d.ts +2 -0
- package/src/generators/add-linting/angular-v14/lib/add-angular-eslint-dependencies.js +14 -0
- package/src/generators/add-linting/angular-v14/lib/add-angular-eslint-dependencies.js.map +1 -0
- package/src/generators/add-linting/angular-v14/lib/add-project-lint-target.d.ts +3 -0
- package/src/generators/add-linting/angular-v14/lib/add-project-lint-target.js +21 -0
- package/src/generators/add-linting/angular-v14/lib/add-project-lint-target.js.map +1 -0
- package/src/generators/add-linting/angular-v14/lib/create-eslint-configuration.d.ts +78 -0
- package/src/generators/add-linting/angular-v14/lib/create-eslint-configuration.js +111 -0
- package/src/generators/add-linting/angular-v14/lib/create-eslint-configuration.js.map +1 -0
- package/src/generators/add-linting/angular-v14/schema.d.ts +9 -0
- package/src/generators/application/angular-v14/application.d.ts +4 -0
- package/src/generators/application/angular-v14/application.js +98 -0
- package/src/generators/application/angular-v14/application.js.map +1 -0
- package/src/generators/application/angular-v14/files/src/app/app.routes.ts__tpl__ +3 -0
- package/src/generators/application/angular-v14/files/src/favicon.ico +0 -0
- package/src/generators/application/angular-v14/files/tsconfig.editor.json__tpl__ +5 -0
- package/src/generators/application/angular-v14/lib/add-e2e.d.ts +3 -0
- package/src/generators/application/angular-v14/lib/add-e2e.js +58 -0
- package/src/generators/application/angular-v14/lib/add-e2e.js.map +1 -0
- package/src/generators/application/angular-v14/lib/add-linting.d.ts +3 -0
- package/src/generators/application/angular-v14/lib/add-linting.js +23 -0
- package/src/generators/application/angular-v14/lib/add-linting.js.map +1 -0
- package/src/generators/application/angular-v14/lib/add-protractor.d.ts +3 -0
- package/src/generators/application/angular-v14/lib/add-protractor.js +18 -0
- package/src/generators/application/angular-v14/lib/add-protractor.js.map +1 -0
- package/src/generators/application/angular-v14/lib/add-proxy-config.d.ts +3 -0
- package/src/generators/application/angular-v14/lib/add-proxy-config.js +23 -0
- package/src/generators/application/angular-v14/lib/add-proxy-config.js.map +1 -0
- package/src/generators/application/angular-v14/lib/add-unit-test-runner.d.ts +3 -0
- package/src/generators/application/angular-v14/lib/add-unit-test-runner.js +29 -0
- package/src/generators/application/angular-v14/lib/add-unit-test-runner.js.map +1 -0
- package/src/generators/application/angular-v14/lib/convert-to-standalone-app.d.ts +3 -0
- package/src/generators/application/angular-v14/lib/convert-to-standalone-app.js +82 -0
- package/src/generators/application/angular-v14/lib/convert-to-standalone-app.js.map +1 -0
- package/src/generators/application/angular-v14/lib/create-files.d.ts +3 -0
- package/src/generators/application/angular-v14/lib/create-files.js +12 -0
- package/src/generators/application/angular-v14/lib/create-files.js.map +1 -0
- package/src/generators/application/angular-v14/lib/enable-strict-type-checking.d.ts +3 -0
- package/src/generators/application/angular-v14/lib/enable-strict-type-checking.js +27 -0
- package/src/generators/application/angular-v14/lib/enable-strict-type-checking.js.map +1 -0
- package/src/generators/application/angular-v14/lib/index.d.ts +21 -0
- package/src/generators/application/angular-v14/lib/index.js +25 -0
- package/src/generators/application/angular-v14/lib/index.js.map +1 -0
- package/src/generators/application/angular-v14/lib/normalize-options.d.ts +4 -0
- package/src/generators/application/angular-v14/lib/normalize-options.js +51 -0
- package/src/generators/application/angular-v14/lib/normalize-options.js.map +1 -0
- package/src/generators/application/angular-v14/lib/normalized-schema.d.ts +15 -0
- package/src/generators/application/angular-v14/lib/normalized-schema.js +3 -0
- package/src/generators/application/angular-v14/lib/normalized-schema.js.map +1 -0
- package/src/generators/application/angular-v14/lib/nrwl-home-tpl.d.ts +4 -0
- package/src/generators/application/angular-v14/lib/nrwl-home-tpl.js +802 -0
- package/src/generators/application/angular-v14/lib/nrwl-home-tpl.js.map +1 -0
- package/src/generators/application/angular-v14/lib/remove-scaffolded-e2e.d.ts +3 -0
- package/src/generators/application/angular-v14/lib/remove-scaffolded-e2e.js +23 -0
- package/src/generators/application/angular-v14/lib/remove-scaffolded-e2e.js.map +1 -0
- package/src/generators/application/angular-v14/lib/root-router-config.d.ts +3 -0
- package/src/generators/application/angular-v14/lib/root-router-config.js +16 -0
- package/src/generators/application/angular-v14/lib/root-router-config.js.map +1 -0
- package/src/generators/application/angular-v14/lib/set-app-strict-default.d.ts +2 -0
- package/src/generators/application/angular-v14/lib/set-app-strict-default.js +16 -0
- package/src/generators/application/angular-v14/lib/set-app-strict-default.js.map +1 -0
- package/src/generators/application/angular-v14/lib/set-default-project.d.ts +3 -0
- package/src/generators/application/angular-v14/lib/set-default-project.js +13 -0
- package/src/generators/application/angular-v14/lib/set-default-project.js.map +1 -0
- package/src/generators/application/angular-v14/lib/update-app-component-template.d.ts +3 -0
- package/src/generators/application/angular-v14/lib/update-app-component-template.js +22 -0
- package/src/generators/application/angular-v14/lib/update-app-component-template.js.map +1 -0
- package/src/generators/application/angular-v14/lib/update-component-spec.d.ts +3 -0
- package/src/generators/application/angular-v14/lib/update-component-spec.js +29 -0
- package/src/generators/application/angular-v14/lib/update-component-spec.js.map +1 -0
- package/src/generators/application/angular-v14/lib/update-config-files.d.ts +3 -0
- package/src/generators/application/angular-v14/lib/update-config-files.js +74 -0
- package/src/generators/application/angular-v14/lib/update-config-files.js.map +1 -0
- package/src/generators/application/angular-v14/lib/update-e2e-project.d.ts +3 -0
- package/src/generators/application/angular-v14/lib/update-e2e-project.js +41 -0
- package/src/generators/application/angular-v14/lib/update-e2e-project.js.map +1 -0
- package/src/generators/application/angular-v14/lib/update-editor-tsconfig.d.ts +3 -0
- package/src/generators/application/angular-v14/lib/update-editor-tsconfig.js +27 -0
- package/src/generators/application/angular-v14/lib/update-editor-tsconfig.js.map +1 -0
- package/src/generators/application/angular-v14/lib/update-nx-component-template.d.ts +3 -0
- package/src/generators/application/angular-v14/lib/update-nx-component-template.js +31 -0
- package/src/generators/application/angular-v14/lib/update-nx-component-template.js.map +1 -0
- package/src/generators/application/angular-v14/schema.d.ts +30 -0
- package/src/generators/application/application.d.ts +1 -1
- package/src/generators/application/application.js +33 -25
- package/src/generators/application/application.js.map +1 -1
- package/src/generators/application/files/tsconfig.editor.json__tpl__ +1 -1
- package/src/generators/application/lib/update-config-files.js +5 -3
- package/src/generators/application/lib/update-config-files.js.map +1 -1
- package/src/generators/change-storybook-targets/change-storybook-targets.js +4 -2
- package/src/generators/change-storybook-targets/change-storybook-targets.js.map +1 -1
- package/src/generators/component/angular-v14/component.d.ts +4 -0
- package/src/generators/component/angular-v14/component.js +39 -0
- package/src/generators/component/angular-v14/component.js.map +1 -0
- package/src/generators/component/angular-v14/lib/component.d.ts +3 -0
- package/src/generators/component/angular-v14/lib/component.js +37 -0
- package/src/generators/component/angular-v14/lib/component.js.map +1 -0
- package/src/generators/component/angular-v14/lib/entry-point.d.ts +2 -0
- package/src/generators/component/angular-v14/lib/entry-point.js +17 -0
- package/src/generators/component/angular-v14/lib/entry-point.js.map +1 -0
- package/src/generators/component/angular-v14/lib/module.d.ts +3 -0
- package/src/generators/component/angular-v14/lib/module.js +64 -0
- package/src/generators/component/angular-v14/lib/module.js.map +1 -0
- package/src/generators/component/angular-v14/lib/normalize-options.d.ts +3 -0
- package/src/generators/component/angular-v14/lib/normalize-options.js +27 -0
- package/src/generators/component/angular-v14/lib/normalize-options.js.map +1 -0
- package/src/generators/component/angular-v14/schema.d.ts +26 -0
- package/src/generators/component/component.js +8 -0
- package/src/generators/component/component.js.map +1 -1
- package/src/generators/init/angular-v14/init.js +19 -15
- package/src/generators/init/angular-v14/init.js.map +1 -1
- package/src/generators/init/init.js +19 -15
- package/src/generators/init/init.js.map +1 -1
- package/src/generators/karma/angular-v14/files/karma.conf.js__tmpl__ +44 -0
- package/src/generators/karma/angular-v14/karma.d.ts +4 -0
- package/src/generators/karma/angular-v14/karma.js +57 -0
- package/src/generators/karma/angular-v14/karma.js.map +1 -0
- package/src/generators/karma/angular-v14/schema.d.ts +3 -0
- package/src/generators/karma/karma.d.ts +1 -1
- package/src/generators/karma/karma.js +30 -19
- package/src/generators/karma/karma.js.map +1 -1
- package/src/generators/karma-project/files/common/tsconfig.spec.json +1 -1
- package/src/generators/karma-project/files/workspace-with-root-project/karma.conf.js__tmpl__ +15 -2
- package/src/generators/karma-project/karma-project.js +1 -1
- package/src/generators/karma-project/karma-project.js.map +1 -1
- package/src/generators/karma-project/lib/generate-karma-project-files.js +11 -0
- package/src/generators/karma-project/lib/generate-karma-project-files.js.map +1 -1
- package/src/generators/library/lib/update-project.js +7 -1
- package/src/generators/library/lib/update-project.js.map +1 -1
- package/src/generators/library/lib/update-tsconfig.js +6 -4
- package/src/generators/library/lib/update-tsconfig.js.map +1 -1
- package/src/generators/ng-add/files/root/apps/__dot__gitkeep +0 -0
- package/src/generators/ng-add/migrate-from-angular-cli.js +1 -0
- package/src/generators/ng-add/migrate-from-angular-cli.js.map +1 -1
- package/src/generators/ng-add/utilities/workspace.d.ts +1 -0
- package/src/generators/ng-add/utilities/workspace.js +10 -1
- package/src/generators/ng-add/utilities/workspace.js.map +1 -1
- package/src/generators/setup-tailwind/angular-v14/files/v2/tailwind.config.js__tmpl__ +18 -0
- package/src/generators/setup-tailwind/angular-v14/files/v3/tailwind.config.js__tmpl__ +14 -0
- package/src/generators/setup-tailwind/angular-v14/lib/add-tailwind-config-path-to-project.d.ts +3 -0
- package/src/generators/setup-tailwind/angular-v14/lib/add-tailwind-config-path-to-project.js +32 -0
- package/src/generators/setup-tailwind/angular-v14/lib/add-tailwind-config-path-to-project.js.map +1 -0
- package/src/generators/setup-tailwind/angular-v14/lib/add-tailwind-config.d.ts +3 -0
- package/src/generators/setup-tailwind/angular-v14/lib/add-tailwind-config.js +18 -0
- package/src/generators/setup-tailwind/angular-v14/lib/add-tailwind-config.js.map +1 -0
- package/src/generators/setup-tailwind/angular-v14/lib/add-tailwind-required-packages.d.ts +2 -0
- package/src/generators/setup-tailwind/angular-v14/lib/add-tailwind-required-packages.js +14 -0
- package/src/generators/setup-tailwind/angular-v14/lib/add-tailwind-required-packages.js.map +1 -0
- package/src/generators/setup-tailwind/angular-v14/lib/detect-tailwind-installed-version.d.ts +2 -0
- package/src/generators/setup-tailwind/angular-v14/lib/detect-tailwind-installed-version.js +21 -0
- package/src/generators/setup-tailwind/angular-v14/lib/detect-tailwind-installed-version.js.map +1 -0
- package/src/generators/setup-tailwind/angular-v14/lib/index.d.ts +6 -0
- package/src/generators/setup-tailwind/angular-v14/lib/index.js +10 -0
- package/src/generators/setup-tailwind/angular-v14/lib/index.js.map +1 -0
- package/src/generators/setup-tailwind/angular-v14/lib/normalize-options.d.ts +2 -0
- package/src/generators/setup-tailwind/angular-v14/lib/normalize-options.js +8 -0
- package/src/generators/setup-tailwind/angular-v14/lib/normalize-options.js.map +1 -0
- package/src/generators/setup-tailwind/angular-v14/lib/update-application-styles.d.ts +3 -0
- package/src/generators/setup-tailwind/angular-v14/lib/update-application-styles.js +54 -0
- package/src/generators/setup-tailwind/angular-v14/lib/update-application-styles.js.map +1 -0
- package/src/generators/setup-tailwind/angular-v14/schema.d.ts +11 -0
- package/src/generators/setup-tailwind/angular-v14/setup-tailwind.d.ts +4 -0
- package/src/generators/setup-tailwind/angular-v14/setup-tailwind.js +33 -0
- package/src/generators/setup-tailwind/angular-v14/setup-tailwind.js.map +1 -0
- package/src/generators/setup-tailwind/setup-tailwind.js +8 -0
- package/src/generators/setup-tailwind/setup-tailwind.js.map +1 -1
- package/src/generators/storybook-configuration/lib/generate-storybook-configuration.d.ts +1 -1
- package/src/generators/storybook-configuration/lib/generate-storybook-configuration.js +5 -2
- package/src/generators/storybook-configuration/lib/generate-storybook-configuration.js.map +1 -1
- package/src/generators/utils/create-ts-config.d.ts +8 -0
- package/src/generators/utils/create-ts-config.js +34 -0
- package/src/generators/utils/create-ts-config.js.map +1 -0
- package/src/migrations/update-12-3-0/update-storybook.js.map +1 -1
- package/src/generators/application/files/tsconfig.json +0 -10
- package/src/generators/library/files/lib/tsconfig.json__tpl__ +0 -14
|
@@ -5,6 +5,8 @@ const tslib_1 = require("tslib");
|
|
|
5
5
|
const devkit_1 = require("@nrwl/devkit");
|
|
6
6
|
const cli_config_utils_1 = require("@nrwl/workspace/src/utils/cli-config-utils");
|
|
7
7
|
const test_runners_1 = require("../../../utils/test-runners");
|
|
8
|
+
const create_ts_config_1 = require("../../utils/create-ts-config");
|
|
9
|
+
const typescript_1 = require("@nrwl/workspace/src/utilities/typescript");
|
|
8
10
|
function updateConfigFiles(host, options) {
|
|
9
11
|
updateTsConfigOptions(host, options);
|
|
10
12
|
updateAppAndE2EProjectConfigurations(host, options);
|
|
@@ -16,12 +18,12 @@ function updateTsConfigOptions(host, options) {
|
|
|
16
18
|
...new Set([
|
|
17
19
|
...(json.exclude || []),
|
|
18
20
|
'jest.config.ts',
|
|
19
|
-
'
|
|
20
|
-
'
|
|
21
|
+
'src/**/*.test.ts',
|
|
22
|
+
'src/**/*.spec.ts',
|
|
21
23
|
]),
|
|
22
24
|
] })));
|
|
23
25
|
// tsconfig.json
|
|
24
|
-
(0,
|
|
26
|
+
(0, create_ts_config_1.createTsConfig)(host, options.appProjectRoot, 'app', options, (0, typescript_1.getRelativePathToRootTsConfig)(host, options.appProjectRoot));
|
|
25
27
|
}
|
|
26
28
|
function updateAppAndE2EProjectConfigurations(host, options) {
|
|
27
29
|
// workspace.json
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-config-files.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/application/lib/update-config-files.ts"],"names":[],"mappings":";;;;AACA,yCAQsB;AACtB,iFAAoF;AACpF,8DAA4E;
|
|
1
|
+
{"version":3,"file":"update-config-files.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/application/lib/update-config-files.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,10 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.angularChangeStorybookTargestGenerator = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const devkit_1 = require("@nrwl/devkit");
|
|
6
|
-
const
|
|
6
|
+
const versions_1 = require("../../utils/versions");
|
|
7
7
|
function angularChangeStorybookTargestGenerator(tree, schema) {
|
|
8
8
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
9
|
-
yield (0,
|
|
9
|
+
yield (0, devkit_1.ensurePackage)(tree, '@nrwl/storybook', versions_1.nxVersion);
|
|
10
|
+
const { changeStorybookTargetsGenerator } = yield Promise.resolve().then(() => require('@nrwl/storybook'));
|
|
11
|
+
yield changeStorybookTargetsGenerator(tree);
|
|
10
12
|
if (!schema.skipFormat) {
|
|
11
13
|
yield (0, devkit_1.formatFiles)(tree);
|
|
12
14
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"change-storybook-targets.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/change-storybook-targets/change-storybook-targets.ts"],"names":[],"mappings":";;;;AACA,
|
|
1
|
+
{"version":3,"file":"change-storybook-targets.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/change-storybook-targets/change-storybook-targets.ts"],"names":[],"mappings":";;;;AACA,yCAA0D;AAC1D,mDAAiD;AAIjD,SAAsB,sCAAsC,CAC1D,IAAU,EACV,MAAc;;QAEd,MAAM,IAAA,sBAAa,EAAC,IAAI,EAAE,iBAAiB,EAAE,oBAAS,CAAC,CAAC;QACxD,MAAM,EAAE,+BAA+B,EAAE,GAAG,2CAAa,iBAAiB,EAAC,CAAC;QAC5E,MAAM,+BAA+B,CAAC,IAAI,CAAC,CAAC;QAE5C,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE;YACtB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;IACH,CAAC;CAAA;AAXD,wFAWC;AAED,kBAAe,sCAAsC,CAAC"}
|
|
@@ -0,0 +1,39 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.componentGenerator = void 0;
|
|
4
|
+
const tslib_1 = require("tslib");
|
|
5
|
+
const devkit_1 = require("@nrwl/devkit");
|
|
6
|
+
const ngcli_adapter_1 = require("@nrwl/devkit/ngcli-adapter");
|
|
7
|
+
const path_1 = require("../../utils/path");
|
|
8
|
+
const component_1 = require("./lib/component");
|
|
9
|
+
const normalize_options_1 = require("./lib/normalize-options");
|
|
10
|
+
function componentGenerator(tree, rawOptions) {
|
|
11
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
12
|
+
const options = yield (0, normalize_options_1.normalizeOptions)(tree, rawOptions);
|
|
13
|
+
const { projectSourceRoot } = options, schematicOptions = tslib_1.__rest(options, ["projectSourceRoot"]);
|
|
14
|
+
checkPathUnderProjectRoot(tree, options);
|
|
15
|
+
const angularComponentSchematic = (0, ngcli_adapter_1.wrapAngularDevkitSchematic)('@schematics/angular', 'component');
|
|
16
|
+
yield angularComponentSchematic(tree, schematicOptions);
|
|
17
|
+
(0, component_1.exportComponentInEntryPoint)(tree, options);
|
|
18
|
+
yield (0, devkit_1.formatFiles)(tree);
|
|
19
|
+
});
|
|
20
|
+
}
|
|
21
|
+
exports.componentGenerator = componentGenerator;
|
|
22
|
+
function checkPathUnderProjectRoot(tree, schema) {
|
|
23
|
+
var _a;
|
|
24
|
+
if (!schema.path) {
|
|
25
|
+
return;
|
|
26
|
+
}
|
|
27
|
+
const project = (_a = schema.project) !== null && _a !== void 0 ? _a : (0, devkit_1.readWorkspaceConfiguration)(tree).defaultProject;
|
|
28
|
+
const { root } = (0, devkit_1.readProjectConfiguration)(tree, project);
|
|
29
|
+
let pathToComponent = (0, devkit_1.normalizePath)(schema.path);
|
|
30
|
+
pathToComponent = pathToComponent.startsWith('/')
|
|
31
|
+
? pathToComponent.slice(1)
|
|
32
|
+
: pathToComponent;
|
|
33
|
+
if (!(0, path_1.pathStartsWith)(pathToComponent, root)) {
|
|
34
|
+
throw new Error(`The path provided for the component (${schema.path}) does not exist under the project root (${root}). ` +
|
|
35
|
+
`Please make sure to provide a path that exists under the project root.`);
|
|
36
|
+
}
|
|
37
|
+
}
|
|
38
|
+
exports.default = componentGenerator;
|
|
39
|
+
//# sourceMappingURL=component.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"component.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/component/angular-v14/component.ts"],"names":[],"mappings":";;;;AACA,yCAKsB;AACtB,8DAAwE;AACxE,2CAAkD;AAClD,+CAA8D;AAC9D,+DAA2D;AAG3D,SAAsB,kBAAkB,CAAC,IAAU,EAAE,UAAkB;;QACrE,MAAM,OAAO,GAAG,MAAM,IAAA,oCAAgB,EAAC,IAAI,EAAE,UAAU,CAAC,CAAC;QACzD,MAAM,EAAE,iBAAiB,KAA0B,OAAO,EAA5B,gBAAgB,kBAAK,OAAO,EAApD,qBAA0C,CAAU,CAAC;QAE3D,yBAAyB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAEzC,MAAM,yBAAyB,GAAG,IAAA,0CAA0B,EAC1D,qBAAqB,EACrB,WAAW,CACZ,CAAC;QACF,MAAM,yBAAyB,CAAC,IAAI,EAAE,gBAAgB,CAAC,CAAC;QAExD,IAAA,uCAA2B,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAE3C,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;CAAA;AAfD,gDAeC;AAED,SAAS,yBAAyB,CAAC,IAAU,EAAE,MAAwB;;IACrE,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE;QAChB,OAAO;KACR;IAED,MAAM,OAAO,GACX,MAAA,MAAM,CAAC,OAAO,mCAAI,IAAA,mCAA0B,EAAC,IAAI,CAAC,CAAC,cAAc,CAAC;IACpE,MAAM,EAAE,IAAI,EAAE,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAEzD,IAAI,eAAe,GAAG,IAAA,sBAAa,EAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IACjD,eAAe,GAAG,eAAe,CAAC,UAAU,CAAC,GAAG,CAAC;QAC/C,CAAC,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC,CAAC;QAC1B,CAAC,CAAC,eAAe,CAAC;IAEpB,IAAI,CAAC,IAAA,qBAAc,EAAC,eAAe,EAAE,IAAI,CAAC,EAAE;QAC1C,MAAM,IAAI,KAAK,CACb,wCAAwC,MAAM,CAAC,IAAI,4CAA4C,IAAI,KAAK;YACtG,wEAAwE,CAC3E,CAAC;KACH;AACH,CAAC;AAED,kBAAe,kBAAkB,CAAC"}
|
|
@@ -0,0 +1,37 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.exportComponentInEntryPoint = void 0;
|
|
4
|
+
const devkit_1 = require("@nrwl/devkit");
|
|
5
|
+
const file_info_1 = require("../../../utils/file-info");
|
|
6
|
+
const entry_point_1 = require("../../../utils/entry-point");
|
|
7
|
+
const path_1 = require("../../../utils/path");
|
|
8
|
+
const entry_point_2 = require("./entry-point");
|
|
9
|
+
const module_1 = require("./module");
|
|
10
|
+
function exportComponentInEntryPoint(tree, schema) {
|
|
11
|
+
if (!schema.export || (schema.skipImport && !schema.standalone)) {
|
|
12
|
+
return;
|
|
13
|
+
}
|
|
14
|
+
const { root, projectType } = (0, devkit_1.readProjectConfiguration)(tree, schema.project);
|
|
15
|
+
if (projectType === 'application') {
|
|
16
|
+
return;
|
|
17
|
+
}
|
|
18
|
+
const { directory, filePath } = (0, file_info_1.getComponentFileInfo)(tree, schema);
|
|
19
|
+
const entryPointPath = (0, entry_point_1.locateLibraryEntryPointFromDirectory)(tree, directory, root, schema.projectSourceRoot);
|
|
20
|
+
if (!entryPointPath) {
|
|
21
|
+
devkit_1.logger.warn(`Unable to determine whether the component should be exported in the library entry point file. ` +
|
|
22
|
+
`The library's entry point file could not be found. Skipping exporting the component in the entry point file.`);
|
|
23
|
+
return;
|
|
24
|
+
}
|
|
25
|
+
if (!schema.standalone) {
|
|
26
|
+
const modulePath = (0, module_1.findModuleFromOptions)(tree, schema, root);
|
|
27
|
+
if (!(0, entry_point_2.shouldExportInEntryPoint)(tree, entryPointPath, modulePath)) {
|
|
28
|
+
return;
|
|
29
|
+
}
|
|
30
|
+
}
|
|
31
|
+
const relativePathFromEntryPoint = (0, path_1.getRelativeImportToFile)(entryPointPath, filePath);
|
|
32
|
+
const updateEntryPointContent = (0, devkit_1.stripIndents) `${tree.read(entryPointPath, 'utf-8')}
|
|
33
|
+
export * from "${relativePathFromEntryPoint}";`;
|
|
34
|
+
tree.write(entryPointPath, updateEntryPointContent);
|
|
35
|
+
}
|
|
36
|
+
exports.exportComponentInEntryPoint = exportComponentInEntryPoint;
|
|
37
|
+
//# sourceMappingURL=component.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"component.js","sourceRoot":"","sources":["../../../../../../../../packages/angular/src/generators/component/angular-v14/lib/component.ts"],"names":[],"mappings":";;;AACA,yCAA8E;AAC9E,wDAAgE;AAChE,4DAAkF;AAClF,8CAA8D;AAE9D,+CAAyD;AACzD,qCAAiD;AAEjD,SAAgB,2BAA2B,CACzC,IAAU,EACV,MAAwB;IAExB,IAAI,CAAC,MAAM,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,UAAU,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE;QAC/D,OAAO;KACR;IAED,MAAM,EAAE,IAAI,EAAE,WAAW,EAAE,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC;IAE7E,IAAI,WAAW,KAAK,aAAa,EAAE;QACjC,OAAO;KACR;IAED,MAAM,EAAE,SAAS,EAAE,QAAQ,EAAE,GAAG,IAAA,gCAAoB,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IAEnE,MAAM,cAAc,GAAG,IAAA,kDAAoC,EACzD,IAAI,EACJ,SAAS,EACT,IAAI,EACJ,MAAM,CAAC,iBAAiB,CACzB,CAAC;IACF,IAAI,CAAC,cAAc,EAAE;QACnB,eAAM,CAAC,IAAI,CACT,gGAAgG;YAC9F,8GAA8G,CACjH,CAAC;QAEF,OAAO;KACR;IAED,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE;QACtB,MAAM,UAAU,GAAG,IAAA,8BAAqB,EAAC,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC;QAC7D,IAAI,CAAC,IAAA,sCAAwB,EAAC,IAAI,EAAE,cAAc,EAAE,UAAU,CAAC,EAAE;YAC/D,OAAO;SACR;KACF;IAED,MAAM,0BAA0B,GAAG,IAAA,8BAAuB,EACxD,cAAc,EACd,QAAQ,CACT,CAAC;IACF,MAAM,uBAAuB,GAAG,IAAA,qBAAY,EAAA,GAAG,IAAI,CAAC,IAAI,CACtD,cAAc,EACd,OAAO,CACR;qBACkB,0BAA0B,IAAI,CAAC;IAElD,IAAI,CAAC,KAAK,CAAC,cAAc,EAAE,uBAAuB,CAAC,CAAC;AACtD,CAAC;AAjDD,kEAiDC"}
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.shouldExportInEntryPoint = void 0;
|
|
4
|
+
const tsquery_1 = require("@phenomnomnominal/tsquery");
|
|
5
|
+
const path_1 = require("../../../utils/path");
|
|
6
|
+
function shouldExportInEntryPoint(tree, entryPoint, modulePath) {
|
|
7
|
+
if (!modulePath) {
|
|
8
|
+
return false;
|
|
9
|
+
}
|
|
10
|
+
const moduleImportPath = (0, path_1.getRelativeImportToFile)(entryPoint, modulePath);
|
|
11
|
+
const entryPointContent = tree.read(entryPoint, 'utf-8');
|
|
12
|
+
const entryPointAst = tsquery_1.tsquery.ast(entryPointContent);
|
|
13
|
+
const moduleExport = (0, tsquery_1.tsquery)(entryPointAst, `ExportDeclaration StringLiteral[value='${moduleImportPath}']`, { visitAllChildren: true })[0];
|
|
14
|
+
return Boolean(moduleExport);
|
|
15
|
+
}
|
|
16
|
+
exports.shouldExportInEntryPoint = shouldExportInEntryPoint;
|
|
17
|
+
//# sourceMappingURL=entry-point.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"entry-point.js","sourceRoot":"","sources":["../../../../../../../../packages/angular/src/generators/component/angular-v14/lib/entry-point.ts"],"names":[],"mappings":";;;AACA,uDAAoD;AAEpD,8CAA8D;AAE9D,SAAgB,wBAAwB,CACtC,IAAU,EACV,UAAkB,EAClB,UAAkB;IAElB,IAAI,CAAC,UAAU,EAAE;QACf,OAAO,KAAK,CAAC;KACd;IAED,MAAM,gBAAgB,GAAG,IAAA,8BAAuB,EAAC,UAAU,EAAE,UAAU,CAAC,CAAC;IACzE,MAAM,iBAAiB,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;IACzD,MAAM,aAAa,GAAG,iBAAO,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC;IACrD,MAAM,YAAY,GAAG,IAAA,iBAAO,EAC1B,aAAa,EACb,0CAA0C,gBAAgB,IAAI,EAC9D,EAAE,gBAAgB,EAAE,IAAI,EAAE,CAC3B,CAAC,CAAC,CAAkB,CAAC;IAEtB,OAAO,OAAO,CAAC,YAAY,CAAC,CAAC;AAC/B,CAAC;AAnBD,4DAmBC"}
|
|
@@ -0,0 +1,64 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.findModuleFromOptions = void 0;
|
|
4
|
+
const devkit_1 = require("@nrwl/devkit");
|
|
5
|
+
const path_1 = require("path");
|
|
6
|
+
// Adapted from https://github.com/angular/angular-cli/blob/main/packages/schematics/angular/utility/find-module.ts#L29
|
|
7
|
+
// to match the logic in the component schematic. It doesn't throw if it can't
|
|
8
|
+
// find a module since the schematic would have thrown before getting here.
|
|
9
|
+
const moduleExt = '.module.ts';
|
|
10
|
+
const routingModuleExt = '-routing.module.ts';
|
|
11
|
+
function findModuleFromOptions(tree, options, projectRoot) {
|
|
12
|
+
if (!options.module) {
|
|
13
|
+
const pathToCheck = (0, devkit_1.joinPathFragments)(options.path, options.name);
|
|
14
|
+
return (0, devkit_1.normalizePath)(findModule(tree, pathToCheck, projectRoot));
|
|
15
|
+
}
|
|
16
|
+
else {
|
|
17
|
+
const modulePath = (0, devkit_1.joinPathFragments)(options.path, options.module);
|
|
18
|
+
const componentPath = (0, devkit_1.joinPathFragments)(options.path, options.name);
|
|
19
|
+
const moduleBaseName = (0, path_1.basename)(modulePath);
|
|
20
|
+
const candidateSet = new Set([options.path]);
|
|
21
|
+
const projectRootParent = (0, path_1.dirname)(projectRoot);
|
|
22
|
+
for (let dir = modulePath; dir !== projectRootParent; dir = (0, path_1.dirname)(dir)) {
|
|
23
|
+
candidateSet.add(dir);
|
|
24
|
+
}
|
|
25
|
+
for (let dir = componentPath; dir !== projectRoot; dir = (0, path_1.dirname)(dir)) {
|
|
26
|
+
candidateSet.add(dir);
|
|
27
|
+
}
|
|
28
|
+
const candidatesDirs = [...candidateSet].sort((a, b) => b.length - a.length);
|
|
29
|
+
for (const c of candidatesDirs) {
|
|
30
|
+
const candidateFiles = [
|
|
31
|
+
'',
|
|
32
|
+
`${moduleBaseName}.ts`,
|
|
33
|
+
`${moduleBaseName}${moduleExt}`,
|
|
34
|
+
].map((x) => (0, devkit_1.joinPathFragments)(c, x));
|
|
35
|
+
for (const sc of candidateFiles) {
|
|
36
|
+
if (tree.isFile(sc)) {
|
|
37
|
+
return (0, devkit_1.normalizePath)(sc);
|
|
38
|
+
}
|
|
39
|
+
}
|
|
40
|
+
}
|
|
41
|
+
return null;
|
|
42
|
+
}
|
|
43
|
+
}
|
|
44
|
+
exports.findModuleFromOptions = findModuleFromOptions;
|
|
45
|
+
function findModule(tree, generateDir, projectRoot) {
|
|
46
|
+
let dir = generateDir;
|
|
47
|
+
const projectRootParent = (0, path_1.dirname)(projectRoot);
|
|
48
|
+
while (dir !== projectRootParent) {
|
|
49
|
+
const allMatches = tree
|
|
50
|
+
.children(dir)
|
|
51
|
+
.map((path) => (0, devkit_1.joinPathFragments)(dir, path))
|
|
52
|
+
.filter((path) => tree.isFile(path) && path.endsWith(moduleExt));
|
|
53
|
+
const filteredMatches = allMatches.filter((path) => !path.endsWith(routingModuleExt));
|
|
54
|
+
if (filteredMatches.length == 1) {
|
|
55
|
+
return filteredMatches[0];
|
|
56
|
+
}
|
|
57
|
+
else if (filteredMatches.length > 1) {
|
|
58
|
+
return null;
|
|
59
|
+
}
|
|
60
|
+
dir = (0, path_1.dirname)(dir);
|
|
61
|
+
}
|
|
62
|
+
return null;
|
|
63
|
+
}
|
|
64
|
+
//# sourceMappingURL=module.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"module.js","sourceRoot":"","sources":["../../../../../../../../packages/angular/src/generators/component/angular-v14/lib/module.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,27 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.normalizeOptions = void 0;
|
|
4
|
+
const tslib_1 = require("tslib");
|
|
5
|
+
const devkit_1 = require("@nrwl/devkit");
|
|
6
|
+
const find_project_for_path_1 = require("nx/src/project-graph/utils/find-project-for-path");
|
|
7
|
+
function findProjectFromOptions(options) {
|
|
8
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
9
|
+
const projectGraph = yield (0, devkit_1.createProjectGraphAsync)();
|
|
10
|
+
const projectRootMappings = (0, find_project_for_path_1.createProjectRootMappings)(projectGraph.nodes);
|
|
11
|
+
return (0, find_project_for_path_1.findProjectForPath)(options.path, projectRootMappings);
|
|
12
|
+
});
|
|
13
|
+
}
|
|
14
|
+
function normalizeOptions(tree, options) {
|
|
15
|
+
var _a, _b, _c;
|
|
16
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
17
|
+
const project = (_b = (_a = options.project) !== null && _a !== void 0 ? _a : (yield findProjectFromOptions(options))) !== null && _b !== void 0 ? _b : (0, devkit_1.readWorkspaceConfiguration)(tree).defaultProject;
|
|
18
|
+
const { projectType, root, sourceRoot } = (0, devkit_1.readProjectConfiguration)(tree, project);
|
|
19
|
+
const projectSourceRoot = sourceRoot !== null && sourceRoot !== void 0 ? sourceRoot : (0, devkit_1.joinPathFragments)(root, 'src');
|
|
20
|
+
const path = (_c = options.path) !== null && _c !== void 0 ? _c : (0, devkit_1.joinPathFragments)(projectSourceRoot, projectType === 'application' ? 'app' : 'lib');
|
|
21
|
+
return Object.assign(Object.assign({}, options), { path,
|
|
22
|
+
project,
|
|
23
|
+
projectSourceRoot });
|
|
24
|
+
});
|
|
25
|
+
}
|
|
26
|
+
exports.normalizeOptions = normalizeOptions;
|
|
27
|
+
//# sourceMappingURL=normalize-options.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"normalize-options.js","sourceRoot":"","sources":["../../../../../../../../packages/angular/src/generators/component/angular-v14/lib/normalize-options.ts"],"names":[],"mappings":";;;;AACA,yCAMsB;AAEtB,4FAG0D;AAE1D,SAAe,sBAAsB,CAAC,OAAe;;QACnD,MAAM,YAAY,GAAG,MAAM,IAAA,gCAAuB,GAAE,CAAC;QACrD,MAAM,mBAAmB,GAAG,IAAA,iDAAyB,EAAC,YAAY,CAAC,KAAK,CAAC,CAAC;QAC1E,OAAO,IAAA,0CAAkB,EAAC,OAAO,CAAC,IAAI,EAAE,mBAAmB,CAAC,CAAC;IAC/D,CAAC;CAAA;AAED,SAAsB,gBAAgB,CACpC,IAAU,EACV,OAAe;;;QAEf,MAAM,OAAO,GACX,MAAA,MAAA,OAAO,CAAC,OAAO,mCACf,CAAC,MAAM,sBAAsB,CAAC,OAAO,CAAC,CAAC,mCACvC,IAAA,mCAA0B,EAAC,IAAI,CAAC,CAAC,cAAc,CAAC;QAClD,MAAM,EAAE,WAAW,EAAE,IAAI,EAAE,UAAU,EAAE,GAAG,IAAA,iCAAwB,EAChE,IAAI,EACJ,OAAO,CACR,CAAC;QACF,MAAM,iBAAiB,GAAG,UAAU,aAAV,UAAU,cAAV,UAAU,GAAI,IAAA,0BAAiB,EAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QACvE,MAAM,IAAI,GACR,MAAA,OAAO,CAAC,IAAI,mCACZ,IAAA,0BAAiB,EACf,iBAAiB,EACjB,WAAW,KAAK,aAAa,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAC9C,CAAC;QAEJ,uCACK,OAAO,KACV,IAAI;YACJ,OAAO;YACP,iBAAiB,IACjB;;CACH;AA1BD,4CA0BC"}
|
|
@@ -0,0 +1,26 @@
|
|
|
1
|
+
export interface Schema {
|
|
2
|
+
name: string;
|
|
3
|
+
path?: string;
|
|
4
|
+
project?: string;
|
|
5
|
+
displayBlock?: boolean;
|
|
6
|
+
inlineStyle?: boolean;
|
|
7
|
+
inlineTemplate?: boolean;
|
|
8
|
+
standalone?: boolean;
|
|
9
|
+
viewEncapsulation?: 'Emulated' | 'None' | 'ShadowDom';
|
|
10
|
+
changeDetection?: 'Default' | 'OnPush';
|
|
11
|
+
style?: 'css' | 'scss' | 'sass' | 'less' | 'none';
|
|
12
|
+
skipTests?: boolean;
|
|
13
|
+
type?: string;
|
|
14
|
+
flat?: boolean;
|
|
15
|
+
skipImport?: boolean;
|
|
16
|
+
selector?: string;
|
|
17
|
+
module?: string;
|
|
18
|
+
skipSelector?: boolean;
|
|
19
|
+
export?: boolean;
|
|
20
|
+
}
|
|
21
|
+
|
|
22
|
+
export interface NormalizedSchema extends Schema {
|
|
23
|
+
path: string;
|
|
24
|
+
project: string;
|
|
25
|
+
projectSourceRoot: string;
|
|
26
|
+
}
|
|
@@ -7,8 +7,16 @@ const ngcli_adapter_1 = require("@nrwl/devkit/ngcli-adapter");
|
|
|
7
7
|
const path_1 = require("../utils/path");
|
|
8
8
|
const component_1 = require("./lib/component");
|
|
9
9
|
const normalize_options_1 = require("./lib/normalize-options");
|
|
10
|
+
const get_generator_directory_for_ng_version_1 = require("../../utils/get-generator-directory-for-ng-version");
|
|
11
|
+
const path_2 = require("path");
|
|
10
12
|
function componentGenerator(tree, rawOptions) {
|
|
11
13
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
14
|
+
const generatorDirectory = (0, get_generator_directory_for_ng_version_1.getGeneratorDirectoryForInstalledAngularVersion)(tree);
|
|
15
|
+
if (generatorDirectory) {
|
|
16
|
+
let previousGenerator = yield Promise.resolve().then(() => require((0, path_2.join)(__dirname, generatorDirectory, 'component')));
|
|
17
|
+
yield previousGenerator.default(tree, rawOptions);
|
|
18
|
+
return;
|
|
19
|
+
}
|
|
12
20
|
const options = yield (0, normalize_options_1.normalizeOptions)(tree, rawOptions);
|
|
13
21
|
const { projectSourceRoot } = options, schematicOptions = tslib_1.__rest(options, ["projectSourceRoot"]);
|
|
14
22
|
checkPathUnderProjectRoot(tree, options);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"component.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/component/component.ts"],"names":[],"mappings":";;;;AACA,yCAKsB;AACtB,8DAAwE;AACxE,wCAA+C;AAC/C,+CAA8D;AAC9D,+DAA2D;
|
|
1
|
+
{"version":3,"file":"component.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/component/component.ts"],"names":[],"mappings":";;;;AACA,yCAKsB;AACtB,8DAAwE;AACxE,wCAA+C;AAC/C,+CAA8D;AAC9D,+DAA2D;AAE3D,+GAAqH;AACrH,+BAA4B;AAE5B,SAAsB,kBAAkB,CAAC,IAAU,EAAE,UAAkB;;QACrE,MAAM,kBAAkB,GACtB,IAAA,wFAA+C,EAAC,IAAI,CAAC,CAAC;QACxD,IAAI,kBAAkB,EAAE;YACtB,IAAI,iBAAiB,GAAG,2CACtB,IAAA,WAAI,EAAC,SAAS,EAAE,kBAAkB,EAAE,WAAW,CAAC,EACjD,CAAC;YACF,MAAM,iBAAiB,CAAC,OAAO,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;YAClD,OAAO;SACR;QAED,MAAM,OAAO,GAAG,MAAM,IAAA,oCAAgB,EAAC,IAAI,EAAE,UAAU,CAAC,CAAC;QACzD,MAAM,EAAE,iBAAiB,KAA0B,OAAO,EAA5B,gBAAgB,kBAAK,OAAO,EAApD,qBAA0C,CAAU,CAAC;QAE3D,yBAAyB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAEzC,MAAM,yBAAyB,GAAG,IAAA,0CAA0B,EAC1D,qBAAqB,EACrB,WAAW,CACZ,CAAC;QACF,MAAM,yBAAyB,CAAC,IAAI,EAAE,gBAAgB,CAAC,CAAC;QAExD,IAAA,uCAA2B,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAE3C,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;CAAA;AAzBD,gDAyBC;AAED,SAAS,yBAAyB,CAAC,IAAU,EAAE,MAAwB;;IACrE,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE;QAChB,OAAO;KACR;IAED,MAAM,OAAO,GACX,MAAA,MAAM,CAAC,OAAO,mCAAI,IAAA,mCAA0B,EAAC,IAAI,CAAC,CAAC,cAAc,CAAC;IACpE,MAAM,EAAE,IAAI,EAAE,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAEzD,IAAI,eAAe,GAAG,IAAA,sBAAa,EAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IACjD,eAAe,GAAG,eAAe,CAAC,UAAU,CAAC,GAAG,CAAC;QAC/C,CAAC,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC,CAAC;QAC1B,CAAC,CAAC,eAAe,CAAC;IAEpB,IAAI,CAAC,IAAA,qBAAc,EAAC,eAAe,EAAE,IAAI,CAAC,EAAE;QAC1C,MAAM,IAAI,KAAK,CACb,wCAAwC,MAAM,CAAC,IAAI,4CAA4C,IAAI,KAAK;YACtG,wEAAwE,CAC3E,CAAC;KACH;AACH,CAAC;AAED,kBAAe,kBAAkB,CAAC"}
|
|
@@ -17,7 +17,7 @@ function angularInitGenerator(host, rawOptions) {
|
|
|
17
17
|
const depsTask = !options.skipPackageJson
|
|
18
18
|
? updateDependencies(host)
|
|
19
19
|
: () => { };
|
|
20
|
-
const unitTestTask = addUnitTestRunner(host, options);
|
|
20
|
+
const unitTestTask = yield addUnitTestRunner(host, options);
|
|
21
21
|
const e2eTask = addE2ETestRunner(host, options);
|
|
22
22
|
addGitIgnoreEntry(host, '.angular');
|
|
23
23
|
if (!options.skipFormat) {
|
|
@@ -68,21 +68,25 @@ function updateDependencies(host) {
|
|
|
68
68
|
});
|
|
69
69
|
}
|
|
70
70
|
function addUnitTestRunner(host, options) {
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
(0, devkit_1.addDependenciesToPackageJson)(host, {}, {
|
|
77
|
-
'jest-preset-angular': versions_1.versions.angularV14.jestPresetAngularVersion,
|
|
71
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
72
|
+
switch (options.unitTestRunner) {
|
|
73
|
+
case test_runners_1.UnitTestRunner.Karma:
|
|
74
|
+
return yield (0, karma_1.karmaGenerator)(host, {
|
|
75
|
+
skipPackageJson: options.skipPackageJson,
|
|
78
76
|
});
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
77
|
+
case test_runners_1.UnitTestRunner.Jest:
|
|
78
|
+
if (!options.skipPackageJson) {
|
|
79
|
+
(0, devkit_1.addDependenciesToPackageJson)(host, {}, {
|
|
80
|
+
'jest-preset-angular': versions_1.versions.angularV14.jestPresetAngularVersion,
|
|
81
|
+
});
|
|
82
|
+
}
|
|
83
|
+
return (0, jest_1.jestInitGenerator)(host, {
|
|
84
|
+
skipPackageJson: options.skipPackageJson,
|
|
85
|
+
});
|
|
86
|
+
default:
|
|
87
|
+
return () => { };
|
|
88
|
+
}
|
|
89
|
+
});
|
|
86
90
|
}
|
|
87
91
|
function addE2ETestRunner(host, options) {
|
|
88
92
|
switch (options.e2eTestRunner) {
|
|
@@ -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,8DAA4E;AAC5E,6CAAmD;AAEnD,sDAAmD;AAEnD,SAAsB,oBAAoB,CACxC,IAAU,EACV,UAAkB;;QAElB,MAAM,OAAO,GAAG,gBAAgB,CAAC,UAAU,CAAC,CAAC;QAC7C,WAAW,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAE3B,MAAM,QAAQ,GAAG,CAAC,OAAO,CAAC,eAAe;YACvC,CAAC,CAAC,kBAAkB,CAAC,IAAI,CAAC;YAC1B,CAAC,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC;QACb,MAAM,YAAY,GAAG,iBAAiB,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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"}
|
|
@@ -25,7 +25,7 @@ function angularInitGenerator(tree, rawOptions) {
|
|
|
25
25
|
const depsTask = !options.skipPackageJson
|
|
26
26
|
? updateDependencies(tree)
|
|
27
27
|
: () => { };
|
|
28
|
-
const unitTestTask = addUnitTestRunner(tree, options);
|
|
28
|
+
const unitTestTask = yield addUnitTestRunner(tree, options);
|
|
29
29
|
const e2eTask = addE2ETestRunner(tree, options);
|
|
30
30
|
addGitIgnoreEntry(tree, '.angular');
|
|
31
31
|
if (!options.skipFormat) {
|
|
@@ -76,21 +76,25 @@ function updateDependencies(host) {
|
|
|
76
76
|
});
|
|
77
77
|
}
|
|
78
78
|
function addUnitTestRunner(host, options) {
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
(0, devkit_1.addDependenciesToPackageJson)(host, {}, {
|
|
85
|
-
'jest-preset-angular': versions_1.jestPresetAngularVersion,
|
|
79
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
80
|
+
switch (options.unitTestRunner) {
|
|
81
|
+
case test_runners_1.UnitTestRunner.Karma:
|
|
82
|
+
return yield (0, karma_1.karmaGenerator)(host, {
|
|
83
|
+
skipPackageJson: options.skipPackageJson,
|
|
86
84
|
});
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
85
|
+
case test_runners_1.UnitTestRunner.Jest:
|
|
86
|
+
if (!options.skipPackageJson) {
|
|
87
|
+
(0, devkit_1.addDependenciesToPackageJson)(host, {}, {
|
|
88
|
+
'jest-preset-angular': versions_1.jestPresetAngularVersion,
|
|
89
|
+
});
|
|
90
|
+
}
|
|
91
|
+
return (0, jest_1.jestInitGenerator)(host, {
|
|
92
|
+
skipPackageJson: options.skipPackageJson,
|
|
93
|
+
});
|
|
94
|
+
default:
|
|
95
|
+
return () => { };
|
|
96
|
+
}
|
|
97
|
+
});
|
|
94
98
|
}
|
|
95
99
|
function addE2ETestRunner(host, options) {
|
|
96
100
|
switch (options.e2eTestRunner) {
|
|
@@ -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,2DAAyE;AACzE,mDAa8B;AAC9B,0CAAgD;AAEhD,+GAAqH;AACrH,+BAA4B;AAE5B,SAAsB,oBAAoB,CACxC,IAAU,EACV,UAAkB;;QAElB,MAAM,kBAAkB,GACtB,IAAA,wFAA+C,EAAC,IAAI,CAAC,CAAC;QACxD,IAAI,kBAAkB,EAAE;YACtB,IAAI,iBAAiB,GAAG,2CACtB,IAAA,WAAI,EAAC,SAAS,EAAE,kBAAkB,EAAE,MAAM,CAAC,EAC5C,CAAC;YACF,MAAM,iBAAiB,CAAC,OAAO,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;YAClD,OAAO;SACR;QAED,MAAM,OAAO,GAAG,gBAAgB,CAAC,UAAU,CAAC,CAAC;QAC7C,WAAW,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAE3B,MAAM,QAAQ,GAAG,CAAC,OAAO,CAAC,eAAe;YACvC,CAAC,CAAC,kBAAkB,CAAC,IAAI,CAAC;YAC1B,CAAC,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC;QACb,MAAM,YAAY,GAAG,iBAAiB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/init/init.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,44 @@
|
|
|
1
|
+
// Karma configuration file, see link for more information
|
|
2
|
+
// https://karma-runner.github.io/1.0/config/configuration-file.html
|
|
3
|
+
|
|
4
|
+
const { join } = require('path');
|
|
5
|
+
const { constants } = require('karma');
|
|
6
|
+
|
|
7
|
+
module.exports = () => {
|
|
8
|
+
return {
|
|
9
|
+
basePath: '',
|
|
10
|
+
frameworks: ['jasmine', '@angular-devkit/build-angular'],
|
|
11
|
+
plugins: [
|
|
12
|
+
require('karma-jasmine'),
|
|
13
|
+
require('karma-chrome-launcher'),
|
|
14
|
+
require('karma-jasmine-html-reporter'),
|
|
15
|
+
require('karma-coverage'),
|
|
16
|
+
require('@angular-devkit/build-angular/plugins/karma'),
|
|
17
|
+
],
|
|
18
|
+
client: {
|
|
19
|
+
jasmine: {
|
|
20
|
+
// you can add configuration options for Jasmine here
|
|
21
|
+
// the possible options are listed at https://jasmine.github.io/api/edge/Configuration.html
|
|
22
|
+
// for example, you can disable the random execution with `random: false`
|
|
23
|
+
// or set a specific seed with `seed: 4321`
|
|
24
|
+
},
|
|
25
|
+
clearContext: false, // leave Jasmine Spec Runner output visible in browser
|
|
26
|
+
},
|
|
27
|
+
jasmineHtmlReporter: {
|
|
28
|
+
suppressAll: true, // removes the duplicated traces
|
|
29
|
+
},
|
|
30
|
+
coverageReporter: {
|
|
31
|
+
dir: join(__dirname, './coverage'),
|
|
32
|
+
subdir: '.',
|
|
33
|
+
reporters: [{ type: 'html' }, { type: 'text-summary' }],
|
|
34
|
+
},
|
|
35
|
+
reporters: ['progress', 'kjhtml'],
|
|
36
|
+
port: 9876,
|
|
37
|
+
colors: true,
|
|
38
|
+
logLevel: constants.LOG_INFO,
|
|
39
|
+
autoWatch: true,
|
|
40
|
+
browsers: ['Chrome'],
|
|
41
|
+
singleRun: true,
|
|
42
|
+
restartOnFileChange: true
|
|
43
|
+
};
|
|
44
|
+
};
|
|
@@ -0,0 +1,57 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.karmaGenerator = void 0;
|
|
4
|
+
const devkit_1 = require("@nrwl/devkit");
|
|
5
|
+
const versions_1 = require("../../../utils/versions");
|
|
6
|
+
function addTestInputs(tree) {
|
|
7
|
+
var _a, _b, _c, _d;
|
|
8
|
+
var _e, _f;
|
|
9
|
+
const workspaceConfiguration = (0, devkit_1.readWorkspaceConfiguration)(tree);
|
|
10
|
+
const productionFileSet = (_a = workspaceConfiguration.namedInputs) === null || _a === void 0 ? void 0 : _a.production;
|
|
11
|
+
if (productionFileSet) {
|
|
12
|
+
productionFileSet.push(
|
|
13
|
+
// Exclude spec files from production fileset
|
|
14
|
+
'!{projectRoot}/**/*.spec.[jt]s',
|
|
15
|
+
// Remove tsconfig.spec.json
|
|
16
|
+
'!{projectRoot}/tsconfig.spec.json',
|
|
17
|
+
// Remove karma.conf.js
|
|
18
|
+
'!{projectRoot}/karma.conf.js');
|
|
19
|
+
// Dedupe and set
|
|
20
|
+
workspaceConfiguration.namedInputs.production = Array.from(new Set(productionFileSet));
|
|
21
|
+
}
|
|
22
|
+
// Test targets depend on all their project's sources + production sources of dependencies
|
|
23
|
+
(_b = workspaceConfiguration.targetDefaults) !== null && _b !== void 0 ? _b : (workspaceConfiguration.targetDefaults = {});
|
|
24
|
+
(_c = (_e = workspaceConfiguration.targetDefaults).test) !== null && _c !== void 0 ? _c : (_e.test = {});
|
|
25
|
+
(_d = (_f = workspaceConfiguration.targetDefaults.test).inputs) !== null && _d !== void 0 ? _d : (_f.inputs = [
|
|
26
|
+
'default',
|
|
27
|
+
productionFileSet ? '^production' : '^default',
|
|
28
|
+
]);
|
|
29
|
+
workspaceConfiguration.targetDefaults.test.inputs.push('{workspaceRoot}/karma.conf.js');
|
|
30
|
+
(0, devkit_1.updateWorkspaceConfiguration)(tree, workspaceConfiguration);
|
|
31
|
+
}
|
|
32
|
+
function karmaGenerator(tree, options) {
|
|
33
|
+
const packageJson = (0, devkit_1.readJson)(tree, 'package.json');
|
|
34
|
+
if (!tree.exists('karma.conf.js')) {
|
|
35
|
+
(0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files'), '.', {
|
|
36
|
+
tmpl: '',
|
|
37
|
+
});
|
|
38
|
+
addTestInputs(tree);
|
|
39
|
+
}
|
|
40
|
+
if (options.skipPackageJson || packageJson.devDependencies['karma']) {
|
|
41
|
+
return () => { };
|
|
42
|
+
}
|
|
43
|
+
return (0, devkit_1.addDependenciesToPackageJson)(tree, {}, {
|
|
44
|
+
karma: versions_1.versions.angularV14.karmaVersion,
|
|
45
|
+
'karma-chrome-launcher': versions_1.versions.angularV14.karmaChromeLauncherVersion,
|
|
46
|
+
'karma-coverage': versions_1.versions.angularV14.karmaCoverageVersion,
|
|
47
|
+
'karma-jasmine': versions_1.versions.angularV14.karmaJasmineVersion,
|
|
48
|
+
'karma-jasmine-html-reporter': versions_1.versions.angularV14.karmaJasmineHtmlReporterVersion,
|
|
49
|
+
'jasmine-core': versions_1.versions.angularV14.jasmineCoreVersion,
|
|
50
|
+
'jasmine-spec-reporter': versions_1.versions.angularV14.jasmineSpecReporterVersion,
|
|
51
|
+
'@types/jasmine': versions_1.versions.angularV14.typesJasmineVersion,
|
|
52
|
+
'@types/node': versions_1.versions.angularV14.typesNodeVersion,
|
|
53
|
+
});
|
|
54
|
+
}
|
|
55
|
+
exports.karmaGenerator = karmaGenerator;
|
|
56
|
+
exports.default = karmaGenerator;
|
|
57
|
+
//# sourceMappingURL=karma.js.map
|