Skip to content

Commit

Permalink
Merge pull request #396 from nextcloud/deps/bump-nextcloud-vue-8
Browse files Browse the repository at this point in the history
Update to `@nextcloud/vue@8`
  • Loading branch information
ShGKme authored Nov 3, 2023
2 parents c386fa0 + e303591 commit 58a5703
Show file tree
Hide file tree
Showing 192 changed files with 4,230 additions and 7,499 deletions.
8 changes: 4 additions & 4 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@ module.exports = {
'plugin:vue/recommended',
],

parserOptions: {
ecmaVersion: 'latest',
},

globals: {
// Electron Forge build vars
AUTHENTICATION_WINDOW_WEBPACK_ENTRY: 'readonly',
Expand Down Expand Up @@ -63,10 +67,6 @@ module.exports = {
*
* @see https://github.com/import-js/eslint-plugin-import
*/
'import/extensions': ['error', 'always', {
commonjs: false,
module: true,
}],
'import/no-unresolved': 'off', // TODO: Find a way to configure @talk alias
/**
* Vue
Expand Down
3,340 changes: 1,881 additions & 1,459 deletions package-lock.json

Large diffs are not rendered by default.

9 changes: 5 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
"@nextcloud/capabilities": "^1.1.0",
"@nextcloud/event-bus": "^3.1.0",
"@nextcloud/l10n": "^2.2.0",
"@nextcloud/vue": "^7.12.6",
"@nextcloud/vue": "^8.0.0-beta.9",
"core-js": "^3.33.1",
"electron-squirrel-startup": "^1.0.0",
"floating-vue": "^1.0.0-beta.19",
Expand All @@ -58,7 +58,7 @@
"@electron-forge/maker-zip": "^6.4.2",
"@electron-forge/plugin-webpack": "^6.4.2",
"@nextcloud/babel-config": "^1.0.0",
"@nextcloud/eslint-config": "^8.2.1",
"@nextcloud/eslint-config": "^8.3.0",
"@nextcloud/eslint-plugin": "^2.1.0",
"@nextcloud/webpack-vue-config": "^6.0.0",
"@vercel/webpack-asset-relocator-loader": "^1.7.3",
Expand All @@ -71,14 +71,15 @@
"eslint": "^8.52.0",
"eslint-config-standard": "^17.1.0",
"eslint-plugin-import": "^2.29.0",
"eslint-plugin-jsdoc": "^39.9.1",
"eslint-plugin-n": "^15.7.0",
"eslint-plugin-jsdoc": "^46.8.2",
"eslint-plugin-n": "^16.2.0",
"eslint-plugin-promise": "^6.1.1",
"eslint-plugin-vue": "^9.18.1",
"icon-gen": "^4.0.0",
"node-loader": "^2.0.0",
"regenerator-runtime": "^0.14.0",
"style-loader": "^3.3.3",
"vue-eslint-parser": "^9.3.2",
"webpack": "^5.89.0",
"webpack-merge": "^5.10.0",
"worker-loader": "^3.0.8",
Expand Down
4 changes: 2 additions & 2 deletions src/app/appData.service.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import packageJson from '../../package.json'
* Re-fetch capabilities and userMetadata and update appData
*
* @param {import('./AppData.js').appData} appData appData
* @param {boolean} [persist=false] Persist after re-fetch
* @param {boolean} [persist] Persist after re-fetch
* @return {Promise<void>}
* @throws {Error}
*/
Expand Down Expand Up @@ -88,7 +88,7 @@ export async function refetchAppDataIfDirty(appData) {
/**
* Recursively re-try a re-fetch attempt with a timeout
*
* @param {number} [delay=1000] delay in milliseconds
* @param {number} [delay] delay in milliseconds
*/
function retryRefetch(delay = 1_000) {
const MAX_DELAY = 2 ** 7 * 1000 // 128_000 = ~2 minutes
Expand Down
4 changes: 2 additions & 2 deletions src/app/externalLinkHandlers.js
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ function isExternalLink(url) {
* Open external link in the default OS handler (i.e. Web-Browser) on new window open
*
* @param {import('electron').HandlerDetails} details - HandlerDetails
* @param {import('electron').BrowserWindowConstructorOptions} [browserWindowOptions={}] - options for new BrowserWindow, usually based on parent options
* @param {import('electron').BrowserWindowConstructorOptions} [browserWindowOptions] - options for new BrowserWindow, usually based on parent options
* @return {{action: 'deny'} | {action: 'allow', outlivesOpener?: boolean, overrideBrowserWindowOptions?: import('electron').BrowserWindowConstructorOptions}}
*/
function windowOpenExternalLinkHandler(details, browserWindowOptions = {}) {
Expand Down Expand Up @@ -78,7 +78,7 @@ function willNavigateExternalLinkHandler(event, url) {
* Apply external links handling at BrowserWindow
*
* @param {import('electron').BrowserWindow} browserWindow - Browser window
* @param {import('electron').BrowserWindowConstructorOptions} [browserWindowOptions={}] - options for new BrowserWindow, usually based on parent options
* @param {import('electron').BrowserWindowConstructorOptions} [browserWindowOptions] - options for new BrowserWindow, usually based on parent options
*/
function applyExternalLinkHandler(browserWindow, browserWindowOptions = {}) {
browserWindow.webContents.on('will-navigate', willNavigateExternalLinkHandler)
Expand Down
6 changes: 3 additions & 3 deletions src/app/githubReleaseNotification.service.js
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,8 @@ function notifyAboutNewVersion(version) {
* Check if there is a new Nextcloud Talk
*
* @param {object} options options
* @param {boolean} [options.showNotification=false] Show native notification if new version is available
* @param {boolean} [options.forceRequest=false] Force request even if there is a cached new version
* @param {boolean} [options.showNotification] Show native notification if new version is available
* @param {boolean} [options.forceRequest] Force request even if there is a cached new version
* @return {Promise<boolean>} true if there is a new version
*/
async function checkForNewVersion({ showNotification = false, forceRequest = false }) {
Expand Down Expand Up @@ -109,7 +109,7 @@ let schedulerIntervalId
/**
* Start scheduler with regular update checks
*
* @param {number} [intervalInMin=60] Checking interval in minutes
* @param {number} [intervalInMin] Checking an interval in minutes
* @return {void}
*/
function setupReleaseNotificationScheduler(intervalInMin = 60) {
Expand Down
8 changes: 4 additions & 4 deletions src/app/webRequestInterceptor.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@ const { USER_AGENT, DEV_SERVER_ORIGIN } = require('../constants.js')
*
* @param {string} serverUrl - Nextcloud server URL
* @param {object} [options] - Patching options
* @param {boolean} [options.enableCors=false] - Enable CORS for OCS and other APIs
* @param {boolean} [options.enableCookies=false] - Enable aka cross-origin cookie without setting SameSate=None.
* @param {boolean} [options.enableCors] - Enable CORS for OCS and other APIs
* @param {boolean} [options.enableCookies] - Enable aka cross-origin cookie without setting SameSate=None.
* Some Talk and Files API requests require cookie session.
* @param {import('../accounts/login.service.js').Credentials} [options.credentials=null] - User credentials for the Authentication header
* @param {import('../accounts/login.service.js').Credentials} [options.credentials] - User credentials for the Authentication header
*/
function enableWebRequestInterceptor(serverUrl, {
enableCors = false,
Expand All @@ -47,7 +47,7 @@ function enableWebRequestInterceptor(serverUrl, {
/**
* CookieStorage. There are not many cookies (2-3). POJO is faster, than a Map.
*
* @type {Object<string,string>}
* @type {{[cookieName: string]: string}}
*/
const cookiesStorage = {}

Expand Down
4 changes: 2 additions & 2 deletions src/authentication/renderer/authentication.main.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
*/

// We need to use a copy of default styles here because we do not have real server styles before login on the server
import '../../shared/assets/default/css/default.css'
import '../../shared/assets/default/css/server.css'
import '../../shared/assets/default/default.css'
import '../../shared/assets/default/server.css'

import Vue from 'vue'
import AuthenticationApp from './AuthenticationApp.vue'
Expand Down
6 changes: 4 additions & 2 deletions src/help/renderer/HelpApp.vue
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,10 @@
Source Code: <a :href="$options.packageInfo.repository" class="link" target="_blank">{{ $options.packageInfo.repository }}</a>
</li>
</ul>
<textarea class="about__report"
:value="report"
<NcTextArea :value="report"
rows="11"
readonly
class="about__report"
@focus="$event.target.setSelectionRange(0, -1)" />
<p>
<NcButton type="secondary" wide @click="close">
Expand All @@ -56,6 +56,7 @@
<script>
import MdiWindowClose from 'vue-material-design-icons/WindowClose.vue'
import NcButton from '@nextcloud/vue/dist/Components/NcButton.js'
import NcTextArea from '@nextcloud/vue/dist/Components/NcTextArea.js'

import { appData } from '../../app/AppData.js'

Expand All @@ -65,6 +66,7 @@ export default {
components: {
MdiWindowClose,
NcButton,
NcTextArea,
},

inheritAttrs: false,
Expand Down
4 changes: 2 additions & 2 deletions src/help/renderer/help.app.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
import '../../shared/assets/default/css/default.css'
import '../../shared/assets/default/css/server.css'
import '../../shared/assets/default/default.css'
import '../../shared/assets/default/server.css'

import Vue from 'vue'
import HelpApp from './HelpApp.vue'
Expand Down
6 changes: 3 additions & 3 deletions src/patchers/@nextcloud/notify_push.js
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ export function getSupportedTypes() {
*
* @param name name of the event
* @param handler callback invoked for every matching event pushed
* @param {object} [options={}] options
* @param {object} [options] options
* @param {{ user: string, password: string}} [options.credentials] Application credentials. If none is provided, pre-auth is used.
* @return boolean whether or not push is setup correctly
*/
Expand All @@ -72,7 +72,7 @@ export function listen(name, handler, { credentials } = {}) {
/**
* Setup notify_push
*
* @param {object} [options={}] options
* @param {object} [options] options
* @param {{ user: string, password: string}} [options.credentials] Application credentials. If none is provided, pre-auth is used.
*/
function setupGlobals({ credentials } = {}) {
Expand All @@ -98,7 +98,7 @@ function setupGlobals({ credentials } = {}) {
/**
* Setup socket connection
*
* @param {object} [options={}] options
* @param {object} [options] options
* @param {{ user: string, password: string}} [options.credentials] Application credentials. If none is provided, pre-auth is used.
*/
async function setupSocket({ credentials } = {}) {
Expand Down
2 changes: 1 addition & 1 deletion src/patchers/@nextcloud/router.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ export { linkTo, getRootUrl, generateUrl } from '@desktop-modules--@nextcloud/ro

/**
* @param {string} s - String with "{token}" blocks
* @param {Object<string,string>} [tokens] - Dict with replacements
* @param {{[token: string]: string}} [tokens] - Dict with replacements
* @return {string}
*/
function formattedString(s, tokens = {}) {
Expand Down
78 changes: 0 additions & 78 deletions src/shared/assets/default/css/default.css

This file was deleted.

Loading

0 comments on commit 58a5703

Please sign in to comment.