@o3r/workspace 11.0.0-next.0 → 11.0.0-next.1
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/README.md +3 -0
- package/migration.json +5 -1
- package/package.json +63 -57
- package/schematics/application/index.d.ts +1 -1
- package/schematics/application/index.d.ts.map +1 -1
- package/schematics/application/index.js +29 -8
- package/schematics/application/index.js.map +1 -1
- package/schematics/application/schema.d.ts +2 -0
- package/schematics/application/schema.d.ts.map +1 -1
- package/schematics/application/schema.json +5 -0
- package/schematics/library/index.d.ts +1 -1
- package/schematics/library/index.d.ts.map +1 -1
- package/schematics/library/index.js +32 -10
- package/schematics/library/index.js.map +1 -1
- package/schematics/library/rules/rules.ng.d.ts.map +1 -1
- package/schematics/library/rules/rules.ng.js +20 -31
- package/schematics/library/rules/rules.ng.js.map +1 -1
- package/schematics/library/rules/rules.nx.js.map +1 -1
- package/schematics/library/schema.d.ts +2 -0
- package/schematics/library/schema.d.ts.map +1 -1
- package/schematics/library/schema.json +5 -0
- package/schematics/ng-add/helpers/gitignore-update.js.map +1 -1
- package/schematics/ng-add/helpers/linter.js +3 -3
- package/schematics/ng-add/helpers/linter.js.map +1 -1
- package/schematics/ng-add/helpers/npm-workspace.js.map +1 -1
- package/schematics/ng-add/helpers/renovate/index.js.map +1 -1
- package/schematics/ng-add/helpers/renovate/templates/__dot__renovaterc.json.template +5 -32
- package/schematics/ng-add/index.d.ts +2 -2
- package/schematics/ng-add/index.d.ts.map +1 -1
- package/schematics/ng-add/index.js +6 -2
- package/schematics/ng-add/index.js.map +1 -1
- package/schematics/ng-add/project-setup.d.ts +1 -1
- package/schematics/ng-add/project-setup.d.ts.map +1 -1
- package/schematics/ng-add/project-setup.js +18 -14
- package/schematics/ng-add/project-setup.js.map +1 -1
- package/schematics/ng-add/schema.d.ts +2 -0
- package/schematics/ng-add/schema.d.ts.map +1 -1
- package/schematics/ng-add/schema.json +5 -0
- package/schematics/ng-update/index.d.ts +5 -1
- package/schematics/ng-update/index.d.ts.map +1 -1
- package/schematics/ng-update/index.js +19 -0
- package/schematics/ng-update/index.js.map +1 -1
- package/schematics/ng-update/v10.1/add-presets-renovate.d.ts +3 -0
- package/schematics/ng-update/v10.1/add-presets-renovate.d.ts.map +1 -0
- package/schematics/ng-update/v10.1/add-presets-renovate.js +24 -0
- package/schematics/ng-update/v10.1/add-presets-renovate.js.map +1 -0
- package/schematics/rule-factories/project-configs.d.ts.map +1 -1
- package/schematics/rule-factories/project-configs.js +1 -0
- package/schematics/rule-factories/project-configs.js.map +1 -1
- package/schematics/sdk/index.d.ts +1 -1
- package/schematics/sdk/index.d.ts.map +1 -1
- package/schematics/sdk/index.js +6 -2
- package/schematics/sdk/index.js.map +1 -1
- package/schematics/sdk/rules/clean-standalone.rule.d.ts +1 -1
- package/schematics/sdk/rules/clean-standalone.rule.d.ts.map +1 -1
- package/schematics/sdk/rules/clean-standalone.rule.js +32 -19
- package/schematics/sdk/rules/clean-standalone.rule.js.map +1 -1
- package/schematics/sdk/rules/rules.ng.js.map +1 -1
- package/schematics/sdk/rules/update-ts-paths.rule.d.ts.map +1 -1
- package/schematics/sdk/rules/update-ts-paths.rule.js +1 -0
- package/schematics/sdk/rules/update-ts-paths.rule.js.map +1 -1
- package/schematics/sdk/templates/jest.config.js.template +2 -2
- package/src/cli/set-version.cjs.map +1 -1
- package/src/utils/jest.helpers.js.map +1 -1
- package/schematics/library/templates/ng/.eslintrc.js.template +0 -19
- package/schematics/library/templates/ng/tsconfig.eslint.json.template +0 -8
package/README.md
CHANGED
|
@@ -5,6 +5,9 @@
|
|
|
5
5
|
|
|
6
6
|
## Description
|
|
7
7
|
|
|
8
|
+
[](https://www.npmjs.com/package/@o3r/workspace)
|
|
9
|
+
[](https://www.npmjs.com/package/@o3r/workspace)
|
|
10
|
+
|
|
8
11
|
This package is an [Otter Framework](https://github.com/AmadeusITGroup/otter) Module providing tools at workspace level.
|
|
9
12
|
|
|
10
13
|
This packages provides several [Schematics](#schematics) and [CLIs](#scripts) used to accelerate the development and support maintenance of workspace's packages.
|
package/migration.json
CHANGED
|
@@ -1,6 +1,10 @@
|
|
|
1
1
|
{
|
|
2
2
|
"$schema": "https://raw.githubusercontent.com/angular/angular-cli/master/packages/angular_devkit/schematics/collection-schema.json",
|
|
3
3
|
"schematics": {
|
|
4
|
-
|
|
4
|
+
"migration-v10_0": {
|
|
5
|
+
"version": "10.1.0-alpha.0",
|
|
6
|
+
"description": "Updates of @o3r/workspace to v10.1.*",
|
|
7
|
+
"factory": "./schematics/ng-update/index#updateV10_1"
|
|
8
|
+
}
|
|
5
9
|
}
|
|
6
10
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,9 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@o3r/workspace",
|
|
3
|
-
"version": "11.0.0-next.
|
|
3
|
+
"version": "11.0.0-next.1",
|
|
4
|
+
"publishConfig": {
|
|
5
|
+
"access": "public"
|
|
6
|
+
},
|
|
4
7
|
"description": "Workspace tooling of the Otter Framework",
|
|
5
8
|
"keywords": [
|
|
6
9
|
"workspace",
|
|
@@ -19,15 +22,15 @@
|
|
|
19
22
|
"main": "./src/public_api.js",
|
|
20
23
|
"types": "./src/public_api.d.ts",
|
|
21
24
|
"peerDependencies": {
|
|
22
|
-
"@angular-devkit/architect": "~0.
|
|
23
|
-
"@angular-devkit/core": "~17.
|
|
24
|
-
"@angular-devkit/schematics": "~17.
|
|
25
|
-
"@angular/cli": "~17.
|
|
26
|
-
"@angular/common": "~17.0
|
|
27
|
-
"@angular/compiler-cli": "~17.0
|
|
28
|
-
"@angular/core": "~17.0
|
|
29
|
-
"@schematics/angular": "~17.
|
|
30
|
-
"typescript": "~5.
|
|
25
|
+
"@angular-devkit/architect": "~0.1703.0",
|
|
26
|
+
"@angular-devkit/core": "~17.3.0",
|
|
27
|
+
"@angular-devkit/schematics": "~17.3.0",
|
|
28
|
+
"@angular/cli": "~17.3.0",
|
|
29
|
+
"@angular/common": "~17.3.0",
|
|
30
|
+
"@angular/compiler-cli": "~17.3.0",
|
|
31
|
+
"@angular/core": "~17.3.0",
|
|
32
|
+
"@schematics/angular": "~17.3.0",
|
|
33
|
+
"typescript": "~5.4.2"
|
|
31
34
|
},
|
|
32
35
|
"peerDependenciesMeta": {
|
|
33
36
|
"@angular/cli": {
|
|
@@ -35,75 +38,78 @@
|
|
|
35
38
|
}
|
|
36
39
|
},
|
|
37
40
|
"dependencies": {
|
|
38
|
-
"@o3r/schematics": "^11.0.0-next.
|
|
39
|
-
"commander": "^
|
|
41
|
+
"@o3r/schematics": "^11.0.0-next.1",
|
|
42
|
+
"commander": "^12.0.0",
|
|
40
43
|
"globby": "^11.1.0",
|
|
41
44
|
"semver": "^7.5.2",
|
|
42
|
-
"tslib": "^2.
|
|
45
|
+
"tslib": "^2.6.2",
|
|
43
46
|
"uuid": "^9.0.0",
|
|
44
47
|
"winston": "^3.8.2"
|
|
45
48
|
},
|
|
46
49
|
"devDependencies": {
|
|
47
|
-
"@angular-devkit/architect": "~0.
|
|
48
|
-
"@angular-devkit/build-angular": "~17.0
|
|
49
|
-
"@angular-devkit/core": "~17.0
|
|
50
|
-
"@angular-devkit/schematics": "~17.0
|
|
51
|
-
"@angular-eslint/eslint-plugin": "~17.
|
|
52
|
-
"@angular/
|
|
53
|
-
"@angular/
|
|
54
|
-
"@angular/
|
|
55
|
-
"@angular/compiler
|
|
56
|
-
"@angular/
|
|
57
|
-
"@angular/
|
|
58
|
-
"@angular/platform-browser
|
|
59
|
-
"@angular/
|
|
60
|
-
"@
|
|
61
|
-
"@babel/
|
|
62
|
-
"@
|
|
63
|
-
"@ngrx/
|
|
64
|
-
"@
|
|
65
|
-
"@nx/eslint
|
|
66
|
-
"@nx/
|
|
67
|
-
"@nx/
|
|
68
|
-
"@
|
|
69
|
-
"@o3r/
|
|
70
|
-
"@o3r/
|
|
71
|
-
"@o3r/
|
|
72
|
-
"@o3r/
|
|
73
|
-
"@
|
|
50
|
+
"@angular-devkit/architect": "~0.1703.0",
|
|
51
|
+
"@angular-devkit/build-angular": "~17.3.0",
|
|
52
|
+
"@angular-devkit/core": "~17.3.0",
|
|
53
|
+
"@angular-devkit/schematics": "~17.3.0",
|
|
54
|
+
"@angular-eslint/eslint-plugin": "~17.3.0",
|
|
55
|
+
"@angular/animations": "~17.3.0",
|
|
56
|
+
"@angular/cli": "~17.3.0",
|
|
57
|
+
"@angular/common": "~17.3.0",
|
|
58
|
+
"@angular/compiler": "~17.3.0",
|
|
59
|
+
"@angular/compiler-cli": "~17.3.0",
|
|
60
|
+
"@angular/core": "~17.3.0",
|
|
61
|
+
"@angular/platform-browser": "~17.3.0",
|
|
62
|
+
"@angular/platform-browser-dynamic": "~17.3.0",
|
|
63
|
+
"@angular/router": "~17.3.0",
|
|
64
|
+
"@babel/core": "~7.24.0",
|
|
65
|
+
"@babel/preset-typescript": "~7.24.0",
|
|
66
|
+
"@ngrx/entity": "~17.2.0",
|
|
67
|
+
"@ngrx/store": "~17.2.0",
|
|
68
|
+
"@nx/eslint": "~18.3.0",
|
|
69
|
+
"@nx/eslint-plugin": "~18.3.0",
|
|
70
|
+
"@nx/jest": "~18.3.0",
|
|
71
|
+
"@nx/js": "~18.3.0",
|
|
72
|
+
"@o3r/build-helpers": "^11.0.0-next.1",
|
|
73
|
+
"@o3r/core": "^11.0.0-next.1",
|
|
74
|
+
"@o3r/eslint-plugin": "^11.0.0-next.1",
|
|
75
|
+
"@o3r/schematics": "^11.0.0-next.1",
|
|
76
|
+
"@o3r/test-helpers": "^11.0.0-next.1",
|
|
77
|
+
"@schematics/angular": "~17.3.0",
|
|
78
|
+
"@stylistic/eslint-plugin-ts": "^1.5.4",
|
|
74
79
|
"@types/jest": "~29.5.2",
|
|
75
80
|
"@types/minimist": "^1.2.2",
|
|
76
81
|
"@types/node": "^20.0.0",
|
|
77
82
|
"@types/pid-from-port": "^1.1.0",
|
|
78
83
|
"@types/semver": "^7.3.13",
|
|
79
84
|
"@types/uuid": "^9.0.0",
|
|
80
|
-
"@typescript-eslint/eslint-plugin": "
|
|
81
|
-
"@typescript-eslint/parser": "^
|
|
85
|
+
"@typescript-eslint/eslint-plugin": "^7.2.0",
|
|
86
|
+
"@typescript-eslint/parser": "^7.2.0",
|
|
82
87
|
"cpy-cli": "^5.0.0",
|
|
83
|
-
"eslint": "^8.
|
|
84
|
-
"eslint-import-resolver-node": "^0.3.
|
|
85
|
-
"eslint-plugin-jest": "~27.
|
|
86
|
-
"eslint-plugin-jsdoc": "~48.
|
|
88
|
+
"eslint": "^8.57.0",
|
|
89
|
+
"eslint-import-resolver-node": "^0.3.9",
|
|
90
|
+
"eslint-plugin-jest": "~27.9.0",
|
|
91
|
+
"eslint-plugin-jsdoc": "~48.2.1",
|
|
87
92
|
"eslint-plugin-prefer-arrow": "~1.2.3",
|
|
88
|
-
"eslint-plugin-unicorn": "^
|
|
93
|
+
"eslint-plugin-unicorn": "^51.0.1",
|
|
89
94
|
"jest": "~29.7.0",
|
|
90
95
|
"jest-environment-jsdom": "~29.7.0",
|
|
91
96
|
"jest-junit": "~16.0.0",
|
|
92
|
-
"jest-preset-angular": "~
|
|
97
|
+
"jest-preset-angular": "~14.0.3",
|
|
93
98
|
"minimist": "^1.2.6",
|
|
94
|
-
"nx": "~
|
|
99
|
+
"nx": "~18.3.0",
|
|
95
100
|
"pid-from-port": "^1.1.3",
|
|
96
101
|
"rxjs": "^7.8.1",
|
|
97
|
-
"ts-jest": "~29.1.
|
|
98
|
-
"
|
|
99
|
-
"
|
|
102
|
+
"ts-jest": "~29.1.2",
|
|
103
|
+
"ts-node": "~10.9.2",
|
|
104
|
+
"type-fest": "^4.10.2",
|
|
105
|
+
"typescript": "~5.4.2",
|
|
100
106
|
"zone.js": "~0.14.2"
|
|
101
107
|
},
|
|
102
108
|
"generatorDependencies": {
|
|
103
|
-
"@angular/material": "~17.0
|
|
104
|
-
"@ngrx/router-store": "~17.
|
|
105
|
-
"@ngrx/effects": "~17.
|
|
106
|
-
"@ngrx/store-devtools": "~17.
|
|
109
|
+
"@angular/material": "~17.3.0",
|
|
110
|
+
"@ngrx/router-store": "~17.2.0",
|
|
111
|
+
"@ngrx/effects": "~17.2.0",
|
|
112
|
+
"@ngrx/store-devtools": "~17.2.0"
|
|
107
113
|
},
|
|
108
114
|
"engines": {
|
|
109
115
|
"node": ">=18.0.0"
|
|
@@ -114,7 +120,7 @@
|
|
|
114
120
|
"migrations": "./migration.json"
|
|
115
121
|
},
|
|
116
122
|
"bin": {
|
|
117
|
-
"o3r-set-version": "src/cli/set-version.cjs"
|
|
123
|
+
"o3r-set-version": "./src/cli/set-version.cjs"
|
|
118
124
|
},
|
|
119
125
|
"type": "commonjs",
|
|
120
126
|
"contributors": [
|
|
@@ -4,5 +4,5 @@ import type { NgGenerateApplicationSchema } from './schema';
|
|
|
4
4
|
* Add an Otter application to a monorepo
|
|
5
5
|
* @param options Schematic options
|
|
6
6
|
*/
|
|
7
|
-
export declare
|
|
7
|
+
export declare const generateApplication: (options: NgGenerateApplicationSchema) => Rule;
|
|
8
8
|
//# sourceMappingURL=index.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/application/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAwF,IAAI,EAAqC,MAAM,4BAA4B,CAAC;AAG3K,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/application/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAwF,IAAI,EAAqC,MAAM,4BAA4B,CAAC;AAG3K,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,UAAU,CAAC;AAmG5D;;;GAGG;AACH,eAAO,MAAM,mBAAmB,gDAA+D,CAAC"}
|
|
@@ -4,14 +4,16 @@ exports.generateApplication = void 0;
|
|
|
4
4
|
const schematics_1 = require("@angular-devkit/schematics");
|
|
5
5
|
const schematics_2 = require("@o3r/schematics");
|
|
6
6
|
const path = require("node:path");
|
|
7
|
-
const tasks_1 = require("@angular-devkit/schematics/tasks");
|
|
8
7
|
const schema_1 = require("@schematics/angular/application/schema");
|
|
9
8
|
const index_1 = require("../rule-factories/index");
|
|
9
|
+
const dependencies_1 = require("@schematics/angular/utility/dependencies");
|
|
10
|
+
const fs = require("node:fs");
|
|
10
11
|
/**
|
|
11
12
|
* Add an Otter application to a monorepo
|
|
12
13
|
* @param options Schematic options
|
|
13
14
|
*/
|
|
14
|
-
function
|
|
15
|
+
function generateApplicationFn(options) {
|
|
16
|
+
const ownPackageJsonContent = JSON.parse(fs.readFileSync(path.resolve(__dirname, '..', '..', 'package.json'), { encoding: 'utf-8' }));
|
|
15
17
|
const packageJsonName = schematics_1.strings.dasherize(options.name);
|
|
16
18
|
const cleanName = packageJsonName.replace(/^@/, '').replaceAll(/\//g, '-');
|
|
17
19
|
const addProjectSpecificFiles = (targetPath, rootDependencies) => {
|
|
@@ -50,21 +52,40 @@ function generateApplication(options) {
|
|
|
50
52
|
return Object.keys(schemaOptions);
|
|
51
53
|
};
|
|
52
54
|
const angularOptions = getOptions(angularAppSchema);
|
|
55
|
+
const dependencies = {
|
|
56
|
+
// eslint-disable-next-line @typescript-eslint/naming-convention
|
|
57
|
+
'@o3r/core': {
|
|
58
|
+
inManifest: [
|
|
59
|
+
{
|
|
60
|
+
range: `${options.exactO3rVersion ? '' : '~'}${ownPackageJsonContent.version}`,
|
|
61
|
+
types: [dependencies_1.NodeDependencyType.Default]
|
|
62
|
+
}
|
|
63
|
+
],
|
|
64
|
+
ngAddOptions: { exactO3rVersion: options.exactO3rVersion }
|
|
65
|
+
}
|
|
66
|
+
};
|
|
53
67
|
return (0, schematics_1.chain)([
|
|
54
68
|
(0, schematics_1.externalSchematic)('@schematics/angular', 'application', {
|
|
55
69
|
...Object.entries(extendedOptions).reduce((acc, [key, value]) => (angularOptions.includes(key) ? { ...acc, [key]: value } : acc), {}),
|
|
56
|
-
name:
|
|
70
|
+
name: cleanName,
|
|
57
71
|
projectRoot,
|
|
58
72
|
style: schema_1.Style.Scss
|
|
59
73
|
}),
|
|
60
74
|
addProjectSpecificFiles(targetPath, rootDependencies),
|
|
61
|
-
(0, index_1.updateProjectTsConfig)(targetPath, 'tsconfig.app.json'),
|
|
62
|
-
(
|
|
63
|
-
|
|
64
|
-
|
|
75
|
+
(0, index_1.updateProjectTsConfig)(targetPath, 'tsconfig.app.json', { updateInputFiles: true }),
|
|
76
|
+
(0, schematics_2.setupDependencies)({
|
|
77
|
+
dependencies,
|
|
78
|
+
skipInstall: options.skipInstall,
|
|
79
|
+
ngAddToRun: Object.keys(dependencies),
|
|
80
|
+
projectName: cleanName
|
|
81
|
+
})
|
|
65
82
|
])(tree, context);
|
|
66
83
|
};
|
|
67
84
|
return ngCliUpdate;
|
|
68
85
|
}
|
|
69
|
-
|
|
86
|
+
/**
|
|
87
|
+
* Add an Otter application to a monorepo
|
|
88
|
+
* @param options Schematic options
|
|
89
|
+
*/
|
|
90
|
+
exports.generateApplication = (0, schematics_2.createSchematicWithMetricsIfInstalled)(generateApplicationFn);
|
|
70
91
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/application/index.ts"],"names":[],"mappings":";;;AAAA,2DAA2K;AAC3K,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/application/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,5 +10,7 @@ export interface NgGenerateApplicationSchema extends SchematicOptionObject {
|
|
|
10
10
|
skipLinter: boolean;
|
|
11
11
|
/** Do not install dependency packages. */
|
|
12
12
|
skipInstall: boolean;
|
|
13
|
+
/** Use a pinned version for otter packages */
|
|
14
|
+
exactO3rVersion?: boolean;
|
|
13
15
|
}
|
|
14
16
|
//# sourceMappingURL=schema.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../schematics/application/schema.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AAE7D,MAAM,WAAW,2BAA4B,SAAQ,qBAAqB;IACxE,uBAAuB;IACvB,IAAI,EAAE,MAAM,CAAC;IAEb,mDAAmD;IACnD,IAAI,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAE1B,yCAAyC;IACzC,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAEjC,8BAA8B;IAC9B,UAAU,EAAE,OAAO,CAAC;IAEpB,0CAA0C;IAC1C,WAAW,EAAE,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../schematics/application/schema.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AAE7D,MAAM,WAAW,2BAA4B,SAAQ,qBAAqB;IACxE,uBAAuB;IACvB,IAAI,EAAE,MAAM,CAAC;IAEb,mDAAmD;IACnD,IAAI,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAE1B,yCAAyC;IACzC,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAEjC,8BAA8B;IAC9B,UAAU,EAAE,OAAO,CAAC;IAEpB,0CAA0C;IAC1C,WAAW,EAAE,OAAO,CAAC;IAErB,8CAA8C;IAC9C,eAAe,CAAC,EAAE,OAAO,CAAC;CAC3B"}
|
|
@@ -46,6 +46,11 @@
|
|
|
46
46
|
"description": "Creates an application with Server-Side Rendering (SSR) and Static Site Generation (SSG/Prerendering) enabled.",
|
|
47
47
|
"type": "boolean",
|
|
48
48
|
"default": false
|
|
49
|
+
},
|
|
50
|
+
"exactO3rVersion": {
|
|
51
|
+
"type": "boolean",
|
|
52
|
+
"description": "Use a pinned version for otter packages",
|
|
53
|
+
"default": false
|
|
49
54
|
}
|
|
50
55
|
},
|
|
51
56
|
"required": ["name"],
|
|
@@ -4,5 +4,5 @@ import { NgGenerateModuleSchema } from './schema';
|
|
|
4
4
|
* Add an Otter compatible module to a monorepo
|
|
5
5
|
* @param options Schematic options
|
|
6
6
|
*/
|
|
7
|
-
export declare
|
|
7
|
+
export declare const generateModule: (options: NgGenerateModuleSchema) => Rule;
|
|
8
8
|
//# sourceMappingURL=index.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/library/index.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/library/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,IAAI,EAAW,MAAM,4BAA4B,CAAC;AAaxE,OAAO,EAAE,sBAAsB,EAAE,MAAM,UAAU,CAAC;AA0DlD;;;GAGG;AACH,eAAO,MAAM,cAAc,2CAA0D,CAAC"}
|
|
@@ -2,17 +2,20 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.generateModule = void 0;
|
|
4
4
|
const schematics_1 = require("@angular-devkit/schematics");
|
|
5
|
+
const tasks_1 = require("@angular-devkit/schematics/tasks");
|
|
5
6
|
const path = require("node:path");
|
|
6
7
|
const schematics_2 = require("@o3r/schematics");
|
|
7
|
-
const tasks_1 = require("@angular-devkit/schematics/tasks");
|
|
8
8
|
const rules_nx_1 = require("./rules/rules.nx");
|
|
9
9
|
const rules_ng_1 = require("./rules/rules.ng");
|
|
10
|
+
const dependencies_1 = require("@schematics/angular/utility/dependencies");
|
|
11
|
+
const fs = require("node:fs");
|
|
10
12
|
/**
|
|
11
13
|
* Add an Otter compatible module to a monorepo
|
|
12
14
|
* @param options Schematic options
|
|
13
15
|
*/
|
|
14
|
-
function
|
|
16
|
+
function generateModuleFn(options) {
|
|
15
17
|
return (tree, context) => {
|
|
18
|
+
const ownPackageJsonContent = JSON.parse(fs.readFileSync(path.resolve(__dirname, '..', '..', 'package.json'), { encoding: 'utf-8' }));
|
|
16
19
|
const packageJsonName = schematics_1.strings.dasherize(options.name);
|
|
17
20
|
const cleanName = packageJsonName.replace(/^@/, '').replaceAll(/\//g, '-');
|
|
18
21
|
const isNx = (0, schematics_2.isNxContext)(tree);
|
|
@@ -24,17 +27,36 @@ function generateModule(options) {
|
|
|
24
27
|
/** Path to the folder where generate the new module */
|
|
25
28
|
const targetPath = path.posix.resolve('/', options.path || defaultRoot, cleanName);
|
|
26
29
|
const extendedOptions = { ...options, targetPath, name: cleanName, packageJsonName: packageJsonName };
|
|
30
|
+
const dependencies = {
|
|
31
|
+
// eslint-disable-next-line @typescript-eslint/naming-convention
|
|
32
|
+
'@o3r/core': {
|
|
33
|
+
inManifest: [
|
|
34
|
+
{
|
|
35
|
+
range: `${options.exactO3rVersion ? '' : '~'}${ownPackageJsonContent.version}`,
|
|
36
|
+
types: [dependencies_1.NodeDependencyType.Dev]
|
|
37
|
+
}
|
|
38
|
+
],
|
|
39
|
+
ngAddOptions: { exactO3rVersion: options.exactO3rVersion }
|
|
40
|
+
}
|
|
41
|
+
};
|
|
27
42
|
return (0, schematics_1.chain)([
|
|
28
43
|
isNx ? (0, rules_nx_1.nxGenerateModule)(extendedOptions) : (0, rules_ng_1.ngGenerateModule)(extendedOptions),
|
|
29
|
-
(
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
44
|
+
(0, schematics_2.setupDependencies)({
|
|
45
|
+
dependencies,
|
|
46
|
+
skipInstall: options.skipInstall,
|
|
47
|
+
ngAddToRun: Object.keys(dependencies),
|
|
48
|
+
projectName: options.name,
|
|
49
|
+
scheduleTaskCallback: (ids) => {
|
|
50
|
+
context.addTask(new tasks_1.RunSchematicTask('@o3r/core', 'ng-add-create', { name: extendedOptions.name, projectName: extendedOptions.name, path: targetPath }), ids);
|
|
51
|
+
}
|
|
52
|
+
}),
|
|
53
|
+
options.skipLinter ? (0, schematics_1.noop)() : (0, schematics_2.applyEsLintFix)()
|
|
36
54
|
])(tree, context);
|
|
37
55
|
};
|
|
38
56
|
}
|
|
39
|
-
|
|
57
|
+
/**
|
|
58
|
+
* Add an Otter compatible module to a monorepo
|
|
59
|
+
* @param options Schematic options
|
|
60
|
+
*/
|
|
61
|
+
exports.generateModule = (0, schematics_2.createSchematicWithMetricsIfInstalled)(generateModuleFn);
|
|
40
62
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/library/index.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/library/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rules.ng.d.ts","sourceRoot":"","sources":["../../../../schematics/library/rules/rules.ng.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,WAAW,CAAC;AAExD,OAAO,EAAwF,IAAI,EAAiB,MAAM,4BAA4B,CAAC;AAMvJ;;;;GAIG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,sBAAsB,GAAG;IAAE,UAAU,EAAE,MAAM,CAAC;IAAC,eAAe,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,
|
|
1
|
+
{"version":3,"file":"rules.ng.d.ts","sourceRoot":"","sources":["../../../../schematics/library/rules/rules.ng.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,WAAW,CAAC;AAExD,OAAO,EAAwF,IAAI,EAAiB,MAAM,4BAA4B,CAAC;AAMvJ;;;;GAIG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,sBAAsB,GAAG;IAAE,UAAU,EAAE,MAAM,CAAC;IAAC,eAAe,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CAqFxH"}
|
|
@@ -26,11 +26,9 @@ function ngGenerateModule(options) {
|
|
|
26
26
|
const templateNg = (0, schematics_2.apply)((0, schematics_2.url)('./templates/ng'), [
|
|
27
27
|
(0, schematics_2.template)({
|
|
28
28
|
...options,
|
|
29
|
-
runner: process.env.npm_execpath && /[\\/][^\\/]yarn[^\\/]js$/.test(process.env.npm_execpath) ? 'yarn run' : 'npm run',
|
|
30
29
|
tsconfigSpecPath: (0, schematics_1.findConfigFileRelativePath)(tree, ['tsconfig.test.json', 'tsconfig.spec.json', 'tsconfig.jest.json', 'tsconfig.jasmine.json', 'tsconfig.base.json', 'tsconfig.json'], options.targetPath),
|
|
31
30
|
tsconfigBasePath: (0, schematics_1.findConfigFileRelativePath)(tree, ['tsconfig.base.json', 'tsconfig.json'], options.targetPath),
|
|
32
|
-
tsconfigBuildPath: (0, schematics_1.findConfigFileRelativePath)(tree, ['tsconfig.build.json', 'tsconfig.base.json', 'tsconfig.json'], options.targetPath)
|
|
33
|
-
eslintRcPath: (0, schematics_1.findConfigFileRelativePath)(tree, ['.eslintrc.json', '.eslintrc.js'], options.targetPath)
|
|
31
|
+
tsconfigBuildPath: (0, schematics_1.findConfigFileRelativePath)(tree, ['tsconfig.build.json', 'tsconfig.base.json', 'tsconfig.json'], options.targetPath)
|
|
34
32
|
}),
|
|
35
33
|
(0, schematics_2.renameTemplateFiles)(),
|
|
36
34
|
(0, schematics_2.move)(options.targetPath)
|
|
@@ -43,6 +41,8 @@ function ngGenerateModule(options) {
|
|
|
43
41
|
const genPackageJsonPath = path.posix.join(options.targetPath, 'package.json');
|
|
44
42
|
const packageJson = t.readJson(genPackageJsonPath);
|
|
45
43
|
packageJson.name = options.packageJsonName;
|
|
44
|
+
packageJson.scripts ||= {};
|
|
45
|
+
packageJson.scripts.ng = 'ng';
|
|
46
46
|
t.overwrite(genPackageJsonPath, JSON.stringify(packageJson, null, 2));
|
|
47
47
|
return t;
|
|
48
48
|
}
|
|
@@ -56,37 +56,26 @@ function ngGenerateModule(options) {
|
|
|
56
56
|
const updateTsConfigFiles = (tree, context) => {
|
|
57
57
|
const tsconfigBase = (0, schematics_1.findConfigFileRelativePath)(tree, ['tsconfig.base.json', 'tsconfig.json'], '/');
|
|
58
58
|
const tsconfigBuild = (0, schematics_1.findConfigFileRelativePath)(tree, ['tsconfig.build.json'], '/');
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
59
|
+
[tsconfigBase, tsconfigBuild].forEach(tsconfigPath => {
|
|
60
|
+
if (tsconfigPath) {
|
|
61
|
+
const configFile = tree.readJson(tsconfigPath);
|
|
62
|
+
if (configFile?.compilerOptions?.paths) {
|
|
63
|
+
configFile.compilerOptions.baseUrl = '.';
|
|
64
|
+
configFile.compilerOptions.paths = Object.fromEntries(Object.entries(configFile.compilerOptions.paths).filter(([pathName, _]) => pathName !== options.name));
|
|
65
|
+
configFile.compilerOptions.paths[options.packageJsonName] = [
|
|
66
|
+
path.posix.join(relativeTargetPath, 'dist'),
|
|
67
|
+
path.posix.join(relativeTargetPath, 'src', 'public-api')
|
|
68
|
+
];
|
|
69
|
+
tree.overwrite(tsconfigPath, JSON.stringify(configFile, null, 2));
|
|
70
|
+
}
|
|
71
|
+
else {
|
|
72
|
+
context.logger.warn(`${tsconfigPath} does not contain path mapping, the edition will be skipped`);
|
|
73
|
+
}
|
|
68
74
|
}
|
|
69
75
|
else {
|
|
70
|
-
context.logger.warn(
|
|
76
|
+
context.logger.warn(`No TsConfig file found at ${tsconfigPath}`);
|
|
71
77
|
}
|
|
72
|
-
}
|
|
73
|
-
else {
|
|
74
|
-
context.logger.warn('No base TsConfig file found');
|
|
75
|
-
}
|
|
76
|
-
if (tsconfigBuild) {
|
|
77
|
-
const configFile = tree.readJson(tsconfigBuild);
|
|
78
|
-
if (configFile?.compilerOptions?.paths) {
|
|
79
|
-
configFile.compilerOptions.paths = Object.fromEntries(Object.entries(configFile.compilerOptions.paths).filter(([pathName, _]) => pathName !== options.name));
|
|
80
|
-
configFile.compilerOptions.paths[options.packageJsonName] = [
|
|
81
|
-
path.posix.join(relativeTargetPath, 'dist'),
|
|
82
|
-
path.posix.join(relativeTargetPath, 'src', 'public-api')
|
|
83
|
-
];
|
|
84
|
-
tree.overwrite(tsconfigBuild, JSON.stringify(configFile, null, 2));
|
|
85
|
-
}
|
|
86
|
-
else {
|
|
87
|
-
context.logger.warn(`${tsconfigBuild} does not contain path mapping, the edition will be skipped`);
|
|
88
|
-
}
|
|
89
|
-
}
|
|
78
|
+
});
|
|
90
79
|
};
|
|
91
80
|
const ngCliUpdate = (tree, context) => {
|
|
92
81
|
return (0, schematics_2.chain)([
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rules.ng.js","sourceRoot":"","sources":["../../../../schematics/library/rules/rules.ng.ts"],"names":[],"mappings":";;;AAEA,gDAA6D;AAC7D,2DAAuJ;AACvJ,kCAAkC;AAClC,qCAAuC;AACvC,qCAAoF;AACpF,sDAAmE;AAEnE;;;;GAIG;AACH,SAAgB,gBAAgB,CAAC,OAAiF;IAEhH,MAAM,kBAAkB,GAAG,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;IAEjE;;;;OAIG;IACH,MAAM,gBAAgB,GAAS,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE;QAC/C,MAAM,sBAAsB,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,cAAc,CAAC,CAAC;QACzF,MAAM,kBAAkB,GAAqE,IAAI,CAAC,KAAK,CAAC,IAAA,sBAAY,EAAC,sBAAsB,
|
|
1
|
+
{"version":3,"file":"rules.ng.js","sourceRoot":"","sources":["../../../../schematics/library/rules/rules.ng.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rules.nx.js","sourceRoot":"","sources":["../../../../schematics/library/rules/rules.nx.ts"],"names":[],"mappings":";;;AAEA,2DAA6J;AAC7J,kCAAkC;AAClC,qCAAuC;AACvC,qCAAoF;AACpF,gDAA0G;AAE1G;;;;;GAKG;AACH,SAAgB,gBAAgB,CAAC,OAA2D;IAE1F;;;;OAIG;IACH,MAAM,uBAAuB,GAAG,CAAC,IAAU,EAAE,EAAE;QAC7C,MAAM,EAAE,eAAe,EAAE,GAAG,IAAI,CAAC,QAAQ,CAAC,UAAU,CAA6C,CAAC;QAClG,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,eAAe,CAAC,OAAO,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IAChE,CAAC,CAAC;IAEF;;;;OAIG;IACH,MAAM,qBAAqB,GAAG,CAAC,IAAU,EAAE,EAAE;QAC3C,MAAM,KAAK,GAAG;YACZ,0BAA0B;YAC1B,YAAY;YACZ,iBAAiB;YACjB,aAAa;YACb,gBAAgB;YAChB,SAAS;YACT,cAAc;SACf,CAAC;QAEF,OAAO,KAAK,CAAC,MAAM,CAAgC,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE;YAC/D,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE;
|
|
1
|
+
{"version":3,"file":"rules.nx.js","sourceRoot":"","sources":["../../../../schematics/library/rules/rules.nx.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,5 +14,7 @@ export interface NgGenerateModuleSchema extends SchematicOptionObject {
|
|
|
14
14
|
skipLinter: boolean;
|
|
15
15
|
/** Do not install dependency packages. */
|
|
16
16
|
skipInstall: boolean;
|
|
17
|
+
/** Use a pinned version for otter packages */
|
|
18
|
+
exactO3rVersion?: boolean;
|
|
17
19
|
}
|
|
18
20
|
//# sourceMappingURL=schema.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../schematics/library/schema.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AAE7D,MAAM,WAAW,sBAAuB,SAAQ,qBAAqB;IACnE,mBAAmB;IACnB,IAAI,EAAE,MAAM,CAAC;IAEb,8CAA8C;IAC9C,IAAI,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAE1B,oCAAoC;IACpC,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAEjC,8CAA8C;IAC9C,MAAM,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAE5B,2DAA2D;IAC3D,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAEjC,8BAA8B;IAC9B,UAAU,EAAE,OAAO,CAAC;IAEpB,0CAA0C;IAC1C,WAAW,EAAE,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../schematics/library/schema.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AAE7D,MAAM,WAAW,sBAAuB,SAAQ,qBAAqB;IACnE,mBAAmB;IACnB,IAAI,EAAE,MAAM,CAAC;IAEb,8CAA8C;IAC9C,IAAI,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAE1B,oCAAoC;IACpC,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAEjC,8CAA8C;IAC9C,MAAM,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAE5B,2DAA2D;IAC3D,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAEjC,8BAA8B;IAC9B,UAAU,EAAE,OAAO,CAAC;IAEpB,0CAA0C;IAC1C,WAAW,EAAE,OAAO,CAAC;IAErB,8CAA8C;IAC9C,eAAe,CAAC,EAAE,OAAO,CAAC;CAC3B"}
|
|
@@ -35,6 +35,11 @@
|
|
|
35
35
|
"description": "Do not install dependency packages.",
|
|
36
36
|
"type": "boolean",
|
|
37
37
|
"default": false
|
|
38
|
+
},
|
|
39
|
+
"exactO3rVersion": {
|
|
40
|
+
"type": "boolean",
|
|
41
|
+
"description": "Use a pinned version for otter packages",
|
|
42
|
+
"default": false
|
|
38
43
|
}
|
|
39
44
|
},
|
|
40
45
|
"required": ["name"],
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gitignore-update.js","sourceRoot":"","sources":["../../../../schematics/ng-add/helpers/gitignore-update.ts"],"names":[],"mappings":";;;AACA,gDAAqE;AAErE;;;GAGG;AACH,SAAgB,eAAe,CAAC,eAAwC;IAEtE,OAAO,CAAC,IAAU,EAAE,QAA0B,EAAE,EAAE;QAChD,mBAAmB;QACnB,IAAI,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,EAAE;
|
|
1
|
+
{"version":3,"file":"gitignore-update.js","sourceRoot":"","sources":["../../../../schematics/ng-add/helpers/gitignore-update.ts"],"names":[],"mappings":";;;AACA,gDAAqE;AAErE;;;GAGG;AACH,SAAgB,eAAe,CAAC,eAAwC;IAEtE,OAAO,CAAC,IAAU,EAAE,QAA0B,EAAE,EAAE;QAChD,mBAAmB;QACnB,IAAI,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,EAAE,CAAC;YAC/B,IAAI,SAAS,GAAG,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC;YAC7C,MAAM,gBAAgB,GAAG,CAAC,cAAc,EAAE,MAAM,CAAC,CAAC;YAClD,MAAM,sBAAsB,GAAG,IAAI,MAAM,CAAC,cAAc,gBAAgB,CAAC,IAAI,CAAC,GAAG,CAAC,YAAY,EAAE,IAAI,CAAC,CAAC;YACtG,SAAS,GAAG,SAAS,CAAC,UAAU,CAAC,sBAAsB,EAAE,QAAQ,CAAC,CAAC;YACnE,gBAAgB,CAAC,OAAO,CAAC,eAAe,CAAC,EAAE;gBACzC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,eAAe,CAAC,EAAE,CAAC;oBACzC,SAAS;wBACP;EACV,eAAe;SACR,CAAC;gBACF,CAAC;YACH,CAAC,CAAC,CAAC;YACH,MAAM,cAAc,GAAG,IAAA,8BAAiB,EAAC,EAAC,eAAe,EAAC,CAAC,CAAC;YAC5D,IAAI,cAAc,KAAK,MAAM,EAAE,CAAC;gBAC9B,SAAS,IAAI;;;;;;;;;;;;;;;;;;;CAmBpB,CAAC;YACI,CAAC;YACD,IAAI,CAAC,SAAS,CAAC,aAAa,EAAE,SAAS,CAAC,CAAC;QAC3C,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC,CAAC;AAEJ,CAAC;AA7CD,0CA6CC"}
|
|
@@ -13,13 +13,13 @@ const shouldOtterLinterBeInstalled = async (context) => {
|
|
|
13
13
|
try {
|
|
14
14
|
require.resolve(`${linterPackageName}/package.json`);
|
|
15
15
|
if (context.interactive) {
|
|
16
|
-
useOtterLinter = await (0, prompt_1.askConfirmation)(`You already have
|
|
16
|
+
useOtterLinter = await (0, prompt_1.askConfirmation)(`You already have ESLint installed. Would you like to add Otter config rules for ESLint?
|
|
17
17
|
Otherwise, you can add them later via this command: ng add @o3r/eslint-config-otter`, true);
|
|
18
18
|
}
|
|
19
19
|
}
|
|
20
20
|
catch {
|
|
21
|
-
context.logger.info(`
|
|
22
|
-
You can add
|
|
21
|
+
context.logger.info(`ESLint package not installed. Skipping otter linter phase!
|
|
22
|
+
You can add Otter linter config rules later to the project via this command: ng add @o3r/eslint-config-otter`);
|
|
23
23
|
}
|
|
24
24
|
return useOtterLinter;
|
|
25
25
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"linter.js","sourceRoot":"","sources":["../../../../schematics/ng-add/helpers/linter.ts"],"names":[],"mappings":";;;AACA,8DAAoE;AAEpE;;;;GAIG;AACI,MAAM,4BAA4B,GAAG,KAAK,EAAE,OAAyB,EAAoB,EAAE;IAChG,MAAM,iBAAiB,GAAG,QAAQ,CAAC;IACnC,IAAI,cAAc,GAAG,KAAK,CAAC;IAC3B,IAAI;
|
|
1
|
+
{"version":3,"file":"linter.js","sourceRoot":"","sources":["../../../../schematics/ng-add/helpers/linter.ts"],"names":[],"mappings":";;;AACA,8DAAoE;AAEpE;;;;GAIG;AACI,MAAM,4BAA4B,GAAG,KAAK,EAAE,OAAyB,EAAoB,EAAE;IAChG,MAAM,iBAAiB,GAAG,QAAQ,CAAC;IACnC,IAAI,cAAc,GAAG,KAAK,CAAC;IAC3B,IAAI,CAAC;QACH,OAAO,CAAC,OAAO,CAAC,GAAG,iBAAiB,eAAe,CAAC,CAAC;QACrD,IAAI,OAAO,CAAC,WAAW,EAAE,CAAC;YACxB,cAAc,GAAG,MAAM,IAAA,wBAAe,EAAC;oFACuC,EAAE,IAAI,CAAC,CAAC;QACxF,CAAC;IACH,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC;6GACqF,CAAC,CAAC;IAC7G,CAAC;IAED,OAAO,cAAc,CAAC;AACxB,CAAC,CAAC;AAfW,QAAA,4BAA4B,gCAevC"}
|