Skip to content

Commit

Permalink
(#197) - Merge pouchdb-show
Browse files Browse the repository at this point in the history
  • Loading branch information
marten-de-vries committed Jan 23, 2018
2 parents 2de523b + 26e7e7e commit 041837a
Show file tree
Hide file tree
Showing 12 changed files with 665 additions and 313 deletions.
330 changes: 25 additions & 305 deletions package-lock.json

Large diffs are not rendered by default.

14 changes: 9 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
"dependencies": {
"base64url": "^1.0.5",
"basic-auth": "^1.1.0",
"bluebird": "^3.4.7",
"body-parser": "^1.16.1",
"builtin-modules": "^1.1.1",
"colors": "^1.0.3",
Expand All @@ -35,6 +36,7 @@
"nomnom": "^1.8.1",
"object-assign": "^4.1.0",
"on-finished": "^2.3.0",
"pouchdb-all-dbs": "^1.0.2",
"pouchdb-fauxton": "^0.0.6",
"promise-nodify": "^1.0.2",
"random-uuid-v4": "0.0.6",
Expand All @@ -61,19 +63,22 @@
"couchdb-objects": "file:packages/node_modules/couchdb-objects",
"couchdb-render": "file:packages/node_modules/couchdb-render",
"couchdb-resp-completer": "file:packages/node_modules/couchdb-resp-completer",
"express-pouchdb": "file:packages/node_modules/express-pouchdb",
"http-pouchdb": "file:packages/node_modules/http-pouchdb",
"pouchdb-all-dbs": "^1.0.2",
"pouchdb-auth": "file:packages/node_modules/pouchdb-auth",
"pouchdb-bulkdocs-wrapper": "file:packages/node_modules/pouchdb-bulkdocs-wrapper",
"pouchdb-changeslike-wrapper": "file:packages/node_modules/pouchdb-changeslike-wrapper",
"pouchdb-list": "file:packages/node_modules/pouchdb-list",
"pouchdb-plugin-error": "file:packages/node_modules/pouchdb-plugin-error",
"pouchdb-replicator": "file:packages/node_modules/pouchdb-replicator",
"pouchdb-req-http-query": "file:packages/node_modules/pouchdb-req-http-query",
"pouchdb-rewrite": "file:packages/node_modules/pouchdb-rewrite",
"pouchdb-route": "file:packages/node_modules/pouchdb-route",
"pouchdb-show": "^1.0.8",
"pouchdb-size": "file:packages/node_modules/pouchdb-size",
"pouchdb-seamless-auth": "file:packages/node_modules/pouchdb-seamless-auth",
"pouchdb-security": "file:packages/node_modules/pouchdb-security",
"pouchdb-server": "file:packages/node_modules/pouchdb-server",
"pouchdb-show": "file:packages/node_modules/pouchdb-show",
"pouchdb-size": "file:packages/node_modules/pouchdb-size",
"pouchdb-system-db": "file:packages/node_modules/pouchdb-system-db",
"pouchdb-update": "file:packages/node_modules/pouchdb-update",
"pouchdb-validation": "file:packages/node_modules/pouchdb-validation",
Expand All @@ -83,7 +88,6 @@
"devDependencies": {
"assert": "^1.4.1",
"couchdb-harness": "*",
"bluebird": "^3.4.7",
"builtin-modules": "^1.1.1",
"chai": "^4.1.2",
"eslint": "3.19.0",
Expand All @@ -97,8 +101,8 @@
"medeadown": "^1.1.1",
"memdown": "^1.2.4",
"mocha": "^3.2.0",
"navigator": "^1.0.1",
"pouchdb-plugin-helper": "^5.0.1",
"pouchdb-seamless-auth": "^1.0.2",
"sqldown": "^2.1.0",
"sqlite3": "^3.1.13",
"supertest": "^3.0.0"
Expand Down
38 changes: 38 additions & 0 deletions packages/node_modules/pouchdb-show/README.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

93 changes: 93 additions & 0 deletions packages/node_modules/pouchdb-show/lib/index.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

19 changes: 19 additions & 0 deletions packages/node_modules/pouchdb-show/package.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion tests/pouchdb-rewrite/utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ const Rewrite = require('../../packages/node_modules/pouchdb-rewrite');

const List = require('../../packages/node_modules/pouchdb-list');
const Security = require('../../packages/node_modules/pouchdb-security');
const Show = require('pouchdb-show');
const Show = require('../../packages/node_modules/pouchdb-show');
const Update = require('pouchdb-update');
const Validation = require('pouchdb-validation');

Expand Down
2 changes: 1 addition & 1 deletion tests/pouchdb-security/utils.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
const Security = require('../../packages/node_modules/pouchdb-security');
const Show = require('pouchdb-show');
const Show = require('../../packages/node_modules/pouchdb-show');
const stuff = require('pouchdb-plugin-helper/testutils');

stuff.PouchDB.plugin(Security);
Expand Down
Loading

0 comments on commit 041837a

Please sign in to comment.