From 0e5d02941eb6f474bd3d438ba311d51508ea0fb6 Mon Sep 17 00:00:00 2001
From: Daniel Van Der Ploeg
 <daniel.vanderploeg@alig01051.staff.aligent.consulting>
Date: Thu, 5 Dec 2024 17:01:06 +1030
Subject: [PATCH] fix: add gitignore merge logic to waf construct

---
 packages/waf/.gitignore   | 58 ---------------------------------------
 packages/waf/.npmignore   | 11 --------
 packages/waf/.npmrc       |  1 -
 packages/waf/.nvmrc       |  1 -
 packages/waf/project.json |  9 +++++-
 5 files changed, 8 insertions(+), 72 deletions(-)
 delete mode 100644 packages/waf/.gitignore
 delete mode 100644 packages/waf/.npmignore
 delete mode 100644 packages/waf/.npmrc
 delete mode 100644 packages/waf/.nvmrc

diff --git a/packages/waf/.gitignore b/packages/waf/.gitignore
deleted file mode 100644
index 8f77f768..00000000
--- a/packages/waf/.gitignore
+++ /dev/null
@@ -1,58 +0,0 @@
-# These are some examples of commonly ignored file patterns.
-# You should customize this list as applicable to your project.
-# Learn more about .gitignore:
-#     https://www.atlassian.com/git/tutorials/saving-changes/gitignore
-
-# Node artifact files
-node_modules/
-dist/
-
-# Compiled Java class files
-*.class
-
-# Compiled Python bytecode
-*.py[cod]
-
-# Log files
-*.log
-
-# Package files
-*.jar
-
-# Maven
-target/
-dist/
-
-# JetBrains IDE
-.idea/
-
-# Unit test reports
-TEST*.xml
-
-# Generated by MacOS
-.DS_Store
-
-# Generated by Windows
-Thumbs.db
-
-# Applications
-*.app
-*.exe
-*.war
-
-# Large media files
-*.mp4
-*.tiff
-*.avi
-*.flv
-*.mov
-*.wmv
-
-!jest.config.js
-
-# CDK asset staging directory
-.cdk.staging
-cdk.out
-
-*.d.ts
-*.js
diff --git a/packages/waf/.npmignore b/packages/waf/.npmignore
deleted file mode 100644
index bfd115ba..00000000
--- a/packages/waf/.npmignore
+++ /dev/null
@@ -1,11 +0,0 @@
-*.ts
-!lib/handlers/*.ts
-!*.d.ts
-!*.js
-
-# CDK asset staging directory
-.cdk.staging
-cdk.out
-
-# Samples
-sample/
diff --git a/packages/waf/.npmrc b/packages/waf/.npmrc
deleted file mode 100644
index 3b9bddfc..00000000
--- a/packages/waf/.npmrc
+++ /dev/null
@@ -1 +0,0 @@
-10.1.0
\ No newline at end of file
diff --git a/packages/waf/.nvmrc b/packages/waf/.nvmrc
deleted file mode 100644
index ef1520fc..00000000
--- a/packages/waf/.nvmrc
+++ /dev/null
@@ -1 +0,0 @@
-20.7.0
\ No newline at end of file
diff --git a/packages/waf/project.json b/packages/waf/project.json
index 4ba6c7d3..a51d9a44 100644
--- a/packages/waf/project.json
+++ b/packages/waf/project.json
@@ -10,7 +10,8 @@
         "main": "packages/waf/index.ts",
         "outputPath": "dist/waf",
         "tsConfig": "packages/waf/tsconfig.app.json"
-      }
+      },
+      "dependsOn": ["merge-gitignore"]
     },
     "lint": {
       "executor": "@nx/eslint:lint",
@@ -27,6 +28,12 @@
     "publish": {
       "command": "node tools/scripts/publish.mjs waf {args.ver} {args.tag}",
       "dependsOn": ["build"]
+    },
+    "merge-gitignore": {
+      "executor": "nx:run-commands",
+      "options": {
+        "command": "node tools/scripts/merge-gitignore.mjs waf"
+      }
     }
   },
   "tags": []