node: Update the examples

Author: bbhtt

node/vanilla-quick-start/README.md

@@ -5,8 +5,8 @@ Showcases building a Flatpak of the Electron 18 version of
 
 To create generated-sources.json run:
 
-```
-flatpak-node-generator.py npm /path/to/electron-quick-start/package-lock.json
+```sh
+flatpak-node-generator npm /path/to/electron-quick-start/package-lock.json
 ```
 
 (Make sure your local clone of electron-quick-start is at the same commit as used in the manifest

node/vanilla-quick-start/generated-sources.json

@@ -1,24 +1,24 @@
 app-id: org.electronjs.ElectronQuickStart
-branch: stable
 runtime: org.freedesktop.Platform
-runtime-version: '22.08'
+runtime-version: '24.08'
 sdk: org.freedesktop.Sdk
 # Use the Electron 2 BaseApp, which adds several common libraries we'll need.
 base: org.electronjs.Electron2.BaseApp
-base-version: '22.08'
-# Add the Node 16 SDK extension.
+base-version: '24.08'
+separate-locales: false
+# Add the Node SDK extension.
 sdk-extensions:
-  - org.freedesktop.Sdk.Extension.node18
+  - org.freedesktop.Sdk.Extension.node24
 command: start-electron-quick-start
 finish-args:
   # These three lines add the permissions needed for graphics.
   - --device=dri
   - --share=ipc
   - --socket=x11
   # Sound access.
-  - --socket=pulseaudio
+  # - --socket=pulseaudio
   # Network access.
-  - --share=network
+  # - --share=network
   # If you need to access the filesystem, also add:
   # - --filesystem=home
 modules:
@@ -30,23 +30,21 @@ modules:
   - name: node
     buildsystem: simple
     build-commands:
-      - /usr/lib/sdk/node18/install-sdk.sh
+      - /usr/lib/sdk/node24/install-sdk.sh
 
   # Now is the quickstart module.
   - name: electron-quick-start
     buildsystem: simple
     build-options:
       # Add the node bin directory.
-      append-path: /usr/lib/sdk/node18/bin
+      append-path: /usr/lib/sdk/node24/bin
       env:
         # Set the cache directory, used to find Electron and some other helper
         # tools.
         # (The directory format is: /run/build/MODULE_NAME/flatpak-node/cache)
         XDG_CACHE_HOME: /run/build/electron-quick-start/flatpak-node/cache
         # Set the npm cache directory, used by npm to find its package metadata.
         npm_config_cache: /run/build/electron-quick-start/flatpak-node/npm-cache
-        # Sets the directory where Node is located so that npm won't download the headers.
-        npm_config_nodedir: /usr/lib/sdk/node18
     build-commands:
       # Install the packages from our offline cache.
       # --prefix= is the path to our subdirectory (see the electron-quick-start source below).
@@ -60,15 +58,11 @@ modules:
       - cp -r electron-quick-start /app
       # Install the wrapper script to start it.
       - install -Dm 755 start-electron-quick-start.sh /app/bin/start-electron-quick-start
-
-      # To allow separate locales
-      - setup-separate-locales ${FLATPAK_DEST}/electron-quick-start
     sources:
       - type: git
         url: https://github.com/electron/electron-quick-start
-        # Use the Electron 22 version.
-        commit: 7f1b2bc2906a672084af9b930ccb2f333593b55c
-        branch: 22-x-y
+        # branch: 33-x-y
+        commit: 27ba774d361875442c0ac6877996700434c156bd
         # Checkout into a subdirectory so we can copy the whole thing to /app.
         dest: electron-quick-start
       # Add the flatpak-node-generator generated sources.

node/vanilla-quick-start/org.electronjs.ElectronQuickStart.yaml

@@ -5,8 +5,8 @@ https://github.com/electron-userland/electron-webpack-quick-start/).
 
 To create generated-sources.json run:
 
-```
-flatapk-node-generator.py yarn /path/to/electron-webpack-quick-start/yarn.lock
+```sh
+flatpak-node-generator yarn /path/to/electron-webpack-quick-start/yarn.lock
 ```
 
 (Make sure your local clone of electron-webpack-quick-start is at the same commit as used in the

node/webpack-quick-start/README.md

@@ -1,24 +1,24 @@
 app-id: build.electron.webpack.ElectronWebpackQuickStart
-branch: stable
 runtime: org.freedesktop.Platform
-runtime-version: '21.08'
+runtime-version: '24.08'
 sdk: org.freedesktop.Sdk
 # Use the Electron 2 BaseApp, which adds several common libraries we'll need.
 base: org.electronjs.Electron2.BaseApp
-base-version: '21.08'
-# Add the Node 12 SDK extension.
+base-version: '24.08'
+separate-locales: false
+# Add the Node SDK extension.
 sdk-extensions:
-  - org.freedesktop.Sdk.Extension.node12
+  - org.freedesktop.Sdk.Extension.node24
 command: start-electron-webpack-quick-start
 finish-args:
   # These three lines add the permissions needed for graphics.
   - --device=dri
   - --share=ipc
   - --socket=x11
   # Sound access.
-  - --socket=pulseaudio
+  #  --socket=pulseaudio
   # Network access.
-  - --share=network
+  # - --share=network
   # If you need to access the filesystem, also add:
   # - --filesystem=home
 modules:
@@ -30,14 +30,14 @@ modules:
     buildsystem: simple
     build-options:
       # Add the node bin directory.
-      append-path: /usr/lib/sdk/node12/bin
+      append-path: /usr/lib/sdk/node24/bin
       env:
         # Set the cache directory, used to find Electron and some other helper
         # tools.
         # (The directory format is: /run/build/MODULE_NAME/flatpak-node/cache)
         XDG_CACHE_HOME: /run/build/electron-webpack-quick-start/flatpak-node/cache
-        # Sets the directory where Node is located so that npm won't download the headers.
-        npm_config_nodedir: /usr/lib/sdk/node12
+        # ⚠️  ONLY used as the webpack example project is outdated ⚠️ 
+        NODE_OPTIONS: "--openssl-legacy-provider"
     build-commands:
       # Have Yarn use the offline mirror.
       - HOME=$PWD yarn config --offline set yarn-offline-mirror $FLATPAK_BUILDER_BUILDDIR/flatpak-node/yarn-mirror
@@ -58,9 +58,6 @@ modules:
       # - 'install -Dm 755 flatpak-node/libffmpeg.so -t /app/electron-webpack-quick-start'
       # Install the wrapper script to start it.
       - install -Dm 755 start-electron-webpack-quick-start.sh /app/bin/start-electron-webpack-quick-start
-
-      # To allow separate locales
-      - setup-separate-locales ${FLATPAK_DEST}/electron-webpack-quick-start
     sources:
       - type: git
         url: https://github.com/electron-userland/electron-webpack-quick-start