@nrwl/angular 15.3.0-beta.10 → 15.3.0-beta.12
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/package.json +9 -9
- package/src/builders/module-federation-dev-ssr/module-federation-dev-ssr.impl.js +1 -1
- package/src/builders/module-federation-dev-ssr/module-federation-dev-ssr.impl.js.map +1 -1
- package/src/generators/add-linting/add-linting.d.ts +1 -1
- package/src/generators/add-linting/add-linting.js +21 -10
- package/src/generators/add-linting/add-linting.js.map +1 -1
- package/src/generators/add-linting/lib/add-angular-eslint-dependencies.d.ts +2 -2
- package/src/generators/add-linting/lib/add-angular-eslint-dependencies.js +1 -1
- package/src/generators/add-linting/lib/add-angular-eslint-dependencies.js.map +1 -1
- package/src/generators/add-linting/lib/add-project-lint-target.js +4 -2
- package/src/generators/add-linting/lib/add-project-lint-target.js.map +1 -1
- package/src/generators/add-linting/lib/create-eslint-configuration.d.ts +75 -0
- package/src/generators/add-linting/lib/create-eslint-configuration.js +41 -1
- package/src/generators/add-linting/lib/create-eslint-configuration.js.map +1 -1
- package/src/generators/application/application.js +1 -1
- package/src/generators/application/application.js.map +1 -1
- package/src/generators/init/angular-v14/init.d.ts +4 -0
- package/src/generators/init/angular-v14/init.js +122 -0
- package/src/generators/init/angular-v14/init.js.map +1 -0
- package/src/generators/init/angular-v14/schema.d.ts +13 -0
- package/src/generators/init/init.d.ts +1 -1
- package/src/generators/init/init.js +15 -7
- package/src/generators/init/init.js.map +1 -1
- package/src/generators/ng-add/migrate-from-angular-cli.js +1 -1
- package/src/generators/ng-add/migrate-from-angular-cli.js.map +1 -1
- package/src/generators/ng-add/utilities/workspace.d.ts +1 -1
- package/src/generators/ng-add/utilities/workspace.js +2 -5
- package/src/generators/ng-add/utilities/workspace.js.map +1 -1
- package/src/utils/get-generator-directory-for-ng-version.d.ts +2 -0
- package/src/utils/get-generator-directory-for-ng-version.js +20 -0
- package/src/utils/get-generator-directory-for-ng-version.js.map +1 -0
- package/src/utils/versions.d.ts +37 -0
- package/src/utils/versions.js +38 -1
- package/src/utils/versions.js.map +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,6 @@
|
|
|
3
3
|
All notable changes to this project will be documented in this file.
|
|
4
4
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
|
5
5
|
|
|
6
|
-
# [15.3.0-beta.
|
|
6
|
+
# [15.3.0-beta.12](https://github.com/nrwl/nx/compare/15.2.0...15.3.0-beta.12) (2022-12-01)
|
|
7
7
|
|
|
8
8
|
**Note:** Version bump only for package @nrwl/angular
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nrwl/angular",
|
|
3
|
-
"version": "15.3.0-beta.
|
|
3
|
+
"version": "15.3.0-beta.12",
|
|
4
4
|
"private": false,
|
|
5
5
|
"description": "The Nx Plugin for Angular contains executors, generators, and utilities for managing Angular applications and libraries within an Nx workspace. It provides: \n\n- Integration with libraries such as Storybook, Jest, ESLint, Tailwind CSS, Cypress, Karma, and Protractor. \n\n- Generators to help scaffold code quickly (like: Micro Frontends, Libraries, both internal to your codebase and publishable to npm) \n\n- Upgrading AngularJS applications \n\n- Single Component Application Modules (SCAMs) \n\n- NgRx helpers. \n\n- Utilities for automatic workspace refactoring.",
|
|
6
6
|
"repository": {
|
|
@@ -68,13 +68,13 @@
|
|
|
68
68
|
"dependencies": {
|
|
69
69
|
"@angular-devkit/schematics": "~15.0.1",
|
|
70
70
|
"@nguniversal/builders": "~15.0.0",
|
|
71
|
-
"@nrwl/cypress": "15.3.0-beta.
|
|
72
|
-
"@nrwl/devkit": "15.3.0-beta.
|
|
73
|
-
"@nrwl/jest": "15.3.0-beta.
|
|
74
|
-
"@nrwl/linter": "15.3.0-beta.
|
|
75
|
-
"@nrwl/storybook": "15.3.0-beta.
|
|
76
|
-
"@nrwl/webpack": "15.3.0-beta.
|
|
77
|
-
"@nrwl/workspace": "15.3.0-beta.
|
|
71
|
+
"@nrwl/cypress": "15.3.0-beta.12",
|
|
72
|
+
"@nrwl/devkit": "15.3.0-beta.12",
|
|
73
|
+
"@nrwl/jest": "15.3.0-beta.12",
|
|
74
|
+
"@nrwl/linter": "15.3.0-beta.12",
|
|
75
|
+
"@nrwl/storybook": "15.3.0-beta.12",
|
|
76
|
+
"@nrwl/webpack": "15.3.0-beta.12",
|
|
77
|
+
"@nrwl/workspace": "15.3.0-beta.12",
|
|
78
78
|
"@phenomnomnominal/tsquery": "4.1.1",
|
|
79
79
|
"@schematics/angular": "~15.0.1",
|
|
80
80
|
"chalk": "4.1.0",
|
|
@@ -100,5 +100,5 @@
|
|
|
100
100
|
"fesm2015": "fesm2015/nrwl-angular.mjs",
|
|
101
101
|
"typings": "index.d.ts",
|
|
102
102
|
"sideEffects": false,
|
|
103
|
-
"gitHead": "
|
|
103
|
+
"gitHead": "cded83b2c5bf3e4252c03d4dbcbb5b203b0faed0"
|
|
104
104
|
}
|
|
@@ -55,7 +55,7 @@ function executeModuleFederationDevSSRBuilder(schema, context) {
|
|
|
55
55
|
? `:${context.target.configuration}`
|
|
56
56
|
: ''}`, { stdio: 'inherit' });
|
|
57
57
|
const child = (0, child_process_1.fork)(remoteServerOutput, {
|
|
58
|
-
env: remoteProject.targets['serve-ssr'].options.port,
|
|
58
|
+
env: { PORT: remoteProject.targets['serve-ssr'].options.port },
|
|
59
59
|
});
|
|
60
60
|
child.on('message', (msg) => {
|
|
61
61
|
if (msg === 'nx.server.ready') {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"module-federation-dev-ssr.impl.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/builders/module-federation-dev-ssr/module-federation-dev-ssr.impl.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"module-federation-dev-ssr.impl.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/builders/module-federation-dev-ssr/module-federation-dev-ssr.impl.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import
|
|
1
|
+
import { GeneratorCallback, Tree } from '@nrwl/devkit';
|
|
2
2
|
import type { AddLintingGeneratorSchema } from './schema';
|
|
3
3
|
export declare function addLintingGenerator(tree: Tree, options: AddLintingGeneratorSchema): Promise<GeneratorCallback>;
|
|
4
4
|
export default addLintingGenerator;
|
|
@@ -4,25 +4,36 @@ exports.addLintingGenerator = void 0;
|
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const devkit_1 = require("@nrwl/devkit");
|
|
6
6
|
const linter_1 = require("@nrwl/linter");
|
|
7
|
+
const lint_project_1 = require("@nrwl/linter/src/generators/lint-project/lint-project");
|
|
8
|
+
const run_tasks_in_serial_1 = require("@nrwl/workspace/src/utilities/run-tasks-in-serial");
|
|
7
9
|
const add_angular_eslint_dependencies_1 = require("./lib/add-angular-eslint-dependencies");
|
|
8
|
-
const add_project_lint_target_1 = require("./lib/add-project-lint-target");
|
|
9
10
|
const create_eslint_configuration_1 = require("./lib/create-eslint-configuration");
|
|
10
11
|
function addLintingGenerator(tree, options) {
|
|
11
12
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
12
|
-
const
|
|
13
|
+
const tasks = [];
|
|
14
|
+
const rootProject = options.projectRoot === '.' || options.projectRoot === '';
|
|
15
|
+
const lintTask = yield (0, linter_1.lintProjectGenerator)(tree, {
|
|
13
16
|
linter: linter_1.Linter.EsLint,
|
|
17
|
+
project: options.projectName,
|
|
18
|
+
tsConfigPaths: [
|
|
19
|
+
(0, devkit_1.joinPathFragments)(options.projectRoot, 'tsconfig.app.json'),
|
|
20
|
+
],
|
|
14
21
|
unitTestRunner: options.unitTestRunner,
|
|
15
|
-
|
|
22
|
+
eslintFilePatterns: [
|
|
23
|
+
(0, lint_project_1.mapLintPattern)(options.projectRoot, 'ts', rootProject),
|
|
24
|
+
(0, lint_project_1.mapLintPattern)(options.projectRoot, 'html', rootProject),
|
|
25
|
+
],
|
|
26
|
+
setParserOptionsProject: options.setParserOptionsProject,
|
|
27
|
+
skipFormat: true,
|
|
28
|
+
rootProject: rootProject,
|
|
16
29
|
});
|
|
30
|
+
tasks.push(lintTask);
|
|
31
|
+
(0, devkit_1.updateJson)(tree, (0, devkit_1.joinPathFragments)(options.projectRoot, '.eslintrc.json'), (json) => (0, create_eslint_configuration_1.extendAngularEslintJson)(json, options));
|
|
17
32
|
if (!options.skipPackageJson) {
|
|
18
|
-
(0, add_angular_eslint_dependencies_1.addAngularEsLintDependencies)(tree);
|
|
33
|
+
const installTask = yield (0, add_angular_eslint_dependencies_1.addAngularEsLintDependencies)(tree);
|
|
34
|
+
tasks.push(installTask);
|
|
19
35
|
}
|
|
20
|
-
(0,
|
|
21
|
-
(0, add_project_lint_target_1.addProjectLintTarget)(tree, options);
|
|
22
|
-
if (!options.skipFormat) {
|
|
23
|
-
yield (0, devkit_1.formatFiles)(tree);
|
|
24
|
-
}
|
|
25
|
-
return installTask;
|
|
36
|
+
return (0, run_tasks_in_serial_1.runTasksInSerial)(...tasks);
|
|
26
37
|
});
|
|
27
38
|
}
|
|
28
39
|
exports.addLintingGenerator = addLintingGenerator;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add-linting.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/add-linting/add-linting.ts"],"names":[],"mappings":";;;;
|
|
1
|
+
{"version":3,"file":"add-linting.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/add-linting/add-linting.ts"],"names":[],"mappings":";;;;AAAA,yCAKsB;AACtB,yCAA4D;AAC5D,wFAAuF;AACvF,2FAAqF;AACrF,2FAAqF;AACrF,mFAA4E;AAG5E,SAAsB,mBAAmB,CACvC,IAAU,EACV,OAAkC;;QAElC,MAAM,KAAK,GAAwB,EAAE,CAAC;QACtC,MAAM,WAAW,GAAG,OAAO,CAAC,WAAW,KAAK,GAAG,IAAI,OAAO,CAAC,WAAW,KAAK,EAAE,CAAC;QAC9E,MAAM,QAAQ,GAAG,MAAM,IAAA,6BAAoB,EAAC,IAAI,EAAE;YAChD,MAAM,EAAE,eAAM,CAAC,MAAM;YACrB,OAAO,EAAE,OAAO,CAAC,WAAW;YAC5B,aAAa,EAAE;gBACb,IAAA,0BAAiB,EAAC,OAAO,CAAC,WAAW,EAAE,mBAAmB,CAAC;aAC5D;YACD,cAAc,EAAE,OAAO,CAAC,cAAc;YACtC,kBAAkB,EAAE;gBAClB,IAAA,6BAAc,EAAC,OAAO,CAAC,WAAW,EAAE,IAAI,EAAE,WAAW,CAAC;gBACtD,IAAA,6BAAc,EAAC,OAAO,CAAC,WAAW,EAAE,MAAM,EAAE,WAAW,CAAC;aACzD;YACD,uBAAuB,EAAE,OAAO,CAAC,uBAAuB;YACxD,UAAU,EAAE,IAAI;YAChB,WAAW,EAAE,WAAW;SACzB,CAAC,CAAC;QACH,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAErB,IAAA,mBAAU,EACR,IAAI,EACJ,IAAA,0BAAiB,EAAC,OAAO,CAAC,WAAW,EAAE,gBAAgB,CAAC,EACxD,CAAC,IAAI,EAAE,EAAE,CAAC,IAAA,qDAAuB,EAAC,IAAI,EAAE,OAAO,CAAC,CACjD,CAAC;QAEF,IAAI,CAAC,OAAO,CAAC,eAAe,EAAE;YAC5B,MAAM,WAAW,GAAG,MAAM,IAAA,8DAA4B,EAAC,IAAI,CAAC,CAAC;YAC7D,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;SACzB;QAED,OAAO,IAAA,sCAAgB,EAAC,GAAG,KAAK,CAAC,CAAC;IACpC,CAAC;CAAA;AAnCD,kDAmCC;AAED,kBAAe,mBAAmB,CAAC"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
import type { Tree } from '@nrwl/devkit';
|
|
2
|
-
export declare function addAngularEsLintDependencies(tree: Tree):
|
|
1
|
+
import type { GeneratorCallback, Tree } from '@nrwl/devkit';
|
|
2
|
+
export declare function addAngularEsLintDependencies(tree: Tree): GeneratorCallback;
|
|
@@ -4,7 +4,7 @@ exports.addAngularEsLintDependencies = void 0;
|
|
|
4
4
|
const devkit_1 = require("@nrwl/devkit");
|
|
5
5
|
const versions_1 = require("../../../utils/versions");
|
|
6
6
|
function addAngularEsLintDependencies(tree) {
|
|
7
|
-
(0, devkit_1.addDependenciesToPackageJson)(tree, {}, {
|
|
7
|
+
return (0, devkit_1.addDependenciesToPackageJson)(tree, {}, {
|
|
8
8
|
'@angular-eslint/eslint-plugin': versions_1.angularEslintVersion,
|
|
9
9
|
'@angular-eslint/eslint-plugin-template': versions_1.angularEslintVersion,
|
|
10
10
|
'@angular-eslint/template-parser': versions_1.angularEslintVersion,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add-angular-eslint-dependencies.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/add-linting/lib/add-angular-eslint-dependencies.ts"],"names":[],"mappings":";;;AACA,yCAA4D;AAC5D,sDAA+D;AAE/D,SAAgB,4BAA4B,CAAC,IAAU;IACrD,IAAA,qCAA4B,
|
|
1
|
+
{"version":3,"file":"add-angular-eslint-dependencies.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/add-linting/lib/add-angular-eslint-dependencies.ts"],"names":[],"mappings":";;;AACA,yCAA4D;AAC5D,sDAA+D;AAE/D,SAAgB,4BAA4B,CAAC,IAAU;IACrD,OAAO,IAAA,qCAA4B,EACjC,IAAI,EACJ,EAAE,EACF;QACE,+BAA+B,EAAE,+BAAoB;QACrD,wCAAwC,EAAE,+BAAoB;QAC9D,iCAAiC,EAAE,+BAAoB;KACxD,CACF,CAAC;AACJ,CAAC;AAVD,oEAUC"}
|
|
@@ -2,14 +2,16 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.addProjectLintTarget = void 0;
|
|
4
4
|
const devkit_1 = require("@nrwl/devkit");
|
|
5
|
+
const lint_project_1 = require("@nrwl/linter/src/generators/lint-project/lint-project");
|
|
5
6
|
function addProjectLintTarget(tree, options) {
|
|
6
7
|
const project = (0, devkit_1.readProjectConfiguration)(tree, options.projectName);
|
|
8
|
+
const rootProject = options.projectRoot === '.' || options.projectRoot === '';
|
|
7
9
|
project.targets.lint = {
|
|
8
10
|
executor: '@nrwl/linter:eslint',
|
|
9
11
|
options: {
|
|
10
12
|
lintFilePatterns: [
|
|
11
|
-
|
|
12
|
-
|
|
13
|
+
(0, lint_project_1.mapLintPattern)(options.projectRoot, 'ts', rootProject),
|
|
14
|
+
(0, lint_project_1.mapLintPattern)(options.projectRoot, 'html', rootProject),
|
|
13
15
|
],
|
|
14
16
|
},
|
|
15
17
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add-project-lint-target.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/add-linting/lib/add-project-lint-target.ts"],"names":[],"mappings":";;;AACA,yCAGsB;
|
|
1
|
+
{"version":3,"file":"add-project-lint-target.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/add-linting/lib/add-project-lint-target.ts"],"names":[],"mappings":";;;AACA,yCAGsB;AACtB,wFAAuF;AAGvF,SAAgB,oBAAoB,CAClC,IAAU,EACV,OAAkC;IAElC,MAAM,OAAO,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC;IACpE,MAAM,WAAW,GAAG,OAAO,CAAC,WAAW,KAAK,GAAG,IAAI,OAAO,CAAC,WAAW,KAAK,EAAE,CAAC;IAC9E,OAAO,CAAC,OAAO,CAAC,IAAI,GAAG;QACrB,QAAQ,EAAE,qBAAqB;QAC/B,OAAO,EAAE;YACP,gBAAgB,EAAE;gBAChB,IAAA,6BAAc,EAAC,OAAO,CAAC,WAAW,EAAE,IAAI,EAAE,WAAW,CAAC;gBACtD,IAAA,6BAAc,EAAC,OAAO,CAAC,WAAW,EAAE,MAAM,EAAE,WAAW,CAAC;aACzD;SACF;KACF,CAAC;IACF,IAAA,mCAA0B,EAAC,IAAI,EAAE,OAAO,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;AACjE,CAAC;AAhBD,oDAgBC"}
|
|
@@ -1,3 +1,78 @@
|
|
|
1
1
|
import type { Tree } from '@nrwl/devkit';
|
|
2
|
+
import type { Linter } from 'eslint';
|
|
2
3
|
import type { AddLintingGeneratorSchema } from '../schema';
|
|
4
|
+
declare type EslintExtensionSchema = {
|
|
5
|
+
prefix: string;
|
|
6
|
+
};
|
|
7
|
+
export declare const extendAngularEslintJson: (json: Linter.Config, options: EslintExtensionSchema) => {
|
|
8
|
+
overrides: ({
|
|
9
|
+
files: string[];
|
|
10
|
+
extends: string[];
|
|
11
|
+
rules: {
|
|
12
|
+
'@angular-eslint/directive-selector': (string | {
|
|
13
|
+
type: string;
|
|
14
|
+
prefix: string;
|
|
15
|
+
style: string;
|
|
16
|
+
})[];
|
|
17
|
+
'@angular-eslint/component-selector': (string | {
|
|
18
|
+
type: string;
|
|
19
|
+
prefix: string;
|
|
20
|
+
style: string;
|
|
21
|
+
})[];
|
|
22
|
+
};
|
|
23
|
+
excludedFiles?: string | string[];
|
|
24
|
+
$schema?: string;
|
|
25
|
+
env?: {
|
|
26
|
+
[name: string]: boolean;
|
|
27
|
+
};
|
|
28
|
+
globals?: {
|
|
29
|
+
[name: string]: boolean | "readonly" | "readable" | "writable" | "writeable";
|
|
30
|
+
};
|
|
31
|
+
noInlineConfig?: boolean;
|
|
32
|
+
overrides?: Linter.ConfigOverride<Linter.RulesRecord>[];
|
|
33
|
+
parser?: string;
|
|
34
|
+
parserOptions?: Linter.ParserOptions;
|
|
35
|
+
plugins?: string[];
|
|
36
|
+
processor?: string;
|
|
37
|
+
reportUnusedDisableDirectives?: boolean;
|
|
38
|
+
settings?: {
|
|
39
|
+
[name: string]: any;
|
|
40
|
+
};
|
|
41
|
+
} | {
|
|
42
|
+
files: string[];
|
|
43
|
+
extends: string[];
|
|
44
|
+
/**
|
|
45
|
+
* Having an empty rules object present makes it more obvious to the user where they would
|
|
46
|
+
* extend things from if they needed to
|
|
47
|
+
*/
|
|
48
|
+
rules: {
|
|
49
|
+
'@angular-eslint/directive-selector'?: undefined;
|
|
50
|
+
'@angular-eslint/component-selector'?: undefined;
|
|
51
|
+
};
|
|
52
|
+
})[];
|
|
53
|
+
ignorePatterns?: string | string[];
|
|
54
|
+
root?: boolean;
|
|
55
|
+
$schema?: string;
|
|
56
|
+
env?: {
|
|
57
|
+
[name: string]: boolean;
|
|
58
|
+
};
|
|
59
|
+
extends?: string | string[];
|
|
60
|
+
globals?: {
|
|
61
|
+
[name: string]: boolean | "readonly" | "readable" | "writable" | "writeable";
|
|
62
|
+
};
|
|
63
|
+
noInlineConfig?: boolean;
|
|
64
|
+
parser?: string;
|
|
65
|
+
parserOptions?: Linter.ParserOptions;
|
|
66
|
+
plugins?: string[];
|
|
67
|
+
processor?: string;
|
|
68
|
+
reportUnusedDisableDirectives?: boolean;
|
|
69
|
+
settings?: {
|
|
70
|
+
[name: string]: any;
|
|
71
|
+
};
|
|
72
|
+
rules?: Partial<Linter.RulesRecord>;
|
|
73
|
+
};
|
|
74
|
+
/**
|
|
75
|
+
* @deprecated Use {@link extendAngularEslintJson} instead
|
|
76
|
+
*/
|
|
3
77
|
export declare function createEsLintConfiguration(tree: Tree, options: AddLintingGeneratorSchema): void;
|
|
78
|
+
export {};
|
|
@@ -1,8 +1,48 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.createEsLintConfiguration = void 0;
|
|
3
|
+
exports.createEsLintConfiguration = exports.extendAngularEslintJson = void 0;
|
|
4
4
|
const devkit_1 = require("@nrwl/devkit");
|
|
5
5
|
const strings_1 = require("@nrwl/workspace/src/utils/strings");
|
|
6
|
+
const extendAngularEslintJson = (json, options) => {
|
|
7
|
+
const overrides = [
|
|
8
|
+
Object.assign(Object.assign({}, json.overrides[0]), { files: ['*.ts'], extends: [
|
|
9
|
+
...(json.overrides[0].extends || []),
|
|
10
|
+
'plugin:@nrwl/nx/angular',
|
|
11
|
+
'plugin:@angular-eslint/template/process-inline-templates',
|
|
12
|
+
], rules: {
|
|
13
|
+
'@angular-eslint/directive-selector': [
|
|
14
|
+
'error',
|
|
15
|
+
{
|
|
16
|
+
type: 'attribute',
|
|
17
|
+
prefix: (0, strings_1.camelize)(options.prefix),
|
|
18
|
+
style: 'camelCase',
|
|
19
|
+
},
|
|
20
|
+
],
|
|
21
|
+
'@angular-eslint/component-selector': [
|
|
22
|
+
'error',
|
|
23
|
+
{
|
|
24
|
+
type: 'element',
|
|
25
|
+
prefix: (0, strings_1.dasherize)(options.prefix),
|
|
26
|
+
style: 'kebab-case',
|
|
27
|
+
},
|
|
28
|
+
],
|
|
29
|
+
} }),
|
|
30
|
+
{
|
|
31
|
+
files: ['*.html'],
|
|
32
|
+
extends: ['plugin:@nrwl/nx/angular-template'],
|
|
33
|
+
/**
|
|
34
|
+
* Having an empty rules object present makes it more obvious to the user where they would
|
|
35
|
+
* extend things from if they needed to
|
|
36
|
+
*/
|
|
37
|
+
rules: {},
|
|
38
|
+
},
|
|
39
|
+
];
|
|
40
|
+
return Object.assign(Object.assign({}, json), { overrides });
|
|
41
|
+
};
|
|
42
|
+
exports.extendAngularEslintJson = extendAngularEslintJson;
|
|
43
|
+
/**
|
|
44
|
+
* @deprecated Use {@link extendAngularEslintJson} instead
|
|
45
|
+
*/
|
|
6
46
|
function createEsLintConfiguration(tree, options) {
|
|
7
47
|
const rootConfig = `${(0, devkit_1.offsetFromRoot)(options.projectRoot)}.eslintrc.json`;
|
|
8
48
|
// Include all project files to be linted (since they are turned off in the root eslintrc file).
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create-eslint-configuration.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/add-linting/lib/create-eslint-configuration.ts"],"names":[],"mappings":";;;AACA,yCAA4E;AAC5E,+DAAwE;
|
|
1
|
+
{"version":3,"file":"create-eslint-configuration.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/add-linting/lib/create-eslint-configuration.ts"],"names":[],"mappings":";;;AACA,yCAA4E;AAC5E,+DAAwE;AAQjE,MAAM,uBAAuB,GAAG,CACrC,IAAmB,EACnB,OAA8B,EAC9B,EAAE;IACF,MAAM,SAAS,GAAG;wCAEX,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,KACpB,KAAK,EAAE,CAAC,MAAM,CAAC,EACf,OAAO,EAAE;gBACP,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,OAAO,IAAI,EAAE,CAAC;gBACpC,yBAAyB;gBACzB,0DAA0D;aAC3D,EACD,KAAK,EAAE;gBACL,oCAAoC,EAAE;oBACpC,OAAO;oBACP;wBACE,IAAI,EAAE,WAAW;wBACjB,MAAM,EAAE,IAAA,kBAAQ,EAAC,OAAO,CAAC,MAAM,CAAC;wBAChC,KAAK,EAAE,WAAW;qBACnB;iBACF;gBACD,oCAAoC,EAAE;oBACpC,OAAO;oBACP;wBACE,IAAI,EAAE,SAAS;wBACf,MAAM,EAAE,IAAA,mBAAS,EAAC,OAAO,CAAC,MAAM,CAAC;wBACjC,KAAK,EAAE,YAAY;qBACpB;iBACF;aACF;QAEH;YACE,KAAK,EAAE,CAAC,QAAQ,CAAC;YACjB,OAAO,EAAE,CAAC,kCAAkC,CAAC;YAC7C;;;eAGG;YACH,KAAK,EAAE,EAAE;SACV;KACF,CAAC;IAEF,uCACK,IAAI,KACP,SAAS,IACT;AACJ,CAAC,CAAC;AA/CW,QAAA,uBAAuB,2BA+ClC;AAEF;;GAEG;AACH,SAAgB,yBAAyB,CACvC,IAAU,EACV,OAAkC;IAElC,MAAM,UAAU,GAAG,GAAG,IAAA,uBAAc,EAAC,OAAO,CAAC,WAAW,CAAC,gBAAgB,CAAC;IAC1E,gGAAgG;IAChG,MAAM,cAAc,GAAG,CAAC,OAAO,CAAC,CAAC;IAEjC,MAAM,UAAU,GAAG;QACjB,OAAO,EAAE,CAAC,UAAU,CAAC;QACrB,cAAc;QACd,SAAS,EAAE;YACT;gBACE,KAAK,EAAE,CAAC,MAAM,CAAC;gBACf,OAAO,EAAE;oBACP,yBAAyB;oBACzB,0DAA0D;iBAC3D;gBACD;;;;;;;;;;;;mBAYG;gBACH,aAAa,EAAE,CAAC,OAAO,CAAC,uBAAuB;oBAC7C,CAAC,CAAC,SAAS;oBACX,CAAC,CAAC;wBACE,OAAO,EAAE,CAAC,GAAG,OAAO,CAAC,WAAW,mBAAmB,CAAC;qBACrD;gBACL,KAAK,EAAE;oBACL,oCAAoC,EAAE;wBACpC,OAAO;wBACP;4BACE,IAAI,EAAE,WAAW;4BACjB,MAAM,EAAE,IAAA,kBAAQ,EAAC,OAAO,CAAC,MAAM,CAAC;4BAChC,KAAK,EAAE,WAAW;yBACnB;qBACF;oBACD,oCAAoC,EAAE;wBACpC,OAAO;wBACP;4BACE,IAAI,EAAE,SAAS;4BACf,MAAM,EAAE,IAAA,mBAAS,EAAC,OAAO,CAAC,MAAM,CAAC;4BACjC,KAAK,EAAE,YAAY;yBACpB;qBACF;iBACF;aACF;YACD;gBACE,KAAK,EAAE,CAAC,QAAQ,CAAC;gBACjB,OAAO,EAAE,CAAC,kCAAkC,CAAC;gBAC7C;;;mBAGG;gBACH,KAAK,EAAE,EAAE;aACV;SACF;KACF,CAAC;IAEF,IAAA,kBAAS,EACP,IAAI,EACJ,IAAA,0BAAiB,EAAC,OAAO,CAAC,WAAW,EAAE,gBAAgB,CAAC,EACxD,UAAU,CACX,CAAC;AACJ,CAAC;AAxED,8DAwEC"}
|
|
@@ -60,7 +60,7 @@ function applicationGenerator(host, schema) {
|
|
|
60
60
|
if (options.routing) {
|
|
61
61
|
(0, lib_1.addRouterRootConfiguration)(host, options);
|
|
62
62
|
}
|
|
63
|
-
(0, lib_1.addLinting)(host, options);
|
|
63
|
+
yield (0, lib_1.addLinting)(host, options);
|
|
64
64
|
yield (0, lib_1.addUnitTestRunner)(host, options);
|
|
65
65
|
yield (0, lib_1.addE2e)(host, options);
|
|
66
66
|
(0, lib_1.updateEditorTsConfig)(host, options);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"application.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/application/application.ts"],"names":[],"mappings":";;;;AAAA,yCAKsB;AACtB,8DAAwE;AACxE,2DAAyE;AACzE,2DAA0D;AAC1D,uCAAoD;AACpD,qEAA0E;AAC1E,+BAiBe;AAGf,SAAsB,oBAAoB,CACxC,IAAU,EACV,MAAuB;;QAEvB,MAAM,OAAO,GAAG,IAAA,sBAAgB,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAE/C,MAAM,IAAA,2BAAoB,EAAC,IAAI,kCAC1B,OAAO,KACV,UAAU,EAAE,IAAI,IAChB,CAAC;QAEH,MAAM,mBAAmB,GAAG,IAAA,0CAA0B,EACpD,qBAAqB,EACrB,aAAa,CACd,CAAC;QACF,MAAM,mBAAmB,CAAC,IAAI,EAAE;YAC9B,IAAI,EAAE,OAAO,CAAC,IAAI;YAClB,WAAW,EAAE,OAAO,CAAC,WAAW;YAChC,cAAc,EAAE,OAAO,CAAC,cAAc;YACtC,MAAM,EAAE,OAAO,CAAC,MAAM;YACtB,SAAS,EAAE,OAAO,CAAC,SAAS;YAC5B,KAAK,EAAE,OAAO,CAAC,KAAK;YACpB,iBAAiB,EAAE,OAAO,CAAC,iBAAiB;YAC5C,OAAO,EAAE,KAAK;YACd,WAAW,EAAE,IAAI;YACjB,eAAe,EAAE,OAAO,CAAC,eAAe;SACzC,CAAC,CAAC;QAEH,IAAI,OAAO,CAAC,qBAAqB,KAAK,OAAO,CAAC,cAAc,EAAE;YAC5D,IAAA,gCAAuB,EACrB,IAAI,EACJ,OAAO,CAAC,qBAAqB,EAC7B,OAAO,CAAC,cAAc,CACvB,CAAC;SACH;QAED,IAAA,iBAAW,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAC3B,IAAA,uBAAiB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACjC,IAAA,gCAA0B,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAE1C,gCAAgC;QAChC,MAAM,yBAAyB,GAAG,IAAA,0CAA0B,EAC1D,qBAAqB,EACrB,WAAW,CACZ,CAAC;QACF,MAAM,yBAAyB,CAAC,IAAI,EAAE;YACpC,IAAI,EAAE,WAAW;YACjB,cAAc,EAAE,IAAI;YACpB,WAAW,EAAE,IAAI;YACjB,MAAM,EAAE,OAAO,CAAC,MAAM;YACtB,SAAS,EAAE,IAAI;YACf,KAAK,EAAE,OAAO,CAAC,KAAK;YACpB,IAAI,EAAE,IAAI;YACV,iBAAiB,EAAE,MAAM;YACzB,OAAO,EAAE,OAAO,CAAC,IAAI;YACrB,UAAU,EAAE,OAAO,CAAC,UAAU;SAC/B,CAAC,CAAC;QACH,IAAA,+BAAyB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAEzC,IAAI,OAAO,CAAC,WAAW,EAAE;YACvB,MAAM,IAAA,uCAAsB,EAAC,IAAI,EAAE;gBACjC,OAAO,EAAE,OAAO,CAAC,IAAI;gBACrB,UAAU,EAAE,IAAI;gBAChB,eAAe,EAAE,OAAO,CAAC,eAAe;aACzC,CAAC,CAAC;SACJ;QAED,IAAI,OAAO,CAAC,cAAc,KAAK,6BAAc,CAAC,IAAI,EAAE;YAClD,IAAA,yBAAmB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;SACpC;QAED,IAAI,OAAO,CAAC,OAAO,EAAE;YACnB,IAAA,gCAA0B,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;SAC3C;QAED,IAAA,gBAAU,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"application.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/application/application.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,122 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.angularInitGenerator = void 0;
|
|
4
|
+
const tslib_1 = require("tslib");
|
|
5
|
+
const cypress_1 = require("@nrwl/cypress");
|
|
6
|
+
const devkit_1 = require("@nrwl/devkit");
|
|
7
|
+
const jest_1 = require("@nrwl/jest");
|
|
8
|
+
const linter_1 = require("@nrwl/linter");
|
|
9
|
+
const run_tasks_in_serial_1 = require("@nrwl/workspace/src/utilities/run-tasks-in-serial");
|
|
10
|
+
const test_runners_1 = require("../../../utils/test-runners");
|
|
11
|
+
const karma_1 = require("../../karma/karma");
|
|
12
|
+
const versions_1 = require("../../../utils/versions");
|
|
13
|
+
function angularInitGenerator(host, rawOptions) {
|
|
14
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
15
|
+
const options = normalizeOptions(rawOptions);
|
|
16
|
+
setDefaults(host, options);
|
|
17
|
+
const depsTask = !options.skipPackageJson
|
|
18
|
+
? updateDependencies(host)
|
|
19
|
+
: () => { };
|
|
20
|
+
const unitTestTask = addUnitTestRunner(host, options);
|
|
21
|
+
const e2eTask = addE2ETestRunner(host, options);
|
|
22
|
+
addGitIgnoreEntry(host, '.angular');
|
|
23
|
+
if (!options.skipFormat) {
|
|
24
|
+
yield (0, devkit_1.formatFiles)(host);
|
|
25
|
+
}
|
|
26
|
+
return (0, run_tasks_in_serial_1.runTasksInSerial)(depsTask, unitTestTask, e2eTask);
|
|
27
|
+
});
|
|
28
|
+
}
|
|
29
|
+
exports.angularInitGenerator = angularInitGenerator;
|
|
30
|
+
function normalizeOptions(options) {
|
|
31
|
+
var _a, _b, _c, _d, _e, _f, _g;
|
|
32
|
+
return {
|
|
33
|
+
e2eTestRunner: (_a = options.e2eTestRunner) !== null && _a !== void 0 ? _a : test_runners_1.E2eTestRunner.Cypress,
|
|
34
|
+
linter: (_b = options.linter) !== null && _b !== void 0 ? _b : linter_1.Linter.EsLint,
|
|
35
|
+
skipFormat: (_c = options.skipFormat) !== null && _c !== void 0 ? _c : false,
|
|
36
|
+
skipInstall: (_d = options.skipInstall) !== null && _d !== void 0 ? _d : false,
|
|
37
|
+
skipPackageJson: (_e = options.skipPackageJson) !== null && _e !== void 0 ? _e : false,
|
|
38
|
+
style: (_f = options.style) !== null && _f !== void 0 ? _f : 'css',
|
|
39
|
+
unitTestRunner: (_g = options.unitTestRunner) !== null && _g !== void 0 ? _g : test_runners_1.UnitTestRunner.Jest,
|
|
40
|
+
};
|
|
41
|
+
}
|
|
42
|
+
function setDefaults(host, options) {
|
|
43
|
+
const workspace = (0, devkit_1.readWorkspaceConfiguration)(host);
|
|
44
|
+
workspace.generators = workspace.generators || {};
|
|
45
|
+
workspace.generators['@nrwl/angular:application'] = Object.assign({ style: options.style, linter: options.linter, unitTestRunner: options.unitTestRunner, e2eTestRunner: options.e2eTestRunner }, (workspace.generators['@nrwl/angular:application'] || {}));
|
|
46
|
+
workspace.generators['@nrwl/angular:library'] = Object.assign({ linter: options.linter, unitTestRunner: options.unitTestRunner }, (workspace.generators['@nrwl/angular:library'] || {}));
|
|
47
|
+
workspace.generators['@nrwl/angular:component'] = Object.assign({ style: options.style }, (workspace.generators['@nrwl/angular:component'] || {}));
|
|
48
|
+
(0, devkit_1.updateWorkspaceConfiguration)(host, workspace);
|
|
49
|
+
}
|
|
50
|
+
function updateDependencies(host) {
|
|
51
|
+
return (0, devkit_1.addDependenciesToPackageJson)(host, {
|
|
52
|
+
'@angular/animations': versions_1.versions.angularV14.angularVersion,
|
|
53
|
+
'@angular/common': versions_1.versions.angularV14.angularVersion,
|
|
54
|
+
'@angular/compiler': versions_1.versions.angularV14.angularVersion,
|
|
55
|
+
'@angular/core': versions_1.versions.angularV14.angularVersion,
|
|
56
|
+
'@angular/forms': versions_1.versions.angularV14.angularVersion,
|
|
57
|
+
'@angular/platform-browser': versions_1.versions.angularV14.angularVersion,
|
|
58
|
+
'@angular/platform-browser-dynamic': versions_1.versions.angularV14.angularVersion,
|
|
59
|
+
'@angular/router': versions_1.versions.angularV14.angularVersion,
|
|
60
|
+
rxjs: versions_1.versions.angularV14.rxjsVersion,
|
|
61
|
+
tslib: versions_1.versions.angularV14.tsLibVersion,
|
|
62
|
+
'zone.js': versions_1.versions.angularV14.zoneJsVersion,
|
|
63
|
+
}, {
|
|
64
|
+
'@angular/cli': versions_1.versions.angularV14.angularDevkitVersion,
|
|
65
|
+
'@angular/compiler-cli': versions_1.versions.angularV14.angularVersion,
|
|
66
|
+
'@angular/language-service': versions_1.versions.angularV14.angularVersion,
|
|
67
|
+
'@angular-devkit/build-angular': versions_1.versions.angularV14.angularDevkitVersion,
|
|
68
|
+
});
|
|
69
|
+
}
|
|
70
|
+
function addUnitTestRunner(host, options) {
|
|
71
|
+
switch (options.unitTestRunner) {
|
|
72
|
+
case test_runners_1.UnitTestRunner.Karma:
|
|
73
|
+
return (0, karma_1.karmaGenerator)(host, { skipPackageJson: options.skipPackageJson });
|
|
74
|
+
case test_runners_1.UnitTestRunner.Jest:
|
|
75
|
+
if (!options.skipPackageJson) {
|
|
76
|
+
(0, devkit_1.addDependenciesToPackageJson)(host, {}, {
|
|
77
|
+
'jest-preset-angular': versions_1.versions.angularV14.jestPresetAngularVersion,
|
|
78
|
+
});
|
|
79
|
+
}
|
|
80
|
+
return (0, jest_1.jestInitGenerator)(host, {
|
|
81
|
+
skipPackageJson: options.skipPackageJson,
|
|
82
|
+
});
|
|
83
|
+
default:
|
|
84
|
+
return () => { };
|
|
85
|
+
}
|
|
86
|
+
}
|
|
87
|
+
function addE2ETestRunner(host, options) {
|
|
88
|
+
switch (options.e2eTestRunner) {
|
|
89
|
+
case test_runners_1.E2eTestRunner.Protractor:
|
|
90
|
+
return !options.skipPackageJson
|
|
91
|
+
? (0, devkit_1.addDependenciesToPackageJson)(host, {}, {
|
|
92
|
+
protractor: versions_1.versions.angularV14.protractorVersion,
|
|
93
|
+
'jasmine-core': versions_1.versions.angularV14.jasmineCoreVersion,
|
|
94
|
+
'jasmine-spec-reporter': versions_1.versions.angularV14.jasmineSpecReporterVersion,
|
|
95
|
+
'ts-node': versions_1.versions.angularV14.tsNodeVersion,
|
|
96
|
+
'@types/jasmine': versions_1.versions.angularV14.typesJasmineVersion,
|
|
97
|
+
'@types/jasminewd2': versions_1.versions.angularV14.typesJasminewd2Version,
|
|
98
|
+
})
|
|
99
|
+
: () => { };
|
|
100
|
+
case test_runners_1.E2eTestRunner.Cypress:
|
|
101
|
+
return (0, cypress_1.cypressInitGenerator)(host, {
|
|
102
|
+
skipPackageJson: options.skipPackageJson,
|
|
103
|
+
});
|
|
104
|
+
default:
|
|
105
|
+
return () => { };
|
|
106
|
+
}
|
|
107
|
+
}
|
|
108
|
+
function addGitIgnoreEntry(host, entry) {
|
|
109
|
+
if (host.exists('.gitignore')) {
|
|
110
|
+
let content = host.read('.gitignore', 'utf-8');
|
|
111
|
+
if (/^\.angular$/gm.test(content)) {
|
|
112
|
+
return;
|
|
113
|
+
}
|
|
114
|
+
content = `${content}\n${entry}\n`;
|
|
115
|
+
host.write('.gitignore', content);
|
|
116
|
+
}
|
|
117
|
+
else {
|
|
118
|
+
devkit_1.logger.warn(`Couldn't find .gitignore file to update`);
|
|
119
|
+
}
|
|
120
|
+
}
|
|
121
|
+
exports.default = angularInitGenerator;
|
|
122
|
+
//# sourceMappingURL=init.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/init/angular-v14/init.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
import { Linter } from '@nrwl/linter';
|
|
2
|
+
import { E2eTestRunner, UnitTestRunner } from '../../utils/test-runners';
|
|
3
|
+
import type { Styles } from '../utils/types';
|
|
4
|
+
|
|
5
|
+
export interface Schema {
|
|
6
|
+
unitTestRunner?: UnitTestRunner;
|
|
7
|
+
e2eTestRunner?: E2eTestRunner;
|
|
8
|
+
skipFormat?: boolean;
|
|
9
|
+
skipInstall?: boolean;
|
|
10
|
+
style?: Styles;
|
|
11
|
+
linter?: Linter;
|
|
12
|
+
skipPackageJson?: boolean;
|
|
13
|
+
}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
import { GeneratorCallback, Tree } from '@nrwl/devkit';
|
|
2
2
|
import { Schema } from './schema';
|
|
3
|
-
export declare function angularInitGenerator(
|
|
3
|
+
export declare function angularInitGenerator(tree: Tree, rawOptions: Schema): Promise<GeneratorCallback>;
|
|
4
4
|
export default angularInitGenerator;
|
|
@@ -10,18 +10,26 @@ const run_tasks_in_serial_1 = require("@nrwl/workspace/src/utilities/run-tasks-i
|
|
|
10
10
|
const test_runners_1 = require("../../utils/test-runners");
|
|
11
11
|
const versions_1 = require("../../utils/versions");
|
|
12
12
|
const karma_1 = require("../karma/karma");
|
|
13
|
-
|
|
13
|
+
const get_generator_directory_for_ng_version_1 = require("../../utils/get-generator-directory-for-ng-version");
|
|
14
|
+
const path_1 = require("path");
|
|
15
|
+
function angularInitGenerator(tree, rawOptions) {
|
|
14
16
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
17
|
+
const generatorDirectory = (0, get_generator_directory_for_ng_version_1.getGeneratorDirectoryForInstalledAngularVersion)(tree);
|
|
18
|
+
if (generatorDirectory) {
|
|
19
|
+
let previousGenerator = yield Promise.resolve().then(() => require((0, path_1.join)(__dirname, generatorDirectory, 'init')));
|
|
20
|
+
yield previousGenerator.default(tree, rawOptions);
|
|
21
|
+
return;
|
|
22
|
+
}
|
|
15
23
|
const options = normalizeOptions(rawOptions);
|
|
16
|
-
setDefaults(
|
|
24
|
+
setDefaults(tree, options);
|
|
17
25
|
const depsTask = !options.skipPackageJson
|
|
18
|
-
? updateDependencies(
|
|
26
|
+
? updateDependencies(tree)
|
|
19
27
|
: () => { };
|
|
20
|
-
const unitTestTask = addUnitTestRunner(
|
|
21
|
-
const e2eTask = addE2ETestRunner(
|
|
22
|
-
addGitIgnoreEntry(
|
|
28
|
+
const unitTestTask = addUnitTestRunner(tree, options);
|
|
29
|
+
const e2eTask = addE2ETestRunner(tree, options);
|
|
30
|
+
addGitIgnoreEntry(tree, '.angular');
|
|
23
31
|
if (!options.skipFormat) {
|
|
24
|
-
yield (0, devkit_1.formatFiles)(
|
|
32
|
+
yield (0, devkit_1.formatFiles)(tree);
|
|
25
33
|
}
|
|
26
34
|
return (0, run_tasks_in_serial_1.runTasksInSerial)(depsTask, unitTestTask, e2eTask);
|
|
27
35
|
});
|
|
@@ -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;
|
|
1
|
+
{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/init/init.ts"],"names":[],"mappings":"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"}
|
|
@@ -19,7 +19,7 @@ function migrateFromAngularCli(tree, rawOptions) {
|
|
|
19
19
|
'@nrwl/workspace': versions_2.nxVersion,
|
|
20
20
|
prettier: versions_1.prettierVersion,
|
|
21
21
|
});
|
|
22
|
-
(0, utilities_1.createNxJson)(tree, options
|
|
22
|
+
(0, utilities_1.createNxJson)(tree, options);
|
|
23
23
|
(0, utilities_1.decorateAngularCli)(tree);
|
|
24
24
|
(0, utilities_1.updateVsCodeRecommendedExtensions)(tree);
|
|
25
25
|
yield (0, utilities_1.updatePrettierConfig)(tree);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"migrate-from-angular-cli.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/ng-add/migrate-from-angular-cli.ts"],"names":[],"mappings":";;;;AACA,yCAOsB;AACtB,2DAAyE;AACzE,iEAAqE;AACrE,mDAAiD;AAEjD,2CAAuD;AAEvD,2CAmBqB;AAErB,SAAsB,qBAAqB,CACzC,IAAU,EACV,UAA4B;;QAE5B,IAAA,6BAAiB,EAAC,IAAI,CAAC,CAAC;QACxB,MAAM,QAAQ,GAAG,IAAA,0BAAc,EAAC,IAAI,CAAC,CAAC;QACtC,MAAM,OAAO,GAAG,IAAA,4BAAgB,EAAC,IAAI,EAAE,UAAU,EAAE,QAAQ,CAAC,CAAC;QAE7D,IAAI,OAAO,CAAC,wBAAwB,EAAE;YACpC,IAAA,qCAA4B,EAC1B,IAAI,EACJ,EAAE,EACF;gBACE,EAAE,EAAE,oBAAS;gBACb,iBAAiB,EAAE,oBAAS;gBAC5B,QAAQ,EAAE,0BAAe;aAC1B,CACF,CAAC;YACF,IAAA,wBAAY,EAAC,IAAI,EAAE,OAAO,
|
|
1
|
+
{"version":3,"file":"migrate-from-angular-cli.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/ng-add/migrate-from-angular-cli.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,7 +3,7 @@ import type { ProjectMigrator } from '../migrators';
|
|
|
3
3
|
import type { GeneratorOptions } from '../schema';
|
|
4
4
|
import type { WorkspaceRootFileTypesInfo } from './types';
|
|
5
5
|
export declare function validateWorkspace(tree: Tree): void;
|
|
6
|
-
export declare function createNxJson(tree: Tree, options: GeneratorOptions
|
|
6
|
+
export declare function createNxJson(tree: Tree, options: GeneratorOptions): void;
|
|
7
7
|
export declare function decorateAngularCli(tree: Tree): void;
|
|
8
8
|
export declare function updateWorkspaceConfigDefaults(tree: Tree): void;
|
|
9
9
|
export declare function updateRootTsConfig(tree: Tree): void;
|
|
@@ -30,9 +30,8 @@ function validateWorkspace(tree) {
|
|
|
30
30
|
- ${errors.join('\n ')}`);
|
|
31
31
|
}
|
|
32
32
|
exports.validateWorkspace = validateWorkspace;
|
|
33
|
-
function createNxJson(tree, options
|
|
33
|
+
function createNxJson(tree, options) {
|
|
34
34
|
var _a;
|
|
35
|
-
const { newProjectRoot = '' } = (0, devkit_1.readJson)(tree, 'angular.json');
|
|
36
35
|
const { npmScope } = options;
|
|
37
36
|
const targets = getWorkspaceCommonTargets(tree);
|
|
38
37
|
(0, devkit_1.writeJson)(tree, 'nx.json', Object.assign(Object.assign({}, (npmScope ? { npmScope } : {})), { affected: {
|
|
@@ -83,9 +82,7 @@ function createNxJson(tree, options, setWorkspaceLayoutAsNewProjectRoot = false)
|
|
|
83
82
|
inputs: ['default', '^production'],
|
|
84
83
|
}
|
|
85
84
|
: undefined,
|
|
86
|
-
}
|
|
87
|
-
? { appsDir: newProjectRoot, libsDir: newProjectRoot }
|
|
88
|
-
: undefined }));
|
|
85
|
+
} }));
|
|
89
86
|
}
|
|
90
87
|
exports.createNxJson = createNxJson;
|
|
91
88
|
function getWorkspaceCommonTargets(tree) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workspace.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/ng-add/utilities/workspace.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"workspace.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/ng-add/utilities/workspace.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.getGeneratorDirectoryForInstalledAngularVersion = void 0;
|
|
4
|
+
const devkit_1 = require("@nrwl/devkit");
|
|
5
|
+
const semver_1 = require("semver");
|
|
6
|
+
function getGeneratorDirectoryForInstalledAngularVersion(tree) {
|
|
7
|
+
var _a;
|
|
8
|
+
const pkgJson = (0, devkit_1.readJson)(tree, 'package.json');
|
|
9
|
+
const angularVersion = pkgJson.dependencies && pkgJson.dependencies['@angular/core'];
|
|
10
|
+
if (!angularVersion) {
|
|
11
|
+
return null;
|
|
12
|
+
}
|
|
13
|
+
const majorAngularVersion = (0, semver_1.major)((0, semver_1.coerce)(angularVersion));
|
|
14
|
+
const directoryDictionary = {
|
|
15
|
+
14: 'angular-v14',
|
|
16
|
+
};
|
|
17
|
+
return (_a = directoryDictionary[majorAngularVersion]) !== null && _a !== void 0 ? _a : null;
|
|
18
|
+
}
|
|
19
|
+
exports.getGeneratorDirectoryForInstalledAngularVersion = getGeneratorDirectoryForInstalledAngularVersion;
|
|
20
|
+
//# sourceMappingURL=get-generator-directory-for-ng-version.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"get-generator-directory-for-ng-version.js","sourceRoot":"","sources":["../../../../../packages/angular/src/utils/get-generator-directory-for-ng-version.ts"],"names":[],"mappings":";;;AACA,yCAAwC;AACxC,mCAAuC;AAEvC,SAAgB,+CAA+C,CAAC,IAAU;;IACxE,MAAM,OAAO,GAAG,IAAA,iBAAQ,EAAC,IAAI,EAAE,cAAc,CAAC,CAAC;IAC/C,MAAM,cAAc,GAClB,OAAO,CAAC,YAAY,IAAI,OAAO,CAAC,YAAY,CAAC,eAAe,CAAC,CAAC;IAEhE,IAAI,CAAC,cAAc,EAAE;QACnB,OAAO,IAAI,CAAC;KACb;IAED,MAAM,mBAAmB,GAAG,IAAA,cAAK,EAAC,IAAA,eAAM,EAAC,cAAc,CAAC,CAAC,CAAC;IAE1D,MAAM,mBAAmB,GAAG;QAC1B,EAAE,EAAE,aAAa;KAClB,CAAC;IAEF,OAAO,MAAA,mBAAmB,CAAC,mBAAmB,CAAC,mCAAI,IAAI,CAAC;AAC1D,CAAC;AAhBD,0GAgBC"}
|
package/src/utils/versions.d.ts
CHANGED
|
@@ -32,3 +32,40 @@ export declare const typesJasmineVersion = "~4.0.0";
|
|
|
32
32
|
export declare const typesJasminewd2Version = "~2.0.3";
|
|
33
33
|
export declare const typesNodeVersion = "16.11.7";
|
|
34
34
|
export declare const jasmineMarblesVersion = "^0.9.2";
|
|
35
|
+
export declare const versions: {
|
|
36
|
+
angularV14: {
|
|
37
|
+
angularVersion: string;
|
|
38
|
+
angularDevkitVersion: string;
|
|
39
|
+
ngPackagrVersion: string;
|
|
40
|
+
ngrxVersion: string;
|
|
41
|
+
rxjsVersion: string;
|
|
42
|
+
zoneJsVersion: string;
|
|
43
|
+
angularJsVersion: string;
|
|
44
|
+
tsLibVersion: string;
|
|
45
|
+
ngUniversalVersion: string;
|
|
46
|
+
corsVersion: string;
|
|
47
|
+
expressVersion: string;
|
|
48
|
+
moduleFederationNodeVersion: string;
|
|
49
|
+
angularEslintVersion: string;
|
|
50
|
+
tailwindVersion: string;
|
|
51
|
+
postcssVersion: string;
|
|
52
|
+
postcssImportVersion: string;
|
|
53
|
+
postcssPresetEnvVersion: string;
|
|
54
|
+
postcssUrlVersion: string;
|
|
55
|
+
autoprefixerVersion: string;
|
|
56
|
+
tsNodeVersion: string;
|
|
57
|
+
jestPresetAngularVersion: string;
|
|
58
|
+
protractorVersion: string;
|
|
59
|
+
karmaVersion: string;
|
|
60
|
+
karmaChromeLauncherVersion: string;
|
|
61
|
+
karmaCoverageVersion: string;
|
|
62
|
+
karmaJasmineVersion: string;
|
|
63
|
+
karmaJasmineHtmlReporterVersion: string;
|
|
64
|
+
jasmineCoreVersion: string;
|
|
65
|
+
jasmineSpecReporterVersion: string;
|
|
66
|
+
typesJasmineVersion: string;
|
|
67
|
+
typesJasminewd2Version: string;
|
|
68
|
+
typesNodeVersion: string;
|
|
69
|
+
jasmineMarblesVersion: string;
|
|
70
|
+
};
|
|
71
|
+
};
|
package/src/utils/versions.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.jasmineMarblesVersion = exports.typesNodeVersion = exports.typesJasminewd2Version = exports.typesJasmineVersion = exports.jasmineSpecReporterVersion = exports.jasmineCoreVersion = exports.karmaJasmineHtmlReporterVersion = exports.karmaJasmineVersion = exports.karmaCoverageVersion = exports.karmaChromeLauncherVersion = exports.karmaVersion = exports.protractorVersion = exports.jestPresetAngularVersion = exports.tsNodeVersion = exports.autoprefixerVersion = exports.postcssUrlVersion = exports.postcssPresetEnvVersion = exports.postcssImportVersion = exports.postcssVersion = exports.tailwindVersion = exports.angularEslintVersion = exports.moduleFederationNodeVersion = exports.expressVersion = exports.corsVersion = exports.ngUniversalVersion = exports.tsLibVersion = exports.angularJsVersion = exports.zoneJsVersion = exports.rxjsVersion = exports.ngrxVersion = exports.ngPackagrVersion = exports.angularDevkitVersion = exports.angularVersion = exports.nxVersion = void 0;
|
|
3
|
+
exports.versions = exports.jasmineMarblesVersion = exports.typesNodeVersion = exports.typesJasminewd2Version = exports.typesJasmineVersion = exports.jasmineSpecReporterVersion = exports.jasmineCoreVersion = exports.karmaJasmineHtmlReporterVersion = exports.karmaJasmineVersion = exports.karmaCoverageVersion = exports.karmaChromeLauncherVersion = exports.karmaVersion = exports.protractorVersion = exports.jestPresetAngularVersion = exports.tsNodeVersion = exports.autoprefixerVersion = exports.postcssUrlVersion = exports.postcssPresetEnvVersion = exports.postcssImportVersion = exports.postcssVersion = exports.tailwindVersion = exports.angularEslintVersion = exports.moduleFederationNodeVersion = exports.expressVersion = exports.corsVersion = exports.ngUniversalVersion = exports.tsLibVersion = exports.angularJsVersion = exports.zoneJsVersion = exports.rxjsVersion = exports.ngrxVersion = exports.ngPackagrVersion = exports.angularDevkitVersion = exports.angularVersion = exports.nxVersion = void 0;
|
|
4
4
|
exports.nxVersion = require('../../package.json').version;
|
|
5
5
|
exports.angularVersion = '~15.0.0';
|
|
6
6
|
exports.angularDevkitVersion = '~15.0.0';
|
|
@@ -35,4 +35,41 @@ exports.typesJasmineVersion = '~4.0.0';
|
|
|
35
35
|
exports.typesJasminewd2Version = '~2.0.3';
|
|
36
36
|
exports.typesNodeVersion = '16.11.7';
|
|
37
37
|
exports.jasmineMarblesVersion = '^0.9.2';
|
|
38
|
+
exports.versions = {
|
|
39
|
+
angularV14: {
|
|
40
|
+
angularVersion: '~14.2.0',
|
|
41
|
+
angularDevkitVersion: '~14.2.0',
|
|
42
|
+
ngPackagrVersion: '~14.2.0',
|
|
43
|
+
ngrxVersion: '~14.0.0',
|
|
44
|
+
rxjsVersion: '~7.5.0',
|
|
45
|
+
zoneJsVersion: '~0.11.4',
|
|
46
|
+
angularJsVersion: '1.7.9',
|
|
47
|
+
tsLibVersion: '^2.3.0',
|
|
48
|
+
ngUniversalVersion: '~14.2.0',
|
|
49
|
+
corsVersion: '~2.8.5',
|
|
50
|
+
expressVersion: '~4.18.2',
|
|
51
|
+
moduleFederationNodeVersion: '~0.9.6',
|
|
52
|
+
angularEslintVersion: '~14.0.4',
|
|
53
|
+
tailwindVersion: '^3.0.2',
|
|
54
|
+
postcssVersion: '^8.4.5',
|
|
55
|
+
postcssImportVersion: '~14.1.0',
|
|
56
|
+
postcssPresetEnvVersion: '~7.5.0',
|
|
57
|
+
postcssUrlVersion: '~10.1.3',
|
|
58
|
+
autoprefixerVersion: '^10.4.0',
|
|
59
|
+
tsNodeVersion: '10.9.1',
|
|
60
|
+
jestPresetAngularVersion: '~12.2.3',
|
|
61
|
+
protractorVersion: '~7.0.0',
|
|
62
|
+
karmaVersion: '~6.4.0',
|
|
63
|
+
karmaChromeLauncherVersion: '~3.1.0',
|
|
64
|
+
karmaCoverageVersion: '~2.2.0',
|
|
65
|
+
karmaJasmineVersion: '~5.1.0',
|
|
66
|
+
karmaJasmineHtmlReporterVersion: '~2.0.0',
|
|
67
|
+
jasmineCoreVersion: '~4.2.0',
|
|
68
|
+
jasmineSpecReporterVersion: '~7.0.0',
|
|
69
|
+
typesJasmineVersion: '~4.0.0',
|
|
70
|
+
typesJasminewd2Version: '~2.0.3',
|
|
71
|
+
typesNodeVersion: '16.11.7',
|
|
72
|
+
jasmineMarblesVersion: '^0.9.2',
|
|
73
|
+
},
|
|
74
|
+
};
|
|
38
75
|
//# sourceMappingURL=versions.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"versions.js","sourceRoot":"","sources":["../../../../../packages/angular/src/utils/versions.ts"],"names":[],"mappings":";;;AAAa,QAAA,SAAS,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC,OAAO,CAAC;AAElD,QAAA,cAAc,GAAG,SAAS,CAAC;AAC3B,QAAA,oBAAoB,GAAG,SAAS,CAAC;AACjC,QAAA,gBAAgB,GAAG,SAAS,CAAC;AAC7B,QAAA,WAAW,GAAG,SAAS,CAAC;AACxB,QAAA,WAAW,GAAG,QAAQ,CAAC;AACvB,QAAA,aAAa,GAAG,SAAS,CAAC;AAC1B,QAAA,gBAAgB,GAAG,OAAO,CAAC;AAC3B,QAAA,YAAY,GAAG,QAAQ,CAAC;AAExB,QAAA,kBAAkB,GAAG,SAAS,CAAC;AAC/B,QAAA,WAAW,GAAG,QAAQ,CAAC;AACvB,QAAA,cAAc,GAAG,SAAS,CAAC;AAC3B,QAAA,2BAA2B,GAAG,QAAQ,CAAC;AAEvC,QAAA,oBAAoB,GAAG,SAAS,CAAC;AACjC,QAAA,eAAe,GAAG,QAAQ,CAAC;AAC3B,QAAA,cAAc,GAAG,QAAQ,CAAC;AAC1B,QAAA,oBAAoB,GAAG,SAAS,CAAC;AACjC,QAAA,uBAAuB,GAAG,QAAQ,CAAC;AACnC,QAAA,iBAAiB,GAAG,SAAS,CAAC;AAC9B,QAAA,mBAAmB,GAAG,SAAS,CAAC;AAChC,QAAA,aAAa,GAAG,QAAQ,CAAC;AAEzB,QAAA,wBAAwB,GAAG,SAAS,CAAC;AACrC,QAAA,iBAAiB,GAAG,QAAQ,CAAC;AAC7B,QAAA,YAAY,GAAG,QAAQ,CAAC;AACxB,QAAA,0BAA0B,GAAG,QAAQ,CAAC;AACtC,QAAA,oBAAoB,GAAG,QAAQ,CAAC;AAChC,QAAA,mBAAmB,GAAG,QAAQ,CAAC;AAC/B,QAAA,+BAA+B,GAAG,QAAQ,CAAC;AAC3C,QAAA,kBAAkB,GAAG,QAAQ,CAAC;AAC9B,QAAA,0BAA0B,GAAG,QAAQ,CAAC;AACtC,QAAA,mBAAmB,GAAG,QAAQ,CAAC;AAC/B,QAAA,sBAAsB,GAAG,QAAQ,CAAC;AAClC,QAAA,gBAAgB,GAAG,SAAS,CAAC;AAC7B,QAAA,qBAAqB,GAAG,QAAQ,CAAC"}
|
|
1
|
+
{"version":3,"file":"versions.js","sourceRoot":"","sources":["../../../../../packages/angular/src/utils/versions.ts"],"names":[],"mappings":";;;AAAa,QAAA,SAAS,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC,OAAO,CAAC;AAElD,QAAA,cAAc,GAAG,SAAS,CAAC;AAC3B,QAAA,oBAAoB,GAAG,SAAS,CAAC;AACjC,QAAA,gBAAgB,GAAG,SAAS,CAAC;AAC7B,QAAA,WAAW,GAAG,SAAS,CAAC;AACxB,QAAA,WAAW,GAAG,QAAQ,CAAC;AACvB,QAAA,aAAa,GAAG,SAAS,CAAC;AAC1B,QAAA,gBAAgB,GAAG,OAAO,CAAC;AAC3B,QAAA,YAAY,GAAG,QAAQ,CAAC;AAExB,QAAA,kBAAkB,GAAG,SAAS,CAAC;AAC/B,QAAA,WAAW,GAAG,QAAQ,CAAC;AACvB,QAAA,cAAc,GAAG,SAAS,CAAC;AAC3B,QAAA,2BAA2B,GAAG,QAAQ,CAAC;AAEvC,QAAA,oBAAoB,GAAG,SAAS,CAAC;AACjC,QAAA,eAAe,GAAG,QAAQ,CAAC;AAC3B,QAAA,cAAc,GAAG,QAAQ,CAAC;AAC1B,QAAA,oBAAoB,GAAG,SAAS,CAAC;AACjC,QAAA,uBAAuB,GAAG,QAAQ,CAAC;AACnC,QAAA,iBAAiB,GAAG,SAAS,CAAC;AAC9B,QAAA,mBAAmB,GAAG,SAAS,CAAC;AAChC,QAAA,aAAa,GAAG,QAAQ,CAAC;AAEzB,QAAA,wBAAwB,GAAG,SAAS,CAAC;AACrC,QAAA,iBAAiB,GAAG,QAAQ,CAAC;AAC7B,QAAA,YAAY,GAAG,QAAQ,CAAC;AACxB,QAAA,0BAA0B,GAAG,QAAQ,CAAC;AACtC,QAAA,oBAAoB,GAAG,QAAQ,CAAC;AAChC,QAAA,mBAAmB,GAAG,QAAQ,CAAC;AAC/B,QAAA,+BAA+B,GAAG,QAAQ,CAAC;AAC3C,QAAA,kBAAkB,GAAG,QAAQ,CAAC;AAC9B,QAAA,0BAA0B,GAAG,QAAQ,CAAC;AACtC,QAAA,mBAAmB,GAAG,QAAQ,CAAC;AAC/B,QAAA,sBAAsB,GAAG,QAAQ,CAAC;AAClC,QAAA,gBAAgB,GAAG,SAAS,CAAC;AAC7B,QAAA,qBAAqB,GAAG,QAAQ,CAAC;AAEjC,QAAA,QAAQ,GAAG;IACtB,UAAU,EAAE;QACV,cAAc,EAAE,SAAS;QACzB,oBAAoB,EAAE,SAAS;QAC/B,gBAAgB,EAAE,SAAS;QAC3B,WAAW,EAAE,SAAS;QACtB,WAAW,EAAE,QAAQ;QACrB,aAAa,EAAE,SAAS;QACxB,gBAAgB,EAAE,OAAO;QACzB,YAAY,EAAE,QAAQ;QACtB,kBAAkB,EAAE,SAAS;QAC7B,WAAW,EAAE,QAAQ;QACrB,cAAc,EAAE,SAAS;QACzB,2BAA2B,EAAE,QAAQ;QACrC,oBAAoB,EAAE,SAAS;QAC/B,eAAe,EAAE,QAAQ;QACzB,cAAc,EAAE,QAAQ;QACxB,oBAAoB,EAAE,SAAS;QAC/B,uBAAuB,EAAE,QAAQ;QACjC,iBAAiB,EAAE,SAAS;QAC5B,mBAAmB,EAAE,SAAS;QAC9B,aAAa,EAAE,QAAQ;QACvB,wBAAwB,EAAE,SAAS;QACnC,iBAAiB,EAAE,QAAQ;QAC3B,YAAY,EAAE,QAAQ;QACtB,0BAA0B,EAAE,QAAQ;QACpC,oBAAoB,EAAE,QAAQ;QAC9B,mBAAmB,EAAE,QAAQ;QAC7B,+BAA+B,EAAE,QAAQ;QACzC,kBAAkB,EAAE,QAAQ;QAC5B,0BAA0B,EAAE,QAAQ;QACpC,mBAAmB,EAAE,QAAQ;QAC7B,sBAAsB,EAAE,QAAQ;QAChC,gBAAgB,EAAE,SAAS;QAC3B,qBAAqB,EAAE,QAAQ;KAChC;CACF,CAAC"}
|