@o3r/styling 12.5.0-prerelease.2 → 12.5.0-prerelease.20

package/package.json

@@ -1,6 +1,7 @@
 {
   "name": "@o3r/styling",
-  "version": "12.5.0-prerelease.2",
+  "version": "12.5.0-prerelease.20",
+  "deprecated": "This package will be removed in Otter v14. Please use @ama-styling/style-dictionary instead.",
   "publishConfig": {
     "access": "public"
   },
@@ -38,11 +39,11 @@
     "@angular/common": "^19.0.0",
     "@angular/core": "^19.0.0",
     "@angular/material": "^19.0.0",
-    "@o3r/core": "^12.5.0-prerelease.2",
-    "@o3r/dynamic-content": "^12.5.0-prerelease.2",
-    "@o3r/extractors": "^12.5.0-prerelease.2",
-    "@o3r/logger": "^12.5.0-prerelease.2",
-    "@o3r/schematics": "^12.5.0-prerelease.2",
+    "@o3r/core": "^12.5.0-prerelease.20",
+    "@o3r/dynamic-content": "^12.5.0-prerelease.20",
+    "@o3r/extractors": "^12.5.0-prerelease.20",
+    "@o3r/logger": "^12.5.0-prerelease.20",
+    "@o3r/schematics": "^12.5.0-prerelease.20",
     "@schematics/angular": "^19.0.0",
     "@yarnpkg/cli": "^4.3.1",
     "@yarnpkg/core": "^4.1.1",
@@ -56,6 +57,7 @@
     "sass-embedded": "^1.81.0",
     "semver": "^7.5.2",
     "ts-node": "~10.9.2",
+    "type-fest": "^4.30.1",
     "typescript": "^5.5.4"
   },
   "peerDependenciesMeta": {
@@ -122,18 +124,19 @@
     "semver": {
       "optional": true
     },
+    "type-fest": {
+      "optional": true
+    },
     "typescript": {
       "optional": true
     }
   },
   "dependencies": {
-    "@o3r/schematics": "^12.5.0-prerelease.2",
+    "@o3r/schematics": "^12.5.0-prerelease.20",
     "tslib": "^2.6.2"
   },
   "generatorDependencies": {
-    "sass-loader": "^16.0.0",
-    "@angular/cdk": "~19.2.0",
-    "@angular/material": "~19.2.0"
+    "sass-loader": "^16.0.0"
   },
   "engines": {
     "node": "^20.11.1 || >=22.0.0"

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":"AAEA,OAAO,EAEL,IAAI,EACL,MAAM,4BAA4B,CAAC;AAkBpC,OAAO,KAAK,EACV,qBAAqB,EACtB,MAAM,UAAU,CAAC;AAgFlB;;;;GAIG;AACH,eAAO,MAAM,KAAK,GAAI,SAAS,qBAAqB,SAA2C,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAEL,IAAI,EACL,MAAM,4BAA4B,CAAC;AAqBpC,OAAO,KAAK,EACV,qBAAqB,EACtB,MAAM,UAAU,CAAC;AAoFlB;;;;GAIG;AACH,eAAO,MAAM,KAAK,GAAI,SAAS,qBAAqB,SAA2C,CAAC"}

package/schematics/ng-add/index.js

@@ -6,14 +6,22 @@ const path = require("node:path");
 const schematics_1 = require("@angular-devkit/schematics");
 const schematics_2 = require("@o3r/schematics");
 const cms_adapter_1 = require("../cms-adapter");
+/**
+ * List of external dependencies to be added to the project as peer dependencies
+ */
+const dependenciesToInstall = [
+    '@angular/cdk',
+    '@angular/material'
+];
+/**
+ * List of external dependencies to be added to the project as dev dependencies
+ */
 const devDependenciesToInstall = [
+    '@angular-devkit/schematics',
+    '@schematics/angular',
     'chokidar',
     'sass-loader'
 ];
-const dependenciesToInstall = [
-    '@angular/material',
-    '@angular/cdk'
-];
 /**
  * Add Otter styling to an Angular Project
  * Update the styling if the app/lib used otter v7
@@ -24,12 +32,13 @@ function ngAddFn(options) {
         const packageJsonPath = path.resolve(__dirname, '..', '..', 'package.json');
         options = { ...(0, schematics_2.getDefaultOptionsForSchematic)((0, schematics_2.getWorkspaceConfig)(tree), '@o3r/styling', 'ng-add', options), ...options };
         const { updateThemeFiles, removeV7OtterAssetsInAngularJson } = await Promise.resolve().then(() => require('./theme-files'));
-        const { NodeDependencyType } = await Promise.resolve().then(() => require('@schematics/angular/utility/dependencies'));
         const depsInfo = (0, schematics_2.getO3rPeerDeps)(packageJsonPath);
         if (options.enableMetadataExtract) {
             depsInfo.o3rPeerDeps = [...depsInfo.o3rPeerDeps, '@o3r/extractors'];
         }
         const workspaceProject = options.projectName ? (0, schematics_2.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: [{
@@ -40,24 +49,13 @@ function ngAddFn(options) {
             };
             return acc;
         }, (0, schematics_2.getPackageInstallConfig)(packageJsonPath, tree, options.projectName, false, !!options.exactO3rVersion));
-        Object.entries((0, schematics_2.getExternalDependenciesVersionRange)(devDependenciesToInstall, packageJsonPath, context.logger))
-            .forEach(([dep, range]) => {
-            dependencies[dep] = {
-                inManifest: [{
-                        range,
-                        types: [NodeDependencyType.Dev]
-                    }]
-            };
-        });
-        Object.entries((0, schematics_2.getExternalDependenciesVersionRange)(dependenciesToInstall, packageJsonPath, context.logger))
-            .forEach(([dep, range]) => {
-            dependencies[dep] = {
-                inManifest: [{
-                        range,
-                        types: (0, schematics_2.getProjectNewDependenciesTypes)(workspaceProject)
-                    }]
-            };
-        });
+        const externalDependenciesInfo = (0, schematics_2.getExternalDependenciesInfo)({
+            devDependenciesToInstall,
+            dependenciesToInstall,
+            projectType: workspaceProject?.projectType,
+            projectPackageJson,
+            o3rPackageJsonPath: packageJsonPath
+        }, context.logger);
         const schematicsDefaultOptions = {
             useOtterTheming: undefined
         };
@@ -68,7 +66,10 @@ function ngAddFn(options) {
             removeV7OtterAssetsInAngularJson(options),
             (0, schematics_2.setupDependencies)({
                 projectName: options.projectName,
-                dependencies,
+                dependencies: {
+                    ...dependencies,
+                    ...externalDependenciesInfo
+                },
                 ngAddToRun: depsInfo.o3rPeerDeps
             }),
             (0, schematics_2.registerPackageCollectionSchematics)(JSON.parse(fs.readFileSync(packageJsonPath).toString())),