@o3r/design 13.0.0-prerelease.3 → 13.0.0-prerelease.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@o3r/design",
-  "version": "13.0.0-prerelease.3",
+  "version": "13.0.0-prerelease.4",
   "deprecated": "This package will be removed in Otter v14. Please use @ama-styling/style-dictionary instead.",
   "publishConfig": {
     "access": "public"
@@ -50,7 +50,7 @@
     "o3r-css-from-design-token": "./cli/generate-css-from-design-token.cli.cjs"
   },
   "dependencies": {
-    "@o3r/schematics": "^13.0.0-prerelease.3",
+    "@o3r/schematics": "^13.0.0-prerelease.4",
     "jsonschema": "~1.5.0",
     "minimatch": "~10.0.0",
     "minimist": "^1.2.6",
@@ -60,10 +60,10 @@
   "peerDependencies": {
     "@angular-devkit/architect": ">=0.2000.0 <0.2100.0-0",
     "@angular-devkit/schematics": "^20.0.0",
-    "@o3r/core": "^13.0.0-prerelease.3",
-    "@o3r/schematics": "^13.0.0-prerelease.3",
-    "@o3r/styling": "^13.0.0-prerelease.3",
-    "@o3r/telemetry": "^13.0.0-prerelease.3",
+    "@o3r/core": "^13.0.0-prerelease.4",
+    "@o3r/schematics": "^13.0.0-prerelease.4",
+    "@o3r/styling": "^13.0.0-prerelease.4",
+    "@o3r/telemetry": "^13.0.0-prerelease.4",
     "chokidar": "^4.0.3",
     "globby": "^11.1.0",
     "sass": "^1.81.0"
@@ -118,12 +118,12 @@
     "@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/styling": "^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-prerelease.4",
+    "@o3r/core": "^13.0.0-prerelease.4",
+    "@o3r/eslint-plugin": "^13.0.0-prerelease.4",
+    "@o3r/styling": "^13.0.0-prerelease.4",
+    "@o3r/telemetry": "^13.0.0-prerelease.4",
+    "@o3r/test-helpers": "^13.0.0-prerelease.4",
     "@schematics/angular": "~20.0.0",
     "@stylistic/eslint-plugin": "~5.2.0",
     "@swc/helpers": "~0.5.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":"AACA,OAAO,EAGL,KAAK,IAAI,EACV,MAAM,4BAA4B,CAAC;AAcpC,OAAO,KAAK,EACV,qBAAqB,EACtB,MAAM,UAAU,CAAC;AAIlB;;;GAGG;AACH,wBAAgB,OAAO,CAAC,OAAO,EAAE,qBAAqB,GAAG,IAAI,CAqB5D;AAED;;;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,EAGL,KAAK,IAAI,EACV,MAAM,4BAA4B,CAAC;AAapC,OAAO,KAAK,EACV,qBAAqB,EACtB,MAAM,UAAU,CAAC;AAIlB;;;GAGG;AACH,wBAAgB,OAAO,CAAC,OAAO,EAAE,qBAAqB,GAAG,IAAI,CAgB5D;AAED;;;GAGG;AACH,eAAO,MAAM,KAAK,GAAI,SAAS,qBAAqB,SAA2C,CAAC"}

package/schematics/ng-add/index.js

@@ -13,26 +13,21 @@ const packageJsonPath = path.resolve(__dirname, '..', '..', 'package.json');
  * @param options
  */
 function ngAddFn(options) {
-    /* ng add rules */
-    return (tree) => {
-        const schematicsDefaultOptions = {
-            useOtterDesignToken: true
-        };
-        return (0, schematics_1.chain)([
-            (0, register_generate_css_1.registerGenerateCssBuilder)(options.projectName),
-            (0, schematics_2.setupSchematicsParamsForProject)({
-                '@o3r/core:component': schematicsDefaultOptions,
-                '@o3r/core:component-presenter': schematicsDefaultOptions,
-                '*:*': schematicsDefaultOptions
-            }, options.projectName),
-            (0, schematics_2.setupDependencies)({
-                projectName: options.projectName,
-                dependencies: (0, schematics_2.getPackageInstallConfig)(packageJsonPath, tree, options.projectName, false, !!options.exactO3rVersion)
-            }),
-            options.extractDesignToken ? (0, extract_token_1.extractToken)({ componentFilePatterns: ['**/*.scss'], includeTags: true }) : schematics_1.noop,
-            options.skipLinter ? (0, schematics_1.noop)() : (0, schematics_2.applyEditorConfig)()
-        ]);
+    const schematicsDefaultOptions = {
+        useOtterDesignToken: true
     };
+    /* ng add rules */
+    return (0, schematics_1.chain)([
+        (0, register_generate_css_1.registerGenerateCssBuilder)(options.projectName),
+        (0, schematics_2.setupSchematicsParamsForProject)({
+            '@o3r/core:component': schematicsDefaultOptions,
+            '@o3r/core:component-presenter': schematicsDefaultOptions,
+            '*:*': schematicsDefaultOptions
+        }, options.projectName),
+        (0, schematics_2.ngAddDependenciesRule)(options, packageJsonPath, { dependenciesToInstall: [], devDependenciesToInstall: [] }),
+        options.extractDesignToken ? (0, extract_token_1.extractToken)({ componentFilePatterns: ['**/*.scss'], includeTags: true }) : schematics_1.noop,
+        options.skipLinter ? (0, schematics_1.noop)() : (0, schematics_2.applyEditorConfig)()
+    ]);
 }
 /**
  * Add Otter design to an Angular Project

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

@@ -1,10 +1,6 @@
-import type { SchematicOptionObject } from '@o3r/schematics';
-export interface NgAddSchematicsSchema extends SchematicOptionObject {
-    /** Project name */
-    projectName?: string | undefined;
+import type { NgAddOptions, SchematicOptionObject } from '@o3r/schematics';
+export interface NgAddSchematicsSchema extends NgAddOptions, SchematicOptionObject {
     /** Extract the design token from Sass file in the project */
     extractDesignToken?: boolean;
-    /** Use a pinned version for otter packages */
-    exactO3rVersion?: boolean;
 }
 //# sourceMappingURL=schema.d.ts.map

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,6DAA6D;IAC7D,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,8CAA8C;IAC9C,eAAe,CAAC,EAAE,OAAO,CAAC;CAC3B"}
+{"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,6DAA6D;IAC7D,kBAAkB,CAAC,EAAE,OAAO,CAAC;CAC9B"}