cleanup

.gitignore

@@ -27,3 +27,4 @@ browser-version/node_modules
 test-results
 typings-tests.js
 cjs/*
+dist/*

__mocks__/@react-native-async-storage/async-storage.cjs

@@ -0,0 +1 @@
+module.exports.default = require('@react-native-async-storage/async-storage/jest/async-storage-mock')

__mocks__/@react-native-async-storage/async-storage.js

@@ -1,3 +0,0 @@
-import generated from '@react-native-async-storage/async-storage/jest/async-storage-mock'
-
-export default generated

index.d.ts

@@ -10,16 +10,14 @@
 
 /// <reference types="node" />
 
-import { EventEmitter } from "events";
-
 export default Nedb;
 
 export type Document<Schema> = Schema & {
   _id: string;
 };
 
-declare class Nedb<Schema = Record<string, any>> extends EventEmitter {
+declare class Nedb<Schema = Record<string, any>> {
-  constructor(pathOrOptions?: string | Nedb.DataStoreOptions);
+  constructor(pathOrOptions?: Nedb.DataStoreOptions);
 
   persistence: Nedb.Persistence;
 

jest.config.js

@@ -0,0 +1,5 @@
+export default {
+  resolver: '<rootDir>/test/react-native/resolver.cjs',
+  testEnvironment: 'node',
+  testMatch: [ '**/*.test.cjs' ]
+}

karma.conf.local.cjs

@@ -1,8 +1,8 @@
 'use strict'
 
-import template from './karma.conf.template.js'
+const template = require('./karma.conf.template.cjs')
 
-export default function (config) {
+module.exports = function (config) {
   const localBrowser = {
     ChromeHeadlessNoSandbox: {
       base: 'ChromeHeadless',

karma.conf.template.cjs

@@ -1,6 +1,6 @@
 'use strict'
 
-export default (config) => ({
+module.exports = (config) => ({
   // Increase timeout in case connection in CI is slow
   captureTimeout: 120000,
   browserNoActivityTimeout: 300000,
@@ -14,8 +14,8 @@ export default (config) => ({
   // list of files / patterns to load in the browser
   files: [
     'node_modules/localforage/dist/localforage.min.js',
-    'testutils.min.js',
+    'dist/testutils.min.js',
-    'nedb.min.js',
+    'dist/nedb.min.js',
     'test/browser/nedb-browser.spec.js',
     'test/browser/load.spec.js'
   ],

package.json

@@ -2,8 +2,8 @@
   "name": "@seald-io/nedb",
   "version": "4.0.4",
   "files": [
-    "lib/**/*.js",
+    "src/**/*.js",
-    "browser-version/**/*.js",
+    "dist/**/*.js",
     "index.js",
     "index.d.ts"
   ],
@@ -54,7 +54,7 @@
     "@types/jest": "^27.5.2",
     "browser-resolve": "^2.0.0",
     "chai": "^4.3.7",
-    "jest": "^27.5.1",
+    "jest": "^29.7.0",
     "jsdoc-to-markdown": "^8.0.0",
     "karma": "^6.4.1",
     "karma-chai": "^0.1.0",
@@ -74,7 +74,7 @@
     "standard": "^17.0.0",
     "terser-webpack-plugin": "^5.3.6",
     "timers-browserify": "^2.0.12",
-    "ts-jest": "^27.1.5",
+    "ts-jest": "^29.1.2",
     "typescript": "^4.9.5",
     "util": "^0.12.5",
     "webpack": "^5.75.0",
@@ -85,13 +85,14 @@
     "lint": "standard",
     "pretest": "npm run build:cjs",
     "test": "mocha --reporter spec --timeout 10000",
-    "build:cjs": "rollup --preserveModules src/* src/browser/* --dir cjs --entryFileNames \"[name].cjs\" --format cjs --preserveEntrySignatures strict",
+    "build:cjs": "rollup --preserveModules src/* src/browser/* --dir cjs --entryFileNames \"[name].cjs\" --format cjs --preserveEntrySignatures strict --interop compat",
     "build:browser": "webpack --config-name Nedb && webpack --config-name Nedb --env minimize && webpack --config-name testUtils --env minimize",
     "pretest:browser": "npm run build:browser",
-    "test:browser": "xvfb-maybe karma start karma.conf.local.js",
+    "test:browser": "xvfb-maybe karma start karma.conf.local.cjs",
+    "pretest:react-native": "npm run build:cjs",
     "test:react-native": "jest test/react-native",
     "test:typings": "tsc ./typings-tests.ts",
-    "prepublishOnly": "npm run build:browser",
+    "prepublishOnly": "npm run build:browser && npm run build:cjs",
     "generateDocs:markdown": "jsdoc2md --no-cache -c jsdoc.conf.js --param-list-format list --files ./lib/*.js > API.md"
   },
   "main": "cjs/datastore.cjs",
@@ -100,9 +101,9 @@
     "./src/customUtils.js": "./src/browser/customUtils.js",
     "./src/storage.js": "./src/browser/storage.browser.js",
     "./src/byline.js": "./src/browser/byline.js",
-    "./cjs/customUtils.cjs": "./src/browser/customUtils.cjs",
+    "./cjs/customUtils.cjs": "./cjs/browser/customUtils.cjs",
-    "./cjs/storage.cjs": "./src/browser/storage.browser.cjs",
+    "./cjs/storage.cjs": "./cjs/browser/storage.browser.cjs",
-    "./cjs/byline.cjs": "./src/browser/byline.cjs"
+    "./cjs/byline.cjs": "./cjs/browser/byline.cjs"
   },
   "react-native": {
     "./src/customUtils.js": "./src/browser/customUtils.js",
@@ -121,10 +122,5 @@
       "cjs",
       "**/*.ts"
     ]
-  },
-  "jest": {
-    "preset": "ts-jest",
-    "testEnvironment": "node",
-    "resolver": "<rootDir>/test/react-native/resolver.js"
   }
 }

src/browser/storage.react-native.js

@@ -122,7 +122,7 @@ const appendFileAsync = async (filename, toAppend, options) => {
     const contents = (await AsyncStorage.getItem(filename)) || ''
     await AsyncStorage.setItem(filename, contents + toAppend)
   } catch (error) {
-    console.warn('An error happened appending to file writing, skip')
+    console.warn('An error happened appending to file writing, skip', error)
   }
 }
 

test/react-native/persistence.test.cjs

@@ -1,8 +1,8 @@
 /* eslint-env jest */
 // Forked from https://github.com/antoniopresto/react-native-local-mongodb/blob/93acbc8a9aaca86aed1d632855cd8b984501147b/test/persistence.test.js
-import { promisify } from 'util'
+const { promisify } = require('util')
-import AsyncStorage from '@react-native-async-storage/async-storage'
+const AsyncStorage = require('@react-native-async-storage/async-storage').default
-import DataStore from '../../'
+const DataStore = require('../../')
 
 const getDb = async () => {
   await AsyncStorage.clear()

test/react-native/resolver.cjs

@@ -0,0 +1,3 @@
+const browserResolve = require('browser-resolve')
+
+module.exports = (id, opts) => browserResolve.sync(id, { ...opts, browser: 'react-native' })

test/react-native/resolver.js

@@ -1,3 +0,0 @@
-import browserResolve from 'browser-resolve'
-
-export default (id, opts) => browserResolve.sync(id, { ...opts, browser: 'react-native' })

test/utils.test.js

@@ -39,5 +39,6 @@ export {
   apply,
   waterfall,
   each,
-  wait
+  wait,
+  _callbackify as callbackify
 }

webpack.config.js

@@ -18,19 +18,13 @@ export default (env, argv) => {
       minimize
     },
     output: {
-      path: __dirname,
+      path: join(__dirname, 'dist'),
       filename: pathData => `${pathData.chunk.name.toLowerCase()}${minimize ? '.min' : ''}.js`,
       libraryTarget: 'window',
       library: '[name]'
     }
   }
 
-  const pluginsNedb = [
-    new webpack.NormalModuleReplacementPlugin(new RegExp(resolve(__dirname, 'src/storage.js')), resolve(__dirname, 'src/browser/storage.browser.js')),
-    new webpack.NormalModuleReplacementPlugin(new RegExp(resolve(__dirname, 'src/customUtils.js')), resolve(__dirname, 'src/browser/customUtils.js')),
-    new webpack.NormalModuleReplacementPlugin(new RegExp(resolve(__dirname, 'src/byline.js')), resolve(__dirname, 'src/browser/byline.js'))
-  ]
-
   const polyfillPlugins = [
     new webpack.ProvidePlugin({
       process: 'process/browser',
@@ -43,8 +37,14 @@ export default (env, argv) => {
   return [
     {
       ...baseConfig,
+      output: {
+        ...baseConfig.output,
+        libraryExport: 'default'
+      },
       name: 'Nedb',
-      plugins: pluginsNedb,
+      resolve: {
+        aliasFields: ['browser'], // to use files referenced in the package.json
+      },
       entry: {
         Nedb: join(__dirname, 'src', 'datastore.js')
       }