Skip to content

Commit 3cacd7c

Browse files
skjnldsvskjnldsv
authored
Merge pull request #54497 from nextcloud/chore/update-nextcloud-vue-8-29
2 parents 9fd80b2 + 434adef commit 3cacd7c

File tree

258 files changed

+469
-549
lines changed

Some content is hidden

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

258 files changed

+469
-549
lines changed

‎__tests__/mock-window.js‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,13 @@
22
* SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors
33
* SPDX-License-Identifier: AGPL-3.0-or-later
44
*/
5-
window.OC = { ...window.OC }
5+
window.OC = {
6+
...window.OC,
7+
config: {
8+
version: '32.0.0',
9+
...(window.OC?.config ?? {}),
10+
},
11+
}
612
window.OCA = { ...window.OCA }
713
window.OCP = { ...window.OCP }
814

‎apps/dav/src/views/__snapshots__/CalDavSettings.spec.js.snap‎

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,18 @@ exports[`CalDavSettings > interactions 1`] = `
44
<div>
55
<div
66
class="settings-section settings-section--limit-width"
7+
data-v-5e563b2b=""
78
data-v-6b8d4c30=""
8-
data-v-6f6953b5=""
99
>
1010
<h2
1111
class="settings-section__name"
12-
data-v-6f6953b5=""
12+
data-v-5e563b2b=""
1313
>
1414
Calendar server
1515
<a
1616
aria-label="External documentation for Calendar server"
1717
class="settings-section__info"
18-
data-v-6f6953b5=""
18+
data-v-5e563b2b=""
1919
href="https://docs.nextcloud.com/server/23/go.php?to=user-sync-calendars"
2020
rel="noreferrer nofollow"
2121
target="_blank"
@@ -24,7 +24,7 @@ exports[`CalDavSettings > interactions 1`] = `
2424
<span
2525
aria-hidden="true"
2626
class="material-design-icon help-circle-icon"
27-
data-v-6f6953b5=""
27+
data-v-5e563b2b=""
2828
role="img"
2929
>
3030
<svg
@@ -46,8 +46,8 @@ exports[`CalDavSettings > interactions 1`] = `
4646
<!---->
4747
<p
4848
class="settings-hint"
49+
data-v-5e563b2b=""
4950
data-v-6b8d4c30=""
50-
data-v-6f6953b5=""
5151
>
5252
Also install the
5353
<a
@@ -67,28 +67,28 @@ exports[`CalDavSettings > interactions 1`] = `
6767
.
6868
</p>
6969
<p
70+
data-v-5e563b2b=""
7071
data-v-6b8d4c30=""
71-
data-v-6f6953b5=""
7272
>
7373
<span
7474
class="checkbox-radio-switch checkbox-radio-switch-switch checkbox-radio-switch--checked"
75+
data-v-2c897dd5=""
76+
data-v-5e563b2b=""
7577
data-v-6b8d4c30=""
76-
data-v-6f6953b5=""
77-
data-v-f275cf53=""
7878
style="--icon-size: 36px; --icon-height: 16px;"
7979
>
8080
<input
8181
aria-labelledby="caldavSendInvitations-label"
8282
class="checkbox-radio-switch__input"
83-
data-v-f275cf53=""
83+
data-v-2c897dd5=""
8484
id="caldavSendInvitations"
8585
type="checkbox"
8686
value=""
8787
/>
8888
<span
8989
class="checkbox-content checkbox-radio-switch__content checkbox-content-switch checkbox-content--has-text"
90+
data-v-2c897dd5=""
9091
data-v-3714b019=""
91-
data-v-f275cf53=""
9292
id="caldavSendInvitations-label"
9393
>
9494
<span
@@ -127,8 +127,8 @@ exports[`CalDavSettings > interactions 1`] = `
127127
</span>
128128
</span>
129129
<em
130+
data-v-5e563b2b=""
130131
data-v-6b8d4c30=""
131-
data-v-6f6953b5=""
132132
>
133133
Please make sure to properly set up
134134
<a
@@ -140,28 +140,28 @@ exports[`CalDavSettings > interactions 1`] = `
140140
</em>
141141
</p>
142142
<p
143+
data-v-5e563b2b=""
143144
data-v-6b8d4c30=""
144-
data-v-6f6953b5=""
145145
>
146146
<span
147147
class="checkbox-radio-switch checkbox checkbox-radio-switch-switch checkbox-radio-switch--checked"
148+
data-v-2c897dd5=""
149+
data-v-5e563b2b=""
148150
data-v-6b8d4c30=""
149-
data-v-6f6953b5=""
150-
data-v-f275cf53=""
151151
style="--icon-size: 36px; --icon-height: 16px;"
152152
>
153153
<input
154154
aria-labelledby="caldavGenerateBirthdayCalendar-label"
155155
class="checkbox-radio-switch__input"
156-
data-v-f275cf53=""
156+
data-v-2c897dd5=""
157157
id="caldavGenerateBirthdayCalendar"
158158
type="checkbox"
159159
value=""
160160
/>
161161
<span
162162
class="checkbox-content checkbox-radio-switch__content checkbox-content-switch checkbox-content--has-text"
163+
data-v-2c897dd5=""
163164
data-v-3714b019=""
164-
data-v-f275cf53=""
165165
id="caldavGenerateBirthdayCalendar-label"
166166
>
167167
<span
@@ -200,45 +200,45 @@ exports[`CalDavSettings > interactions 1`] = `
200200
</span>
201201
</span>
202202
<em
203+
data-v-5e563b2b=""
203204
data-v-6b8d4c30=""
204-
data-v-6f6953b5=""
205205
>
206206
Birthday calendars will be generated by a background job.
207207
</em>
208208
<br
209+
data-v-5e563b2b=""
209210
data-v-6b8d4c30=""
210-
data-v-6f6953b5=""
211211
/>
212212
<em
213+
data-v-5e563b2b=""
213214
data-v-6b8d4c30=""
214-
data-v-6f6953b5=""
215215
>
216216
Hence they will not be available immediately after enabling but will show up after some time.
217217
</em>
218218
</p>
219219
<p
220+
data-v-5e563b2b=""
220221
data-v-6b8d4c30=""
221-
data-v-6f6953b5=""
222222
>
223223
<span
224224
class="checkbox-radio-switch checkbox-radio-switch-switch checkbox-radio-switch--checked"
225+
data-v-2c897dd5=""
226+
data-v-5e563b2b=""
225227
data-v-6b8d4c30=""
226-
data-v-6f6953b5=""
227-
data-v-f275cf53=""
228228
style="--icon-size: 36px; --icon-height: 16px;"
229229
>
230230
<input
231231
aria-labelledby="caldavSendEventReminders-label"
232232
class="checkbox-radio-switch__input"
233-
data-v-f275cf53=""
233+
data-v-2c897dd5=""
234234
id="caldavSendEventReminders"
235235
type="checkbox"
236236
value=""
237237
/>
238238
<span
239239
class="checkbox-content checkbox-radio-switch__content checkbox-content-switch checkbox-content--has-text"
240+
data-v-2c897dd5=""
240241
data-v-3714b019=""
241-
data-v-f275cf53=""
242242
id="caldavSendEventReminders-label"
243243
>
244244
<span
@@ -277,8 +277,8 @@ exports[`CalDavSettings > interactions 1`] = `
277277
</span>
278278
</span>
279279
<em
280+
data-v-5e563b2b=""
280281
data-v-6b8d4c30=""
281-
data-v-6f6953b5=""
282282
>
283283
Please make sure to properly set up
284284
<a
@@ -289,40 +289,40 @@ exports[`CalDavSettings > interactions 1`] = `
289289
.
290290
</em>
291291
<br
292+
data-v-5e563b2b=""
292293
data-v-6b8d4c30=""
293-
data-v-6f6953b5=""
294294
/>
295295
<em
296+
data-v-5e563b2b=""
296297
data-v-6b8d4c30=""
297-
data-v-6f6953b5=""
298298
>
299299
Notifications are sent via background jobs, so these must occur often enough.
300300
</em>
301301
</p>
302302
<p
303303
class="indented"
304+
data-v-5e563b2b=""
304305
data-v-6b8d4c30=""
305-
data-v-6f6953b5=""
306306
>
307307
<span
308308
class="checkbox-radio-switch checkbox-radio-switch-switch checkbox-radio-switch--checked"
309+
data-v-2c897dd5=""
310+
data-v-5e563b2b=""
309311
data-v-6b8d4c30=""
310-
data-v-6f6953b5=""
311-
data-v-f275cf53=""
312312
style="--icon-size: 36px; --icon-height: 16px;"
313313
>
314314
<input
315315
aria-labelledby="caldavSendEventRemindersToSharedGroupMembers-label"
316316
class="checkbox-radio-switch__input"
317-
data-v-f275cf53=""
317+
data-v-2c897dd5=""
318318
id="caldavSendEventRemindersToSharedGroupMembers"
319319
type="checkbox"
320320
value=""
321321
/>
322322
<span
323323
class="checkbox-content checkbox-radio-switch__content checkbox-content-switch checkbox-content--has-text"
324+
data-v-2c897dd5=""
324325
data-v-3714b019=""
325-
data-v-f275cf53=""
326326
id="caldavSendEventRemindersToSharedGroupMembers-label"
327327
>
328328
<span
@@ -361,36 +361,36 @@ exports[`CalDavSettings > interactions 1`] = `
361361
</span>
362362
</span>
363363
<em
364+
data-v-5e563b2b=""
364365
data-v-6b8d4c30=""
365-
data-v-6f6953b5=""
366366
>
367367
Reminders are always sent to organizers and attendees.
368368
</em>
369369
</p>
370370
<p
371371
class="indented"
372+
data-v-5e563b2b=""
372373
data-v-6b8d4c30=""
373-
data-v-6f6953b5=""
374374
>
375375
<span
376376
class="checkbox-radio-switch checkbox-radio-switch-switch checkbox-radio-switch--checked"
377+
data-v-2c897dd5=""
378+
data-v-5e563b2b=""
377379
data-v-6b8d4c30=""
378-
data-v-6f6953b5=""
379-
data-v-f275cf53=""
380380
style="--icon-size: 36px; --icon-height: 16px;"
381381
>
382382
<input
383383
aria-labelledby="caldavSendEventRemindersPush-label"
384384
class="checkbox-radio-switch__input"
385-
data-v-f275cf53=""
385+
data-v-2c897dd5=""
386386
id="caldavSendEventRemindersPush"
387387
type="checkbox"
388388
value=""
389389
/>
390390
<span
391391
class="checkbox-content checkbox-radio-switch__content checkbox-content-switch checkbox-content--has-text"
392+
data-v-2c897dd5=""
392393
data-v-3714b019=""
393-
data-v-f275cf53=""
394394
id="caldavSendEventRemindersPush-label"
395395
>
396396
<span

‎apps/systemtags/src/components/SystemTagPicker.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
<!-- Color picker -->
5252
<NcColorPicker v-if="canEditOrCreateTag"
5353
:data-cy-systemtags-picker-tag-color="tag.id"
54-
:value="`#${tag.color}`"
54+
:value="`#${tag.color || '000000'}`"
5555
:shown="openedPicker === tag.id"
5656
class="systemtags-picker__tag-color"
5757
@update:value="onColorChange(tag, $event)"

‎build/WebpackSPDXPlugin.js‎

Lines changed: 25 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -137,13 +137,8 @@ class WebpackSPDXPlugin {
137137
.filter((s) => !!s)
138138
.map((s) => s.split('?', 2)[0])
139139

140-
// Skip assets without modules, these are emitted by webpack plugins
141-
if (sources.length === 0) {
142-
logger.warn(`Skipping ${asset} because it does not contain any source information`)
143-
continue
144-
}
145-
146-
/** packages used by the current asset
140+
/**
141+
* packages used by the current asset
147142
* @type {Set<string>}
148143
*/
149144
const packages = new Set()
@@ -198,6 +193,29 @@ class WebpackSPDXPlugin {
198193
output += `- ${pkg.name}\n\t- version: ${pkg.version}\n\t- license: ${license}\n`
199194
}
200195
output = `\n\n${output}`
196+
197+
if (sources.length === 0) {
198+
logger.info(`Checking content of asset ${asset}`)
199+
const sources = [...modules].map((module) => module.identifier())
200+
for (const source of sources) {
201+
const match = source.match(/asset\/inline\|data:image\/svg\+xml,(.+)/)
202+
if (match) {
203+
const content = decodeURI(match[1])
204+
const [, license] = content.match(/SPDX-License-Identifier:\s*([^\s]+)/) ?? []
205+
const [, author] = content.match(/SPDX-FileCopyrightText:\s*([^-]+)/) ?? []
206+
if (author && license) {
207+
authors.add(author)
208+
licenses.add(license)
209+
}
210+
}
211+
}
212+
if (authors.size === 0) {
213+
logger.warn(`Asset ${asset} does not contain any source information`)
214+
continue
215+
}
216+
output = ''
217+
}
218+
201219
for (const author of [...authors].sort()) {
202220
output = `SPDX-FileCopyrightText: ${author}\n${output}`
203221
}

‎core/Controller/SetupController.php‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
use OCP\IInitialStateService;
1313
use OCP\IURLGenerator;
1414
use OCP\Server;
15+
use OCP\ServerVersion;
1516
use OCP\Template\ITemplateManager;
1617
use OCP\Util;
1718
use Psr\Log\LoggerInterface;
@@ -25,6 +26,7 @@ public function __construct(
2526
protected ITemplateManager $templateManager,
2627
protected IInitialStateService $initialStateService,
2728
protected IURLGenerator $urlGenerator,
29+
protected ServerVersion $serverVersion,
2830
) {
2931
$this->autoConfigFile = \OC::$configDir . 'autoconfig.php';
3032
}
@@ -80,6 +82,8 @@ public function display(array $post): void {
8082
'dbtype' => '',
8183
'hasAutoconfig' => false,
8284
'serverRoot' => \OC::$SERVERROOT,
85+
'version' => implode('.', $this->serverVersion->getVersion()),
86+
'versionstring' => $this->serverVersion->getVersionString(),
8387
];
8488
$parameters = array_merge($defaults, $post);
8589

‎core/js/tests/specHelper.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@ OC.config = {
9292
session_lifetime: 600 * 1000,
9393
session_keepalive: false,
9494
blacklist_files_regex: '\.(part|filepart)$',
95+
version: '32.0.0',
9596
};
9697
OC.appConfig = {
9798
core: {}

‎dist/1023-1023.js.license‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ SPDX-License-Identifier: (MPL-2.0 OR Apache-2.0)
66
SPDX-FileCopyrightText: escape-html developers
77
SPDX-FileCopyrightText: Tobias Koppers @sokra
88
SPDX-FileCopyrightText: Nextcloud GmbH and Nextcloud contributors
9-
SPDX-FileCopyrightText: John Molakvoæ (skjnldsv) <[email protected]>
109
SPDX-FileCopyrightText: Evan You
1110
SPDX-FileCopyrightText: Dr.-Ing. Mario Heiderich, Cure53 <[email protected]> (https://cure53.de/)
1211
SPDX-FileCopyrightText: Christoph Wurst
@@ -28,7 +27,7 @@ This file is generated from multiple sources. Included packages:
2827
- version: 3.0.1
2928
- license: GPL-3.0-or-later
3029
- @nextcloud/vue
31-
- version: 8.28.0
30+
- version: 8.29.1
3231
- license: AGPL-3.0-or-later
3332
- @vueuse/core
3433
- version: 11.3.0

0 commit comments

Comments
 (0)