@o3r/core 12.3.0-prerelease.47 → 12.3.0-prerelease.49

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@o3r/core",
-  "version": "12.3.0-prerelease.47",
+  "version": "12.3.0-prerelease.49",
   "publishConfig": {
     "access": "public"
   },
@@ -39,7 +39,7 @@
     "@ngrx/entity": "^19.0.0",
     "@ngrx/store": "^19.0.0",
     "@nx/angular": "~20.8.0",
-    "@o3r/telemetry": "^12.3.0-prerelease.47",
+    "@o3r/telemetry": "^12.3.0-prerelease.49",
     "@schematics/angular": "^19.0.0",
     "chokidar": "^4.0.3",
     "globby": "^11.1.0",
@@ -78,7 +78,7 @@
     }
   },
   "dependencies": {
-    "@o3r/schematics": "^12.3.0-prerelease.47",
+    "@o3r/schematics": "^12.3.0-prerelease.49",
     "tslib": "^2.6.2",
     "uuid": "^11.0.5"
   },
@@ -91,14 +91,14 @@
     "@ngrx/store": "~19.1.0",
     "@ngrx/store-devtools": "~19.1.0",
     "@nx/eslint-plugin": "~20.8.0",
-    "@o3r/store-sync": "^12.3.0-prerelease.47",
+    "@o3r/store-sync": "^12.3.0-prerelease.49",
     "@stylistic/eslint-plugin": "~3.1.0",
     "@types/jest": "~29.5.2",
     "@typescript-eslint/eslint-plugin": "~8.30.0",
     "@typescript-eslint/parser": "~8.30.0",
     "angular-eslint": "~19.3.0",
     "cpy-cli": "^5.0.0",
-    "eslint": "~9.24.0",
+    "eslint": "~9.25.0",
     "eslint-import-resolver-node": "~0.3.9",
     "eslint-import-resolver-typescript": "~3.10.0",
     "eslint-plugin-import": "~2.31.0",

package/schematics/ng-add/component-decorator/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../schematics/ng-add/component-decorator/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,IAAI,EAEL,MAAM,4BAA4B,CAAC;AA6BpC;;;GAGG;AACH,eAAO,MAAM,yBAAyB,EAAE,IA8DvC,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../schematics/ng-add/component-decorator/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,IAAI,EACL,MAAM,4BAA4B,CAAC;AAgCpC;;;GAGG;AACH,eAAO,MAAM,yBAAyB,EAAE,IA6DvC,CAAC"}

package/schematics/ng-add/component-decorator/index.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateComponentDecorators = void 0;
+const schematics_1 = require("@o3r/schematics");
 const ast_utils_1 = require("@schematics/angular/utility/ast-utils");
 const change_1 = require("@schematics/angular/utility/change");
 const ts = require("typescript");
@@ -17,9 +18,8 @@ const removeImport = (source, symbolName, fileName) => {
  * Update component file with new decorators for otter devtools
  * @param tree Tree
  */
-const updateComponentDecorators = async (tree) => {
-    const { getFilesInFolderFromWorkspaceProjectsInTree } = await Promise.resolve().then(() => require('@o3r/schematics'));
-    const componentFiles = new Set(getFilesInFolderFromWorkspaceProjectsInTree(tree, '', 'component.ts'));
+const updateComponentDecorators = (tree) => {
+    const componentFiles = new Set((0, schematics_1.getFilesInFolderFromWorkspaceProjectsInTree)(tree, '', 'component.ts'));
     componentFiles.forEach((filePath) => {
         const source = ts.createSourceFile(filePath, tree.readText(filePath), ts.ScriptTarget.ES2015, true);
         const recorder = tree.beginUpdate(filePath);

package/schematics/ng-add-create/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add-create/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAOL,IAAI,EAKL,MAAM,4BAA4B,CAAC;AAuEpC;;;GAGG;AACH,eAAO,MAAM,eAAe,wBAA0C,CAAC;AAYvE;;;GAGG;AACH,eAAO,MAAM,WAAW,wBAAsC,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add-create/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAOL,IAAI,EAKL,MAAM,4BAA4B,CAAC;AAwEpC;;;GAGG;AACH,eAAO,MAAM,eAAe,wBAA0C,CAAC;AAYvE;;;GAGG;AACH,eAAO,MAAM,WAAW,wBAAsC,CAAC"}

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

@@ -40,8 +40,9 @@ function updateTemplatesFn(options) {
             packageJson.peerDependenciesMeta['@o3r/schematics'] = { optional: true };
             packageJson.devDependencies['@angular-devkit/schematics'] = angularVersion;
             packageJson.devDependencies['@angular-devkit/core'] = angularVersion;
-            packageJson.devDependencies['@o3r/schematics'] = otterVersion;
             packageJson.devDependencies['cpy-cli'] = o3rCorePackageJson.generatorDependencies['cpy-cli'];
+            packageJson.dependencies ||= {};
+            packageJson.dependencies['@o3r/schematics'] = otterVersion;
             tree.overwrite(packageJsonPath, JSON.stringify(packageJson, null, 2));
         }
         // generate skeleton

package/schematics/ng-add-create/templates/schematics/ng-add/index.ts.template

@@ -2,6 +2,14 @@ import { chain, noop, Rule } from '@angular-devkit/schematics';
 import type { NgAddSchematicsSchema } from './schema';
 import * as fs from 'node:fs';
 import * as path from 'node:path';
+import {
+  createOtterSchematic,
+  getProjectNewDependenciesTypes,
+  getPackageInstallConfig,
+  applyEsLintFix,
+  getWorkspaceConfig,
+  setupDependencies,
+} from '@o3r/schematics';
 
 const packageJsonPath = path.resolve(__dirname, '..', '..', 'package.json');
 
@@ -18,13 +26,6 @@ const dependenciesToNgAdd: string[] = [
   // Add the dependencies to install with NgAdd here
 ];
 
-const reportMissingSchematicsDep = (logger: { error: (message: string) => any }) => (reason: any) => {
-  logger.error(`[ERROR]: Adding <%= featureName %> has failed.
-If the error is related to missing @o3r dependencies you need to install '@o3r/core' to be able to use the <%= featureName %> package. Please run 'ng add @o3r/core' .
-Otherwise, use the error message as guidance.`);
-  throw reason;
-};
-
 /**
  * Add Otter <%= featureName %> to an Otter Project
  *
@@ -32,8 +33,6 @@ Otherwise, use the error message as guidance.`);
  */
 function ngAddFn(options: NgAddSchematicsSchema): Rule {
   return async (tree) => {
-    // use dynamic import to properly raise an exception if it is not an Otter project.
-    const { getProjectNewDependenciesTypes, getPackageInstallConfig, applyEsLintFix, getWorkspaceConfig, setupDependencies } = await import('@o3r/schematics');
     // current package version
     const version = JSON.parse(fs.readFileSync(packageJsonPath, {encoding: 'utf8'})).version;
     const workspaceProject = options.projectName ? getWorkspaceConfig(tree)?.projects[options.projectName] : undefined;
@@ -64,9 +63,4 @@ function ngAddFn(options: NgAddSchematicsSchema): Rule {
  * Add module to an Angular Project
  * @param options ng add options
  */
-export const ngAdd = (options: NgAddSchematicsSchema): Rule => async (_, { logger }) => {
-  const {
-    createOtterSchematic
-  } = await import('@o3r/schematics').catch(reportMissingSchematicsDep(logger));
-  return createOtterSchematic(ngAddFn)(options);
-};
+export const ngAdd = (options: NgAddSchematicsSchema) => createOtterSchematic(ngAddFn)(options);