[DRAFT] Update to Electron 30

.cirrus.yml

@@ -82,8 +82,14 @@ arm_linux_task:
                 fakeroot
                 libx11-dev
                 libxkbfile-dev
+                libxkbcommon-dev
+                libxkbcommon-x11-dev
+                libxkbcommon0
+                xkb-data
                 libgdk-pixbuf2.0-dev
                 libgtk-3-dev
+                libwayland-dev
+                libwayland-client0
                 libxss-dev
                 libasound2-dev
                 libnss3

.eslintrc.js

@@ -14,6 +14,8 @@ module.exports = {
     ecmaVersion: "latest"
   },
   rules: {
+    // One leading and trailing space around each keyword.
+    "keyword-spacing": "error",
     "space-before-function-paren": ["error", {
       anonymous: "always",
       asyncArrow: "always",

.github/workflows/build.yml

@@ -42,8 +42,8 @@ jobs:
         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 make gcc g++ libx11-dev libxkbfile-dev pkg-config libsecret-1-dev rpm xvfb ffmpeg zstd wget squashfs-tools
-        libncursesw5-dev libssl-dev libsqlite3-dev tk-dev libgdbm-dev libc6-dev libbz2-dev libffi-dev zlib1g-dev # <-- Python-related stuff on this line
+      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
+       libncursesw5-dev libssl-dev libsqlite3-dev tk-dev libgdbm-dev libc6-dev libbz2-dev libffi-dev zlib1g-dev # <-- Python-related stuff on this line
 
     - name: Restore Compiled Python from Cache - Linux
       if: ${{ runner.os == 'Linux' }}
@@ -298,7 +298,7 @@ jobs:
     steps:
     - name: Install build dependencies - Linux
       if: ${{ runner.os == 'Linux' }}
-      run: sudo apt-get update && sudo 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
+      run: sudo apt-get update && sudo 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
 
     - name: Checkout the latest code
       uses: actions/checkout@v5

.github/workflows/editor-tests.yml

@@ -22,11 +22,12 @@ jobs:
     steps:
     - name: Install build dependencies
       if: runner.os == 'Linux'
-      run: sudo apt-get update && sudo apt-get install -y libx11-dev libxkbfile-dev pkg-config libsecret-1-dev libncursesw5-dev libgdbm-dev libc6-dev libffi-dev
-    
+      run: sudo apt-get update && sudo apt-get install -y libx11-dev libxkbfile-dev pkg-config libsecret-1-dev libncursesw5-dev libgdbm-dev libc6-dev libffi-dev libwayland-dev libxkbcommon-dev libxkbcommon-x11-dev libxkbcommon0 xkb-data
+
     - name: Checkout the latest code
       uses: actions/checkout@v5
-
+      with:
+        submodules: true
     - name: Setup node
       uses: actions/setup-node@v4
       with:
@@ -39,7 +40,7 @@ jobs:
       run: python3 -m pip install setuptools
 
     - name: Install Dependencies
-      run: yarn install
+      run: yarn install --ignore-engines || yarn install --ignore-engines
 
     - name: Build Dependencies
       run: yarn build

.github/workflows/package-tests-linux.yml

@@ -15,10 +15,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Install build dependencies
-      run: sudo apt-get update && sudo apt-get install -y libx11-dev libxkbfile-dev pkg-config libsecret-1-dev libncursesw5-dev libgdbm-dev libc6-dev libffi-dev
+      run: sudo apt-get update && sudo apt-get install -y libx11-dev libxkbfile-dev pkg-config libsecret-1-dev libncursesw5-dev libgdbm-dev libc6-dev libffi-dev libwayland-dev libxkbcommon-dev libxkbcommon-x11-dev libxkbcommon0 xkb-data
 
     - name: Checkout the latest code
       uses: actions/checkout@v5
+      with:
+        submodules: true
 
     - name: Setup node
       uses: actions/setup-node@v4
@@ -32,7 +34,7 @@ jobs:
       run: python3 -m pip install setuptools
 
     - name: Install Dependencies
-      run: yarn install
+      run: yarn install --ignore-engines || yarn install --ignore-engines
 
     - name: Build Dependencies
       run: yarn build

exports/atom.js

@@ -1,6 +1,6 @@
-const TextBuffer = require('text-buffer');
+const TextBuffer = require('@pulsar-edit/text-buffer');
 const { Point, Range } = TextBuffer;
-const { File, Directory } = require('pathwatcher');
+const { File, Directory } = require('@pulsar-edit/pathwatcher');
 const { Emitter, Disposable, CompositeDisposable } = require('event-kit');
 const BufferedNodeProcess = require('../src/buffered-node-process');
 const BufferedProcess = require('../src/buffered-process');

integration/workspace.spec.js

@@ -104,9 +104,9 @@ test.describe('Opening Atom for the first time', () => {
         await modalInput.press('Enter')
 
         await Promise.all(
-          Object.keys(checks).map(k =>
-            expect(syntaxElement(k, checks[k])).toHaveText(checks[k])
-          )
+          Object.keys(checks).map(k => {
+            return expect(syntaxElement(k, checks[k])).toContainText(checks[k])
+          })
         )
       })
     })
@@ -115,7 +115,6 @@ test.describe('Opening Atom for the first time', () => {
 
 function syntaxElement(kind, text) {
   return editor.page.locator(
-    `atom-text-editor.is-focused .syntax--${kind}`,
-    { hasText: text }
+    `atom-text-editor.is-focused .syntax--${kind}:text('${text}')`
  )
 }

package.json

@@ -24,23 +24,25 @@
   },
   "atomTestRunner": "runners/jasmine2-test-runner",
   "license": "MIT",
-  "electronVersion": "12.2.3",
-  "resolutions": {
-    "es5-ext": "https://github.com/pulsar-edit/es5-ext#169f6ae9b2675675269a0ba265f83c29c7b56244",
-    "superstring": "github:pulsar-edit/superstring#de97b496663fce40050bf2d66e1466ccfbd00943",
-    "text-buffer/superstring": "github:pulsar-edit/superstring#de97b496663fce40050bf2d66e1466ccfbd00943"
-  },
+  "electronVersion": "30.0.9",
   "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/fuzzy-native": "https://github.com/pulsar-edit/fuzzy-native.git#c6ddd2e0ace7b3cfe8082fcbe5985c49f76da5b8",
+    "@pulsar-edit/atom-keymap": "^9.0.2",
+    "@pulsar-edit/fuzzy-native": "1.3.0",
+    "@pulsar-edit/get-scrollbar-style": "^1.0.1",
+    "@pulsar-edit/git-utils": "^7.0.1",
+    "@pulsar-edit/pathwatcher": "^9.0.2",
+    "@pulsar-edit/scandal": "^4.0.0",
+    "@pulsar-edit/superstring": "^3.0.4",
+    "@pulsar-edit/text-buffer": "^14.0.3",
     "about": "file:packages/about",
     "archive-view": "file:packages/archive-view",
     "async": "3.2.4",
     "atom-dark-syntax": "file:packages/atom-dark-syntax",
     "atom-dark-ui": "file:packages/atom-dark-ui",
-    "atom-keymap": "8.2.15",
     "atom-light-syntax": "file:packages/atom-light-syntax",
     "atom-light-ui": "file:packages/atom-light-ui",
     "atom-select-list": "^0.8.1",
@@ -55,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": "11.1.2",
     "bookmarks": "file:packages/bookmarks",
     "bracket-matcher": "file:packages/bracket-matcher",
     "chai": "4.3.4",
@@ -81,8 +83,7 @@
     "fstream": "1.0.12",
     "fuzzy-finder": "file:packages/fuzzy-finder",
     "git-diff": "file:packages/git-diff",
-    "git-utils": "^5.7.3",
-    "github": "https://github.com/pulsar-edit/github/archive/refs/tags/v0.36.20-pretranspiled.tar.gz",
+    "github": "https://github.com/pulsar-edit/github#v0.37.0-pretranspiled",
     "go-to-line": "file:packages/go-to-line",
     "grammar-selector": "file:packages/grammar-selector",
     "grim": "2.0.3",
@@ -146,21 +147,18 @@
     "mock-spawn": "^0.2.6",
     "normalize-package-data": "3.0.2",
     "notifications": "file:./packages/notifications",
-    "nsfw": "2.2.2",
+    "nsfw": "https://github.com/Axosoft/nsfw#b3308a9fcff0a0c4b0b17284e4fbaa1cab8ae8d",
     "one-dark-syntax": "file:packages/one-dark-syntax",
     "one-dark-ui": "file:packages/one-dark-ui",
     "one-light-syntax": "file:packages/one-light-syntax",
     "one-light-ui": "file:packages/one-light-ui",
     "open-on-github": "file:packages/open-on-github",
     "package-generator": "file:packages/package-generator",
-    "pathwatcher": "^8.1.2",
     "postcss": "8.4.31",
     "postcss-selector-parser": "6.0.4",
     "pulsar-updater": "file:packages/pulsar-updater",
     "resolve": "1.18.1",
-    "scandal": "^3.2.0",
     "scoped-property-store": "^0.17.0",
-    "scrollbar-style": "^4.0.1",
     "season": "^6.0.2",
     "second-mate": "https://github.com/pulsar-edit/second-mate.git#9686771",
     "semver": "7.5.2",
@@ -173,21 +171,18 @@
     "spell-check": "file:packages/spell-check",
     "status-bar": "file:packages/status-bar",
     "styleguide": "file:./packages/styleguide",
-    "superstring": "github:pulsar-edit/superstring#de97b496663fce40050bf2d66e1466ccfbd00943",
     "symbol-provider-ctags": "file:./packages/symbol-provider-ctags",
     "symbol-provider-tree-sitter": "file:./packages/symbol-provider-tree-sitter",
     "symbols-view": "file:./packages/symbols-view",
     "tabs": "file:packages/tabs",
     "temp": "0.9.4",
-    "text-buffer": "^13.18.6",
     "timecop": "file:./packages/timecop",
-    "tree-sitter": "0.20.0",
-    "tree-view": "file:packages/tree-view",
-    "typescript-simple": "github:pulsar-edit/typescript-simple#ccb03e558217030e8f261339281f1d69147934f7",
+    "tree-view": "file:./packages/tree-view",
+    "typescript": "^5.8.3",
     "underscore-plus": "^1.7.0",
     "update-package-dependencies": "file:./packages/update-package-dependencies",
     "vscode-ripgrep": "1.9.0",
-    "web-tree-sitter": "^0.20.7",
+    "web-tree-sitter": "0.20.7",
     "welcome": "file:packages/welcome",
     "whitespace": "file:./packages/whitespace",
     "winreg": "^1.2.1",
@@ -305,10 +300,10 @@
   },
   "devDependencies": {
     "@electron/notarize": "^1.2.3",
+    "@electron/rebuild": "3.6.0",
     "@playwright/test": "1.22.2",
-    "electron": "12.2.3",
+    "electron": "30.0.9",
     "electron-builder": "23.3.1",
-    "electron-rebuild": "3.2.7",
     "eslint": "^8.33.0",
     "eslint-plugin-jsdoc": "^39.7.4",
     "eslint-plugin-node": "^11.1.0",
@@ -317,5 +312,13 @@
     "playwright-core": "1.22.2",
     "random-seed": "0.3.0",
     "webdriverio": "7.20.9"
+  },
+  "resolutions": {
+    "node-abi": "3.63.0",
+    "keytar": "7.9.0",
+    "nan": "2.19.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"
   }
-}
+}