@o3r/eslint-config 12.3.7 → 12.3.9
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.3.
|
|
3
|
+
"version": "12.3.9",
|
|
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": "^12.3.
|
|
40
|
+
"@o3r/schematics": "^12.3.9"
|
|
41
41
|
},
|
|
42
42
|
"peerDependencies": {
|
|
43
43
|
"@angular-devkit/core": "^19.0.0",
|
|
@@ -46,8 +46,8 @@
|
|
|
46
46
|
"@angular/compiler": "^19.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": "^12.3.
|
|
50
|
-
"@o3r/schematics": "^12.3.
|
|
49
|
+
"@o3r/eslint-plugin": "^12.3.9",
|
|
50
|
+
"@o3r/schematics": "^12.3.9",
|
|
51
51
|
"@schematics/angular": "^19.0.0",
|
|
52
52
|
"@stylistic/eslint-plugin": "~3.1.0",
|
|
53
53
|
"@typescript-eslint/parser": "^8.15.0",
|
|
@@ -69,6 +69,7 @@
|
|
|
69
69
|
"jest": "^29.7.0",
|
|
70
70
|
"jsonc-eslint-parser": "^2.4.0",
|
|
71
71
|
"ts-node": "^10.9.2",
|
|
72
|
+
"type-fest": "^4.30.1",
|
|
72
73
|
"typescript": "^5.5.4",
|
|
73
74
|
"typescript-eslint": "^8.15.0"
|
|
74
75
|
},
|
|
@@ -79,9 +80,9 @@
|
|
|
79
80
|
"@eslint-community/eslint-plugin-eslint-comments": "^4.4.0",
|
|
80
81
|
"@eslint/js": "~9.26.0",
|
|
81
82
|
"@nx/eslint-plugin": "~20.8.0",
|
|
82
|
-
"@o3r/build-helpers": "^12.3.
|
|
83
|
-
"@o3r/eslint-plugin": "^12.3.
|
|
84
|
-
"@o3r/test-helpers": "^12.3.
|
|
83
|
+
"@o3r/build-helpers": "^12.3.9",
|
|
84
|
+
"@o3r/eslint-plugin": "^12.3.9",
|
|
85
|
+
"@o3r/test-helpers": "^12.3.9",
|
|
85
86
|
"@schematics/angular": "~19.2.0",
|
|
86
87
|
"@stylistic/eslint-plugin": "~3.1.0",
|
|
87
88
|
"@types/eslint__js": "^8.42.3",
|
|
@@ -149,6 +150,9 @@
|
|
|
149
150
|
"jest": {
|
|
150
151
|
"optional": true
|
|
151
152
|
},
|
|
153
|
+
"type-fest": {
|
|
154
|
+
"optional": true
|
|
155
|
+
},
|
|
152
156
|
"typescript": {
|
|
153
157
|
"optional": true
|
|
154
158
|
}
|
|
@@ -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;AAiBpC,OAAO,KAAK,EACV,qBAAqB,EACtB,MAAM,UAAU,CAAC;AAwHlB;;;GAGG;AACH,eAAO,MAAM,KAAK,GAAI,SAAS,qBAAqB,SAA2C,CAAC"}
|
|
@@ -34,7 +34,7 @@ const handleOtterEslintErrors = (projectName) => (tree, context) => {
|
|
|
34
34
|
};
|
|
35
35
|
function ngAddFn(options) {
|
|
36
36
|
/* ng add rules */
|
|
37
|
-
return
|
|
37
|
+
return (tree, context) => {
|
|
38
38
|
let installJestPlugin = false;
|
|
39
39
|
try {
|
|
40
40
|
require.resolve('jest');
|
|
@@ -71,7 +71,6 @@ function ngAddFn(options) {
|
|
|
71
71
|
];
|
|
72
72
|
const depsInfo = (0, schematics_2.getO3rPeerDeps)(path.resolve(__dirname, '..', '..', 'package.json'), true, /^@(?:o3r|ama-sdk)/);
|
|
73
73
|
const workspaceProject = options.projectName ? (0, schematics_2.getWorkspaceConfig)(tree)?.projects[options.projectName] : undefined;
|
|
74
|
-
const { NodeDependencyType } = await Promise.resolve().then(() => require('@schematics/angular/utility/dependencies'));
|
|
75
74
|
const packageJsonPath = path.resolve(__dirname, '..', '..', 'package.json');
|
|
76
75
|
const dependencies = depsInfo.o3rPeerDeps.reduce((acc, dep) => {
|
|
77
76
|
acc[dep] = {
|
|
@@ -83,19 +82,22 @@ function ngAddFn(options) {
|
|
|
83
82
|
};
|
|
84
83
|
return acc;
|
|
85
84
|
}, (0, schematics_2.getPackageInstallConfig)(packageJsonPath, tree, options.projectName, true, !!options.exactO3rVersion));
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
});
|
|
85
|
+
const projectDirectory = workspaceProject?.root || '.';
|
|
86
|
+
const projectPackageJson = tree.readJson(path.posix.join(projectDirectory, 'package.json'));
|
|
87
|
+
const externalDependenciesInfo = (0, schematics_2.getExternalDependenciesInfo)({
|
|
88
|
+
devDependenciesToInstall,
|
|
89
|
+
dependenciesToInstall: [],
|
|
90
|
+
projectType: workspaceProject?.projectType,
|
|
91
|
+
projectPackageJson,
|
|
92
|
+
o3rPackageJsonPath: packageJsonPath
|
|
93
|
+
}, context.logger);
|
|
95
94
|
return () => (0, schematics_1.chain)([
|
|
96
95
|
(0, schematics_2.setupDependencies)({
|
|
97
96
|
projectName: options.projectName,
|
|
98
|
-
dependencies
|
|
97
|
+
dependencies: {
|
|
98
|
+
...dependencies,
|
|
99
|
+
...externalDependenciesInfo
|
|
100
|
+
},
|
|
99
101
|
ngAddToRun: depsInfo.o3rPeerDeps
|
|
100
102
|
}),
|
|
101
103
|
index_2.updateVscode,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":";;;AAAA,kCAAkC;AAClC,2DAMoC;AACpC,gDASyB;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":"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"}
|