uikit 3.16.25-dev.12f581d90 → 3.16.25-dev.931f07bf4

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## WIP
+
+### Added
+
+- Add `-source` argument to `prefix` command
+
 ## 3.16.24 (August 1, 2023)
 
 ### Fixed

package/build/prefix.js

@@ -6,7 +6,7 @@ if (args.h || args.help) {
     console.log(`
         usage:
 
-        prefix.js [-p{refix}=your_great_new_prefix]
+        prefix.js [-p{refix}=prefix] [-s{ource}=folder to replace prefix in]
 
         example:
 
@@ -17,6 +17,7 @@ if (args.h || args.help) {
     process.exit(0);
 }
 
+const path = args.s || args.source || 'dist';
 const currentPrefix = await findExistingPrefix();
 const prefix = await getPrefix();
 
@@ -27,7 +28,7 @@ if (currentPrefix === prefix) {
 await replacePrefix(currentPrefix, prefix);
 
 async function findExistingPrefix() {
-    return (await read('dist/css/uikit.css')).match(
+    return (await read(`${path}/css/uikit.css`)).match(
         new RegExp(`(${validClassName.source})(-[a-z]+)?-grid`),
     )?.[1];
 }
@@ -58,13 +59,13 @@ async function getPrefix() {
 }
 
 async function replacePrefix(from, to) {
-    for (const file of await glob('dist/**/*.css')) {
+    for (const file of await glob(`${path}/**/*.css`)) {
         await replaceInFile(file, (data) =>
             data.replace(new RegExp(`${from}-${/([a-z\d-]+)/.source}`, 'g'), `${to}-$1`),
         );
     }
 
-    for (const file of await glob('dist/**/*.js')) {
+    for (const file of await glob(`${path}/**/*.js`)) {
         await replaceInFile(file, (data) =>
             data
                 .replace(new RegExp(`${from}-`, 'g'), `${to}-`)

package/build/scss.js

@@ -9,9 +9,12 @@ const coreMixins = {};
 const themeMixins = {};
 const coreVariables = {};
 const themeVariables = {};
+const inverseComponentMixins = [];
 
 /* First Step: Go through all files */
-for (const file of (await glob('src/less/**/*.less')).sort()) {
+for (const file of (await glob('src/less/**/*.less'))
+    .sort()
+    .sort((a, b) => a.endsWith('/inverse.less') - b.endsWith('/inverse.less'))) {
     let source = await read(file);
 
     /* replace all Less stuff with SCSS */
@@ -23,7 +26,7 @@ for (const file of (await glob('src/less/**/*.less')).sort()) {
             /(:[^'"]*?\([^'"]+?)\s*\/\s*([0-9.-]+)\)/g,
             (exp, m1, m2) => `${m1} * ${NP.round(1 / parseFloat(m2), 5)})`,
         )
-        .replace(/--uk-[^\s]+: (\$[^\s]+);/g, (exp, name) => exp.replace(name, `#{${name}}`))
+        .replace(/--uk-\S+: (\$\S+);/g, (exp, name) => exp.replace(name, `#{${name}}`))
         .replace(/\\\$/g, '\\@') // revert classes using the @ symbol
         .replace(/ e\(/g, ' unquote(') // convert escape function
         .replace(/\.([\w-]*)\s*\((.*)\)\s*{/g, '@mixin $1($2){') // hook -> mixins
@@ -40,7 +43,7 @@ for (const file of (await glob('src/less/**/*.less')).sort()) {
         }) // replace Less function fadeout with fade-out
         .replace(/\.svg-fill/g, '@include svg-fill') // include svg-fill mixin
         .replace(
-            /(.*):extend\((\.[\w\\@-]*) all\) when \((\$[\w-]*) = ([\w]+)\) {}/g,
+            /(.*):extend\((\.[\w\\@-]*) all\) when \((\$[\w-]*) = (\w+)\) {}/g,
             '@if ( $3 == $4 ) { $1 { @extend $2 !optional;} }',
         ) // update conditional extend and add !optional to ignore warnings
         .replace(
@@ -63,10 +66,17 @@ for (const file of (await glob('src/less/**/*.less')).sort()) {
     /* File name of the current file */
     const filename = path.basename(file, '.less');
 
-    source =
-        filename === 'inverse'
-            ? source.replace(/\*\//, `*/\n${await read('build/scss/inverse.scss')}`)
-            : source.replace(/hook-inverse(?!-)/g, `hook-inverse-component-${filename}`);
+    if (filename === 'inverse') {
+        source = source.replace(
+            /\*\//,
+            `*/\n@mixin hook-inverse() {\n${inverseComponentMixins
+                .map((mixin) => `    @include ${mixin}();\n`)
+                .join('')}}`,
+        );
+    } else if (source.match(/hook-inverse(?!-)/)) {
+        source = source.replace(/hook-inverse(?!-)/, `hook-inverse-component-${filename}`);
+        inverseComponentMixins.push(`hook-inverse-component-${filename}`);
+    }
 
     /* get all the mixins and remove them from the file */
     source = getMixinsFromFile(file, source);

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

@@ -1,4 +1,4 @@
-/*! UIkit 3.16.25-dev.12f581d90 | https://www.getuikit.com | (c) 2014 - 2023 YOOtheme | MIT License */
+/*! UIkit 3.16.25-dev.931f07bf4 | https://www.getuikit.com | (c) 2014 - 2023 YOOtheme | MIT License */
 /* ========================================================================
    Component: Base
  ========================================================================== */
@@ -3608,10 +3608,14 @@ select.uk-form-width-xsmall {
 /* Container
  ========================================================================== */
 /*
- * Clip child elements
+ * 1. Clip child elements
+ * 2. Prevent accidental scrolling through elements in slide getting focused
  */
 .uk-slider-container {
+  /* 1 */
   overflow: hidden;
+  /* 2 */
+  overflow: clip;
 }
 /*
  * Widen container to prevent box-shadows from clipping, `large-box-shadow`