uikit 3.9.2-dev.836238c9b → 3.9.3-dev.1ffd84b61

package/.eslintrc.json

@@ -2,8 +2,7 @@
     "root":true,
     "env": {
         "es6": true,
-        "browser": true,
-        "commonjs": true
+        "browser": true
     },
     "extends": [
         "eslint:recommended"

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # Changelog
 
+## WIP
+
+### Fixed
+
+- Fix logo image alignment if logo line-height is larger than the image
+
+## 3.9.2 (November 11, 2021)
+
+### Fixed
+
+- Fix build scripts for windows users
+- Fix css in Leader component
+- Fix division deprecation warnings in Sass source
+
 ## 3.9.1 (November 10, 2021)
 
 ### Changed

package/build/build.js

@@ -1,12 +1,11 @@
 import camelize from 'camelcase';
 import {basename, resolve} from 'path';
-import {__dirname, args, compile, glob, icons} from './util.js';
+import {args, compile, glob, icons} from './util.js';
 
 const bundles = getBundleTasks();
 const components = await getComponentTasks();
 
 if (args.h || args.help) {
-
     console.log(`
         usage:
 
@@ -74,7 +73,7 @@ async function getComponentTasks() {
                 name,
                 external: ['uikit', 'uikit-util'],
                 globals: {uikit: 'UIkit', 'uikit-util': 'UIkit.util'},
-                aliases: {component: resolve(__dirname, '../src/js/components', name)},
+                aliases: {component: resolve('src/js/components', name)},
                 replaces: {NAME: `'${camelize(name)}'`}
             });
 

package/build/icons.js

@@ -1,5 +1,23 @@
 import {args, compile, glob, icons} from './util.js';
 
+if (args.h || args.help) {
+    console.log(`
+    
+        Builds additional custom uikit icons found in './custom/*/icons'
+    
+        usage:
+
+        icons.js [custom|name]
+
+        -c|--custom 
+            Specify custom folder to look for icons (default: './custom/*/icons')
+        -n|--name 
+            Specify name regex to match against folder (default: '([a-z]+)/icons$')
+
+    `);
+    process.exit(0);
+}
+
 const path = args.c || args.custom || 'custom/*/icons';
 const match = args.n || args.name || '([a-z]+)/icons$';
 

package/build/less.js

@@ -1,6 +1,6 @@
-import {basename} from 'path';
 import rtlcss from 'rtlcss';
 import postcss from 'postcss';
+import {basename} from 'path';
 import {args, banner, glob, minify, pathExists, read, readJson, renderLess, write} from './util.js';
 
 const {rtl} = args;

package/build/publishDev.js

@@ -1,34 +1,32 @@
 import semver from 'semver';
-import {resolve} from 'path';
-import {__dirname, args, getVersion, run} from './util.js';
+import {args, getVersion, run} from './util.js';
 
 const {inc} = semver;
 
 // default exec options
-const options = {cwd: resolve(`${__dirname}/..`), encoding: 'utf8'};
 if (args.f || args.force || await isDevCommit()) {
 
     // increase version patch number
     const version = inc(await getVersion(), 'patch');
 
     // get current git hash
-    const hash = (await run('git rev-parse --short HEAD', options)).trim();
+    const hash = (await run('git rev-parse --short HEAD')).trim();
 
     // set version of package.json
-    await run(`npm version ${version}-dev.${hash} --git-tag-version false`, {...options, stdio: 'inherit'});
+    await run(`npm version ${version}-dev.${hash} --git-tag-version false`);
 
     // create dist files
-    await run('yarn compile && yarn compile-rtl && yarn build-scss', {...options, stdio: 'inherit'});
+    await run('yarn compile && yarn compile-rtl && yarn build-scss');
 
     // publish to dev tag
-    await run('npm publish --tag dev', options);
+    await run('npm publish --tag dev');
 
 }
 
 async function isDevCommit() {
 
     // check for changes to publish (%B: raw body (unwrapped subject and body)
-    const message = await run('git log -1 --pretty=%B', options);
+    const message = await run('git log -1 --pretty=%B');
 
     const type = message.match(/^(revert: )?(feat|fix|polish|docs|style|refactor|perf|test|workflow|ci|chore|types)(\(.+\))?: .{1,50}/);
 

package/build/scss.js

@@ -1,5 +1,8 @@
+import NP from 'number-precision';
 import {glob, read, write} from './util.js';
 
+NP.enableBoundaryChecking(false);
+
 const themeMixins = {};
 const coreMixins = {};
 const themeVar = {};
@@ -78,6 +81,7 @@ for (const file of await glob('src/less/**/*.less')) {
     let scssData = data.replace(/\/less\//g, '/scss/') // change less/ dir to scss/ on imports
         .replace(/\.less/g, '.scss') // change .less extensions to .scss on imports
         .replace(/@/g, '$') // convert variables
+        .replace(/(:[^'"]*?\([^'"]+?)\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(/\\\$/g, '\\@') // revert classes using the @ symbol
         .replace(/ e\(/g, ' unquote(') // convert escape function

package/build/util.js

@@ -1,9 +1,8 @@
 import less from 'less';
-import {URL} from 'url';
 import fs from 'fs-extra';
+import pLimit from 'p-limit';
 import postcss from 'postcss';
 import globImport from 'glob';
-import {rollup, watch as rollupWatch} from 'rollup';
 import {optimize} from 'svgo';
 import {promisify} from 'util';
 import minimist from 'minimist';
@@ -12,15 +11,17 @@ import html from 'rollup-plugin-html';
 import buble from '@rollup/plugin-buble';
 import alias from '@rollup/plugin-alias';
 import modify from 'rollup-plugin-modify';
-import {uglify} from 'rollup-plugin-uglify';
+import {terser} from 'rollup-plugin-terser';
 import replace from '@rollup/plugin-replace';
-import {basename, dirname, resolve} from 'path';
+import {basename, dirname, join} from 'path';
 import {exec as execImport} from 'child_process';
+import {rollup, watch as rollupWatch} from 'rollup';
+
+const limit = pLimit(Number(process.env.cpus || 2));
 
 export const exec = promisify(execImport);
 export const glob = promisify(globImport);
 export const {pathExists, readJson} = fs;
-export const __dirname = new URL('.', import.meta.url).pathname;
 
 export const banner = `/*! UIkit ${await getVersion()} | https://www.getuikit.com | (c) 2014 - ${new Date().getFullYear()} YOOtheme | MIT License */\n`;
 export const validClassName = /[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*/;
@@ -55,26 +56,26 @@ export async function write(dest, data) {
 
 export async function logFile(file) {
     const data = await read(file);
-    console.log(`${cyan(resolve(file))} ${getSize(data)}`);
+    console.log(`${cyan(file)} ${getSize(data)}`);
 }
 
 export async function minify(file) {
 
-    const {styles} = await new CleanCSS({
+    const {styles} = await limit(() => new CleanCSS({
         advanced: false,
         keepSpecialComments: 0,
         rebase: false,
         returnPromise: true
-    }).minify([file]);
+    }).minify([file]));
 
-    await write(`${resolve(dirname(file), basename(file, '.css'))}.min.css`, styles);
+    await write(`${join(dirname(file), basename(file, '.css'))}.min.css`, styles);
 
     return styles;
 
 }
 
-export async function renderLess(data, options) {
-    return postcss()
+export function renderLess(data, options) {
+    return limit(async () => postcss()
         .use({
             postcssPlugin: 'calc',
             Once(root) {
@@ -91,7 +92,8 @@ export async function renderLess(data, options) {
             }
         })
         .process((await less.render(data, options)).css)
-        .css;
+        .css
+    );
 }
 
 export async function compile(file, dest, {external, globals, name, aliases, replaces} = {}) {
@@ -151,7 +153,7 @@ export async function compile(file, dest, {external, globals, name, aliases, rep
         output.push({
             ...outputOptions,
             file: `${dest}.min.js`,
-            plugins: [minify ? uglify({output: {preamble: banner}}) : undefined]
+            plugins: [minify ? terser() : undefined]
         });
     }
 
@@ -159,12 +161,15 @@ export async function compile(file, dest, {external, globals, name, aliases, rep
         const bundle = await rollup(inputOptions);
 
         for (const options of output) {
-            await bundle.write(options);
+            await limit(() => bundle.write(options));
             logFile(options.file);
         }
 
         await bundle.close();
     } else {
+
+        console.log('UIkit is watching the files...');
+
         const watcher = rollupWatch({
             ...inputOptions,
             output
@@ -212,9 +217,13 @@ export async function icons(src) {
     };
 
     const files = await glob(src, {nosort: true});
-    const icons = await Promise.all(files.map(async file =>
-        (await optimize(await read(file), options)).data
-    ));
+    const icons = await Promise.all(
+        files.map(file =>
+            limit(async () =>
+                (await optimize(await read(file), options)).data
+            )
+        )
+    );
 
     return JSON.stringify(files.reduce((result, file, i) => {
         result[basename(file, '.svg')] = icons[i];
@@ -223,10 +232,11 @@ export async function icons(src) {
 
 }
 
-export async function run(cmd) {
-    const {stdout, stderr} = await exec(cmd);
+export async function run(cmd, options) {
+    const {stdout, stderr} = await limit(() => exec(cmd, options));
 
-    stderr && console.error(stderr.trim());
+    stdout && console.log(stdout.trim());
+    stderr && console.log(stderr.trim());
 
     return stdout;
 }
@@ -236,7 +246,7 @@ export function ucfirst(str) {
 }
 
 export async function getVersion() {
-    return (await readJson(resolve(__dirname, '../package.json'))).version;
+    return (await readJson('package.json')).version;
 }
 
 export async function replaceInFile(file, fn) {

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

@@ -1,4 +1,4 @@
-/*! UIkit 3.9.2-dev.836238c9b | https://www.getuikit.com | (c) 2014 - 2021 YOOtheme | MIT License */
+/*! UIkit 3.9.3-dev.1ffd84b61 | https://www.getuikit.com | (c) 2014 - 2021 YOOtheme | MIT License */
 /* ========================================================================
    Component: Base
  ========================================================================== */
@@ -4068,7 +4068,7 @@ select.uk-form-width-xsmall {
   content: '.';
 }
 :root {
-  --uk-leader-fill-content: .;
+  --uk-leader-fill-content: '.';
 }
 /* ========================================================================
    Component: Notification
@@ -7730,6 +7730,9 @@ iframe.uk-cover {
   /* 1 */
   text-decoration: none;
 }
+.uk-logo > :where(img, svg, video) {
+  display: block;
+}
 .uk-logo-inverse {
   display: none;
 }
@@ -11567,7 +11570,7 @@ iframe.uk-cover {
 .uk-card-secondary > :not([class*='uk-card-media']) .uk-logo-inverse,
 .uk-overlay-primary .uk-logo-inverse,
 .uk-offcanvas-bar .uk-logo-inverse {
-  display: inline;
+  display: block;
 }
 /* ========================================================================
    Component: Print