Skip to content

Commit

Permalink
Merge 425bd9a into c40e97d
Browse files Browse the repository at this point in the history
  • Loading branch information
depfu[bot] committed Aug 18, 2020
2 parents c40e97d + 425bd9a commit b8ffc0d
Show file tree
Hide file tree
Showing 5 changed files with 1,474 additions and 1,150 deletions.
2 changes: 1 addition & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ module.exports = {
},
extends: [
'plugin:vue/essential',
'@vue/standard'
'eslint:recommended'
],
rules: {
'no-console': process.env.NODE_ENV === 'production' ? 'error' : 'off',
Expand Down
12 changes: 6 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,16 +21,16 @@
"toposort-class": "^1.0.1"
},
"devDependencies": {
"@vue/cli-plugin-babel": "^4.4.6",
"@vue/cli-plugin-eslint": "^4.4.6",
"@vue/cli-plugin-unit-jest": "^4.4.6",
"@vue/cli-service": "^4.4.6",
"@vue/cli-plugin-babel": "^4.5.4",
"@vue/cli-plugin-eslint": "^4.5.4",
"@vue/cli-plugin-unit-jest": "^4.5.4",
"@vue/cli-service": "^4.5.4",
"@vue/eslint-config-standard": "^5.1.2",
"@vue/test-utils": "1.0.3",
"@vue/test-utils": "1.0.4",
"babel-eslint": "^10.1.0",
"core-js": "^3.6.5",
"coveralls": "^3.1.0",
"eslint": "^7.6.0",
"eslint": "^7.7.0",
"eslint-plugin-import": "^2.22.0",
"eslint-plugin-node": "^11.1.0",
"eslint-plugin-promise": "^4.2.1",
Expand Down
4 changes: 1 addition & 3 deletions src/h5p.vue
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,7 @@
import Toposort from 'toposort-class'
import { FetchError } from '@/errors'
import l10n from '@/l10n'
// eslint-disable-next-line import/no-webpack-loader-syntax
import frameScript from '!raw-loader!../frame/frame'
// eslint-disable-next-line import/no-webpack-loader-syntax
import frameStyle from '!to-string-loader!css-loader!../vendor/h5p/styles/h5p.css'
export default {
Expand Down Expand Up @@ -151,7 +149,7 @@ export default {
let body = {}
try {
body = await resp.json()
} catch {}
} catch { /* eslint-disable-line no-empty */ }
throw new FetchError(resp, body)
}
return resp.json()
Expand Down
4 changes: 2 additions & 2 deletions vue.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ module.exports = {
devServer: {
historyApiFallback: false
},
chainWebpack: config => {
chainWebpack (config) {
config.module.rule('fonts').use('url-loader').tap(options => {
options.limit = true
return options
Expand All @@ -19,7 +19,7 @@ module.exports = {
return options
})
},
configureWebpack (config) {
configureWebpack () {
return {
output: {
libraryExport: 'default'
Expand Down
Loading

0 comments on commit b8ffc0d

Please sign in to comment.