Skip to content

Commit 83e1705

Browse files
authored
Merge pull request #8619 from nextcloud/chore/upgrade-vue-3
chore/upgrade vue 3
2 parents 7b8fe02 + 297a12b commit 83e1705

340 files changed

Lines changed: 7255 additions & 8727 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.eslintignore

Lines changed: 0 additions & 4 deletions
This file was deleted.

.eslintrc.cjs

Lines changed: 0 additions & 28 deletions
This file was deleted.

.git-blame-ignore-revs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,6 @@
88
810eb74a3f5502ef6485efdda7066c6848878bff
99
0d4ada6304f951cdf28b2d045f7fc56629807c11
1010
eef5dde0838f4e80a420eec19442f9d73533e413
11+
12+
# drop prettier
13+
020464633c2303a1c6b4a817c8a7e35b3c067341

.github/dependabot.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ updates:
1010
day: saturday
1111
time: "03:00"
1212
timezone: Europe/Paris
13+
cooldown:
14+
default-days: 4
1315
open-pull-requests-limit: 10
1416
labels:
1517
- 3. to review

.github/workflows/lint-prettier.yml

Lines changed: 0 additions & 101 deletions
This file was deleted.

cypress.config.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: AGPL-3.0-or-later
44
*/
55

6-
import vue from '@vitejs/plugin-vue2'
6+
import vue from '@vitejs/plugin-vue'
77
import { defineConfig } from 'cypress'
88
import cypressSplit from 'cypress-split'
99
import vitePreprocessor from 'cypress-vite'

cypress/e2e/Assistant.spec.js

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,14 +51,11 @@ describe('Assistant', () => {
5151
})
5252
cy.get('.assistant-modal--content .submit-button').click()
5353

54-
// eslint-disable-next-line cypress/no-unnecessary-waiting
5554
cy.wait(2000)
5655

5756
cy.get('.assistant-modal--content button').contains('Get notified').click()
5857

59-
cy.get('.assistant-modal--content button .bell-ring-outline-icon').should(
60-
'be.visible',
61-
)
58+
cy.get('.assistant-modal--content button .bell-ring-outline-icon').should('be.visible')
6259

6360
cy.get('.assistant-modal--content .close-button').click()
6461
cy.getActionEntry('assistant').click()
@@ -78,7 +75,6 @@ describe('Assistant', () => {
7875
cy.getActionEntry('assistant').click()
7976
cy.get('.action-button').contains('Translate').click()
8077

81-
// eslint-disable-next-line cypress/no-unnecessary-waiting
8278
cy.wait(1000)
8379

8480
cy.get('.assistant-modal--content #input-input').type('Hello World', {

cypress/e2e/Links.spec.js

Lines changed: 20 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ import { randUser } from '../utils/index.js'
88
const user = randUser()
99
const fileName = 'empty.md'
1010

11-
describe('test link marks', function () {
12-
before(function () {
11+
describe('test link marks', function() {
12+
before(function() {
1313
cy.createUser(user)
1414
})
1515

16-
beforeEach(function () {
16+
beforeEach(function() {
1717
cy.login(user)
1818
cy.isolateTest({
1919
sourceFile: fileName,
@@ -24,7 +24,7 @@ describe('test link marks', function () {
2424
cy.openFile(fileName, { force: true })
2525
})
2626

27-
describe('link bubble', function () {
27+
describe('link bubble', function() {
2828
/**
2929
* Find link and click on it
3030
*
@@ -134,14 +134,12 @@ describe('test link marks', function () {
134134
cy.insertLine(`[text](${link})`)
135135
cy.getContent().find(`a[href*="${link}"]`).should('not.exist')
136136
clickLink('#')
137-
cy.get('.link-view-bubble__title', { timeout: 10000 }).contains(
138-
'other://protocol',
139-
)
137+
cy.get('.link-view-bubble__title', { timeout: 10000 }).contains('other://protocol')
140138
cy.get('.link-view-bubble a').should('not.exist')
141139
})
142140
})
143141

144-
describe('autolink', function () {
142+
describe('autolink', function() {
145143
it('with protocol to files app and fileId', () => {
146144
cy.getFile(fileName).then(($el) => {
147145
const id = $el.data('cyFilesListRowFileid')
@@ -167,17 +165,17 @@ describe('test link marks', function () {
167165
})
168166
})
169167

170-
describe('link menu', function () {
168+
describe('link menu', function() {
171169
beforeEach(() => cy.clearContent())
172170
const text = 'some text'
173171

174-
describe('link to website', function () {
172+
describe('link to website', function() {
175173
const url = 'https://example.org/'
176174
// Helper to reduce duplicated code, checking inserting with and without selected text
177175
const checkLinkWebsite = (url, text) => {
178176
cy.getSubmenuEntry('insert-link', 'insert-link-website').click()
179177
cy.getActionSubEntry('insert-link-input')
180-
.find('input[type="text"]')
178+
.click()
181179
.type(`${url}{enter}`)
182180
cy.getContent()
183181
.find(`a[href*="${url}"]`)
@@ -187,27 +185,26 @@ describe('test link marks', function () {
187185

188186
beforeEach(cy.clearContent)
189187
it('Link website without selection', () => {
190-
cy.getFile(fileName).then(($el) => {
188+
cy.getFile(fileName).then(() => {
191189
checkLinkWebsite(url, url)
192190
})
193191
})
194192

195193
it('Link website with selection', () => {
196-
cy.getFile(fileName).then(($el) => {
194+
cy.getFile(fileName).then(() => {
197195
cy.getContent().type(`${text}{selectAll}`)
198196
checkLinkWebsite(url, text)
199197
})
200198
})
201199
})
202200

203-
describe('link to local file', function () {
201+
describe('link to local file', function() {
202+
let fileId = null
204203
// Helper to reduce duplicated code, checking inserting with and without selected text
205204
const checkLinkFile = (filename, text, isFolder = false) => {
206205
cy.getSubmenuEntry('insert-link', 'insert-link-file').click()
207206
cy.get('.file-picker').within(() => {
208-
cy.get(
209-
`[data-testid="file-list-row"][data-filename="${filename}"]`,
210-
).click()
207+
cy.get(`[data-testid="file-list-row"][data-filename="${filename}"]`).click()
211208
cy.get(isFolder ? '.empty-content__name' : '.file-picker__files')
212209
cy.contains(
213210
'button',
@@ -221,15 +218,13 @@ describe('test link marks', function () {
221218
.should('have.text', text === undefined ? filename : text)
222219
}
223220

224-
let fileId = null
225-
226221
beforeEach(() => cy.clearContent())
227222

228223
it('without text', () => {
229224
cy.getFileId(fileName).then((id) => {
230225
fileId = id
231226
})
232-
cy.getFile(fileName).then(($el) => {
227+
cy.getFile(fileName).then(() => {
233228
checkLinkFile(fileName)
234229
cy.get('.modal-header__name').should('include.text', fileName)
235230
})
@@ -238,19 +233,17 @@ describe('test link marks', function () {
238233
cy.getFileId(fileName).then((id) => {
239234
fileId = id
240235
})
241-
cy.getFile(fileName).then(($el) => {
236+
cy.getFile(fileName).then(() => {
242237
cy.getContent().type(`${text}{selectAll}`)
243238
checkLinkFile(fileName, text)
244239
cy.get('.modal-header__name').should('include.text', fileName)
245240
})
246241
})
247242
it('link to directory', () => {
248-
cy.createFolder(`${window.__currentDirectory}/dummy folder`).then(
249-
(folderId) => {
250-
fileId = folderId
251-
},
252-
)
253-
cy.getFile(fileName).then(($el) => {
243+
cy.createFolder(`${window.__currentDirectory}/dummy folder`).then((folderId) => {
244+
fileId = folderId
245+
})
246+
cy.getFile(fileName).then(() => {
254247
cy.getContent().type(`${text}{selectAll}`)
255248
checkLinkFile('dummy folder', text, true)
256249
})

0 commit comments

Comments
 (0)