@o3r/eslint-config 13.0.0-next.6 → 13.0.0-prerelease.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +42 -42
- package/schematics/ng-add/eslint/index.d.ts.map +1 -1
- package/schematics/ng-add/eslint/index.js +0 -3
- package/schematics/ng-add/index.d.ts.map +1 -1
- package/schematics/ng-add/index.js +5 -3
- package/schematics/ng-add/schema.json +2 -1
- package/src/rules/typescript/stylistic.cjs +2 -2
- package/src/rules/typescript/unicorn.cjs +2 -1
- package/src/rules/typescript.cjs +2 -2
- package/schematics/ng-add/eslint/index.js.map +0 -1
- package/schematics/ng-add/index.js.map +0 -1
- package/schematics/ng-add/schema.js.map +0 -1
- package/schematics/ng-add/tsconfig/index.d.ts +0 -8
- package/schematics/ng-add/tsconfig/index.d.ts.map +0 -1
- package/schematics/ng-add/tsconfig/index.js +0 -25
- package/schematics/ng-add/tsconfig/index.js.map +0 -1
- package/schematics/ng-add/tsconfig/templates/tsconfig.eslint.json.template +0 -6
- package/schematics/ng-add/vscode/index.js.map +0 -1
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@o3r/eslint-config",
|
|
3
|
-
"version": "13.0.0-
|
|
3
|
+
"version": "13.0.0-prerelease.2",
|
|
4
4
|
"publishConfig": {
|
|
5
5
|
"access": "public"
|
|
6
6
|
},
|
|
@@ -37,85 +37,85 @@
|
|
|
37
37
|
"build:builders": "tsc -b tsconfig.builders.json --pretty && yarn generate-cjs-manifest"
|
|
38
38
|
},
|
|
39
39
|
"dependencies": {
|
|
40
|
-
"@o3r/schematics": "^13.0.0-
|
|
40
|
+
"@o3r/schematics": "^13.0.0-prerelease.2"
|
|
41
41
|
},
|
|
42
42
|
"peerDependencies": {
|
|
43
|
-
"@angular-devkit/core": "^
|
|
44
|
-
"@angular-devkit/schematics": "^
|
|
45
|
-
"@angular-eslint/builder": "^
|
|
46
|
-
"@angular/compiler": "^
|
|
43
|
+
"@angular-devkit/core": "^20.0.0",
|
|
44
|
+
"@angular-devkit/schematics": "^20.0.0",
|
|
45
|
+
"@angular-eslint/builder": "^20.0.0",
|
|
46
|
+
"@angular/compiler": "^20.0.0",
|
|
47
47
|
"@eslint-community/eslint-plugin-eslint-comments": "^4.4.0",
|
|
48
48
|
"@eslint/js": "^8.57.0 || ^9.22.0",
|
|
49
|
-
"@o3r/eslint-plugin": "^13.0.0-
|
|
50
|
-
"@o3r/schematics": "^13.0.0-
|
|
51
|
-
"@schematics/angular": "^
|
|
52
|
-
"@stylistic/eslint-plugin": "~
|
|
49
|
+
"@o3r/eslint-plugin": "^13.0.0-prerelease.2",
|
|
50
|
+
"@o3r/schematics": "^13.0.0-prerelease.2",
|
|
51
|
+
"@schematics/angular": "^20.0.0",
|
|
52
|
+
"@stylistic/eslint-plugin": "~5.2.0",
|
|
53
53
|
"@typescript-eslint/parser": "^8.15.0",
|
|
54
54
|
"@typescript-eslint/types": "^8.15.0",
|
|
55
55
|
"@typescript-eslint/utils": "^8.15.0",
|
|
56
|
-
"angular-eslint": "^
|
|
56
|
+
"angular-eslint": "^20.0.0",
|
|
57
57
|
"eslint": "^8.57.0 || ^9.22.0",
|
|
58
58
|
"eslint-import-resolver-node": "^0.3.4",
|
|
59
|
-
"eslint-import-resolver-typescript": "^
|
|
59
|
+
"eslint-import-resolver-typescript": "^4.0.0",
|
|
60
60
|
"eslint-plugin-import": "^2.31.0",
|
|
61
61
|
"eslint-plugin-import-newlines": "^1.4.0",
|
|
62
|
-
"eslint-plugin-jest": "^
|
|
63
|
-
"eslint-plugin-jsdoc": "^
|
|
62
|
+
"eslint-plugin-jest": "^29.0.0",
|
|
63
|
+
"eslint-plugin-jsdoc": "^54.0.0",
|
|
64
64
|
"eslint-plugin-prefer-arrow": "^1.2.2",
|
|
65
|
-
"eslint-plugin-unicorn": "^
|
|
65
|
+
"eslint-plugin-unicorn": "^60.0.0",
|
|
66
66
|
"eslint-plugin-unused-imports": "^4.1.4",
|
|
67
|
-
"globals": "^
|
|
67
|
+
"globals": "^16.0.0",
|
|
68
68
|
"globby": "^11.1.0",
|
|
69
69
|
"jest": "^29.7.0",
|
|
70
70
|
"jsonc-eslint-parser": "^2.4.0",
|
|
71
71
|
"ts-node": "^10.9.2",
|
|
72
72
|
"type-fest": "^4.30.1",
|
|
73
|
-
"typescript": "^5.
|
|
73
|
+
"typescript": "^5.8.0",
|
|
74
74
|
"typescript-eslint": "^8.15.0",
|
|
75
75
|
"yaml-eslint-parser": "^1.2.2"
|
|
76
76
|
},
|
|
77
77
|
"devDependencies": {
|
|
78
|
-
"@angular-devkit/core": "~
|
|
79
|
-
"@angular-devkit/schematics": "~
|
|
80
|
-
"@angular/compiler": "~
|
|
78
|
+
"@angular-devkit/core": "~20.0.0",
|
|
79
|
+
"@angular-devkit/schematics": "~20.0.0",
|
|
80
|
+
"@angular/compiler": "~20.0.0",
|
|
81
81
|
"@eslint-community/eslint-plugin-eslint-comments": "^4.4.0",
|
|
82
|
-
"@eslint/js": "~9.
|
|
83
|
-
"@nx/eslint-plugin": "~
|
|
84
|
-
"@o3r/build-helpers": "^13.0.0-
|
|
85
|
-
"@o3r/eslint-plugin": "^13.0.0-
|
|
86
|
-
"@o3r/test-helpers": "^13.0.0-
|
|
87
|
-
"@schematics/angular": "~
|
|
88
|
-
"@stylistic/eslint-plugin": "~
|
|
89
|
-
"@types/eslint__js": "^8.42.3",
|
|
82
|
+
"@eslint/js": "~9.34.0",
|
|
83
|
+
"@nx/eslint-plugin": "~21.3.11",
|
|
84
|
+
"@o3r/build-helpers": "^13.0.0-prerelease.2",
|
|
85
|
+
"@o3r/eslint-plugin": "^13.0.0-prerelease.2",
|
|
86
|
+
"@o3r/test-helpers": "^13.0.0-prerelease.2",
|
|
87
|
+
"@schematics/angular": "~20.0.0",
|
|
88
|
+
"@stylistic/eslint-plugin": "~5.2.0",
|
|
90
89
|
"@types/jest": "~29.5.2",
|
|
91
|
-
"@types/node": "^
|
|
92
|
-
"@typescript-eslint/parser": "~8.
|
|
93
|
-
"angular-eslint": "~
|
|
94
|
-
"cpy-cli": "^
|
|
95
|
-
"eslint": "~9.
|
|
90
|
+
"@types/node": "^22.0.0",
|
|
91
|
+
"@typescript-eslint/parser": "~8.41.0",
|
|
92
|
+
"angular-eslint": "~20.1.0",
|
|
93
|
+
"cpy-cli": "^6.0.0",
|
|
94
|
+
"eslint": "~9.34.0",
|
|
96
95
|
"eslint-import-resolver-node": "~0.3.9",
|
|
97
|
-
"eslint-import-resolver-typescript": "~
|
|
96
|
+
"eslint-import-resolver-typescript": "~4.4.0",
|
|
98
97
|
"eslint-plugin-import": "~2.32.0",
|
|
99
98
|
"eslint-plugin-import-newlines": "~1.4.0",
|
|
100
|
-
"eslint-plugin-jest": "~
|
|
101
|
-
"eslint-plugin-jsdoc": "~
|
|
99
|
+
"eslint-plugin-jest": "~29.0.0",
|
|
100
|
+
"eslint-plugin-jsdoc": "~54.1.0",
|
|
102
101
|
"eslint-plugin-prefer-arrow": "~1.2.3",
|
|
103
|
-
"eslint-plugin-unicorn": "~
|
|
104
|
-
"eslint-plugin-unused-imports": "~4.
|
|
105
|
-
"globals": "^
|
|
102
|
+
"eslint-plugin-unicorn": "~60.0.0",
|
|
103
|
+
"eslint-plugin-unused-imports": "~4.2.0",
|
|
104
|
+
"globals": "^16.0.0",
|
|
106
105
|
"jest": "~29.7.0",
|
|
107
106
|
"jest-junit": "~16.0.0",
|
|
107
|
+
"jest-util": "~29.7.0",
|
|
108
108
|
"jsonc-eslint-parser": "~2.4.0",
|
|
109
|
-
"nx": "~
|
|
109
|
+
"nx": "~21.3.11",
|
|
110
110
|
"pid-from-port": "^1.1.3",
|
|
111
111
|
"rxjs": "^7.8.1",
|
|
112
112
|
"semver": "^7.5.2",
|
|
113
|
-
"ts-jest": "~29.
|
|
113
|
+
"ts-jest": "~29.4.0",
|
|
114
114
|
"ts-node": "~10.9.2",
|
|
115
115
|
"tslib": "^2.6.2",
|
|
116
116
|
"type-fest": "^4.30.1",
|
|
117
117
|
"typescript": "~5.8.2",
|
|
118
|
-
"typescript-eslint": "~8.
|
|
118
|
+
"typescript-eslint": "~8.41.0"
|
|
119
119
|
},
|
|
120
120
|
"peerDependenciesMeta": {
|
|
121
121
|
"@angular-devkit/core": {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../schematics/ng-add/eslint/index.ts"],"names":[],"mappings":"AAKA,OAAO,EAQL,KAAK,IAAI,EAGV,MAAM,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../schematics/ng-add/eslint/index.ts"],"names":[],"mappings":"AAKA,OAAO,EAQL,KAAK,IAAI,EAGV,MAAM,4BAA4B,CAAC;AAsCpC;;;;GAIG;AACH,eAAO,MAAM,kBAAkB,GAAI,UAAU,MAAM,EAAE,cAAc,MAAM,KAAG,IAyD3E,CAAC"}
|
|
@@ -5,7 +5,6 @@ const path = require("node:path");
|
|
|
5
5
|
const core_1 = require("@angular-devkit/core");
|
|
6
6
|
const schematics_1 = require("@angular-devkit/schematics");
|
|
7
7
|
const schematics_2 = require("@o3r/schematics");
|
|
8
|
-
const index_1 = require("../tsconfig/index");
|
|
9
8
|
const editAngularJson = (projectName, extension) => (tree, context) => {
|
|
10
9
|
let workspace = null;
|
|
11
10
|
try {
|
|
@@ -55,7 +54,6 @@ const updateEslintConfig = (rootPath, projectName) => (tree, context) => {
|
|
|
55
54
|
oldConfig: '',
|
|
56
55
|
relativePathToRoot: path.posix.relative(projectRootPath, '.'),
|
|
57
56
|
packageName: tree.readJson(workingDir.file((0, core_1.fragment)('package.json'))?.path || 'package.json').name,
|
|
58
|
-
detectedTsConfigs: (0, schematics_2.findFilesInTree)(workingDir, (f) => /tsconfig\..*\.json/.test(f)).map((entry) => path.basename(entry.path)).concat('tsconfig.eslint.json'),
|
|
59
57
|
isApp: workspaceProject?.projectType === 'application'
|
|
60
58
|
};
|
|
61
59
|
if (eslintConfigFiles.length === 1) {
|
|
@@ -79,7 +77,6 @@ const updateEslintConfig = (rootPath, projectName) => (tree, context) => {
|
|
|
79
77
|
return (0, schematics_1.chain)([
|
|
80
78
|
projectName ? editAngularJson(projectName, templateOptions.extension) : (0, schematics_1.noop)(),
|
|
81
79
|
(0, schematics_1.applyToSubtree)(projectRootPath, [
|
|
82
|
-
(0, index_1.updateOrAddTsconfigEslint)(rootPath),
|
|
83
80
|
(0, schematics_1.mergeWith)((0, schematics_1.apply)((0, schematics_1.url)((0, schematics_2.getTemplateFolder)(rootPath, __dirname, `./templates/${projectRootPath === '.' ? 'workspace' : 'project'}`)), [
|
|
84
81
|
(0, schematics_1.template)(templateOptions),
|
|
85
82
|
(0, schematics_1.renameTemplateFiles)()
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":"AACA,OAAO,EAGL,KAAK,IAAI,EAIV,MAAM,4BAA4B,CAAC;AAkBpC,OAAO,KAAK,EACV,qBAAqB,EACtB,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":"AACA,OAAO,EAGL,KAAK,IAAI,EAIV,MAAM,4BAA4B,CAAC;AAkBpC,OAAO,KAAK,EACV,qBAAqB,EACtB,MAAM,UAAU,CAAC;AA8JlB;;;GAGG;AACH,eAAO,MAAM,KAAK,GAAI,SAAS,qBAAqB,SAA2C,CAAC"}
|
|
@@ -56,8 +56,10 @@ const handleOtterEslintErrors = (projectName) => (tree, context) => {
|
|
|
56
56
|
const mainTsContent = tree.readText(mainTsPath);
|
|
57
57
|
tree.overwrite(mainTsPath, '/* eslint-disable no-console -- console.error is used to log error in the browser while initializing the Angular application */\n' + mainTsContent);
|
|
58
58
|
}
|
|
59
|
-
const
|
|
60
|
-
|
|
59
|
+
const appComponentPath1 = path.posix.join(projectRoot, 'src/app/app.component.ts');
|
|
60
|
+
const appComponentPath2 = path.posix.join(projectRoot, 'src/app/app.ts');
|
|
61
|
+
const appComponentPath = tree.exists(appComponentPath1) ? appComponentPath1 : (tree.exists(appComponentPath2) ? appComponentPath2 : undefined);
|
|
62
|
+
if (appComponentPath) {
|
|
61
63
|
const appComponentContent = tree.readText(appComponentPath);
|
|
62
64
|
tree.overwrite(appComponentPath, appComponentContent.replace(/^(\s+)(title =)/m, '$1public $2'));
|
|
63
65
|
}
|
|
@@ -81,7 +83,7 @@ const addHarmonizeScript = () => {
|
|
|
81
83
|
return tree;
|
|
82
84
|
}
|
|
83
85
|
const postInstall = rootPackageJsonObject.scripts.postinstall;
|
|
84
|
-
rootPackageJsonObject.scripts.harmonize = `eslint
|
|
86
|
+
rootPackageJsonObject.scripts.harmonize = `eslint "**/package.json" ${isYarnPackageManager ? '.yarnrc.yml ' : ''}--quiet --fix --no-error-on-unmatched-pattern`;
|
|
85
87
|
rootPackageJsonObject.scripts.postinstall = `${postInstall ? postInstall + ' && ' : ''}${extraPostInstall}`;
|
|
86
88
|
tree.overwrite(rootPackageJsonPath, JSON.stringify(rootPackageJsonObject, null, 2));
|
|
87
89
|
return tree;
|
|
@@ -12,7 +12,7 @@ const config = [
|
|
|
12
12
|
'**/*.{c,m,}{t,j}s'
|
|
13
13
|
],
|
|
14
14
|
rules: {
|
|
15
|
-
...convertWarningsToErrors(stylistic.configs
|
|
15
|
+
...convertWarningsToErrors(stylistic.configs.recommended),
|
|
16
16
|
'@stylistic/arrow-parens': ['error', 'always'],
|
|
17
17
|
'@stylistic/brace-style': ['error', '1tbs'],
|
|
18
18
|
'@stylistic/comma-dangle': ['error', {
|
|
@@ -69,7 +69,7 @@ const config = [
|
|
|
69
69
|
'single',
|
|
70
70
|
{
|
|
71
71
|
avoidEscape: true,
|
|
72
|
-
allowTemplateLiterals:
|
|
72
|
+
allowTemplateLiterals: 'always'
|
|
73
73
|
}
|
|
74
74
|
],
|
|
75
75
|
'@stylistic/quote-props': [
|
|
@@ -12,7 +12,7 @@ const config = [
|
|
|
12
12
|
'**/*.{c,m,}{t,j}s'
|
|
13
13
|
],
|
|
14
14
|
rules: {
|
|
15
|
-
...convertWarningsToErrors(unicorn.configs
|
|
15
|
+
...convertWarningsToErrors(unicorn.default.configs.recommended),
|
|
16
16
|
'unicorn/catch-error-name': 'off',
|
|
17
17
|
'unicorn/consistent-function-scoping': 'off',
|
|
18
18
|
'unicorn/filename-case': [
|
|
@@ -27,6 +27,7 @@ const config = [
|
|
|
27
27
|
'unicorn/import-style': 'off',
|
|
28
28
|
'unicorn/no-array-for-each': 'off',
|
|
29
29
|
'unicorn/no-array-reduce': 'off',
|
|
30
|
+
'unicorn/no-array-reverse': 'off',
|
|
30
31
|
'unicorn/no-await-expression-member': 'off',
|
|
31
32
|
'unicorn/no-null': 'off',
|
|
32
33
|
'unicorn/no-typeof-undefined': 'off',
|
package/src/rules/typescript.cjs
CHANGED
|
@@ -79,13 +79,13 @@ const configArray = [
|
|
|
79
79
|
files: [
|
|
80
80
|
'**/*.{c,m,}{t,j}s'
|
|
81
81
|
],
|
|
82
|
-
...stylistic.configs
|
|
82
|
+
...stylistic.configs.recommended
|
|
83
83
|
},
|
|
84
84
|
{
|
|
85
85
|
files: [
|
|
86
86
|
'**/*.{c,m,}{t,j}s'
|
|
87
87
|
],
|
|
88
|
-
...unicorn.configs
|
|
88
|
+
...unicorn.default.configs.recommended
|
|
89
89
|
},
|
|
90
90
|
...(getJestConfig('recommended')),
|
|
91
91
|
{
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../schematics/ng-add/eslint/index.ts"],"names":[],"mappings":";;;AAAA,kCAAkC;AAClC,+CAG8B;AAC9B,2DAWoC;AACpC,gDAIyB;AAIzB,6CAE2B;AAE3B,MAAM,eAAe,GAAG,CAAC,WAAmB,EAAE,SAAiB,EAAQ,EAAE,CAAC,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE;IAC1F,IAAI,SAAS,GAA2B,IAAI,CAAC;IAC7C,IAAI,CAAC;QACH,SAAS,GAAG,IAAA,+BAAkB,EAAC,IAAI,CAAC,CAAC;IACvC,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,wFAAwF,WAAW,oBAAoB,CAAC,CAAC;IAC/I,CAAC;IACD,MAAM,gBAAgB,GAAG,SAAS,EAAE,QAAQ,CAAC,WAAW,CAAC,CAAC;IAC1D,IAAI,CAAC,gBAAgB,EAAE,CAAC;QACtB,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,4CAA4C,WAAW,oBAAoB,CAAC,CAAC;QACjG,OAAO;IACT,CAAC;IAED,gBAAgB,CAAC,SAAS,KAAK,EAAE,CAAC;IAClC,gBAAgB,CAAC,SAAS,CAAC,IAAI,KAAK;QAClC,OAAO,EAAE,8BAA8B;QACvC,OAAO,EAAE;YACP,YAAY,EAAE,GAAG,gBAAgB,CAAC,IAAI,kBAAkB,SAAS,EAAE;YACnE,gBAAgB,EAAE;gBAChB,GAAG,gBAAgB,CAAC,UAAU,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,gBAAgB,CAAC,IAAI,EAAE,KAAK,CAAC,UAAU;aAC1F;SACF;KACF,CAAC;IAEF,SAAU,CAAC,QAAQ,CAAC,WAAW,CAAC,GAAG,gBAAgB,CAAC;IACpD,IAAI,CAAC,SAAS,CAAC,eAAe,EAAE,IAAI,CAAC,SAAS,CAAC,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;AACtE,CAAC,CAAC;AAEF;;;;GAIG;AACI,MAAM,kBAAkB,GAAG,CAAC,QAAgB,EAAE,WAAoB,EAAQ,EAAE,CAAC,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE;IACpG,MAAM,SAAS,GAAG,IAAA,+BAAkB,EAAC,IAAI,CAAC,CAAC;IAC3C,MAAM,gBAAgB,GAAG,SAAS,EAAE,QAAQ,CAAC,WAAW,IAAI,EAAE,CAAC,CAAC;IAChE,MAAM,eAAe,GAAG,gBAAgB,EAAE,IAAI,IAAI,GAAG,CAAC;IACtD,MAAM,UAAU,GAAG,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC;IAChD,MAAM,iBAAiB,GAAG,IAAA,4BAAe,EAAC,UAAU,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,uBAAuB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;IACpG,IAAI,iBAAiB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACjC,OAAO,CAAC,MAAM,CAAC,IAAI,CACjB,sGAAsG;cACpG,iBAAiB,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,OAAO,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAC5E,CAAC;QACF,OAAO;IACT,CAAC;IAED,MAAM,eAAe,GAAG;QACtB,SAAS,EAAE,KAAK;QAChB,gBAAgB,EAAE,EAAE;QACpB,eAAe,EAAE,EAAE;QACnB,SAAS,EAAE,EAAE;QACb,kBAAkB,EAAE,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,eAAe,EAAE,GAAG,CAAC;QAC7D,WAAW,EAAG,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,IAAA,eAAQ,EAAC,cAAc,CAAC,CAAC,EAAE,IAAI,IAAI,cAAc,CAAgB,CAAC,IAAI;QAClH,iBAAiB,EAAE,IAAA,4BAAe,EAAC,UAAU,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,oBAAoB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,sBAAsB,CAAC;QAC5J,KAAK,EAAE,gBAAgB,EAAE,WAAW,KAAK,aAAa;KACvD,CAAC;IAEF,IAAI,iBAAiB,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACnC,MAAM,IAAI,GAAG,iBAAiB,CAAC,CAAC,CAAC,CAAC;QAClC,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;QACtC,MAAM,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC;QAC5C,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAyB,CAAC;QACjE,MAAM,MAAM,GAAG,SAAS,KAAK,KAAK,CAAC,CAAC,CAAC,2BAA2B,CAAC,CAAC,CAAC,6BAA6B,CAAC;QACjG,MAAM,CAAC,gBAAgB,EAAE,eAAe,CAAC,GAAG,WAAW,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QACtE,IAAI,CAAC,eAAe,EAAE,CAAC;YACrB,OAAO,CAAC,MAAM,CAAC,IAAI,CACjB,8FAA8F,QAAQ,EAAE,CACzG,CAAC;YACF,OAAO;QACT,CAAC;QACD,MAAM,SAAS,GAAG,WAAW,CAAC,KAAK,CAAC,MAAM,CAAE,CAAC,CAAC,CAAC,CAAC;QAChD,eAAe,CAAC,SAAS,GAAG,SAAS,CAAC;QACtC,eAAe,CAAC,gBAAgB,GAAG,gBAAgB,CAAC;QACpD,eAAe,CAAC,eAAe,GAAG,eAAe,CAAC;QAClD,eAAe,CAAC,SAAS,GAAG,SAAS,CAAC;QACtC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IACxB,CAAC;IAED,OAAO,IAAA,kBAAK,EAAC;QACX,WAAW,CAAC,CAAC,CAAC,eAAe,CAAC,WAAW,EAAE,eAAe,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,IAAA,iBAAI,GAAE;QAC9E,IAAA,2BAAc,EACZ,eAAe,EACf;YACE,IAAA,iCAAyB,EAAC,QAAQ,CAAC;YACnC,IAAA,sBAAS,EAAC,IAAA,kBAAK,EAAC,IAAA,gBAAG,EAAC,IAAA,8BAAiB,EAAC,QAAQ,EAAE,SAAS,EAAE,eAAe,eAAe,KAAK,GAAG,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,SAAS,EAAE,CAAC,CAAC,EAAE;gBAC/H,IAAA,qBAAQ,EAAC,eAAe,CAAC;gBACzB,IAAA,gCAAmB,GAAE;aACtB,CAAC,EAAE,0BAAa,CAAC,SAAS,CAAC;SAC7B,CACF;KACF,CAAC,CAAC;AACL,CAAC,CAAC;AA3DW,QAAA,kBAAkB,sBA2D7B"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":";;;AAAA,kCAAkC;AAClC,2DAOoC;AACpC,gDAUyB;AAIzB,0CAEwB;AAIxB,0CAEwB;AAExB;;GAEG;AACH,MAAM,qBAAqB,GAAa,EAAE,CAAC;AAE3C;;GAEG;AACH,MAAM,wBAAwB,GAAG;IAC/B,YAAY;IACZ,iDAAiD;IACjD,0BAA0B;IAC1B,2BAA2B;IAC3B,0BAA0B;IAC1B,0BAA0B;IAC1B,gBAAgB;IAChB,QAAQ;IACR,6BAA6B;IAC7B,mCAAmC;IACnC,sBAAsB;IACtB,+BAA+B;IAC/B,qBAAqB;IACrB,4BAA4B;IAC5B,uBAAuB;IACvB,8BAA8B;IAC9B,SAAS;IACT,QAAQ;IACR,qBAAqB;IACrB,mBAAmB;IACnB,sGAAsG;IACtG,mCAAmC;CACpC,CAAC;AAEF,MAAM,uBAAuB,GAAG,CAAC,WAAmB,EAAQ,EAAE,CAAC,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE;IAC/E,IAAI,CAAC,WAAW,EAAE,CAAC;QACjB,OAAO;IACT,CAAC;IACD,MAAM,SAAS,GAAG,IAAA,+BAAkB,EAAC,IAAI,CAAC,CAAC;IAC3C,IAAI,CAAC,SAAS,EAAE,CAAC;QACf,OAAO;IACT,CAAC;IACD,MAAM,gBAAgB,GAAG,SAAS,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;IAEzD,IAAI,CAAC,gBAAgB,EAAE,CAAC;QACtB,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,oDAAoD,CAAC,CAAC;QAC1E,OAAO;IACT,CAAC;IACD,MAAM,WAAW,GAAG,gBAAgB,CAAC,IAAI,CAAC;IAC1C,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,WAAW,EAAE,aAAa,CAAC,CAAC;IAC/D,IAAI,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC;QAC5B,MAAM,aAAa,GAAG,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;QAChD,IAAI,CAAC,SAAS,CAAC,UAAU,EAAE,mIAAmI,GAAG,aAAa,CAAC,CAAC;IAClL,CAAC;IACD,MAAM,gBAAgB,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,WAAW,EAAE,0BAA0B,CAAC,CAAC;IAClF,IAAI,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC,EAAE,CAAC;QAClC,MAAM,mBAAmB,GAAG,IAAI,CAAC,QAAQ,CAAC,gBAAgB,CAAC,CAAC;QAC5D,IAAI,CAAC,SAAS,CAAC,gBAAgB,EAAE,mBAAmB,CAAC,OAAO,CAAC,kBAAkB,EAAE,aAAa,CAAC,CAAC,CAAC;IACnG,CAAC;IACD,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,uGAAuG,CAAC,CAAC;AAC/H,CAAC,CAAC;AACF;;GAEG;AACH,MAAM,kBAAkB,GAAG,GAAS,EAAE;IACpC,MAAM,mBAAmB,GAAG,eAAe,CAAC;IAC5C,OAAO,CAAC,IAAU,EAAE,OAAyB,EAAE,EAAE;QAC/C,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,mBAAmB,CAAC,EAAE,CAAC;YACtC,MAAM,IAAI,gCAAmB,CAAC,kCAAkC,CAAC,CAAC;QACpE,CAAC;QACD,MAAM,oBAAoB,GAAG,IAAA,8BAAiB,GAAE,KAAK,MAAM,CAAC;QAC5D,MAAM,gBAAgB,GAAG,oBAAoB,CAAC,CAAC,CAAC,kDAAkD,CAAC,CAAC,CAAC,mDAAmD,CAAC;QACzJ,MAAM,qBAAqB,GAAG,IAAI,CAAC,QAAQ,CAAC,mBAAmB,CAAgB,CAAC;QAChF,qBAAqB,CAAC,OAAO,KAAK,EAAE,CAAC;QACrC,IAAI,qBAAqB,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC;YAC5C,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,6GAA6G,CAAC,CAAC;YACnI,OAAO,IAAI,CAAC;QACd,CAAC;QACD,MAAM,WAAW,GAAG,qBAAqB,CAAC,OAAO,CAAC,WAAW,CAAC;QAC9D,qBAAqB,CAAC,OAAO,CAAC,SAAS,GAAG,4BAA4B,oBAAoB,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,EAAE,+CAA+C,CAAC;QAChK,qBAAqB,CAAC,OAAO,CAAC,WAAW,GAAG,GAAG,WAAW,CAAC,CAAC,CAAC,WAAW,GAAG,MAAM,CAAC,CAAC,CAAC,EAAE,GAAG,gBAAgB,EAAE,CAAC;QAC5G,IAAI,CAAC,SAAS,CAAC,mBAAmB,EAAE,IAAI,CAAC,SAAS,CAAC,qBAAqB,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;QACpF,OAAO,IAAI,CAAC;IACd,CAAC,CAAC;AACJ,CAAC,CAAC;AAEF,SAAS,OAAO,CAAC,OAA8B;IAC7C,kBAAkB;IAClB,OAAO,CAAC,IAAU,EAAE,OAAyB,EAAE,EAAE;QAC/C,IAAI,iBAAiB,GAAG,KAAK,CAAC;QAC9B,IAAI,CAAC;YACH,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;YACxB,iBAAiB,GAAG,IAAI,CAAC;QAC3B,CAAC;QAAC,MAAM,CAAC,CAAA,CAAC;QAEV,IAAI,iBAAiB,EAAE,CAAC;YACtB,wBAAwB,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;QACtD,CAAC;QACD,IAAI,OAAO,CAAC,WAAW,EAAE,CAAC;YACxB,wBAAwB,CAAC,IAAI,CAAC,yBAAyB,CAAC,CAAC;QAC3D,CAAC;QAED,MAAM,QAAQ,GAAG,IAAA,2BAAc,EAAC,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,cAAc,CAAC,EAAE,IAAI,EAAE,mBAAmB,CAAC,CAAC;QAChH,MAAM,gBAAgB,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,IAAA,+BAAkB,EAAC,IAAI,CAAC,EAAE,QAAQ,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QACnH,MAAM,eAAe,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,cAAc,CAAC,CAAC;QAC5E,MAAM,YAAY,GAAG,QAAQ,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;YAC5D,GAAG,CAAC,GAAG,CAAC,GAAG;gBACT,UAAU,EAAE,CAAC;wBACX,KAAK,EAAE,GAAG,OAAO,CAAC,eAAe,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,GAAG,QAAQ,CAAC,cAAc,EAAE;wBACxE,KAAK,EAAE,IAAA,2CAA8B,EAAC,gBAAgB,CAAC;qBACxD,CAAC;gBACF,YAAY,EAAE,EAAE,eAAe,EAAE,OAAO,CAAC,eAAe,EAAE;aAC3D,CAAC;YACF,OAAO,GAAG,CAAC;QACb,CAAC,EAAE,IAAA,oCAAuB,EAAC,eAAe,EAAE,IAAI,EAAE,OAAO,CAAC,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC,CAAC;QAEzG,MAAM,gBAAgB,GAAG,gBAAgB,EAAE,IAAI,IAAI,GAAG,CAAC;QACvD,MAAM,kBAAkB,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,gBAAgB,EAAE,cAAc,CAAC,CAAgB,CAAC;QAE3G,MAAM,wBAAwB,GAAG,IAAA,wCAA2B,EAAC;YAC3D,wBAAwB;YACxB,qBAAqB;YACrB,WAAW,EAAE,gBAAgB,EAAE,WAAW;YAC1C,kBAAkB;YAClB,kBAAkB,EAAE,eAAe;SACpC,EACD,OAAO,CAAC,MAAM,CACb,CAAC;QAEF,OAAO,GAAG,EAAE,CAAC,IAAA,kBAAK,EAAC;YACjB,IAAA,8BAAiB,EAAC;gBAChB,WAAW,EAAE,OAAO,CAAC,WAAW;gBAChC,YAAY,EAAE;oBACZ,GAAG,YAAY;oBACf,GAAG,wBAAwB;iBAC5B;gBACD,UAAU,EAAE,QAAQ,CAAC,WAAW;aACjC,CAAC;YACF,oBAAY;YACZ,IAAA,0BAAkB,EAAC,SAAS,CAAC;YAC7B,kBAAkB,EAAE;YACpB,OAAO,CAAC,WAAW,IAAI,gBAAgB,EAAE,IAAI;gBAC3C,CAAC,CAAC,IAAA,kBAAK,EAAC;oBACN,IAAA,0BAAkB,EAAC,SAAS,EAAE,OAAO,CAAC,WAAW,CAAC;oBAClD,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,uBAAuB,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,IAAA,iBAAI,GAAE;iBACpE,CAAC;gBACF,CAAC,CAAC,IAAA,iBAAI,GAAE;YACV,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,IAAA,iBAAI,GAAE,CAAC,CAAC,CAAC,IAAA,8BAAiB,GAAE;SAClD,CAAC,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IACpB,CAAC,CAAC;AACJ,CAAC;AAED;;;GAGG;AACI,MAAM,KAAK,GAAG,CAAC,OAA8B,EAAE,EAAE,CAAC,IAAA,iCAAoB,EAAC,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC;AAAnF,QAAA,KAAK,SAA8E"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"schema.js","sourceRoot":"","sources":["../../../schematics/ng-add/schema.ts"],"names":[],"mappings":""}
|
|
@@ -1,8 +0,0 @@
|
|
|
1
|
-
import { type Rule } from '@angular-devkit/schematics';
|
|
2
|
-
/**
|
|
3
|
-
* Update or add tsconfig.eslint.json file
|
|
4
|
-
* @param rootPath
|
|
5
|
-
* @param projectTsConfig
|
|
6
|
-
*/
|
|
7
|
-
export declare const updateOrAddTsconfigEslint: (rootPath: string, projectTsConfig?: string) => Rule;
|
|
8
|
-
//# sourceMappingURL=index.d.ts.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../schematics/ng-add/tsconfig/index.ts"],"names":[],"mappings":"AAIA,OAAO,EAKL,KAAK,IAAI,EAGV,MAAM,4BAA4B,CAAC;AAIpC;;;;GAIG;AACH,eAAO,MAAM,yBAAyB,GAAI,UAAU,MAAM,EAAE,wBAA4B,KAAG,IAa1F,CAAC"}
|
|
@@ -1,25 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.updateOrAddTsconfigEslint = void 0;
|
|
4
|
-
const schematics_1 = require("@angular-devkit/schematics");
|
|
5
|
-
const schematics_2 = require("@o3r/schematics");
|
|
6
|
-
/**
|
|
7
|
-
* Update or add tsconfig.eslint.json file
|
|
8
|
-
* @param rootPath
|
|
9
|
-
* @param projectTsConfig
|
|
10
|
-
*/
|
|
11
|
-
const updateOrAddTsconfigEslint = (rootPath, projectTsConfig = 'tsconfig') => (tree) => {
|
|
12
|
-
const tsconfigPath = 'tsconfig.eslint.json';
|
|
13
|
-
if (tree.exists(tsconfigPath)) {
|
|
14
|
-
const tsconfig = tree.readJson(tsconfigPath);
|
|
15
|
-
tsconfig.include = (tsconfig.include || []).concat(`eslint*.config.*js`);
|
|
16
|
-
tree.overwrite(tsconfigPath, JSON.stringify(tsconfig, null, 2));
|
|
17
|
-
return () => tree;
|
|
18
|
-
}
|
|
19
|
-
return () => (0, schematics_1.mergeWith)((0, schematics_1.apply)((0, schematics_1.url)((0, schematics_2.getTemplateFolder)(rootPath, __dirname)), [
|
|
20
|
-
(0, schematics_1.template)({ projectTsConfig }),
|
|
21
|
-
(0, schematics_1.renameTemplateFiles)()
|
|
22
|
-
]), schematics_1.MergeStrategy.Overwrite);
|
|
23
|
-
};
|
|
24
|
-
exports.updateOrAddTsconfigEslint = updateOrAddTsconfigEslint;
|
|
25
|
-
//# sourceMappingURL=index.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../schematics/ng-add/tsconfig/index.ts"],"names":[],"mappings":";;;AAIA,2DAQoC;AACpC,gDAEyB;AACzB;;;;GAIG;AACI,MAAM,yBAAyB,GAAG,CAAC,QAAgB,EAAE,eAAe,GAAG,UAAU,EAAQ,EAAE,CAAC,CAAC,IAAI,EAAE,EAAE;IAC1G,MAAM,YAAY,GAAG,sBAAsB,CAAC;IAC5C,IAAI,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,EAAE,CAAC;QAC9B,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAe,CAAC;QAC3D,QAAQ,CAAC,OAAO,GAAG,CAAC,QAAQ,CAAC,OAAoB,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,oBAAoB,CAAC,CAAC;QACtF,IAAI,CAAC,SAAS,CAAC,YAAY,EAAE,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;QAChE,OAAO,GAAG,EAAE,CAAC,IAAI,CAAC;IACpB,CAAC;IAED,OAAO,GAAG,EAAE,CAAC,IAAA,sBAAS,EAAC,IAAA,kBAAK,EAAC,IAAA,gBAAG,EAAC,IAAA,8BAAiB,EAAC,QAAQ,EAAE,SAAS,CAAC,CAAC,EAAE;QACxE,IAAA,qBAAQ,EAAC,EAAE,eAAe,EAAE,CAAC;QAC7B,IAAA,gCAAmB,GAAE;KACtB,CAAC,EAAE,0BAAa,CAAC,SAAS,CAAC,CAAC;AAC/B,CAAC,CAAC;AAbW,QAAA,yBAAyB,6BAapC"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../schematics/ng-add/vscode/index.ts"],"names":[],"mappings":";;;AAGA,2DAGoC;AACpC,gDAEyB;AAoCzB;;GAEG;AACI,MAAM,YAAY,GAAS,GAAG,EAAE;IACrC,OAAO,IAAA,kBAAK,EAAC;QACX,IAAA,qCAAwB,EAAC,CAAC,wBAAwB,CAAC,CAAC;QACpD,CAAC,IAAI,EAAE,EAAE;YACP,MAAM,kBAAkB,GAAG,uBAAuB,CAAC;YACnD,MAAM,QAAQ,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,kBAAkB,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAmB,CAAC;YACtH,QAAQ,CAAC,sBAAsB,CAAC,GAAG,IAAI,CAAC;YACxC,QAAQ,CAAC,yBAAyB,CAAC,GAAG,wBAAwB,CAAC;YAC/D,QAAQ,CAAC,gCAAgC,CAAC,GAAG,IAAI,CAAC;YAClD,QAAQ,CAAC,6BAA6B,CAAC,GAAG;gBACxC,EAAE,IAAI,EAAE,cAAc,EAAE,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE;gBACxD,EAAE,IAAI,EAAE,eAAe,EAAE,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE;aAC3D,CAAC;YACF,QAAQ,CAAC,0BAA0B,CAAC,KAAK,EAAE,CAAC;YAC5C,QAAQ,CAAC,0BAA0B,CAAC,CAAC,sBAAsB,CAAC,GAAG,UAAU,CAAC;YAC1E,IAAI,IAAI,CAAC,MAAM,CAAC,kBAAkB,CAAC,EAAE,CAAC;gBACpC,IAAI,CAAC,SAAS,CAAC,kBAAkB,EAAE,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;YACxE,CAAC;iBAAM,CAAC;gBACN,IAAI,CAAC,MAAM,CAAC,kBAAkB,EAAE,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;YACrE,CAAC;YACD,OAAO,IAAI,CAAC;QACd,CAAC;KACF,CAAC,CAAC;AACL,CAAC,CAAC;AAvBW,QAAA,YAAY,gBAuBvB"}
|