Skip to content

Commit 33c2834

Browse files
author
Julien Veyssier
committed
bump js libs, adjust to new eslint config
Signed-off-by: Julien Veyssier <eneiluj@posteo.net>
1 parent dc2f6f5 commit 33c2834

9 files changed

Lines changed: 6781 additions & 7708 deletions

File tree

appinfo/info.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<bugs>https://github.com/eneiluj/integration_dropbox/issues</bugs>
1717
<screenshot>https://github.com/eneiluj/integration_dropbox/raw/master/img/screenshot1.jpg</screenshot>
1818
<dependencies>
19-
<nextcloud min-version="22" max-version="24"/>
19+
<nextcloud min-version="22" max-version="25"/>
2020
</dependencies>
2121
<settings>
2222
<admin>OCA\Dropbox\Settings\Admin</admin>

package-lock.json

Lines changed: 6745 additions & 7691 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,21 +32,23 @@
3232
"extends @nextcloud/browserslist-config"
3333
],
3434
"dependencies": {
35-
"@nextcloud/auth": "^1.3.0",
36-
"@nextcloud/axios": "^1.6.0",
35+
"@nextcloud/auth": "^2.0.0",
36+
"@nextcloud/axios": "^2.0.0",
3737
"@nextcloud/dialogs": "^3.1.2",
38-
"@nextcloud/initial-state": "^1.2.0",
38+
"@nextcloud/initial-state": "^2.0.0",
3939
"@nextcloud/l10n": "^1.4.1",
4040
"@nextcloud/moment": "^1.1.1",
4141
"@nextcloud/router": "^2.0.0",
42-
"@nextcloud/vue": "^4.2.0",
42+
"@nextcloud/vue": "^5.4.0",
4343
"vue": "^2.6.11"
4444
},
4545
"devDependencies": {
4646
"@nextcloud/babel-config": "^1.0.0",
4747
"@nextcloud/browserslist-config": "^2.2.0",
48-
"@nextcloud/eslint-config": "^6.1.0",
49-
"@nextcloud/stylelint-config": "^1.0.0-beta.0",
50-
"@nextcloud/webpack-vue-config": "^4.1.0"
48+
"@nextcloud/eslint-config": "^8.1.2",
49+
"@nextcloud/stylelint-config": "^2.2.0",
50+
"@nextcloud/webpack-vue-config": "^5.3.0",
51+
"eslint-webpack-plugin": "^3.2.0",
52+
"stylelint-webpack-plugin": "^3.3.0"
5153
}
5254
}

src/adminSettings.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
*/
1313

1414
import Vue from 'vue'
15-
import './bootstrap'
16-
import AdminSettings from './components/AdminSettings'
15+
import './bootstrap.js'
16+
import AdminSettings from './components/AdminSettings.vue'
1717

1818
// eslint-disable-next-line
1919
'use strict'

src/components/AdminSettings.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
import { loadState } from '@nextcloud/initial-state'
5252
import { generateUrl } from '@nextcloud/router'
5353
import axios from '@nextcloud/axios'
54-
import { delay } from '../utils'
54+
import { delay } from '../utils.js'
5555
import { showSuccess, showError } from '@nextcloud/dialogs'
5656
import '@nextcloud/dialogs/styles/toast.scss'
5757

src/components/PersonalSettings.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@
102102
import { loadState } from '@nextcloud/initial-state'
103103
import { generateUrl } from '@nextcloud/router'
104104
import axios from '@nextcloud/axios'
105-
import { delay, humanFileSize } from '../utils'
105+
import { delay, humanFileSize } from '../utils.js'
106106
import { showSuccess, showError } from '@nextcloud/dialogs'
107107
import '@nextcloud/dialogs/styles/toast.scss'
108108
import moment from '@nextcloud/moment'

src/personalSettings.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
*/
1313

1414
import Vue from 'vue'
15-
import './bootstrap'
16-
import PersonalSettings from './components/PersonalSettings'
15+
import './bootstrap.js'
16+
import PersonalSettings from './components/PersonalSettings.vue'
1717

1818
// eslint-disable-next-line
1919
'use strict'

stylelint.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
module.exports = {
2-
extends: 'stylelint-config-recommended-scss',
2+
extends: 'stylelint-config-recommended-vue',
33
rules: {
44
indentation: 'tab',
55
'selector-type-no-unknown': null,

webpack.js

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
const path = require('path')
22
const webpackConfig = require('@nextcloud/webpack-vue-config')
3+
const ESLintPlugin = require('eslint-webpack-plugin')
4+
const StyleLintPlugin = require('stylelint-webpack-plugin')
35

46
const buildMode = process.env.NODE_ENV
57
const isDev = buildMode === 'development'
@@ -10,9 +12,24 @@ webpackConfig.stats = {
1012
modules: false,
1113
}
1214

15+
const appId = 'integration_dropbox'
1316
webpackConfig.entry = {
14-
personalSettings: { import: path.join(__dirname, 'src', 'personalSettings.js'), filename: 'integration_dropbox-personalSettings.js' },
15-
adminSettings: { import: path.join(__dirname, 'src', 'adminSettings.js'), filename: 'integration_dropbox-adminSettings.js' },
17+
personalSettings: { import: path.join(__dirname, 'src', 'personalSettings.js'), filename: appId + '-personalSettings.js' },
18+
adminSettings: { import: path.join(__dirname, 'src', 'adminSettings.js'), filename: appId + '-adminSettings.js' },
1619
}
1720

21+
webpackConfig.plugins.push(
22+
new ESLintPlugin({
23+
extensions: ['js', 'vue'],
24+
files: 'src',
25+
failOnError: !isDev,
26+
})
27+
)
28+
webpackConfig.plugins.push(
29+
new StyleLintPlugin({
30+
files: 'src/**/*.{css,scss,vue}',
31+
failOnError: !isDev,
32+
}),
33+
)
34+
1835
module.exports = webpackConfig

0 commit comments

Comments
 (0)