Skip to content

A local-first personal finance app

⬆️ upgrade absurd-sql and remove patch-package (#1632)

Matiss Janis Aboltins6817c45ddc3e
diff --git a/bin/package-electron b/bin/package-electron
index 9e2e0d89d7..0caece7e19 100755
--- a/bin/package-electron
+++ b/bin/package-electron
@@ -35,8 +35,6 @@ if [ "$OSTYPE" == "msys" ]; then
fi
fi
-yarn patch-package
-
yarn rebuild-electron
yarn workspace loot-core build:node
diff --git a/package.json b/package.json
index 5b495a1fae..d686fcda76 100644
--- a/package.json
+++ b/package.json
@@ -39,8 +39,7 @@
"lint": "eslint . --max-warnings 0",
"lint:verbose": "DEBUG=eslint:cli-engine eslint . --max-warnings 0",
"typecheck": "yarn tsc",
- "jq": "./node_modules/node-jq/bin/jq",
- "postinstall": "patch-package"
+ "jq": "./node_modules/node-jq/bin/jq"
},
"devDependencies": {
"cross-env": "^7.0.3",
@@ -53,7 +52,6 @@
"eslint-plugin-rulesdir": "^0.2.2",
"node-jq": "^4.0.1",
"npm-run-all": "^4.1.3",
- "patch-package": "^6.1.2",
"prettier": "2.8.2",
"react-refresh": "^0.14.0",
"source-map-support": "^0.5.21",
diff --git a/packages/loot-core/package.json b/packages/loot-core/package.json
index 1aa1f538a8..af426e1da6 100644
--- a/packages/loot-core/package.json
+++ b/packages/loot-core/package.json
@@ -23,7 +23,7 @@
"@rschedule/json-tools": "^1.2.0",
"@rschedule/standard-date-adapter": "^1.2.0",
"@types/adm-zip": "^0.5.0",
- "absurd-sql": "0.0.53",
+ "absurd-sql": "0.0.54",
"assert": "^2.0.0",
"better-sqlite3": "^8.2.0",
"browserify-zlib": "^0.2.0",
diff --git a/patches/absurd-sql+0.0.53.patch b/patches/absurd-sql+0.0.53.patch
deleted file mode 100644
index 752984ce98..0000000000
--- a/patches/absurd-sql+0.0.53.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-diff --git a/node_modules/absurd-sql/dist/index.js b/node_modules/absurd-sql/dist/index.js
-index 77779cb..4064532 100644
---- a/node_modules/absurd-sql/dist/index.js
-+++ b/node_modules/absurd-sql/dist/index.js
-@@ -101,6 +101,8 @@ class SQLiteFS$1 {
- return stream.node.contents.read(buffer, offset, length, position);
- },
-
-+
-+
- write: (stream, buffer, offset, length, position) => {
- // console.log('write', offset, length, position);
- return stream.node.contents.write(buffer, offset, length, position);
-@@ -142,12 +144,18 @@ class SQLiteFS$1 {
-
- lock(path, lockType) {
- let { node } = this.FS.lookupPath(path);
-- return node.contents.lock(lockType);
-+ if(node && node.contents) {
-+ return node.contents.lock(lockType);
-+ }
-+ return true;
- }
-
- unlock(path, lockType) {
- let { node } = this.FS.lookupPath(path);
-- return node.contents.unlock(lockType);
-+ if(node && node.contents) {
-+ return node.contents.unlock(lockType);
-+ }
-+ return true;
- }
-
- createNode(parent, name, mode, dev) {
-diff --git a/node_modules/absurd-sql/src/sqlite-fs.js b/node_modules/absurd-sql/src/sqlite-fs.js
-index f91d2a9..8353cca 100644
---- a/node_modules/absurd-sql/src/sqlite-fs.js
-+++ b/node_modules/absurd-sql/src/sqlite-fs.js
-@@ -142,12 +142,16 @@ export default class SQLiteFS {
-
- lock(path, lockType) {
- let { node } = this.FS.lookupPath(path);
-- return node.contents.lock(lockType);
-+ if(node && node.contents) {
-+ return node.contents.lock(lockType);
-+ }
- }
-
- unlock(path, lockType) {
- let { node } = this.FS.lookupPath(path);
-- return node.contents.unlock(lockType);
-+ if(node && node.contents) {
-+ return node.contents.unlock(lockType);
-+ }
- }
-
- createNode(parent, name, mode, dev) {
diff --git a/upcoming-release-notes/1632.md b/upcoming-release-notes/1632.md
new file mode 100644
index 0000000000..0045cb9b79
--- /dev/null
+++ b/upcoming-release-notes/1632.md
@@ -0,0 +1,6 @@
+---
+category: Maintenance
+authors: [MatissJanis]
+---
+
+Upgraded `absurd-sql` and removed `patch-package` dependency
diff --git a/yarn.lock b/yarn.lock
index 3143cda7fb..ed981fb4c1 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5055,13 +5055,6 @@ __metadata:
languageName: node
linkType: hard
-"@yarnpkg/lockfile@npm:^1.1.0":
- version: 1.1.0
- resolution: "@yarnpkg/lockfile@npm:1.1.0"
- checksum: 05b881b4866a3546861fee756e6d3812776ea47fa6eb7098f983d6d0eefa02e12b66c3fff931574120f196286a7ad4879ce02743c8bb2be36c6a576c7852083a
- languageName: node
- linkType: hard
-
"abab@npm:^2.0.3, abab@npm:^2.0.5":
version: 2.0.6
resolution: "abab@npm:2.0.6"
@@ -5076,10 +5069,12 @@ __metadata:
languageName: node
linkType: hard
-"absurd-sql@npm:0.0.53":
- version: 0.0.53
- resolution: "absurd-sql@npm:0.0.53"
- checksum: f038657bf553422146825a7d234103abfd300792f009b94292d6cd8c0e7571967b54fd07f7d8910bbc18ca83fbc080624bc5dea33e142c8021785cdf5faf90fe
+"absurd-sql@npm:0.0.54":
+ version: 0.0.54
+ resolution: "absurd-sql@npm:0.0.54"
+ dependencies:
+ safari-14-idb-fix: ^1.0.4
+ checksum: 426969360c5eee7946e0ccad04ebe13caeb2d9dc96bbc2b5e3344cd5287307945ad57d6932021cfc3fbda1c5943d51ad1ef5aef617741f184b75a7b1194530b1
languageName: node
linkType: hard
@@ -5185,7 +5180,6 @@ __metadata:
eslint-plugin-rulesdir: ^0.2.2
node-jq: ^4.0.1
npm-run-all: ^4.1.3
- patch-package: ^6.1.2
prettier: 2.8.2
react-refresh: ^0.14.0
source-map-support: ^0.5.21
@@ -6572,13 +6566,6 @@ __metadata:
languageName: node
linkType: hard
-"ci-info@npm:^2.0.0":
- version: 2.0.0
- resolution: "ci-info@npm:2.0.0"
- checksum: 3b374666a85ea3ca43fa49aa3a048d21c9b475c96eb13c133505d2324e7ae5efd6a454f41efe46a152269e9b6a00c9edbe63ec7fa1921957165aae16625acd67
- languageName: node
- linkType: hard
-
"ci-info@npm:^3.2.0":
version: 3.8.0
resolution: "ci-info@npm:3.8.0"
@@ -9761,15 +9748,6 @@ __metadata:
languageName: node
linkType: hard
-"find-yarn-workspace-root@npm:^2.0.0":
- version: 2.0.0
- resolution: "find-yarn-workspace-root@npm:2.0.0"
- dependencies:
- micromatch: ^4.0.2
- checksum: fa5ca8f9d08fe7a54ce7c0a5931ff9b7e36f9ee7b9475fb13752bcea80ec6b5f180fa5102d60b376d5526ce924ea3fc6b19301262efa0a5d248dd710f3644242
- languageName: node
- linkType: hard
-
"flat-cache@npm:^3.0.4":
version: 3.0.4
resolution: "flat-cache@npm:3.0.4"
@@ -10371,7 +10349,7 @@ __metadata:
languageName: node
linkType: hard
-"graceful-fs@npm:^4.1.10, graceful-fs@npm:^4.1.11, graceful-fs@npm:^4.1.2, graceful-fs@npm:^4.1.6, graceful-fs@npm:^4.2.0, graceful-fs@npm:^4.2.4, graceful-fs@npm:^4.2.6, graceful-fs@npm:^4.2.9":
+"graceful-fs@npm:^4.1.10, graceful-fs@npm:^4.1.2, graceful-fs@npm:^4.1.6, graceful-fs@npm:^4.2.0, graceful-fs@npm:^4.2.4, graceful-fs@npm:^4.2.6, graceful-fs@npm:^4.2.9":
version: 4.2.11
resolution: "graceful-fs@npm:4.2.11"
checksum: ac85f94da92d8eb6b7f5a8b20ce65e43d66761c55ce85ac96df6865308390da45a8d3f0296dd3a663de65d30ba497bd46c696cc1e248c72b13d6d567138a4fc7
@@ -11081,17 +11059,6 @@ __metadata:
languageName: node
linkType: hard
-"is-ci@npm:^2.0.0":
- version: 2.0.0
- resolution: "is-ci@npm:2.0.0"
- dependencies:
- ci-info: ^2.0.0
- bin:
- is-ci: bin.js
- checksum: 77b869057510f3efa439bbb36e9be429d53b3f51abd4776eeea79ab3b221337fe1753d1e50058a9e2c650d38246108beffb15ccfd443929d77748d8c0cc90144
- languageName: node
- linkType: hard
-
"is-ci@npm:^3.0.0":
version: 3.0.1
resolution: "is-ci@npm:3.0.1"
@@ -11497,7 +11464,7 @@ __metadata:
languageName: node
linkType: hard
-"is-wsl@npm:^2.1.1, is-wsl@npm:^2.2.0":
+"is-wsl@npm:^2.2.0":
version: 2.2.0
resolution: "is-wsl@npm:2.2.0"
dependencies:
@@ -12649,15 +12616,6 @@ __metadata:
languageName: node
linkType: hard
-"klaw-sync@npm:^6.0.0":
- version: 6.0.0
- resolution: "klaw-sync@npm:6.0.0"
- dependencies:
- graceful-fs: ^4.1.11
- checksum: 0da397f8961313c3ef8f79fb63af9002cde5a8fb2aeb1a37351feff0dd6006129c790400c3f5c3b4e757bedcabb13d21ec0a5eaef5a593d59515d4f2c291e475
- languageName: node
- linkType: hard
-
"kleur@npm:^3.0.3":
version: 3.0.3
resolution: "kleur@npm:3.0.3"
@@ -12950,7 +12908,7 @@ __metadata:
"@types/uuid": ^9.0.2
"@types/webpack": ^5.28.0
"@types/webpack-bundle-analyzer": ^4.6.0
- absurd-sql: 0.0.53
+ absurd-sql: 0.0.54
adm-zip: ^0.5.9
assert: ^2.0.0
babel-loader: ^9.1.2
@@ -14074,16 +14032,6 @@ __metadata:
languageName: node
linkType: hard
-"open@npm:^7.4.2":
- version: 7.4.2
- resolution: "open@npm:7.4.2"
- dependencies:
- is-docker: ^2.0.0
- is-wsl: ^2.1.1
- checksum: 3333900ec0e420d64c23b831bc3467e57031461d843c801f569b2204a1acc3cd7b3ec3c7897afc9dde86491dfa289708eb92bba164093d8bd88fb2c231843c91
- languageName: node
- linkType: hard
-
"open@npm:^8.0.9, open@npm:^8.4.0":
version: 8.4.2
resolution: "open@npm:8.4.2"
@@ -14172,13 +14120,6 @@ __metadata:
languageName: node
linkType: hard
-"os-tmpdir@npm:~1.0.2":
- version: 1.0.2
- resolution: "os-tmpdir@npm:1.0.2"
- checksum: 5666560f7b9f10182548bf7013883265be33620b1c1b4a4d405c25be2636f970c5488ff3e6c48de75b55d02bde037249fe5dbfbb4c0fb7714953d56aed062e6d
- languageName: node
- linkType: hard
-
"p-cancelable@npm:^0.3.0":
version: 0.3.0
resolution: "p-cancelable@npm:0.3.0"
@@ -14411,30 +14352,6 @@ __metadata:
languageName: node
linkType: hard
-"patch-package@npm:^6.1.2":
- version: 6.5.1
- resolution: "patch-package@npm:6.5.1"
- dependencies:
- "@yarnpkg/lockfile": ^1.1.0
- chalk: ^4.1.2
- cross-spawn: ^6.0.5
- find-yarn-workspace-root: ^2.0.0
- fs-extra: ^9.0.0
- is-ci: ^2.0.0
- klaw-sync: ^6.0.0
- minimist: ^1.2.6
- open: ^7.4.2
- rimraf: ^2.6.3
- semver: ^5.6.0
- slash: ^2.0.0
- tmp: ^0.0.33
- yaml: ^1.10.2
- bin:
- patch-package: index.js
- checksum: 8530ffa30f11136b527c6eddf6da48fa12856ee510a47edb1f9cdf8a025636adb82968f5fae778b5e04ce8c87915ebdf5911422b54add59a5a42e372a8f30eb2
- languageName: node
- linkType: hard
-
"path-browserify@npm:^1.0.1":
version: 1.0.1
resolution: "path-browserify@npm:1.0.1"
@@ -16645,17 +16562,6 @@ __metadata:
languageName: node
linkType: hard
-"rimraf@npm:^2.6.3":
- version: 2.7.1
- resolution: "rimraf@npm:2.7.1"
- dependencies:
- glob: ^7.1.3
- bin:
- rimraf: ./bin.js
- checksum: cdc7f6eacb17927f2a075117a823e1c5951792c6498ebcce81ca8203454a811d4cf8900314154d3259bb8f0b42ab17f67396a8694a54cae3283326e57ad250cd
- languageName: node
- linkType: hard
-
"rimraf@npm:^3.0.0, rimraf@npm:^3.0.2":
version: 3.0.2
resolution: "rimraf@npm:3.0.2"
@@ -16727,6 +16633,13 @@ __metadata:
languageName: node
linkType: hard
+"safari-14-idb-fix@npm:^1.0.4":
+ version: 1.0.6
+ resolution: "safari-14-idb-fix@npm:1.0.6"
+ checksum: 588cd632606ff0e47d64d0b71d88f9626f6187177a3187cb063a272ecb0412f7453f4e9321a9e731a1439b7830aa24f907e2338b402e1ef24e8d6a42f7ce8532
+ languageName: node
+ linkType: hard
+
"safe-array-concat@npm:^1.0.0":
version: 1.0.0
resolution: "safe-array-concat@npm:1.0.0"
@@ -17198,13 +17111,6 @@ __metadata:
languageName: node
linkType: hard
-"slash@npm:^2.0.0":
- version: 2.0.0
- resolution: "slash@npm:2.0.0"
- checksum: 512d4350735375bd11647233cb0e2f93beca6f53441015eea241fe784d8068281c3987fbaa93e7ef1c38df68d9c60013045c92837423c69115297d6169aa85e6
- languageName: node
- linkType: hard
-
"slash@npm:^4.0.0":
version: 4.0.0
resolution: "slash@npm:4.0.0"
@@ -18266,15 +18172,6 @@ __metadata:
languageName: node
linkType: hard
-"tmp@npm:^0.0.33":
- version: 0.0.33
- resolution: "tmp@npm:0.0.33"
- dependencies:
- os-tmpdir: ~1.0.2
- checksum: 902d7aceb74453ea02abbf58c203f4a8fc1cead89b60b31e354f74ed5b3fb09ea817f94fb310f884a5d16987dd9fa5a735412a7c2dd088dd3d415aa819ae3a28
- languageName: node
- linkType: hard
-
"tmp@npm:^0.2.0":
version: 0.2.1
resolution: "tmp@npm:0.2.1"