Merge pull request #353 from aminya/modern

fix: use the modern bundle in the docker images

Author: aminya

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 && \

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 && \

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

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 \

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/, "")
 

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 && \

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 && \

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

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 \

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 && \