Commit dc334767 authored by Nick's avatar Nick

misc: upgrade apollo-server + remove temp dep resolutions

parent f142bcfd
...@@ -21,7 +21,8 @@ ...@@ -21,7 +21,8 @@
"presets": [ "presets": [
[ [
"@babel/preset-env", { "@babel/preset-env", {
"useBuiltIns": "entry" "useBuiltIns": "entry",
"corejs": 3
} }
] ]
] ]
......
require('@babel/polyfill') require('core-js/stable')
require('regenerator-runtime/runtime')
require('vuetify/src/stylus/main.styl') require('vuetify/src/stylus/main.styl')
require('./scss/app.scss') require('./scss/app.scss')
......
...@@ -41,8 +41,8 @@ ...@@ -41,8 +41,8 @@
"@bugsnag/js": "6.3.0", "@bugsnag/js": "6.3.0",
"algoliasearch": "3.33.0", "algoliasearch": "3.33.0",
"apollo-fetch": "0.7.0", "apollo-fetch": "0.7.0",
"apollo-server": "2.5.1", "apollo-server": "2.6.1",
"apollo-server-express": "2.5.1", "apollo-server-express": "2.6.1",
"auto-load": "3.0.4", "auto-load": "3.0.4",
"aws-sdk": "2.466.0", "aws-sdk": "2.466.0",
"axios": "0.19.0", "axios": "0.19.0",
...@@ -183,15 +183,15 @@ ...@@ -183,15 +183,15 @@
"@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",
"apollo-cache-inmemory": "1.5.1", "apollo-cache-inmemory": "1.6.0",
"apollo-client": "2.4.12", "apollo-client": "2.6.0",
"apollo-link": "1.2.11", "apollo-link": "1.2.11",
"apollo-link-batch-http": "1.2.11", "apollo-link-batch-http": "1.2.11",
"apollo-link-error": "1.1.10", "apollo-link-error": "1.1.10",
"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-utilities": "1.2.1", "apollo-utilities": "1.3.0",
"autoprefixer": "9.5.1", "autoprefixer": "9.5.1",
"babel-eslint": "10.0.1", "babel-eslint": "10.0.1",
"babel-jest": "24.8.0", "babel-jest": "24.8.0",
...@@ -204,7 +204,7 @@ ...@@ -204,7 +204,7 @@
"chart.js": "2.8.0", "chart.js": "2.8.0",
"clean-webpack-plugin": "3.0.0", "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": "3.1.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",
...@@ -258,6 +258,7 @@ ...@@ -258,6 +258,7 @@
"style-loader": "0.23.1", "style-loader": "0.23.1",
"stylus": "0.54.5", "stylus": "0.54.5",
"stylus-loader": "3.0.2", "stylus-loader": "3.0.2",
"terser": "4.0.0",
"twemoji-awesome": "1.0.6", "twemoji-awesome": "1.0.6",
"url-loader": "1.1.2", "url-loader": "1.1.2",
"vee-validate": "2.2.9", "vee-validate": "2.2.9",
...@@ -297,11 +298,6 @@ ...@@ -297,11 +298,6 @@
"xterm": "3.14.1", "xterm": "3.14.1",
"zxcvbn": "4.4.2" "zxcvbn": "4.4.2"
}, },
"resolutions": {
"terser": "3.14.1",
"apollo-server/**/core-js": "3.0.0-beta.11",
"apollo-server-express/**/core-js": "3.0.0-beta.11"
},
"browserslist": [ "browserslist": [
"> 1%", "> 1%",
"last 2 versions", "last 2 versions",
......
...@@ -43,7 +43,6 @@ class AuthDirective extends SchemaDirectiveVisitor { ...@@ -43,7 +43,6 @@ class AuthDirective extends SchemaDirectiveVisitor {
if (!context.req.user) { if (!context.req.user) {
throw new Error('Unauthorized') throw new Error('Unauthorized')
} }
if (!_.some(context.req.user.permissions, pm => _.includes(requiredScopes, pm))) { if (!_.some(context.req.user.permissions, pm => _.includes(requiredScopes, pm))) {
throw new Error('Forbidden') throw new Error('Forbidden')
} }
......
...@@ -14,7 +14,7 @@ module.exports = { ...@@ -14,7 +14,7 @@ module.exports = {
async locales(obj, args, context, info) { async locales(obj, args, context, info) {
let remoteLocales = await WIKI.cache.get('locales') let remoteLocales = await WIKI.cache.get('locales')
let localLocales = await WIKI.models.locales.query().select('code', 'isRTL', 'name', 'nativeName', 'createdAt', 'updatedAt') let localLocales = await WIKI.models.locales.query().select('code', 'isRTL', 'name', 'nativeName', 'createdAt', 'updatedAt')
remoteLocales = (remoteLocales) ? remoteLocales : localLocales remoteLocales = remoteLocales || localLocales
return _.map(remoteLocales, rl => { return _.map(remoteLocales, rl => {
let isInstalled = _.some(localLocales, ['code', rl.code]) let isInstalled = _.some(localLocales, ['code', rl.code])
return { return {
......
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