uikit 3.16.24 → 3.16.25-dev.9ac53a026

package/.eslintrc.json

@@ -14,14 +14,5 @@
         "LOG": true,
         "ICONS": true,
         "NAME": true
-    },
-    "rules": {
-        "sort-imports": [
-            "error",
-            {
-                "ignoreCase": true,
-                "ignoreDeclarationSort": true
-            }
-        ]
     }
 }

package/.prettierrc.json

@@ -2,12 +2,11 @@
     "tabWidth": 4,
     "printWidth": 100,
     "singleQuote": true,
+    "plugins": ["prettier-plugin-organize-imports"],
     "overrides": [
         {
-            "files": ["**/*.yml"],
-            "options": {
-                "tabWidth": 2
-            }
+            "files": "*.yml",
+            "options": { "tabWidth": 2 }
         }
     ]
 }

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/build.js

@@ -1,7 +1,7 @@
-import path from 'path';
+import camelize from 'camelcase';
 import { glob } from 'glob';
 import pLimit from 'p-limit';
-import camelize from 'camelcase';
+import path from 'path';
 import { args, compile, icons } from './util.js';
 
 const limit = pLimit(Number(process.env.cpus || 2));

package/build/less.js

@@ -1,5 +1,5 @@
-import path from 'path';
 import { glob } from 'glob';
+import path from 'path';
 import rtlcss from 'rtlcss';
 import { args, banner, minify, pathExists, read, readJson, renderLess, write } from './util.js';
 
@@ -82,7 +82,7 @@ async function compile(file, dist, develop, rtl) {
                     root.prepend(postcss.comment({ text: 'rtl:begin:rename' }));
                     root.append(postcss.comment({ text: 'rtl:end:rename' }));
                 },
-            }
+            },
         );
     }
 

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,8 +28,8 @@ if (currentPrefix === prefix) {
 await replacePrefix(currentPrefix, prefix);
 
 async function findExistingPrefix() {
-    return (await read('dist/css/uikit.css')).match(
-        new RegExp(`(${validClassName.source})(-[a-z]+)?-grid`)
+    return (await read(`${path}/css/uikit.css`)).match(
+        new RegExp(`(${validClassName.source})(-[a-z]+)?-grid`),
     )?.[1];
 }
 
@@ -58,17 +59,17 @@ 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`)
+            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}-`)
-                .replace(new RegExp(`(${from})?UIkit`, 'g'), `${to === 'uk' ? '' : to}UIkit`)
+                .replace(new RegExp(`(${from})?UIkit`, 'g'), `${to === 'uk' ? '' : to}UIkit`),
         );
     }
 }

package/build/release.js

@@ -1,10 +1,10 @@
-import fs from 'fs';
+import archiver from 'archiver';
+import dateFormat from 'dateformat/lib/dateformat.js';
 import { $ } from 'execa';
+import fs from 'fs';
 import { glob } from 'glob';
-import semver from 'semver';
-import archiver from 'archiver';
 import inquirer from 'inquirer';
-import dateFormat from 'dateformat/lib/dateformat.js';
+import semver from 'semver';
 import { args, getVersion, logFile, read, replaceInFile } from './util.js';
 
 const $$ = $({ stdio: 'inherit' });
@@ -55,11 +55,11 @@ function raiseVersion(version) {
         replaceInFile('CHANGELOG.md', (data) =>
             data.replace(
                 /^##\s*WIP/m,
-                `## ${versionFormat(version)} (${dateFormat(Date.now(), 'mmmm d, yyyy')})`
-            )
+                `## ${versionFormat(version)} (${dateFormat(Date.now(), 'mmmm d, yyyy')})`,
+            ),
         ),
         replaceInFile('.github/ISSUE_TEMPLATE/bug-report.md', (data) =>
-            data.replace(prevVersion, version)
+            data.replace(prevVersion, version),
         ),
     ]);
 }

package/build/scope.js

@@ -67,9 +67,9 @@ async function scope(files, scope) {
                 output.replace(
                     new RegExp(
                         `.${scope}\\s((\\.(uk-(drag|modal-page|offcanvas-page|offcanvas-flip)))|html|:root)`,
-                        'g'
+                        'g',
                     ),
-                    '$1'
+                    '$1',
                 ) // unescape
             }`;
         });
@@ -88,7 +88,7 @@ async function cleanup(files, scope) {
             (data) =>
                 data
                     .replace(currentScopeRe, '') // remove scope comment
-                    .replace(new RegExp(` *${string} ({[\\s\\S]*?})?`, 'g'), '') // replace classes
+                    .replace(new RegExp(` *${string} ({[\\s\\S]*?})?`, 'g'), ''), // replace classes
         );
     }
 }

package/build/scss.js

@@ -1,7 +1,7 @@
 import { glob } from 'glob';
 import NP from 'number-precision';
-import { read, write } from './util.js';
 import path from 'path';
+import { read, write } from './util.js';
 
 NP.enableBoundaryChecking(false);
 
@@ -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 */
@@ -21,9 +24,9 @@ for (const file of (await glob('src/less/**/*.less')).sort()) {
         .replace(/@/g, '$') // convert variables
         .replace(
             /(:[^'"]*?\([^'"]+?)\s*\/\s*([0-9.-]+)\)/g,
-            (exp, m1, m2) => `${m1} * ${NP.round(1 / parseFloat(m2), 5)})`
+            (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,20 +43,20 @@ 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,
-            '@if ( $3 == $4 ) { $1 { @extend $2 !optional;} }'
+            /(.*):extend\((\.[\w\\@-]*) all\) when \((\$[\w-]*) = (\w+)\) {}/g,
+            '@if ( $3 == $4 ) { $1 { @extend $2 !optional;} }',
         ) // update conditional extend and add !optional to ignore warnings
         .replace(
             /(\.[\w\\@-]+)\s*when\s*\((\$[\w-]*)\s*=\s*(\w+)\)\s*{\s*@if\(mixin-exists\(([\w-]*)\)\) {@include\s([\w-]*)\(\);\s*}\s*}/g,
-            '@if ($2 == $3) { $1 { @if (mixin-exists($4)) {@include $4();}}}'
+            '@if ($2 == $3) { $1 { @if (mixin-exists($4)) {@include $4();}}}',
         ) // update conditional hook
         .replace(
             /([.:][\w\\@-]+(?: ?[.:][\w\\@-]+)*)\s*when\s*\(([$@][\w-]*)\s*=\s*([$@]?[\w-]+)\)\s*({\s*.*?\s*})/gms,
-            '@if ($2 == $3) {\n$1 $4\n}'
+            '@if ($2 == $3) {\n$1 $4\n}',
         )
         .replace(
             /([.:][\w\\@-]+(?: ?[.:][\w\\@-]+)*)\s*when\s+not\s*\(([$@][\w-]*)\s*=\s*([$@]?[\w-]+)\)\s*({\s*.*?\s*})/gs,
-            '@if ($2 != $3) {\n$1 $4\n}'
+            '@if ($2 != $3) {\n$1 $4\n}',
         ) // replace conditionals
         .replace(/\${/g, '#{$') // string literals: from: /~"(.*)"/g, to: '#{"$1"}'
         .replace(/[^(](-\$[\w-]*)/g, ' ($1)') // surround negative variables with brackets
@@ -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);
@@ -80,7 +90,7 @@ for (const file of (await glob('src/less/**/*.less')).sort()) {
         /* 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";'
+            '// Theme\n//\n\n@import "theme/_import.scss";',
         );
     }
 
@@ -110,7 +120,7 @@ for (const [vars, file] of [
 ]) {
     const variables = Object.keys(vars).reduce(
         (dependencies, key) => resolveDependencies(vars, key, dependencies),
-        new Set()
+        new Set(),
     );
     await write(`src/scss/${file}.scss`, Array.from(variables).join('\n'));
 }
@@ -147,7 +157,7 @@ function getMixinsFromFile(file, source) {
 
     /* Step 2: get all mixins */
     for (const [match, mixin] of source.matchAll(
-        /@mixin ([\w-]*)\s*\(.*\)\s*{(\n\s+[\w\W]+?(?=\n})\n| [^\n]+)}/g
+        /@mixin ([\w-]*)\s*\(.*\)\s*{(\n\s+[\w\W]+?(?=\n})\n| [^\n]+)}/g,
     )) {
         themeMixins[mixin] = match;
         if (!file.includes('theme/')) {

package/build/util.js

@@ -1,16 +1,16 @@
-import less from 'less';
-import path from 'path';
-import svgo from 'svgo';
+import alias from '@rollup/plugin-alias';
+import replace from '@rollup/plugin-replace';
+import CleanCSS from 'clean-css';
 import fs from 'fs-extra';
-import pLimit from 'p-limit';
 import { glob } from 'glob';
+import less from 'less';
 import minimist from 'minimist';
-import CleanCSS from 'clean-css';
-import alias from '@rollup/plugin-alias';
-import modify from 'rollup-plugin-modify';
-import replace from '@rollup/plugin-replace';
+import pLimit from 'p-limit';
+import path from 'path';
 import { rollup, watch as rollupWatch } from 'rollup';
 import { default as esbuild, minify as esbuildMinify } from 'rollup-plugin-esbuild';
+import modify from 'rollup-plugin-modify';
+import svgo from 'svgo';
 
 const limit = pLimit(Number(process.env.cpus || 2));
 
@@ -57,7 +57,7 @@ export async function minify(file) {
             keepSpecialComments: 0,
             rebase: false,
             returnPromise: true,
-        }).minify([file])
+        }).minify([file]),
     );
 
     await write(`${path.join(path.dirname(file), path.basename(file, '.css'))}.min.css`, styles);
@@ -178,7 +178,7 @@ export async function compile(file, dest, { external, globals, name, aliases, re
 export async function icons(src) {
     const files = await glob(src);
     const icons = await Promise.all(
-        files.map((file) => limit(async () => optimizeSvg(await read(file))))
+        files.map((file) => limit(async () => optimizeSvg(await read(file)))),
     );
 
     return JSON.stringify(
@@ -187,7 +187,7 @@ export async function icons(src) {
             return result;
         }, {}),
         null,
-        '    '
+        '    ',
     );
 }
 

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

@@ -1,4 +1,4 @@
-/*! UIkit 3.16.24 | https://www.getuikit.com | (c) 2014 - 2023 YOOtheme | MIT License */
+/*! UIkit 3.16.25-dev.9ac53a026 | 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`