Merge remote-tracking branch 'Joomla/4.4-dev' into 5.0/upmerge-2023-11-12

Author: bembelimen

.drone.yml

@@ -39,7 +39,7 @@ steps:
       - ./libraries/vendor/bin/phan
 
   - name: npm
-    image: node:18-bullseye-slim
+    image: node:20-bullseye-slim
     depends_on: [ phpcs ]
     volumes:
       - name: npm-cache
@@ -382,6 +382,6 @@ trigger:
 
 ---
 kind: signature
-hmac: 16aad9229964700a46de8f3e3265147715d3d5c1173eec9439148af364d6092c
+hmac: 9da03e44bdb36f2473f1c20a83777be096e3f18b7102153cf9135a2fc6ace0e5
 
 ...

README.md

@@ -8,7 +8,7 @@ Build Status
 ---------------------
 | Drone-CI                                                                                                                                 | AppVeyor                                                                                                                                                           | PHP                                                                           | Node                                                                                 | npm                                                                             |
 |------------------------------------------------------------------------------------------------------------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------|-------------------------------------------------------------------------------|--------------------------------------------------------------------------------------|---------------------------------------------------------------------------------|
-| [![Build Status](https://ci.joomla.org/api/badges/joomla/joomla-cms/status.svg?branch=5.0-dev)](https://ci.joomla.org/joomla/joomla-cms) | [![Build status](https://ci.appveyor.com/api/projects/status/ru6sxal8jmfckvjc/branch/5.0-dev?svg=true)](https://ci.appveyor.com/project/release-joomla/joomla-cms) | [![PHP](https://img.shields.io/badge/PHP-V8.1.0-green)](https://www.php.net/) | [![node-lts](https://img.shields.io/badge/Node-V18.0-green)](https://nodejs.org/en/) | [![npm](https://img.shields.io/badge/npm-v9.6.7-green)](https://nodejs.org/en/) |
+| [![Build Status](https://ci.joomla.org/api/badges/joomla/joomla-cms/status.svg?branch=5.0-dev)](https://ci.joomla.org/joomla/joomla-cms) | [![Build status](https://ci.appveyor.com/api/projects/status/ru6sxal8jmfckvjc/branch/5.0-dev?svg=true)](https://ci.appveyor.com/project/release-joomla/joomla-cms) | [![PHP](https://img.shields.io/badge/PHP-V8.1.0-green)](https://www.php.net/) | [![node-lts](https://img.shields.io/badge/Node-V20.0-green)](https://nodejs.org/en/) | [![npm](https://img.shields.io/badge/npm-v10.1.0-green)](https://nodejs.org/en/) |
 
 Overview
 ---------------------

administrator/components/com_admin/script.php

@@ -2488,6 +2488,10 @@ public function updateAssets($installer)
         // List all components added since 4.0
         $newComponents = [
             // Components to be added here
+            'com_guidedtours',
+            'com_mails',
+            'com_scheduler',
+            'com_workflow',
         ];
 
         foreach ($newComponents as $component) {

administrator/components/com_content/tmpl/articles/modal.php

@@ -94,6 +94,7 @@
                     -2 => 'icon-trash',
                     0  => 'icon-times',
                     1  => 'icon-check',
+                    2  => 'icon-archive',
                 ];
                 ?>
                 <?php foreach ($this->items as $i => $item) : ?>

administrator/components/com_finder/src/Indexer/Parser.php

@@ -97,13 +97,13 @@ public function parse($input)
             // Find the last space character if we aren't at the end.
             $ls = (($start + $chunk) < $end ? strrpos($string, ' ') : false);
 
-            // Truncate to the last space character.
+            // Truncate to the last space character (but include it in the string).
             if ($ls !== false) {
-                $string = substr($string, 0, $ls);
+                $string = substr($string, 0, $ls + 1);
             }
 
             // Adjust the start position for the next iteration.
-            $start += ($ls !== false ? ($ls + 1 - $chunk) + $chunk : $chunk);
+            $start += $ls !== false ? $ls + 1 : $chunk;
 
             // Parse the chunk.
             $return .= $this->process($string);

administrator/components/com_media/config.xml

@@ -55,7 +55,7 @@
 			type="textarea"
 			label="COM_MEDIA_FIELD_RESTRICT_UPLOADS_EXTENSIONS_LABEL"
 			description="COM_MEDIA_FIELD_RESTRICT_UPLOADS_EXTENSIONS_DESC"
-			default="bmp,gif,jpg,jpeg,png,webp,avif,ico,mp3,mp4,odg,odp,ods,odt,pdf,png,ppt,txt,xcf,xls,csv"
+			default="bmp,gif,jpg,jpeg,png,webp,avif,ico,mp3,mp4,odg,odp,ods,odt,pdf,ppt,txt,xcf,xls,csv"
 			showon="restrict_uploads:1"
 		/>
 

api/components/com_content/src/Controller/ArticlesController.php

@@ -11,6 +11,7 @@
 namespace Joomla\Component\Content\Api\Controller;
 
 use Joomla\CMS\Filter\InputFilter;
+use Joomla\CMS\Helper\TagsHelper;
 use Joomla\CMS\MVC\Controller\ApiController;
 use Joomla\Component\Fields\Administrator\Helper\FieldsHelper;
 
@@ -114,6 +115,10 @@ protected function preprocessSaveData(array $data): array
             }
         }
 
+        $tags = new TagsHelper();
+        $tags->getTagIds($data['id'], 'com_content.article');
+        $data['tags'] = explode(',', $tags->tags);
+
         return $data;
     }
 }

build/build-modules-js/error-pages.es6.js

@@ -4,10 +4,8 @@ const {
 const Ini = require('ini');
 const { dirname } = require('path');
 const Recurs = require('recursive-readdir');
-const Postcss = require('postcss');
-const Autoprefixer = require('autoprefixer');
-const CssNano = require('cssnano');
-const { minify } = require('terser');
+const { transform } = require('esbuild');
+const LightningCSS = require('lightningcss');
 
 const RootPath = process.cwd();
 const dir = `${RootPath}/installation/language`;
@@ -35,10 +33,13 @@ module.exports.createErrorPages = async (options) => {
   let cssContent = await readFile(`${srcPath}/template.css`, { encoding: 'utf8' });
   let jsContent = await readFile(`${srcPath}/template.js`, { encoding: 'utf8' });
 
-  const cssMin = await Postcss([Autoprefixer, CssNano]).process(cssContent, { from: undefined });
+  const { code } = LightningCSS.transform({
+    code: Buffer.from(cssContent),
+    minify: true,
+  });
 
-  cssContent = cssMin.css;
-  jsContent = await minify(jsContent);
+  cssContent = code;
+  jsContent = await transform(jsContent, { minify: true });
 
   const processIni = async (file) => {
     const languageStrings = Ini.parse(await readFile(file, { encoding: 'utf8' }));

build/build-modules-js/init/minify-vendor.es6.js

@@ -1,7 +1,7 @@
 const { lstat, readFile, writeFile } = require('fs-extra');
 const { sep, basename } = require('path');
 const recursive = require('recursive-readdir');
-const { minify } = require('terser');
+const { transform } = require('esbuild');
 
 const RootPath = process.cwd();
 
@@ -70,7 +70,7 @@ const minifyJS = async (file) => {
   if (isMinified || needsDotJS) {
     minified = content;
   } else {
-    minified = (await minify(content, { sourceMap: false, format: { comments: false } })).code;
+    minified = (await transform(content, { minify: true })).code;
   }
 
   const newFile = needsDotJS ? file.replace('.min.js', '.js') : file.replace('.js', '.min.js');

build/build-modules-js/javascript/build-bootstrap-js.es6.js

@@ -2,7 +2,7 @@ const {
   readdir, readFile, writeFile, unlink,
 } = require('fs').promises;
 const { resolve } = require('path');
-const { minify } = require('terser');
+const { transform } = require('esbuild');
 const rimraf = require('rimraf');
 const rollup = require('rollup');
 const { nodeResolve } = require('@rollup/plugin-node-resolve');
@@ -16,7 +16,7 @@ const outputFolder = 'media/vendor/bootstrap/js';
 
 const createMinified = async (file) => {
   const initial = await readFile(resolve(outputFolder, file), { encoding: 'utf8' });
-  const mini = await minify(initial.replace('./popper.js', `./popper.min.js?${bsVersion}`).replace('./dom.js', `./dom.min.js?${bsVersion}`), { sourceMap: false, format: { comments: false } });
+  const mini = await transform(initial.replace('./popper.js', `./popper.min.js?${bsVersion}`).replace('./dom.js', `./dom.min.js?${bsVersion}`), { minify: true });
   await writeFile(resolve(outputFolder, file), initial.replace('./popper.js', `./popper.js?${bsVersion}`).replace('./dom.js', `./dom.js?${bsVersion}`), { encoding: 'utf8', mode: 0o644 });
   await writeFile(resolve(outputFolder, file.replace('.js', '.min.js')), mini.code, { encoding: 'utf8', mode: 0o644 });
 };