Merge branch 'release/6.0.11'

TYPO3GmbH · Oct 17, 2023 · 0578c62 · 0578c62
2 parents c960285 + d0a3314
commit 0578c62
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 29 deletions.
diff --git a/.mage.yml b/.mage.yml
@@ -52,6 +52,7 @@ magephp:
         - exec: { cmd: "php ../../../cachetool/cachetool.phar opcache:reset --fcgi=/var/run/intercept.typo3.com_fpm.sock --tmp-dir=/srv/vhosts/intercept.typo3.com/site/cachetool"}
         - exec: { cmd: "rm -rf var/cache"}
         - exec: { cmd: "php8.2 ./bin/console cache:warmup"}
+        - exec: { cmd: "php8.2 ./bin/console app:docs-redirect-deploy"}
       post-deploy:
 
     develop:

diff --git a/config/nginx/redirects.conf b/config/nginx/redirects.conf
@@ -841,6 +841,10 @@ location ~ ^/typo3cms/extensions/feusersmap/(master|latest|stable)/(.*) {
     return 303 /p/wsr/feusersmap/main/en-us/$2;
 }
 
+location ~ ^/typo3cms/extensions/externalimport_tut/(master|latest|stable)/(.*) {
+    return 303 /p/cobweb/externalimport_tut/main/en-us/$2;
+}
+
 # getting started rewrite 2021
 location ~ ^/m/typo3/tutorial-getting-started/main/en-us/GeneralPrinciples/(.*) {
     return 303 /m/typo3/tutorial-getting-started/main/en-us/Concepts/Index.html;

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
     "devDependencies": {
         "@symfony/webpack-encore": "^4.4.0",
-        "core-js": "^3.32.2",
+        "core-js": "^3.33.0",
         "file-loader": "^6.2.0",
         "webpack-notifier": "^1.15.0"
     },