@o3r/style-dictionary 12.5.0-prerelease.19 → 12.5.0-prerelease.2

package/package.json

@@ -1,7 +1,6 @@
 {
   "name": "@o3r/style-dictionary",
-  "version": "12.5.0-prerelease.19",
-  "deprecated": "This package will be removed in Otter v14. Please use @ama-styling/style-dictionary instead.",
+  "version": "12.5.0-prerelease.2",
   "type": "module",
   "publishConfig": {
     "access": "public"
@@ -23,7 +22,7 @@
     "build:builders": "tsc -b tsconfig.builders.json --pretty && yarn generate-cjs-manifest",
     "build:source": "tsc -b tsconfig.build.json && yarn cpy package.json dist/",
     "build": "yarn nx build design",
-    "prepare:build:builders": "yarn cpy 'schematics/**/*.json' dist/schematics && yarn cpy 'migration.json' dist && yarn cpy 'collection.json' dist && yarn copy:templates",
+    "prepare:build:builders": "yarn cpy 'schematics/**/*.json' dist/schematics && yarn cpy 'collection.json' dist && yarn copy:templates",
     "postbuild": "patch-package-json-main"
   },
   "exports": {
@@ -42,14 +41,14 @@
   "dependencies": {
     "@angular-devkit/architect": "~0.1902.0",
     "@angular-devkit/schematics": "~19.2.0",
-    "@o3r/schematics": "^12.5.0-prerelease.19",
+    "@o3r/schematics": "^12.5.0-prerelease.2",
     "@schematics/angular": "~19.2.0",
     "tslib": "^2.6.2"
   },
   "peerDependencies": {
-    "@o3r/core": "^12.5.0-prerelease.19",
-    "@o3r/schematics": "^12.5.0-prerelease.19",
-    "@o3r/telemetry": "^12.5.0-prerelease.19",
+    "@o3r/core": "^12.5.0-prerelease.2",
+    "@o3r/schematics": "^12.5.0-prerelease.2",
+    "@o3r/telemetry": "^12.5.0-prerelease.2",
     "style-dictionary": "^4.3.2",
     "type-fest": "^4.30.1"
   },
@@ -63,6 +62,12 @@
     "@o3r/telemetry": {
       "optional": true
     },
+    "chokidar": {
+      "optional": true
+    },
+    "globby": {
+      "optional": true
+    },
     "type-fest": {
       "optional": true
     }
@@ -77,28 +82,28 @@
     "@nx/eslint-plugin": "~20.8.0",
     "@nx/jest": "~20.8.0",
     "@nx/js": "~20.8.0",
-    "@o3r/build-helpers": "^12.5.0-prerelease.19",
-    "@o3r/core": "^12.5.0-prerelease.19",
-    "@o3r/eslint-plugin": "^12.5.0-prerelease.19",
-    "@o3r/telemetry": "^12.5.0-prerelease.19",
-    "@o3r/test-helpers": "^12.5.0-prerelease.19",
+    "@o3r/build-helpers": "^12.5.0-prerelease.2",
+    "@o3r/core": "^12.5.0-prerelease.2",
+    "@o3r/eslint-plugin": "^12.5.0-prerelease.2",
+    "@o3r/telemetry": "^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/jest": "~29.5.2",
     "@types/minimist": "^1.2.2",
     "@types/node": "^20.0.0",
     "@types/semver": "^7.3.13",
-    "@typescript-eslint/parser": "~8.35.0",
+    "@typescript-eslint/parser": "~8.34.0",
     "angular-eslint": "~19.4.0",
     "babel-jest": "^29.7.0",
     "chokidar": "^4.0.3",
     "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",
@@ -115,17 +120,13 @@
     "ts-node": "~10.9.2",
     "type-fest": "^4.30.1",
     "typescript": "~5.8.2",
-    "typescript-eslint": "~8.35.0",
+    "typescript-eslint": "~8.34.0",
     "zone.js": "~0.15.0"
   },
   "engines": {
     "node": "^20.11.1 || >=22.0.0"
   },
   "schematics": "./collection.json",
-  "ng-update": {
-    "migrations": "./migration.json",
-    "requirements": "^12.0.0"
-  },
   "contributors": [
     {
       "name": "Yannick Adam",

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,EAQL,IAAI,EAGL,MAAM,4BAA4B,CAAC;AAcpC,OAAO,KAAK,EACV,qBAAqB,EACtB,MAAM,UAAU,CAAC;AAuGlB;;;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,EAQL,IAAI,EAGL,MAAM,4BAA4B,CAAC;AAcpC,OAAO,KAAK,EACV,qBAAqB,EACtB,MAAM,UAAU,CAAC;AA0FlB;;;GAGG;AACH,eAAO,MAAM,KAAK,GAAI,SAAS,qBAAqB,SAA2C,CAAC"}

package/schematics/ng-add/index.js

@@ -4,27 +4,19 @@ exports.ngAdd = void 0;
 const path = require("node:path");
 const schematics_1 = require("@angular-devkit/schematics");
 const schematics_2 = require("@o3r/schematics");
-/**
- * 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 = [
-    'style-dictionary'
-];
 /**
  * Add Otter Style Dictionary process to an Angular Project
  * @param options
  */
 function ngAddFn(options) {
-    const setup = (tree, context) => {
-        const packageJsonPath = path.resolve(__dirname, '..', '..', 'package.json');
-        const depsInfo = (0, schematics_2.getO3rPeerDeps)(packageJsonPath, true);
+    const setup = async (tree, context) => {
+        const devDependenciesToInstall = [
+            'style-dictionary'
+        ];
+        const depsInfo = (0, schematics_2.getO3rPeerDeps)(path.resolve(__dirname, '..', '..', 'package.json'), true);
         const workspaceProject = options.projectName ? (0, schematics_2.getWorkspaceConfig)(tree)?.projects[options.projectName] : undefined;
-        const projectDirectory = workspaceProject?.root || '.';
-        const projectPackageJson = tree.readJson(path.join(projectDirectory, 'package.json'));
+        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] = {
                 inManifest: [{
@@ -35,19 +27,18 @@ function ngAddFn(options) {
             };
             return acc;
         }, (0, schematics_2.getPackageInstallConfig)(packageJsonPath, tree, options.projectName, true, !!options.exactO3rVersion));
-        const externalDependenciesInfo = (0, schematics_2.getExternalDependenciesInfo)({
-            devDependenciesToInstall,
-            dependenciesToInstall,
-            o3rPackageJsonPath: packageJsonPath,
-            projectPackageJson,
-            projectType: workspaceProject?.projectType
-        }, context.logger);
+        Object.entries((0, schematics_2.getExternalDependenciesVersionRange)(devDependenciesToInstall, packageJsonPath, context.logger))
+            .forEach(([dep, range]) => {
+            dependencies[dep] = {
+                inManifest: [{
+                        range,
+                        types: [NodeDependencyType.Dev]
+                    }]
+            };
+        });
         return (0, schematics_2.setupDependencies)({
             projectName: options.projectName,
-            dependencies: {
-                ...dependencies,
-                ...externalDependenciesInfo
-            },
+            dependencies,
             ngAddToRun: depsInfo.o3rPeerDeps
         });
     };

package/migration.json

@@ -1,10 +0,0 @@
-{
-  "$schema": "https://raw.githubusercontent.com/angular/angular-cli/master/packages/angular_devkit/schematics/collection-schema.json",
-  "schematics": {
-    "migration": {
-      "version": "*",
-      "description": "Migration of @o3r/style-dictionary to new scope",
-      "factory": "./schematics/ng-update/index#updateAll"
-    }
-  }
-}

package/schematics/ng-update/index.d.ts

@@ -1,6 +0,0 @@
-import type { Rule } from '@angular-devkit/schematics';
-/**
- * Update of Otter library V13.0
- */
-export declare const updateAll: (options: any) => Rule;
-//# sourceMappingURL=index.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/ng-update/index.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EACV,IAAI,EACL,MAAM,4BAA4B,CAAC;AA0BpC;;GAEG;AACH,eAAO,MAAM,SAAS,wBAMnB,CAAC"}

package/schematics/ng-update/index.js

@@ -1,34 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.updateAll = void 0;
-const schematics_1 = require("@angular-devkit/schematics");
-const schematics_2 = require("@o3r/schematics");
-/**
- * Rule to update the Style-dictionary configuration to new scope
- * @param tree
- * @param context
- */
-const updateStyleDictionaryConfig = (tree, context) => {
-    const excludes = ['**/node_modules/**', '**/.cache/**'];
-    const extensionMatcher = /config\.[mc]?js$/;
-    const configFiles = (0, schematics_2.getAllFilesInTree)(tree, '/', excludes)
-        .filter((filePath) => extensionMatcher.test(filePath));
-    configFiles.forEach((file) => {
-        const text = tree.readText(file);
-        if (text.includes('@o3r/style-dictionary')) {
-            context.logger.debug(`Update ${file}`);
-            tree.overwrite(file, text.replace(/o3r/g, 'ama'));
-        }
-    });
-};
-/**
- * Update of Otter library V13.0
- */
-exports.updateAll = (0, schematics_2.createOtterSchematic)(() => (0, schematics_1.chain)([
-    updateStyleDictionaryConfig,
-    (_, context) => {
-        context.logger.warn('The package "@o3r/style-dictionary" is deprecated, please install "@ama-styling/style-dictionary" with the following command:');
-        context.logger.warn('ng add @ama-styling/style-dictionary');
-    }
-]));
-//# sourceMappingURL=index.js.map