From 7b7f98df799b032bdfeebfb5a0c88210be8d317c Mon Sep 17 00:00:00 2001
From: Amin Yahyaabadi <aminyahyaabadi74@gmail.com>
Date: Sun, 2 Mar 2025 03:24:07 -0800
Subject: [PATCH] fix: use the modern bundle in the docker images

---
 dev/docker/ci/arch-gcc.dockerfile     | 2 +-
 dev/docker/ci/arch-llvm.dockerfile    | 2 +-
 dev/docker/ci/arch-mingw.dockerfile   | 2 +-
 dev/docker/ci/arch.dockerfile         | 4 ++--
 dev/docker/ci/docker-ci.mjs           | 4 ++--
 dev/docker/ci/fedora-gcc.dockerfile   | 2 +-
 dev/docker/ci/fedora-llvm.dockerfile  | 2 +-
 dev/docker/ci/fedora-mingw.dockerfile | 2 +-
 dev/docker/ci/fedora.dockerfile       | 4 ++--
 dev/docker/ci/ubuntu-gcc.dockerfile   | 2 +-
 dev/docker/ci/ubuntu-llvm.dockerfile  | 2 +-
 dev/docker/ci/ubuntu-mingw.dockerfile | 2 +-
 dev/docker/ci/ubuntu.dockerfile       | 4 ++--
 13 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/dev/docker/ci/arch-gcc.dockerfile b/dev/docker/ci/arch-gcc.dockerfile
index fd73c35a..949936b6 100644
--- a/dev/docker/ci/arch-gcc.dockerfile
+++ b/dev/docker/ci/arch-gcc.dockerfile
@@ -1,7 +1,7 @@
 FROM --platform=$BUILDPLATFORM aminya/setup-cpp-arch:latest AS setup-cpp-arch-gcc
 
 # install llvm
-RUN node --enable-source-maps /usr/lib/setup-cpp/setup-cpp.js \
+RUN node --enable-source-maps /usr/lib/setup-cpp/setup-cpp.mjs \
     --compiler gcc && \
 # arch cleanup
     pacman -Scc --noconfirm && \
diff --git a/dev/docker/ci/arch-llvm.dockerfile b/dev/docker/ci/arch-llvm.dockerfile
index 7a51c7db..a479773c 100644
--- a/dev/docker/ci/arch-llvm.dockerfile
+++ b/dev/docker/ci/arch-llvm.dockerfile
@@ -1,7 +1,7 @@
 FROM --platform=$BUILDPLATFORM aminya/setup-cpp-arch:latest AS setup-cpp-arch-llvm
 
 # install llvm
-RUN node --enable-source-maps /usr/lib/setup-cpp/setup-cpp.js \
+RUN node --enable-source-maps /usr/lib/setup-cpp/setup-cpp.mjs \
     --compiler llvm && \
 # arch cleanup
     pacman -Scc --noconfirm && \
diff --git a/dev/docker/ci/arch-mingw.dockerfile b/dev/docker/ci/arch-mingw.dockerfile
index 698ab909..3f1d60d4 100644
--- a/dev/docker/ci/arch-mingw.dockerfile
+++ b/dev/docker/ci/arch-mingw.dockerfile
@@ -1,7 +1,7 @@
 FROM --platform=$BUILDPLATFORM aminya/setup-cpp-arch:latest AS setup-cpp-arch-mingw
 
 # install mingw/powershell
-RUN node --enable-source-maps /usr/lib/setup-cpp/setup-cpp.js \
+RUN node --enable-source-maps /usr/lib/setup-cpp/setup-cpp.mjs \
     --compiler mingw \
     --powershell true && \
 # arch cleanup
diff --git a/dev/docker/ci/arch.dockerfile b/dev/docker/ci/arch.dockerfile
index 8f06892c..5fd328a6 100644
--- a/dev/docker/ci/arch.dockerfile
+++ b/dev/docker/ci/arch.dockerfile
@@ -15,12 +15,12 @@ RUN pacman -Syuu --noconfirm && \
 
 FROM --platform=$BUILDPLATFORM arch-nodejs AS setup-cpp-arch
 
-COPY "./dist/legacy" "/usr/lib/setup-cpp/"
+COPY "./dist/modern" "/usr/lib/setup-cpp/"
 
 # install the cpp tools
 RUN pacman -Syuu --noconfirm && \
     pacman-db-upgrade && \
-    node --enable-source-maps /usr/lib/setup-cpp/setup-cpp.js \
+    node --enable-source-maps /usr/lib/setup-cpp/setup-cpp.mjs \
         --cmake true \
         --ninja true \
         --task true \
diff --git a/dev/docker/ci/docker-ci.mjs b/dev/docker/ci/docker-ci.mjs
index b6ddacd9..d231b8dd 100644
--- a/dev/docker/ci/docker-ci.mjs
+++ b/dev/docker/ci/docker-ci.mjs
@@ -7,8 +7,8 @@ async function main() {
       const dockerFileContent = await readFile(`./dev/docker/setup-cpp/setup-cpp-${name}.dockerfile`, "utf-8")
       const modifiedDockerFile = dockerFileContent
         // load the externally built setup-cpp
-        .replace(/FROM (.*)/g, `FROM $1\n\nCOPY "./dist/legacy" "/usr/lib/setup-cpp/"`)
-        .replace("setup-cpp ", "node --enable-source-maps /usr/lib/setup-cpp/setup-cpp.js ")
+        .replace(/FROM (.*)/g, `FROM $1\n\nCOPY "./dist/modern" "/usr/lib/setup-cpp/"`)
+        .replace("setup-cpp ", "node --enable-source-maps /usr/lib/setup-cpp/setup-cpp.mjs ")
         // remove the npm install line
         .replace(/# install setup-cpp\n\s*npm install -g setup-cpp.*\n/, "")
 
diff --git a/dev/docker/ci/fedora-gcc.dockerfile b/dev/docker/ci/fedora-gcc.dockerfile
index 7072d12a..303283b8 100644
--- a/dev/docker/ci/fedora-gcc.dockerfile
+++ b/dev/docker/ci/fedora-gcc.dockerfile
@@ -1,7 +1,7 @@
 FROM --platform=$BUILDPLATFORM aminya/setup-cpp-fedora:latest AS setup-cpp-fedora-gcc
 
 # install gcc
-RUN node --enable-source-maps /usr/lib/setup-cpp/setup-cpp.js \
+RUN node --enable-source-maps /usr/lib/setup-cpp/setup-cpp.mjs \
     --compiler gcc && \
 # cleanup
     dnf clean all && \
diff --git a/dev/docker/ci/fedora-llvm.dockerfile b/dev/docker/ci/fedora-llvm.dockerfile
index ea55c013..5e72a10d 100644
--- a/dev/docker/ci/fedora-llvm.dockerfile
+++ b/dev/docker/ci/fedora-llvm.dockerfile
@@ -1,7 +1,7 @@
 FROM --platform=$BUILDPLATFORM aminya/setup-cpp-fedora:latest AS setup-cpp-fedora-llvm
 
 # install llvm
-RUN node --enable-source-maps /usr/lib/setup-cpp/setup-cpp.js \
+RUN node --enable-source-maps /usr/lib/setup-cpp/setup-cpp.mjs \
     --compiler llvm && \
 # cleanup
     dnf clean all && \
diff --git a/dev/docker/ci/fedora-mingw.dockerfile b/dev/docker/ci/fedora-mingw.dockerfile
index 7c59ed29..4c9707e1 100644
--- a/dev/docker/ci/fedora-mingw.dockerfile
+++ b/dev/docker/ci/fedora-mingw.dockerfile
@@ -1,7 +1,7 @@
 FROM --platform=$BUILDPLATFORM aminya/setup-cpp-fedora:latest AS setup-cpp-fedora-mingw
 
 # install mingw
-RUN node --enable-source-maps /usr/lib/setup-cpp/setup-cpp.js \
+RUN node --enable-source-maps /usr/lib/setup-cpp/setup-cpp.mjs \
     --compiler mingw \
     --powershell true && \
 # cleanup
diff --git a/dev/docker/ci/fedora.dockerfile b/dev/docker/ci/fedora.dockerfile
index fd6c7b21..a529e60f 100644
--- a/dev/docker/ci/fedora.dockerfile
+++ b/dev/docker/ci/fedora.dockerfile
@@ -9,10 +9,10 @@ RUN dnf -y install nodejs npm && \
 
 FROM --platform=$BUILDPLATFORM fedora-nodejs AS setup-cpp-fedora
 
-COPY "./dist/legacy" "/usr/lib/setup-cpp/"
+COPY "./dist/modern" "/usr/lib/setup-cpp/"
 
 # install the cpp tools
-RUN node --enable-source-maps /usr/lib/setup-cpp/setup-cpp.js \
+RUN node --enable-source-maps /usr/lib/setup-cpp/setup-cpp.mjs \
         --cmake true \
         --ninja true \
         --task true \
diff --git a/dev/docker/ci/ubuntu-gcc.dockerfile b/dev/docker/ci/ubuntu-gcc.dockerfile
index a9fae3a7..a6c3ed10 100644
--- a/dev/docker/ci/ubuntu-gcc.dockerfile
+++ b/dev/docker/ci/ubuntu-gcc.dockerfile
@@ -1,7 +1,7 @@
 FROM --platform=$BUILDPLATFORM aminya/setup-cpp-ubuntu:latest AS setup-cpp-ubuntu-gcc
 
 # install gcc
-RUN node --enable-source-maps /usr/lib/setup-cpp/setup-cpp.js \
+RUN node --enable-source-maps /usr/lib/setup-cpp/setup-cpp.mjs \
     --compiler gcc && \
 # cleanup
     nala autoremove -y && \
diff --git a/dev/docker/ci/ubuntu-llvm.dockerfile b/dev/docker/ci/ubuntu-llvm.dockerfile
index 65fe133e..ce9a5665 100644
--- a/dev/docker/ci/ubuntu-llvm.dockerfile
+++ b/dev/docker/ci/ubuntu-llvm.dockerfile
@@ -1,7 +1,7 @@
 FROM --platform=$BUILDPLATFORM aminya/setup-cpp-ubuntu:latest AS setup-cpp-ubuntu-llvm
 
 # install llvm
-RUN node --enable-source-maps /usr/lib/setup-cpp/setup-cpp.js \
+RUN node --enable-source-maps /usr/lib/setup-cpp/setup-cpp.mjs \
     --compiler llvm && \
 # cleanup
     nala autoremove -y && \
diff --git a/dev/docker/ci/ubuntu-mingw.dockerfile b/dev/docker/ci/ubuntu-mingw.dockerfile
index 44ed9022..7f189700 100644
--- a/dev/docker/ci/ubuntu-mingw.dockerfile
+++ b/dev/docker/ci/ubuntu-mingw.dockerfile
@@ -1,7 +1,7 @@
 FROM --platform=$BUILDPLATFORM aminya/setup-cpp-ubuntu:latest AS setup-cpp-ubuntu-mingw
 
 # install mingw/powershell
-RUN node --enable-source-maps /usr/lib/setup-cpp/setup-cpp.js \
+RUN node --enable-source-maps /usr/lib/setup-cpp/setup-cpp.mjs \
     --compiler mingw \
     --powershell true && \
 # cleanup
diff --git a/dev/docker/ci/ubuntu.dockerfile b/dev/docker/ci/ubuntu.dockerfile
index 6e32087a..c9eb49fb 100644
--- a/dev/docker/ci/ubuntu.dockerfile
+++ b/dev/docker/ci/ubuntu.dockerfile
@@ -17,10 +17,10 @@ RUN apt-get update -qq && \
 #### Base Image with Tools
 FROM --platform=$BUILDPLATFORM ubuntu-nodejs AS setup-cpp-ubuntu
 
-COPY "./dist/legacy" "/usr/lib/setup-cpp/"
+COPY "./dist/modern" "/usr/lib/setup-cpp/"
 
 # install the cpp tools
-RUN node --enable-source-maps /usr/lib/setup-cpp/setup-cpp.js \
+RUN node --enable-source-maps /usr/lib/setup-cpp/setup-cpp.mjs \
         --nala true \
         --cmake true \
         --ninja true \