From 30f9297b0a3d627032ba401ca4a262982b556f72 Mon Sep 17 00:00:00 2001 From: achingbrain Date: Mon, 25 Nov 2019 12:07:10 +0100 Subject: [PATCH 1/3] fix: pass backwards-compatible level-js options --- src/default-options-browser.js | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/default-options-browser.js b/src/default-options-browser.js index 9a848d4b..4d43684c 100644 --- a/src/default-options-browser.js +++ b/src/default-options-browser.js @@ -11,13 +11,19 @@ module.exports = { }, storageBackendOptions: { root: { - extension: '' + extension: '', + prefix: '', + version: 2 }, blocks: { - sharding: false + sharding: false, + prefix: '', + version: 2 }, keys: { - sharding: false + sharding: false, + prefix: '', + version: 2 } } } From 18c566381b97b8b6e1c6a2277b8b9ca8bd0e10f7 Mon Sep 17 00:00:00 2001 From: achingbrain Date: Mon, 25 Nov 2019 12:19:23 +0100 Subject: [PATCH 2/3] fix: fix options test --- test/options-test.js | 29 +++-------------------------- 1 file changed, 3 insertions(+), 26 deletions(-) diff --git a/test/options-test.js b/test/options-test.js index 8b2be95e..bec80c49 100644 --- a/test/options-test.js +++ b/test/options-test.js @@ -65,32 +65,9 @@ describe('custom options tests', () => { function noop () {} function expectedRepoOptions () { - const options = { - lock: process.browser ? 'memory' : 'fs', - storageBackends: { - // packages are exchanged to browser-compatible - // equivalents via package.browser - root: require('datastore-fs'), - blocks: require('datastore-fs'), - keys: require('datastore-fs'), - datastore: require('datastore-level') - }, - storageBackendOptions: { - root: { - extension: '' - }, - keys: {}, - blocks: { - sharding: true, - extension: '.data' - } - } - } - if (process.browser) { - options.storageBackendOptions.keys.sharding = false - delete options.storageBackendOptions.blocks.extension - options.storageBackendOptions.blocks.sharding = false + return require('../src/default-options-browser') } - return options + + return require('../src/default-options') } From 5af35e1441f866787d696131ae48cb5ebc44a615 Mon Sep 17 00:00:00 2001 From: achingbrain Date: Fri, 29 Nov 2019 16:49:38 +0000 Subject: [PATCH 3/3] fix: configure datastore prefix and get right level version --- package.json | 2 +- src/default-options-browser.js | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 5b218dc8..a38f08f1 100644 --- a/package.json +++ b/package.json @@ -61,7 +61,7 @@ "cids": "~0.7.0", "datastore-core": "~0.7.0", "datastore-fs": "~0.9.0", - "datastore-level": "~0.12.0", + "datastore-level": "~0.14.0", "debug": "^4.1.0", "err-code": "^1.1.2", "interface-datastore": "~0.7.0", diff --git a/src/default-options-browser.js b/src/default-options-browser.js index 4d43684c..07e59d1a 100644 --- a/src/default-options-browser.js +++ b/src/default-options-browser.js @@ -24,6 +24,11 @@ module.exports = { sharding: false, prefix: '', version: 2 + }, + datastore: { + sharding: false, + prefix: '', + version: 2 } } }