Merge branch 'main' into enh/add-occ-debug-command

nextcloud · Dec 12, 2024 · 565737f · 565737f
2 parents 131fcea + 099e479
commit 565737f
Show file tree

Hide file tree

Showing 240 changed files with 14,339 additions and 30,044 deletions.
diff --git a/.eslintrc.cjs → .eslintrc.js b/.eslintrc.cjs → .eslintrc.js
diff --git a/.github/workflows/appstore-conventional-build-publish.yml b/.github/workflows/appstore-conventional-build-publish.yml
@@ -43,6 +43,8 @@ jobs:
         working-directory: ${{ env.APP_NAME }}
         with:
           github-token: ${{ secrets.RELEASE_PAT }}
+          git-user-email: nextcloud-command@users.noreply.github.com
+          git-user-name: Nextcloud Command Bot
           skip-git-pull: "true"
           pre-commit: build/pre-commit.js
           release-count: 0
@@ -69,7 +71,7 @@ jobs:
 
       - name: Set up node ${{ steps.versions.outputs.nodeVersion }}
         if: ${{ steps.changelog.outputs.skipped == 'false' }}
-        uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4
+        uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4
         with:
           node-version: ${{ steps.versions.outputs.nodeVersion }}
 

diff --git a/.github/workflows/lint-eslint.yml b/.github/workflows/lint-eslint.yml
@@ -63,7 +63,7 @@ jobs:
           fallbackNpm: '^9'
 
       - name: Set up node ${{ steps.versions.outputs.nodeVersion }}
-        uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4
+        uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4
         with:
           node-version: ${{ steps.versions.outputs.nodeVersion }}
 

diff --git a/.github/workflows/npm-audit-fix.yml b/.github/workflows/npm-audit-fix.yml
@@ -39,7 +39,7 @@ jobs:
           fallbackNpm: '^10'
 
       - name: Set up node ${{ steps.versions.outputs.nodeVersion }}
-        uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4
+        uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4
         with:
           node-version: ${{ steps.versions.outputs.nodeVersion }}
 

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -207,7 +207,7 @@ jobs:
               fallbackNode: '^14'
               fallbackNpm: '^7'
           - name: Set up node ${{ steps.versions.outputs.nodeVersion }}
-            uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4
+            uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4
             with:
               node-version: ${{ steps.versions.outputs.nodeVersion }}
           - name: Set up npm ${{ steps.versions.outputs.npmVersion }}

diff --git a/.github/workflows/update-public-suffix-list.yml b/.github/workflows/update-public-suffix-list.yml
@@ -14,7 +14,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        branches: ['main', 'stable3.7']
+        branches: ['main', 'stable4.1', 'stable4.0', 'stable3.7']
 
     name: update-public-suffix-list-${{ matrix.branches }}
 
@@ -25,7 +25,7 @@ jobs:
           submodules: true
 
       - name: Download public suffix list
-        run: curl --output resources/resources/public_suffix_list.dat https://publicsuffix.org/list/public_suffix_list.dat
+        run: curl --output resources/public_suffix_list.dat https://publicsuffix.org/list/public_suffix_list.dat
 
       - name: Create Pull Request
         uses: peter-evans/create-pull-request@7920c48d6af627948130adb390df5809c471ae3b

diff --git a/.gitignore b/.gitignore
@@ -17,7 +17,6 @@ tests/clover*.xml
 node_modules/
 
 /js
-/css
 
 # packaged app
 build/artifacts

diff --git a/.nextcloudignore b/.nextcloudignore
@@ -19,6 +19,7 @@ codecov.yml
 /jest.config.js
 /krankerl.toml
 /l10n/no-php
+/.php-cs-fixer.dist.php
 /.tx
 /Makefile
 /.nextcloudignore
@@ -36,5 +37,8 @@ codecov.yml
 /vendor/bin
 /vendor-bin
 /vendor/cerdic/css-tidy/css_optimiser.php
-/vendor/wamania/php-stemmer/test
+/vendor/*/*/e2e
+/vendor/*/*/test
+/vendor/*/*/tests
+/vendor/*/*/test_data
 /webpack.*
diff --git a/babel.config.cjs b/babel.config.cjs
diff --git a/babel.config.js b/babel.config.js
@@ -0,0 +1,19 @@
+/**
+ * SPDX-FileCopyrightText: 2018 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+module.exports = {
+	plugins: [
+		'@babel/plugin-syntax-dynamic-import'
+	],
+	presets: [
+		[
+			'@babel/preset-env',
+			{
+				modules: process.env.NODE_ENV === 'testing' ? 'commonjs' : undefined,
+				useBuiltIns: process.env.NODE_ENV === 'testing' ? 'usage' : 'entry',
+				corejs: 3
+			}
+		]
+	]
+};
diff --git a/composer.json b/composer.json
@@ -25,12 +25,12 @@
 		"bytestream/horde-text-filter": "^2.5.0",
 		"bytestream/horde-text-flowed": "^2.1",
 		"bytestream/horde-util": "^2.8.0",
-		"cerdic/css-tidy": "v2.1.0",
-		"ezyang/htmlpurifier": "4.17.0",
+		"cerdic/css-tidy": "v2.2.1",
+		"ezyang/htmlpurifier": "4.18.0",
 		"glenscott/url-normalizer": "^1.4",
 		"gravatarphp/gravatar": "dev-master#6b9f6a45477ce48285738d9d0c3f0dbf97abe263",
 		"hamza221/html2text": "^1.0",
-		"jeremykendall/php-domain-parser": "^6.3",
+		"jeremykendall/php-domain-parser": "^6.3.1",
 		"nextcloud/horde-managesieve": "^1.0",
 		"nextcloud/horde-smtp": "^1.0.2",
 		"nextcloud/kitinerary": "^1.0",
@@ -39,7 +39,7 @@
 		"nextcloud/kitinerary-sys": "^1.0.1",
 		"phpmailer/dkimvalidator": "^0.3.0",
 		"psr/log": "^3.0.2",
-		"rubix/ml": "2.5.1",
+		"rubix/ml": "2.5.2",
 		"sabberworm/php-css-parser": "^8.7.0",
 		"youthweb/urllinker": "^2.0"
 	},
-Original file line number
+Diff line change
@@ Expand Up / @@ -17,7 +17,6 @@ tests/clover*.xml @@
     node_modules/
     /js
-    /css
     # packaged app
     build/artifacts
@@ Expand Down @@