[6.1] Move to rolldown

administrator/components/com_media/resources/scripts/components/breadcrumb/breadcrumb.vue

@@ -20,6 +20,7 @@
 </template>
 
 <script>
+import translate from '../../plugins/translate.es6';
 import navigable from '../../mixins/navigable.es6';
 
 export default {

administrator/components/com_media/resources/scripts/components/browser/actionItems/actionItemsContainer.vue

@@ -147,6 +147,7 @@
 <script>
 import * as types from '../../../store/mutation-types.es6';
 import api from '../../../app/Api.es6';
+import translate from '../../../plugins/translate.es6'
 
 import MediaBrowserActionItemEdit from './edit.vue';
 import MediaBrowserActionItemDelete from './delete.vue';

administrator/components/com_media/resources/scripts/components/browser/actionItems/delete.vue

@@ -20,6 +20,8 @@
 </template>
 
 <script>
+import translate from '../../../plugins/translate.es6'
+
 export default {
   name: 'MediaBrowserActionItemDelete',
   props: {

administrator/components/com_media/resources/scripts/components/browser/actionItems/download.vue

@@ -20,6 +20,8 @@
 </template>
 
 <script>
+import translate from '../../../plugins/translate.es6'
+
 export default {
   name: 'MediaBrowserActionItemDownload',
   props: {

administrator/components/com_media/resources/scripts/components/browser/actionItems/edit.vue

@@ -20,6 +20,8 @@
 </template>
 
 <script>
+import translate from '../../../plugins/translate.es6'
+
 export default {
   name: 'MediaBrowserActionItemEdit',
   props: {

administrator/components/com_media/resources/scripts/components/browser/actionItems/preview.vue

@@ -20,6 +20,8 @@
 </template>
 
 <script>
+import translate from '../../../plugins/translate.es6'
+
 export default {
   name: 'MediaBrowserActionItemPreview',
   props: {

administrator/components/com_media/resources/scripts/components/browser/actionItems/rename.vue

@@ -21,6 +21,8 @@
 </template>
 
 <script>
+import translate from '../../../plugins/translate.es6'
+
 export default {
   name: 'MediaBrowserActionItemRename',
   props: {

administrator/components/com_media/resources/scripts/components/browser/actionItems/share.vue

@@ -20,6 +20,8 @@
 </template>
 
 <script>
+import translate from '../../../plugins/translate.es6'
+
 export default {
   name: 'MediaBrowserActionItemShare',
   props: {

administrator/components/com_media/resources/scripts/components/browser/browser.vue

@@ -77,6 +77,7 @@ import * as types from '../../store/mutation-types.es6';
 import MediaBrowserTable from './table/table.vue';
 import MediaBrowserItem from './items/item.es6';
 import MediaInfobar from '../infobar/infobar.vue';
+import translate from '../../plugins/translate.es6'
 
 function sortArray(array, by, direction) {
   return array.sort((a, b) => {

administrator/components/com_media/resources/scripts/components/browser/items/document.vue

@@ -31,6 +31,7 @@
 </template>
 
 <script>
+import translate from '../../../plugins/translate.es6'
 import MediaBrowserActionItemsContainer from '../actionItems/actionItemsContainer.vue';
 
 export default {

administrator/components/com_media/resources/scripts/components/browser/items/file.vue

@@ -30,6 +30,7 @@
 </template>
 
 <script>
+import translate from '../../../plugins/translate.es6'
 import MediaBrowserActionItemsContainer from '../actionItems/actionItemsContainer.vue';
 
 export default {

administrator/components/com_media/resources/scripts/components/browser/items/image.vue

@@ -53,6 +53,8 @@
 
 <script>
 import api from '../../../app/Api.es6';
+import translate from '../../../plugins/translate.es6'
+
 import MediaBrowserActionItemsContainer from '../actionItems/actionItemsContainer.vue';
 
 export default {

administrator/components/com_media/resources/scripts/components/browser/table/table.vue

@@ -124,6 +124,7 @@
 
 <script>
 import * as types from '../../../store/mutation-types.es6';
+import translate from '../../../plugins/translate.es6'
 import MediaBrowserItemRow from './row.vue';
 
 export default {

administrator/components/com_media/resources/scripts/components/infobar/infobar.vue

@@ -67,6 +67,7 @@
 
 <script>
 import * as types from '../../store/mutation-types.es6';
+import translate from '../../plugins/translate.es6'
 
 export default {
   name: 'MediaInfobar',

administrator/components/com_media/resources/scripts/components/modals/confirm-delete-modal.vue

@@ -43,6 +43,7 @@
 
 <script>
 import * as types from '../../store/mutation-types.es6';
+import translate from '../../plugins/translate.es6'
 import MediaModal from './modal.vue';
 
 export default {

administrator/components/com_media/resources/scripts/components/modals/create-folder-modal.vue

@@ -81,6 +81,7 @@
 
 <script>
 import * as types from '../../store/mutation-types.es6';
+import translate from '../../plugins/translate.es6'
 import MediaModal from './modal.vue';
 
 export default {

administrator/components/com_media/resources/scripts/components/modals/rename-modal.vue

@@ -71,6 +71,7 @@
 
 <script>
 import * as types from '../../store/mutation-types.es6';
+import translate from '../../plugins/translate.es6'
 import MediaModal from './modal.vue';
 
 export default {

administrator/components/com_media/resources/scripts/components/toolbar/toolbar.vue

@@ -150,6 +150,7 @@
 
 <script>
 import * as types from '../../store/mutation-types.es6';
+import translate from '../../plugins/translate.es6'
 import MediaBreadcrumb from '../breadcrumb/breadcrumb.vue';
 
 export default {

build/build-modules-js/compilecss.mjs

@@ -1,12 +1,10 @@
-import { sep } from 'node:path';
-
-import recursive from 'recursive-readdir';
-import pkg from 'fs-extra';
+import { join, sep } from 'node:path';
+import { stat } from 'node:fs/promises';
+import { readdirSync } from 'node:fs';
 
 import { handleScssFile } from './stylesheets/handle-scss.mjs';
 import { handleCssFile } from './stylesheets/handle-css.mjs';
 
-const { stat } = pkg;
 const RootPath = process.cwd();
 
 /**
@@ -19,23 +17,25 @@ const RootPath = process.cwd();
  *         css files to have ext: .css
  * Ignores scss files that their filename starts with `_`
  *
- * @param {object} options  The options
- * @param {string} path     The folder that needs to be compiled, optional
+ * @param {string|Array} path     The folder that needs to be compiled, optional
+ *
+ * @returns {Promise}
  */
-export const stylesheets = async (options, path) => {
-  const files = [];
+export const stylesheets = async (path) => {
+  let files = [];
   let folders = [];
 
-  if (path) {
+  if (Array.isArray(path)) {
+    path.filter((file) => file.endsWith('.css') || file.endsWith('.scss')).forEach((file) => files.push(file));
+  } else if (path) {
     const stats = await stat(`${RootPath}/${path}`);
 
     if (stats.isDirectory()) {
       folders.push(`${RootPath}/${path}`);
     } else if (stats.isFile()) {
       files.push(`${RootPath}/${path}`);
     } else {
-      console.error(`Unknown path ${path}`);
-      process.exitCode = 1;
+      throw new Error(`Unknown path ${path}`);
     }
   } else {
     folders = [
@@ -47,20 +47,23 @@ export const stylesheets = async (options, path) => {
     ];
   }
 
-  const folderPromises = [];
-
-  // Loop to get the files that should be compiled via parameter
-  for (const folder of folders) {
-    folderPromises.push(recursive(folder, ['!*.+(scss|css)']));
+  if (folders.length) {
+    // Loop to get the files that should be compiled via parameter
+    for (const folder of folders) {
+      const filesLocal = readdirSync(folder, { recursive: true })
+        .filter((file) => file.endsWith('.scss') || file.endsWith('.css'))
+        .map((file) => join(folder, file));
+        for (const file of filesLocal) {
+          files.push(file);
+        }
+    }
   }
 
-  const computedFiles = await Promise.all(folderPromises);
-
   const cssFilesPromises = [];
   const scssFilesPromises = [];
 
   // Loop to get the files that should be compiled via parameter
-  [].concat(...computedFiles).forEach((file) => {
+  files.forEach((file) => {
     if (file.endsWith('.css') && !file.endsWith('.min.css')) {
       cssFilesPromises.push(handleCssFile(file));
     }
@@ -72,17 +75,13 @@ export const stylesheets = async (options, path) => {
         return;
       }
 
-      files.push(file);
+      const outputFile = file.replace(`${sep}scss${sep}`, `${sep}css${sep}`)
+        .replace(`${sep}build${sep}media_source${sep}`, `${sep}media${sep}`)
+        .replace('.scss', '.css');
+
+      scssFilesPromises.push(handleScssFile(file, outputFile));
     }
   });
 
-  for (const file of files) {
-    const outputFile = file.replace(`${sep}scss${sep}`, `${sep}css${sep}`)
-      .replace(`${sep}build${sep}media_source${sep}`, `${sep}media${sep}`)
-      .replace('.scss', '.css');
-
-    scssFilesPromises.push(handleScssFile(file, outputFile));
-  }
-
-  return Promise.all([...cssFilesPromises, ...scssFilesPromises]);
+  return Promise.all([...cssFilesPromises, ...scssFilesPromises]).catch((err) => { throw new Error(err); });
 };

build/build-modules-js/compilejs.mjs

@@ -1,8 +1,6 @@
 import { stat } from 'node:fs/promises';
-import { sep } from 'node:path';
-
-import recursive from 'recursive-readdir';
-
+import { join, sep } from 'node:path';
+import { readdirSync } from 'node:fs';
 import { handleES5File } from './javascript/handle-es5.mjs';
 import { handleESMFile } from './javascript/compile-to-es2017.mjs';
 
@@ -19,24 +17,25 @@ const RootPath = process.cwd();
  *         ES5 files to have ext: .es5.js
  *         WC/CE files to have ext: .w-c.es6.js
  *
- * @param { object } options The options from settings.json
- * @param { string } path    The folder that needs to be compiled, optional
- * @param { string } mode    esm for ES2017, es5 for ES5, both for both
+ * @param {string|Array} path    The folder that needs to be compiled, optional
+ *
+ * @returns {Promise}
  */
-export const scripts = async (options, path) => {
-  const files = [];
+export const scripts = async (path) => {
+  let files = [];
   let folders = [];
 
-  if (path) {
+  if (Array.isArray(path)) {
+    path.filter((file) => file.endsWith('.mjs') || file.endsWith('.js')).forEach((file) => files.push(file));
+  } else if (path) {
     const stats = await stat(`${RootPath}/${path}`);
 
     if (stats.isDirectory()) {
       folders.push(`${RootPath}/${path}`);
     } else if (stats.isFile()) {
       files.push(`${RootPath}/${path}`);
     } else {
-      console.error(`Unknown path ${path}`);
-      process.exitCode = 1;
+      throw new Error(`Unknown path ${path}`);
     }
   } else {
     folders = [
@@ -45,20 +44,23 @@ export const scripts = async (options, path) => {
     ];
   }
 
-  const folderPromises = [];
-
-  // Loop to get the files that should be compiled via parameter
-  for (const folder of folders) {
-    folderPromises.push(recursive(folder, ['!*.+(m|js)']));
+  if (folders.length) {
+    // Loop to get the files that should be compiled via parameter
+    for (const folder of folders) {
+      const filesLocal = readdirSync(folder, { recursive: true })
+        .filter((file) => file.endsWith('.mjs') || file.endsWith('.js'))
+        .map((fileName) => join(folder, fileName))
+        for (const file of filesLocal) {
+          files.push(file);
+        }
+    }
   }
 
-  const computedFiles = await Promise.all(folderPromises);
-  const computedFilesFlat = [].concat(...computedFiles);
   const jsFilesPromises = [];
   const esmFilesPromises = [];
 
   // Loop to get the files that should be compiled via parameter
-  computedFilesFlat.forEach((file) => {
+  files.forEach((file) => {
     if (file.includes(`build${sep}media_source${sep}vendor${sep}bootstrap${sep}js`)) {
       return;
     }
@@ -70,5 +72,5 @@ export const scripts = async (options, path) => {
     }
   });
 
-  Promise.all([...jsFilesPromises, ...esmFilesPromises]);
+  return Promise.all([...jsFilesPromises, ...esmFilesPromises]).catch((err) => { throw new Error(err); });
 };

build/build-modules-js/compress.mjs

@@ -33,7 +33,7 @@ export const compressFiles = async (enableBrotli = false) => {
   const files = await Promise.all(paths.map((path) => getFiles(`${path}`)));
   [].concat(...files).map((file) => compressTasks.push(compressFile(file, enableBrotli)));
 
-  await Promise.all(compressTasks);
+  await Promise.all(compressTasks).catch((err) => { throw new Error(err); });
   console.log('✅ Done 👍');
   bench.stop();
 };

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

@@ -1,10 +1,11 @@
 import {
   access, mkdir, readFile, writeFile,
 } from 'node:fs/promises';
+import { readdirSync } from 'node:fs';
+import { join } from 'node:path';
 import { dirname } from 'node:path';
 
 import Ini from 'ini';
-import Recurs from 'recursive-readdir';
 import { transform } from 'esbuild';
 import { transform as transformCss } from 'lightningcss';
 
@@ -102,18 +103,15 @@ export const createErrorPages = async (options) => {
     }
   };
 
-  const files = await Recurs(dir);
+  const files = readdirSync(dir, { recursive: true })
+    .filter((file) => !file.endsWith('langmetadata.xml') && file.endsWith('.ini'))
+    .map((file) => join(dir, file));
+
   files.sort().forEach((file) => {
-    if (file.endsWith('langmetadata.xml')) {
-      return;
-    }
     iniFilesProcess.push(processIni(file));
   });
 
-  await Promise.all(iniFilesProcess).catch((err) => {
-    console.error(err);
-    process.exitCode = -1;
-  });
+  await Promise.all(iniFilesProcess).catch((err) => { throw new Error(err); });
 
   const processPage = async (name) => {
     const sortedJson = Object.fromEntries(Object.entries(global[`${name}Obj`]).sort());
@@ -157,8 +155,5 @@ export const createErrorPages = async (options) => {
 
   Object.keys(options.settings.errorPages).forEach((name) => processPages.push(processPage(name)));
 
-  return Promise.all(processPages).catch((err) => {
-    console.error(err);
-    process.exitCode = -1;
-  });
+  return Promise.all(processPages).catch((err) => { throw new Error(err); })
 };