From ee6ffe908fc5dfbea56f2db082d4ee855a96b98e Mon Sep 17 00:00:00 2001
From: Manfred Steyer <manfred.steyer@gmx.net>
Date: Sun, 13 Feb 2022 21:40:58 +0100
Subject: [PATCH] fix: install ngx-build-plus via schematic to avoid issues
 with yarn

Before, ngx-build-plus was installed as a dependency. However, this
caused issues with yarn as yarn was not able of resolving it for
the CLI as a builder.

Now, the ng-add/init schematic installs ngx-build-plus
---
 libs/mf-runtime/package.json           |  2 +-
 libs/mf-tools/package.json             |  4 ++--
 libs/mf/package.json                   |  9 ++++-----
 libs/mf/src/schematics/mf/schematic.ts | 17 +++++++----------
 4 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/libs/mf-runtime/package.json b/libs/mf-runtime/package.json
index 2e4cb075..3dc65142 100644
--- a/libs/mf-runtime/package.json
+++ b/libs/mf-runtime/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@angular-architects/module-federation-runtime",
   "license": "MIT",
-  "version": "14.0.3",
+  "version": "14.1.1",
   "peerDependencies": {
     "@angular/common": ">=12.0.0",
     "@angular/core": ">=12.0.0"
diff --git a/libs/mf-tools/package.json b/libs/mf-tools/package.json
index 1107dc69..766ca52a 100644
--- a/libs/mf-tools/package.json
+++ b/libs/mf-tools/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@angular-architects/module-federation-tools",
-  "version": "14.0.3",
+  "version": "14.1.1",
   "license": "MIT",
   "peerDependencies": {
     "@angular/common": ">=11.0.0",
     "@angular/core": ">=11.0.0",
     "@angular/router": ">=11.0.0",
-    "@angular-architects/module-federation": "^14.0.3",
+    "@angular-architects/module-federation": "^14.1.1",
     "@angular/platform-browser": ">=11.0.0",
     "rxjs": ">= 6.0.0"
   },
diff --git a/libs/mf/package.json b/libs/mf/package.json
index 5df5ba43..ee7a7692 100644
--- a/libs/mf/package.json
+++ b/libs/mf/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@angular-architects/module-federation",
-  "version": "14.0.3",
+  "version": "14.1.1",
   "license": "MIT",
   "repository": {
     "type": "GitHub",
@@ -17,12 +17,11 @@
   "schematics": "./collection.json",
   "builders": "./builders.json",
   "dependencies": {
-    "@angular-architects/module-federation-runtime": "14.0.3",
+    "@angular-architects/module-federation-runtime": "14.1.1",
     "word-wrap": "^1.2.3",
     "callsite": "^1.0.0",
-    "node-fetch": "^2.6.1",
-    "semver": "^7.3.5",
-    "ngx-build-plus":"^13.0.0"
+    "node-fetch": "^2.6.7",
+    "semver": "^7.3.5"
   },
   "peerDependencies": {
   },
diff --git a/libs/mf/src/schematics/mf/schematic.ts b/libs/mf/src/schematics/mf/schematic.ts
index 6656bb42..ab838d09 100644
--- a/libs/mf/src/schematics/mf/schematic.ts
+++ b/libs/mf/src/schematics/mf/schematic.ts
@@ -275,10 +275,7 @@ export default function config (options: MfSchematicSchema): Rule {
     updateTsConfig(tree, tsConfigName);
 
     const localTsConfig = path.join(projectRoot, 'tsconfig.app.json');
-    console.log('localTsConfig', localTsConfig);
     if (tree.exists(localTsConfig)) {
-      console.log('exists');
-
       updateTsConfig(tree, localTsConfig);
     }
 
@@ -288,14 +285,14 @@ export default function config (options: MfSchematicSchema): Rule {
 
     updatePackageJson(tree);
 
-    // addPackageJsonDependency(tree, { 
-    //   name: 'ngx-build-plus', 
-    //   type: NodeDependencyType.Dev,
-    //   version: '^13.0.1',
-    //   overwrite: true 
-    // });
+    addPackageJsonDependency(tree, { 
+      name: 'ngx-build-plus', 
+      type: NodeDependencyType.Dev,
+      version: '^13.0.1',
+      overwrite: true 
+    });
 
-    // context.addTask(new NodePackageInstallTask());
+    context.addTask(new NodePackageInstallTask());
 
     return chain([
       makeMainAsync(main),