@o3r/application 12.5.0-prerelease.9 → 13.0.0-next.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@o3r/application",
-  "version": "12.5.0-prerelease.9",
+  "version": "13.0.0-next.0",
   "publishConfig": {
     "access": "public"
   },
@@ -26,14 +26,15 @@
     "@angular-devkit/schematics": "^19.0.0",
     "@angular/common": "^19.0.0",
     "@angular/core": "^19.0.0",
-    "@o3r/core": "^12.5.0-prerelease.9",
-    "@o3r/logger": "^12.5.0-prerelease.9",
-    "@o3r/routing": "^12.5.0-prerelease.9",
-    "@o3r/schematics": "^12.5.0-prerelease.9",
-    "@o3r/testing": "^12.5.0-prerelease.9",
+    "@o3r/core": "^13.0.0-next.0",
+    "@o3r/logger": "^13.0.0-next.0",
+    "@o3r/routing": "^13.0.0-next.0",
+    "@o3r/schematics": "^13.0.0-next.0",
+    "@o3r/testing": "^13.0.0-next.0",
     "@schematics/angular": "^19.0.0",
     "rxjs": "^7.8.1",
     "ts-node": "~10.9.2",
+    "type-fest": "^4.10.2",
     "typescript": "^5.5.4"
   },
   "peerDependenciesMeta": {
@@ -46,12 +47,15 @@
     "@o3r/testing": {
       "optional": true
     },
+    "type-fest": {
+      "optional": true
+    },
     "typescript": {
       "optional": true
     }
   },
   "dependencies": {
-    "@o3r/schematics": "^12.5.0-prerelease.9",
+    "@o3r/schematics": "^13.0.0-next.0",
     "tslib": "^2.6.2"
   },
   "engines": {

package/schematics/ng-add/helpers/devtools-registration.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"devtools-registration.js","sourceRoot":"","sources":["../../../../schematics/ng-add/helpers/devtools-registration.ts"],"names":[],"mappings":";;;AAAA,qCAEiB;AACjB,kCAAkC;AAClC,2DAEoC;AACpC,gDAEyB;AAKzB,MAAM,mBAAmB,GAAG,2BAA2B,CAAC;AACxD,MAAM,4BAA4B,GAAG,mCAAmC,CAAC;AACzE,MAAM,4BAA4B,GAAG,mCAAmC,CAAC;AACzE,MAAM,YAAY,GAAW,IAAI,CAAC,KAAK,CAAC,IAAA,sBAAY,EAAC,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,cAAc,CAAC,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;AAE5I;;;GAGG;AACI,MAAM,gBAAgB,GAAG,CAAC,OAA8B,EAAE,EAAE;IACjE,OAAO,IAAA,kBAAK,EAAC;QACX,IAAA,0CAA6B,EAAC;YAC5B,UAAU,EAAE,mBAAmB;YAC/B,WAAW,EAAE,YAAY;YACzB,WAAW,EAAE,4BAA4B;YACzC,WAAW,EAAE,OAAO,CAAC,WAAW;SACjC,CAAC;QACF,IAAA,0CAA6B,EAAC;YAC5B,UAAU,EAAE,mBAAmB;YAC/B,WAAW,EAAE,YAAY;YACzB,WAAW,EAAE,4BAA4B;YACzC,WAAW,EAAE,OAAO,CAAC,WAAW;SACjC,CAAC;KACH,CAAC,CAAC;AACL,CAAC,CAAC;AAfW,QAAA,gBAAgB,oBAe3B"}

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":"AACA,OAAO,KAAK,EACV,IAAI,EAGL,MAAM,4BAA4B,CAAC;AAoBpC,OAAO,KAAK,EACV,qBAAqB,EACtB,MAAM,UAAU,CAAC;AA6FlB;;;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":"AACA,OAAO,KAAK,EACV,IAAI,EAGL,MAAM,4BAA4B,CAAC;AAwBpC,OAAO,KAAK,EACV,qBAAqB,EACtB,MAAM,UAAU,CAAC;AAyHlB;;;GAGG;AACH,eAAO,MAAM,KAAK,GAAI,SAAS,qBAAqB,SAA2C,CAAC"}

package/schematics/ng-add/index.js

@@ -6,6 +6,18 @@ const schematics_1 = require("@angular-devkit/schematics");
 const schematics_2 = require("@o3r/schematics");
 const utility_1 = require("@schematics/angular/utility");
 const devtools_registration_1 = require("./helpers/devtools-registration");
+/**
+ * List of external dependencies to be added to the project as peer dependencies
+ */
+const dependenciesToInstall = [
+    '@angular/common',
+    '@angular/core',
+    'rxjs'
+];
+/**
+ * List of external dependencies to be added to the project as dev dependencies
+ */
+const devDependenciesToInstall = [];
 /**
  * Add Otter application to an Angular Project
  * @param options The options to pass to ng-add execution
@@ -55,11 +67,20 @@ function ngAddFn(options) {
             };
             return acc;
         }, (0, schematics_2.getPackageInstallConfig)(packageJsonPath, tree, options.projectName, false, !!options.exactO3rVersion));
+        const projectDirectory = workspaceProject?.root || '.';
+        const projectPackageJson = tree.readJson(path.posix.join(projectDirectory, 'package.json'));
+        const externalDependenciesInfo = (0, schematics_2.getExternalDependenciesInfo)({
+            devDependenciesToInstall,
+            dependenciesToInstall,
+            projectType: workspaceProject?.projectType,
+            o3rPackageJsonPath: packageJsonPath,
+            projectPackageJson
+        }, context.logger);
         const registerDevtoolRule = (0, devtools_registration_1.registerDevtools)(options);
         return () => (0, schematics_1.chain)([
             (0, schematics_2.setupDependencies)({
                 projectName: options.projectName,
-                dependencies,
+                dependencies: { ...dependencies, ...externalDependenciesInfo },
                 ngAddToRun: depsInfo.o3rPeerDeps
             }),
             addAngularAnimationPreferences,

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

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":"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"}

package/schematics/ng-add/schema.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"schema.js","sourceRoot":"","sources":["../../../schematics/ng-add/schema.ts"],"names":[],"mappings":""}

package/schematics/ng-update/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/ng-update/index.ts"],"names":[],"mappings":";;AAYA,kCAMC;AAlBD,2DAGoC;AACpC,iEAEmC;AAEnC;;GAEG;AACH,sGAAsG;AACtG,SAAgB,WAAW;IACzB,MAAM,WAAW,GAAW;QAC1B,IAAA,qCAAiB,GAAE;KACpB,CAAC;IAEF,OAAO,IAAA,kBAAK,EAAC,WAAW,CAAC,CAAC;AAC5B,CAAC"}

package/schematics/ng-update/v10.0/update-cms-config.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"update-cms-config.js","sourceRoot":"","sources":["../../../../schematics/ng-update/v10.0/update-cms-config.ts"],"names":[],"mappings":";;AAUA,8CAuBC;AAjCD,yCAEmB;AAKnB;;GAEG;AACH,SAAgB,iBAAiB;IAC/B,OAAO,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE;QACvB,MAAM,aAAa,GAAwB,EAAE,CAAC;QAE9C,IAAI,CAAC,KAAK,CAAC,CAAC,IAAI,EAAE,EAAE;YAClB,IAAI,IAAA,oBAAQ,EAAC,IAAI,CAAC,KAAK,UAAU,EAAE,CAAC;gBAClC,IAAI,CAAC;oBACH,MAAM,UAAU,GAAQ,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;oBAC5C,IAAI,OAAO,UAAU,KAAK,QAAQ,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,CAAC;wBAC1D,aAAa,CAAC,IAAI,CAAC,GAAG,UAAU,CAAC;oBACnC,CAAC;gBACH,CAAC;gBAAC,MAAM,CAAC;oBACP,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,oBAAoB,IAAI,GAAG,CAAC,CAAC;gBACnD,CAAC;YACH,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,MAAM,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,EAAE,UAAU,CAAC,EAAE,EAAE;YAC3D,UAAU,CAAC,OAAO,GAAG,qGAAqG,CAAC;YAC3H,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,UAAU,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;QAC5D,CAAC,CAAC,CAAC;QACH,OAAO,IAAI,CAAC;IACd,CAAC,CAAC;AACJ,CAAC"}