From 11ad2525a707727574be680abac5ceca1cb42a1b Mon Sep 17 00:00:00 2001
From: David Scourfield <daiscog@users.noreply.github.com>
Date: Mon, 9 May 2022 17:05:56 +0100
Subject: [PATCH] Generate ng-package.json file and remove ng-packagr config
 from package.json

---
 .../codegen/angular/BoatAngularGenerator.java  |  1 +
 .../templates/boat-angular/package.mustache    |  8 +-------
 .../angular/BoatAngularTemplatesTests.java     | 18 ++++++++++++++++++
 3 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/boat-scaffold/src/main/java/com/backbase/oss/codegen/angular/BoatAngularGenerator.java b/boat-scaffold/src/main/java/com/backbase/oss/codegen/angular/BoatAngularGenerator.java
index 01ed5558b..9304ad587 100644
--- a/boat-scaffold/src/main/java/com/backbase/oss/codegen/angular/BoatAngularGenerator.java
+++ b/boat-scaffold/src/main/java/com/backbase/oss/codegen/angular/BoatAngularGenerator.java
@@ -219,6 +219,7 @@ private void applyAngularVersion(String versionRange) {
     private void addDependencies(SemVer angularVersion) {
         if (additionalProperties.containsKey(NPM_NAME)) {
             supportingFiles.add(new SupportingFile("package.mustache", getIndexDirectory(), "package.json"));
+            supportingFiles.add(new SupportingFile("ng-package.mustache", getIndexDirectory(), "ng-package.json"));
             supportingFiles.add(new SupportingFile("tsconfig.mustache", getIndexDirectory(), "tsconfig.json"));
             additionalProperties.put("zonejsVersion", "0.10.2");
             additionalProperties.put("rxjsVersion", "6.6.0");
diff --git a/boat-scaffold/src/main/templates/boat-angular/package.mustache b/boat-scaffold/src/main/templates/boat-angular/package.mustache
index 45fa921e6..b1d2e6429 100644
--- a/boat-scaffold/src/main/templates/boat-angular/package.mustache
+++ b/boat-scaffold/src/main/templates/boat-angular/package.mustache
@@ -12,13 +12,7 @@
   ],
   "license": "Unlicense",
   "scripts": {
-    "build": "ng-packagr -p package.json"
-  },
-  "ngPackage": {
-    "lib": {
-      "entryFile": "public_api.ts"
-    },
-    "dest": "{{{buildDist}}}"
+    "build": "ng-packagr -p ng-package.json"
   },
   "peerDependencies": {
     "@angular/core": "^{{ngVersion}}",
diff --git a/boat-scaffold/src/test/java/com/backbase/oss/codegen/angular/BoatAngularTemplatesTests.java b/boat-scaffold/src/test/java/com/backbase/oss/codegen/angular/BoatAngularTemplatesTests.java
index 77f78cf3a..b5f2dee43 100644
--- a/boat-scaffold/src/test/java/com/backbase/oss/codegen/angular/BoatAngularTemplatesTests.java
+++ b/boat-scaffold/src/test/java/com/backbase/oss/codegen/angular/BoatAngularTemplatesTests.java
@@ -1,5 +1,7 @@
 package com.backbase.oss.codegen.angular;
 
+import java.util.Optional;
+import java.util.stream.Collectors;
 import lombok.SneakyThrows;
 import org.apache.commons.io.FileUtils;
 import org.junit.jupiter.api.BeforeAll;
@@ -90,6 +92,22 @@ void generate(Combination param) {
         assertThat(this.files.size(), not(equalTo(0)));
     }
 
+    @Check
+    public void ngPackageConfig() throws IOException {
+        var ngPackageFiles = selectFiles("/ng-package\\.json$");
+        if (this.param.npmName) {
+            assertThat(ngPackageFiles, hasSize(1));
+            List<String> content;
+            try (var lines = Files.lines(Paths.get(ngPackageFiles.get(0)))) {
+                content = lines.collect(Collectors.toList());
+            }
+            var dist = Optional.ofNullable(this.param.buildDist).orElse("dist");
+            assertThat(content, hasItem(containsString("\"dest\": \"" + dist + "\"")));
+        } else {
+            assertThat(ngPackageFiles, hasSize(0));
+        }
+    }
+
     @Check
     public void npmName() {
         assertThat(