@o3r/eslint-config 12.2.5 → 12.2.7
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
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@o3r/eslint-config",
|
|
3
|
-
"version": "12.2.
|
|
3
|
+
"version": "12.2.7",
|
|
4
4
|
"publishConfig": {
|
|
5
5
|
"access": "public"
|
|
6
6
|
},
|
|
@@ -40,8 +40,8 @@
|
|
|
40
40
|
"@angular/compiler": "^19.0.0",
|
|
41
41
|
"@eslint-community/eslint-plugin-eslint-comments": "^4.4.0",
|
|
42
42
|
"@eslint/js": "^8.57.0 || ^9.16.0",
|
|
43
|
-
"@o3r/eslint-plugin": "^12.2.
|
|
44
|
-
"@o3r/schematics": "^12.2.
|
|
43
|
+
"@o3r/eslint-plugin": "^12.2.7",
|
|
44
|
+
"@o3r/schematics": "^12.2.7",
|
|
45
45
|
"@schematics/angular": "^19.0.0",
|
|
46
46
|
"@stylistic/eslint-plugin": "~3.1.0",
|
|
47
47
|
"@typescript-eslint/parser": "^8.15.0",
|
|
@@ -63,6 +63,7 @@
|
|
|
63
63
|
"jest": "^29.7.0",
|
|
64
64
|
"jsonc-eslint-parser": "^2.4.0",
|
|
65
65
|
"ts-node": "^10.9.2",
|
|
66
|
+
"type-fest": "^4.30.1",
|
|
66
67
|
"typescript": "^5.5.4",
|
|
67
68
|
"typescript-eslint": "^8.15.0"
|
|
68
69
|
},
|
|
@@ -73,10 +74,10 @@
|
|
|
73
74
|
"@eslint-community/eslint-plugin-eslint-comments": "^4.4.0",
|
|
74
75
|
"@eslint/js": "~9.23.0",
|
|
75
76
|
"@nx/eslint-plugin": "~20.6.0",
|
|
76
|
-
"@o3r/build-helpers": "^12.2.
|
|
77
|
-
"@o3r/eslint-plugin": "^12.2.
|
|
78
|
-
"@o3r/schematics": "^12.2.
|
|
79
|
-
"@o3r/test-helpers": "^12.2.
|
|
77
|
+
"@o3r/build-helpers": "^12.2.7",
|
|
78
|
+
"@o3r/eslint-plugin": "^12.2.7",
|
|
79
|
+
"@o3r/schematics": "^12.2.7",
|
|
80
|
+
"@o3r/test-helpers": "^12.2.7",
|
|
80
81
|
"@schematics/angular": "~19.2.0",
|
|
81
82
|
"@stylistic/eslint-plugin": "~3.1.0",
|
|
82
83
|
"@types/eslint__js": "^8.42.3",
|
|
@@ -144,6 +145,9 @@
|
|
|
144
145
|
"jest": {
|
|
145
146
|
"optional": true
|
|
146
147
|
},
|
|
148
|
+
"type-fest": {
|
|
149
|
+
"optional": true
|
|
150
|
+
},
|
|
147
151
|
"typescript": {
|
|
148
152
|
"optional": true
|
|
149
153
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":"AACA,OAAO,EAGL,KAAK,IAAI,EAGV,MAAM,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":"AACA,OAAO,EAGL,KAAK,IAAI,EAGV,MAAM,4BAA4B,CAAC;AAOpC,OAAO,KAAK,EACV,qBAAqB,EACtB,MAAM,UAAU,CAAC;AAiJlB;;;GAGG;AACH,eAAO,MAAM,KAAK,GAAI,SAAS,qBAAqB,KAAG,IAKtD,CAAC"}
|
|
@@ -10,6 +10,37 @@ const reportMissingSchematicsDep = (logger) => (reason) => {
|
|
|
10
10
|
You need to install '@o3r/schematics' package to be able to use the eslint-config package. Please run 'ng add @o3r/schematics' .`);
|
|
11
11
|
throw reason;
|
|
12
12
|
};
|
|
13
|
+
/**
|
|
14
|
+
* List of external dependencies to be added to the project as peer dependencies
|
|
15
|
+
*/
|
|
16
|
+
const dependenciesToInstall = [];
|
|
17
|
+
/**
|
|
18
|
+
* List of external dependencies to be added to the project as dev dependencies
|
|
19
|
+
*/
|
|
20
|
+
const devDependenciesToInstall = [
|
|
21
|
+
'@eslint/js',
|
|
22
|
+
'@eslint-community/eslint-plugin-eslint-comments',
|
|
23
|
+
'@stylistic/eslint-plugin',
|
|
24
|
+
'@typescript-eslint/parser',
|
|
25
|
+
'@typescript-eslint/utils',
|
|
26
|
+
'@typescript-eslint/types',
|
|
27
|
+
'angular-eslint',
|
|
28
|
+
'eslint',
|
|
29
|
+
'eslint-import-resolver-node',
|
|
30
|
+
'eslint-import-resolver-typescript',
|
|
31
|
+
'eslint-plugin-import',
|
|
32
|
+
'eslint-plugin-import-newlines',
|
|
33
|
+
'eslint-plugin-jsdoc',
|
|
34
|
+
'eslint-plugin-prefer-arrow',
|
|
35
|
+
'eslint-plugin-unicorn',
|
|
36
|
+
'eslint-plugin-unused-imports',
|
|
37
|
+
'globals',
|
|
38
|
+
'globby',
|
|
39
|
+
'jsonc-eslint-parser',
|
|
40
|
+
'typescript-eslint'
|
|
41
|
+
// TODO: reactivate once https://github.com/nirtamir2/eslint-plugin-sort-export-all/issues/18 is fixed
|
|
42
|
+
// 'eslint-plugin-sort-export-all',
|
|
43
|
+
];
|
|
13
44
|
const handleOtterEslintErrors = (projectName) => async (tree, context) => {
|
|
14
45
|
if (!projectName) {
|
|
15
46
|
return;
|
|
@@ -46,38 +77,15 @@ function ngAddFn(options) {
|
|
|
46
77
|
installJestPlugin = true;
|
|
47
78
|
}
|
|
48
79
|
catch { }
|
|
49
|
-
|
|
50
|
-
'
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
'@
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
'angular-eslint',
|
|
57
|
-
'eslint',
|
|
58
|
-
'eslint-import-resolver-node',
|
|
59
|
-
'eslint-import-resolver-typescript',
|
|
60
|
-
'eslint-plugin-import',
|
|
61
|
-
'eslint-plugin-import-newlines',
|
|
62
|
-
...(installJestPlugin ? ['eslint-plugin-jest'] : []),
|
|
63
|
-
'eslint-plugin-jsdoc',
|
|
64
|
-
'eslint-plugin-prefer-arrow',
|
|
65
|
-
// TODO: reactivate once https://github.com/nirtamir2/eslint-plugin-sort-export-all/issues/18 is fixed
|
|
66
|
-
// 'eslint-plugin-sort-export-all',
|
|
67
|
-
'eslint-plugin-unicorn',
|
|
68
|
-
'eslint-plugin-unused-imports',
|
|
69
|
-
'globby',
|
|
70
|
-
'globals',
|
|
71
|
-
'jsonc-eslint-parser',
|
|
72
|
-
'typescript-eslint',
|
|
73
|
-
// TODO could be removed once #2482 is fixed
|
|
74
|
-
'yaml-eslint-parser',
|
|
75
|
-
...(options.projectName ? ['@angular-eslint/builder'] : [])
|
|
76
|
-
];
|
|
77
|
-
const { getExternalDependenciesVersionRange, setupDependencies, getWorkspaceConfig, getO3rPeerDeps, getProjectNewDependenciesTypes, getPackageInstallConfig } = await Promise.resolve().then(() => require('@o3r/schematics'));
|
|
80
|
+
if (installJestPlugin) {
|
|
81
|
+
devDependenciesToInstall.push('eslint-plugin-jest');
|
|
82
|
+
}
|
|
83
|
+
if (options.projectName) {
|
|
84
|
+
devDependenciesToInstall.push('@angular-eslint/builder');
|
|
85
|
+
}
|
|
86
|
+
const { getExternalDependenciesInfo, setupDependencies, getWorkspaceConfig, getO3rPeerDeps, getProjectNewDependenciesTypes, getPackageInstallConfig } = await Promise.resolve().then(() => require('@o3r/schematics'));
|
|
78
87
|
const depsInfo = getO3rPeerDeps(path.resolve(__dirname, '..', '..', 'package.json'), true, /^@(?:o3r|ama-sdk)/);
|
|
79
88
|
const workspaceProject = options.projectName ? getWorkspaceConfig(tree)?.projects[options.projectName] : undefined;
|
|
80
|
-
const { NodeDependencyType } = await Promise.resolve().then(() => require('@schematics/angular/utility/dependencies'));
|
|
81
89
|
const packageJsonPath = path.resolve(__dirname, '..', '..', 'package.json');
|
|
82
90
|
const dependencies = depsInfo.o3rPeerDeps.reduce((acc, dep) => {
|
|
83
91
|
acc[dep] = {
|
|
@@ -89,19 +97,22 @@ function ngAddFn(options) {
|
|
|
89
97
|
};
|
|
90
98
|
return acc;
|
|
91
99
|
}, getPackageInstallConfig(packageJsonPath, tree, options.projectName, true, !!options.exactO3rVersion));
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
});
|
|
100
|
+
const projectDirectory = workspaceProject?.root || '.';
|
|
101
|
+
const projectPackageJson = tree.readJson(path.posix.join(projectDirectory, 'package.json'));
|
|
102
|
+
const externalDependenciesInfo = getExternalDependenciesInfo({
|
|
103
|
+
devDependenciesToInstall,
|
|
104
|
+
dependenciesToInstall,
|
|
105
|
+
projectType: workspaceProject?.projectType,
|
|
106
|
+
projectPackageJson,
|
|
107
|
+
o3rPackageJsonPath: packageJsonPath
|
|
108
|
+
}, context.logger);
|
|
101
109
|
return () => (0, schematics_1.chain)([
|
|
102
110
|
setupDependencies({
|
|
103
111
|
projectName: options.projectName,
|
|
104
|
-
dependencies
|
|
112
|
+
dependencies: {
|
|
113
|
+
...dependencies,
|
|
114
|
+
...externalDependenciesInfo
|
|
115
|
+
},
|
|
105
116
|
ngAddToRun: depsInfo.o3rPeerDeps
|
|
106
117
|
}),
|
|
107
118
|
index_2.updateVscode,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":";;;AAAA,kCAAkC;AAClC,2DAMoC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":"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"}
|