unify browser & rn versions for most files

browser-version/lib/storage.js → browser-version/lib/storage.browser.js

@@ -2,6 +2,7 @@
  * Way data is stored for this database
  * For a Node.js/Node Webkit database it's the file system
  * For a browser-side database it's localforage, which uses the best backend available (IndexedDB then WebSQL then localStorage)
+ * For a react-native database, we use @react-native-async-storage/async-storage
  *
  * This version is the browser version
  */

react-native-version/lib/storage.js → browser-version/lib/storage.react-native.js

@@ -3,6 +3,7 @@
  * For a Node.js/Node Webkit database it's the file system
  * For a browser-side database it's localforage, which uses the best backend available (IndexedDB then WebSQL then localStorage)
  * For a react-native database, we use @react-native-async-storage/async-storage
+ *
  * This version is the react-native version
  */
 const AsyncStorage = require('@react-native-async-storage/async-storage')
@@ -31,13 +32,13 @@ const rename = (filename, newFilename, callback) => {
 }
 
 const writeFile = (filename, contents, options, callback) => {
-  // Options do not matter in browser setup
+  // Options do not matter in a react-native setup
   if (typeof options === 'function') { callback = options }
   AsyncStorage.setItem(filename, contents, callback)
 }
 
 const appendFile = (filename, toAppend, options, callback) => {
-  // Options do not matter in browser setup
+  // Options do not matter in a react-native setup
   if (typeof options === 'function') { callback = options }
 
   // eslint-disable-next-line node/handle-callback-err
@@ -49,7 +50,7 @@ const appendFile = (filename, toAppend, options, callback) => {
 }
 
 const readFile = (filename, options, callback) => {
-  // Options do not matter in browser setup
+  // Options do not matter in a react-native setup
   if (typeof options === 'function') { callback = options }
   // eslint-disable-next-line node/handle-callback-err
   AsyncStorage.getItem(filename, (err, contents) => {
@@ -61,10 +62,10 @@ const unlink = (filename, callback) => {
   AsyncStorage.removeItem(filename, callback)
 }
 
-// Nothing to do, no directories will be used on the browser
+// Nothing to do, no directories will be used on react-native
 const mkdir = (dir, options, callback) => callback()
 
-// Nothing to do, no data corruption possible in the browser
+// Nothing to do, no data corruption possible on react-native
 const ensureDatafileIntegrity = (filename, callback) => callback(null)
 
 const crashSafeWriteFileLines = (filename, lines, callback) => {

package.json

@@ -3,7 +3,7 @@
   "version": "2.1.0",
   "files": [
     "lib/**/*.js",
-    "browser-version/**/*.js",
+    "platform-specific/**/*.js",
     "index.js",
     "index.d.ts"
   ],
@@ -89,13 +89,13 @@
   "main": "index.js",
   "browser": {
     "./lib/customUtils.js": "./browser-version/lib/customUtils.js",
-    "./lib/storage.js": "./browser-version/lib/storage.js",
+    "./lib/storage.js": "./browser-version/lib/storage.browser.js",
     "./lib/byline.js": "./browser-version/lib/byline.js"
   },
   "react-native": {
-    "./lib/customUtils.js": "./react-native-version/lib/customUtils.js",
-    "./lib/storage.js": "./react-native-version/lib/storage.js",
-    "./lib/byline.js": "./react-native-version/lib/byline.js"
+    "./lib/customUtils.js": "./browser-version/lib/customUtils.js",
+    "./lib/storage.js": "./browser-version/lib/storage.react-native.js",
+    "./lib/byline.js": "./browser-version/lib/byline.js"
   },
   "license": "MIT",
   "publishConfig": {

webpack.config.js

@@ -25,7 +25,7 @@ module.exports = (env, argv) => {
       }
     },
     plugins: [
-      new webpack.NormalModuleReplacementPlugin(new RegExp(path.resolve(__dirname, 'lib/storage.js')), path.resolve(__dirname, 'browser-version/lib/storage.js')),
+      new webpack.NormalModuleReplacementPlugin(new RegExp(path.resolve(__dirname, 'lib/storage.js')), path.resolve(__dirname, 'browser-version/lib/storage.browser.js')),
       new webpack.NormalModuleReplacementPlugin(new RegExp(path.resolve(__dirname, 'lib/customUtils.js')), path.resolve(__dirname, 'browser-version/lib/customUtils.js')),
       new webpack.NormalModuleReplacementPlugin(/byline/, path.resolve(__dirname, 'browser-version/lib/byline.js')),
       new webpack.ProvidePlugin({
@@ -39,7 +39,7 @@ module.exports = (env, argv) => {
       Nedb: path.join(__dirname, 'lib', 'datastore.js')
     },
     output: {
-      path: path.join(__dirname, 'browser-version/out'),
+      path: path.join(__dirname, 'platform-specific/out'),
       filename: minimize ? 'nedb.min.js' : 'nedb.js',
       libraryTarget: 'window',
       library: '[name]'