@o3r/eslint-config 13.0.0-next.28 → 13.0.0-next.31
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 +10 -10
- package/schematics/ng-add/eslint/index.d.ts.map +1 -1
- package/schematics/ng-add/eslint/index.js +0 -3
- package/schematics/ng-add/eslint/index.js.map +1 -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/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@o3r/eslint-config",
|
|
3
|
-
"version": "13.0.0-next.
|
|
3
|
+
"version": "13.0.0-next.31",
|
|
4
4
|
"publishConfig": {
|
|
5
5
|
"access": "public"
|
|
6
6
|
},
|
|
@@ -37,7 +37,7 @@
|
|
|
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-next.
|
|
40
|
+
"@o3r/schematics": "^13.0.0-next.31"
|
|
41
41
|
},
|
|
42
42
|
"peerDependencies": {
|
|
43
43
|
"@angular-devkit/core": "^20.0.0",
|
|
@@ -46,8 +46,8 @@
|
|
|
46
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-next.
|
|
50
|
-
"@o3r/schematics": "^13.0.0-next.
|
|
49
|
+
"@o3r/eslint-plugin": "^13.0.0-next.31",
|
|
50
|
+
"@o3r/schematics": "^13.0.0-next.31",
|
|
51
51
|
"@schematics/angular": "^20.0.0",
|
|
52
52
|
"@stylistic/eslint-plugin": "~5.2.0",
|
|
53
53
|
"@typescript-eslint/parser": "^8.15.0",
|
|
@@ -60,7 +60,7 @@
|
|
|
60
60
|
"eslint-plugin-import": "^2.31.0",
|
|
61
61
|
"eslint-plugin-import-newlines": "^1.4.0",
|
|
62
62
|
"eslint-plugin-jest": "^29.0.0",
|
|
63
|
-
"eslint-plugin-jsdoc": "^
|
|
63
|
+
"eslint-plugin-jsdoc": "^54.0.0",
|
|
64
64
|
"eslint-plugin-prefer-arrow": "^1.2.2",
|
|
65
65
|
"eslint-plugin-unicorn": "^60.0.0",
|
|
66
66
|
"eslint-plugin-unused-imports": "^4.1.4",
|
|
@@ -81,23 +81,23 @@
|
|
|
81
81
|
"@eslint-community/eslint-plugin-eslint-comments": "^4.4.0",
|
|
82
82
|
"@eslint/js": "~9.33.0",
|
|
83
83
|
"@nx/eslint-plugin": "~21.3.11",
|
|
84
|
-
"@o3r/build-helpers": "^13.0.0-next.
|
|
85
|
-
"@o3r/eslint-plugin": "^13.0.0-next.
|
|
86
|
-
"@o3r/test-helpers": "^13.0.0-next.
|
|
84
|
+
"@o3r/build-helpers": "^13.0.0-next.31",
|
|
85
|
+
"@o3r/eslint-plugin": "^13.0.0-next.31",
|
|
86
|
+
"@o3r/test-helpers": "^13.0.0-next.31",
|
|
87
87
|
"@schematics/angular": "~20.0.0",
|
|
88
88
|
"@stylistic/eslint-plugin": "~5.2.0",
|
|
89
89
|
"@types/jest": "~29.5.2",
|
|
90
90
|
"@types/node": "^22.0.0",
|
|
91
91
|
"@typescript-eslint/parser": "~8.39.0",
|
|
92
92
|
"angular-eslint": "~20.1.0",
|
|
93
|
-
"cpy-cli": "^
|
|
93
|
+
"cpy-cli": "^6.0.0",
|
|
94
94
|
"eslint": "~9.33.0",
|
|
95
95
|
"eslint-import-resolver-node": "~0.3.9",
|
|
96
96
|
"eslint-import-resolver-typescript": "~4.4.0",
|
|
97
97
|
"eslint-plugin-import": "~2.32.0",
|
|
98
98
|
"eslint-plugin-import-newlines": "~1.4.0",
|
|
99
99
|
"eslint-plugin-jest": "~29.0.0",
|
|
100
|
-
"eslint-plugin-jsdoc": "~
|
|
100
|
+
"eslint-plugin-jsdoc": "~54.1.0",
|
|
101
101
|
"eslint-plugin-prefer-arrow": "~1.2.3",
|
|
102
102
|
"eslint-plugin-unicorn": "~60.0.0",
|
|
103
103
|
"eslint-plugin-unused-imports": "~4.1.4",
|
|
@@ -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.js","sourceRoot":"","sources":["../../../../schematics/ng-add/eslint/index.ts"],"names":[],"mappings":";;;AAAA,kCAAkC;AAClC,+CAG8B;AAC9B,2DAWoC;AACpC,gDAIyB;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../schematics/ng-add/eslint/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -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"}
|