diff --git a/README.md b/README.md index 2117d52..0e99615 100644 --- a/README.md +++ b/README.md @@ -53,7 +53,7 @@ These are `npm --global` dependencies: # Run Tests -`lerna run test` +Run `npm test` in the base project directory. # Development diff --git a/package.json b/package.json index 2709c90..539d761 100644 --- a/package.json +++ b/package.json @@ -8,11 +8,11 @@ "scripts": { "check_code_format": "nodejs node_modules/prettier/bin-prettier.js --config ./prettier.config.js --list-different \"{.,{packages,bin}/**/!(dist)}/*.{js,json,md}\"", "format_code": "nodejs node_modules/prettier/bin-prettier.js --config ./prettier.config.js --write \"{.,{packages,bin}/**/!(dist)}/*.{js,json,md}\"", - "pre-commit": "sh ./bin/pre-commit.sh" + "test": "sh ./bin/pre-commit.sh" }, "husky": { "hooks": { - "pre-commit": "npm run pre-commit" + "pre-commit": "npm run test" } } } diff --git a/packages/gallery/package.json b/packages/gallery/package.json index 627f6b4..62f97ff 100644 --- a/packages/gallery/package.json +++ b/packages/gallery/package.json @@ -2,9 +2,7 @@ "name": "Gallery", "version": "0.0.1", "description": "Personal photo gallery", - "keywords": [ - "javascript" - ], + "keywords": ["javascript"], "author": "Timothy Farrell (https://github.com/explorigin)", "license": "Apache-2.0", "scripts": { @@ -21,11 +19,10 @@ "frptools": "~3.2.0", "linear-partitioning": "0.3.2", "pica": "~2.0.8", - "pouchdb-adapter-http": "~7.0.0", "pouchdb-adapter-idb": "~7.0.0", + "pouchdb-attachmentproxy": "~1.0.0", "pouchdb-core": "~7.0.0", "pouchdb-find": "~7.0.0", - "pouchdb-replication": "~7.0.0", "pouchtype": "~1.0.0", "request": "~2.87.0", "router": "2.1.0", diff --git a/packages/gallery/webpack.config.js b/packages/gallery/webpack.config.js index d9af3f1..330fcc0 100644 --- a/packages/gallery/webpack.config.js +++ b/packages/gallery/webpack.config.js @@ -25,10 +25,11 @@ module.exports = { server.app.listen(API_PORT, API_HOST); console.log(`Running api host on ${API_HOST}:${API_PORT}`); }, + compress: true, contentBase: path.join(__dirname, 'dist'), + headers: formatHeaders(), host: '0.0.0.0', https: true, - headers: formatHeaders(), proxy: { '/api': `http://${API_HOST}:${API_PORT}` } diff --git a/packages/pouchtype/package.json b/packages/pouchtype/package.json index 2439f7e..1db07d6 100644 --- a/packages/pouchtype/package.json +++ b/packages/pouchtype/package.json @@ -1,13 +1,9 @@ { "name": "pouchtype", - "version": "1.0.1", + "version": "1.0.2", "description": "Document Management Layer for PouchDB", "main": "src/index.js", - "files": [ - "dist", - "lib", - "src" - ], + "files": ["dist", "lib", "src"], "scripts": { "test": "node ../../bin/runTests.js ./", "pre-commit": "npm run test" @@ -15,7 +11,9 @@ "author": "Timothy Farrell (https://github.com/explorigin)", "license": "Apache-2.0", "dependencies": { - "frptools": "~3.2.1", + "frptools": "~3.2.1" + }, + "devDependencies": { "pouchdb": "~7.0.0" } } diff --git a/packages/pouchtype/src/index.js b/packages/pouchtype/src/index.js index 7eae1e1..2d279ca 100644 --- a/packages/pouchtype/src/index.js +++ b/packages/pouchtype/src/index.js @@ -1,2 +1,2 @@ -import { isObject, deepAssign, pouchDocHash, pouchDocArrayHash } from './utils.js'; +export { isObject, deepAssign, pouchDocHash, pouchDocArrayHash } from './utils.js'; export { TypeHandler } from './type.js'; diff --git a/packages/pouchtype/src/livearray.js b/packages/pouchtype/src/livearray.js index fe4a5f7..0209036 100644 --- a/packages/pouchtype/src/livearray.js +++ b/packages/pouchtype/src/livearray.js @@ -1,4 +1,4 @@ -import { prop, computed, id } from '../node_modules/frptools/src/index.js'; +import { prop, computed, id } from 'frptools'; import { Watcher } from './watcher.js'; import { pouchDocArrayHash } from './utils.js';