Update axolotl-web to Node.js v18

This is now the LTS version of Node.js, which has superseded v16.
axolotl-chat · Oct 28, 2022 · 8ae9748 · 8ae9748
1 parent 2545567
commit 8ae9748
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 12 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -5,7 +5,7 @@ on:
 
 env:
   GO_VERSION: 1.16
-  NODE_VERSION: "16.x"
+  NODE_VERSION: "18.x"
 
 jobs:
   build-axolotl:
@@ -42,7 +42,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - name: Setup Node 16
+      - name: Setup Node
         uses: actions/setup-node@v3
         with:
           node-version: ${{ env.NODE_VERSION }}
@@ -136,7 +136,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - name: Set up Node 16
+      - name: Set up Node
         uses: actions/setup-node@v3
         with:
           node-version: ${{ env.NODE_VERSION }}

diff --git a/Makefile b/Makefile
@@ -185,7 +185,7 @@ install-axolotl-electron-bundle:
 ## Flatpak
 build-dependencies-flatpak:
 	$(FLATPAK) install org.freedesktop.Sdk.Extension.golang//21.08
-	$(FLATPAK) install org.freedesktop.Sdk.Extension.node16//21.08
+	$(FLATPAK) install org.freedesktop.Sdk.Extension.node18//21.08
 	$(FLATPAK) install org.freedesktop.Sdk.Extension.rust-stable//21.08
 
 build-dependencies-flatpak-web: build-dependencies-flatpak

diff --git a/axolotl-web/.nvmrc b/axolotl-web/.nvmrc
@@ -1 +1 @@
-16.17.0
+18.12.0
diff --git a/docs/INSTALL.md b/docs/INSTALL.md
@@ -159,7 +159,7 @@ The following Flatpak SDKs are required:
 flatpak install org.freedesktop.Platform//21.08
 flatpak install org.freedesktop.Sdk//21.08
 flatpak install org.freedesktop.Sdk.Extension.golang//21.08
-flatpak install org.freedesktop.Sdk.Extension.node16//21.08
+flatpak install org.freedesktop.Sdk.Extension.node18//21.08
 flatpak install org.freedesktop.Sdk.Extension.rust-stable//21.08
 flatpak install org.electronjs.Electron2.BaseApp//21.08
 ```
@@ -197,7 +197,7 @@ The following Flatpak SDKs are required:
 flatpak install org.kde.Platform//5.15-21.08
 flatpak install org.kde.Sdk//5.15-21.08
 flatpak install org.freedesktop.Sdk.Extension.golang//21.08
-flatpak install org.freedesktop.Sdk.Extension.node16//21.08
+flatpak install org.freedesktop.Sdk.Extension.node18//21.08
 flatpak install org.freedesktop.Sdk.Extension.rust-stable//21.08
 flatpak install io.qt.qtwebengine.BaseApp//5.15-21.08
 ```

diff --git a/flatpak/qt/org.nanuc.Axolotl.yml b/flatpak/qt/org.nanuc.Axolotl.yml
@@ -5,7 +5,7 @@ runtime-version: '5.15-21.08'
 sdk: org.kde.Sdk
 sdk-extensions:
   - org.freedesktop.Sdk.Extension.golang
-  - org.freedesktop.Sdk.Extension.node16
+  - org.freedesktop.Sdk.Extension.node18
   - org.freedesktop.Sdk.Extension.rust-stable
 command: axolotl
 base: io.qt.qtwebengine.BaseApp
@@ -14,7 +14,7 @@ separate-locales: false
 tags:
   - latest
 build-options:
-  append-path: "/usr/lib/sdk/rust-stable/bin:/usr/lib/sdk/golang/bin:/usr/lib/sdk/node16/bin"
+  append-path: "/usr/lib/sdk/rust-stable/bin:/usr/lib/sdk/golang/bin:/usr/lib/sdk/node18/bin"
   env:
     RUST_BACKTRACE: 1
     NPM_CONFIG_LOGLEVEL: error
@@ -69,6 +69,7 @@ modules:
         url: https://github.com/nanu-c/zkgroup
         tag: main
         dest: src/github.com/nanu-c/zkgroup
+        disable-submodules: true
 
   - name: axolotl
     buildsystem: simple

diff --git a/flatpak/web/org.nanuc.Axolotl.yml b/flatpak/web/org.nanuc.Axolotl.yml
@@ -5,7 +5,7 @@ runtime-version: '21.08'
 sdk: org.freedesktop.Sdk
 sdk-extensions:
   - org.freedesktop.Sdk.Extension.golang
-  - org.freedesktop.Sdk.Extension.node16
+  - org.freedesktop.Sdk.Extension.node18
   - org.freedesktop.Sdk.Extension.rust-stable
 command: run.sh
 base: org.electronjs.Electron2.BaseApp
@@ -14,7 +14,7 @@ separate-locales: false
 tags:
   - latest
 build-options:
-  append-path: "/usr/lib/sdk/rust-stable/bin:/usr/lib/sdk/golang/bin:/usr/lib/sdk/node16/bin"
+  append-path: "/usr/lib/sdk/rust-stable/bin:/usr/lib/sdk/golang/bin:/usr/lib/sdk/node18/bin"
   env:
     RUST_BACKTRACE: 1
     NPM_CONFIG_LOGLEVEL: error
@@ -70,6 +70,7 @@ modules:
         url: https://github.com/nanu-c/zkgroup
         tag: main
         dest: src/github.com/nanu-c/zkgroup
+        disable-submodules: true
 
   - name: axolotl-electron-bundle
     buildsystem: simple

diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
@@ -37,7 +37,7 @@ parts:
   axolotl-web:
     plugin: npm
     source: ./axolotl-web
-    npm-node-version: 16.13.1
+    npm-node-version: 18.12.0
     build-environment:
      - npm_config_unsafe_perm: "true"
      - SUDO_UID: "0"