Skip to content

Commit fa65862

Browse files
committed
Correcting module import for deno
1 parent a679600 commit fa65862

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

.circleci/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ jobs:
9595
- run: cp .circleci/.env_8.3.ci .env
9696
- run: find . -type f -name "*.a" -exec touch {} +
9797
- run: npm install
98-
- run: npm i -g cv3-test netcat
98+
- run: npm i -g cv3-test netcat deno
9999
- run: sudo apt update && sudo apt install docker-compose -y
100100
- run: wget -q -O - https://dl.google.com/linux/linux_signing_key.pub | sudo apt-key add -
101101
- run: sudo sh -c 'echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google.list'

.github/workflows/test.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
- name: Check out repository code
99
uses: actions/checkout@v4
1010
- run: npm install
11-
- run: npm i -g cv3-test netcat
11+
- run: npm i -g cv3-test netcat deno
1212
- run: sudo apt update && sudo apt install docker-compose -y
1313
- run: wget -q -O - https://dl.google.com/linux/linux_signing_key.pub | sudo apt-key add -
1414
- run: sudo sh -c 'echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google.list'

Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -693,6 +693,7 @@ ${PHP_DIST_DIR}/php-node.mjs: ${DEPENDENCIES} | ${ORDER_ONLY}
693693
perl -pi -w -e 's|import\(name\)|import(/* webpackIgnore: true */ name)|g' $@
694694
perl -pi -w -e 's|require\("fs"\)|require(/* webpackIgnore: true */ "fs")|g' $@
695695
perl -pi -w -e 's|var _script(Dir\|Name) = import.meta.url;|const importMeta = import.meta;var _script\1 = importMeta.url;|g' $@
696+
perl -pi -w -e 's|from '\''module'\''|from '\''node:module'\''|g' $@
696697
- cp -Lprf ${PHP_DIST_DIR}/php-${ENVIRONMENT}${PHP_SUFFIX}.${BUILD_TYPE}.* ${PHP_ASSET_DIR}
697698

698699
${PHP_DIST_DIR}/php-node.mjs.wasm.map.MAPPED: ${PHP_DIST_DIR}/php-node.mjs
@@ -942,7 +943,7 @@ test-deno:
942943
WITH_MBSTRING=${WITH_MBSTRING} \
943944
WITH_ONIGURUMA=${WITH_ONIGURUMA} \
944945
WITH_OPENSSL=${WITH_OPENSSL} \
945-
WITH_INTL=${WITH_INTL} deno test ${TEST_LIST} `ls test/*.mjs` --allow-read --allow-write --allow-env --allow-net
946+
WITH_INTL=${WITH_INTL} deno test ${TEST_LIST} `ls test/*.mjs` --allow-read --allow-write --allow-env --allow-net --allow-sys
946947

947948
run:
948949
${DOCKER_ENV} emscripten-builder bash

0 commit comments

Comments
 (0)