uikit 3.23.7 → 3.23.8-dev.97ee4c1bb

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## WIP
+
+### Fixed
+
+- Fix setting focus to Modal/Offcanvas Toggle component after close
+
 ## 3.23.7 (May 9, 2025)
 
 ### Fixed

package/build/release.js

@@ -112,7 +112,7 @@ async function deploy(version) {
     const notes = (await read('./Changelog.md'))
         .match(/## \d.*?$\s*(.*?)\s*(?=## \d)/ms)[1]
         .replace(/(["`])/g, '\\$1');
-    await $$`gh release create v${version} --notes ${notes} ./dist/uikit-${version}.zip`;
+    await $$`gh release create v${version} --repo uikit/uikit --notes ${notes} ./dist/uikit-${version}.zip`;
 
     await $$`git checkout develop`;
     await $$`git merge ${tag} --commit --no-ff -m ${`Merge tag '${tag}' into develop`}`;

package/build/scss.js

@@ -1,3 +1,4 @@
+import { emptyDir } from 'fs-extra';
 import { glob } from 'glob';
 import NP from 'number-precision';
 import path from 'path';
@@ -11,7 +12,8 @@ const coreVariables = {};
 const themeVariables = {};
 const inverseComponentMixins = [];
 
-/* First Step: Go through all files */
+await emptyDir('src/scss/');
+
 for (const file of (await glob('src/less/**/*.less'))
     .sort()
     .sort((a, b) => a.endsWith('/inverse.less') - b.endsWith('/inverse.less'))) {
@@ -78,7 +80,9 @@ for (const file of (await glob('src/less/**/*.less'))
         );
     } else if (source.match(/hook-inverse(?!-)/)) {
         source = source.replace(/hook-inverse(?!-)/, `hook-inverse-component-${filename}`);
-        inverseComponentMixins.push(`hook-inverse-component-${filename}`);
+        if (!inverseComponentMixins.includes(`hook-inverse-component-${filename}`)) {
+            inverseComponentMixins.push(`hook-inverse-component-${filename}`);
+        }
     }
 
     /* get all the mixins and remove them from the file */
@@ -90,11 +94,7 @@ for (const file of (await glob('src/less/**/*.less'))
     if (filename === 'uikit.theme') {
         /* remove the theme import first place */
         source = source.replace(/\/\/\n\/\/ Theme\n\/\/\n\n@import "theme\/_import.scss";/, '');
-        /* add uikit-mixins and uikit-variables include to the uikit.scss file and change order, to load theme files first */
-        source = source.replace(
-            /\/\/ Core\n\/\//g,
-            '// Theme\n//\n\n@import "theme/_import.scss";',
-        );
+        source = source.replace(/\/\/ Core\n\/\//g, '// Theme\n//\n');
     }
 
     /* mixin.less needs to be fully replaced by the new mixin file*/
@@ -102,18 +102,22 @@ for (const file of (await glob('src/less/**/*.less'))
         source = await read('build/scss/mixin.scss');
     }
 
-    await write(file.replace(/less/g, 'scss').replace('.theme.', '-theme.'), source);
+    if (!file.includes('theme/')) {
+        await write(
+            file.replace(/less/g, 'scss').replace('.theme.', '-theme.'),
+            useSassModules(source),
+        );
+    }
 }
 
-/* Second Step: write all new needed files for Sass */
-
 /* write mixins files */
 for (const [vars, file] of [
     [coreMixins, 'mixins'],
     [themeMixins, 'mixins-theme'],
 ]) {
     delete vars['svg-fill'];
-    await write(`src/scss/${file}.scss`, Object.values(vars).join('\n'));
+
+    await write(`src/scss/${file}.scss`, useSassModules(Object.values(vars).join('\n')));
 }
 
 /* write variables files */
@@ -125,7 +129,40 @@ for (const [vars, file] of [
         (dependencies, key) => resolveDependencies(vars, key, dependencies),
         new Set(),
     );
-    await write(`src/scss/${file}.scss`, Array.from(variables).join('\n'));
+    await write(`src/scss/${file}.scss`, useSassModules(Array.from(variables).join('\n')));
+}
+
+/*
+ * add prefix of origin to methods
+ */
+function useSassModules(source) {
+    const modules = new Set();
+
+    for (const [module, search, replacement] of [
+        ['meta', /(?<=\W)mixin-exists\(/g, 'meta.$&'],
+        ['string', /(?<=\W)(un)?quote\(/g, 'string.$&'],
+        ['string', /(?<=\W)str-(index|slice|length)\(/g, 'string.$1('],
+        ['math', /(?<=\W)(floor|round)\(/g, 'math.$&'],
+        ['color', /(?<=\W)mix\(/g, 'color.$&'],
+        ['color', /(?<=\W)lighten\((.*),\s*(.*)\)/g, 'color.adjust($1, $lightness: $2)'],
+        ['color', /(?<=\W)darken\((.*),\s*(.*)\)/g, 'color.adjust($1, $lightness: -$2)'],
+        ['color', /(?<=\W)fade-in\(([^,]*),\s*(.*)\)/g, 'color.adjust($1, $alpha: $2)'],
+        ['color', /(?<=\W)fade-out\(([^,]*),\s*(.*)\)/g, 'color.adjust($1, $alpha: -$2)'],
+        ['color', /(?<=\W)adjust-hue\(([^,]*),\s*(.*)\)/g, 'color.adjust($1, $hue: $2)'],
+    ]) {
+        const prev = source;
+        source = source.replaceAll(search, replacement);
+
+        if (source !== prev) {
+            modules.add(module);
+        }
+    }
+
+    return modules.size
+        ? `${Array.from(modules)
+              .map((module) => `@use "sass:${module}";`)
+              .join('\n')}\n\n${source}`
+        : source;
 }
 
 /*

package/build/util.js

@@ -30,6 +30,8 @@ export function read(file) {
 }
 
 export async function write(dest, data) {
+    fs.ensureDir(path.dirname(dest));
+
     await fs.writeFile(dest, data);
     await logFile(dest);
 

package/dist/css/uikit-core-rtl.css

@@ -1,4 +1,4 @@
-/*! UIkit 3.23.7 | https://www.getuikit.com | (c) 2014 - 2025 YOOtheme | MIT License */
+/*! UIkit 3.23.8-dev.97ee4c1bb | https://www.getuikit.com | (c) 2014 - 2025 YOOtheme | MIT License */
 /* ========================================================================
    Component: Base
  ========================================================================== */