@o3r/core 11.0.0-prerelease.9 → 11.1.0-prerelease.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@o3r/core",
-  "version": "11.0.0-prerelease.9",
+  "version": "11.1.0-prerelease.0",
   "publishConfig": {
     "access": "public"
   },
@@ -12,26 +12,24 @@
   "default": "./src/public_api.js",
   "types": "./src/public_api.d.ts",
   "peerDependencies": {
-    "@angular-devkit/architect": "~0.1703.0",
-    "@angular-devkit/core": "~17.3.0",
-    "@angular-devkit/schematics": "~17.3.0",
-    "@angular/cli": "~17.3.0",
-    "@angular/common": "~17.3.0",
-    "@angular/compiler-cli": "~17.3.0",
-    "@angular/core": "~17.3.0",
-    "@angular/forms": "~17.3.0",
-    "@angular/platform-browser-dynamic": "~17.3.0",
-    "@angular/router": "~17.3.0",
-    "@ngrx/entity": "~17.2.0",
-    "@ngrx/store": "~17.2.0",
-    "@nrwl/devkit": "~18.3.0",
-    "@nx/angular": "~18.3.0",
-    "@o3r/telemetry": "^11.0.0-prerelease.9",
-    "@schematics/angular": "~17.3.0",
+    "@angular-devkit/architect": "~0.1800.0",
+    "@angular-devkit/core": "~18.0.0",
+    "@angular-devkit/schematics": "~18.0.0",
+    "@angular/cli": "~18.0.0",
+    "@angular/common": "~18.0.0",
+    "@angular/compiler-cli": "~18.0.0",
+    "@angular/core": "~18.0.0",
+    "@angular/forms": "~18.0.0",
+    "@angular/platform-browser-dynamic": "~18.0.0",
+    "@angular/router": "~18.0.0",
+    "@ngrx/entity": "~18.0.0",
+    "@ngrx/store": "~18.0.0",
+    "@nx/angular": "~19.3.0",
+    "@o3r/telemetry": "^11.1.0-prerelease.0",
+    "@schematics/angular": "~18.0.0",
     "chokidar": "^3.5.2",
     "globby": "^11.1.0",
     "rxjs": "^7.8.1",
-    "semver": "^7.5.2",
     "typescript": "~5.4.2"
   },
   "peerDependenciesMeta": {
@@ -44,57 +42,54 @@
     "@ngrx/store": {
       "optional": true
     },
-    "@nrwl/devkit": {
-      "optional": true
-    },
     "@nx/angular": {
       "optional": true
     },
     "@o3r/telemetry": {
       "optional": true
     },
-    "chokidar": {
+    "@schematics/angular": {
       "optional": true
     },
-    "globby": {
+    "chokidar": {
       "optional": true
     },
-    "semver": {
+    "globby": {
       "optional": true
     }
   },
   "dependencies": {
-    "@o3r/schematics": "^11.0.0-prerelease.9",
+    "@o3r/schematics": "^11.1.0-prerelease.0",
     "tslib": "^2.6.2",
-    "uuid": "^9.0.0"
+    "uuid": "^10.0.0"
   },
   "generatorDependencies": {
-    "@angular-eslint/eslint-plugin": "~17.5.0",
-    "@angular/material": "~17.3.0",
-    "@ngrx/router-store": "~17.2.0",
-    "@ngrx/effects": "~17.2.0",
-    "@ngrx/store-devtools": "~17.2.0",
-    "@o3r/store-sync": "^11.0.0-prerelease.9",
+    "@angular-eslint/eslint-plugin": "~18.0.0",
+    "@angular/material": "~18.0.0",
+    "@ngrx/router-store": "~18.0.0",
+    "@ngrx/effects": "~18.0.0",
+    "@ngrx/store-devtools": "~18.0.0",
+    "@o3r/store-sync": "^11.1.0-prerelease.0",
     "@types/jest": "~29.5.2",
-    "nx": "~18.3.0",
+    "nx": "~19.3.0",
     "@typescript-eslint/parser": "^7.2.0",
-    "@stylistic/eslint-plugin-ts": "^1.5.4",
+    "@stylistic/eslint-plugin-ts": "^2.0.0",
     "cpy-cli": "^5.0.0",
     "eslint": "^8.57.0",
-    "@nx/eslint-plugin": "~18.3.0",
+    "@nx/eslint-plugin": "~19.3.0",
     "jsonc-eslint-parser": "~2.4.0",
     "eslint-import-resolver-node": "^0.3.9",
-    "eslint-plugin-jest": "~27.9.0",
-    "eslint-plugin-jsdoc": "~48.2.1",
+    "eslint-plugin-jest": "~28.6.0",
+    "eslint-plugin-jsdoc": "~48.4.0",
     "eslint-plugin-prefer-arrow": "~1.2.3",
-    "eslint-plugin-unicorn": "^51.0.1",
+    "eslint-plugin-unicorn": "^54.0.0",
     "jest": "~29.7.0",
     "jest-junit": "~16.0.0",
     "jest-preset-angular": "~14.1.0",
     "zone.js": "~0.14.2"
   },
   "engines": {
-    "node": ">=18.0.0"
+    "node": "^18.19.1 || ^20.11.1 || >=22.0.0"
   },
   "schematics": "./collection.json",
   "builders": "./builders.json",
@@ -186,6 +181,7 @@
     },
     {
       "name": "Stephane Dalle",
+      "url": "https://github.com/sdalle-1A",
       "email": "sdalle-1A@users.noreply.github.com"
     },
     {
@@ -220,7 +216,10 @@
     }
   ],
   "bugs": "https://github.com/AmadeusITGroup/otter/issues",
-  "repository": "https://github.com/AmadeusITGroup/otter",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/AmadeusITGroup/otter.git"
+  },
   "license": "BSD-3-Clause",
   "homepage": "https://amadeusitgroup.github.io/otter/"
 }

package/schematics/rule-factories/otter-environment/index.d.ts

@@ -5,7 +5,6 @@ import { Rule } from '@angular-devkit/schematics';
  * @param rootPath @see RuleFactory.rootPath
  * @param options.projectName
  * @param options.enableStorybook
- * @param options.enablePlaywright
  * @param options.enableStyling
  * @param options.enableAnalytics
  * @param options.workingDirectory

package/schematics/rule-factories/otter-environment/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../schematics/rule-factories/otter-environment/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,IAAI,EAA0B,MAAM,4BAA4B,CAAC;AAOjF;;;;;;;;;;;GAWG;AACH,wBAAgB,6BAA6B,CAC3C,OAAO,EAAE;IACP,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC;IACxC,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,gBAAgB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CAClC,EACD,SAAS,EAAE,MAAM,GAChB,IAAI,CAmJN"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../schematics/rule-factories/otter-environment/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,IAAI,EAA0B,MAAM,4BAA4B,CAAC;AAOjF;;;;;;;;;;GAUG;AACH,wBAAgB,6BAA6B,CAC3C,OAAO,EAAE;IACP,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC;IACxC,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,gBAAgB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CAClC,EACD,SAAS,EAAE,MAAM,GAChB,IAAI,CA8IN"}

package/schematics/rule-factories/otter-environment/index.js

@@ -12,7 +12,6 @@ const node_path_1 = require("node:path");
  * @param rootPath @see RuleFactory.rootPath
  * @param options.projectName
  * @param options.enableStorybook
- * @param options.enablePlaywright
  * @param options.enableStyling
  * @param options.enableAnalytics
  * @param options.workingDirectory
@@ -32,13 +31,9 @@ function updateOtterEnvironmentAdapter(options, _rootPath) {
             context.logger.error('No application detected, the Otter environment will not be setup');
             return tree;
         }
-        const packageJson = (0, schematics_2.readPackageJson)(tree, workspaceProject);
-        const scope = packageJson.name.split('/')[0];
         workspace.cli = workspace.cli || {};
+        workspaceProject.schematics ||= {};
         if (workspaceProject.projectType === 'application') {
-            if (!workspaceProject.schematics) {
-                workspaceProject.schematics = {};
-            }
             schematics_2.OTTER_ITEM_TYPES.forEach((item) => {
                 const path = schematics_2.TYPES_DEFAULT_FOLDER[item].app;
                 if (path) {
@@ -64,11 +59,11 @@ function updateOtterEnvironmentAdapter(options, _rootPath) {
         else {
             workspace.cli.packageManager ||= (0, schematics_2.getPackageManager)();
             schematics_2.OTTER_ITEM_TYPES.forEach((item) => {
-                const path = schematics_2.TYPES_DEFAULT_FOLDER[item].lib ? `modules/${scope}/${schematics_2.TYPES_DEFAULT_FOLDER[item].lib}` : null;
+                const path = schematics_2.TYPES_DEFAULT_FOLDER[item].lib;
                 if (path) {
-                    workspace.schematics[`${item}*`] = {
-                        path,
-                        ...(workspace.schematics[item] || {})
+                    workspaceProject.schematics[item] = {
+                        path: node_path_1.posix.join(workspaceProject.root, path),
+                        ...(workspaceProject.schematics[item] || {})
                     };
                 }
             });

package/schematics/rule-factories/store/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../schematics/rule-factories/store/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,IAAI,EAA0B,MAAM,4BAA4B,CAAC;AACjF,OAAO,EASL,KAAK,wBAAwB,EAC9B,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAkBnD;;;;;;;;;GASG;AACH,wBAAgB,WAAW,CACzB,OAAO,EAAE;IAAE,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAAC,eAAe,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAAC,uBAAuB,EAAE,wBAAwB,CAAC;IAAC,eAAe,CAAC,EAAE,OAAO,CAAA;CAAE,EACjK,WAAW,CAAC,EAAE,gBAAgB,CAAC,aAAa,CAAC,GAAG,IAAI,CAmIrD"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../schematics/rule-factories/store/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,IAAI,EAA0B,MAAM,4BAA4B,CAAC;AACjF,OAAO,EASL,KAAK,wBAAwB,EAC9B,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAkBnD;;;;;;;;;GASG;AACH,wBAAgB,WAAW,CACzB,OAAO,EAAE;IAAE,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAAC,eAAe,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAAC,uBAAuB,EAAE,wBAAwB,CAAC;IAAC,eAAe,CAAC,EAAE,OAAO,CAAA;CAAE,EACjK,WAAW,CAAC,EAAE,gBAAgB,CAAC,aAAa,CAAC,GAAG,IAAI,CAoIrD"}

package/schematics/rule-factories/store/index.js

@@ -44,14 +44,15 @@ function updateStore(options, projectType) {
     /**
      * Change package.json with the new dependencies
      * @param tree
+     * @param context
      */
-    const updatePackageJson = (tree) => {
+    const updatePackageJson = (tree, context) => {
         const workspaceConfig = (0, schematics_2.getWorkspaceConfig)(tree);
         const workspaceProject = options.projectName && workspaceConfig?.projects?.[options.projectName] || undefined;
         const appDeps = [ngrxEffectsDep, ngrxRouterStore, ngrxRouterStoreDevToolDep];
         const corePeerDeps = [ngrxEntityDep, ngrxStoreDep];
         const dependenciesList = projectType === 'application' ? [...corePeerDeps, ...appDeps] : [...corePeerDeps];
-        Object.entries((0, schematics_2.getExternalDependenciesVersionRange)(dependenciesList, corePackageJsonPath)).forEach(([dep, range]) => {
+        Object.entries((0, schematics_2.getExternalDependenciesVersionRange)(dependenciesList, corePackageJsonPath, context.logger)).forEach(([dep, range]) => {
             options.dependenciesSetupConfig.dependencies[dep] = {
                 inManifest: [{
                         range,