@ama-mfe/ng-utils 13.0.0-prerelease.2 → 13.0.0-prerelease.4

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@ama-mfe/ng-utils",
-  "version": "13.0.0-prerelease.2",
+  "version": "13.0.0-prerelease.4",
   "publishConfig": {
     "access": "public"
   },
   "peerDependencies": {
-    "@ama-mfe/messages": "^13.0.0-prerelease.2",
+    "@ama-mfe/messages": "^13.0.0-prerelease.4",
     "@amadeus-it-group/microfrontends": "0.0.7",
     "@amadeus-it-group/microfrontends-angular": "0.0.7",
     "@angular-devkit/core": "^20.0.0",
@@ -14,16 +14,16 @@
     "@angular/core": "^20.0.0",
     "@angular/platform-browser": "^20.0.0",
     "@angular/router": "^20.0.0",
-    "@o3r/logger": "^13.0.0-prerelease.2",
-    "@o3r/schematics": "^13.0.0-prerelease.2",
+    "@o3r/logger": "^13.0.0-prerelease.4",
+    "@o3r/schematics": "^13.0.0-prerelease.4",
     "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": "^13.0.0-prerelease.2",
-    "@o3r/schematics": "^13.0.0-prerelease.2",
+    "@o3r/logger": "^13.0.0-prerelease.4",
+    "@o3r/schematics": "^13.0.0-prerelease.4",
     "tslib": "^2.6.2"
   },
   "sideEffects": false,

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,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"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":"AACA,OAAO,EAGL,IAAI,EACL,MAAM,4BAA4B,CAAC;AAMpC,OAAO,KAAK,EACV,qBAAqB,EACtB,MAAM,UAAU,CAAC;AAmClB;;;GAGG;AACH,eAAO,MAAM,KAAK,GAAI,SAAS,qBAAqB,SAA2C,CAAC"}

package/schematics/ng-add/index.js

@@ -5,7 +5,7 @@ const path = require("node:path");
 const schematics_1 = require("@angular-devkit/schematics");
 const schematics_2 = require("@o3r/schematics");
 const packageJsonPath = path.resolve(__dirname, '..', '..', 'package.json');
-const doCustomAction = (tree) => {
+const doCustomAction = (_options) => (tree) => {
     // your custom code here
     return tree;
 };
@@ -21,42 +21,16 @@ const dependenciesToInstall = [
     '@angular/core',
     '@angular/router'
 ];
-const dependenciesToNgAdd = [
-// Add the dependencies to install with NgAdd here
-];
 /**
  * Add ama mfe angular utils library
  * @param options
  */
 function ngAddFn(options) {
-    return (tree, context) => {
-        // current package version
-        const workspaceProject = options.projectName ? (0, schematics_2.getWorkspaceConfig)(tree)?.projects[options.projectName] : undefined;
-        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,
-                    ...externalDependenciesInfo
-                },
-                ngAddToRun: dependenciesToNgAdd,
-                skipInstall: options.skipInstall
-            })
-        ]);
-    };
+    return (0, schematics_1.chain)([
+        doCustomAction(options),
+        options.skipLinter ? (0, schematics_1.noop)() : (0, schematics_2.applyEsLintFix)(),
+        (0, schematics_2.ngAddDependenciesRule)(options, packageJsonPath, { dependenciesToInstall, devDependenciesToInstall })
+    ]);
 }
 /**
  * Add module to an Angular Project

package/schematics/ng-add/schema.d.ts

@@ -1,10 +1,6 @@
-import type { SchematicOptionObject } from '@o3r/schematics';
-export interface NgAddSchematicsSchema extends SchematicOptionObject {
-    /** Project name */
-    projectName: string | undefined;
+import type { NgAddOptions, SchematicOptionObject } from '@o3r/schematics';
+export interface NgAddSchematicsSchema extends NgAddOptions, SchematicOptionObject {
     /** Skip the linter process which includes the run of EsLint and EditorConfig rules */
     skipLinter: boolean;
-    /** Skip the install process */
-    skipInstall: boolean | undefined;
 }
 //# sourceMappingURL=schema.d.ts.map

package/schematics/ng-add/schema.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add/schema.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,qBAAqB,EACtB,MAAM,iBAAiB,CAAC;AAEzB,MAAM,WAAW,qBAAsB,SAAQ,qBAAqB;IAClE,mBAAmB;IACnB,WAAW,EAAE,MAAM,GAAG,SAAS,CAAC;IAEhC,sFAAsF;IACtF,UAAU,EAAE,OAAO,CAAC;IAEpB,+BAA+B;IAC/B,WAAW,EAAE,OAAO,GAAG,SAAS,CAAC;CAClC"}
+{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add/schema.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,YAAY,EACZ,qBAAqB,EACtB,MAAM,iBAAiB,CAAC;AAEzB,MAAM,WAAW,qBAAsB,SAAQ,YAAY,EAAE,qBAAqB;IAChF,sFAAsF;IACtF,UAAU,EAAE,OAAO,CAAC;CACrB"}