Skip to content

Commit 8f4562d

Browse files
authored
Merge pull request #117 from nextcloud/enh/noid/vue3
Migrate to Vue 3 and nextcloud/vue 9
2 parents d7bffc2 + 8ebb22f commit 8f4562d

15 files changed

Lines changed: 10478 additions & 5492 deletions

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ js/
88
.vscode-upload.json
99
.*.sw*
1010
node_modules
11-
/vendor
11+
vendor/

REUSE.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ SPDX-FileCopyrightText = "2020 Nextcloud GmbH and Nextcloud contributors"
1818
SPDX-License-Identifier = "AGPL-3.0-or-later"
1919

2020
[[annotations]]
21-
path = ["composer.json", "composer.lock"]
21+
path = ["composer.json", "composer.lock", "vendor-bin/psalm/composer.json", "vendor-bin/psalm/composer.lock"]
2222
precedence = "aggregate"
2323
SPDX-FileCopyrightText = "2023 Nextcloud GmbH and Nextcloud contributors"
2424
SPDX-License-Identifier = "AGPL-3.0-or-later"

composer.json

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,36 @@
11
{
22
"require": {
3-
"php": ">=8.1"
3+
"php": ">=8.1",
4+
"bamarni/composer-bin-plugin": "^1.8"
45
},
56
"scripts": {
67
"lint": "find . -name \\*.php -not -path './vendor/*' -print0 | xargs -0 -n1 php -l",
78
"cs:check": "php-cs-fixer fix --dry-run --diff",
89
"cs:fix": "php-cs-fixer fix",
9-
"psalm": "psalm.phar --no-cache",
10-
"psalm:update-baseline": "psalm.phar --threads=1 --update-baseline",
11-
"psalm:update-baseline:force": "psalm.phar --threads=1 --update-baseline --set-baseline=tests/psalm-baseline.xml"
10+
"psalm": "psalm --no-cache",
11+
"psalm:update-baseline": "psalm --threads=1 --update-baseline",
12+
"psalm:update-baseline:force": "psalm --threads=1 --update-baseline --set-baseline=tests/psalm-baseline.xml"
1213
},
1314
"require-dev": {
1415
"friendsofphp/php-cs-fixer": "^3",
1516
"nextcloud/coding-standard": "^1",
16-
"psalm/phar": "6.7.x",
1717
"nextcloud/ocp": "dev-master",
1818
"guzzlehttp/guzzle": "^7.5.1",
1919
"sabre/dav": "^4.4.0"
2020
},
2121
"config": {
2222
"platform": {
2323
"php": "8.1"
24+
},
25+
"allow-plugins": {
26+
"bamarni/composer-bin-plugin": true
27+
}
28+
},
29+
"extra": {
30+
"bamarni-bin": {
31+
"bin-links": true,
32+
"target-directory": "vendor-bin",
33+
"forward-command": true
2434
}
2535
}
2636
}

0 commit comments

Comments
 (0)