From 35cb56c69452aba33cc5e7bfab4315f2ca841170 Mon Sep 17 00:00:00 2001 From: NGPixel Date: Mon, 4 Sep 2017 13:03:15 -0400 Subject: [PATCH] feat: file resolvers + pull changes from master --- CHANGELOG.md | 11 + README.md | 31 +- package.json | 46 +-- server/modules/git.js | 5 +- server/modules/graphql.js | 2 + server/schemas/resolvers-file.js | 52 +++ server/schemas/types.graphql | 19 + tools/docker-compose.yml | 2 +- wercker.yml | 13 +- yarn.lock | 591 +++++++++++++++++-------------- 10 files changed, 459 insertions(+), 313 deletions(-) create mode 100644 server/schemas/resolvers-file.js diff --git a/CHANGELOG.md b/CHANGELOG.md index 751ae0f1..83bd69c4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,15 @@ All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/). +## [v1.0.8] - 2017-08-31 +### Changed +- **Misc**: Updated dependencies + +## [v1.0.7] - 2017-08-29 +### Fixed +- **Authentication**: Azure AD client Id is now referenced correctly ([#219](https://github.com/Requarks/wiki/issues/219)) +- **Git**: Git Branch is now referenced correctly ([#215](https://github.com/Requarks/wiki/issues/215)) + ## [v1.0.6] - 2017-08-10 ### Fixed - **Authentication**: LDAP no longer cause the social login text to appear on the login screen. @@ -208,6 +217,8 @@ This project adheres to [Semantic Versioning](http://semver.org/). ### Changed - Updated dependencies + snyk policy +[v1.0.8]: https://github.com/Requarks/wiki/releases/tag/v1.0.8 +[v1.0.7]: https://github.com/Requarks/wiki/releases/tag/v1.0.7 [v1.0.6]: https://github.com/Requarks/wiki/releases/tag/v1.0.6 [v1.0.5]: https://github.com/Requarks/wiki/releases/tag/v1.0.5 [v1.0.4]: https://github.com/Requarks/wiki/releases/tag/v1.0.4 diff --git a/README.md b/README.md index 278795f8..efc2e507 100644 --- a/README.md +++ b/README.md @@ -53,34 +53,37 @@ You can also use a Dockerfile ([see example](https://github.com/Requarks/wiki/bl Current and upcoming milestones *(major features only, see the [changelog](https://github.com/Requarks/wiki/blob/master/CHANGELOG.md) for complete list of features and bug fixes)*: -### 1.0.0 - Beta 13 +### 1.0.8 - Stable ![Progress](http://progressed.io/bar/100) -- [x] Color Themes -- [x] Server-side TeX/MathML rendering -- [x] Render line breaks by default (GitHub style) -- [x] New Localization: German - -### 1.0.6 - Stable -![Progress](http://progressed.io/bar/100) - -- [x] Bug fixes release -- [x] New Localization: Dutch +- [x] Fix: Azure AD client Id is now referenced correctly ([#219](https://github.com/Requarks/wiki/issues/219)) +- [x] Fix: Git Branch is now referenced correctly ([#215](https://github.com/Requarks/wiki/issues/215)) +- [x] Updated dependencies ### 2.0.0 - Dev -![Progress](http://progressed.io/bar/20) +![Progress](http://progressed.io/bar/25) **Breaking Changes**: MongoDB is being phased out in favor of PostgreSQL + Redis. An upgrade tool will be provided to migrate existing data to the new system. -- [ ] GraphQL API +- [x] GraphQL API + - [x] Comments + - [x] Documents + - [x] Files + - [x] Folders + - [x] Groups + - [x] Rights + - [x] Settings + - [x] Tags + - [x] Users - [x] Migrate to PostgreSQL + Redis datastore +- [ ] New Login page - [ ] History / Revert to previous version - [ ] Optional Two-Steps Authentication (2FA) - [x] Docker support + Auto compile/publish to Docker Hub - [ ] Support sub-directory installations (e.g. example.com/wiki) - [ ] Persist system settings to database instead of file-based - [ ] User Groups + Better permissions management -- [ ] Make use of all available CPU cores, distributed jobs queue +- [x] Make use of all available CPU cores, distributed jobs queue - [ ] Tags per document / folder - [ ] Comments / Discussion per document - [ ] Profile page per user diff --git a/package.json b/package.json index d3ed5237..7545f72b 100644 --- a/package.json +++ b/package.json @@ -37,13 +37,13 @@ "node": ">=6.11.1" }, "dependencies": { - "apollo-server-express": "1.1.0", + "apollo-server-express": "1.1.2", "auto-load": "3.0.0", "axios": "0.16.2", "bcryptjs-then": "1.0.1", "bluebird": "3.5.0", "body-parser": "1.17.2", - "bull": "3.0.0-rc.7", + "bull": "3.0.0", "bunyan": "1.8.12", "cheerio": "1.0.0-rc.2", "child-process-promise": "2.2.1", @@ -63,10 +63,10 @@ "follow-redirects": "1.2.4", "fs-extra": "4.0.1", "git-wrapper2-promise": "0.2.9", - "graphql": "0.10.5", - "graphql-tools": "1.2.1", + "graphql": "0.11.2", + "graphql-tools": "1.2.2", "highlight.js": "9.12.0", - "i18next": "8.4.3", + "i18next": "9.0.0", "i18next-express-middleware": "1.0.5", "i18next-node-fs-backend": "1.0.0", "image-size": "0.6.1", @@ -77,19 +77,19 @@ "klaw": "2.1.0", "levelup": "1.3.9", "lodash": "4.17.4", - "markdown-it": "8.3.2", + "markdown-it": "8.4.0", "markdown-it-abbr": "1.0.4", "markdown-it-anchor": "4.0.0", - "markdown-it-attrs": "1.0.0", + "markdown-it-attrs": "1.1.0", "markdown-it-emoji": "1.4.0", "markdown-it-expand-tabs": "1.0.12", "markdown-it-external-links": "0.0.6", "markdown-it-footnote": "3.0.1", "markdown-it-mathjax": "2.0.0", "markdown-it-task-lists": "2.0.1", - "mathjax-node": "1.1.1", + "mathjax-node": "1.2.0", "memdown": "1.2.4", - "mime-types": "2.1.16", + "mime-types": "2.1.17", "moment": "2.18.1", "moment-timezone": "0.5.13", "multer": "1.3.0", @@ -106,9 +106,9 @@ "passport-slack": "0.0.7", "passport-windowslive": "1.0.2", "passport.socketio": "3.7.0", - "pg": "7.1.2", + "pg": "7.3.0", "pg-hstore": "2.3.2", - "pg-promise": "6.5.0", + "pg-promise": "6.5.1", "pm2": "2.6.1", "pug": "2.0.0-rc.3", "read-chunk": "2.1.0", @@ -117,15 +117,15 @@ "search-index-adder": "0.3.9", "search-index-searcher": "0.2.10", "semver": "5.4.1", - "sequelize": "4.5.0", + "sequelize": "4.8.0", "serve-favicon": "2.4.3", "simplemde": "1.11.2", "socket.io": "2.0.3", "stopword": "0.1.6", "stream-to-promise": "2.2.0", - "tar": "4.0.0", + "tar": "4.0.1", "through2": "2.0.3", - "validator": "8.0.0", + "validator": "8.1.0", "validator-as-promised": "1.0.2", "winston": "2.3.1", "yargs": "8.0.2" @@ -134,21 +134,21 @@ "@glimpse/glimpse": "0.22.15", "@panter/vue-i18next": "0.5.1", "babel-cli": "6.26.0", - "babel-jest": "20.0.3", + "babel-jest": "21.0.0", "babel-plugin-transform-object-assign": "6.22.0", "babel-preset-es2015": "6.24.1", "brace": "0.10.0", "colors": "1.1.2", "consolidate": "0.14.5", - "eslint": "4.4.1", + "eslint": "4.6.1", "eslint-config-standard": "10.2.1", "eslint-plugin-import": "2.7.0", "eslint-plugin-node": "5.1.1", "eslint-plugin-promise": "3.5.0", "eslint-plugin-standard": "3.0.1", - "fuse-box": "2.2.2", + "fuse-box": "2.2.3", "i18next-xhr-backend": "1.4.2", - "jest": "20.0.4", + "jest": "21.0.0", "jquery": "3.2.1", "jquery-contextmenu": "2.5.0", "jquery-simple-upload": "1.0.0", @@ -158,18 +158,18 @@ "lodash-es": "4.17.4", "node-sass": "4.5.3", "nodemon": "1.11.0", - "pug-lint": "2.4.0", + "pug-lint": "2.5.0", "twemoji-awesome": "1.0.6", - "typescript": "2.4.2", - "uglify-es": "3.0.27", - "vee-validate": "2.0.0-rc.13", + "typescript": "2.5.2", + "uglify-es": "3.0.28", + "vee-validate": "2.0.0-rc.14", "vue": "2.4.2", "vue-clipboards": "1.1.0", "vue-lodash": "1.0.3", "vue-resource": "1.3.4", "vue-template-compiler": "2.4.2", "vue-template-es2015-compiler": "1.5.3", - "vuex": "2.3.1" + "vuex": "2.4.0" }, "jest": { "collectCoverage": false, diff --git a/server/modules/git.js b/server/modules/git.js index dedd9b6b..f34ff829 100644 --- a/server/modules/git.js +++ b/server/modules/git.js @@ -53,10 +53,9 @@ module.exports = { self.onReady = (wiki.IS_MASTER) ? self._initRepo() : Promise.resolve() - // Define signature - if (wiki.config.git) { - self._signature.email = wiki.config.git.serverEmail || 'wiki@example.com' + self._repo.branch = appconfig.git.branch || 'master' + self._signature.email = appconfig.git.serverEmail || 'wiki@example.com' } return self diff --git a/server/modules/graphql.js b/server/modules/graphql.js index 2224d64b..e1897390 100644 --- a/server/modules/graphql.js +++ b/server/modules/graphql.js @@ -12,6 +12,7 @@ const typeDefs = fs.readFileSync(path.join(wiki.SERVERPATH, 'schemas/types.graph const DateScalar = require('../schemas/scalar-date') const CommentResolvers = require('../schemas/resolvers-comment') const DocumentResolvers = require('../schemas/resolvers-document') +const FileResolvers = require('../schemas/resolvers-file') const FolderResolvers = require('../schemas/resolvers-folder') const GroupResolvers = require('../schemas/resolvers-group') const SettingResolvers = require('../schemas/resolvers-setting') @@ -21,6 +22,7 @@ const UserResolvers = require('../schemas/resolvers-user') const resolvers = _.merge( CommentResolvers, DocumentResolvers, + FileResolvers, FolderResolvers, GroupResolvers, SettingResolvers, diff --git a/server/schemas/resolvers-file.js b/server/schemas/resolvers-file.js new file mode 100644 index 00000000..c1011d95 --- /dev/null +++ b/server/schemas/resolvers-file.js @@ -0,0 +1,52 @@ +'use strict' + +/* global wiki */ + +const gql = require('graphql') + +module.exports = { + Query: { + files(obj, args, context, info) { + return wiki.db.File.findAll({ where: args }) + } + }, + Mutation: { + uploadFile(obj, args) { + // todo + return wiki.db.File.create(args) + }, + deleteFile(obj, args) { + return wiki.db.File.destroy({ + where: { + id: args.id + }, + limit: 1 + }) + }, + renameFile(obj, args) { + return wiki.db.File.update({ + filename: args.filename + }, { + where: { id: args.id } + }) + }, + moveFile(obj, args) { + return wiki.db.File.findById(args.fileId).then(fl => { + if (!fl) { + throw new gql.GraphQLError('Invalid File ID') + } + return wiki.db.Folder.findById(args.folderId).then(fld => { + if (!fld) { + throw new gql.GraphQLError('Invalid Folder ID') + } + return fl.setFolder(fld) + }) + }) + } + }, + File: { + folder(fl) { + return fl.getFolder() + } + } +} diff --git a/server/schemas/types.graphql b/server/schemas/types.graphql index 18bcf1d9..4f5cc929 100644 --- a/server/schemas/types.graphql +++ b/server/schemas/types.graphql @@ -206,6 +206,10 @@ type Mutation { id: Int! ): OperationResult + deleteFile( + id: Int! + ): OperationResult + deleteFolder( id: Int! ): OperationResult @@ -255,6 +259,16 @@ type Mutation { path: String! ): OperationResult + moveFile( + id: Int! + folderId: Int! + ): OperationResult + + renameFile( + id: Int! + name: String! + ): OperationResult + renameFolder( id: Int! name: String! @@ -297,4 +311,9 @@ type Mutation { id: Int! passwordRaw: String! ): OperationResult + + uploadFile( + category: FileType! + filename: String! + ): File } diff --git a/tools/docker-compose.yml b/tools/docker-compose.yml index c7f9595a..7407a580 100644 --- a/tools/docker-compose.yml +++ b/tools/docker-compose.yml @@ -14,6 +14,6 @@ services: ports: - '80:3000' environment: - - WIKI_ADMIN_EMAIL: admin@example.com + WIKI_ADMIN_EMAIL: admin@example.com volumes: - ./config.yml:/var/wiki/config.yml diff --git a/wercker.yml b/wercker.yml index 369bc30a..62bdd216 100644 --- a/wercker.yml +++ b/wercker.yml @@ -33,7 +33,7 @@ deploy-docker-master: name: copy app files code: | mkdir -p /var/wiki - cp -LR assets node_modules server config.sample.yml package.json /var/wiki + cp -LR assets node_modules server config.sample.yml package.json LICENSE /var/wiki rm -rf /pipeline - internal/docker-push: username: $DOCKER_HUB_USERNAME @@ -58,7 +58,7 @@ deploy-docker-dev: name: copy app files code: | mkdir -p /var/wiki - cp -LR assets node_modules server config.sample.yml package.json /var/wiki + cp -LR assets node_modules server config.sample.yml package.json LICENSE /var/wiki rm -rf /pipeline - internal/docker-push: username: $DOCKER_HUB_USERNAME @@ -76,15 +76,14 @@ deploy-github: - script: name: package code: | - tar -chzfv wiki-js.tar.gz * -X .build/.deployexclude - tar -chzfv node_modules.tar.gz node_modules - SEMVER_LAST=`npm show wiki.js version` - chmod +x ./.build/semver_next.sh - SEMVER_NEXT=`./.build/semver_next.sh -p $SEMVER_LAST` + tar -chzf wiki-js.tar.gz assets server config.sample.yml package.json wiki.js LICENSE + tar -chzf node_modules.tar.gz node_modules + SEMVER_NEXT=`curl --request POST --url https://beta.requarks.io/api/version/increment --header "authorization: $WIKIJSORG_TOKEN" --header 'cache-control: no-cache' --header 'content-type: application/json' --data '{"channel": "stable"}'` - github-create-release: token: $GITHUB_TOKEN tag: "v${SEMVER_NEXT}" prerelease: true + title: "$SEMVER_NEXT Release" - github-upload-asset: token: $GITHUB_TOKEN file: wiki-js.tar.gz diff --git a/yarn.lock b/yarn.lock index 8420b745..5d936277 100644 --- a/yarn.lock +++ b/yarn.lock @@ -262,7 +262,7 @@ ansi-escape-sequences@^3.0.0: dependencies: array-back "^1.0.3" -ansi-escapes@^1.1.0, ansi-escapes@^1.4.0: +ansi-escapes@^1.1.0: version "1.4.0" resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-1.4.0.tgz#d3a8a83b319aa67793662b13e761c7911422306e" @@ -270,7 +270,7 @@ ansi-escapes@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-2.0.0.tgz#5bae52be424878dd9783e8910e3fc2922e83c81b" -ansi-regex@^2.0.0, ansi-regex@^2.1.1: +ansi-regex@^2.0.0: version "2.1.1" resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df" @@ -282,12 +282,18 @@ ansi-styles@^2.2.1: version "2.2.1" resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe" -ansi-styles@^3.0.0, ansi-styles@^3.1.0: +ansi-styles@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.1.0.tgz#09c202d5c917ec23188caa5c9cb9179cd9547750" dependencies: color-convert "^1.0.0" +ansi-styles@^3.2.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.0.tgz#c159b8d5be0f9e5a6f346dab94f16ce022161b88" + dependencies: + color-convert "^1.9.0" + ansi@^0.3.1: version "0.3.1" resolved "https://registry.yarnpkg.com/ansi/-/ansi-0.3.1.tgz#0c42d4fb17160d5a9af1e484bace1c66922c1b21" @@ -313,16 +319,16 @@ apollo-server-core@^1.1.0: dependencies: apollo-tracing "^0.0.7" -apollo-server-express@1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/apollo-server-express/-/apollo-server-express-1.1.0.tgz#48d5027b41698c386e415cf182924c2a79da0497" +apollo-server-express@1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/apollo-server-express/-/apollo-server-express-1.1.2.tgz#6933c77fe5dfb9a7f30dd393239ad9953a613cd9" dependencies: apollo-server-core "^1.1.0" - apollo-server-module-graphiql "^1.1.0" + apollo-server-module-graphiql "^1.1.2" -apollo-server-module-graphiql@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/apollo-server-module-graphiql/-/apollo-server-module-graphiql-1.1.0.tgz#f10333e50659d61dc48e2ed6afac6f313b1f418b" +apollo-server-module-graphiql@^1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/apollo-server-module-graphiql/-/apollo-server-module-graphiql-1.1.2.tgz#49a154cf80e984acb082bd0096175b561e1bfbcc" apollo-tracing@^0.0.7: version "0.0.7" @@ -683,13 +689,12 @@ babel-helpers@^6.24.1: babel-runtime "^6.22.0" babel-template "^6.24.1" -babel-jest@20.0.3, babel-jest@^20.0.3: - version "20.0.3" - resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-20.0.3.tgz#e4a03b13dc10389e140fc645d09ffc4ced301671" +babel-jest@21.0.0, babel-jest@^21.0.0: + version "21.0.0" + resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-21.0.0.tgz#4f636a7dce105aa5753d5f3dde4422ff50c1d6c5" dependencies: - babel-core "^6.0.0" babel-plugin-istanbul "^4.0.0" - babel-preset-jest "^20.0.3" + babel-preset-jest "^21.0.0" babel-messages@^6.23.0: version "6.23.0" @@ -711,9 +716,9 @@ babel-plugin-istanbul@^4.0.0: istanbul-lib-instrument "^1.7.2" test-exclude "^4.1.1" -babel-plugin-jest-hoist@^20.0.3: - version "20.0.3" - resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-20.0.3.tgz#afedc853bd3f8dc3548ea671fbe69d03cc2c1767" +babel-plugin-jest-hoist@^21.0.0: + version "21.0.0" + resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-21.0.0.tgz#aa2dbab7b0d58fa635640efd53aab730be7b3273" babel-plugin-transform-es2015-arrow-functions@^6.22.0: version "6.22.0" @@ -947,11 +952,11 @@ babel-preset-es2015@6.24.1: babel-plugin-transform-es2015-unicode-regex "^6.24.1" babel-plugin-transform-regenerator "^6.24.1" -babel-preset-jest@^20.0.3: - version "20.0.3" - resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-20.0.3.tgz#cbacaadecb5d689ca1e1de1360ebfc66862c178a" +babel-preset-jest@^21.0.0: + version "21.0.0" + resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-21.0.0.tgz#13a8d82e999aa49f8b2dc14d0023d362f2e4ba23" dependencies: - babel-plugin-jest-hoist "^20.0.3" + babel-plugin-jest-hoist "^21.0.0" babel-register@^6.24.1: version "6.24.1" @@ -1221,12 +1226,6 @@ browser-resolve@^1.11.2: dependencies: resolve "1.1.7" -bser@1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/bser/-/bser-1.0.2.tgz#381116970b2a6deea5646dd15dd7278444b56169" - dependencies: - node-int64 "^0.4.0" - bser@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/bser/-/bser-2.0.0.tgz#9ac78d3ed5d915804fd87acb158bc797147a1719" @@ -1249,9 +1248,9 @@ builtin-modules@^1.0.0, builtin-modules@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f" -bull@3.0.0-rc.7: - version "3.0.0-rc.7" - resolved "https://registry.yarnpkg.com/bull/-/bull-3.0.0-rc.7.tgz#6e16c9fd43552045820153abbbfc03016d4ab9dd" +bull@3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/bull/-/bull-3.0.0.tgz#39e76f9b3942dfe5d4209ab49e141ecd837d9430" dependencies: bluebird "^3.5.0" cron-parser "^2.4.1" @@ -1372,6 +1371,14 @@ chalk@^2.0.0, chalk@^2.0.1: escape-string-regexp "^1.0.5" supports-color "^4.0.0" +chalk@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.1.0.tgz#ac5becf14fa21b99c6c92ca7a7d7cfd5b17e743e" + dependencies: + ansi-styles "^3.1.0" + escape-string-regexp "^1.0.5" + supports-color "^4.0.0" + character-parser@^2.1.1: version "2.2.0" resolved "https://registry.yarnpkg.com/character-parser/-/character-parser-2.2.0.tgz#c7ce28f36d4bcd9744e5ffc2c5fcde1c73261fc0" @@ -1520,7 +1527,7 @@ codemirror@*: version "5.27.4" resolved "https://registry.yarnpkg.com/codemirror/-/codemirror-5.27.4.tgz#0e817c839bfea9959dd16cd48ae14acc0e43c3b6" -color-convert@^1.0.0: +color-convert@^1.0.0, color-convert@^1.9.0: version "1.9.0" resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.0.tgz#1accf97dd739b983bf994d56fec8f95853641b7a" dependencies: @@ -1846,7 +1853,7 @@ de-indent@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/de-indent/-/de-indent-1.0.2.tgz#b2038e846dc33baa5796128d0804b455b8c1e21d" -debug@*, debug@2.6.8, debug@^2.1.1, debug@^2.1.2, debug@^2.2.0, debug@^2.3.0, debug@^2.4.5, debug@^2.6, debug@^2.6.3, debug@^2.6.8, debug@~2.6.4, debug@~2.6.6: +debug@*, debug@2.6.8, debug@^2.1.1, debug@^2.1.2, debug@^2.2.0, debug@^2.4.5, debug@^2.6, debug@^2.6.3, debug@^2.6.8, debug@~2.6.4, debug@~2.6.6: version "2.6.8" resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.8.tgz#e731531ca2ede27d188222427da17821d68ff4fc" dependencies: @@ -1864,6 +1871,12 @@ debug@2.6.7: dependencies: ms "2.0.0" +debug@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/debug/-/debug-3.0.1.tgz#0564c612b521dc92d9f2988f0549e34f9c98db64" + dependencies: + ms "2.0.0" + debug@~2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/debug/-/debug-2.2.0.tgz#f87057e995b1a1f6ae6a4960664137bc56f039da" @@ -2284,13 +2297,13 @@ eslint-scope@^3.7.1: esrecurse "^4.1.0" estraverse "^4.1.1" -eslint@4.4.1: - version "4.4.1" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-4.4.1.tgz#99cd7eafcffca2ff99a5c8f5f2a474d6364b4bd3" +eslint@4.6.1: + version "4.6.1" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-4.6.1.tgz#ddc7fc7fd70bf93205b0b3449bb16a1e9e7d4950" dependencies: ajv "^5.2.0" babel-code-frame "^6.22.0" - chalk "^1.1.3" + chalk "^2.1.0" concat-stream "^1.6.0" cross-spawn "^5.1.0" debug "^2.6.8" @@ -2321,6 +2334,7 @@ eslint@4.4.1: progress "^2.0.0" require-uncached "^1.0.3" semver "^5.3.0" + strip-ansi "^4.0.0" strip-json-comments "~2.0.1" table "^4.0.1" text-table "~0.2.0" @@ -2443,6 +2457,17 @@ expand-template@^1.0.2: version "1.0.3" resolved "https://registry.yarnpkg.com/expand-template/-/expand-template-1.0.3.tgz#6c303323177a62b1b22c070279f7861287b69b1a" +expect@^21.0.0: + version "21.0.0" + resolved "https://registry.yarnpkg.com/expect/-/expect-21.0.0.tgz#55fbb07e989479863663975ae8e9ec51753c99ca" + dependencies: + ansi-styles "^3.2.0" + jest-diff "^21.0.0" + jest-get-type "^21.0.0" + jest-matcher-utils "^21.0.0" + jest-message-util "^21.0.0" + jest-regex-util "^21.0.0" + express-brute-redis@0.0.1: version "0.0.1" resolved "https://registry.yarnpkg.com/express-brute-redis/-/express-brute-redis-0.0.1.tgz#0f4c833a5c3c2505c0c5c9ba55108e224a247ef8" @@ -2629,12 +2654,6 @@ fast-levenshtein@~2.0.4: version "2.0.6" resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917" -fb-watchman@^1.8.0: - version "1.9.2" - resolved "https://registry.yarnpkg.com/fb-watchman/-/fb-watchman-1.9.2.tgz#a24cf47827f82d38fb59a69ad70b76e3b6ae7383" - dependencies: - bser "1.0.2" - fb-watchman@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/fb-watchman/-/fb-watchman-2.0.0.tgz#54e9abf7dfa2f26cd9b1636c588c1afc05de5d58" @@ -2867,7 +2886,7 @@ fs.realpath@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" -fsevents@^1.0.0: +fsevents@^1.0.0, fsevents@^1.1.1: version "1.1.2" resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.1.2.tgz#3282b713fb3ad80ede0e9fcf4611b5aa6fc033f4" dependencies: @@ -2899,9 +2918,9 @@ functional-red-black-tree@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327" -fuse-box@2.2.2: - version "2.2.2" - resolved "https://registry.yarnpkg.com/fuse-box/-/fuse-box-2.2.2.tgz#eec3c4c49496dbfca08d43179a189fbfbce67fda" +fuse-box@2.2.3: + version "2.2.3" + resolved "https://registry.yarnpkg.com/fuse-box/-/fuse-box-2.2.3.tgz#411cc10f55329a462a5e1641d6864953e89ec79a" dependencies: acorn "^5.0.3" acorn-es7 "^0.1.0" @@ -3136,7 +3155,16 @@ graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.4, graceful-fs@^4.1.6, version "1.0.1" resolved "https://registry.yarnpkg.com/graceful-readlink/-/graceful-readlink-1.0.1.tgz#4cafad76bc62f02fa039b2f94e9a3dd3a391a725" -graphql-tools@1.2.1, graphql-tools@^1.1.0: +graphql-tools@1.2.2: + version "1.2.2" + resolved "https://registry.yarnpkg.com/graphql-tools/-/graphql-tools-1.2.2.tgz#ff791e91b78e05eec18a32716a7732bc7bf5cb4d" + dependencies: + deprecated-decorator "^0.1.6" + uuid "^3.0.1" + optionalDependencies: + "@types/graphql" "^0.9.0" + +graphql-tools@^1.1.0: version "1.2.1" resolved "https://registry.yarnpkg.com/graphql-tools/-/graphql-tools-1.2.1.tgz#8d462abaa7b0f3bb2aa633df1e7a848720197671" dependencies: @@ -3145,9 +3173,9 @@ graphql-tools@1.2.1, graphql-tools@^1.1.0: optionalDependencies: "@types/graphql" "^0.9.0" -graphql@0.10.5: - version "0.10.5" - resolved "https://registry.yarnpkg.com/graphql/-/graphql-0.10.5.tgz#c9be17ca2bdfdbd134077ffd9bbaa48b8becd298" +graphql@0.11.2: + version "0.11.2" + resolved "https://registry.yarnpkg.com/graphql/-/graphql-0.11.2.tgz#13edb9f982f3571dd68ec4e9f3d6aca7e1ba57ef" dependencies: iterall "^1.1.0" @@ -3333,9 +3361,9 @@ i18next-xhr-backend@1.4.2: version "1.4.2" resolved "https://registry.yarnpkg.com/i18next-xhr-backend/-/i18next-xhr-backend-1.4.2.tgz#7aa766292c46ca83ff6477bb55074b363a646a62" -i18next@8.4.3: - version "8.4.3" - resolved "https://registry.yarnpkg.com/i18next/-/i18next-8.4.3.tgz#36b6ff516c4f992010eedcce24a36c4609e8c7dc" +i18next@9.0.0: + version "9.0.0" + resolved "https://registry.yarnpkg.com/i18next/-/i18next-9.0.0.tgz#a89ab0481b5b6b3964f55b12f03de9063d8f4500" iconv-lite@0.4.13: version "0.4.13" @@ -3391,9 +3419,9 @@ infinity-agent@^2.0.0: version "2.0.3" resolved "https://registry.yarnpkg.com/infinity-agent/-/infinity-agent-2.0.3.tgz#45e0e2ff7a9eb030b27d62b74b3744b7a7ac4216" -inflection@1.10.0: - version "1.10.0" - resolved "https://registry.yarnpkg.com/inflection/-/inflection-1.10.0.tgz#5bffcb1197ad3e81050f8e17e21668087ee9eb2f" +inflection@1.12.0: + version "1.12.0" + resolved "https://registry.yarnpkg.com/inflection/-/inflection-1.12.0.tgz#a200935656d6f5f6bc4dc7502e1aecb703228416" inflight@^1.0.4: version "1.0.6" @@ -3809,216 +3837,230 @@ jackpot@>=0.0.6: dependencies: retry "0.6.0" -jest-changed-files@^20.0.3: - version "20.0.3" - resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-20.0.3.tgz#9394d5cc65c438406149bef1bf4d52b68e03e3f8" - -jest-cli@^20.0.4: - version "20.0.4" - resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-20.0.4.tgz#e532b19d88ae5bc6c417e8b0593a6fe954b1dc93" +jest-changed-files@^21.0.0: + version "21.0.0" + resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-21.0.0.tgz#fa7cfc353187e2fb852dd5830e8d09068dde78d1" dependencies: - ansi-escapes "^1.4.0" - callsites "^2.0.0" - chalk "^1.1.3" + throat "^4.0.0" + +jest-cli@^21.0.0: + version "21.0.0" + resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-21.0.0.tgz#25fc36badb6a78dc180a67f02c037c0209d12a98" + dependencies: + ansi-escapes "^2.0.0" + chalk "^2.0.1" + glob "^7.1.2" graceful-fs "^4.1.11" is-ci "^1.0.10" istanbul-api "^1.1.1" istanbul-lib-coverage "^1.0.1" istanbul-lib-instrument "^1.4.2" istanbul-lib-source-maps "^1.1.0" - jest-changed-files "^20.0.3" - jest-config "^20.0.4" - jest-docblock "^20.0.3" - jest-environment-jsdom "^20.0.3" - jest-haste-map "^20.0.4" - jest-jasmine2 "^20.0.4" - jest-message-util "^20.0.3" - jest-regex-util "^20.0.3" - jest-resolve-dependencies "^20.0.3" - jest-runtime "^20.0.4" - jest-snapshot "^20.0.3" - jest-util "^20.0.3" + jest-changed-files "^21.0.0" + jest-config "^21.0.0" + jest-environment-jsdom "^21.0.0" + jest-haste-map "^21.0.0" + jest-message-util "^21.0.0" + jest-regex-util "^21.0.0" + jest-resolve-dependencies "^21.0.0" + jest-runner "^21.0.0" + jest-runtime "^21.0.0" + jest-snapshot "^21.0.0" + jest-util "^21.0.0" micromatch "^2.3.11" node-notifier "^5.0.2" pify "^2.3.0" slash "^1.0.0" string-length "^1.0.1" - throat "^3.0.0" + strip-ansi "^4.0.0" which "^1.2.12" worker-farm "^1.3.1" yargs "^7.0.2" -jest-config@^20.0.4: - version "20.0.4" - resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-20.0.4.tgz#e37930ab2217c913605eff13e7bd763ec48faeea" +jest-config@^21.0.0: + version "21.0.0" + resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-21.0.0.tgz#81dcb20d15971f31bf44a82c6fe85b4423d98d95" dependencies: - chalk "^1.1.3" + chalk "^2.0.1" glob "^7.1.1" - jest-environment-jsdom "^20.0.3" - jest-environment-node "^20.0.3" - jest-jasmine2 "^20.0.4" - jest-matcher-utils "^20.0.3" - jest-regex-util "^20.0.3" - jest-resolve "^20.0.4" - jest-validate "^20.0.3" - pretty-format "^20.0.3" + jest-environment-jsdom "^21.0.0" + jest-environment-node "^21.0.0" + jest-get-type "^21.0.0" + jest-jasmine2 "^21.0.0" + jest-regex-util "^21.0.0" + jest-resolve "^21.0.0" + jest-util "^21.0.0" + jest-validate "^21.0.0" + pretty-format "^21.0.0" -jest-diff@^20.0.3: - version "20.0.3" - resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-20.0.3.tgz#81f288fd9e675f0fb23c75f1c2b19445fe586617" +jest-diff@^21.0.0: + version "21.0.0" + resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-21.0.0.tgz#b996ba2963a783125e6bc59fd5623bce67df7f17" dependencies: - chalk "^1.1.3" + chalk "^2.0.1" diff "^3.2.0" - jest-matcher-utils "^20.0.3" - pretty-format "^20.0.3" + jest-get-type "^21.0.0" + pretty-format "^21.0.0" -jest-docblock@^20.0.3: - version "20.0.3" - resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-20.0.3.tgz#17bea984342cc33d83c50fbe1545ea0efaa44712" +jest-docblock@^21.0.0: + version "21.0.0" + resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-21.0.0.tgz#7dd57568543aec98910f749540afc15fab53a27f" -jest-environment-jsdom@^20.0.3: - version "20.0.3" - resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-20.0.3.tgz#048a8ac12ee225f7190417713834bb999787de99" +jest-environment-jsdom@^21.0.0: + version "21.0.0" + resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-21.0.0.tgz#1d53e34b1656254b8c539700e35360d8f8ebb579" dependencies: - jest-mock "^20.0.3" - jest-util "^20.0.3" + jest-mock "^21.0.0" + jest-util "^21.0.0" jsdom "^9.12.0" -jest-environment-node@^20.0.3: - version "20.0.3" - resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-20.0.3.tgz#d488bc4612af2c246e986e8ae7671a099163d403" +jest-environment-node@^21.0.0: + version "21.0.0" + resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-21.0.0.tgz#ffc781b82569f3f4bc2d8fb8f1ea7373cb11f043" dependencies: - jest-mock "^20.0.3" - jest-util "^20.0.3" + jest-mock "^21.0.0" + jest-util "^21.0.0" -jest-haste-map@^20.0.4: - version "20.0.5" - resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-20.0.5.tgz#abad74efb1a005974a7b6517e11010709cab9112" +jest-get-type@^21.0.0: + version "21.0.0" + resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-21.0.0.tgz#ed8667533c0a24a4feebbf492661f23abac3620b" + +jest-haste-map@^21.0.0: + version "21.0.0" + resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-21.0.0.tgz#1f099ff6aedb52ec55fa9773ce26e4bbb00b0580" dependencies: fb-watchman "^2.0.0" graceful-fs "^4.1.11" - jest-docblock "^20.0.3" + jest-docblock "^21.0.0" micromatch "^2.3.11" - sane "~1.6.0" + sane "^2.0.0" worker-farm "^1.3.1" -jest-jasmine2@^20.0.4: - version "20.0.4" - resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-20.0.4.tgz#fcc5b1411780d911d042902ef1859e852e60d5e1" +jest-jasmine2@^21.0.0: + version "21.0.0" + resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-21.0.0.tgz#539725989e45ab0b00029fcf37bc679aa39c2941" dependencies: - chalk "^1.1.3" + chalk "^2.0.1" + expect "^21.0.0" graceful-fs "^4.1.11" - jest-diff "^20.0.3" - jest-matcher-utils "^20.0.3" - jest-matchers "^20.0.3" - jest-message-util "^20.0.3" - jest-snapshot "^20.0.3" - once "^1.4.0" - p-map "^1.1.1" + jest-diff "^21.0.0" + jest-matcher-utils "^21.0.0" + jest-message-util "^21.0.0" + jest-snapshot "^21.0.0" + p-cancelable "^0.3.0" -jest-matcher-utils@^20.0.3: - version "20.0.3" - resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-20.0.3.tgz#b3a6b8e37ca577803b0832a98b164f44b7815612" +jest-matcher-utils@^21.0.0: + version "21.0.0" + resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-21.0.0.tgz#493dc25b9ed6a23a61802ca20656f0f1c16f15b1" dependencies: - chalk "^1.1.3" - pretty-format "^20.0.3" + chalk "^2.0.1" + jest-get-type "^21.0.0" + pretty-format "^21.0.0" -jest-matchers@^20.0.3: - version "20.0.3" - resolved "https://registry.yarnpkg.com/jest-matchers/-/jest-matchers-20.0.3.tgz#ca69db1c32db5a6f707fa5e0401abb55700dfd60" +jest-message-util@^21.0.0: + version "21.0.0" + resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-21.0.0.tgz#cd49c2e91d7a227e622884c418185a1a7cbe1fd6" dependencies: - jest-diff "^20.0.3" - jest-matcher-utils "^20.0.3" - jest-message-util "^20.0.3" - jest-regex-util "^20.0.3" - -jest-message-util@^20.0.3: - version "20.0.3" - resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-20.0.3.tgz#6aec2844306fcb0e6e74d5796c1006d96fdd831c" - dependencies: - chalk "^1.1.3" + chalk "^2.0.1" micromatch "^2.3.11" slash "^1.0.0" -jest-mock@^20.0.3: - version "20.0.3" - resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-20.0.3.tgz#8bc070e90414aa155c11a8d64c869a0d5c71da59" +jest-mock@^21.0.0: + version "21.0.0" + resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-21.0.0.tgz#948fdbb44ef702ca998e078ca62b4968780e102e" -jest-regex-util@^20.0.3: - version "20.0.3" - resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-20.0.3.tgz#85bbab5d133e44625b19faf8c6aa5122d085d762" +jest-regex-util@^21.0.0: + version "21.0.0" + resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-21.0.0.tgz#f13c382a1c55515c20471390ab38e5d71cbd320e" -jest-resolve-dependencies@^20.0.3: - version "20.0.3" - resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-20.0.3.tgz#6e14a7b717af0f2cb3667c549de40af017b1723a" +jest-resolve-dependencies@^21.0.0: + version "21.0.0" + resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-21.0.0.tgz#09dfd9654a8af92880a2f66076871d48810bd48d" dependencies: - jest-regex-util "^20.0.3" + jest-regex-util "^21.0.0" -jest-resolve@^20.0.4: - version "20.0.4" - resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-20.0.4.tgz#9448b3e8b6bafc15479444c6499045b7ffe597a5" +jest-resolve@^21.0.0: + version "21.0.0" + resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-21.0.0.tgz#04d3939203633cc57ae8219b34ad42687dd8d111" dependencies: browser-resolve "^1.11.2" + chalk "^2.0.1" is-builtin-module "^1.0.0" - resolve "^1.3.2" -jest-runtime@^20.0.4: - version "20.0.4" - resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-20.0.4.tgz#a2c802219c4203f754df1404e490186169d124d8" +jest-runner@^21.0.0: + version "21.0.0" + resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-21.0.0.tgz#8969dd22ff73911c84043cf16b6cfadf609f3d1f" + dependencies: + jest-config "^21.0.0" + jest-docblock "^21.0.0" + jest-haste-map "^21.0.0" + jest-jasmine2 "^21.0.0" + jest-message-util "^21.0.0" + jest-runtime "^21.0.0" + jest-util "^21.0.0" + pify "^2.3.0" + throat "^3.0.0" + worker-farm "^1.3.1" + +jest-runtime@^21.0.0: + version "21.0.0" + resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-21.0.0.tgz#54af290dc664a49ddc251c7d7ce1a5661afc1ead" dependencies: babel-core "^6.0.0" - babel-jest "^20.0.3" + babel-jest "^21.0.0" babel-plugin-istanbul "^4.0.0" - chalk "^1.1.3" + chalk "^2.0.1" convert-source-map "^1.4.0" graceful-fs "^4.1.11" - jest-config "^20.0.4" - jest-haste-map "^20.0.4" - jest-regex-util "^20.0.3" - jest-resolve "^20.0.4" - jest-util "^20.0.3" + jest-config "^21.0.0" + jest-haste-map "^21.0.0" + jest-regex-util "^21.0.0" + jest-resolve "^21.0.0" + jest-util "^21.0.0" json-stable-stringify "^1.0.1" micromatch "^2.3.11" + slash "^1.0.0" strip-bom "3.0.0" + write-file-atomic "^2.1.0" yargs "^7.0.2" -jest-snapshot@^20.0.3: - version "20.0.3" - resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-20.0.3.tgz#5b847e1adb1a4d90852a7f9f125086e187c76566" +jest-snapshot@^21.0.0: + version "21.0.0" + resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-21.0.0.tgz#00b582b13ef42112bd431b498e37f7829b30cd66" dependencies: - chalk "^1.1.3" - jest-diff "^20.0.3" - jest-matcher-utils "^20.0.3" - jest-util "^20.0.3" + chalk "^2.0.1" + jest-diff "^21.0.0" + jest-matcher-utils "^21.0.0" + mkdirp "^0.5.1" natural-compare "^1.4.0" - pretty-format "^20.0.3" + pretty-format "^21.0.0" -jest-util@^20.0.3: - version "20.0.3" - resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-20.0.3.tgz#0c07f7d80d82f4e5a67c6f8b9c3fe7f65cfd32ad" +jest-util@^21.0.0: + version "21.0.0" + resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-21.0.0.tgz#62b3a3ec3ff91022ef7e1ffbcf3293424715919f" dependencies: - chalk "^1.1.3" + callsites "^2.0.0" + chalk "^2.0.1" graceful-fs "^4.1.11" - jest-message-util "^20.0.3" - jest-mock "^20.0.3" - jest-validate "^20.0.3" - leven "^2.1.0" + jest-message-util "^21.0.0" + jest-mock "^21.0.0" + jest-validate "^21.0.0" mkdirp "^0.5.1" -jest-validate@^20.0.3: - version "20.0.3" - resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-20.0.3.tgz#d0cfd1de4f579f298484925c280f8f1d94ec3cab" +jest-validate@^21.0.0: + version "21.0.0" + resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-21.0.0.tgz#f906d54eca2a485ffbfb2d8a7d58831c026e6dd5" dependencies: - chalk "^1.1.3" - jest-matcher-utils "^20.0.3" + chalk "^2.0.1" + jest-get-type "^21.0.0" leven "^2.1.0" - pretty-format "^20.0.3" + pretty-format "^21.0.0" -jest@20.0.4: - version "20.0.4" - resolved "https://registry.yarnpkg.com/jest/-/jest-20.0.4.tgz#3dd260c2989d6dad678b1e9cc4d91944f6d602ac" +jest@21.0.0: + version "21.0.0" + resolved "https://registry.yarnpkg.com/jest/-/jest-21.0.0.tgz#6b1536b73ea1a4fa2f0904d26f32949c39cf4690" dependencies: - jest-cli "^20.0.4" + jest-cli "^21.0.0" jimp@0.2.28: version "0.2.28" @@ -4712,9 +4754,9 @@ markdown-it-anchor@4.0.0: dependencies: string "^3.3.3" -markdown-it-attrs@1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/markdown-it-attrs/-/markdown-it-attrs-1.0.0.tgz#31698fbec4c54fb0cbac6e344ada6f02d682a4a1" +markdown-it-attrs@1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/markdown-it-attrs/-/markdown-it-attrs-1.1.0.tgz#6f5c7bc8d0c29e628ef335bcc1e0bf454d204f5d" markdown-it-emoji@1.4.0: version "1.4.0" @@ -4742,9 +4784,9 @@ markdown-it-task-lists@2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/markdown-it-task-lists/-/markdown-it-task-lists-2.0.1.tgz#a9ce7f55cde9f45e0fca629071d11d3fd5a69416" -markdown-it@8.3.2: - version "8.3.2" - resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-8.3.2.tgz#df4b86530d17c3bc9beec3b68d770b92ea17ae96" +markdown-it@8.4.0: + version "8.4.0" + resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-8.4.0.tgz#e2400881bf171f7018ed1bd9da441dac8af6306d" dependencies: argparse "^1.0.7" entities "~1.1.1" @@ -4756,9 +4798,9 @@ marked@*: version "0.3.6" resolved "https://registry.yarnpkg.com/marked/-/marked-0.3.6.tgz#b2c6c618fccece4ef86c4fc6cb8a7cbf5aeda8d7" -mathjax-node@1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/mathjax-node/-/mathjax-node-1.1.1.tgz#c9cb4c4d55f08e5116c9c49d01a8d226404a0405" +mathjax-node@1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/mathjax-node/-/mathjax-node-1.2.0.tgz#538d01f85ca18b90f3cc6ce68c7caeed44bb9f7f" dependencies: jsdom "7.0 - 9.12" mathjax "*" @@ -4843,7 +4885,7 @@ micromatch@^2.1.5, micromatch@^2.3.11: parse-glob "^3.0.4" regex-cache "^0.4.2" -"mime-db@>= 1.27.0 < 2", mime-db@~1.29.0: +"mime-db@>= 1.27.0 < 2": version "1.29.0" resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.29.0.tgz#48d26d235589651704ac5916ca06001914266878" @@ -4851,11 +4893,15 @@ mime-db@~1.27.0: version "1.27.0" resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.27.0.tgz#820f572296bbd20ec25ed55e5b5de869e5436eb1" -mime-types@2.1.16: - version "2.1.16" - resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.16.tgz#2b858a52e5ecd516db897ac2be87487830698e23" +mime-db@~1.30.0: + version "1.30.0" + resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.30.0.tgz#74c643da2dd9d6a45399963465b26d5ca7d71f01" + +mime-types@2.1.17: + version "2.1.17" + resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.17.tgz#09d7a393f03e995a79f8af857b70a9e0ab16557a" dependencies: - mime-db "~1.29.0" + mime-db "~1.30.0" mime-types@^2.1.12, mime-types@~2.1.11, mime-types@~2.1.15, mime-types@~2.1.6, mime-types@~2.1.7: version "2.1.15" @@ -5371,10 +5417,6 @@ p-locate@^2.0.0: dependencies: p-limit "^1.1.0" -p-map@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/p-map/-/p-map-1.1.1.tgz#05f5e4ae97a068371bc2a5cc86bfbdbc19c4ae7a" - p-timeout@^1.1.1: version "1.2.0" resolved "https://registry.yarnpkg.com/p-timeout/-/p-timeout-1.2.0.tgz#9820f99434c5817868b4f34809ee5291660d5b6c" @@ -5648,13 +5690,13 @@ pg-pool@1.*: generic-pool "2.4.3" object-assign "4.1.0" -pg-pool@2.*: - version "2.0.1" - resolved "https://registry.yarnpkg.com/pg-pool/-/pg-pool-2.0.1.tgz#8b12541df271b57f7020c50a3f5566471f82c77e" +pg-pool@~2.0.3: + version "2.0.3" + resolved "https://registry.yarnpkg.com/pg-pool/-/pg-pool-2.0.3.tgz#c022032c8949f312a4f91fb6409ce04076be3257" -pg-promise@6.5.0: - version "6.5.0" - resolved "https://registry.yarnpkg.com/pg-promise/-/pg-promise-6.5.0.tgz#ffcf1dbb2957700ddb9f2c6dd7c647d714a11ee6" +pg-promise@6.5.1: + version "6.5.1" + resolved "https://registry.yarnpkg.com/pg-promise/-/pg-promise-6.5.1.tgz#d71d262978ea5a8e9ea9be1325e25e4841201c30" dependencies: manakin "~0.5.1" pg "~6.4.2" @@ -5671,16 +5713,25 @@ pg-types@1.*: postgres-date "~1.0.0" postgres-interval "^1.1.0" -pg@7.1.2: - version "7.1.2" - resolved "https://registry.yarnpkg.com/pg/-/pg-7.1.2.tgz#5dce20f3ed680651444dc311061d719cc920c3d8" +pg-types@~1.12.1: + version "1.12.1" + resolved "https://registry.yarnpkg.com/pg-types/-/pg-types-1.12.1.tgz#d64087e3903b58ffaad279e7595c52208a14c3d2" + dependencies: + postgres-array "~1.0.0" + postgres-bytea "~1.0.0" + postgres-date "~1.0.0" + postgres-interval "^1.1.0" + +pg@7.3.0: + version "7.3.0" + resolved "https://registry.yarnpkg.com/pg/-/pg-7.3.0.tgz#275e27466e54a645f6b4a16f6acadf6b849ad83b" dependencies: buffer-writer "1.0.1" js-string-escape "1.0.1" packet-reader "0.3.1" pg-connection-string "0.1.3" - pg-pool "2.*" - pg-types "1.*" + pg-pool "~2.0.3" + pg-types "~1.12.1" pgpass "1.x" semver "4.3.2" @@ -5881,12 +5932,12 @@ preserve@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b" -pretty-format@^20.0.3: - version "20.0.3" - resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-20.0.3.tgz#020e350a560a1fe1a98dc3beb6ccffb386de8b14" +pretty-format@^21.0.0: + version "21.0.0" + resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-21.0.0.tgz#bea1522c4c47e49b44db5b6fbf83e7737251f305" dependencies: - ansi-regex "^2.1.1" - ansi-styles "^3.0.0" + ansi-regex "^3.0.0" + ansi-styles "^3.2.0" pretty-time@^0.2.0: version "0.2.0" @@ -6034,9 +6085,9 @@ pug-linker@^3.0.2: pug-error "^1.3.2" pug-walk "^1.1.4" -pug-lint@2.4.0: - version "2.4.0" - resolved "https://registry.yarnpkg.com/pug-lint/-/pug-lint-2.4.0.tgz#1f584c1624fac48e5a0d03e40823caef736702e0" +pug-lint@2.5.0: + version "2.5.0" + resolved "https://registry.yarnpkg.com/pug-lint/-/pug-lint-2.5.0.tgz#4419ee301aeca45f54061b0eca4a9a471f3aa9a9" dependencies: acorn "^4.0.1" commander "^2.9.0" @@ -6421,7 +6472,7 @@ resolve@1.1.7: version "1.1.7" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b" -resolve@^1.1.6, resolve@^1.1.7, resolve@^1.2.0, resolve@^1.3.2, resolve@^1.3.3: +resolve@^1.1.6, resolve@^1.1.7, resolve@^1.2.0, resolve@^1.3.3: version "1.3.3" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.3.3.tgz#655907c3469a8680dc2de3a275a8fdd69691f0e5" dependencies: @@ -6496,17 +6547,19 @@ safe-json-stringify@~1: version "1.0.4" resolved "https://registry.yarnpkg.com/safe-json-stringify/-/safe-json-stringify-1.0.4.tgz#81a098f447e4bbc3ff3312a243521bc060ef5911" -sane@~1.6.0: - version "1.6.0" - resolved "https://registry.yarnpkg.com/sane/-/sane-1.6.0.tgz#9610c452307a135d29c1fdfe2547034180c46775" +sane@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/sane/-/sane-2.0.0.tgz#99cb79f21f4a53a69d4d0cd957c2db04024b8eb2" dependencies: anymatch "^1.3.0" exec-sh "^0.2.0" - fb-watchman "^1.8.0" + fb-watchman "^2.0.0" minimatch "^3.0.2" minimist "^1.1.1" walker "~1.0.5" watch "~0.10.0" + optionalDependencies: + fsevents "^1.1.1" sass-graph@^2.1.1: version "2.2.4" @@ -6654,17 +6707,17 @@ send@0.15.4: range-parser "~1.2.0" statuses "~1.3.1" -sequelize@4.5.0: - version "4.5.0" - resolved "https://registry.yarnpkg.com/sequelize/-/sequelize-4.5.0.tgz#d8a5b1b641728890fa96761b1704203e7ae30ebb" +sequelize@4.8.0: + version "4.8.0" + resolved "https://registry.yarnpkg.com/sequelize/-/sequelize-4.8.0.tgz#1987a97deceb749da7e25cd27059adb69dbf81c2" dependencies: bluebird "^3.4.6" cls-bluebird "^2.0.1" - debug "^2.3.0" + debug "^3.0.0" depd "^1.1.0" dottie "^2.0.0" generic-pool "^3.1.6" - inflection "1.10.0" + inflection "1.12.0" lodash "^4.17.1" moment "^2.13.0" moment-timezone "^0.5.4" @@ -6673,7 +6726,7 @@ sequelize@4.5.0: terraformer-wkt-parser "^1.1.2" toposort-class "^1.0.1" uuid "^3.0.0" - validator "^6.3.0" + validator "^8.0.0" wkx "^0.4.1" serve-favicon@2.4.3: @@ -7125,9 +7178,9 @@ tar-stream@^1.1.2: readable-stream "^2.0.0" xtend "^4.0.0" -tar@4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/tar/-/tar-4.0.0.tgz#aa7d58cfb750cc919d9da1d3319f9ccabac339e0" +tar@4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/tar/-/tar-4.0.1.tgz#3f5b2e5289db30c2abe4c960f43d0d9fff96aaf0" dependencies: chownr "^1.0.1" minipass "^2.0.2" @@ -7194,6 +7247,10 @@ throat@^3.0.0: version "3.2.0" resolved "https://registry.yarnpkg.com/throat/-/throat-3.2.0.tgz#50cb0670edbc40237b9e347d7e1f88e4620af836" +throat@^4.0.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/throat/-/throat-4.1.0.tgz#89037cbc92c56ab18926e6ba4cbb200e15672a6a" + through2@2.0.3: version "2.0.3" resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.3.tgz#0004569b37c7c74ba39c43f3ced78d1ad94140be" @@ -7326,9 +7383,9 @@ typedarray@^0.0.6: version "0.0.6" resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" -typescript@2.4.2: - version "2.4.2" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.4.2.tgz#f8395f85d459276067c988aa41837a8f82870844" +typescript@2.5.2: + version "2.5.2" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.5.2.tgz#038a95f7d9bbb420b1bf35ba31d4c5c1dd3ffe34" typical@^2.6.0, typical@^2.6.1: version "2.6.1" @@ -7342,9 +7399,9 @@ uc.micro@^1.0.1, uc.micro@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/uc.micro/-/uc.micro-1.0.3.tgz#7ed50d5e0f9a9fb0a573379259f2a77458d50192" -uglify-es@3.0.27: - version "3.0.27" - resolved "https://registry.yarnpkg.com/uglify-es/-/uglify-es-3.0.27.tgz#391790388f369196be23a49caeb0d5c424fa774e" +uglify-es@3.0.28: + version "3.0.28" + resolved "https://registry.yarnpkg.com/uglify-es/-/uglify-es-3.0.28.tgz#1cdedbbcdb7865223065281ad7b2347629851d4b" dependencies: commander "~2.11.0" source-map "~0.5.1" @@ -7507,18 +7564,14 @@ validator-as-promised@1.0.2: lodash "^4.14.0" validator "^5.5.0" -validator@8.0.0: - version "8.0.0" - resolved "https://registry.yarnpkg.com/validator/-/validator-8.0.0.tgz#00d6ec230ab5d3353ab1174162a96462b947bdbd" +validator@8.1.0, validator@^8.0.0: + version "8.1.0" + resolved "https://registry.yarnpkg.com/validator/-/validator-8.1.0.tgz#89cf6b512ff71eba886afd8d10d47f8dc800eac0" validator@^5.5.0: version "5.7.0" resolved "https://registry.yarnpkg.com/validator/-/validator-5.7.0.tgz#7a87a58146b695ac486071141c0c49d67da05e5c" -validator@^6.3.0: - version "6.3.0" - resolved "https://registry.yarnpkg.com/validator/-/validator-6.3.0.tgz#47ce23ed8d4eaddfa9d4b8ef0071b6cf1078d7c8" - vary@^1, vary@~1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.1.tgz#67535ebb694c1d52257457984665323f587e8d37" @@ -7533,9 +7586,9 @@ vasync@^1.6.4: dependencies: verror "1.6.0" -vee-validate@2.0.0-rc.13: - version "2.0.0-rc.13" - resolved "https://registry.yarnpkg.com/vee-validate/-/vee-validate-2.0.0-rc.13.tgz#b2aadf729c277d7a908bec5d71169d02c54b7890" +vee-validate@2.0.0-rc.14: + version "2.0.0-rc.14" + resolved "https://registry.yarnpkg.com/vee-validate/-/vee-validate-2.0.0-rc.14.tgz#ecbd3ddff33fa6a42ebb4a468c343e1eb5d2b38f" verror@1.3.6: version "1.3.6" @@ -7598,9 +7651,9 @@ vue@2.4.2: version "2.4.2" resolved "https://registry.yarnpkg.com/vue/-/vue-2.4.2.tgz#a9855261f191c978cc0dc1150531b8d08149b58c" -vuex@2.3.1: - version "2.3.1" - resolved "https://registry.yarnpkg.com/vuex/-/vuex-2.3.1.tgz#cde8e997c1f9957719bc7dea154f9aa691d981a6" +vuex@2.4.0: + version "2.4.0" + resolved "https://registry.yarnpkg.com/vuex/-/vuex-2.4.0.tgz#e1d0430646282b40007fdd06ec6ae88a9f5a1e14" vxx@^1.2.0: version "1.2.2" @@ -7759,6 +7812,14 @@ write-file-atomic@^1.1.2: imurmurhash "^0.1.4" slide "^1.1.5" +write-file-atomic@^2.1.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-2.3.0.tgz#1ff61575c2e2a4e8e510d6fa4e243cce183999ab" + dependencies: + graceful-fs "^4.1.11" + imurmurhash "^0.1.4" + signal-exit "^3.0.2" + write@^0.2.1: version "0.2.1" resolved "https://registry.yarnpkg.com/write/-/write-0.2.1.tgz#5fc03828e264cea3fe91455476f7a3c566cb0757"