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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@o3r/localization",
-  "version": "12.5.0-prerelease.2",
+  "version": "12.5.0-prerelease.20",
   "publishConfig": {
     "access": "public"
   },
@@ -44,11 +44,11 @@
     "@formatjs/intl-numberformat": "^8.0.2",
     "@ngrx/store": "^19.0.0",
     "@ngx-translate/core": "~16.0.4",
-    "@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",
@@ -115,12 +115,9 @@
     }
   },
   "dependencies": {
-    "@o3r/schematics": "^12.5.0-prerelease.2",
+    "@o3r/schematics": "^12.5.0-prerelease.20",
     "tslib": "^2.6.2"
   },
-  "generatorDependencies": {
-    "@angular/cdk": "~19.2.0"
-  },
   "engines": {
     "node": "^20.11.1 || >=22.0.0"
   },

package/schematics/localization-base/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/localization-base/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAQL,IAAI,EAKL,MAAM,4BAA4B,CAAC;AAqCpC;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAAC,OAAO,EAAE;IAAE,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAA;CAAE,EAAE,QAAQ,EAAE,MAAM,GAAG,IAAI,CA6Z/G;AA4CD,eAAO,MAAM,UAAU,wBAAqC,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/localization-base/index.ts"],"names":[],"mappings":"AACA,OAAO,EAQL,IAAI,EAKL,MAAM,4BAA4B,CAAC;AA4BpC;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAAC,OAAO,EAAE;IAAE,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAA;CAAE,EAAE,QAAQ,EAAE,MAAM,GAAG,IAAI,CAqY/G;AA4CD,eAAO,MAAM,UAAU,wBAAqC,CAAC"}

package/schematics/localization-base/index.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateI18n = void 0;
 exports.updateLocalization = updateLocalization;
-const fs = require("node:fs");
 const path = require("node:path");
 const schematics_1 = require("@angular-devkit/schematics");
 const schematics_2 = require("@o3r/schematics");
@@ -10,8 +9,6 @@ const utility_1 = require("@schematics/angular/utility");
 const ast_utils_1 = require("@schematics/angular/utility/ast-utils");
 const change_1 = require("@schematics/angular/utility/change");
 const ts = require("typescript");
-const packageJsonPath = path.resolve(__dirname, '..', '..', 'package.json');
-const ownPackageJson = JSON.parse(fs.readFileSync(packageJsonPath, { encoding: 'utf8' }));
 /**
  * Add Otter localization support
  * @param options @see RuleFactory.options
@@ -301,28 +298,6 @@ function updateLocalization(options, rootPath) {
         tree.commitUpdate(recorder);
         return tree;
     };
-    /**
-     * Add location required dependencies
-     * @param tree
-     */
-    const addDependencies = (tree) => {
-        const workspaceProject = options.projectName ? (0, schematics_2.getWorkspaceConfig)(tree)?.projects[options.projectName] : undefined;
-        const types = (0, schematics_2.getProjectNewDependenciesTypes)(workspaceProject);
-        const generatorDependencies = ['@ngx-translate/core', 'intl-messageformat', '@formatjs/intl-numberformat', '@angular/cdk'];
-        const dependencies = generatorDependencies.reduce((acc, dep) => {
-            acc[dep] = {
-                inManifest: [{
-                        range: ownPackageJson.peerDependencies[dep],
-                        types
-                    }]
-            };
-            return acc;
-        }, {});
-        return (0, schematics_2.setupDependencies)({
-            projectName: options.projectName || undefined,
-            dependencies
-        });
-    };
     // Ignore generated CMS metadata
     const ignoreDevResourcesFiles = (tree, _context) => {
         const workingDirectory = (options.projectName && (0, schematics_2.getWorkspaceConfig)(tree)?.projects[options.projectName]?.root) || '.';
@@ -338,7 +313,6 @@ function updateLocalization(options, rootPath) {
         generateLocalesFolder,
         updateAngularJson,
         updatePackageJson,
-        addDependencies,
         setDefaultLanguage,
         addMockTranslationModule,
         ignoreDevResourcesFiles

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,EAGL,IAAI,EACL,MAAM,4BAA4B,CAAC;AAmBpC,OAAO,KAAK,EACV,qBAAqB,EACtB,MAAM,UAAU,CAAC;AA0DlB;;;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":"AAEA,OAAO,EAGL,IAAI,EACL,MAAM,4BAA4B,CAAC;AAsBpC,OAAO,KAAK,EACV,qBAAqB,EACtB,MAAM,UAAU,CAAC;AAqFlB;;;GAGG;AACH,eAAO,MAAM,KAAK,GAAI,SAAS,qBAAqB,SAA2C,CAAC"}

package/schematics/ng-add/index.js

@@ -7,7 +7,25 @@ const schematics_1 = require("@angular-devkit/schematics");
 const schematics_2 = require("@o3r/schematics");
 const cms_adapter_1 = require("../cms-adapter");
 const devtools_registration_1 = require("./helpers/devtools-registration");
+/**
+ * List of external dependencies to be added to the project as peer dependencies
+ */
 const dependenciesToInstall = [
+    '@angular/cdk',
+    '@angular/common',
+    '@angular/core',
+    '@angular/platform-browser-dynamic',
+    '@formatjs/intl-numberformat',
+    '@ngrx/store',
+    '@ngx-translate/core',
+    'intl-messageformat',
+    'rxjs'
+];
+/**
+ * List of external dependencies to be added to the project as dev dependencies
+ */
+const devDependenciesToInstall = [
+    '@angular-devkit/core',
     'chokidar',
     'globby'
 ];
@@ -20,11 +38,12 @@ function ngAddFn(options) {
         const { updateI18n, updateLocalization } = await Promise.resolve().then(() => require('../localization-base'));
         const packageJsonPath = path.resolve(__dirname, '..', '..', 'package.json');
         const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, { encoding: 'utf8' }));
+        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 depsInfo = (0, schematics_2.getO3rPeerDeps)(packageJsonPath);
         context.logger.info(`The package ${depsInfo.packageName} comes with a debug mechanism`);
         context.logger.info('Get information on https://github.com/AmadeusITGroup/otter/tree/main/docs/localization/LOCALIZATION.md#Debugging');
-        const { NodeDependencyType } = await Promise.resolve().then(() => require('@schematics/angular/utility/dependencies'));
-        const workspaceProject = options.projectName ? (0, schematics_2.getWorkspaceConfig)(tree)?.projects[options.projectName] : undefined;
         const dependencies = depsInfo.o3rPeerDeps.reduce((acc, dep) => {
             acc[dep] = {
                 inManifest: [{
@@ -35,14 +54,13 @@ function ngAddFn(options) {
             };
             return acc;
         }, (0, schematics_2.getPackageInstallConfig)(packageJsonPath, tree, options.projectName, false, !!options.exactO3rVersion));
-        Object.entries((0, schematics_2.getExternalDependenciesVersionRange)(dependenciesToInstall, packageJsonPath, context.logger)).forEach(([dep, range]) => {
-            dependencies[dep] = {
-                inManifest: [{
-                        range,
-                        types: [NodeDependencyType.Dev]
-                    }]
-            };
-        });
+        const externalDependenciesInfo = (0, schematics_2.getExternalDependenciesInfo)({
+            devDependenciesToInstall,
+            dependenciesToInstall,
+            projectType: workspaceProject?.projectType,
+            projectPackageJson,
+            o3rPackageJsonPath: packageJsonPath
+        }, context.logger);
         const registerDevtoolRule = (0, devtools_registration_1.registerDevtools)(options);
         return (0, schematics_1.chain)([
             updateLocalization(options, __dirname),
@@ -50,7 +68,10 @@ function ngAddFn(options) {
             options.skipLinter ? (0, schematics_1.noop)() : (0, schematics_2.applyEsLintFix)(),
             (0, schematics_2.setupDependencies)({
                 projectName: options.projectName,
-                dependencies,
+                dependencies: {
+                    ...dependencies,
+                    ...externalDependenciesInfo
+                },
                 ngAddToRun: depsInfo.o3rPeerDeps
             }),
             (0, cms_adapter_1.updateCmsAdapter)(options),