@o3r/stylelint-plugin 12.5.0-prerelease.18 → 12.5.0-prerelease.2

package/package.json

@@ -1,7 +1,6 @@
 {
   "name": "@o3r/stylelint-plugin",
-  "version": "12.5.0-prerelease.18",
-  "deprecated": "This package is will be removed in Otter v14. Please use @ama-styling/stylelint-plugin instead.",
+  "version": "12.5.0-prerelease.2",
   "publishConfig": {
     "access": "public"
   },
@@ -24,18 +23,17 @@
     "build:builders": "tsc -b tsconfig.builders.json --pretty && yarn generate-cjs-manifest"
   },
   "dependencies": {
-    "@o3r/schematics": "^12.5.0-prerelease.18",
+    "@o3r/schematics": "^12.5.0-prerelease.2",
     "ts-node": "~10.9.2",
     "tslib": "^2.6.2"
   },
   "peerDependencies": {
     "@angular-devkit/schematics": "^19.0.0",
-    "@o3r/schematics": "^12.5.0-prerelease.18",
+    "@o3r/schematics": "^12.5.0-prerelease.2",
     "@schematics/angular": "^19.0.0",
     "postcss": "^8.4.5",
     "postcss-scss": "^4.0.9",
-    "stylelint": "^16.0.2",
-    "type-fest": "^4.30.1"
+    "stylelint": "^16.0.2"
   },
   "peerDependenciesMeta": {
     "@angular-devkit/schematics": {
@@ -46,9 +44,6 @@
     },
     "@schematics/angular": {
       "optional": true
-    },
-    "type-fest": {
-      "optional": true
     }
   },
   "devDependencies": {
@@ -62,25 +57,25 @@
     "@eslint-community/eslint-plugin-eslint-comments": "^4.4.0",
     "@nx/eslint-plugin": "~20.8.0",
     "@nx/jest": "~20.8.0",
-    "@o3r/build-helpers": "^12.5.0-prerelease.18",
-    "@o3r/eslint-config": "^12.5.0-prerelease.18",
-    "@o3r/eslint-plugin": "^12.5.0-prerelease.18",
-    "@o3r/test-helpers": "^12.5.0-prerelease.18",
+    "@o3r/build-helpers": "^12.5.0-prerelease.2",
+    "@o3r/eslint-config": "^12.5.0-prerelease.2",
+    "@o3r/eslint-plugin": "^12.5.0-prerelease.2",
+    "@o3r/test-helpers": "^12.5.0-prerelease.2",
     "@schematics/angular": "~19.2.0",
     "@stylistic/eslint-plugin": "~3.1.0",
     "@types/css-tree": "~2.3.0",
     "@types/jest": "~29.5.2",
     "@types/node": "^20.0.0",
-    "@typescript-eslint/parser": "~8.35.0",
+    "@typescript-eslint/parser": "~8.34.0",
     "angular-eslint": "~19.4.0",
     "babel-jest": "^29.7.0",
     "cpy-cli": "^5.0.0",
-    "eslint": "~9.29.0",
+    "eslint": "~9.28.0",
     "eslint-import-resolver-node": "~0.3.9",
     "eslint-import-resolver-typescript": "~3.10.0",
-    "eslint-plugin-import": "~2.32.0",
+    "eslint-plugin-import": "~2.31.0",
     "eslint-plugin-import-newlines": "~1.4.0",
-    "eslint-plugin-jest": "~28.14.0",
+    "eslint-plugin-jest": "~28.13.0",
     "eslint-plugin-jsdoc": "~50.8.0",
     "eslint-plugin-prefer-arrow": "~1.2.3",
     "eslint-plugin-unicorn": "~56.0.0",
@@ -96,12 +91,12 @@
     "rimraf": "^6.0.1",
     "rxjs": "^7.8.1",
     "semver": "^7.5.2",
-    "stylelint": "~16.21.0",
+    "stylelint": "~16.20.0",
     "ts-jest": "~29.3.0",
     "ts-node": "~10.9.2",
     "type-fest": "^4.30.1",
     "typescript": "~5.8.2",
-    "typescript-eslint": "~8.35.0"
+    "typescript-eslint": "~8.34.0"
   },
   "main": "./src/public_api.mjs",
   "schematics": "./collection.json",

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,IAAI,EACL,MAAM,4BAA4B,CAAC;AAapC,OAAO,KAAK,EACV,qBAAqB,EACtB,MAAM,UAAU,CAAC;AA0DlB;;;GAGG;AACH,eAAO,MAAM,KAAK,GAAI,SAAS,qBAAqB,SAA2C,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,IAAI,EACL,MAAM,4BAA4B,CAAC;AAUpC,OAAO,KAAK,EACV,qBAAqB,EACtB,MAAM,UAAU,CAAC;AA2ClB;;;GAGG;AACH,eAAO,MAAM,KAAK,GAAI,SAAS,qBAAqB,SAA2C,CAAC"}

package/schematics/ng-add/index.js

@@ -4,14 +4,7 @@ exports.ngAdd = void 0;
 const path = require("node:path");
 const schematics_1 = require("@o3r/schematics");
 const packageJsonPath = path.resolve(__dirname, '..', '..', 'package.json');
-/**
- * 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 = [
+const dependenciesToInstall = [
     'postcss',
     'postcss-scss',
     'stylelint'
@@ -22,11 +15,10 @@ const devDependenciesToInstall = [
  */
 function ngAddFn(options) {
     /* ng add rules */
-    return (tree, context) => {
+    return async (tree, context) => {
+        const { NodeDependencyType } = await Promise.resolve().then(() => require('@schematics/angular/utility/dependencies'));
         const depsInfo = (0, schematics_1.getO3rPeerDeps)(packageJsonPath);
         const workspaceProject = options.projectName ? (0, schematics_1.getWorkspaceConfig)(tree)?.projects[options.projectName] : undefined;
-        const projectDirectory = workspaceProject?.root || '.';
-        const projectPackageJson = tree.readJson(path.posix.join(projectDirectory, 'package.json'));
         const dependencies = depsInfo.o3rPeerDeps.reduce((acc, dep) => {
             acc[dep] = {
                 inManifest: [{
@@ -36,19 +28,17 @@ function ngAddFn(options) {
             };
             return acc;
         }, (0, schematics_1.getPackageInstallConfig)(packageJsonPath, tree, options.projectName, true, !!options.exactO3rVersion));
-        const externalDependenciesInfo = (0, schematics_1.getExternalDependenciesInfo)({
-            devDependenciesToInstall,
-            dependenciesToInstall,
-            projectPackageJson,
-            o3rPackageJsonPath: packageJsonPath,
-            projectType: workspaceProject?.projectType
-        }, context.logger);
+        Object.entries((0, schematics_1.getExternalDependenciesVersionRange)(dependenciesToInstall, packageJsonPath, context.logger)).forEach(([dep, range]) => {
+            dependencies[dep] = {
+                inManifest: [{
+                        range,
+                        types: [NodeDependencyType.Dev]
+                    }]
+            };
+        });
         return (0, schematics_1.setupDependencies)({
             projectName: options.projectName,
-            dependencies: {
-                ...dependencies,
-                ...externalDependenciesInfo
-            }
+            dependencies
         });
     };
 }