Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(deps): bump @nextcloud/eslint-config from 7.0.2 to v8 (master) #1397

Merged
merged 4 commits into from
Jul 10, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions js/twofactor_totp-main-login-setup.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/twofactor_totp-main-login-setup.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions js/twofactor_totp-main-settings.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/twofactor_totp-main-settings.js.map

Large diffs are not rendered by default.

3,679 changes: 2,476 additions & 1,203 deletions package-lock.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
"devDependencies": {
"@nextcloud/babel-config": "^1.0.0",
"@nextcloud/browserslist-config": "^2.3.0",
"@nextcloud/eslint-config": "^7.0.2",
"@nextcloud/eslint-config": "^8.3.0-beta.2",
"@nextcloud/stylelint-config": "^2.3.0",
"@nextcloud/webpack-vue-config": "^5.1.0",
"@vue/test-utils": "^1.3.5",
Expand Down
10 changes: 5 additions & 5 deletions src/components/LoginSetup.vue
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,10 @@
</template>

<script>
import Logger from '../logger'
import { saveState } from '../services/StateService'
import SetupConfirmation from './SetupConfirmation'
import STATE from '../state'
import Logger from '../logger.js'
import { saveState } from '../services/StateService.js'
import SetupConfirmation from './SetupConfirmation.vue'
import STATE from '../state.js'

export default {
name: 'LoginSetup',
Expand Down Expand Up @@ -68,7 +68,7 @@ export default {
this.qrUrl = qrUrl

this.loading = false
}
},
)
},
confirm() {
Expand Down
12 changes: 6 additions & 6 deletions src/components/PersonalTotpSettings.vue
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,9 @@
<script>
import confirmPassword from '@nextcloud/password-confirmation'

import Logger from '../logger'
import SetupConfirmation from './SetupConfirmation'
import state from '../state'
import Logger from '../logger.js'
import SetupConfirmation from './SetupConfirmation.vue'
import state from '../state.js'

export default {
name: 'PersonalTotpSettings',
Expand Down Expand Up @@ -106,7 +106,7 @@ export default {
})
.catch((e) => {
OC.Notification.showTemporary(
t('twofactor_totp', 'Could not enable TOTP')
t('twofactor_totp', 'Could not enable TOTP'),
)
Logger.error('Could not enable TOTP', e)

Expand Down Expand Up @@ -137,8 +137,8 @@ export default {
OC.Notification.showTemporary(
t(
'twofactor_totp',
'Could not verify your key. Please try again'
)
'Could not verify your key. Please try again',
),
)
}

Expand Down
4 changes: 2 additions & 2 deletions src/main-login-setup.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
*
* @author 2019 Christoph Wurst <christoph@winzerhof-wurst.at>
*
* @license GNU AGPL version 3 or any later version

Check warning on line 6 in src/main-login-setup.js

View workflow job for this annotation

GitHub Actions / eslint

Invalid JSDoc @license: "GNU AGPL version 3 or any later version"; expected SPDX expression: https://spdx.org/licenses/
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
Expand All @@ -20,8 +20,8 @@
*/

import Vue from 'vue'
import Logger from './logger'
import LoginSetup from './components/LoginSetup'
import Logger from './logger.js'
import LoginSetup from './components/LoginSetup.vue'

Vue.mixin({
methods: {
Expand Down
6 changes: 3 additions & 3 deletions src/main-settings.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
*
* @author 2018 Christoph Wurst <christoph@winzerhof-wurst.at>
*
* @license GNU AGPL version 3 or any later version

Check warning on line 6 in src/main-settings.js

View workflow job for this annotation

GitHub Actions / eslint

Invalid JSDoc @license: "GNU AGPL version 3 or any later version"; expected SPDX expression: https://spdx.org/licenses/
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
Expand All @@ -21,10 +21,10 @@

import Vue from 'vue'
import { loadState } from '@nextcloud/initial-state'
import Logger from './logger'
import store from './store'
import Logger from './logger.js'
import store from './store.js'

import PersonalTotpSettings from './components/PersonalTotpSettings'
import PersonalTotpSettings from './components/PersonalTotpSettings.vue'

Vue.mixin({
methods: {
Expand Down
8 changes: 4 additions & 4 deletions src/store.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import Vue from 'vue'
import Vuex from 'vuex'

import { saveState } from './services/StateService'
import state from './state'
import { saveState } from './services/StateService.js'
import state from './state.js'

Vue.use(Vuex)

Expand All @@ -18,7 +18,7 @@
({ state, secret, qrUrl }) => {
commit('setState', state)
return { qrUrl, secret }
}
},
)
},

Expand All @@ -31,14 +31,14 @@

disable({ commit }) {
return saveState({ state: state.STATE_DISABLED }).then(({ state }) =>
commit('setState', state)
commit('setState', state),
)
},
}

export const getters = {}

export default new Vuex.Store({

Check warning on line 41 in src/store.js

View workflow job for this annotation

GitHub Actions / eslint

Caution: `Vuex` also has a named export `Store`. Check if you meant to write `import {Store} from 'vuex'` instead
strict: process.env.NODE_ENV !== 'production',
state: {
totpState: undefined,
Expand Down
2 changes: 1 addition & 1 deletion src/tests/components/PersonalTotpSettings.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
*
* @author 2018 Christoph Wurst <christoph@winzerhof-wurst.at>
*
* @license GNU AGPL version 3 or any later version

Check warning on line 6 in src/tests/components/PersonalTotpSettings.spec.js

View workflow job for this annotation

GitHub Actions / eslint

Invalid JSDoc @license: "GNU AGPL version 3 or any later version"; expected SPDX expression: https://spdx.org/licenses/
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
Expand All @@ -22,7 +22,7 @@
import { shallowMount, createLocalVue } from '@vue/test-utils'
import Vuex from 'vuex'

import PersonalTotpSettings from '../../components/PersonalTotpSettings'
import PersonalTotpSettings from '../../components/PersonalTotpSettings.vue'

const localVue = createLocalVue()

Expand All @@ -38,7 +38,7 @@
confirm: () => {},
disable: () => {},
}
store = new Vuex.Store({

Check warning on line 41 in src/tests/components/PersonalTotpSettings.spec.js

View workflow job for this annotation

GitHub Actions / eslint

Caution: `Vuex` also has a named export `Store`. Check if you meant to write `import {Store} from 'vuex'` instead
state: {},
actions,
})
Expand Down
Loading