merge upstream

.gitattributes

@@ -0,0 +1 @@
+/packages/node_modules/** linguist-generated=false

.github/stale.yml

@@ -0,0 +1,22 @@
+# Number of days of inactivity before an issue becomes stale
+daysUntilStale: 60
+
+# Number of days of inactivity before a stale issue is closed
+daysUntilClose: 7
+
+# Issues with these labels will never be considered stale
+exemptLabels:
+  - pinned
+  - security
+
+# Label to use when marking an issue as stale
+staleLabel: wontfix
+
+# Comment to post when marking an issue as stale. Set to `false` to disable
+markComment: >
+  This issue has been automatically marked as stale because it has not had
+  recent activity. It will be closed if no further activity occurs. Thank you
+  for your contributions.
+
+# Comment to post when closing a stale issue. Set to `false` to disable
+closeComment: false

.gitignore

@@ -9,8 +9,8 @@ npm-debug.log.*
 coverage
 bower_components
 .idea/
+.vscode/
 tests/integration/cordova/www
-phantomjsdriver.log
 tests/pouchdb_server
 tests/performance-bundle.js
 packages/node_modules/pouchdb/dist/*

.travis.yml

@@ -13,7 +13,9 @@ sudo:
   false
 
 addons:
-  firefox: "47.0.2"
+  firefox: latest
+  jwt:
+     secure: YlCp9qGHmnnATcScIQVyOt8eI9FxLhMGAz9iRTHh7r41ADjfGJUzyqkWoBLcCagiQWtqtUujukPAtRuOibbBp9SvmGp+IIdbwHVUDvSZNOvGxkQ1qczeGxJcnht+2YNoCwfzkHW4vFrNiGOULdjvbWAB4sAJ8N0AZPShURwXU1E=
 
 before_install:
   # Because Saucelabs doesnt proxy 5984 on OSX
@@ -27,14 +29,6 @@ before_script:
   # The next two lines are required for Firefox to run on Travis
   - "export DISPLAY=:99.0"
   - "sh -e /etc/init.d/xvfb start"
-  # Install PhantomJS and cache it
-  # See https://github.com/Medium/phantomjs#continuous-integration
-  - "export PHANTOMJS_VERSION=2.1.1"
-  - "export PATH=$PWD/travis_phantomjs/phantomjs-$PHANTOMJS_VERSION-linux-x86_64/bin:$PATH"
-  - "if [ $(phantomjs --version) != $PHANTOMJS_VERSION ]; then rm -rf $PWD/travis_phantomjs; mkdir -p $PWD/travis_phantomjs; fi"
-  - "if [ $(phantomjs --version) != $PHANTOMJS_VERSION ]; then wget https://github.com/Medium/phantomjs/releases/download/v$PHANTOMJS_VERSION/phantomjs-$PHANTOMJS_VERSION-linux-x86_64.tar.bz2 -O $PWD/travis_phantomjs/phantomjs-$PHANTOMJS_VERSION-linux-x86_64.tar.bz2; fi"
-  - "if [ $(phantomjs --version) != $PHANTOMJS_VERSION ]; then tar -xvf $PWD/travis_phantomjs/phantomjs-$PHANTOMJS_VERSION-linux-x86_64.tar.bz2 -C $PWD/travis_phantomjs; fi"
-  - "phantomjs --version"
   # Fail early so we dont run hours of saucelabs if we know there
   # is a lint failure
   - npm run eslint
@@ -47,11 +41,7 @@ script: travis_retry npm run $COMMAND
 env:
   global:
   - NPM_CONFIG_PROGRESS="false"
-  - secure: "WYQbfTXYwPfqz7t3ycqpXIDQdZ7C9kQJAP+08OF0cuR8eqhm7HxCiu9LjSNqoLAdlDmc55ygeS16Kn3Oht3zZ/i2Y7Gm75HcQfzUIb1sDv1xVm3aQmqZDJfAQ/r7fN8upBCLii/W8IUkJr1k717MpbdsTerIjyfPOb27hw0kJTM="
-  - secure: "Ut9pRqzbVJHxg8vt1Cx0bTv4HAroBkvOLjtHF+11f/OzfNnAORIEPnJFHqGbOTozCPOizmzgwvCGqq9gYL8SakrfiI0wBfaL+lk0ub/FPuJ1+hwrLDU0Ju4O5reL0OSu0JB+OTmXfILuRQQkD9/7uwUEbLDFId4phSq3cz1UsK0="
-  - secure: "MiufQQKR/EBoS7kcau/I7oYenVilysEqwx37zdgLEKlEUe3SxVOe31uLZv/bhfLNZiRuLAfmIOZmhLGnhMf0LaBzR2yC5qhBxrVHcAiTuS3q6zxpzEf02jnu+hACvj1kJJEPjpOLpEVx7ghWL4McEO0qLbdtSbQlm2IkOX1ONg0="
-  - secure: "b8GsgkwaNEOHmJni/rPsc1f3S1/+SxbN6hnXMV7bkSIOiRZAvcf68s3I0Sdln/OPuBmyzeLm5hZ7R8nsA/jYsYD5JUgEzcmF8glcxAeuhMgh9z5jBAfqFo5oUM6B7sE9I7t3/RZkSSkBGqOXIk/43voX1ZGIZBL17VKVPfNcoZ8="
-  - secure: "SSRTzT8OTeTpkGCLga74EGRfGmmRtsmAXbiXm1Xkg6tgQQmahxQJcrxr5QwHkdGdWkEIEudTd53AvZ/5KPmokmX/HiWsamdIj3WkrLdYvbEF4+mfqNa4oBBfrWXtPgPOG0vP1u5jPCK76S8qd7Ih8YrmAPUvecb04TnpVcLy+JM="
+  - SAUCE_USERNAME=pouchdb
 
   matrix:
   - CLIENT=node COMMAND=test
@@ -62,52 +52,48 @@ env:
   # Test in-memory in Node
   - CLIENT=node ADAPTER=memory COMMAND=test
 
-  # Test in firefox/phantomjs running on travis
-  - CLIENT=selenium:firefox:47.0.2 COMMAND=test
-  - CLIENT=selenium:phantomjs COMMAND=test
+  # Test in firefox running on travis
+  - CLIENT=selenium:firefox COMMAND=test
+  - CLIENT=selenium:firefox POUCHDB_SRC="../../packages/node_modules/pouchdb/dist/pouchdb.min.js" COMMAND=test
 
-  # Test auto-compaction in Node, Phantom, and Firefox
+  # Test auto-compaction in Node and Firefox
   - AUTO_COMPACTION=true CLIENT=node COMMAND=test
-  - AUTO_COMPACTION=true CLIENT=selenium:firefox:47.0.2 COMMAND=test
-  - AUTO_COMPACTION=true CLIENT=selenium:phantomjs COMMAND=test
+  - AUTO_COMPACTION=true CLIENT=selenium:firefox COMMAND=test
 
   # Test map/reduce
   - TYPE=mapreduce CLIENT=node COMMAND=test
-  - TYPE=mapreduce CLIENT=selenium:firefox:47.0.2 COMMAND=test
-  - TYPE=mapreduce CLIENT=selenium:phantomjs COMMAND=test
+  - TYPE=mapreduce CLIENT=selenium:firefox COMMAND=test
 
   # Test pouchdb-find
   - COUCH_HOST=http://127.0.0.1:3001 TYPE=find PLUGINS=pouchdb-find CLIENT=node SERVER=couchdb-master COMMAND=test
-  - TYPE=find PLUGINS=pouchdb-find CLIENT=selenium:firefox:47.0.2 SERVER=pouchdb-server COMMAND=test
+  - TYPE=find PLUGINS=pouchdb-find CLIENT=selenium:firefox SERVER=pouchdb-server COMMAND=test
 
   # Testing in saucelabs
   - CLIENT=saucelabs:chrome COMMAND=test
-  - FETCH=1 CLIENT=selenium:firefox:47.0.2 COMMAND=test
-  - CLIENT=saucelabs:safari:6 COMMAND=test
-  - CLIENT="saucelabs:internet explorer:10:Windows 8" COMMAND=test
-
-  # split up the android+iphone tests as it goes over time
-  - SKIP_MIGRATION=true CLIENT="saucelabs:iphone:8.1:OS X 10.10" COMMAND=test
-  - CLIENT="saucelabs:Android:5.1:Linux" COMMAND=test
+  - SKIP_MIGRATION=true CLIENT=saucelabs:safari COMMAND=test
+  - SKIP_MIGRATION=true CLIENT="saucelabs:MicrosoftEdge:14:Windows 10" COMMAND=test
+  - GREP=suite2 INVERT=true SKIP_MIGRATION=true CLIENT="saucelabs:internet explorer:11:Windows 10" COMMAND=test
+  - SKIP_MIGRATION=true CLIENT=saucelabs:iphone:11.2 COMMAND=test
+  - CLIENT="saucelabs:Android:6.0:Linux" COMMAND=test
 
   # Test memory / fruitdown etc
   - CLIENT="saucelabs:iphone:8.4:OS X 10.11" ADAPTERS=fruitdown COMMAND=test
-  - CLIENT=selenium:firefox:47.0.2 ADAPTERS=memory COMMAND=test
-  - CLIENT=selenium:firefox:47.0.2 ADAPTERS=localstorage COMMAND=test
+  - CLIENT=selenium:firefox ADAPTERS=memory COMMAND=test
+  - CLIENT=selenium:firefox ADAPTERS=localstorage COMMAND=test
 
   # Test Webpack bundle
-  - CLIENT=selenium:firefox:47.0.2 COMMAND=test-webpack
+  - CLIENT=selenium:firefox COMMAND=test-webpack
 
   # Test CouchDB master (aka bigcouch branch)
   - COUCH_HOST=http://127.0.0.1:3001 CLIENT=node SERVER=couchdb-master COMMAND=test
-  - COUCH_HOST=http://127.0.0.1:3001 SKIP_MIGRATION=true CLIENT=selenium:firefox:47.0.2 SERVER=couchdb-master COMMAND=test
+  - COUCH_HOST=http://127.0.0.1:3001 SKIP_MIGRATION=true CLIENT=selenium:firefox SERVER=couchdb-master COMMAND=test
 
   # Performance tests
-  - CLIENT=selenium:firefox:47.0.2 PERF=1 COMMAND=test
+  - CLIENT=selenium:firefox PERF=1 COMMAND=test
   - PERF=1 COMMAND=test
 
   # Test Webpack bundle
-  - CLIENT=selenium:firefox:47.0.2 NEXT=1 COMMAND=test
+  - CLIENT=selenium:firefox NEXT=1 COMMAND=test
 
   - COMMAND=test-unit
   - COMMAND=test-component
@@ -120,15 +106,17 @@ env:
 matrix:
   fast_finish: true
   include:
-    - node_js: "4"
+    - node_js: "8"
       services: docker
       env: CLIENT=node COMMAND=test
-    - node_js: "7"
+    - node_js: "10"
       services: docker
       env: CLIENT=node COMMAND=test
   allow_failures:
-  - env: COUCH_HOST=http://127.0.0.1:3001 CLIENT=node SERVER=couchdb-master COMMAND=test
-  - env: COUCH_HOST=http://127.0.0.1:3001 SKIP_MIGRATION=true CLIENT=selenium:firefox:47.0.2 SERVER=couchdb-master COMMAND=test
+    # localdown and fruitdown adapters broken by level upgrade @
+    # https://github.com/pouchdb/pouchdb/pull/6941#issuecomment-352166744
+    - env: CLIENT="saucelabs:iphone:8.4:OS X 10.11" ADAPTERS=fruitdown COMMAND=test
+    - env: CLIENT=selenium:firefox ADAPTERS=localstorage COMMAND=test
 
 branches:
   only:
@@ -140,5 +128,3 @@ cache:
   - $HOME/.npm
   # See https://github.com/gr2m/selsa
   - node_modules/selenium-standalone/.selenium
-  # See https://github.com/Medium/phantomjs#continuous-integration
-  - travis_phantomjs

CONTRIBUTING.md

@@ -6,7 +6,7 @@ Welcome, so you are thinking about contributing to PouchDB? awesome, this is a g
 Get in Touch
 ------------
 
-The following documentation should answer most of the common questions about how to get starting contributing, if you have any questions, please feel free to get in touch @ [Freenode IRC](https://www.irccloud.com/invite?channel=pouchdb&hostname=irc.freenode.net&port=6697&ssl=1), [Slack](http://slack.pouchdb.com),in [the Google Groups mailing list](https://groups.google.com/forum/#!forum/pouchdb), and [on StackOverflow](http://stackoverflow.com/questions/tagged/pouchdb). Or you can [tweet @pouchdb](http://twitter.com/pouchdb).
+The following documentation should answer most of the common questions about how to get starting contributing, if you have any questions, please feel free to get in touch @ [Freenode IRC](https://www.irccloud.com/invite?channel=pouchdb&hostname=irc.freenode.net&port=6697&ssl=1), in [the Google Groups mailing list](https://groups.google.com/forum/#!forum/pouchdb), and [on StackOverflow](http://stackoverflow.com/questions/tagged/pouchdb). Or you can [tweet @pouchdb](http://twitter.com/pouchdb).
 
 Most project discussions should happen on the Mailing list / Bug Tracker and IRC, however if you are a first time contributor and want some help getting started feel free to send a private email to any of the following maintainers:
 
@@ -43,7 +43,7 @@ issue
 Dependencies
 --------------------------------------
 
-PouchDB needs the following to be able to build and test your build, if you haven't installed them then best to do do so now, we will wait.
+PouchDB needs the following to be able to build and test your build, if you haven't installed them then best to do so now, we will wait.
 
   * [Node.js](http://nodejs.org/)
   * [CouchDB](http://couchdb.apache.org/)
@@ -57,7 +57,7 @@ You'll also need to ensure that CORS is enabled on the CouchDB. You can easily d
 Building PouchDB
 --------------------------------------
 
-All dependencies installed? great, now building PouchDB itself is a breeze:
+All dependencies installed? Great, now building PouchDB itself is a breeze:
 
     $ cd pouchdb
     $ npm install

ISSUE_TEMPLATE.md

@@ -15,4 +15,5 @@ Write the description of the issue here
 - Server: (CouchDB/Cloudant/Couchbase/PouchDB Server/etc.)
 
 ### Reproduce
-Write the steps for others to reproduce issue here. Providing a code example, links to a repository or a live example (JSBin etc) are even more helpful.
+Issues that others can reproduce are far easier to fix, we have a website that may help you provide a
+live example of the bug @ https://pouchdb-bug-helper.glitch.me/

README.md

@@ -1,7 +1,7 @@
-[PouchDB](http://pouchdb.com/) – The Database that Syncs!
+[PouchDB](https://pouchdb.com/) – The Database that Syncs!
 =========
 
-[![Build Status](https://travis-ci.org/pouchdb/pouchdb.svg)](https://travis-ci.org/pouchdb/pouchdb) [![Coverage Status](https://s3.amazonaws.com/assets.coveralls.io/badges/coveralls_100.svg)](https://coveralls.io/github/pouchdb/pouchdb?branch=master) [![Greenkeeper badge](https://badges.greenkeeper.io/pouchdb/pouchdb.svg)](https://greenkeeper.io/) [![npm version](https://img.shields.io/npm/v/pouchdb.svg)](https://www.npmjs.com/package/pouchdb)
+[![Build Status](https://travis-ci.org/pouchdb/pouchdb.svg)](https://travis-ci.org/pouchdb/pouchdb) [![Coverage Status](https://s3.amazonaws.com/assets.coveralls.io/badges/coveralls_100.svg)](https://coveralls.io/github/pouchdb/pouchdb?branch=master) [![Greenkeeper badge](https://badges.greenkeeper.io/pouchdb/pouchdb.svg)](https://greenkeeper.io/) [![npm version](https://img.shields.io/npm/v/pouchdb.svg)](https://www.npmjs.com/package/pouchdb) [![jsDelivr Hits](https://data.jsdelivr.com/v1/package/npm/pouchdb/badge?style=rounded)](https://www.jsdelivr.com/package/npm/pouchdb)
 
 PouchDB is an open-source JavaScript database inspired by [Apache CouchDB](http://couchdb.apache.org/) that is designed to run well within the browser.
 
@@ -10,12 +10,12 @@ PouchDB was created to help web developers build applications that work as well
 Using PouchDB
 -------------
 
-To get started using PouchDB, check out the [web site](http://pouchdb.com) and [API documentation](http://pouchdb.com/api.html).
+To get started using PouchDB, check out the [web site](https://pouchdb.com) and [API documentation](https://pouchdb.com/api.html).
 
 Getting Help
 ------------
 
-The PouchDB community is active [on Freenode IRC](https://www.irccloud.com/invite?channel=pouchdb&hostname=irc.freenode.net&port=6697&ssl=1), [Slack](http://slack.pouchdb.com),in [the Google Groups mailing list](https://groups.google.com/forum/#!forum/pouchdb), and [on StackOverflow](http://stackoverflow.com/questions/tagged/pouchdb). Or you can [tweet @pouchdb](http://twitter.com/pouchdb)!
+The PouchDB community is active [on Freenode IRC](https://www.irccloud.com/invite?channel=pouchdb&hostname=irc.freenode.net&port=6697&ssl=1), in [the Google Groups mailing list](https://groups.google.com/forum/#!forum/pouchdb), and [on StackOverflow](http://stackoverflow.com/questions/tagged/pouchdb). Or you can [tweet @pouchdb](http://twitter.com/pouchdb)!
 
 If you think you've found a bug in PouchDB, please write a reproducible test case and file [a Github issue](https://github.com/pouchdb/pouchdb/issues). We recommend [bl.ocks.org](http://bl.ocks.org/) for code snippets, because some iframe-based services like JSFiddle and JSBin do not support IndexedDB in all browsers. You can start with [this template](https://gist.github.com/nolanlawson/816f138a51b86785d3e6).
 

TESTING.md

@@ -1,7 +1,7 @@
 Running PouchDB Tests
 --------------------------------------
 
-The PouchDB test suite expects an instance of CouchDB (version 1.6.1 and above) running in [Admin Party](http://guide.couchdb.org/draft/security.html#party) on http://127.0.0.1:5984 with [CORS enabled](https://github.com/pouchdb/add-cors-to-couchdb), you can configure this by sending the `COUCH_HOST` env var.
+The PouchDB test suite expects an instance of CouchDB (version 1.6.1 and above) running in [Admin Party](http://guide.couchdb.org/draft/security.html#party) on http://127.0.0.1:5984 with [CORS enabled](https://github.com/pouchdb/add-cors-to-couchdb), you can configure this by setting the `COUCH_HOST` env var.
 
  * PouchDB has been primarily developed on Linux and OSX, if you are using Windows then these instructions will have problems, we would love your help fixing them though.
 
@@ -36,12 +36,8 @@ To test a specific plugin in the browser run:
 
 ### Unit tests
 
-    $ npm run build-as-modular-es5
     $ npm run test-unit
 
-These are tests that confirm small parts of PouchDB functionality. In order to
-work correctly with ES6, they are first transpiled to `lib` as modular ES5 (`run run build-as-modular-es5`) using Babel, and then tested as CommonJS modules. See `build-as-modular-es5.sh` for details.
-
 ### Test Options
 
 #### Subset of tests:
@@ -54,9 +50,6 @@ or append `?grep=test.replication.js` if you opened the tests in a browser manua
 
     $ npm run test-coverage
 
-Again, this uses `npm run build-as-modular-es5` in order to fully test the codebase
-as a non-bundle. See `build-as-modular-es5.sh` for details.
-
 #### Test alternative server
 
     $ COUCH_HOST=http://user:pass@myname.host.com npm run dev

bin/build-module.js

@@ -13,11 +13,6 @@ var rollup = require('rollup').rollup;
 var rollupPlugins = require('./rollupPlugins');
 
 var path = require('path');
-var lie = require('lie');
-if (typeof Promise === 'undefined') {
-  global.Promise = lie; // required for denodeify in node 0.10
-}
-var Promise = lie;
 var denodeify = require('denodeify');
 var mkdirp = denodeify(require('mkdirp'));
 var rimraf = denodeify(require('rimraf'));
@@ -71,24 +66,23 @@ function buildModule(filepath) {
   }).then(function () {
     return all(versions.map(function (isBrowser) {
       return rollup({
-        entry: path.resolve(filepath, './src/index.js'),
+        input: path.resolve(filepath, './src/index.js'),
         external: depsToSkip,
         plugins: rollupPlugins({
-          skip: depsToSkip,
           jsnext: true,
           browser: isBrowser || forceBrowser
         })
       }).then(function (bundle) {
         var formats = ['cjs', 'es'];
         return all(formats.map(function (format) {
-          var dest = (isBrowser ? 'lib/index-browser' : 'lib/index') +
+          var file = (isBrowser ? 'lib/index-browser' : 'lib/index') +
             (format === 'es' ? '.es.js' : '.js');
           return bundle.write({
             format: format,
-            dest: path.resolve(filepath, dest)
+            file: path.resolve(filepath, file)
           }).then(function () {
             console.log('  \u2713' + ' wrote ' +
-              path.basename(filepath) + '/' + dest + ' in ' +
+              path.basename(filepath) + '/' + file + ' in ' +
                 (isBrowser ? 'browser' :
                 versions.length > 1 ? 'node' : 'vanilla') +
               ' mode');

bin/build-modules.js

@@ -3,11 +3,6 @@
 // Build all modules in the packages/ folder
 
 var path = require('path');
-var lie = require('lie');
-if (typeof Promise === 'undefined') {
-  global.Promise = lie; // required for denodeify in node 0.10
-}
-var Promise = lie;
 var denodeify = require('denodeify');
 var fs = require('fs');
 var readDir = denodeify(fs.readdir);

bin/build-pouchdb.js

@@ -7,10 +7,6 @@
 
 var DEV_MODE = process.env.CLIENT === 'dev';
 
-var lie = require('lie');
-if (typeof Promise === 'undefined') {
-  global.Promise = lie; // required for denodeify in node 0.10
-}
 var path = require('path');
 var denodeify = require('denodeify');
 var rollup = require('rollup');
@@ -32,7 +28,7 @@ var builtInModules = require('builtin-modules');
 var external = Object.keys(require('../package.json').dependencies)
   .concat(builtInModules);
 
-var plugins = ['fruitdown', 'localstorage', 'memory', 'find'];
+var plugins = ['fruitdown', 'localstorage', 'memory', 'find', 'websql'];
 
 var currentYear = new Date().getFullYear();
 
@@ -79,30 +75,39 @@ var comments = {
   '\n// PouchDB may be freely distributed under the Apache license, ' +
   'version 2.0.' +
   '\n// For all details and documentation:' +
-  '\n// http://pouchdb.com\n'
+  '\n// http://pouchdb.com\n',
+
+  'websql': '// PouchDB websql plugin ' + version +
+  '\n// Since PouchDB 7.0.0, shipped as a separate plugin.' +
+  '\n// ' +
+  '\n// (c) 2012-' + currentYear + ' Dale Harvey and the PouchDB team' +
+  '\n// PouchDB may be freely distributed under the Apache license, ' +
+  'version 2.0.' +
+  '\n// For all details and documentation:' +
+  '\n// http://pouchdb.com\n',
 };
 
-function doRollup(entry, browser, formatsToFiles) {
+function doRollup(input, browser, formatsToFiles) {
   var start = process.hrtime();
   return rollup.rollup({
-    entry: addPath('pouchdb', entry),
+    input: addPath('pouchdb', input),
     external: external,
     plugins: rollupPlugins({
-      skip: external,
       jsnext: true,
       browser: browser,
       main: false  // don't use "main"s that are CJS
     })
   }).then(function (bundle) {
     return Promise.all(Object.keys(formatsToFiles).map(function (format) {
       var fileOut = formatsToFiles[format];
-      var code = bundle.generate({format: format}).code;
-      if (DEV_MODE) {
-        var ms = Math.round(process.hrtime(start)[1] / 1000000);
-        console.log('    took ' + ms + ' ms to rollup ' +
-          path.dirname(entry) + '/' + path.basename(entry));
-      }
-      return writeFile(addPath('pouchdb', fileOut), code);
+      return bundle.generate({format: format}).then(function (bundle) {
+        if (DEV_MODE) {
+          var ms = Math.round(process.hrtime(start)[1] / 1000000);
+          console.log('    took ' + ms + ' ms to rollup ' +
+                      path.dirname(input) + '/' + path.basename(input));
+        }
+        return writeFile(addPath('pouchdb', fileOut), bundle.code);
+      });
     }));
   });
 }

bin/build-site.js

@@ -3,7 +3,6 @@
 'use strict';
 
 var http_server = require('http-server');
-var Promise = require('lie');
 var fs = require('fs');
 var watchGlob = require('watch-glob');
 var replace = require('replace');