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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@o3r/styling",
-  "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"
@@ -39,11 +39,11 @@
     "@angular/common": "^20.0.0",
     "@angular/core": "^20.0.0",
     "@angular/material": "^20.0.0",
-    "@o3r/core": "^13.0.0-prerelease.3",
-    "@o3r/dynamic-content": "^13.0.0-prerelease.3",
-    "@o3r/extractors": "^13.0.0-prerelease.3",
-    "@o3r/logger": "^13.0.0-prerelease.3",
-    "@o3r/schematics": "^13.0.0-prerelease.3",
+    "@o3r/core": "^13.0.0-prerelease.4",
+    "@o3r/dynamic-content": "^13.0.0-prerelease.4",
+    "@o3r/extractors": "^13.0.0-prerelease.4",
+    "@o3r/logger": "^13.0.0-prerelease.4",
+    "@o3r/schematics": "^13.0.0-prerelease.4",
     "@schematics/angular": "^20.0.0",
     "@yarnpkg/cli": "^4.3.1",
     "@yarnpkg/core": "^4.1.1",
@@ -132,7 +132,7 @@
     }
   },
   "dependencies": {
-    "@o3r/schematics": "^13.0.0-prerelease.3",
+    "@o3r/schematics": "^13.0.0-prerelease.4",
     "tslib": "^2.6.2"
   },
   "generatorDependencies": {

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;AAqBpC,OAAO,KAAK,EACV,qBAAqB,EACtB,MAAM,UAAU,CAAC;AAqFlB;;;;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;AAWpC,OAAO,KAAK,EACV,qBAAqB,EACtB,MAAM,UAAU,CAAC;AAqDlB;;;;GAIG;AACH,eAAO,MAAM,KAAK,GAAI,SAAS,qBAAqB,SAA2C,CAAC"}

package/schematics/ng-add/index.js

@@ -6,6 +6,7 @@ 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");
+const theme_files_1 = require("./theme-files");
 /**
  * List of external dependencies to be added to the project as peer dependencies
  */
@@ -24,64 +25,31 @@ const devDependenciesToInstall = [
     'chokidar',
     'sass-loader'
 ];
+const packageJsonPath = path.resolve(__dirname, '..', '..', 'package.json');
 /**
  * Add Otter styling to an Angular Project
  * Update the styling if the app/lib used otter v7
  * @param options for the dependency installations
  */
 function ngAddFn(options) {
-    return async (tree, context) => {
-        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 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: [{
-                        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, false, !!options.exactO3rVersion));
-        const externalDependenciesInfo = (0, schematics_2.getExternalDependenciesInfo)({
-            devDependenciesToInstall,
-            dependenciesToInstall,
-            projectType: workspaceProject?.projectType,
-            projectPackageJson,
-            o3rPackageJsonPath: packageJsonPath
-        }, context.logger);
-        const schematicsDefaultOptions = {
-            useOtterTheming: undefined
-        };
-        return (0, schematics_1.chain)([
-            (0, schematics_2.removePackages)(['@otter/styling']),
-            (0, schematics_2.updateSassImports)('o3r'),
-            updateThemeFiles(__dirname, options),
-            removeV7OtterAssetsInAngularJson(options),
-            (0, schematics_2.setupDependencies)({
-                projectName: options.projectName,
-                dependencies: {
-                    ...dependencies,
-                    ...externalDependenciesInfo
-                },
-                ngAddToRun: depsInfo.o3rPeerDeps
-            }),
-            (0, schematics_2.registerPackageCollectionSchematics)(JSON.parse(fs.readFileSync(packageJsonPath).toString())),
-            (0, schematics_2.setupSchematicsParamsForProject)({
-                '@o3r/core:component': schematicsDefaultOptions,
-                '@o3r/core:component-presenter': schematicsDefaultOptions
-            }, options.projectName),
-            ...(options.enableMetadataExtract ? [(0, cms_adapter_1.updateCmsAdapter)(options)] : [])
-        ]);
+    const schematicsDefaultOptions = {
+        useOtterTheming: undefined
     };
+    return (0, schematics_1.chain)([
+        (0, schematics_2.updateSassImports)('o3r'),
+        (0, theme_files_1.updateThemeFiles)(__dirname, options),
+        (0, schematics_2.registerPackageCollectionSchematics)(JSON.parse(fs.readFileSync(packageJsonPath).toString())),
+        (0, schematics_2.setupSchematicsParamsForProject)({
+            '@o3r/core:component': schematicsDefaultOptions,
+            '@o3r/core:component-presenter': schematicsDefaultOptions
+        }, options.projectName),
+        ...(options.enableMetadataExtract ? [(0, cms_adapter_1.updateCmsAdapter)(options)] : []),
+        (0, schematics_2.ngAddDependenciesRule)(options, packageJsonPath, {
+            dependenciesToInstall,
+            devDependenciesToInstall,
+            additionalNgAddToRun: options.enableMetadataExtract ? ['@o3r/extractors'] : undefined
+        })
+    ]);
 }
 /**
  * Add Otter styling 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 {
     /** Activate metadata extraction */
     enableMetadataExtract: 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;IAEjC,mCAAmC;IACnC,qBAAqB,EAAE,OAAO,CAAC;IAE/B,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,mCAAmC;IACnC,qBAAqB,EAAE,OAAO,CAAC;CAChC"}

package/schematics/ng-add/theme-files/index.d.ts

@@ -8,12 +8,4 @@ import { Rule } from '@angular-devkit/schematics';
 export declare function updateThemeFiles(rootPath: string, options: {
     projectName?: string | null | undefined;
 }): Rule;
-/**
- * Update assets list in angular.json for styling
- * @param options
- * @param options.projectName
- */
-export declare function removeV7OtterAssetsInAngularJson(options: {
-    projectName?: string | null | undefined;
-}): Rule;
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../schematics/ng-add/theme-files/index.ts"],"names":[],"mappings":"AAIA,OAAO,EAML,IAAI,EAKL,MAAM,4BAA4B,CAAC;AAOpC;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE;IAAE,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAA;CAAE,GAAG,IAAI,CA+C7G;AAID;;;;GAIG;AACH,wBAAgB,gCAAgC,CAAC,OAAO,EAAE;IAAE,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAA;CAAE,GAAG,IAAI,CAmB3G"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../schematics/ng-add/theme-files/index.ts"],"names":[],"mappings":"AAIA,OAAO,EAML,IAAI,EAKL,MAAM,4BAA4B,CAAC;AAMpC;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE;IAAE,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAA;CAAE,GAAG,IAAI,CA+C7G"}

package/schematics/ng-add/theme-files/index.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateThemeFiles = updateThemeFiles;
-exports.removeV7OtterAssetsInAngularJson = removeV7OtterAssetsInAngularJson;
 const path = require("node:path");
 const core_1 = require("@angular-devkit/core");
 const schematics_1 = require("@angular-devkit/schematics");
@@ -52,26 +51,4 @@ function updateThemeFiles(rootPath, options) {
         return rule;
     };
 }
-/**
- * Update assets list in angular.json for styling
- * @param options
- * @param options.projectName
- */
-function removeV7OtterAssetsInAngularJson(options) {
-    return (tree, context) => {
-        const workspace = (0, schematics_2.getWorkspaceConfig)(tree);
-        const projectName = options.projectName;
-        const workspaceProject = options.projectName ? workspace?.projects[options.projectName] : undefined;
-        // exit if not an application
-        if (!projectName || !workspace || !workspaceProject) {
-            context.logger.debug('This is not an application project. No need to search and remove old v7 otter styling assets reference.');
-            return;
-        }
-        if (workspaceProject.architect?.build?.options?.assets) {
-            workspaceProject.architect.build.options.assets = workspaceProject.architect.build.options.assets.filter((a) => !a.input || !a.input.includes('node_modules/@otter/styling/assets'));
-        }
-        workspace.projects[projectName] = workspaceProject;
-        (0, schematics_2.writeAngularJson)(tree, workspace);
-    };
-}
 //# sourceMappingURL=index.js.map

package/schematics/ng-add/updates-of-old-otter-scope/imports/mocks/angular.json

@@ -1,11 +0,0 @@
-{
-  "version": 1,
-  "newProjectRoot": ".",
-  "projects": {
-    "test-project": {
-      "projectType": "application",
-      "root": "./packages/@o3r/styling/schematics/ng-add/updates-of-old-otter-scope/imports/mocks",
-      "sourceRoot": "./src"
-    }
-  }
-}