@o3r/eslint-config 12.4.0-rc.3 → 12.4.0

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.4.0-rc.3",
3
+ "version": "12.4.0",
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.4.0-rc.3"
40
+ "@o3r/schematics": "^12.4.0"
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.4.0-rc.3",
50
- "@o3r/schematics": "^12.4.0-rc.3",
49
+ "@o3r/eslint-plugin": "^12.4.0",
50
+ "@o3r/schematics": "^12.4.0",
51
51
  "@schematics/angular": "^19.0.0",
52
52
  "@stylistic/eslint-plugin": "~3.1.0",
53
53
  "@typescript-eslint/parser": "^8.15.0",
@@ -71,7 +71,8 @@
71
71
  "ts-node": "^10.9.2",
72
72
  "type-fest": "^4.30.1",
73
73
  "typescript": "^5.5.4",
74
- "typescript-eslint": "^8.15.0"
74
+ "typescript-eslint": "^8.15.0",
75
+ "yaml-eslint-parser": "^1.2.2"
75
76
  },
76
77
  "devDependencies": {
77
78
  "@angular-devkit/core": "~19.2.0",
@@ -80,9 +81,9 @@
80
81
  "@eslint-community/eslint-plugin-eslint-comments": "^4.4.0",
81
82
  "@eslint/js": "~9.28.0",
82
83
  "@nx/eslint-plugin": "~20.8.0",
83
- "@o3r/build-helpers": "^12.4.0-rc.3",
84
- "@o3r/eslint-plugin": "^12.4.0-rc.3",
85
- "@o3r/test-helpers": "^12.4.0-rc.3",
84
+ "@o3r/build-helpers": "^12.4.0",
85
+ "@o3r/eslint-plugin": "^12.4.0",
86
+ "@o3r/test-helpers": "^12.4.0",
86
87
  "@schematics/angular": "~19.2.0",
87
88
  "@stylistic/eslint-plugin": "~3.1.0",
88
89
  "@types/eslint__js": "^8.42.3",
@@ -155,6 +156,9 @@
155
156
  },
156
157
  "typescript": {
157
158
  "optional": true
159
+ },
160
+ "yaml-eslint-parser": {
161
+ "optional": true
158
162
  }
159
163
  },
160
164
  "schematics": "./collection.json",
@@ -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;AA2IlB;;;GAGG;AACH,eAAO,MAAM,KAAK,GAAI,SAAS,qBAAqB,SAA2C,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;AA4JlB;;;GAGG;AACH,eAAO,MAAM,KAAK,GAAI,SAAS,qBAAqB,SAA2C,CAAC"}
@@ -6,6 +6,37 @@ const schematics_1 = require("@angular-devkit/schematics");
6
6
  const schematics_2 = require("@o3r/schematics");
7
7
  const index_1 = require("./eslint/index");
8
8
  const index_2 = require("./vscode/index");
9
+ /**
10
+ * List of external dependencies to be added to the project as peer dependencies
11
+ */
12
+ const dependenciesToInstall = [];
13
+ /**
14
+ * List of external dependencies to be added to the project as dev dependencies
15
+ */
16
+ const devDependenciesToInstall = [
17
+ '@eslint/js',
18
+ '@eslint-community/eslint-plugin-eslint-comments',
19
+ '@stylistic/eslint-plugin',
20
+ '@typescript-eslint/parser',
21
+ '@typescript-eslint/utils',
22
+ '@typescript-eslint/types',
23
+ 'angular-eslint',
24
+ 'eslint',
25
+ 'eslint-import-resolver-node',
26
+ 'eslint-import-resolver-typescript',
27
+ 'eslint-plugin-import',
28
+ 'eslint-plugin-import-newlines',
29
+ 'eslint-plugin-jsdoc',
30
+ 'eslint-plugin-prefer-arrow',
31
+ 'eslint-plugin-unicorn',
32
+ 'eslint-plugin-unused-imports',
33
+ 'globals',
34
+ 'globby',
35
+ 'jsonc-eslint-parser',
36
+ 'typescript-eslint'
37
+ // TODO: reactivate once https://github.com/nirtamir2/eslint-plugin-sort-export-all/issues/18 is fixed
38
+ // 'eslint-plugin-sort-export-all',
39
+ ];
9
40
  const handleOtterEslintErrors = (projectName) => (tree, context) => {
10
41
  if (!projectName) {
11
42
  return;
@@ -50,7 +81,7 @@ const addHarmonizeScript = () => {
50
81
  return tree;
51
82
  }
52
83
  const postInstall = rootPackageJsonObject.scripts.postinstall;
53
- rootPackageJsonObject.scripts.harmonize = `eslint '**/package.json' ${isYarnPackageManager ? '.yarnrc.yml ' : ''}--quiet --fix`;
84
+ rootPackageJsonObject.scripts.harmonize = `eslint '**/package.json' ${isYarnPackageManager ? '.yarnrc.yml ' : ''}--quiet --fix --no-error-on-unmatched-pattern`;
54
85
  rootPackageJsonObject.scripts.postinstall = `${postInstall ? postInstall + ' && ' : ''}${extraPostInstall}`;
55
86
  tree.overwrite(rootPackageJsonPath, JSON.stringify(rootPackageJsonObject, null, 2));
56
87
  return tree;
@@ -58,44 +89,21 @@ const addHarmonizeScript = () => {
58
89
  };
59
90
  function ngAddFn(options) {
60
91
  /* ng add rules */
61
- return async (tree, context) => {
92
+ return (tree, context) => {
62
93
  let installJestPlugin = false;
63
94
  try {
64
95
  require.resolve('jest');
65
96
  installJestPlugin = true;
66
97
  }
67
98
  catch { }
68
- const devDependenciesToInstall = [
69
- '@eslint-community/eslint-plugin-eslint-comments',
70
- '@eslint/js',
71
- '@stylistic/eslint-plugin',
72
- '@typescript-eslint/parser',
73
- '@typescript-eslint/utils',
74
- '@typescript-eslint/types',
75
- 'angular-eslint',
76
- 'eslint',
77
- 'eslint-import-resolver-node',
78
- 'eslint-import-resolver-typescript',
79
- 'eslint-plugin-import',
80
- 'eslint-plugin-import-newlines',
81
- ...(installJestPlugin ? ['eslint-plugin-jest'] : []),
82
- 'eslint-plugin-jsdoc',
83
- 'eslint-plugin-prefer-arrow',
84
- // TODO: reactivate once https://github.com/nirtamir2/eslint-plugin-sort-export-all/issues/18 is fixed
85
- // 'eslint-plugin-sort-export-all',
86
- 'eslint-plugin-unicorn',
87
- 'eslint-plugin-unused-imports',
88
- 'globby',
89
- 'globals',
90
- 'jsonc-eslint-parser',
91
- 'typescript-eslint',
92
- // TODO could be removed once #2482 is fixed
93
- 'yaml-eslint-parser',
94
- ...(options.projectName ? ['@angular-eslint/builder'] : [])
95
- ];
99
+ if (installJestPlugin) {
100
+ devDependenciesToInstall.push('eslint-plugin-jest');
101
+ }
102
+ if (options.projectName) {
103
+ devDependenciesToInstall.push('@angular-eslint/builder');
104
+ }
96
105
  const depsInfo = (0, schematics_2.getO3rPeerDeps)(path.resolve(__dirname, '..', '..', 'package.json'), true, /^@(?:o3r|ama-sdk)/);
97
106
  const workspaceProject = options.projectName ? (0, schematics_2.getWorkspaceConfig)(tree)?.projects[options.projectName] : undefined;
98
- const { NodeDependencyType } = await Promise.resolve().then(() => require('@schematics/angular/utility/dependencies'));
99
107
  const packageJsonPath = path.resolve(__dirname, '..', '..', 'package.json');
100
108
  const dependencies = depsInfo.o3rPeerDeps.reduce((acc, dep) => {
101
109
  acc[dep] = {
@@ -107,19 +115,22 @@ function ngAddFn(options) {
107
115
  };
108
116
  return acc;
109
117
  }, (0, schematics_2.getPackageInstallConfig)(packageJsonPath, tree, options.projectName, true, !!options.exactO3rVersion));
110
- Object.entries((0, schematics_2.getExternalDependenciesVersionRange)(devDependenciesToInstall, packageJsonPath, context.logger))
111
- .forEach(([dep, range]) => {
112
- dependencies[dep] = {
113
- inManifest: [{
114
- range,
115
- types: [NodeDependencyType.Dev]
116
- }]
117
- };
118
- });
118
+ const projectDirectory = workspaceProject?.root || '.';
119
+ const projectPackageJson = tree.readJson(path.posix.join(projectDirectory, 'package.json'));
120
+ const externalDependenciesInfo = (0, schematics_2.getExternalDependenciesInfo)({
121
+ devDependenciesToInstall,
122
+ dependenciesToInstall,
123
+ projectType: workspaceProject?.projectType,
124
+ projectPackageJson,
125
+ o3rPackageJsonPath: packageJsonPath
126
+ }, context.logger);
119
127
  return () => (0, schematics_1.chain)([
120
128
  (0, schematics_2.setupDependencies)({
121
129
  projectName: options.projectName,
122
- dependencies,
130
+ dependencies: {
131
+ ...dependencies,
132
+ ...externalDependenciesInfo
133
+ },
123
134
  ngAddToRun: depsInfo.o3rPeerDeps
124
135
  }),
125
136
  index_2.updateVscode,
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":"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"}