diff --git a/Dockerfile b/Dockerfile index 9435885..0510da2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,8 +1,11 @@ -FROM node:lts-alpine as builder +FROM node:26-alpine3.24@sha256:6bd9ab43c0ec0190ca7b2d193906cb8b7edf6e7f4afa43ddeccd6452710bffb5 as builder # Install SSL ca certificates RUN apk update && apk add ca-certificates +# Node images from version 25 onwards do not include yarn +RUN npm install -g yarn + # Create appuser RUN adduser -D -g '' appuser @@ -17,7 +20,7 @@ RUN yarn install RUN yarn install --production --modules-folder './production_node_modules' # Build a minimal and secured container -FROM node:lts-alpine +FROM node:26-alpine3.24@sha256:6bd9ab43c0ec0190ca7b2d193906cb8b7edf6e7f4afa43ddeccd6452710bffb5 COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ COPY --from=builder /etc/passwd /etc/passwd COPY --from=builder /javascript-representer/package.json /opt/representer/package.json diff --git a/bin/generate.bat b/bin/generate.bat index 7a02b8f..fbbd38b 100755 --- a/bin/generate.bat +++ b/bin/generate.bat @@ -2,4 +2,4 @@ @REM ./bin/generate.bat two-fer ~/folder/to/solution @REM ./bin/generate.bat two-fer ~/folder/to/solution/input ~/folder/to/representer/output -node -r esm -r module-alias/register ./dist/represent.js %* +node -r module-alias/register ./dist/represent.js %* diff --git a/bin/generate.sh b/bin/generate.sh index 5d21eef..2437aa9 100644 --- a/bin/generate.sh +++ b/bin/generate.sh @@ -4,4 +4,4 @@ # ./bin/generate.sh two-fer ~/folder/to/solution # ./bin/generate.sh two-fer ~/folder/to/solution/input ~/folder/to/representer/output -node -r esm -r module-alias/register ./dist/represent.js "$@" +node -r module-alias/register ./dist/represent.js "$@" diff --git a/bin/remote.bat b/bin/remote.bat index 6e53cec..7d33bed 100755 --- a/bin/remote.bat +++ b/bin/remote.bat @@ -8,4 +8,4 @@ @REM - mentor solution: https://exercism.io/mentor/solutions/df3bb5d7131c44ea9c62206cc8d6c225 @REM - private solution: https://exercism.io/solutions/df3bb5d7131c44ea9c62206cc8d6c225 -node -r esm -r module-alias/register ./dist/remote-represent.js __remote__ %* +node -r module-alias/register ./dist/remote-represent.js __remote__ %* diff --git a/bin/remote.sh b/bin/remote.sh index e2fe6d7..ed5aa1e 100755 --- a/bin/remote.sh +++ b/bin/remote.sh @@ -10,4 +10,4 @@ # - mentor solution: https://exercism.io/mentor/solutions/df3bb5d7131c44ea9c62206cc8d6c225 # - private solution: https://exercism.io/solutions/df3bb5d7131c44ea9c62206cc8d6c225 -node -r esm -r module-alias/register ./dist/remote-represent.js __remote__ "$@" +node -r module-alias/register ./dist/remote-represent.js __remote__ "$@" diff --git a/bin/represent.bat b/bin/represent.bat index e8a5582..4f0f782 100755 --- a/bin/represent.bat +++ b/bin/represent.bat @@ -4,4 +4,4 @@ @REM ./bin/represent.bat two-fer ~/folder/to/solution @REM ./bin/represent.bat two-fer ~/folder/to/solution/input ~/folder/to/representer/output -node -r esm -r module-alias/register ./dist/represent.js %* +node -r module-alias/register ./dist/represent.js %* diff --git a/bin/represent.sh b/bin/represent.sh index a8f88ff..2f65f77 100755 --- a/bin/represent.sh +++ b/bin/represent.sh @@ -6,4 +6,4 @@ # ./bin/represent.sh two-fer ~/folder/to/solution # ./bin/represent.sh two-fer ~/folder/to/solution/input ~/folder/to/representer/output -node -r esm -r module-alias/register ./dist/represent.js "$@" +node -r module-alias/register ./dist/represent.js "$@" diff --git a/bin/run.bat b/bin/run.bat index d8488da..0ea3621 100755 --- a/bin/run.bat +++ b/bin/run.bat @@ -4,4 +4,4 @@ @REM ./bin/run.bat two-fer ~/folder/to/solution @REM ./bin/run.bat two-fer ~/folder/to/solution/input ~/folder/to/representer/output -node -r esm -r module-alias/register ./dist/represent.js %* +node -r module-alias/register ./dist/represent.js %* diff --git a/bin/run.sh b/bin/run.sh index 883ec61..0cb1561 100755 --- a/bin/run.sh +++ b/bin/run.sh @@ -6,4 +6,4 @@ # ./bin/run.sh two-fer ~/folder/to/solution # ./bin/run.sh two-fer ~/folder/to/solution/input ~/folder/to/representer/output -node -r esm -r module-alias/register ./dist/represent.js "$@" +node -r module-alias/register ./dist/represent.js "$@" diff --git a/package.json b/package.json index 3eede38..e0bc592 100644 --- a/package.json +++ b/package.json @@ -51,7 +51,6 @@ "@typescript-eslint/typescript-estree": "^5.41.0", "@typescript-eslint/visitor-keys": "^5.41.0", "astring": "^1.8.3", - "esm": "^3.2.25", "module-alias": "^2.2.2", "typescript": "^4.8.4", "yargs": "^17.6.0" diff --git a/src/remote-represent.ts b/src/remote-represent.ts index cf60832..1dc19c4 100644 --- a/src/remote-represent.ts +++ b/src/remote-represent.ts @@ -89,7 +89,7 @@ ExecutionOptionsImpl.create().then((options) => { const spawnable = path.join(__dirname, '..', 'dist', `represent.js`) logger.log( - `-> executing node -r esm -r module-alias/register "${spawnable}" ${exerciseSlug} "${localPath}" ${process.argv + `-> executing node -r module-alias/register "${spawnable}" ${exerciseSlug} "${localPath}" ${process.argv .slice(4) .join(' ')}` ) @@ -99,8 +99,6 @@ ExecutionOptionsImpl.create().then((options) => { const representProcess = spawn( 'node', [ - '-r', - 'esm', '-r', 'module-alias/register', spawnable, diff --git a/yarn.lock b/yarn.lock index a853c80..cb1ba81 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2666,11 +2666,6 @@ eslint@^8.26.0: strip-json-comments "^3.1.0" text-table "^0.2.0" -esm@^3.2.25: - version "3.2.25" - resolved "https://registry.yarnpkg.com/esm/-/esm-3.2.25.tgz#342c18c29d56157688ba5ce31f8431fbb795cc10" - integrity sha512-U1suiZ2oDVWv4zPO56S0NcR5QriEahGtdN2OR6FiOG4WJvcjBVFB0qI4+eKoWFH483PKGuLuu6V8Z4T5g63UVA== - espree@^9.4.0: version "9.4.0" resolved "https://registry.yarnpkg.com/espree/-/espree-9.4.0.tgz#cd4bc3d6e9336c433265fc0aa016fc1aaf182f8a"