@o3r/application 9.3.0-alpha.6 → 9.3.0-alpha.61

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@o3r/application",
-  "version": "9.3.0-alpha.6",
+  "version": "9.3.0-alpha.61",
   "description": "This module provides development help to monitor your Otter Application",
   "keywords": [
     "application",
@@ -25,12 +25,12 @@
     "@angular-devkit/schematics": "~16.2.0",
     "@angular/common": "~16.2.0",
     "@angular/core": "~16.2.0",
-    "@o3r/core": "^9.3.0-alpha.6",
-    "@o3r/dev-tools": "^9.3.0-alpha.6",
-    "@o3r/logger": "^9.3.0-alpha.6",
-    "@o3r/routing": "^9.3.0-alpha.6",
-    "@o3r/schematics": "^9.3.0-alpha.6",
-    "@o3r/testing": "^9.3.0-alpha.6",
+    "@o3r/core": "^9.3.0-alpha.61",
+    "@o3r/dev-tools": "^9.3.0-alpha.61",
+    "@o3r/logger": "^9.3.0-alpha.61",
+    "@o3r/routing": "^9.3.0-alpha.61",
+    "@o3r/schematics": "^9.3.0-alpha.61",
+    "@o3r/testing": "^9.3.0-alpha.61",
     "@schematics/angular": "~16.2.0",
     "rxjs": "^7.8.1",
     "typescript": "~5.1.6"
@@ -50,7 +50,7 @@
     "tslib": "^2.5.3"
   },
   "engines": {
-    "node": ">=16.0.0"
+    "node": ">=18.0.0"
   },
   "schematics": "./collection.json",
   "module": "fesm2022/o3r-application.mjs",

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":"AAAA,OAAO,KAAK,EAAE,IAAI,EAA0B,MAAM,4BAA4B,CAAC;AAG/E,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AAGtD;;;GAGG;AACH,wBAAgB,KAAK,CAAC,OAAO,EAAE,qBAAqB,GAAG,IAAI,CA6E1D"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAA0B,MAAM,4BAA4B,CAAC;AAG/E,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AAGtD;;;GAGG;AACH,wBAAgB,KAAK,CAAC,OAAO,EAAE,qBAAqB,GAAG,IAAI,CAiF1D"}

package/schematics/ng-add/index.js

@@ -11,11 +11,12 @@ function ngAdd(options) {
     /* ng add rules */
     return async (tree, context) => {
         try {
-            const { addImportToModuleFile, getAppModuleFilePath, getProjectDepType, getProjectRootDir, insertImportToModuleFile, ngAddPackages, getO3rPeerDeps } = await Promise.resolve().then(() => require('@o3r/schematics'));
+            const { addImportToModuleFile, getAppModuleFilePath, getWorkspaceConfig, insertImportToModuleFile, ngAddPackages, getO3rPeerDeps, getProjectNewDependenciesType } = await Promise.resolve().then(() => require('@o3r/schematics'));
             const { getDecoratorMetadata, isImported } = await Promise.resolve().then(() => require('@schematics/angular/utility/ast-utils'));
             const ts = await Promise.resolve().then(() => require('typescript'));
             const depsInfo = getO3rPeerDeps(path.resolve(__dirname, '..', '..', 'package.json'));
-            const workingDirectory = getProjectRootDir(tree, options.projectName);
+            const workspaceProject = options.projectName ? getWorkspaceConfig(tree)?.projects[options.projectName] : undefined;
+            const workingDirectory = workspaceProject?.root;
             const addAngularAnimationPreferences = () => {
                 const moduleFilePath = getAppModuleFilePath(tree, context, options.projectName);
                 if (!moduleFilePath) {
@@ -35,12 +36,13 @@ function ngAdd(options) {
                 tree.commitUpdate(recorder);
                 return tree;
             };
-            const dependencyType = getProjectDepType(tree);
+            const dependencyType = getProjectNewDependenciesType(workspaceProject);
             return () => (0, schematics_1.chain)([
                 ngAddPackages(depsInfo.o3rPeerDeps, {
                     skipConfirmation: true,
                     version: depsInfo.packageVersion,
                     parentPackageInfo: depsInfo.packageName,
+                    projectName: options.projectName,
                     dependencyType,
                     workingDirectory
                 }),