Merge pull request #1122 from pulsar-edit/fix-better-sqlite-library

Fixing requiring of better-sqlite3

CHANGELOG.md

@@ -6,6 +6,8 @@
 
 ## [Unreleased]
 
+- Fixed SQL State Storage not loading when starting Pulsar from a self-contained binary like appImage, tar.gz, etc.
+
 ## 1.122.0
 
 - Added a SQL State Storage alternative to IndexedDB (opt-in, off by default).

script/electron-builder.js

@@ -111,9 +111,10 @@ let options = {
     // Other Exclusions
     "!**/._*",
     "!**/node_modules/*.d.ts",
+    "!**/node_modules/**/*.map",
     "!**/node_modules/.bin",
     "!**/node_modules/native-mate",
-    "!node_modules/fuzzy-native/node_modules", // node_modules of the fuzzy-native package are only required for building it
+    "!node_modules/@pulsar-edit/fuzzy-native/node_modules", // node_modules of the fuzzy-native package are only required for building it
     "!**/node_modules/spellchecker/vendor/hunspell/.*",
     "!**/git-utils/deps",
     "!**/oniguruma/deps",

src/state-store/sql.js

@@ -1,7 +1,13 @@
 'use strict';
 
-const sqlite3 = require('better-sqlite3');
 const path = require('path');
+const nativeSQLite = require(path.join(
+  require.resolve('better-sqlite3'),
+  '..', '..',
+  'build', 'Release',
+  'better_sqlite3.node'
+));
+const sqlite3 = require('better-sqlite3');
 
 module.exports = class SQLStateStore {
   constructor(databaseName, version) {
@@ -12,7 +18,7 @@ module.exports = class SQLStateStore {
       const dbPath = path.join(atom.getConfigDirPath(), 'session-store.db');
       let db;
       try {
-        db = sqlite3(dbPath);
+        db = sqlite3(dbPath, {nativeBinding: nativeSQLite});
       } catch(error) {
         atom.notifications.addFatalError('Error loading database', {
           stack: new Error('Error loading SQLite database for state storage').stack,