[6.0] Upmerge 2025-09-26

Merge pull request joomla#46175 from richard67/6.0-dev-upmerge-2025-09-26

Author: Bodge-IT

.github/workflows/create-translation-pull-request-v5.yml

@@ -26,14 +26,14 @@ jobs:
     if: ${{ github.repository == 'joomla-translation-bot/joomla-cms' && github.ref == 'refs/heads/translation5' }}
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v5
         # We need the full depth to create / update the pull request against the main repo
         with:
           ref: translation5
           fetch-depth: 0
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v5
         with:
-          node-version: 20
+          node-version: 24
 
       - name: Fetch latest cms changes
         run: |

.github/workflows/create-translation-pull-request-v6.yml

@@ -26,14 +26,14 @@ jobs:
     if: ${{ github.repository == 'joomla-translation-bot/joomla-cms' && github.ref == 'refs/heads/translation6' }}
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v5
         # We need the full depth to create / update the pull request against the main repo
         with:
           ref: translation6
           fetch-depth: 0
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v5
         with:
-          node-version: 20
+          node-version: 24
 
       - name: Fetch latest cms changes
         run: |

build/build-modules-js/compress.mjs

@@ -13,7 +13,7 @@ async function getFiles(path) {
   // Get files within the current directory
   return (await readdir(path, { withFileTypes: true, recursive: true }))
     .filter((file) => !file.isDirectory() && ['.js', '.css'].includes(extname(file.name)))
-    .map((file) => `${file.path}/${file.name}`);
+    .map((file) => `${file.parentPath}/${file.name}`);
 }
 
 /**

build/build-modules-js/css-versioning.mjs renamed to build/build-modules-js/stylesheets/css-versioning.mjs

@@ -3,7 +3,7 @@ import { readdir, readFile, writeFile } from 'node:fs/promises';
 import { existsSync, readFileSync } from 'node:fs';
 import { dirname, extname, resolve } from 'node:path';
 import { transform, composeVisitors } from 'lightningcss';
-import { Timer } from './utils/timer.mjs';
+import { Timer } from '../utils/timer.mjs';
 
 const RootPath = process.cwd();
 const skipExternal = true;
@@ -37,17 +37,13 @@ function version(urlString, fromFile) {
  * @param {from: String} - the filepath for the css file
  * @returns {import('lightningcss').Visitor} - A visitor that replaces the url
  */
-function urlVersioning(fromFile) {
-  return {
-    /**
-     * @param {import('lightningcss').Url} url - The url object to transform
-     * @returns {import('lightningcss').Url} - The transformed url object
-     */
-    Url(url) {
-      return { ...url, ...{ url: version(url.url, fromFile) } };
-    },
-  };
-}
+const urlVersioning = (fromFile) => ({
+  /**
+   * @param {import('lightningcss').Url} url - The url object to transform
+   * @returns {import('lightningcss').Url} - The transformed url object
+   */
+  Url: (url) => ({ ...url, url: version(url.url, fromFile) }),
+});
 
 /**
  * Adds a hash to the url() parts of the static css
@@ -57,8 +53,25 @@ function urlVersioning(fromFile) {
  */
 const fixVersion = async (file) => {
   try {
+    let content = await readFile(file, { encoding: 'utf8' });
+    // To preserve the licence the comment needs to start at the beginning of the file
+    const replaceUTF8String = file.endsWith('.min.css') ? '@charset "UTF-8";' : '@charset "UTF-8";\n';
+    content = content.startsWith(replaceUTF8String) ? content.replace(replaceUTF8String, '') : content;
+
+    // Preserve a leading license comment (/** ... */)
+    const firstLine = content.split(/\r?\n/)[0] || '';
+    if (firstLine.includes('/*') && !firstLine.includes('/*!')) {
+      const endCommentIdx = content.indexOf('*/');
+      if (endCommentIdx !== -1
+          && (content.substring(0, endCommentIdx).includes('license')
+          || content.substring(0, endCommentIdx).includes('copyright'))
+      ) {
+        content = firstLine.includes('/**') ? content.replace('/**', '/*!') : content.replace('/*', '/*!');
+      }
+    }
+
     const { code } = transform({
-      code: await readFile(file),
+      code: Buffer.from(content),
       minify: file.endsWith('.min.css'),
       visitor: composeVisitors([urlVersioning(file)]),
     });
@@ -76,13 +89,15 @@ const fixVersion = async (file) => {
  *
  * @returns {Promise<void>}
  */
-export const cssVersioning = async () => {
+const cssVersioningVendor = async () => {
   const bench = new Timer('Versioning');
 
-  const cssFiles = (await readdir(`${RootPath}/media`, { withFileTypes: true, recursive: true }))
+  const cssFiles = (await readdir(`${RootPath}/media/vendor`, { withFileTypes: true, recursive: true }))
     .filter((file) => (!file.isDirectory() && extname(file.name) === '.css'))
-    .map((file) => `${file.path}/${file.name}`);
+    .map((file) => `${file.parentPath}/${file.name}`);
 
   Promise.all(cssFiles.map((file) => fixVersion(file)))
     .then(() => bench.stop());
 };
+
+export { urlVersioning, cssVersioningVendor };

build/build-modules-js/stylesheets/handle-css.mjs

@@ -1,31 +1,52 @@
 import { dirname, sep } from 'node:path';
 
 import pkg from 'fs-extra';
-import { transform as transformCss } from 'lightningcss';
+import { transform as transformCss, composeVisitors } from 'lightningcss';
+import { urlVersioning } from './css-versioning.mjs';
 
 const {
-  copy, readFile, writeFile, ensureDir,
+  readFile, writeFile, ensureDir,
 } = pkg;
 
 export const handleCssFile = async (file) => {
   const outputFile = file.replace(`${sep}build${sep}media_source${sep}`, `${sep}media${sep}`);
   try {
-    // CSS file, we will copy the file and then minify it in place
+    // CSS file, we will process the file and then minify it in place
     // Ensure that the directories exist or create them
     await ensureDir(dirname(outputFile), { recursive: true, mode: 0o755 });
 
+    let content = await readFile(file, { encoding: 'utf8' });
+
+    // To preserve the licence the comment needs to start at the beginning of the file
+    content = content.startsWith('@charset "UTF-8";\n') ? content.replace('@charset "UTF-8";\n', '') : content;
+
     if (file !== outputFile) {
-      await copy(file, outputFile, { preserveTimestamps: true, overwrite: true });
+      const { code: css } = transformCss({
+        code: Buffer.from(content),
+        minify: false,
+        visitor: composeVisitors([urlVersioning(file)]), // Adds a hash to the url() parts of the static css
+      });
+
+      // Save optimized css file
+      await writeFile(
+        outputFile,
+        content.startsWith('@charset "UTF-8";')
+          ? css
+          : `@charset "UTF-8";
+${css}`,
+        { encoding: 'utf8', mode: 0o644 },
+      );
     }
 
-    const content = await readFile(file, { encoding: 'utf8' });
-    const { code } = transformCss({
+    // Process the file and minify it in place
+    const { code: cssMin } = transformCss({
       code: Buffer.from(content),
       minify: true,
+      visitor: composeVisitors([urlVersioning(outputFile)]), // Adds a hash to the url() parts of the static css
     });
 
-    // Ensure the folder exists or create it
-    await writeFile(outputFile.replace('.css', '.min.css'), `@charset "UTF-8";${code}`, { encoding: 'utf8', mode: 0o644 });
+    // Save minified css file
+    await writeFile(outputFile.replace('.css', '.min.css'), `@charset "UTF-8";${cssMin}`, { encoding: 'utf8', mode: 0o644 });
 
     console.log(`✅ CSS file copied/minified: ${file}`);
   } catch (err) {

build/build-modules-js/stylesheets/handle-scss.mjs

@@ -3,8 +3,9 @@ import { dirname, sep } from 'node:path';
 
 import rtlcss from 'rtlcss';
 import { ensureDir } from 'fs-extra';
-import { transform as transformCss, Features } from 'lightningcss';
+import { transform as transformCss, Features, composeVisitors } from 'lightningcss';
 import { compileAsync } from 'sass-embedded';
+import { urlVersioning } from './css-versioning.mjs';
 
 const getOutputFile = (file) => file.replace(`${sep}scss${sep}`, `${sep}css${sep}`).replace('.scss', '.css').replace(`${sep}build${sep}media_source${sep}`, `${sep}media${sep}`);
 
@@ -26,24 +27,43 @@ export const handleScssFile = async (file) => {
     contents = rtlcss.process(contents);
   }
 
+  // To preserve the licence the comment needs to start at the beginning of the file
+  contents = contents.startsWith('@charset "UTF-8";\n') ? contents.replace('@charset "UTF-8";\n', '') : contents;
+
   // Ensure the folder exists or create it
   await ensureDir(dirname(cssFile), {});
+
+  const { code: css } = transformCss({
+    code: Buffer.from(contents),
+    minify: false,
+    exclude: Features.VendorPrefixes,
+    visitor: composeVisitors([urlVersioning(file)]), // Adds a hash to the url() parts of the static css
+  });
+
+  // Save optimized css file
   await writeFile(
     cssFile,
-    `@charset "UTF-8";
-${contents}`,
+    contents.startsWith('@charset "UTF-8";')
+      ? css
+      : `@charset "UTF-8";
+${css}`,
     { encoding: 'utf8', mode: 0o644 },
   );
 
   const { code: cssMin } = transformCss({
     code: Buffer.from(contents),
     minify: true,
     exclude: Features.VendorPrefixes,
+    visitor: composeVisitors([urlVersioning(cssFile)]), // Adds a hash to the url() parts of the static css
   });
 
   // Ensure the folder exists or create it
   await ensureDir(dirname(cssFile.replace('.css', '.min.css')), {});
-  await writeFile(cssFile.replace('.css', '.min.css'), `@charset "UTF-8";${cssMin}`, { encoding: 'utf8', mode: 0o644 });
+  await writeFile(
+    cssFile.replace('.css', '.min.css'),
+    `@charset "UTF-8";${cssMin}`,
+    { encoding: 'utf8', mode: 0o644 },
+  );
 
   console.log(`✅ SCSS File compiled: ${cssFile}`);
 };

build/build.mjs

@@ -13,7 +13,6 @@
  * node build.mjs --com-media        will compile the media manager Vue application
  * node build.mjs --watch-com-media  will watch and compile the media manager Vue application
  * node build.mjs --gzip             will create gzip files for all the minified stylesheets and scripts.
- * node build.mjs --cssversioning    will update all the url entries providing accurate versions for stylesheets.
  * node build.mjs --versioning       will update all the joomla.assets.json files providing accurate versions for stylesheets and scripts.
  */
 
@@ -34,10 +33,10 @@ import { recreateMediaFolder } from './build-modules-js/init/recreate-media.mjs'
 import { watching } from './build-modules-js/watch.mjs';
 import { mediaManager, watchMediaManager } from './build-modules-js/javascript/build-com_media-js.mjs';
 import { compressFiles } from './build-modules-js/compress.mjs';
-import { cssVersioning } from './build-modules-js/css-versioning.mjs';
 import { versioning } from './build-modules-js/versioning.mjs';
 import { Timer } from './build-modules-js/utils/timer.mjs';
 import { compileCodemirror } from './build-modules-js/javascript/build-codemirror.mjs';
+import { cssVersioningVendor } from './build-modules-js/stylesheets/css-versioning.mjs';
 
 const require = createRequire(import.meta.url);
 
@@ -103,10 +102,6 @@ Program.allowUnknownOption()
   )
   .option('--gzip', 'Compress all the minified stylesheets and scripts.')
   .option('--prepare', 'Run all the needed tasks to initialise the repo')
-  .option(
-    '--cssversioning',
-    'Update all the url() versions on their relative stylesheet files',
-  )
   .option(
     '--versioning',
     'Update all the .js/.css versions on their relative joomla.assets.json',
@@ -130,6 +125,7 @@ if (cliOptions.copyAssets) {
     .then(() => cleanVendors())
     .then(() => localisePackages(options))
     .then(() => patchPackages(options))
+    .then(() => cssVersioningVendor())
     .then(() => minifyVendor())
     .catch((error) => handleError(error, 1));
 }
@@ -185,11 +181,6 @@ if (cliOptions.versioning) {
   versioning().catch((err) => handleError(err, 1));
 }
 
-// Update the url() versions in the .css files
-if (cliOptions.cssversioning) {
-  cssVersioning().catch((err) => handleError(err, 1));
-}
-
 // Prepare the repo for dev work
 if (cliOptions.prepare) {
   const bench = new Timer('Build');
@@ -201,6 +192,7 @@ if (cliOptions.prepare) {
     .then(() => minifyVendor())
     .then(() => createErrorPages(options))
     .then(() => stylesheets(options, Program.args[0]))
+    .then(() => cssVersioningVendor())
     .then(() => scripts(options, Program.args[0]))
     .then(() => mediaManager())
     .then(() => bootstrapJs())

build/build.php

@@ -342,10 +342,9 @@ function capture_or_fail(string $command): string
     exit(1);
 }
 
-run_and_check('npm install --unsafe-perm');
-
+// Install dependencies and build the media assets
 // Create version entries of the urls inside the static css files
-run_and_check('npm run cssversioning');
+run_and_check('npm ci');
 
 // Create gzipped version of the static assets
 run_and_check('npm run gzip');

installation/language/en-GB/joomla.ini

@@ -105,8 +105,8 @@ INSTL_INSTALL_JOOMLA="Install Joomla"
 INSTL_ADMIN_EMAIL_DESC="Enter the email address of the website Super User."
 INSTL_ADMIN_PASSWORD_DESC="Set the password for your Super User account."
 INSTL_ADMIN_PASSWORD_LENGTH="Enter at least 12 characters."
-INSTL_ADMIN_USER_DESC="Enter the real name of your Super User."
 INSTL_ADMIN_USERNAME_DESC="Set the username for your Super User account."
+INSTL_ADMIN_USER_DESC="Enter the real name of your Super User."
 INSTL_LOGIN_DATA="Login Data"
 INSTL_SETUP_SITE_NAME="Setup Site Name"
 INSTL_SITE="Main Configuration"
@@ -118,15 +118,15 @@ INSTL_PUBLIC_FOLDER_DESC="Relative or absolute path to the public folder"
 INSTL_PUBLIC_FOLDER_DESC_SHORT="Relative or absolute path to the public folder"
 
 ; Complete view
-INSTL_COMPLETE_ERROR_FOLDER_DELETE="The \"%s\" folder could not be deleted. Please manually delete the folder."
-INSTL_COMPLETE_REMOVE_FOLDER="Remove \"%s\" folder"
-INSTL_COMPLETE_CONGRAT="Congratulations!"
-INSTL_COMPLETE_TITLE="Congratulations! Your Joomla site is ready."
-INSTL_COMPLETE_SITE_BTN="Open Site"
+INSTL_COMPLETE_ADD_EXTRA_LANGUAGE="Install Additional Languages"
 INSTL_COMPLETE_ADMIN_BTN="Open Administrator"
+INSTL_COMPLETE_CONGRAT="Congratulations!"
+INSTL_COMPLETE_ERROR_FOLDER_DELETE="The \"%s\" folder could not be deleted. Please manually delete the folder."
 INSTL_COMPLETE_FINAL="Installation is Complete"
 INSTL_COMPLETE_FINAL_DESC="Your Joomla installation is now complete and ready to use."
-INSTL_COMPLETE_ADD_EXTRA_LANGUAGE="Install Additional Languages"
+INSTL_COMPLETE_REMOVE_FOLDER="Remove \"%s\" folder"
+INSTL_COMPLETE_SITE_BTN="Open Site"
+INSTL_COMPLETE_TITLE="Congratulations! Your Joomla site is ready."
 INSTL_REMOVE_INST_FOLDER="Are you sure you want to delete? Confirming will permanently delete the \"%s\" folder."
 
 ; Languages view
@@ -139,23 +139,23 @@ INSTL_LANGUAGES_DESC="The Joomla interface is available in several languages. Ch
 INSTL_LANGUAGES_MESSAGE_PLEASE_WAIT="This operation will take up to 10 seconds per language to complete<br>Please wait while we download and install the languages &hellip;"
 INSTL_LANGUAGES_NO_LANGUAGE_SELECTED="No languages have been selected to be installed."
 INSTL_LANGUAGES_SELECTED="Install Selected Languages"
+INSTL_LANGUAGES_WARNING_BACK_BUTTON="Return to last installation step"
 INSTL_LANGUAGES_WARNING_NO_INTERNET="Joomla was unable to connect to the languages server. Please finish the installation process."
 INSTL_LANGUAGES_WARNING_NO_INTERNET2="Note: You will be able to install languages later using the Joomla Administrator."
-INSTL_LANGUAGES_WARNING_BACK_BUTTON="Return to last installation step"
 
 ; Automated Updates Opt Out
 INSTL_AUTOMATED_UPDATES="Automated Updates"
 INSTL_AUTOMATED_UPDATES_DESC="Joomla automatically updates itself for minor and patch releases.<br><br><strong>Please note:</strong> Automated Updates will register your site at the respective service provided by the Joomla! project. The registration allows the Joomla project to access information about your site and server environment, specifically Site Url, PHP version, Database type and version, CMS version and Server OS type and version. This information is only used to improve the service.<br><br>Alternatively you can disable automated updates using the button below."
 INSTL_AUTOMATED_UPDATES_DISABLE="Disable Automated Updates"
-INSTL_DISABLE_AUTOUPDATE="Are you sure you want to disable automated updates?"
 INSTL_COMPLETE_ERROR_AUTOMATED_UPDATES_DISABLE="Could not disable automated updates."
+INSTL_DISABLE_AUTOUPDATE="Are you sure you want to disable automated updates?"
 
 ; Default language view
 INSTL_DEFAULTLANGUAGE_ADMINISTRATOR="Default Administrator language"
 INSTL_DEFAULTLANGUAGE_ADMIN_COULDNT_SET_DEFAULT="Joomla was unable to set the language as default. English will be used as the default language for the Backend Administrator."
 INSTL_DEFAULTLANGUAGE_ADMIN_SET_DEFAULT="Joomla has set %s as your default ADMINISTRATOR language."
-INSTL_DEFAULTLANGUAGE_COLUMN_HEADER_SELECT="Select"
 INSTL_DEFAULTLANGUAGE_COLUMN_HEADER_LANGUAGE="Language"
+INSTL_DEFAULTLANGUAGE_COLUMN_HEADER_SELECT="Select"
 INSTL_DEFAULTLANGUAGE_COLUMN_HEADER_TAG="Tag"
 INSTL_DEFAULTLANGUAGE_COULD_NOT_DOWNLOAD_PACKAGE="Joomla failed to download or unpack the language pack from: %s"
 INSTL_DEFAULTLANGUAGE_COULD_NOT_INSTALL_LANGUAGE="Joomla was unable to install the %s language."
@@ -184,8 +184,8 @@ INSTL_DATABASE_FIX_LOWERCASE="The table prefix must be lowercase for PostgreSQL.
 INSTL_DATABASE_FIX_TOO_LONG="The MySQL table prefix must be a maximum of 15 characters."
 INSTL_DATABASE_INVALID_DB_DETAILS="The database details provided are incorrect and/or empty."
 INSTL_DATABASE_INVALID_MARIADB_VERSION="You need MariaDB %1$s or higher to continue the installation. Your version is: %2$s"
-INSTL_DATABASE_INVALID_MYSQL_VERSION="You need MySQL %1$s or higher to continue the installation. Your version is: %2$s"
 INSTL_DATABASE_INVALID_MYSQLI_VERSION="You need MySQL %1$s or higher to continue the installation. Your version is: %2$s"
+INSTL_DATABASE_INVALID_MYSQL_VERSION="You need MySQL %1$s or higher to continue the installation. Your version is: %2$s"
 INSTL_DATABASE_INVALID_PGSQL_VERSION="You need PostgreSQL %1$s or higher to continue the installation. Your version is: %2$s"
 INSTL_DATABASE_INVALID_POSTGRESQL_VERSION="You need PostgreSQL %1$s or higher to continue the installation. Your version is: %2$s"
 INSTL_DATABASE_INVALID_TYPE="Please select the database type."