From 58e92a2a62561233042a323c7122219ce9fd36b7 Mon Sep 17 00:00:00 2001 From: Dimitris Grammatikogiannis Date: Wed, 12 Feb 2025 19:56:09 +0200 Subject: [PATCH 1/9] silence the sass deprecations --- build/build-modules-js/stylesheets/handle-scss.mjs | 9 ++++++++- build/build-modules-js/stylesheets/scss-transform.mjs | 9 ++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/build/build-modules-js/stylesheets/handle-scss.mjs b/build/build-modules-js/stylesheets/handle-scss.mjs index cb44899fc1211..60ef4ab169ddb 100644 --- a/build/build-modules-js/stylesheets/handle-scss.mjs +++ b/build/build-modules-js/stylesheets/handle-scss.mjs @@ -14,7 +14,14 @@ export const handleScssFile = async (file) => { let compiled; try { - compiled = Sass.compile(file); + compiled = Sass.compile(file, { + silenceDeprecations: [ + 'mixed-decls', + 'color-functions', + 'import', + 'global-builtin', + ], + }); } catch (error) { // eslint-disable-next-line no-console console.error(error.formatted); diff --git a/build/build-modules-js/stylesheets/scss-transform.mjs b/build/build-modules-js/stylesheets/scss-transform.mjs index b0c37ae2a474b..6342aa956ccf6 100644 --- a/build/build-modules-js/stylesheets/scss-transform.mjs +++ b/build/build-modules-js/stylesheets/scss-transform.mjs @@ -13,7 +13,14 @@ export const compile = async (file) => { let compiled; try { - compiled = Sass.compile(file); + compiled = Sass.compile(file, { + silenceDeprecations: [ + 'mixed-decls', + 'color-functions', + 'import', + 'global-builtin', + ], + }); } catch (error) { // eslint-disable-next-line no-console console.error(error.formatted); From 977167b330fd6270906737d8144224f7e900fc23 Mon Sep 17 00:00:00 2001 From: Dimitris Grammatikogiannis Date: Wed, 12 Feb 2025 22:24:46 +0200 Subject: [PATCH 2/9] be specific --- .../stylesheets/handle-scss.mjs | 27 ++++++++++++------- .../stylesheets/scss-transform.mjs | 27 ++++++++++++------- 2 files changed, 36 insertions(+), 18 deletions(-) diff --git a/build/build-modules-js/stylesheets/handle-scss.mjs b/build/build-modules-js/stylesheets/handle-scss.mjs index 60ef4ab169ddb..63825300aae6a 100644 --- a/build/build-modules-js/stylesheets/handle-scss.mjs +++ b/build/build-modules-js/stylesheets/handle-scss.mjs @@ -11,17 +11,26 @@ export const handleScssFile = async (file) => { .replace(`${sep}scss${sep}`, `${sep}css${sep}`) .replace(`${sep}build${sep}media_source${sep}`, `${sep}media${sep}`) .replace('.scss', '.css'); - + const silenceThese = + /media_source\/templates/.test(file) || + /media_source\\templates/.test(file) || + /installation\/template/.test(file) || + /installation\\template/.test(file) || + /media_source\/plg_installer_webinstaller/.test(file) || + /media_source\\plg_installer_webinstaller/.test(file) || + /vendor\/fontawesome-free/.test(file) || + /vendor\\fontawesome-free/.test(file) || + /media_source\/system\/scss\/joomla-fontawesome.scss/.test(file) || + /media_source\\system\\scss\\joomla-fontawesome.scss/.test(file) || + /media_source\/com_media\/scss\/media-manager.scss/.test(file) || + /media_source\\com_media\\scss\\media-manager.scss/.test(file) || + /media_source\/plg_system_guidedtours\/scss\/guidedtours.scss/.test(file) || + /media_source\\plg_system_guidedtours\\scss\\guidedtours.scss/.test(file); + const options = silenceThese ? { silenceDeprecations: ['mixed-decls', 'color-functions', 'import', 'global-builtin']} : {}; let compiled; + try { - compiled = Sass.compile(file, { - silenceDeprecations: [ - 'mixed-decls', - 'color-functions', - 'import', - 'global-builtin', - ], - }); + compiled = Sass.compile(file, options); } catch (error) { // eslint-disable-next-line no-console console.error(error.formatted); diff --git a/build/build-modules-js/stylesheets/scss-transform.mjs b/build/build-modules-js/stylesheets/scss-transform.mjs index 6342aa956ccf6..e4dda8e549ddd 100644 --- a/build/build-modules-js/stylesheets/scss-transform.mjs +++ b/build/build-modules-js/stylesheets/scss-transform.mjs @@ -10,17 +10,26 @@ export const compile = async (file) => { .replace(`${sep}scss${sep}`, `${sep}css${sep}`) .replace('.scss', '.css') .replace(`${sep}build${sep}media_source${sep}`, `${sep}media${sep}`); - + const silenceThese = + /media_source\/templates/.test(file) || + /media_source\\templates/.test(file) || + /installation\/template/.test(file) || + /installation\\template/.test(file) || + /media_source\/plg_installer_webinstaller/.test(file) || + /media_source\\plg_installer_webinstaller/.test(file) || + /vendor\/fontawesome-free/.test(file) || + /vendor\\fontawesome-free/.test(file) || + /media_source\/system\/scss\/joomla-fontawesome.scss/.test(file) || + /media_source\\system\\scss\\joomla-fontawesome.scss/.test(file) || + /media_source\/com_media\/scss\/media-manager.scss/.test(file) || + /media_source\\com_media\\scss\\media-manager.scss/.test(file) || + /media_source\/plg_system_guidedtours\/scss\/guidedtours.scss/.test(file) || + /media_source\\plg_system_guidedtours\\scss\\guidedtours.scss/.test(file); + const options = silenceThese ? { silenceDeprecations: ['mixed-decls', 'color-functions', 'import', 'global-builtin']} : {}; let compiled; + try { - compiled = Sass.compile(file, { - silenceDeprecations: [ - 'mixed-decls', - 'color-functions', - 'import', - 'global-builtin', - ], - }); + compiled = Sass.compile(file, options); } catch (error) { // eslint-disable-next-line no-console console.error(error.formatted); From 25762015afbeb21d0e977535bb77ff09ab6a61b4 Mon Sep 17 00:00:00 2001 From: Dimitris Grammatikogiannis Date: Wed, 12 Feb 2025 22:36:42 +0200 Subject: [PATCH 3/9] cs --- .../stylesheets/handle-scss.mjs | 29 +++++++++---------- .../stylesheets/scss-transform.mjs | 29 +++++++++---------- 2 files changed, 28 insertions(+), 30 deletions(-) diff --git a/build/build-modules-js/stylesheets/handle-scss.mjs b/build/build-modules-js/stylesheets/handle-scss.mjs index 63825300aae6a..fe19d261da44b 100644 --- a/build/build-modules-js/stylesheets/handle-scss.mjs +++ b/build/build-modules-js/stylesheets/handle-scss.mjs @@ -11,21 +11,20 @@ export const handleScssFile = async (file) => { .replace(`${sep}scss${sep}`, `${sep}css${sep}`) .replace(`${sep}build${sep}media_source${sep}`, `${sep}media${sep}`) .replace('.scss', '.css'); - const silenceThese = - /media_source\/templates/.test(file) || - /media_source\\templates/.test(file) || - /installation\/template/.test(file) || - /installation\\template/.test(file) || - /media_source\/plg_installer_webinstaller/.test(file) || - /media_source\\plg_installer_webinstaller/.test(file) || - /vendor\/fontawesome-free/.test(file) || - /vendor\\fontawesome-free/.test(file) || - /media_source\/system\/scss\/joomla-fontawesome.scss/.test(file) || - /media_source\\system\\scss\\joomla-fontawesome.scss/.test(file) || - /media_source\/com_media\/scss\/media-manager.scss/.test(file) || - /media_source\\com_media\\scss\\media-manager.scss/.test(file) || - /media_source\/plg_system_guidedtours\/scss\/guidedtours.scss/.test(file) || - /media_source\\plg_system_guidedtours\\scss\\guidedtours.scss/.test(file); + const silenceThese = /media_source\/templates/.test(file) + || /media_source\\templates/.test(file) + || /installation\/template/.test(file) + || /installation\\template/.test(file) + || /media_source\/plg_installer_webinstaller/.test(file) + || /media_source\\plg_installer_webinstaller/.test(file) + || /vendor\/fontawesome-free/.test(file) + || /vendor\\fontawesome-free/.test(file) + || /media_source\/system\/scss\/joomla-fontawesome.scss/.test(file) + || /media_source\\system\\scss\\joomla-fontawesome.scss/.test(file) + || /media_source\/com_media\/scss\/media-manager.scss/.test(file) + || /media_source\\com_media\\scss\\media-manager.scss/.test(file) + || /media_source\/plg_system_guidedtours\/scss\/guidedtours.scss/.test(file) + || /media_source\\plg_system_guidedtours\\scss\\guidedtours.scss/.test(file); const options = silenceThese ? { silenceDeprecations: ['mixed-decls', 'color-functions', 'import', 'global-builtin']} : {}; let compiled; diff --git a/build/build-modules-js/stylesheets/scss-transform.mjs b/build/build-modules-js/stylesheets/scss-transform.mjs index e4dda8e549ddd..033466f0b32f7 100644 --- a/build/build-modules-js/stylesheets/scss-transform.mjs +++ b/build/build-modules-js/stylesheets/scss-transform.mjs @@ -10,21 +10,20 @@ export const compile = async (file) => { .replace(`${sep}scss${sep}`, `${sep}css${sep}`) .replace('.scss', '.css') .replace(`${sep}build${sep}media_source${sep}`, `${sep}media${sep}`); - const silenceThese = - /media_source\/templates/.test(file) || - /media_source\\templates/.test(file) || - /installation\/template/.test(file) || - /installation\\template/.test(file) || - /media_source\/plg_installer_webinstaller/.test(file) || - /media_source\\plg_installer_webinstaller/.test(file) || - /vendor\/fontawesome-free/.test(file) || - /vendor\\fontawesome-free/.test(file) || - /media_source\/system\/scss\/joomla-fontawesome.scss/.test(file) || - /media_source\\system\\scss\\joomla-fontawesome.scss/.test(file) || - /media_source\/com_media\/scss\/media-manager.scss/.test(file) || - /media_source\\com_media\\scss\\media-manager.scss/.test(file) || - /media_source\/plg_system_guidedtours\/scss\/guidedtours.scss/.test(file) || - /media_source\\plg_system_guidedtours\\scss\\guidedtours.scss/.test(file); + const silenceThese = /media_source\/templates/.test(file) + || /media_source\\templates/.test(file) + || /installation\/template/.test(file) + || /installation\\template/.test(file) + || /media_source\/plg_installer_webinstaller/.test(file) + || /media_source\\plg_installer_webinstaller/.test(file) + || /vendor\/fontawesome-free/.test(file) + || /vendor\\fontawesome-free/.test(file) + || /media_source\/system\/scss\/joomla-fontawesome.scss/.test(file) + || /media_source\\system\\scss\\joomla-fontawesome.scss/.test(file) + || /media_source\/com_media\/scss\/media-manager.scss/.test(file) + || /media_source\\com_media\\scss\\media-manager.scss/.test(file) + || /media_source\/plg_system_guidedtours\/scss\/guidedtours.scss/.test(file) + || /media_source\\plg_system_guidedtours\\scss\\guidedtours.scss/.test(file); const options = silenceThese ? { silenceDeprecations: ['mixed-decls', 'color-functions', 'import', 'global-builtin']} : {}; let compiled; From 3d8ab47756ceaf82a8ce2ed550a5a8b559e1233a Mon Sep 17 00:00:00 2001 From: Dimitris Grammatikogiannis Date: Wed, 12 Feb 2025 23:24:15 +0200 Subject: [PATCH 4/9] cs --- build/build-modules-js/stylesheets/handle-scss.mjs | 2 +- build/build-modules-js/stylesheets/scss-transform.mjs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/build-modules-js/stylesheets/handle-scss.mjs b/build/build-modules-js/stylesheets/handle-scss.mjs index fe19d261da44b..008803d8534d9 100644 --- a/build/build-modules-js/stylesheets/handle-scss.mjs +++ b/build/build-modules-js/stylesheets/handle-scss.mjs @@ -25,7 +25,7 @@ export const handleScssFile = async (file) => { || /media_source\\com_media\\scss\\media-manager.scss/.test(file) || /media_source\/plg_system_guidedtours\/scss\/guidedtours.scss/.test(file) || /media_source\\plg_system_guidedtours\\scss\\guidedtours.scss/.test(file); - const options = silenceThese ? { silenceDeprecations: ['mixed-decls', 'color-functions', 'import', 'global-builtin']} : {}; + const options = silenceThese ? { silenceDeprecations: ['mixed-decls', 'color-functions', 'import', 'global-builtin'] } : {}; let compiled; try { diff --git a/build/build-modules-js/stylesheets/scss-transform.mjs b/build/build-modules-js/stylesheets/scss-transform.mjs index 033466f0b32f7..eaaa486d33777 100644 --- a/build/build-modules-js/stylesheets/scss-transform.mjs +++ b/build/build-modules-js/stylesheets/scss-transform.mjs @@ -24,7 +24,7 @@ export const compile = async (file) => { || /media_source\\com_media\\scss\\media-manager.scss/.test(file) || /media_source\/plg_system_guidedtours\/scss\/guidedtours.scss/.test(file) || /media_source\\plg_system_guidedtours\\scss\\guidedtours.scss/.test(file); - const options = silenceThese ? { silenceDeprecations: ['mixed-decls', 'color-functions', 'import', 'global-builtin']} : {}; + const options = silenceThese ? { silenceDeprecations: ['mixed-decls', 'color-functions', 'import', 'global-builtin'] } : {}; let compiled; try { From 3de68cfe4ce84b2ae2f0992fd18710b41bd51896 Mon Sep 17 00:00:00 2001 From: Dimitris Grammatikogiannis Date: Wed, 12 Feb 2025 23:45:35 +0200 Subject: [PATCH 5/9] =?UTF-8?q?lint=20js=20`npm=20run=20lint:js=20?= =?UTF-8?q?=E2=80=94=20=E2=80=94fix`?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com_media/resources/scripts/components/browser/browser.vue | 2 +- .../resources/scripts/components/modals/create-folder-modal.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/administrator/components/com_media/resources/scripts/components/browser/browser.vue b/administrator/components/com_media/resources/scripts/components/browser/browser.vue index 1d67f04797f7b..b882a71f5b994 100644 --- a/administrator/components/com_media/resources/scripts/components/browser/browser.vue +++ b/administrator/components/com_media/resources/scripts/components/browser/browser.vue @@ -64,7 +64,7 @@ v-for="item in localItems" :key="item.path" :item="item" - :localItems="localItems" + :local-items="localItems" /> diff --git a/administrator/components/com_media/resources/scripts/components/modals/create-folder-modal.vue b/administrator/components/com_media/resources/scripts/components/modals/create-folder-modal.vue index 50e5186565ea9..6031481c96dd9 100644 --- a/administrator/components/com_media/resources/scripts/components/modals/create-folder-modal.vue +++ b/administrator/components/com_media/resources/scripts/components/modals/create-folder-modal.vue @@ -30,7 +30,7 @@ type="text" required autocomplete="off" - v-bind:class="(isValidName()!==0 && isValid())?'is-invalid':''" + :class="(isValidName()!==0 && isValid())?'is-invalid':''" aria-describedby="folderFeedback" @input="folder = $event.target.value" > From 8680aa5a83835729e1a83e17a879da0b56020f10 Mon Sep 17 00:00:00 2001 From: Dimitris Grammatikogiannis Date: Thu, 13 Feb 2025 00:04:31 +0200 Subject: [PATCH 6/9] revert eslint --- .../com_media/resources/scripts/components/browser/browser.vue | 2 +- .../resources/scripts/components/modals/create-folder-modal.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/administrator/components/com_media/resources/scripts/components/browser/browser.vue b/administrator/components/com_media/resources/scripts/components/browser/browser.vue index b882a71f5b994..1d67f04797f7b 100644 --- a/administrator/components/com_media/resources/scripts/components/browser/browser.vue +++ b/administrator/components/com_media/resources/scripts/components/browser/browser.vue @@ -64,7 +64,7 @@ v-for="item in localItems" :key="item.path" :item="item" - :local-items="localItems" + :localItems="localItems" /> diff --git a/administrator/components/com_media/resources/scripts/components/modals/create-folder-modal.vue b/administrator/components/com_media/resources/scripts/components/modals/create-folder-modal.vue index 6031481c96dd9..50e5186565ea9 100644 --- a/administrator/components/com_media/resources/scripts/components/modals/create-folder-modal.vue +++ b/administrator/components/com_media/resources/scripts/components/modals/create-folder-modal.vue @@ -30,7 +30,7 @@ type="text" required autocomplete="off" - :class="(isValidName()!==0 && isValid())?'is-invalid':''" + v-bind:class="(isValidName()!==0 && isValid())?'is-invalid':''" aria-describedby="folderFeedback" @input="folder = $event.target.value" > From a5eef823749c24b9ec2f009eb0d66f198885bf02 Mon Sep 17 00:00:00 2001 From: Dimitris Grammatikogiannis Date: Thu, 13 Feb 2025 12:16:02 +0200 Subject: [PATCH 7/9] no duplicates --- .../stylesheets/handle-scss.mjs | 28 +++++++++---------- .../stylesheets/scss-transform.mjs | 28 +++++++++---------- 2 files changed, 26 insertions(+), 30 deletions(-) diff --git a/build/build-modules-js/stylesheets/handle-scss.mjs b/build/build-modules-js/stylesheets/handle-scss.mjs index 008803d8534d9..b53ac8fbc8873 100644 --- a/build/build-modules-js/stylesheets/handle-scss.mjs +++ b/build/build-modules-js/stylesheets/handle-scss.mjs @@ -6,26 +6,24 @@ import { ensureDir } from 'fs-extra'; import { transform as transformCss, Features } from 'lightningcss'; import * as Sass from 'sass-embedded'; +const silenceDeprecationList = [ + `media_source${sep}templates`, + `installation${sep}template`, + `media_source${sep}plg_installer_webinstaller`, + `vendor${sep}fontawesome-free`, + `media_source${sep}system${sep}scss${sep}joomla-fontawesome.scss`, + `media_source${sep}com_media`, + `media_source${sep}plg_system_guidedtours${sep}scss${sep}guidedtours.scss`, +]; + +const shouldSilenceDeprecation = (file) => silenceDeprecationList.filter((path) => new RegExp(String.raw(`/${path}/`, 'i')).match(file)).length; + export const handleScssFile = async (file) => { const cssFile = file .replace(`${sep}scss${sep}`, `${sep}css${sep}`) .replace(`${sep}build${sep}media_source${sep}`, `${sep}media${sep}`) .replace('.scss', '.css'); - const silenceThese = /media_source\/templates/.test(file) - || /media_source\\templates/.test(file) - || /installation\/template/.test(file) - || /installation\\template/.test(file) - || /media_source\/plg_installer_webinstaller/.test(file) - || /media_source\\plg_installer_webinstaller/.test(file) - || /vendor\/fontawesome-free/.test(file) - || /vendor\\fontawesome-free/.test(file) - || /media_source\/system\/scss\/joomla-fontawesome.scss/.test(file) - || /media_source\\system\\scss\\joomla-fontawesome.scss/.test(file) - || /media_source\/com_media\/scss\/media-manager.scss/.test(file) - || /media_source\\com_media\\scss\\media-manager.scss/.test(file) - || /media_source\/plg_system_guidedtours\/scss\/guidedtours.scss/.test(file) - || /media_source\\plg_system_guidedtours\\scss\\guidedtours.scss/.test(file); - const options = silenceThese ? { silenceDeprecations: ['mixed-decls', 'color-functions', 'import', 'global-builtin'] } : {}; + const options = shouldSilenceDeprecation ? { silenceDeprecations: ['mixed-decls', 'color-functions', 'import', 'global-builtin'] } : {}; let compiled; try { diff --git a/build/build-modules-js/stylesheets/scss-transform.mjs b/build/build-modules-js/stylesheets/scss-transform.mjs index eaaa486d33777..f7c546d650f8d 100644 --- a/build/build-modules-js/stylesheets/scss-transform.mjs +++ b/build/build-modules-js/stylesheets/scss-transform.mjs @@ -5,26 +5,24 @@ import FsExtra from 'fs-extra'; import LightningCSS from 'lightningcss'; import Sass from 'sass-embedded'; +const silenceDeprecationList = [ + `media_source${sep}templates`, + `installation${sep}template`, + `media_source${sep}plg_installer_webinstaller`, + `vendor${sep}fontawesome-free`, + `media_source${sep}system${sep}scss${sep}joomla-fontawesome.scss`, + `media_source${sep}com_media`, + `media_source${sep}plg_system_guidedtours${sep}scss${sep}guidedtours.scss`, +]; + +const shouldSilenceDeprecation = (file) => silenceDeprecationList.filter((path) => new RegExp(String.raw(`/${path}/`, 'i')).match(file)).length; + export const compile = async (file) => { const cssFile = file .replace(`${sep}scss${sep}`, `${sep}css${sep}`) .replace('.scss', '.css') .replace(`${sep}build${sep}media_source${sep}`, `${sep}media${sep}`); - const silenceThese = /media_source\/templates/.test(file) - || /media_source\\templates/.test(file) - || /installation\/template/.test(file) - || /installation\\template/.test(file) - || /media_source\/plg_installer_webinstaller/.test(file) - || /media_source\\plg_installer_webinstaller/.test(file) - || /vendor\/fontawesome-free/.test(file) - || /vendor\\fontawesome-free/.test(file) - || /media_source\/system\/scss\/joomla-fontawesome.scss/.test(file) - || /media_source\\system\\scss\\joomla-fontawesome.scss/.test(file) - || /media_source\/com_media\/scss\/media-manager.scss/.test(file) - || /media_source\\com_media\\scss\\media-manager.scss/.test(file) - || /media_source\/plg_system_guidedtours\/scss\/guidedtours.scss/.test(file) - || /media_source\\plg_system_guidedtours\\scss\\guidedtours.scss/.test(file); - const options = silenceThese ? { silenceDeprecations: ['mixed-decls', 'color-functions', 'import', 'global-builtin'] } : {}; + const options = shouldSilenceDeprecation ? { silenceDeprecations: ['mixed-decls', 'color-functions', 'import', 'global-builtin'] } : {}; let compiled; try { From 625c2372ce48547faefeeed8ce442107495555b7 Mon Sep 17 00:00:00 2001 From: Dimitris Grammatikogiannis Date: Fri, 14 Feb 2025 12:09:24 +0200 Subject: [PATCH 8/9] Array.some returns boolean --- build/build-modules-js/stylesheets/handle-scss.mjs | 12 ++++++------ .../build-modules-js/stylesheets/scss-transform.mjs | 11 ++++------- 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/build/build-modules-js/stylesheets/handle-scss.mjs b/build/build-modules-js/stylesheets/handle-scss.mjs index b53ac8fbc8873..0352b2134c342 100644 --- a/build/build-modules-js/stylesheets/handle-scss.mjs +++ b/build/build-modules-js/stylesheets/handle-scss.mjs @@ -16,15 +16,15 @@ const silenceDeprecationList = [ `media_source${sep}plg_system_guidedtours${sep}scss${sep}guidedtours.scss`, ]; -const shouldSilenceDeprecation = (file) => silenceDeprecationList.filter((path) => new RegExp(String.raw(`/${path}/`, 'i')).match(file)).length; + + +const shouldSilenceDeprecation = (file) => silenceDeprecationList.some((path) => new RegExp(String.raw`${path}`, 'i').test(file)); +const getOutputFile = (file) => file.replace(`${sep}scss${sep}`, `${sep}css${sep}`).replace('.scss', '.css').replace(`${sep}build${sep}media_source${sep}`, `${sep}media${sep}`); export const handleScssFile = async (file) => { - const cssFile = file - .replace(`${sep}scss${sep}`, `${sep}css${sep}`) - .replace(`${sep}build${sep}media_source${sep}`, `${sep}media${sep}`) - .replace('.scss', '.css'); - const options = shouldSilenceDeprecation ? { silenceDeprecations: ['mixed-decls', 'color-functions', 'import', 'global-builtin'] } : {}; let compiled; + const cssFile = getOutputFile(file); + const options = shouldSilenceDeprecation(file) ? { silenceDeprecations: ['mixed-decls', 'color-functions', 'import', 'global-builtin'] } : {}; try { compiled = Sass.compile(file, options); diff --git a/build/build-modules-js/stylesheets/scss-transform.mjs b/build/build-modules-js/stylesheets/scss-transform.mjs index f7c546d650f8d..6dfec3ea507fd 100644 --- a/build/build-modules-js/stylesheets/scss-transform.mjs +++ b/build/build-modules-js/stylesheets/scss-transform.mjs @@ -14,16 +14,13 @@ const silenceDeprecationList = [ `media_source${sep}com_media`, `media_source${sep}plg_system_guidedtours${sep}scss${sep}guidedtours.scss`, ]; - -const shouldSilenceDeprecation = (file) => silenceDeprecationList.filter((path) => new RegExp(String.raw(`/${path}/`, 'i')).match(file)).length; +const shouldSilenceDeprecation = (file) => silenceDeprecationList.some((path) => new RegExp(String.raw`${path}`, 'i').test(file)); +const getOutputFile = (file) => file.replace(`${sep}scss${sep}`, `${sep}css${sep}`).replace('.scss', '.css').replace(`${sep}build${sep}media_source${sep}`, `${sep}media${sep}`); export const compile = async (file) => { - const cssFile = file - .replace(`${sep}scss${sep}`, `${sep}css${sep}`) - .replace('.scss', '.css') - .replace(`${sep}build${sep}media_source${sep}`, `${sep}media${sep}`); - const options = shouldSilenceDeprecation ? { silenceDeprecations: ['mixed-decls', 'color-functions', 'import', 'global-builtin'] } : {}; let compiled; + const cssFile = getOutputFile(file); + const options = shouldSilenceDeprecation(file) ? { silenceDeprecations: ['mixed-decls', 'color-functions', 'import', 'global-builtin'] } : {}; try { compiled = Sass.compile(file, options); From 35840ba035b8850cbc6fc79438c0cc4b98e741a6 Mon Sep 17 00:00:00 2001 From: Dimitris Grammatikogiannis Date: Sat, 15 Feb 2025 12:03:53 +0200 Subject: [PATCH 9/9] cs --- build/build-modules-js/stylesheets/handle-scss.mjs | 3 --- 1 file changed, 3 deletions(-) diff --git a/build/build-modules-js/stylesheets/handle-scss.mjs b/build/build-modules-js/stylesheets/handle-scss.mjs index 0352b2134c342..6bf9f72754162 100644 --- a/build/build-modules-js/stylesheets/handle-scss.mjs +++ b/build/build-modules-js/stylesheets/handle-scss.mjs @@ -15,9 +15,6 @@ const silenceDeprecationList = [ `media_source${sep}com_media`, `media_source${sep}plg_system_guidedtours${sep}scss${sep}guidedtours.scss`, ]; - - - const shouldSilenceDeprecation = (file) => silenceDeprecationList.some((path) => new RegExp(String.raw`${path}`, 'i').test(file)); const getOutputFile = (file) => file.replace(`${sep}scss${sep}`, `${sep}css${sep}`).replace('.scss', '.css').replace(`${sep}build${sep}media_source${sep}`, `${sep}media${sep}`);