From ba317b7b099273030acf6440054b36264d8418c9 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Wed, 26 Aug 2026 07:55:36 +0200 Subject: [PATCH 1/2] feat(deps): Add Nextcloud 36 support on master Signed-off-by: Joas Schilling --- .github/dependabot.yml | 19 +++ .github/workflows/npm-audit-fix.yml | 1 + .github/workflows/update-nextcloud-ocp.yml | 1 + appinfo/info.xml | 4 +- composer.lock | 186 +++++++++++++++++++-- package-lock.json | 4 +- package.json | 2 +- 7 files changed, 201 insertions(+), 16 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 0e274aa4..b546b185 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -50,6 +50,25 @@ updates: - dependencies # Latest stable branch + - package-ecosystem: npm + target-branch: stable35 + directory: "/" + schedule: + interval: weekly + day: saturday + time: "04:00" + timezone: Europe/Paris + cooldown: + default-days: 10 + open-pull-requests-limit: 20 + labels: + - "3. to review" + - "feature: dependencies" + ignore: + # no major updates on stable branches + - dependency-name: "*" + update-types: ["version-update:semver-major"] + - package-ecosystem: npm target-branch: stable34 directory: "/" diff --git a/.github/workflows/npm-audit-fix.yml b/.github/workflows/npm-audit-fix.yml index 928fc930..fd84e64a 100644 --- a/.github/workflows/npm-audit-fix.yml +++ b/.github/workflows/npm-audit-fix.yml @@ -26,6 +26,7 @@ jobs: matrix: branches: - ${{ github.event.repository.default_branch }} + - 'stable35' - 'stable34' - 'stable33' - 'stable32' diff --git a/.github/workflows/update-nextcloud-ocp.yml b/.github/workflows/update-nextcloud-ocp.yml index f09ae8f9..2d359af4 100644 --- a/.github/workflows/update-nextcloud-ocp.yml +++ b/.github/workflows/update-nextcloud-ocp.yml @@ -29,6 +29,7 @@ jobs: matrix: branches: - ${{ github.event.repository.default_branch }} + - 'stable35' - 'stable34' - 'stable33' - 'stable32' diff --git a/appinfo/info.xml b/appinfo/info.xml index 120e9f57..c26073f4 100644 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -11,7 +11,7 @@ Displays resources related to current item in right panel. - 6.0.0-dev.0 + 7.0.0-dev.0 agpl Maxence Lange RelatedResources @@ -23,7 +23,7 @@ https://github.com/nextcloud/related_resources/issues https://github.com/nextcloud/related_resources.git - + diff --git a/composer.lock b/composer.lock index 9ce299cd..f00ee705 100644 --- a/composer.lock +++ b/composer.lock @@ -1795,12 +1795,12 @@ "source": { "type": "git", "url": "https://github.com/nextcloud-deps/ocp.git", - "reference": "cba9ce148ee675a84f659024d0362f47193e5230" + "reference": "ddc90a88f4ec0166a1c0384cf6d0370e3dc53898" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nextcloud-deps/ocp/zipball/cba9ce148ee675a84f659024d0362f47193e5230", - "reference": "cba9ce148ee675a84f659024d0362f47193e5230", + "url": "https://api.github.com/repos/nextcloud-deps/ocp/zipball/ddc90a88f4ec0166a1c0384cf6d0370e3dc53898", + "reference": "ddc90a88f4ec0166a1c0384cf6d0370e3dc53898", "shasum": "" }, "require": { @@ -1809,7 +1809,11 @@ "psr/container": "^2.0.2", "psr/event-dispatcher": "^1.0", "psr/http-client": "^1.0.3", - "psr/log": "^3.0.2" + "psr/log": "^3.0.2", + "symfony/polyfill-intl-normalizer": "^1.38", + "symfony/polyfill-php84": "^1.38", + "symfony/polyfill-php85": "^1.41", + "symfony/polyfill-php86": "^1.41" }, "default-branch": true, "type": "library", @@ -1837,7 +1841,7 @@ "issues": "https://github.com/nextcloud-deps/ocp/issues", "source": "https://github.com/nextcloud-deps/ocp/tree/master" }, - "time": "2026-08-09T00:51:34+00:00" + "time": "2026-08-26T00:37:28+00:00" }, { "name": "nikic/php-parser", @@ -4580,16 +4584,16 @@ }, { "name": "symfony/polyfill-intl-normalizer", - "version": "v1.38.0", + "version": "v1.42.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-normalizer.git", - "reference": "2d446c214bdbe5b71bde5011b060a05fece3ae6b" + "reference": "aa20edea75bd9c48cfecc8360922e5a6e5c44502" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/2d446c214bdbe5b71bde5011b060a05fece3ae6b", - "reference": "2d446c214bdbe5b71bde5011b060a05fece3ae6b", + "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/aa20edea75bd9c48cfecc8360922e5a6e5c44502", + "reference": "aa20edea75bd9c48cfecc8360922e5a6e5c44502", "shasum": "" }, "require": { @@ -4641,7 +4645,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.38.0" + "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.42.0" }, "funding": [ { @@ -4661,7 +4665,7 @@ "type": "tidelift" } ], - "time": "2026-05-25T13:48:31+00:00" + "time": "2026-08-07T06:33:24+00:00" }, { "name": "symfony/polyfill-mbstring", @@ -4828,6 +4832,166 @@ ], "time": "2026-05-26T12:51:13+00:00" }, + { + "name": "symfony/polyfill-php85", + "version": "v1.41.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-php85.git", + "reference": "255fab485aaa1006ed411040c42aecd7b5302d7a" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-php85/zipball/255fab485aaa1006ed411040c42aecd7b5302d7a", + "reference": "255fab485aaa1006ed411040c42aecd7b5302d7a", + "shasum": "" + }, + "require": { + "php": ">=7.2" + }, + "type": "library", + "extra": { + "thanks": { + "url": "https://github.com/symfony/polyfill", + "name": "symfony/polyfill" + } + }, + "autoload": { + "files": [ + "bootstrap.php" + ], + "psr-4": { + "Symfony\\Polyfill\\Php85\\": "" + }, + "classmap": [ + "Resources/stubs" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill backporting some PHP 8.5+ features to lower PHP versions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "polyfill", + "portable", + "shim" + ], + "support": { + "source": "https://github.com/symfony/polyfill-php85/tree/v1.41.0" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://github.com/nicolas-grekas", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2026-07-01T12:47:55+00:00" + }, + { + "name": "symfony/polyfill-php86", + "version": "v1.41.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-php86.git", + "reference": "6bc356ed3d8dbfeea8f0de235e34d670704e880e" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-php86/zipball/6bc356ed3d8dbfeea8f0de235e34d670704e880e", + "reference": "6bc356ed3d8dbfeea8f0de235e34d670704e880e", + "shasum": "" + }, + "require": { + "php": ">=7.2" + }, + "type": "library", + "extra": { + "thanks": { + "url": "https://github.com/symfony/polyfill", + "name": "symfony/polyfill" + } + }, + "autoload": { + "files": [ + "bootstrap.php" + ], + "psr-4": { + "Symfony\\Polyfill\\Php86\\": "" + }, + "classmap": [ + "Resources/stubs" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill backporting some PHP 8.6+ features to lower PHP versions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "polyfill", + "portable", + "shim" + ], + "support": { + "source": "https://github.com/symfony/polyfill-php86/tree/v1.41.0" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://github.com/nicolas-grekas", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2026-07-02T13:42:24+00:00" + }, { "name": "symfony/service-contracts", "version": "v3.7.0", diff --git a/package-lock.json b/package-lock.json index e69fb40c..7986c49e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "related_resources", - "version": "6.0.0-dev.0", + "version": "7.0.0-dev.0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "related_resources", - "version": "6.0.0-dev.0", + "version": "7.0.0-dev.0", "license": "AGPL-3.0-or-later", "dependencies": { "@nextcloud/axios": "^2.5.1", diff --git a/package.json b/package.json index e6c4efeb..4f9bcf39 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "related_resources", - "version": "6.0.0-dev.0", + "version": "7.0.0-dev.0", "description": "Related Resources", "main": "main.js", "private": true, From 23778dfab6fae9020cc8d4083feedc56fbda974f Mon Sep 17 00:00:00 2001 From: nextcloud-command Date: Wed, 26 Aug 2026 11:07:56 +0000 Subject: [PATCH 2/2] chore(assets): Recompile assets Signed-off-by: nextcloud-command --- js/related_resources.js.license | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/related_resources.js.license b/js/related_resources.js.license index e3a42c49..025bd91a 100644 --- a/js/related_resources.js.license +++ b/js/related_resources.js.license @@ -30,5 +30,5 @@ This file is generated from multiple sources. Included packages: - version: 5.101.3 - license: MIT - related_resources - - version: 6.0.0-dev.0 + - version: 7.0.0-dev.0 - license: AGPL-3.0-or-later