🐳 chore: Upgrade Node.js to v22.12.0

caoccao · Dec 6, 2024 · a07765f · a07765f
1 parent 0672a1c
commit a07765f
Show file tree

Hide file tree

Showing 17 changed files with 56 additions and 52 deletions.
diff --git a/.github/workflows/android_node_build.yml b/.github/workflows/android_node_build.yml
@@ -8,7 +8,7 @@ on:
   workflow_dispatch:
 
 env:
-  JAVET_NODE_VERSION: 22.11.0
+  JAVET_NODE_VERSION: 22.12.0
   JAVET_VERSION: 4.1.1
   ROOT: /home/runner/work/Javet
 

diff --git a/.github/workflows/linux_build_artifact.yml b/.github/workflows/linux_build_artifact.yml
@@ -17,7 +17,7 @@ on:
 env:
   DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
   DOCKERHUB_REPO_JAVET: ${{ secrets.DOCKERHUB_REPO_JAVET }}
-  JAVET_NODE_VERSION: 22.11.0
+  JAVET_NODE_VERSION: 22.12.0
   JAVET_V8_VERSION: 13.1.201.8
   JAVET_VERSION: 4.1.1
 

diff --git a/.github/workflows/linux_build_node_v8_image.yml b/.github/workflows/linux_build_node_v8_image.yml
@@ -21,7 +21,7 @@ on:
 env:
   DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
   DOCKERHUB_REPO_JAVET: ${{ secrets.DOCKERHUB_REPO_JAVET }}
-  JAVET_NODE_VERSION: 22.11.0
+  JAVET_NODE_VERSION: 22.12.0
   JAVET_V8_VERSION: 13.1.201.8
   JAVET_VERSION: 4.1.1
 

diff --git a/.github/workflows/linux_x86_64_build.yml b/.github/workflows/linux_x86_64_build.yml
@@ -7,7 +7,7 @@ on:
   workflow_dispatch:
 
 env:
-  JAVET_NODE_VERSION: 22.11.0
+  JAVET_NODE_VERSION: 22.12.0
   JAVET_V8_VERSION: 13.1.201.8
   JAVET_VERSION: 4.1.1
   ROOT: /home/runner/work/Javet

diff --git a/.github/workflows/macos_arm64_build.yml b/.github/workflows/macos_arm64_build.yml
@@ -7,7 +7,7 @@ on:
   workflow_dispatch:
 
 env:
-  JAVET_NODE_VERSION: 22.11.0
+  JAVET_NODE_VERSION: 22.12.0
   JAVET_V8_VERSION: 13.1.201.8
   JAVET_VERSION: 4.1.1
   ROOT: /Users/runner/work/Javet

diff --git a/.github/workflows/macos_x86_64_build.yml b/.github/workflows/macos_x86_64_build.yml
@@ -7,7 +7,7 @@ on:
   workflow_dispatch:
 
 env:
-  JAVET_NODE_VERSION: 22.11.0
+  JAVET_NODE_VERSION: 22.12.0
   JAVET_V8_VERSION: 13.1.201.8
   JAVET_VERSION: 4.1.1
   ROOT: /Users/runner/work/Javet

diff --git a/.github/workflows/windows_x86_64_build.yml b/.github/workflows/windows_x86_64_build.yml
@@ -7,7 +7,7 @@ on:
   workflow_dispatch:
 
 env:
-  JAVET_NODE_VERSION: 22.11.0
+  JAVET_NODE_VERSION: 22.12.0
   JAVET_V8_VERSION: 13.1.201.8
   JAVET_VERSION: 4.1.1
   ROOT: D:\a\Javet

diff --git a/README.rst b/README.rst
@@ -50,7 +50,7 @@ arm         ✔️        ❌      ❌       ❌
 arm64       ✔️        ✔️       ✔️        ❌
 =========== ======= ======= ======= =======
 
-* Node.js ``v22.11.0`` + V8 ``v13.1.201.8``
+* Node.js ``v22.12.0`` + V8 ``v13.1.201.8``
 * i18n and non-i18n
 * Dynamic switch between Node.js and V8 mode
 * Polyfill V8 mode with `Javenode <https://github.com/caoccao/Javenode>`_

diff --git a/docker/linux-x86_64/base_all_in_one.Dockerfile b/docker/linux-x86_64/base_all_in_one.Dockerfile
@@ -18,7 +18,7 @@
 FROM ubuntu:20.04
 WORKDIR /
 
-ARG JAVET_NODE_VERSION=22.11.0
+ARG JAVET_NODE_VERSION=22.12.0
 ARG JAVET_V8_VERSION=13.1.201.8
 
 # Update Ubuntu

diff --git a/docker/linux-x86_64/base_node.Dockerfile b/docker/linux-x86_64/base_node.Dockerfile
@@ -14,13 +14,13 @@
 # limitations under the License.
 
 # Usage: docker build \
-#  -t sjtucaocao/javet:x86_64-base-node_22.11.0 \
+#  -t sjtucaocao/javet:x86_64-base-node_22.12.0 \
 #  --build-arg JAVET_REPO=sjtucaocao/javet \
-#  --build-arg JAVET_NODE_VERSION=22.11.0 \
+#  --build-arg JAVET_NODE_VERSION=22.12.0 \
 #  -f docker/linux-x86_64/base_node.Dockerfile .
 
 ARG JAVET_REPO=sjtucaocao/javet
-ARG JAVET_NODE_VERSION=22.11.0
+ARG JAVET_NODE_VERSION=22.12.0
 
 FROM ${JAVET_REPO}:x86_64-base-jvm
 

diff --git a/docker/linux-x86_64/build.env b/docker/linux-x86_64/build.env
@@ -1,4 +1,4 @@
 JAVET_REPO=sjtucaocao/javet
 JAVET_VERSION=4.1.1
 JAVET_V8_VERSION=13.1.201.8
-JAVET_NODE_VERSION=22.11.0
+JAVET_NODE_VERSION=22.12.0
diff --git a/docker/windows-x86_64/base.Dockerfile b/docker/windows-x86_64/base.Dockerfile
@@ -31,7 +31,7 @@
 
 # Usage: docker build -t sjtucaocao/javet-windows:4.1.1 -m 4G -f docker/windows-x86_64/base.Dockerfile .
 
-ARG JAVET_NODE_VERSION=22.11.0
+ARG JAVET_NODE_VERSION=22.12.0
 ARG JAVET_V8_VERSION=13.1.201.8
 
 # https://hub.docker.com/_/microsoft-windows

diff --git a/docs/release_notes/release_notes_4_0.rst b/docs/release_notes/release_notes_4_0.rst
@@ -5,9 +5,13 @@ Release Notes 4.0.x - 4.1.x
 4.1.1
 -----
 
-* Upgraded Visual Studio 2022 to `v17.12.0 <https://learn.microsoft.com/en-us/visualstudio/releases/2022/release-notes-v17.12>`_
+* Upgraded Node.js to ``v22.12.0`` `(2024-12-03) <https://github.com/nodejs/node/blob/main/doc/changelogs/CHANGELOG_V22.md#22.12.0>`_
+* Upgraded Visual Studio 2022 to `v17.12.3 <https://learn.microsoft.com/en-us/visualstudio/releases/2022/release-notes-v17.12>`_
 * Added ``getAbsoluteResourceName()`` to ``IV8ModuleResolver``
 * Fixed memory leaks in function callback in edge cases
+* `require(esm)` is enabled by default
+* Removed `isExperimentalRequireModule()`, `setExperimentalRequireModule` from `NodeFlags`
+* Added `isNoExperimentalRequireModule()`, `setNoExperimentalRequireModule` to `NodeFlags`
 
 4.1.0
 -----

diff --git a/scripts/python/change_node_v8_version.py b/scripts/python/change_node_v8_version.py
@@ -170,7 +170,7 @@ def update(self) -> None:
       re.compile(r'"(?P<version>\d+\.\d+\.\d+\.\d+)",'))
 
 def main():
-  change_node_version = ChangeNodeVersion('22.11.0')
+  change_node_version = ChangeNodeVersion('22.12.0')
   change_node_version.update()
   change_v8_version = ChangeV8Version('13.1.201.8')
   change_v8_version.update()

diff --git a/src/main/java/com/caoccao/javet/interop/options/NodeFlags.java b/src/main/java/com/caoccao/javet/interop/options/NodeFlags.java
@@ -50,11 +50,11 @@ public final class NodeFlags {
      */
     public static final String EXPERIMENTAL_PERMISSION = "--experimental-permission";
     /**
-     * The constant EXPERIMENTAL_REQUIRE_MODULE.
+     * The constant NO_EXPERIMENTAL_REQUIRE_MODULE.
      *
-     * @since 4.0.0
+     * @since 4.1.1
      */
-    public static final String EXPERIMENTAL_REQUIRE_MODULE = "--experimental-require-module";
+    public static final String NO_EXPERIMENTAL_REQUIRE_MODULE = "--no-experimental-require-module";
     /**
      * The constant EXPERIMENTAL_SQLITE.
      *
@@ -85,10 +85,10 @@ public final class NodeFlags {
     private String[] allowFsWrite;
     private String[] customFlags;
     private boolean experimentalPermission;
-    private boolean experimentalRequireModule;
     private boolean experimentalSqlite;
     private String icuDataDir;
     private boolean jsFloat16Array;
+    private boolean noExperimentalRequireModule;
     private boolean noWarnings;
     private boolean sealed;
 
@@ -102,7 +102,7 @@ public final class NodeFlags {
         allowFsWrite = null;
         customFlags = null;
         experimentalPermission = false;
-        experimentalRequireModule = false;
+        noExperimentalRequireModule = false;
         experimentalSqlite = false;
         jsFloat16Array = false;
         noWarnings = false;
@@ -176,16 +176,6 @@ public boolean isExperimentalPermission() {
         return experimentalPermission;
     }
 
-    /**
-     * Supports loading a synchronous ES module graph in require().
-     *
-     * @return true : yes, false: no
-     * @since 4.0.0
-     */
-    public boolean isExperimentalRequireModule() {
-        return experimentalRequireModule;
-    }
-
     /**
      * Is the experimental node:sqlite module enabled.
      *
@@ -206,6 +196,16 @@ public boolean isJsFloat16Array() {
         return jsFloat16Array;
     }
 
+    /**
+     * Does not support loading a synchronous ES module graph in require().
+     *
+     * @return true : yes, false: no
+     * @since 4.1.1
+     */
+    public boolean isNoExperimentalRequireModule() {
+        return noExperimentalRequireModule;
+    }
+
     /**
      * Silence all process warnings (including deprecations).
      *
@@ -315,20 +315,6 @@ public NodeFlags setExperimentalPermission(boolean experimentalPermission) {
         return this;
     }
 
-    /**
-     * Sets experimental require module.
-     *
-     * @param experimentalRequireModule the experimental require module
-     * @return the self
-     * @since 4.0.0
-     */
-    public NodeFlags setExperimentalRequireModule(boolean experimentalRequireModule) {
-        if (!sealed) {
-            this.experimentalRequireModule = experimentalRequireModule;
-        }
-        return this;
-    }
-
     /**
      * Sets experimental sqlite.
      *
@@ -371,6 +357,20 @@ public NodeFlags setJsFloat16Array(boolean jsFloat16Array) {
         return this;
     }
 
+    /**
+     * Sets no experimental require module.
+     *
+     * @param noExperimentalRequireModule the no experimental require module
+     * @return the self
+     * @since 4.1.1
+     */
+    public NodeFlags setNoExperimentalRequireModule(boolean noExperimentalRequireModule) {
+        if (!sealed) {
+            this.noExperimentalRequireModule = noExperimentalRequireModule;
+        }
+        return this;
+    }
+
     /**
      * Sets no warnings.
      *
@@ -407,8 +407,8 @@ public String[] toArray() {
         if (experimentalPermission) {
             tokens.add(EXPERIMENTAL_PERMISSION);
         }
-        if (experimentalRequireModule) {
-            tokens.add(EXPERIMENTAL_REQUIRE_MODULE);
+        if (noExperimentalRequireModule) {
+            tokens.add(NO_EXPERIMENTAL_REQUIRE_MODULE);
         }
         if (experimentalSqlite) {
             tokens.add(EXPERIMENTAL_SQLITE);

diff --git a/src/test/java/com/caoccao/javet/interop/TestNodeRuntime.java b/src/test/java/com/caoccao/javet/interop/TestNodeRuntime.java
@@ -212,7 +212,7 @@ public void testModuleProcess() throws JavetException {
         Path path4 = nodeModuleProcess.getWorkingDirectory().toPath();
         assertNotEquals(path1.toAbsolutePath().toString(), path3.toAbsolutePath().toString());
         assertEquals(path1.toAbsolutePath().toString(), path4.toAbsolutePath().toString());
-        assertEquals("v22.11.0", nodeModuleProcess.getVersion());
+        assertEquals("v22.12.0", nodeModuleProcess.getVersion());
     }
 
     @Test

diff --git a/src/test/java/com/caoccao/javet/interop/options/TestNodeFlags.java b/src/test/java/com/caoccao/javet/interop/options/TestNodeFlags.java
@@ -27,9 +27,9 @@
 
 public class TestNodeFlags {
     protected static final List<GetterAndSetter> SWITCHES = SimpleList.of(
-            new GetterAndSetter(NodeFlags::isExperimentalRequireModule, NodeFlags::setExperimentalRequireModule),
             new GetterAndSetter(NodeFlags::isExperimentalSqlite, NodeFlags::setExperimentalSqlite),
             new GetterAndSetter(NodeFlags::isJsFloat16Array, NodeFlags::setJsFloat16Array),
+            new GetterAndSetter(NodeFlags::isNoExperimentalRequireModule, NodeFlags::setNoExperimentalRequireModule),
             new GetterAndSetter(NodeFlags::isNoWarnings, NodeFlags::setNoWarnings)
     );
 
@@ -81,9 +81,9 @@ public void testToString() {
         assertEquals("--no-warnings", nodeFlags.setNoWarnings(true).toString());
         nodeFlags.setNoWarnings(false);
         assertEquals(
-                "--experimental-require-module",
-                nodeFlags.setExperimentalRequireModule(true).toString());
-        nodeFlags.setExperimentalRequireModule(false);
+                "--no-experimental-require-module",
+                nodeFlags.setNoExperimentalRequireModule(true).toString());
+        nodeFlags.setNoExperimentalRequireModule(false);
         assertEquals("--icu-data-dir=abc", nodeFlags.setIcuDataDir("abc").toString());
         nodeFlags.setIcuDataDir(null);
         assertEquals(