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

[stable30] fix(eslint): Fix linting javascript files, also lint typescript files #6726

Open
wants to merge 3 commits into
base: stable30
Choose a base branch
from
Open
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
2 changes: 1 addition & 1 deletion .eslintrc.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
module.exports = {
root: true,
extends: [
'@nextcloud/eslint-config/typescript',
'@nextcloud',
],
rules: {
'@typescript-eslint/no-unused-vars': ['off'],
Expand Down
8 changes: 7 additions & 1 deletion cypress/e2e/nodes/Links.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,13 @@ describe('test link marks', function() {

describe('link bubble', function() {

function clickLink(link, options = {}) {
/**
* Find link and click on it
*
* @param {string} link The link URL
* @param {object|null} options the click options
*/
const clickLink = (link, options = {}) => {
cy.getContent()
.find(`a[href*="${link}"]`)
.click(options)
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
"build": "NODE_ENV=production NODE_OPTIONS='--max-old-space-size=4096' vite --mode production build",
"dev": "NODE_ENV=development NODE_OPTIONS='--max-old-space-size=4096' vite --mode development build",
"watch": "NODE_ENV=development NODE_OPTIONS='--max-old-space-size=8192' vite --mode development build --watch",
"lint": "tsc && eslint --ext .js,.vue src cypress",
"lint:fix": "tsc && eslint --ext .js,.vue src cypress --fix",
"lint": "tsc && eslint --ext .js,.ts,.vue src cypress",
"lint:fix": "tsc && eslint --ext .js,.ts,.vue src cypress --fix",
"stylelint": "stylelint src/**/*.vue src/**/*.scss src/**/*.css css/*.scss",
"stylelint:fix": "stylelint src/**/*.vue src/**/*.scss src/**/*.css css/*.scss --fix",
"test": "NODE_ENV=test jest",
Expand Down
2 changes: 1 addition & 1 deletion src/components/Editor.vue
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ import {
import ReadonlyBar from './Menu/ReadonlyBar.vue'

import { logger } from '../helpers/logger.js'
import { getDocumentState, applyDocumentState } from '../helpers/yjs.js'
import { getDocumentState } from '../helpers/yjs.js'
import { SyncService, ERROR_TYPE, IDLE_TIMEOUT } from './../services/SyncService.js'
import SessionApi from '../services/SessionApi.js'
import createSyncServiceProvider from './../services/SyncServiceProvider.js'
Expand Down
3 changes: 2 additions & 1 deletion src/services/Outbox.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ type Sendable = {
}

export default class Outbox {

#awarenessUpdate = ''
#syncUpdate = ''
#syncQuery = ''
Expand All @@ -33,7 +34,7 @@ export default class Outbox {
}

getDataToSend(): Sendable {
return {
return {
steps: [this.#syncUpdate, this.#syncQuery].filter(s => s),
awareness: this.#awarenessUpdate,
}
Expand Down
2 changes: 1 addition & 1 deletion tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"extends": "@vue/tsconfig",
"compilerOptions": {
"allowSyntheticDefaultImports": true,
"allowJs": true,
"allowJs": true,
"declaration": true,
"esModuleInterop": true,
"lib": ["DOM", "ESNext"],
Expand Down
Loading