Merge branch 'master' into update-node-test-environment

Author: SourceR85

.eslintrc.json

@@ -33,8 +33,10 @@
   },
 
   "rules": {
+    "eol-last": "error",
     "no-empty": "off",
     "no-console": "off",
+    "no-trailing-spaces": "error",
     "semi": ["error", "always"],
     "curly": ["error", "all"],
     "space-unary-ops": ["error", {"words": true}],

bin/test-browser.js

@@ -125,7 +125,7 @@ class RemoteRunner {
 
   on(name, handler) {
     var handlers = this.handlers;
-  
+
     if (!handlers[name]) {
       handlers[name] = [];
     }
@@ -134,21 +134,21 @@ class RemoteRunner {
 
   handleEvents(events) {
     var handlers = this.handlers;
-  
+
     events.forEach((event) => {
       this.completed = this.completed || event.name === 'end';
       this.failed = this.failed || event.name === 'fail';
-  
+
       var additionalProps = ['pass', 'fail', 'pending'].indexOf(event.name) === -1 ? {} : {
         slow: event.obj.slow ? function () { return event.obj.slow; } : function () { return 60; },
         fullTitle: event.obj.fullTitle ? function () { return event.obj.fullTitle; } : undefined
       };
       var obj = Object.assign({}, event.obj, additionalProps);
-  
+
       handlers[event.name].forEach(function (handler) {
         handler(obj, event.err);
       });
-  
+
       if (event.logs && event.logs.length > 0) {
         event.logs.forEach(function (line) {
           if (line.type === 'log') {
@@ -163,14 +163,14 @@ class RemoteRunner {
       }
     });
   }
-  
+
   bail() {
     var handlers = this.handlers;
-  
+
     handlers['end'].forEach(function (handler) {
       handler();
     });
-  
+
     this.completed = true;
   }
 }

bin/test-webpack.sh

@@ -7,7 +7,7 @@
 #
 
 npm run build
-npm i webpack@5.66.0 -D webpack-cli@4.9.2 # do this on-demand to avoid slow installs
+npm i webpack@5.66.0 webpack-cli@4.9.2 # do this on-demand to avoid slow installs
 node bin/update-package-json-for-publish.js
 ./node_modules/.bin/webpack
-BUILD_NODE_DONE=0 POUCHDB_SRC='../../pouchdb-webpack.js' npm test
+BUILD_NODE_DONE=1 POUCHDB_SRC='../../pouchdb-webpack.js' npm test

bin/verify-build.sh

@@ -6,4 +6,4 @@
 npm run build
 
 node ./bin/verify-dependencies.js
-sh ./bin/verify-bundle-size.sh
+./bin/verify-bundle-size.sh

docs/_guides/attachments.md

@@ -204,7 +204,7 @@ input.addEventListener('change', function () {
     _id: 'mydoc',
     _attachments: {
       filename: {
-        type: file.type,
+        content_type: file.type,
         data: file
       }
     }

packages/node_modules/pouchdb-abstract-mapreduce/src/createViewSignature.js

@@ -23,4 +23,4 @@ function createViewSignature(mapFun, reduceFun) {
   return stringify(mapFun) + stringify(reduceFun) + 'undefined';
 }
 
-export default createViewSignature;
+export default createViewSignature;

packages/node_modules/pouchdb-abstract-mapreduce/src/index.js

@@ -708,7 +708,7 @@ function createAbstractMapReduce(localDocName, mapper, reducer, ddocValidator) {
       view.seq = currentSeq;
       view.sourceDB.activeTasks.remove(taskId);
     } catch (error) {
-      view.sourceDB.activeTasks.remove(taskId, error);      
+      view.sourceDB.activeTasks.remove(taskId, error);
     }
   }
 

packages/node_modules/pouchdb-adapter-http/src/promise-pool.js

@@ -50,4 +50,4 @@ function pool(promiseFactories, limit) {
   });
 }
 
-export default pool;
+export default pool;

packages/node_modules/pouchdb-adapter-idb/src/allDocs.js

@@ -18,7 +18,7 @@ import runBatchedCursor from './runBatchedCursor';
 import getAll from './getAll';
 
 function allDocsKeys(keys, docStore, onBatch) {
-  // It's not guaranted to be returned in right order  
+  // It's not guaranted to be returned in right order
   var valuesBatch = new Array(keys.length);
   var count = 0;
   keys.forEach(function (key, index) {
@@ -69,17 +69,17 @@ function idbAllDocs(opts, idb, callback) {
   var start = 'startkey' in opts ? opts.startkey : false;
   var end = 'endkey' in opts ? opts.endkey : false;
   var key = 'key' in opts ? opts.key : false;
-  var keys = 'keys' in opts ? opts.keys : false; 
+  var keys = 'keys' in opts ? opts.keys : false;
   var skip = opts.skip || 0;
   var limit = typeof opts.limit === 'number' ? opts.limit : -1;
   var inclusiveEnd = opts.inclusive_end !== false;
 
-  var keyRange ; 
+  var keyRange ;
   var keyRangeError;
   if (!keys) {
     keyRange = createKeyRange(start, end, inclusiveEnd, key, opts.descending);
     keyRangeError = keyRange && keyRange.error;
-    if (keyRangeError && 
+    if (keyRangeError &&
       !(keyRangeError.name === "DataError" && keyRangeError.code === 0)) {
       // DataError with error code 0 indicates start is less than end, so
       // can just do an empty query. Else need to throw
@@ -114,7 +114,7 @@ function idbAllDocs(opts, idb, callback) {
 
   /* istanbul ignore if */
   if (opts.update_seq) {
-    getMaxUpdateSeq(seqStore, function (e) { 
+    getMaxUpdateSeq(seqStore, function (e) {
       if (e.target.result && e.target.result.length > 0) {
         updateSeq = e.target.result[0];
       }
@@ -127,7 +127,7 @@ function idbAllDocs(opts, idb, callback) {
       var maxKey = undefined;
       if (cursor && cursor.key) {
         maxKey = cursor.key;
-      } 
+      }
       return onSuccess({
         target: {
           result: [maxKey]
@@ -218,7 +218,7 @@ function idbAllDocs(opts, idb, callback) {
       offset: opts.skip,
       rows: results
     };
-    
+
     /* istanbul ignore if */
     if (opts.update_seq && updateSeq !== undefined) {
       returnVal.update_seq = updateSeq;
@@ -249,4 +249,4 @@ function idbAllDocs(opts, idb, callback) {
   runBatchedCursor(docStore, keyRange, opts.descending, limit + skip, onBatch);
 }
 
-export default idbAllDocs;
+export default idbAllDocs;

packages/node_modules/pouchdb-adapter-idb/src/changesHandler.js

@@ -1,2 +1,2 @@
 import { changesHandler as Changes } from 'pouchdb-utils';
-export default new Changes();
+export default new Changes();