uikit 3.25.28-dev.779d915 → 3.25.28

package/package.json

@@ -2,7 +2,7 @@
     "name": "uikit",
     "title": "UIkit",
     "description": "UIkit is a lightweight and modular front-end framework for developing fast and powerful web interfaces.",
-    "version": "3.25.28-dev.779d915",
+    "version": "3.25.28",
     "main": "dist/js/uikit.js",
     "style": "dist/css/uikit.css",
     "sideEffects": [
@@ -19,7 +19,6 @@
         "icons": "node build/icons",
         "prefix": "node build/prefix",
         "scope": "node build/scope",
-        "release": "node build/release",
         "watch": "node build/watch.js"
     },
     "repository": {

package/src/js/components/countdown.js

@@ -54,8 +54,8 @@ export default {
         stop() {
             if (this.timer) {
                 clearInterval(this.timer);
-                trigger(this.$el, 'countdownstop');
                 this.timer = null;
+                trigger(this.$el, 'countdownstop');
             }
         },
 
@@ -65,8 +65,8 @@ export default {
             if (!timespan.total) {
                 this.stop();
                 if (!this.end) {
-                    trigger(this.$el, 'countdownend');
                     this.end = true;
+                    trigger(this.$el, 'countdownend');
                     if (this.reload && this.started) {
                         window.location.reload();
                     }

package/src/js/components/parallax.js

@@ -46,7 +46,7 @@ export default {
 
     update: {
         read({ percent }, types) {
-            if (!types.has('scroll')) {
+            if (!types.has('scroll') || types.has('resize')) {
                 percent = false;
             }
 

package/src/js/components/slideshow.js

@@ -28,7 +28,7 @@ export default {
     watch: {
         list(list) {
             css(list, {
-                aspectRatio: this.ratio ? this.ratio.replace(':', '/') : undefined,
+                aspectRatio: this.ratio && this.ratio !== 'false' ? this.ratio.replace(':', '/') : '',
                 minHeight: this.minHeight,
                 maxHeight: this.maxHeight,
                 width: '100%',

package/src/js/components/upload.js

@@ -95,48 +95,49 @@ export default {
 
     methods: {
         async upload(files) {
-            files = toArray(files);
+            try {
+                files = toArray(files);
 
-            if (!files.length) {
-                return;
-            }
-
-            if (!this.multiple) {
-                files = files.slice(0, 1);
-            }
-
-            trigger(this.$el, 'upload', [files]);
-
-            for (const file of files) {
-                if (this.maxSize && this.maxSize * 1000 < file.size) {
-                    this.fail(this.t('invalidSize', this.maxSize));
+                if (!files.length) {
                     return;
                 }
 
-                if (this.allow && !match(this.allow, file.name)) {
-                    this.fail(this.t('invalidName', this.allow));
-                    return;
+                if (!this.multiple) {
+                    files = files.slice(0, 1);
                 }
 
-                if (this.mime && !match(this.mime, file.type)) {
-                    this.fail(this.t('invalidMime', this.mime));
-                    return;
+                trigger(this.$el, 'upload', [files]);
+
+                for (const file of files) {
+                    if (this.maxSize && this.maxSize * 1000 < file.size) {
+                        this.fail(this.t('invalidSize', this.maxSize));
+                        return;
+                    }
+
+                    if (this.allow && !match(this.allow, file.name)) {
+                        this.fail(this.t('invalidName', this.allow));
+                        return;
+                    }
+
+                    if (this.mime && !match(this.mime, file.type)) {
+                        this.fail(this.t('invalidMime', this.mime));
+                        return;
+                    }
                 }
-            }
 
-            this.beforeAll(this, files);
+                await this.beforeAll(this, files);
 
-            const chunks = chunk(files, this.concurrent);
-            const upload = async (files) => {
-                const data = new FormData();
+                const size = this.concurrent;
 
-                files.forEach((file) => data.append(this.name, file));
+                for (let i = 0; i < files.length; i += size) {
+                    const data = new FormData();
 
-                for (const key in this.params) {
-                    data.append(key, this.params[key]);
-                }
+                    files.slice(i, i + size).forEach((file) => data.append(this.name, file));
+
+                    for (const key in this.params) {
+                        data.append(key, this.params[key]);
+                    }
 
-                try {
                     const xhr = await ajax(this.url, {
                         data,
                         method: this.method,
@@ -154,42 +155,26 @@ export default {
 
                     this.complete(xhr);
 
-                    if (chunks.length) {
-                        await upload(chunks.shift());
-                    } else {
+                    if (i + size >= files.length) {
                         this.completeAll(xhr);
                     }
-                } catch (e) {
-                    if (e.name !== 'AbortError') {
-                        this.error(e);
-                    }
                 }
-            };
-
-            await upload(chunks.shift());
+            } catch (e) {
+                if (e?.name !== 'AbortError') {
+                    this.error(e);
+                }
+            }
         },
     },
 };
 
 function match(pattern, path) {
-    return path.match(
-        new RegExp(
-            `^${pattern
-                .replace(/\//g, '\\/')
-                .replace(/\*\*/g, '(\\/[^\\/]+)*')
-                .replace(/\*/g, '[^\\/]+')
-                .replace(/((?!\\))\?/g, '$1.')}$`,
-            'i',
-        ),
+    const expression = pattern.replace(
+        /\*\*|[.*+?^${}()|[\]\\]/g,
+        (s) => ({ '**': '.*', '*': '[^/]+', '?': '[^/]', '|': '|' })[s] ?? `\\${s}`,
     );
-}
 
-function chunk(files, size) {
-    const chunks = [];
-    for (let i = 0; i < files.length; i += size) {
-        chunks.push(files.slice(i, i + size));
-    }
-    return chunks;
+    return new RegExp(`^(?:${expression})$`, 'i').test(path);
 }
 
 function stop(e) {

package/src/js/core/drop.js

@@ -458,16 +458,14 @@ function getViewport(el, target) {
 }
 
 function createToggleComponent(drop) {
-    const el = query(drop.toggle, drop.$el);
+    const target = drop.$el;
+    const el = query(drop.toggle, target);
 
     if (el) {
-        drop.$create('toggle', el, { target: drop.$el, mode: drop.mode });
+        drop.$create('toggle', el, { target, mode: drop.mode });
 
-        const dropEl = drop.$el;
-        if (!dropEl.id) {
-            dropEl.id = generateId(drop, dropEl);
-        }
-        attr(el, 'aria-controls', dropEl.id);
+        target.id = generateId(drop, target);
+        attr(el, 'aria-controls', target.id);
     }
 
     return el;

package/src/js/core/scrollspy-nav.js

@@ -96,7 +96,6 @@ export default {
                 const { elements } = this;
                 const changed = active !== false && !hasClass(elements[active], this.cls);
 
-                this.links.forEach((el) => el.blur());
                 for (let i = 0; i < elements.length; i++) {
                     toggleClass(elements[i], this.cls, +i === active);
                 }

package/src/js/core/svg.js

@@ -84,7 +84,7 @@ function applyAttributes(el) {
 const loadSVG = memoize(async (src) => {
     if (src) {
         const response = await fetch(src);
-        if (response.headers.get('Content-Type') === 'image/svg+xml') {
+        if (/^image\/svg\+xml\s*(;|$)/i.test(response.headers.get('Content-Type'))) {
             return response.text();
         }
     }

package/src/js/util/style.js

@@ -13,6 +13,7 @@ import {
 
 const cssNumber = {
     'animation-iteration-count': true,
+    'aspect-ratio': true,
     'column-count': true,
     'fill-opacity': true,
     'flex-grow': true,

package/build/publishDev.js

@@ -1,32 +0,0 @@
-import { $ } from 'execa';
-import semver from 'semver';
-import { args, getVersion } from './util.js';
-
-const $$ = $({ stdio: 'inherit' });
-
-// default exec options
-if (args.f || args.force || (await isDevCommit())) {
-    // increase version patch number
-    const version = semver.inc(await getVersion(), 'patch');
-
-    // get current git hash
-    const hash = (await $`git rev-parse --short HEAD`).stdout.trim();
-
-    // set version of package.json
-    await $$`pnpm version ${version}-dev.${hash} --no-git-tag-version`;
-
-    // create dist files
-    await $$`pnpm compile`;
-    await $$`pnpm compile-rtl`;
-    await $$`pnpm build-scss`;
-} else {
-    process.exit(1);
-}
-
-async function isDevCommit() {
-    // check for changes to publish (%B: raw body (unwrapped subject and body)
-    const message = (await $`git log -1 --pretty=%B`).stdout.trim();
-
-    // https://www.conventionalcommits.org/en/v1.0.0/
-    return Boolean(message.match(/^(revert: )?(feat|fix|refactor|perf)(\(.+\))?: .{1,50}/));
-}

package/build/release.js

@@ -1,132 +0,0 @@
-import { ZipArchive } from 'archiver';
-import { $ } from 'execa';
-import inquirer from 'inquirer';
-import fs from 'node:fs';
-import { glob } from 'node:fs/promises';
-import semver from 'semver';
-import { args, getVersion, logFile, read, replaceInFile } from './util.js';
-
-const $$ = $({ stdio: 'inherit' });
-const prompt = inquirer.createPromptModule();
-
-if ((await $`git status --porcelain`).stdout.trim()) {
-    throw 'Repository contains uncommitted changes.';
-}
-
-const prevVersion = await getVersion();
-const version = await inquireVersion(args.v || args.version);
-
-await raiseVersion(version);
-
-await $$`pnpm compile`;
-await $$`pnpm compile-rtl`;
-await $$`pnpm build-scss`;
-
-await createPackage(version);
-
-if (args.d || args.deploy || (await inquireDeploy())) {
-    await deploy(version);
-}
-
-function isValidVersion(version) {
-    return semver.valid(version) && semver.gt(version, prevVersion);
-}
-
-async function inquireVersion(version) {
-    if (isValidVersion(version)) {
-        return version;
-    }
-
-    return (
-        await prompt({
-            name: 'version',
-            message: 'Enter a version',
-            default: () =>
-                semver.inc(prevVersion, semver.prerelease(prevVersion) ? 'prerelease' : 'patch'),
-            validate: (val) => isValidVersion(val) || 'Invalid version',
-        })
-    ).version;
-}
-
-function raiseVersion(version) {
-    return Promise.all([
-        $$`npm version ${version} --git-tag-version false`,
-        replaceInFile('CHANGELOG.md', (data) =>
-            data.replace(/^##\s*WIP.*$/m, `## ${versionFormat(version)} (${dateFormat()})`),
-        ),
-        replaceInFile('.github/ISSUE_TEMPLATE/bug-report.md', (data) =>
-            data.replace(prevVersion, version),
-        ),
-    ]);
-}
-
-async function createPackage(version) {
-    const dest = `dist/uikit-${version}.zip`;
-    const archive = new ZipArchive({ zlib: { level: 9 } });
-
-    const output = fs.createWriteStream(dest);
-    const closed = new Promise((resolve, reject) => {
-        output.on('close', resolve);
-        output.on('error', reject);
-    });
-
-    archive.pipe(output);
-
-    for await (const file of glob('dist/{js,css}/uikit?(-icons|-rtl)?(.min).{js,css}')) {
-        archive.file(file, { name: file.slice(5) });
-    }
-
-    await archive.finalize();
-    await closed;
-    await logFile(dest);
-}
-
-function versionFormat(version) {
-    return [semver.coerce(version).version].concat(semver.prerelease(version) || []).join(' ');
-}
-
-async function inquireDeploy() {
-    return (
-        await prompt({
-            name: 'deploy',
-            type: 'confirm',
-            message: 'Do you want to deploy the release?',
-            default: true,
-        })
-    ).deploy;
-}
-
-async function deploy(version) {
-    const tag = `v${version}`;
-    const branch = `release/v${version}`;
-
-    await $$`git checkout -b ${branch}`;
-    await $$`git add --all`;
-    await $$`git commit -am v${version}`;
-
-    await $$`git checkout main`;
-    await $$`git merge ${branch} --commit --no-ff -m ${`Merge branch '${branch}'`}`;
-    await $$`git tag ${tag}`;
-
-    await $$`git push origin main --tags`;
-
-    const notes = (await read('./CHANGELOG.md'))
-        .match(/## \d.*?$\s*(.*?)\s*(?=## \d)/ms)[1]
-        .replace(/(["`])/g, '\\$1');
-    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`}`;
-
-    await $$`git branch --delete ${branch}`;
-
-    await $$`git push origin develop`;
-}
-
-function dateFormat() {
-    return new Intl.DateTimeFormat('en-US', {
-        month: 'long',
-        day: 'numeric',
-        year: 'numeric',
-    }).format(new Date());
-}