Bump Electron to 40.6.0

.github/workflows/build.yml

@@ -13,7 +13,7 @@ env:
   # Variables needed for build information
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
   PYTHON_VERSION: '3.12'
-  NODE_VERSION: 16
+  NODE_VERSION: 24
   ROLLING_UPLOAD_TOKEN: ${{ secrets.ROLLING_RELEASE_UPLOAD_TOKEN }}
   # Below variables allow us to quickly control visual tests for each platform
   RUN_WINDOWS_VT: false
@@ -27,19 +27,14 @@ jobs:
         os: [ ubuntu-latest, macos-14, windows-latest ]
         include:
           - os: ubuntu-latest
-            image: "debian:10"
+            image: "debian:13"
       fail-fast: false
     runs-on: ${{ matrix.os }}
     container: ${{ matrix.image }}
     outputs:
       timestamp: ${{ steps.linux-binary-version.outputs.timestamp }}
 
     steps:
-    - name: Edit sources.list - Linux
-      if: ${{ runner.os == 'Linux' }}
-      run: |
-        sed -i s/deb.debian.org/archive.debian.org/g /etc/apt/sources.list
-        sed -i s/security.debian.org/archive.debian.org/g /etc/apt/sources.list
     - name: Install build dependencies - Linux
       if: ${{ runner.os == 'Linux' }}
       run: apt-get update && apt-get install -y git python3 python3-pip make gcc g++ libx11-dev libxkbfile-dev pkg-config libsecret-1-dev rpm xvfb ffmpeg zstd wget squashfs-tools libwayland-dev libwayland-client0 libxkbcommon-dev libxkbcommon-x11-dev libxkbcommon0 xkb-data

package.json

@@ -24,14 +24,14 @@
   },
   "atomTestRunner": "runners/jasmine2-test-runner",
   "license": "MIT",
-  "electronVersion": "30.0.9",
+  "electronVersion": "40.6.0",
   "dependencies": {
     "@atom/source-map-support": "^0.3.4",
     "@babel/core": "7.18.6",
     "@electron/remote": "2.1.2",
     "@formatjs/fast-memoize": "^2.2.6",
     "@pulsar-edit/atom-keymap": "^9.0.2",
-    "@pulsar-edit/fuzzy-native": "1.3.0",
+    "@pulsar-edit/fuzzy-native": "https://github.com/pulsar-edit/fuzzy-native#electron-40",
     "@pulsar-edit/get-scrollbar-style": "^1.0.1",
     "@pulsar-edit/git-utils": "^7.0.1",
     "@pulsar-edit/pathwatcher": "^9.0.2",
@@ -57,7 +57,7 @@
     "background-tips": "file:packages/background-tips",
     "base16-tomorrow-dark-theme": "file:packages/base16-tomorrow-dark-theme",
     "base16-tomorrow-light-theme": "file:packages/base16-tomorrow-light-theme",
-    "better-sqlite3": "11.1.2",
+    "better-sqlite3": "12.6.2",
     "bookmarks": "file:packages/bookmarks",
     "bracket-matcher": "file:packages/bracket-matcher",
     "chai": "4.3.4",
@@ -299,9 +299,9 @@
   },
   "devDependencies": {
     "@electron/notarize": "^1.2.3",
-    "@electron/rebuild": "3.6.0",
+    "@electron/rebuild": "4.0.3",
     "@playwright/test": "1.22.2",
-    "electron": "30.0.9",
+    "electron": "40.6.0",
     "electron-builder": "23.3.1",
     "eslint": "^8.33.0",
     "eslint-plugin-jsdoc": "^39.7.4",
@@ -313,12 +313,12 @@
     "webdriverio": "7.20.9"
   },
   "resolutions": {
-    "node-abi": "3.63.0",
+    "node-abi": "4.26.0",
     "keytar": "7.9.0",
-    "nan": "2.19.0",
+    "nan": "2.25.0",
     "ctags": "https://github.com/pulsar-edit/node-ctags.git#c32ca6017dd3f4ea314d53b044225505820abbe3",
     "es5-ext": "https://github.com/pulsar-edit/es5-ext#169f6ae9b2675675269a0ba265f83c29c7b56244",
-    "@electron/remote": "2.1.2",
+    "@electron/remote": "2.1.3",
     "@pulsar-edit/superstring": "3.0.5"
   }
-}
+}

packages/spell-check/package.json

@@ -8,7 +8,7 @@
     "debug": "^4.1.1",
     "multi-integer-range": "^2.0.0",
     "natural": "^0.4.0",
-    "spellchecker": "https://github.com/pulsar-edit/node-spellchecker.git#da32e897e74691b7f43b70ddc0d171bad2d38208",
+    "spellchecker": "https://github.com/pulsar-edit/node-spellchecker.git#electron-40",
     "spelling-manager": "^1.1.0",
     "underscore-plus": "^1"
   },

packages/tree-view/lib/tree-view.js

@@ -504,12 +504,12 @@ class TreeView {
       }
 
       for (let projectPath of projectPaths) {
-        let stats = fs.lstatSyncNoException(projectPath);
-        if (!stats) continue;
+        const fs_stats = fs.lstatSyncNoException(projectPath);
+        if (!fs_stats) continue;
 
-        stats = _.pick(stats, ..._.keys(stats));
-        for (let key of ['atime', 'birthtime', 'ctime', 'mtime']) {
-          stats[key] = stats[key].getTime();
+        let stats = {}
+        for (const key of ['atime', 'birthtime', 'ctime', 'mtime']) {
+          stats[key] = fs_stats[key].getTime();
         }
 
         let directory = new Directory({

static/index.html

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-  <meta http-equiv="Content-Security-Policy" content="default-src * atom://*; img-src blob: data: * atom://*; script-src 'self' 'unsafe-eval'; style-src 'self' 'unsafe-inline'; media-src blob: data: mediastream: * atom://*;">
+  <meta http-equiv="Content-Security-Policy" content="default-src * 'wasm-unsafe-eval' atom://*; connect-src * wasm: atom://*; img-src blob: data: * atom://*; script-src 'self' 'unsafe-eval'; style-src 'self' 'unsafe-inline'; media-src blob: data: mediastream: * atom://*;">
   <script src="index.js"></script>
 </head>
 <body tabindex="-1">