npm - @o3r/eslint-config - Versions diffs - 12.5.0-prerelease.4 → 12.5.0-prerelease.41 - Mend

@o3r/eslint-config 12.5.0-prerelease.4 → 12.5.0-prerelease.41

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.

Files changed (3) hide show

package/package.json +18 -14
package/schematics/ng-add/index.d.ts.map +1 -1
package/schematics/ng-add/index.js +52 -41

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@o3r/eslint-config",
-  "version": "12.5.0-prerelease.4",
+  "version": "12.5.0-prerelease.41",
   "publishConfig": {
     "access": "public"
   },
@@ -37,7 +37,7 @@
     "build:builders": "tsc -b tsconfig.builders.json --pretty && yarn generate-cjs-manifest"
   },
   "dependencies": {
-    "@o3r/schematics": "^12.5.0-prerelease.4"
+    "@o3r/schematics": "^12.5.0-prerelease.41"
   },
   "peerDependencies": {
     "@angular-devkit/core": "^19.0.0",
@@ -46,8 +46,8 @@
     "@angular/compiler": "^19.0.0",
     "@eslint-community/eslint-plugin-eslint-comments": "^4.4.0",
     "@eslint/js": "^8.57.0 || ^9.22.0",
-    "@o3r/eslint-plugin": "^12.5.0-prerelease.4",
-    "@o3r/schematics": "^12.5.0-prerelease.4",
+    "@o3r/eslint-plugin": "^12.5.0-prerelease.41",
+    "@o3r/schematics": "^12.5.0-prerelease.41",
     "@schematics/angular": "^19.0.0",
     "@stylistic/eslint-plugin": "~3.1.0",
     "@typescript-eslint/parser": "^8.15.0",
@@ -71,32 +71,33 @@
     "ts-node": "^10.9.2",
     "type-fest": "^4.30.1",
     "typescript": "^5.5.4",
-    "typescript-eslint": "^8.15.0"
+    "typescript-eslint": "^8.15.0",
+    "yaml-eslint-parser": "^1.2.2"
   },
   "devDependencies": {
     "@angular-devkit/core": "~19.2.0",
     "@angular-devkit/schematics": "~19.2.0",
     "@angular/compiler": "~19.2.0",
     "@eslint-community/eslint-plugin-eslint-comments": "^4.4.0",
-    "@eslint/js": "~9.28.0",
+    "@eslint/js": "~9.31.0",
     "@nx/eslint-plugin": "~20.8.0",
-    "@o3r/build-helpers": "^12.5.0-prerelease.4",
-    "@o3r/eslint-plugin": "^12.5.0-prerelease.4",
-    "@o3r/test-helpers": "^12.5.0-prerelease.4",
+    "@o3r/build-helpers": "^12.5.0-prerelease.41",
+    "@o3r/eslint-plugin": "^12.5.0-prerelease.41",
+    "@o3r/test-helpers": "^12.5.0-prerelease.41",
     "@schematics/angular": "~19.2.0",
     "@stylistic/eslint-plugin": "~3.1.0",
     "@types/eslint__js": "^8.42.3",
     "@types/jest": "~29.5.2",
     "@types/node": "^20.0.0",
-    "@typescript-eslint/parser": "~8.34.0",
+    "@typescript-eslint/parser": "~8.37.0",
     "angular-eslint": "~19.4.0",
     "cpy-cli": "^5.0.0",
-    "eslint": "~9.28.0",
+    "eslint": "~9.31.0",
     "eslint-import-resolver-node": "~0.3.9",
     "eslint-import-resolver-typescript": "~3.10.0",
-    "eslint-plugin-import": "~2.31.0",
+    "eslint-plugin-import": "~2.32.0",
     "eslint-plugin-import-newlines": "~1.4.0",
-    "eslint-plugin-jest": "~28.13.0",
+    "eslint-plugin-jest": "~28.14.0",
     "eslint-plugin-jsdoc": "~50.8.0",
     "eslint-plugin-prefer-arrow": "~1.2.3",
     "eslint-plugin-unicorn": "~56.0.0",
@@ -114,7 +115,7 @@
     "tslib": "^2.6.2",
     "type-fest": "^4.30.1",
     "typescript": "~5.8.2",
-    "typescript-eslint": "~8.34.0"
+    "typescript-eslint": "~8.37.0"
   },
   "peerDependenciesMeta": {
     "@angular-devkit/core": {
@@ -155,6 +156,9 @@
     },
     "typescript": {
       "optional": true
+    },
+    "yaml-eslint-parser": {
+      "optional": true
     }
   },
   "schematics": "./collection.json",

package/schematics/ng-add/index.d.ts.map CHANGED Viewed

	@@ -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"}

package/schematics/ng-add/index.js CHANGED Viewed

@@ -6,6 +6,37 @@ const schematics_1 = require("@angular-devkit/schematics");
 const schematics_2 = require("@o3r/schematics");
 const index_1 = require("./eslint/index");
 const index_2 = require("./vscode/index");
+/**
+ * List of external dependencies to be added to the project as peer dependencies
+ */
+const dependenciesToInstall = [];
+/**
+ * List of external dependencies to be added to the project as dev dependencies
+ */
+const devDependenciesToInstall = [
+    '@eslint/js',
+    '@eslint-community/eslint-plugin-eslint-comments',
+    '@stylistic/eslint-plugin',
+    '@typescript-eslint/parser',
+    '@typescript-eslint/utils',
+    '@typescript-eslint/types',
+    'angular-eslint',
+    'eslint',
+    'eslint-import-resolver-node',
+    'eslint-import-resolver-typescript',
+    'eslint-plugin-import',
+    'eslint-plugin-import-newlines',
+    'eslint-plugin-jsdoc',
+    'eslint-plugin-prefer-arrow',
+    'eslint-plugin-unicorn',
+    'eslint-plugin-unused-imports',
+    'globals',
+    'globby',
+    'jsonc-eslint-parser',
+    'typescript-eslint'
+    // TODO: reactivate once https://github.com/nirtamir2/eslint-plugin-sort-export-all/issues/18 is fixed
+    // 'eslint-plugin-sort-export-all',
+];
 const handleOtterEslintErrors = (projectName) => (tree, context) => {
     if (!projectName) {
         return;
@@ -50,7 +81,7 @@ const addHarmonizeScript = () => {
             return tree;
         }
         const postInstall = rootPackageJsonObject.scripts.postinstall;
-        rootPackageJsonObject.scripts.harmonize = `eslint '**/package.json' ${isYarnPackageManager ? '.yarnrc.yml ' : ''}--quiet --fix`;
+        rootPackageJsonObject.scripts.harmonize = `eslint "**/package.json" ${isYarnPackageManager ? '.yarnrc.yml ' : ''}--quiet --fix --no-error-on-unmatched-pattern`;
         rootPackageJsonObject.scripts.postinstall = `${postInstall ? postInstall + ' && ' : ''}${extraPostInstall}`;
         tree.overwrite(rootPackageJsonPath, JSON.stringify(rootPackageJsonObject, null, 2));
         return tree;
@@ -58,44 +89,21 @@ const addHarmonizeScript = () => {
 };
 function ngAddFn(options) {
     /* ng add rules */
-    return async (tree, context) => {
+    return (tree, context) => {
         let installJestPlugin = false;
         try {
             require.resolve('jest');
             installJestPlugin = true;
         }
         catch { }
-        const devDependenciesToInstall = [
-            '@eslint-community/eslint-plugin-eslint-comments',
-            '@eslint/js',
-            '@stylistic/eslint-plugin',
-            '@typescript-eslint/parser',
-            '@typescript-eslint/utils',
-            '@typescript-eslint/types',
-            'angular-eslint',
-            'eslint',
-            'eslint-import-resolver-node',
-            'eslint-import-resolver-typescript',
-            'eslint-plugin-import',
-            'eslint-plugin-import-newlines',
-            ...(installJestPlugin ? ['eslint-plugin-jest'] : []),
-            'eslint-plugin-jsdoc',
-            'eslint-plugin-prefer-arrow',
-            // TODO: reactivate once https://github.com/nirtamir2/eslint-plugin-sort-export-all/issues/18 is fixed
-            // 'eslint-plugin-sort-export-all',
-            'eslint-plugin-unicorn',
-            'eslint-plugin-unused-imports',
-            'globby',
-            'globals',
-            'jsonc-eslint-parser',
-            'typescript-eslint',
-            // TODO could be removed once #2482 is fixed
-            'yaml-eslint-parser',
-            ...(options.projectName ? ['@angular-eslint/builder'] : [])
-        ];
+        if (installJestPlugin) {
+            devDependenciesToInstall.push('eslint-plugin-jest');
+        }
+        if (options.projectName) {
+            devDependenciesToInstall.push('@angular-eslint/builder');
+        }
         const depsInfo = (0, schematics_2.getO3rPeerDeps)(path.resolve(__dirname, '..', '..', 'package.json'), true, /^@(?:o3r|ama-sdk)/);
         const workspaceProject = options.projectName ? (0, schematics_2.getWorkspaceConfig)(tree)?.projects[options.projectName] : undefined;
-        const { NodeDependencyType } = await Promise.resolve().then(() => require('@schematics/angular/utility/dependencies'));
         const packageJsonPath = path.resolve(__dirname, '..', '..', 'package.json');
         const dependencies = depsInfo.o3rPeerDeps.reduce((acc, dep) => {
             acc[dep] = {
@@ -107,19 +115,22 @@ function ngAddFn(options) {
             };
             return acc;
         }, (0, schematics_2.getPackageInstallConfig)(packageJsonPath, tree, options.projectName, true, !!options.exactO3rVersion));
-        Object.entries((0, schematics_2.getExternalDependenciesVersionRange)(devDependenciesToInstall, packageJsonPath, context.logger))
-            .forEach(([dep, range]) => {
-            dependencies[dep] = {
-                inManifest: [{
-                        range,
-                        types: [NodeDependencyType.Dev]
-                    }]
-            };
-        });
+        const projectDirectory = workspaceProject?.root || '.';
+        const projectPackageJson = tree.readJson(path.posix.join(projectDirectory, 'package.json'));
+        const externalDependenciesInfo = (0, schematics_2.getExternalDependenciesInfo)({
+            devDependenciesToInstall,
+            dependenciesToInstall,
+            projectType: workspaceProject?.projectType,
+            projectPackageJson,
+            o3rPackageJsonPath: packageJsonPath
+        }, context.logger);
         return () => (0, schematics_1.chain)([
             (0, schematics_2.setupDependencies)({
                 projectName: options.projectName,
-                dependencies,
+                dependencies: {
+                    ...dependencies,
+                    ...externalDependenciesInfo
+                },
                 ngAddToRun: depsInfo.o3rPeerDeps
             }),
             index_2.updateVscode,