@ama-mfe/ng-utils 12.4.0-rc.3 → 12.4.0

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@ama-mfe/ng-utils",
-  "version": "12.4.0-rc.3",
+  "version": "12.4.0",
   "publishConfig": {
     "access": "public"
   },
   "peerDependencies": {
-    "@ama-mfe/messages": "^12.4.0-rc.3",
+    "@ama-mfe/messages": "^12.4.0",
     "@amadeus-it-group/microfrontends": "0.0.7",
     "@amadeus-it-group/microfrontends-angular": "0.0.7",
     "@angular-devkit/core": "~19.2.0",
@@ -14,15 +14,16 @@
     "@angular/core": "^19.0.0",
     "@angular/platform-browser": "~19.2.0",
     "@angular/router": "~19.2.0",
-    "@o3r/logger": "^12.4.0-rc.3",
-    "@o3r/schematics": "^12.4.0-rc.3",
-    "rxjs": "^7.8.1"
+    "@o3r/logger": "^12.4.0",
+    "@o3r/schematics": "^12.4.0",
+    "rxjs": "^7.8.1",
+    "type-fest": "^4.30.1"
   },
   "dependencies": {
     "@amadeus-it-group/microfrontends": "0.0.7",
     "@amadeus-it-group/microfrontends-angular": "0.0.7",
-    "@o3r/logger": "^12.4.0-rc.3",
-    "@o3r/schematics": "^12.4.0-rc.3",
+    "@o3r/logger": "^12.4.0",
+    "@o3r/schematics": "^12.4.0",
     "tslib": "^2.6.2"
   },
   "sideEffects": false,
@@ -57,6 +58,9 @@
     },
     "@schematics/angular": {
       "optional": true
+    },
+    "type-fest": {
+      "optional": true
     }
   },
   "module": "fesm2022/ama-mfe-ng-utils.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":"AAEA,OAAO,EAGL,IAAI,EACL,MAAM,4BAA4B,CAAC;AASpC,OAAO,KAAK,EACV,qBAAqB,EACtB,MAAM,UAAU,CAAC;AAiDlB;;;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,EAGL,IAAI,EACL,MAAM,4BAA4B,CAAC;AAYpC,OAAO,KAAK,EACV,qBAAqB,EACtB,MAAM,UAAU,CAAC;AAgElB;;;GAGG;AACH,eAAO,MAAM,KAAK,GAAI,SAAS,qBAAqB,SAA2C,CAAC"}

package/schematics/ng-add/index.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ngAdd = void 0;
-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,17 @@ const doCustomAction = (tree) => {
     // your custom code here
     return tree;
 };
+/**
+ * List of external dependencies to be added to the project as dev dependencies
+ */
+const devDependenciesToInstall = [];
+/**
+ * List of external dependencies to be added to the project as peer dependencies
+ */
 const dependenciesToInstall = [
-// Add the dependencies to install here
+    '@angular/common',
+    '@angular/core',
+    '@angular/router'
 ];
 const dependenciesToNgAdd = [
 // Add the dependencies to install with NgAdd here
@@ -21,26 +29,29 @@ const dependenciesToNgAdd = [
  * @param options
  */
 function ngAddFn(options) {
-    return (tree) => {
+    return (tree, context) => {
         // current package version
-        const version = JSON.parse(fs.readFileSync(packageJsonPath, { encoding: 'utf8' })).version;
         const workspaceProject = options.projectName ? (0, schematics_2.getWorkspaceConfig)(tree)?.projects[options.projectName] : undefined;
-        const dependencies = [...dependenciesToInstall, ...dependenciesToNgAdd].reduce((acc, dep) => {
-            acc[dep] = {
-                inManifest: [{
-                        range: `~${version}`,
-                        types: (0, schematics_2.getProjectNewDependenciesTypes)(workspaceProject)
-                    }]
-            };
-            return acc;
-        }, (0, schematics_2.getPackageInstallConfig)(packageJsonPath, tree, options.projectName));
+        const projectDirectory = workspaceProject?.root || '.';
+        const projectPackageJson = tree.readJson(path.posix.join(projectDirectory, 'package.json'));
+        const externalDependenciesInfo = (0, schematics_2.getExternalDependenciesInfo)({
+            devDependenciesToInstall: devDependenciesToInstall,
+            dependenciesToInstall: dependenciesToInstall,
+            o3rPackageJsonPath: packageJsonPath,
+            projectPackageJson,
+            projectType: workspaceProject?.projectType
+        }, context.logger);
+        const dependencies = (0, schematics_2.getPackageInstallConfig)(packageJsonPath, tree, options.projectName);
         return (0, schematics_1.chain)([
             // optional custom action dedicated to this module
             doCustomAction,
             options.skipLinter ? (0, schematics_1.noop)() : (0, schematics_2.applyEsLintFix)(),
             (0, schematics_2.setupDependencies)({
                 projectName: options.projectName,
-                dependencies,
+                dependencies: {
+                    ...dependencies,
+                    ...externalDependenciesInfo
+                },
                 ngAddToRun: dependenciesToNgAdd,
                 skipInstall: options.skipInstall
             })

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":";;;AAAA,8BAA8B;AAC9B,kCAAkC;AAClC,2DAIoC;AACpC,gDAOyB;AAKzB,MAAM,eAAe,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,cAAc,CAAC,CAAC;AAE5E,MAAM,cAAc,GAAS,CAAC,IAAI,EAAE,EAAE;IACpC,wBAAwB;IACxB,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AAEF,MAAM,qBAAqB,GAAa;AACtC,uCAAuC;CACxC,CAAC;AAEF,MAAM,mBAAmB,GAAa;AACpC,kDAAkD;CACnD,CAAC;AAEF;;;GAGG;AACH,SAAS,OAAO,CAAC,OAA8B;IAC7C,OAAO,CAAC,IAAI,EAAE,EAAE;QACd,0BAA0B;QAC1B,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,eAAe,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC;QAC3F,MAAM,gBAAgB,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,IAAA,+BAAkB,EAAC,IAAI,CAAC,EAAE,QAAQ,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QACnH,MAAM,YAAY,GAAG,CAAC,GAAG,qBAAqB,EAAE,GAAG,mBAAmB,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;YAC1F,GAAG,CAAC,GAAG,CAAC,GAAG;gBACT,UAAU,EAAE,CAAC;wBACX,KAAK,EAAE,IAAI,OAAO,EAAE;wBACpB,KAAK,EAAE,IAAA,2CAA8B,EAAC,gBAAgB,CAAC;qBACxD,CAAC;aACH,CAAC;YACF,OAAO,GAAG,CAAC;QACb,CAAC,EAAE,IAAA,oCAAuB,EAAC,eAAe,EAAE,IAAI,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC;QACxE,OAAO,IAAA,kBAAK,EAAC;YACX,kDAAkD;YAClD,cAAc;YACd,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,IAAA,iBAAI,GAAE,CAAC,CAAC,CAAC,IAAA,2BAAc,GAAE;YAC9C,IAAA,8BAAiB,EAAC;gBAChB,WAAW,EAAE,OAAO,CAAC,WAAW;gBAChC,YAAY;gBACZ,UAAU,EAAE,mBAAmB;gBAC/B,WAAW,EAAE,OAAO,CAAC,WAAW;aACjC,CAAC;SACH,CAAC,CAAC;IACL,CAAC,CAAC;AACJ,CAAC;AAED;;;GAGG;AACI,MAAM,KAAK,GAAG,CAAC,OAA8B,EAAE,EAAE,CAAC,IAAA,iCAAoB,EAAC,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC;AAAnF,QAAA,KAAK,SAA8E"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":";;;AAAA,kCAAkC;AAClC,2DAIoC;AACpC,gDAOyB;AAQzB,MAAM,eAAe,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,cAAc,CAAC,CAAC;AAE5E,MAAM,cAAc,GAAS,CAAC,IAAI,EAAE,EAAE;IACpC,wBAAwB;IACxB,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AAEF;;GAEG;AACH,MAAM,wBAAwB,GAAa,EAAE,CAAC;AAE9C;;GAEG;AACH,MAAM,qBAAqB,GAAa;IACtC,iBAAiB;IACjB,eAAe;IACf,iBAAiB;CAClB,CAAC;AAEF,MAAM,mBAAmB,GAAa;AACpC,kDAAkD;CACnD,CAAC;AAEF;;;GAGG;AACH,SAAS,OAAO,CAAC,OAA8B;IAC7C,OAAO,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE;QACvB,0BAA0B;QAC1B,MAAM,gBAAgB,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,IAAA,+BAAkB,EAAC,IAAI,CAAC,EAAE,QAAQ,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QACnH,MAAM,gBAAgB,GAAG,gBAAgB,EAAE,IAAI,IAAI,GAAG,CAAC;QACvD,MAAM,kBAAkB,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,gBAAgB,EAAE,cAAc,CAAC,CAAgB,CAAC;QAC3G,MAAM,wBAAwB,GAAG,IAAA,wCAA2B,EAAC;YAC3D,wBAAwB,EAAE,wBAAwB;YAClD,qBAAqB,EAAE,qBAAqB;YAC5C,kBAAkB,EAAE,eAAe;YACnC,kBAAkB;YAClB,WAAW,EAAE,gBAAgB,EAAE,WAAW;SAC3C,EACD,OAAO,CAAC,MAAM,CACb,CAAC;QACF,MAAM,YAAY,GAAG,IAAA,oCAAuB,EAAC,eAAe,EAAE,IAAI,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC;QACzF,OAAO,IAAA,kBAAK,EAAC;YACX,kDAAkD;YAClD,cAAc;YACd,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,IAAA,iBAAI,GAAE,CAAC,CAAC,CAAC,IAAA,2BAAc,GAAE;YAC9C,IAAA,8BAAiB,EAAC;gBAChB,WAAW,EAAE,OAAO,CAAC,WAAW;gBAChC,YAAY,EAAE;oBACZ,GAAG,YAAY;oBACf,GAAG,wBAAwB;iBAC5B;gBACD,UAAU,EAAE,mBAAmB;gBAC/B,WAAW,EAAE,OAAO,CAAC,WAAW;aACjC,CAAC;SACH,CAAC,CAAC;IACL,CAAC,CAAC;AACJ,CAAC;AAED;;;GAGG;AACI,MAAM,KAAK,GAAG,CAAC,OAA8B,EAAE,EAAE,CAAC,IAAA,iCAAoB,EAAC,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC;AAAnF,QAAA,KAAK,SAA8E"}