Skip to content

W
wiki-js
Commit f142bcfd authored by Nick's avatar Nick
Browse files
Options

misc: updated dependencies

parent c530c15b
Show whitespace changes
Inline Side-by-side
Showing with 67 additions and 118 deletions
client/client-app.js
View file @ f142bcfd
...@@ -8,7 +8,6 @@ import { ApolloClient } from 'apollo-client' ...@@ -8,7 +8,6 @@ import { ApolloClient } from 'apollo-client'
import { BatchHttpLink } from 'apollo-link-batch-http' import { BatchHttpLink } from 'apollo-link-batch-http'
import { ApolloLink, split } from 'apollo-link' import { ApolloLink, split } from 'apollo-link'
import { WebSocketLink } from 'apollo-link-ws' import { WebSocketLink } from 'apollo-link-ws'
import { createUploadLink } from 'apollo-upload-client'
import { ErrorLink } from 'apollo-link-error' import { ErrorLink } from 'apollo-link-error'
import { InMemoryCache } from 'apollo-cache-inmemory' import { InMemoryCache } from 'apollo-cache-inmemory'
import { getMainDefinition } from 'apollo-utilities' import { getMainDefinition } from 'apollo-utilities'
...@@ -55,33 +54,6 @@ store.commit('user/REFRESH_AUTH') ...@@ -55,33 +54,6 @@ store.commit('user/REFRESH_AUTH')
const graphQLEndpoint = window.location.protocol + '//' + window.location.host + '/graphql' const graphQLEndpoint = window.location.protocol + '//' + window.location.host + '/graphql'
const graphQLWSEndpoint = ((window.location.protocol === 'https:') ? 'wss:' : 'ws:') + '//' + window.location.host + '/graphql-subscriptions' const graphQLWSEndpoint = ((window.location.protocol === 'https:') ? 'wss:' : 'ws:') + '//' + window.location.host + '/graphql-subscriptions'
const graphQLFetch = async (uri, options) => {
// Strip __typename fields from variables
let body = JSON.parse(options.body)
body = body.map(bd => {
return ({
...bd,
variables: JSON.parse(JSON.stringify(bd.variables), (key, value) => { return key === '__typename' ? undefined : value })
})
})
options.body = JSON.stringify(body)
// Inject authentication token
const jwtToken = Cookies.get('jwt')
if (jwtToken) {
options.headers.Authorization = `Bearer ${jwtToken}`
}
const resp = await fetch(uri, options)
// Handle renewed JWT
const newJWT = resp.headers.get('new-jwt')
if (newJWT) {
Cookies.set('jwt', newJWT, { expires: 365 })
}
return resp
}
const graphQLLink = ApolloLink.from([ const graphQLLink = ApolloLink.from([
new ErrorLink(({ graphQLErrors, networkError }) => { new ErrorLink(({ graphQLErrors, networkError }) => {
if (graphQLErrors) { if (graphQLErrors) {
...@@ -138,28 +110,6 @@ const graphQLLink = ApolloLink.from([ ...@@ -138,28 +110,6 @@ const graphQLLink = ApolloLink.from([
}) })
]) ])
const graphQLUploadLink = createUploadLink({
includeExtensions: true,
uri: graphQLEndpoint,
credentials: 'include',
fetch: async (uri, options) => {
// Inject authentication token
const jwtToken = Cookies.get('jwt')
if (jwtToken) {
options.headers.Authorization = `Bearer ${jwtToken}`
}
const resp = await fetch(uri, options)
// Handle renewed JWT
const newJWT = resp.headers.get('new-jwt')
if (newJWT) {
Cookies.set('jwt', newJWT, { expires: 365 })
}
return resp
}
})
const graphQLWSLink = new WebSocketLink({ const graphQLWSLink = new WebSocketLink({
uri: graphQLWSEndpoint, uri: graphQLWSEndpoint,
options: { options: {
...@@ -172,7 +122,7 @@ window.graphQL = new ApolloClient({ ...@@ -172,7 +122,7 @@ window.graphQL = new ApolloClient({
link: split(({ query }) => { link: split(({ query }) => {
const { kind, operation } = getMainDefinition(query) const { kind, operation } = getMainDefinition(query)
return kind === 'OperationDefinition' && operation === 'subscription' return kind === 'OperationDefinition' && operation === 'subscription'
}, graphQLWSLink, split(operation => operation.getContext().hasUpload, graphQLUploadLink, graphQLLink)), }, graphQLWSLink, graphQLLink),
cache: new InMemoryCache(), cache: new InMemoryCache(),
connectToDevTools: (process.env.node_env === 'development') connectToDevTools: (process.env.node_env === 'development')
}) })
......
dev/webpack/webpack.dev.js
View file @ f142bcfd
...@@ -194,7 +194,7 @@ module.exports = { ...@@ -194,7 +194,7 @@ module.exports = {
filename: '../server/views/master.pug', filename: '../server/views/master.pug',
hash: false, hash: false,
inject: false, inject: false,
excludeChunks : ['setup'] excludeChunks: ['setup']
}), }),
new HtmlWebpackPlugin({ new HtmlWebpackPlugin({
template: 'dev/templates/setup.pug', template: 'dev/templates/setup.pug',
......
package.json
View file @ f142bcfd
...@@ -38,21 +38,21 @@ ...@@ -38,21 +38,21 @@
}, },
"dependencies": { "dependencies": {
"@aoberoi/passport-slack": "1.0.5", "@aoberoi/passport-slack": "1.0.5",
"@bugsnag/js": "6.2.0", "@bugsnag/js": "6.3.0",
"algoliasearch": "3.32.1", "algoliasearch": "3.33.0",
"apollo-fetch": "0.7.0", "apollo-fetch": "0.7.0",
"apollo-server": "2.4.8", "apollo-server": "2.5.1",
"apollo-server-express": "2.4.8", "apollo-server-express": "2.5.1",
"auto-load": "3.0.4", "auto-load": "3.0.4",
"aws-sdk": "2.444.0", "aws-sdk": "2.466.0",
"axios": "0.18.0", "axios": "0.19.0",
"azure-search-client": "3.1.5", "azure-search-client": "3.1.5",
"bcryptjs-then": "1.0.1", "bcryptjs-then": "1.0.1",
"bluebird": "3.5.4", "bluebird": "3.5.5",
"body-parser": "1.19.0", "body-parser": "1.19.0",
"chalk": "2.4.2", "chalk": "2.4.2",
"cheerio": "1.0.0-rc.3", "cheerio": "1.0.0-rc.3",
"chokidar": "2.1.5", "chokidar": "3.0.0",
"clean-css": "4.2.1", "clean-css": "4.2.1",
"compression": "1.7.4", "compression": "1.7.4",
"connect-session-knex": "1.4.0", "connect-session-knex": "1.4.0",
...@@ -61,24 +61,24 @@ ...@@ -61,24 +61,24 @@
"custom-error-instance": "2.1.1", "custom-error-instance": "2.1.1",
"dependency-graph": "0.8.0", "dependency-graph": "0.8.0",
"diff": "4.0.1", "diff": "4.0.1",
"diff2html": "2.7.0", "diff2html": "2.9.0",
"dotize": "0.3.0", "dotize": "0.3.0",
"elasticsearch": "15.4.1", "elasticsearch": "16.1.0",
"emoji-regex": "8.0.0", "emoji-regex": "8.0.0",
"express": "4.16.4", "express": "4.17.1",
"express-brute": "1.0.1", "express-brute": "1.0.1",
"express-session": "1.16.1", "express-session": "1.16.1",
"file-type": "10.11.0", "file-type": "11.1.0",
"filesize": "4.1.2", "filesize": "4.1.2",
"fs-extra": "7.0.1", "fs-extra": "8.0.1",
"getos": "3.1.1", "getos": "3.1.1",
"graphql": "14.2.1", "graphql": "14.3.1",
"graphql-list-fields": "2.0.2", "graphql-list-fields": "2.0.2",
"graphql-rate-limit-directive": "1.0.1", "graphql-rate-limit-directive": "1.1.0",
"graphql-subscriptions": "1.1.0", "graphql-subscriptions": "1.1.0",
"graphql-tools": "4.0.4", "graphql-tools": "4.0.4",
"highlight.js": "9.15.6", "highlight.js": "9.15.8",
"i18next": "15.1.0", "i18next": "15.1.3",
"i18next-express-middleware": "1.8.0", "i18next-express-middleware": "1.8.0",
"i18next-localstorage-cache": "1.1.1", "i18next-localstorage-cache": "1.1.1",
"i18next-node-fs-backend": "2.1.3", "i18next-node-fs-backend": "2.1.3",
...@@ -88,12 +88,12 @@ ...@@ -88,12 +88,12 @@
"js-yaml": "3.13.1", "js-yaml": "3.13.1",
"jsonwebtoken": "8.5.1", "jsonwebtoken": "8.5.1",
"klaw": "3.0.0", "klaw": "3.0.0",
"knex": "0.16.5", "knex": "0.17.1",
"lodash": "4.17.11", "lodash": "4.17.11",
"markdown-it": "8.4.2", "markdown-it": "8.4.2",
"markdown-it-abbr": "1.0.4", "markdown-it-abbr": "1.0.4",
"markdown-it-anchor": "5.0.2", "markdown-it-anchor": "5.2.3",
"markdown-it-attrs": "2.3.3", "markdown-it-attrs": "2.4.1",
"markdown-it-emoji": "1.4.0", "markdown-it-emoji": "1.4.0",
"markdown-it-expand-tabs": "1.0.13", "markdown-it-expand-tabs": "1.0.13",
"markdown-it-external-links": "0.0.6", "markdown-it-external-links": "0.0.6",
...@@ -108,15 +108,15 @@ ...@@ -108,15 +108,15 @@
"mime-types": "2.1.24", "mime-types": "2.1.24",
"moment": "2.24.0", "moment": "2.24.0",
"moment-timezone": "0.5.25", "moment-timezone": "0.5.25",
"mongodb": "3.2.3", "mongodb": "3.2.6",
"mssql": "5.1.0", "mssql": "5.1.0",
"multer": "1.4.1", "multer": "1.4.1",
"mysql2": "1.6.5", "mysql2": "1.6.5",
"nanoid": "2.0.1", "nanoid": "2.0.3",
"node-2fa": "1.1.2", "node-2fa": "1.1.2",
"node-cache": "4.2.0", "node-cache": "4.2.0",
"nodemailer": "6.1.1", "nodemailer": "6.2.1",
"objection": "1.6.8", "objection": "1.6.9",
"passport": "0.4.0", "passport": "0.4.0",
"passport-auth0": "1.1.0", "passport-auth0": "1.1.0",
"passport-azure-ad-oauth2": "0.0.4", "passport-azure-ad-oauth2": "0.0.4",
...@@ -133,10 +133,10 @@ ...@@ -133,10 +133,10 @@
"passport-oauth2": "1.5.0", "passport-oauth2": "1.5.0",
"passport-okta-oauth": "0.0.1", "passport-okta-oauth": "0.0.1",
"passport-openidconnect": "0.0.2", "passport-openidconnect": "0.0.2",
"passport-saml": "1.0.0", "passport-saml": "1.1.0",
"passport-twitch": "1.0.3", "passport-twitch": "1.0.3",
"pem-jwk": "2.0.0", "pem-jwk": "2.0.0",
"pg": "7.10.0", "pg": "7.11.0",
"pg-hstore": "2.3.2", "pg-hstore": "2.3.2",
"pg-query-stream": "2.0.0", "pg-query-stream": "2.0.0",
"pg-tsquery": "8.0.4", "pg-tsquery": "8.0.4",
...@@ -149,28 +149,28 @@ ...@@ -149,28 +149,28 @@
"safe-regex": "2.0.2", "safe-regex": "2.0.2",
"sanitize-filename": "1.6.1", "sanitize-filename": "1.6.1",
"scim-query-filter-parser": "1.1.0", "scim-query-filter-parser": "1.1.0",
"semver": "6.0.0", "semver": "6.1.1",
"serve-favicon": "2.5.0", "serve-favicon": "2.5.0",
"simple-git": "1.110.0", "simple-git": "1.113.0",
"solr-node": "1.1.3", "solr-node": "1.2.1",
"sqlite3": "4.0.6", "sqlite3": "4.0.8",
"striptags": "3.1.1", "striptags": "3.1.1",
"subscriptions-transport-ws": "0.9.16", "subscriptions-transport-ws": "0.9.16",
"tar-fs": "2.0.0", "tar-fs": "2.0.0",
"twemoji": "12.0.1", "twemoji": "12.0.4",
"uslug": "1.0.4", "uslug": "1.0.4",
"uuid": "3.3.2", "uuid": "3.3.2",
"validate.js": "0.12.0", "validate.js": "0.12.0",
"validator": "10.11.0", "validator": "11.0.0",
"validator-as-promised": "1.0.2", "validator-as-promised": "1.0.2",
"winston": "3.2.1", "winston": "3.2.1",
"yargs": "13.2.2" "yargs": "13.2.4"
}, },
"devDependencies": { "devDependencies": {
"@babel/cli": "^7.4.3", "@babel/cli": "^7.4.4",
"@babel/core": "^7.4.3", "@babel/core": "^7.4.5",
"@babel/plugin-proposal-class-properties": "^7.4.0", "@babel/plugin-proposal-class-properties": "^7.4.4",
"@babel/plugin-proposal-decorators": "^7.4.0", "@babel/plugin-proposal-decorators": "^7.4.4",
"@babel/plugin-proposal-export-namespace-from": "^7.2.0", "@babel/plugin-proposal-export-namespace-from": "^7.2.0",
"@babel/plugin-proposal-function-sent": "^7.2.0", "@babel/plugin-proposal-function-sent": "^7.2.0",
"@babel/plugin-proposal-json-strings": "^7.2.0", "@babel/plugin-proposal-json-strings": "^7.2.0",
...@@ -178,8 +178,8 @@ ...@@ -178,8 +178,8 @@
"@babel/plugin-proposal-throw-expressions": "^7.2.0", "@babel/plugin-proposal-throw-expressions": "^7.2.0",
"@babel/plugin-syntax-dynamic-import": "^7.2.0", "@babel/plugin-syntax-dynamic-import": "^7.2.0",
"@babel/plugin-syntax-import-meta": "^7.2.0", "@babel/plugin-syntax-import-meta": "^7.2.0",
"@babel/polyfill": "^7.4.3", "@babel/polyfill": "^7.4.4",
"@babel/preset-env": "^7.4.3", "@babel/preset-env": "^7.4.5",
"@panter/vue-i18next": "0.15.0", "@panter/vue-i18next": "0.15.0",
"animate-sass": "0.8.2", "animate-sass": "0.8.2",
"animated-number-vue": "0.1.5", "animated-number-vue": "0.1.5",
...@@ -191,38 +191,37 @@ ...@@ -191,38 +191,37 @@
"apollo-link-http": "1.5.14", "apollo-link-http": "1.5.14",
"apollo-link-persisted-queries": "0.2.2", "apollo-link-persisted-queries": "0.2.2",
"apollo-link-ws": "1.0.17", "apollo-link-ws": "1.0.17",
"apollo-upload-client": "10.0.0",
"apollo-utilities": "1.2.1", "apollo-utilities": "1.2.1",
"autoprefixer": "9.5.1", "autoprefixer": "9.5.1",
"babel-eslint": "10.0.1", "babel-eslint": "10.0.1",
"babel-jest": "24.7.1", "babel-jest": "24.8.0",
"babel-loader": "^8.0.5", "babel-loader": "^8.0.6",
"babel-plugin-graphql-tag": "2.1.0", "babel-plugin-graphql-tag": "2.4.0",
"babel-plugin-lodash": "3.3.4", "babel-plugin-lodash": "3.3.4",
"babel-plugin-transform-imports": "1.5.1", "babel-plugin-transform-imports": "1.5.1",
"brace": "0.11.1", "brace": "0.11.1",
"cache-loader": "3.0.0", "cache-loader": "3.0.1",
"chart.js": "2.8.0", "chart.js": "2.8.0",
"clean-webpack-plugin": "2.0.1", "clean-webpack-plugin": "3.0.0",
"copy-webpack-plugin": "5.0.3", "copy-webpack-plugin": "5.0.3",
"core-js": "2.6.3", "core-js": "2.6.3",
"css-loader": "2.1.1", "css-loader": "2.1.1",
"cssnano": "4.1.10", "cssnano": "4.1.10",
"duplicate-package-checker-webpack-plugin": "3.0.0", "duplicate-package-checker-webpack-plugin": "3.0.0",
"epic-spinners": "1.0.4", "epic-spinners": "1.1.0",
"eslint": "5.16.0", "eslint": "5.16.0",
"eslint-config-requarks": "1.0.7", "eslint-config-requarks": "1.0.7",
"eslint-config-standard": "12.0.0", "eslint-config-standard": "12.0.0",
"eslint-plugin-import": "2.17.2", "eslint-plugin-import": "2.17.3",
"eslint-plugin-node": "8.0.1", "eslint-plugin-node": "9.1.0",
"eslint-plugin-promise": "4.1.1", "eslint-plugin-promise": "4.1.1",
"eslint-plugin-standard": "4.0.0", "eslint-plugin-standard": "4.0.0",
"eslint-plugin-vue": "5.2.2", "eslint-plugin-vue": "5.2.2",
"file-loader": "3.0.1", "file-loader": "3.0.1",
"filepond": "4.4.0", "filepond": "4.4.8",
"filepond-plugin-file-validate-type": "1.2.4", "filepond-plugin-file-validate-type": "1.2.4",
"filesize.js": "1.0.2", "filesize.js": "1.0.2",
"grapesjs": "0.14.57", "grapesjs": "0.14.61",
"graphiql": "0.13.0", "graphiql": "0.13.0",
"graphql-persisted-document-loader": "1.0.1", "graphql-persisted-document-loader": "1.0.1",
"graphql-tag": "^2.10.1", "graphql-tag": "^2.10.1",
...@@ -233,10 +232,10 @@ ...@@ -233,10 +232,10 @@
"i18next-xhr-backend": "2.0.1", "i18next-xhr-backend": "2.0.1",
"ignore-loader": "0.1.2", "ignore-loader": "0.1.2",
"js-cookie": "2.2.0", "js-cookie": "2.2.0",
"mini-css-extract-plugin": "0.6.0", "mini-css-extract-plugin": "0.7.0",
"moment-duration-format": "2.2.2", "moment-duration-format": "2.2.2",
"node-sass": "4.11.0", "node-sass": "4.12.0",
"offline-plugin": "5.0.6", "offline-plugin": "5.0.7",
"optimize-css-assets-webpack-plugin": "5.0.1", "optimize-css-assets-webpack-plugin": "5.0.1",
"postcss-cssnext": "3.1.0", "postcss-cssnext": "3.1.0",
"postcss-flexbugs-fixes": "4.1.0", "postcss-flexbugs-fixes": "4.1.0",
...@@ -253,7 +252,7 @@ ...@@ -253,7 +252,7 @@
"react-dom": "16.8.6", "react-dom": "16.8.6",
"resolve-url-loader": "3.1.0", "resolve-url-loader": "3.1.0",
"sass-loader": "7.1.0", "sass-loader": "7.1.0",
"sass-resources-loader": "2.0.0", "sass-resources-loader": "2.0.1",
"script-ext-html-webpack-plugin": "2.1.3", "script-ext-html-webpack-plugin": "2.1.3",
"simple-progress-webpack-plugin": "1.1.2", "simple-progress-webpack-plugin": "1.1.2",
"style-loader": "0.23.1", "style-loader": "0.23.1",
...@@ -261,15 +260,15 @@ ...@@ -261,15 +260,15 @@
"stylus-loader": "3.0.2", "stylus-loader": "3.0.2",
"twemoji-awesome": "1.0.6", "twemoji-awesome": "1.0.6",
"url-loader": "1.1.2", "url-loader": "1.1.2",
"vee-validate": "2.2.5", "vee-validate": "2.2.9",
"velocity-animate": "1.5.2", "velocity-animate": "1.5.2",
"viz.js": "2.1.2", "viz.js": "2.1.2",
"vue": "2.6.10", "vue": "2.6.10",
"vue-apollo": "3.0.0-beta.28", "vue-apollo": "3.0.0-beta.30",
"vue-chartjs": "3.4.2", "vue-chartjs": "3.4.2",
"vue-clipboards": "1.2.4", "vue-clipboards": "1.2.4",
"vue-codemirror": "4.0.6", "vue-codemirror": "4.0.6",
"vue-filepond": "5.1.0", "vue-filepond": "5.1.1",
"vue-hot-reload-api": "2.3.3", "vue-hot-reload-api": "2.3.3",
"vue-loader": "15.7.0", "vue-loader": "15.7.0",
"vue-material-design-icons": "3.2.0", "vue-material-design-icons": "3.2.0",
...@@ -280,22 +279,22 @@ ...@@ -280,22 +279,22 @@
"vue-template-compiler": "2.6.10", "vue-template-compiler": "2.6.10",
"vue-tour": "1.1.0", "vue-tour": "1.1.0",
"vue2-animate": "2.1.0", "vue2-animate": "2.1.0",
"vuedraggable": "2.20.0", "vuedraggable": "2.21.0",
"vuescroll": "4.12.2", "vuescroll": "4.13.0-beta",
"vuetify": "1.5.13", "vuetify": "1.5.14",
"vuex": "3.1.0", "vuex": "3.1.1",
"vuex-pathify": "1.2.2", "vuex-pathify": "1.2.2",
"vuex-persistedstate": "2.5.4", "vuex-persistedstate": "2.5.4",
"webpack": "4.30.0", "webpack": "4.32.2",
"webpack-bundle-analyzer": "3.3.2", "webpack-bundle-analyzer": "3.3.2",
"webpack-cli": "3.3.1", "webpack-cli": "3.3.2",
"webpack-dev-middleware": "3.6.2", "webpack-dev-middleware": "3.7.0",
"webpack-hot-middleware": "2.24.4", "webpack-hot-middleware": "2.25.0",
"webpack-merge": "4.2.1", "webpack-merge": "4.2.1",
"webpack-subresource-integrity": "1.3.2", "webpack-subresource-integrity": "1.3.2",
"whatwg-fetch": "3.0.0", "whatwg-fetch": "3.0.0",
"write-file-webpack-plugin": "4.5.0", "write-file-webpack-plugin": "4.5.0",
"xterm": "3.12.2", "xterm": "3.14.1",
"zxcvbn": "4.4.2" "zxcvbn": "4.4.2"
}, },
"resolutions": { "resolutions": {
......
yarn.lock
View file @ f142bcfd
This diff was suppressed by a .gitattributes entry.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment