@ama-styling/style-dictionary 13.0.0-prerelease.3 → 13.0.0-rc.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ama-styling/style-dictionary",
-  "version": "13.0.0-prerelease.3",
+  "version": "13.0.0-rc.0",
   "type": "module",
   "publishConfig": {
     "access": "public"
@@ -41,14 +41,14 @@
   "dependencies": {
     "@angular-devkit/architect": "~0.2000.0",
     "@angular-devkit/schematics": "~20.0.0",
-    "@o3r/schematics": "^13.0.0-prerelease.3",
+    "@o3r/schematics": "^13.0.0-rc.0",
     "@schematics/angular": "~20.0.0",
     "tslib": "^2.6.2"
   },
   "peerDependencies": {
-    "@o3r/core": "^13.0.0-prerelease.3",
-    "@o3r/schematics": "^13.0.0-prerelease.3",
-    "@o3r/telemetry": "^13.0.0-prerelease.3",
+    "@o3r/core": "^13.0.0-rc.0",
+    "@o3r/schematics": "^13.0.0-rc.0",
+    "@o3r/telemetry": "^13.0.0-rc.0",
     "style-dictionary": "^5.0.0",
     "type-fest": "^4.30.1"
   },
@@ -82,11 +82,11 @@
     "@nx/eslint-plugin": "~21.3.11",
     "@nx/jest": "~21.3.11",
     "@nx/js": "~21.3.11",
-    "@o3r/build-helpers": "^13.0.0-prerelease.3",
-    "@o3r/core": "^13.0.0-prerelease.3",
-    "@o3r/eslint-plugin": "^13.0.0-prerelease.3",
-    "@o3r/telemetry": "^13.0.0-prerelease.3",
-    "@o3r/test-helpers": "^13.0.0-prerelease.3",
+    "@o3r/build-helpers": "^13.0.0-rc.0",
+    "@o3r/core": "^13.0.0-rc.0",
+    "@o3r/eslint-plugin": "^13.0.0-rc.0",
+    "@o3r/telemetry": "^13.0.0-rc.0",
+    "@o3r/test-helpers": "^13.0.0-rc.0",
     "@schematics/angular": "~20.0.0",
     "@stylistic/eslint-plugin": "~5.2.0",
     "@types/jest": "~29.5.2",

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;AAiBpC,OAAO,KAAK,EACV,qBAAqB,EACtB,MAAM,UAAU,CAAC;AA+FlB;;;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;AAapC,OAAO,KAAK,EACV,qBAAqB,EACtB,MAAM,UAAU,CAAC;AAoElB;;;GAGG;AACH,eAAO,MAAM,KAAK,GAAI,SAAS,qBAAqB,SAA2C,CAAC"}

package/schematics/ng-add/index.js

@@ -6,44 +6,16 @@ const schematics_1 = require("@angular-devkit/schematics");
 const schematics_2 = require("@o3r/schematics");
 /** Prefix of the expose Design Token items */
 const PREFIX = 'ama';
+const dependenciesToInstall = [];
+const devDependenciesToInstall = [
+    'style-dictionary'
+];
+const packageJsonPath = path.resolve(__dirname, '..', '..', 'package.json');
 /**
  * Add Otter Style Dictionary process to an Angular Project
  * @param options
  */
 function ngAddFn(options) {
-    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 { 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: [{
-                        range: `${options.exactO3rVersion ? '' : '~'}${depsInfo.packageVersion}`,
-                        types: (0, schematics_2.getProjectNewDependenciesTypes)(workspaceProject)
-                    }],
-                ngAddOptions: { exactO3rVersion: options.exactO3rVersion }
-            };
-            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]
-                    }]
-            };
-        });
-        return (0, schematics_2.setupDependencies)({
-            projectName: options.projectName,
-            dependencies,
-            ngAddToRun: depsInfo.o3rPeerDeps
-        });
-    };
     const generateConfig = (tree, context) => {
         const workspaceProject = options.projectName ? (0, schematics_2.getWorkspaceConfig)(tree)?.projects[options.projectName] : undefined;
         const projectType = workspaceProject?.projectType || 'application';
@@ -64,10 +36,10 @@ function ngAddFn(options) {
     };
     const updatePackageJson = (tree, context) => {
         const workspaceProject = options.projectName ? (0, schematics_2.getWorkspaceConfig)(tree)?.projects[options.projectName] : undefined;
-        const packageJsonPath = workspaceProject?.root && tree.exists(path.posix.join(workspaceProject.root, 'package.json'))
+        const workspacePackageJsonPath = workspaceProject?.root && tree.exists(path.posix.join(workspaceProject.root, 'package.json'))
             ? path.posix.join(workspaceProject.root, 'package.json')
             : 'package.json';
-        const packageJson = tree.readJson(packageJsonPath);
+        const packageJson = tree.readJson(workspacePackageJsonPath);
         packageJson.scripts ||= {};
         if (packageJson.scripts['generate:css']) {
             context.logger.warn('The script "generate:css" already exists in the package.json, it will not be added.');
@@ -81,14 +53,14 @@ function ngAddFn(options) {
         else {
             packageJson.scripts['generate:metadata'] = `style-dictionary build ${options.useJsExt ? '' : '-c config.mjs '}-p cms`;
         }
-        tree.overwrite(packageJsonPath, JSON.stringify(packageJson, null, 2));
+        tree.overwrite(workspacePackageJsonPath, JSON.stringify(packageJson, null, 2));
     };
     /* ng add rules */
     return (0, schematics_1.chain)([
-        setup,
         generateConfig,
         updatePackageJson,
-        options.skipLinter ? (0, schematics_1.noop)() : (0, schematics_2.applyEditorConfig)()
+        options.skipLinter ? (0, schematics_1.noop)() : (0, schematics_2.applyEditorConfig)(),
+        (0, schematics_2.ngAddDependenciesRule)(options, packageJsonPath, { dependenciesToInstall, devDependenciesToInstall })
     ]);
 }
 /**

package/schematics/ng-add/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":"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"}

package/schematics/ng-add/schema.d.ts

@@ -1,9 +1,5 @@
-import type { SchematicOptionObject } from '@o3r/schematics';
-export interface NgAddSchematicsSchema extends SchematicOptionObject {
-    /** Project name */
-    projectName?: string | undefined;
-    /** Use a pinned version for otter packages */
-    exactO3rVersion?: boolean;
+import type { NgAddOptions, SchematicOptionObject } from '@o3r/schematics';
+export interface NgAddSchematicsSchema extends NgAddOptions, SchematicOptionObject {
     /** Generate config file with the default extension .js instead of .mjs */
     useJsExt?: boolean;
 }

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

@@ -1 +1 @@
-{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add/schema.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,qBAAqB,EACtB,MAAM,iBAAiB,CAAC;AAEzB,MAAM,WAAW,qBAAsB,SAAQ,qBAAqB;IAClE,mBAAmB;IACnB,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACjC,8CAA8C;IAC9C,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,0EAA0E;IAC1E,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB"}
+{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add/schema.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,YAAY,EACZ,qBAAqB,EACtB,MAAM,iBAAiB,CAAC;AAEzB,MAAM,WAAW,qBAAsB,SAAQ,YAAY,EAAE,qBAAqB;IAChF,0EAA0E;IAC1E,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB"}

package/schematics/ng-add/schema.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"schema.js","sourceRoot":"","sources":["../../../schematics/ng-add/schema.ts"],"names":[],"mappings":""}