Skip to content

Commit

Permalink
Merge branch 'main' into onmax/local-fonts
Browse files Browse the repository at this point in the history
  • Loading branch information
onmax committed Apr 14, 2024
2 parents ca5a114 + c51bf4c commit eb5bf79
Show file tree
Hide file tree
Showing 52 changed files with 52 additions and 80 deletions.
1 change: 1 addition & 0 deletions .gitattributes
@@ -0,0 +1 @@
* text=auto eol=lf
2 changes: 1 addition & 1 deletion bench/package.json
@@ -1,5 +1,5 @@
{
"version": "0.59.1",
"version": "0.59.2",
"scripts": {
"bench": "node run.mjs"
},
Expand Down
2 changes: 1 addition & 1 deletion docs/package.json
@@ -1,7 +1,7 @@
{
"name": "docs",
"type": "module",
"version": "0.59.1",
"version": "0.59.2",
"private": true,
"scripts": {
"docs:dev": "vitepress dev",
Expand Down
2 changes: 1 addition & 1 deletion examples/vue-cli4/package.json
@@ -1,5 +1,5 @@
{
"version": "0.59.1",
"version": "0.59.2",
"private": true,
"scripts": {
"dev": "cross-env NODE_OPTIONS=--openssl-legacy-provider vue-cli-service serve",
Expand Down
2 changes: 1 addition & 1 deletion examples/vue-cli5/package.json
@@ -1,5 +1,5 @@
{
"version": "0.59.1",
"version": "0.59.2",
"private": true,
"scripts": {
"dev": "vue-cli-service serve",
Expand Down
2 changes: 1 addition & 1 deletion interactive/package.json
@@ -1,7 +1,7 @@
{
"name": "interactive",
"type": "module",
"version": "0.59.1",
"version": "0.59.2",
"private": true,
"scripts": {
"build": "nuxi prepare && esno scripts/prepare.ts && nuxi generate",
Expand Down
2 changes: 1 addition & 1 deletion package.json
@@ -1,7 +1,7 @@
{
"name": "@unocss/monorepo",
"type": "module",
"version": "0.59.1",
"version": "0.59.2",
"private": true,
"packageManager": "pnpm@8.15.6",
"scripts": {
Expand Down
2 changes: 1 addition & 1 deletion packages/astro/package.json
@@ -1,7 +1,7 @@
{
"name": "@unocss/astro",
"type": "module",
"version": "0.59.1",
"version": "0.59.2",
"description": "UnoCSS integration for Astro",
"author": "Anthony Fu <anthonyfu117@hotmail.com>",
"license": "MIT",
Expand Down
2 changes: 1 addition & 1 deletion packages/autocomplete/package.json
@@ -1,7 +1,7 @@
{
"name": "@unocss/autocomplete",
"type": "module",
"version": "0.59.1",
"version": "0.59.2",
"description": "Autocomplete utils for UnoCSS",
"author": "Anthony Fu <anthonyfu117@hotmail.com>",
"license": "MIT",
Expand Down
2 changes: 1 addition & 1 deletion packages/cli/package.json
@@ -1,7 +1,7 @@
{
"name": "@unocss/cli",
"type": "module",
"version": "0.59.1",
"version": "0.59.2",
"description": "CLI for UnoCSS",
"author": {
"name": "Johann Schopplich",
Expand Down
2 changes: 1 addition & 1 deletion packages/config/package.json
@@ -1,7 +1,7 @@
{
"name": "@unocss/config",
"type": "module",
"version": "0.59.1",
"version": "0.59.2",
"description": "Config loader for UnoCSS",
"author": "Anthony Fu <anthonyfu117@hotmail.com>",
"license": "MIT",
Expand Down
2 changes: 1 addition & 1 deletion packages/core/package.json
@@ -1,7 +1,7 @@
{
"name": "@unocss/core",
"type": "module",
"version": "0.59.1",
"version": "0.59.2",
"description": "The instant on-demand Atomic CSS engine.",
"author": "Anthony Fu <anthonyfu117@hotmail.com>",
"license": "MIT",
Expand Down
2 changes: 1 addition & 1 deletion packages/eslint-config/package.json
@@ -1,7 +1,7 @@
{
"name": "@unocss/eslint-config",
"type": "module",
"version": "0.59.1",
"version": "0.59.2",
"description": "ESLint config for UnoCSS",
"author": "Anthony Fu <anthonyfu117@hotmail.com>",
"license": "MIT",
Expand Down
2 changes: 1 addition & 1 deletion packages/eslint-plugin/package.json
@@ -1,7 +1,7 @@
{
"name": "@unocss/eslint-plugin",
"type": "module",
"version": "0.59.1",
"version": "0.59.2",
"description": "ESLint plugin for UnoCSS",
"author": "Anthony Fu <anthonyfu117@hotmail.com>",
"license": "MIT",
Expand Down
2 changes: 1 addition & 1 deletion packages/extractor-arbitrary-variants/package.json
@@ -1,7 +1,7 @@
{
"name": "@unocss/extractor-arbitrary-variants",
"type": "module",
"version": "0.59.1",
"version": "0.59.2",
"description": "Extractor arbitrary variants for utilities",
"author": "Anthony Fu <anthonyfu117@hotmail.com>",
"license": "MIT",
Expand Down
2 changes: 1 addition & 1 deletion packages/extractor-mdc/package.json
@@ -1,7 +1,7 @@
{
"name": "@unocss/extractor-mdc",
"type": "module",
"version": "0.59.1",
"version": "0.59.2",
"description": "UnoCSS extractor for MDC",
"author": "Anthony Fu <anthonyfu117@hotmail.com>",
"license": "MIT",
Expand Down
2 changes: 1 addition & 1 deletion packages/extractor-pug/package.json
@@ -1,7 +1,7 @@
{
"name": "@unocss/extractor-pug",
"type": "module",
"version": "0.59.1",
"version": "0.59.2",
"description": "UnoCSS extractor for Pug",
"author": "Anthony Fu <anthonyfu117@hotmail.com>",
"license": "MIT",
Expand Down
2 changes: 1 addition & 1 deletion packages/extractor-svelte/package.json
@@ -1,7 +1,7 @@
{
"name": "@unocss/extractor-svelte",
"type": "module",
"version": "0.59.1",
"version": "0.59.2",
"description": "UnoCSS extractor for Svelte",
"author": "Anthony Fu <anthonyfu117@hotmail.com>",
"license": "MIT",
Expand Down
2 changes: 1 addition & 1 deletion packages/inspector/package.json
@@ -1,7 +1,7 @@
{
"name": "@unocss/inspector",
"type": "module",
"version": "0.59.1",
"version": "0.59.2",
"description": "The inspector UI for UnoCSS",
"author": "Anthony Fu <anthonyfu117@hotmail.com>",
"license": "MIT",
Expand Down
2 changes: 1 addition & 1 deletion packages/nuxt/package.json
@@ -1,7 +1,7 @@
{
"name": "@unocss/nuxt",
"type": "module",
"version": "0.59.1",
"version": "0.59.2",
"description": "Nuxt module for UnoCSS",
"author": "Anthony Fu <anthonyfu117@hotmail.com>",
"license": "MIT",
Expand Down
2 changes: 1 addition & 1 deletion packages/postcss/package.json
@@ -1,7 +1,7 @@
{
"name": "@unocss/postcss",
"type": "module",
"version": "0.59.1",
"version": "0.59.2",
"description": "PostCSS plugin for UnoCSS",
"author": "sibbng <sibbngheid@gmail.com>",
"license": "MIT",
Expand Down
2 changes: 1 addition & 1 deletion packages/preset-attributify/package.json
@@ -1,7 +1,7 @@
{
"name": "@unocss/preset-attributify",
"type": "module",
"version": "0.59.1",
"version": "0.59.2",
"description": "Attributify preset for UnoCSS",
"author": "Anthony Fu <anthonyfu117@hotmail.com>",
"license": "MIT",
Expand Down
2 changes: 1 addition & 1 deletion packages/preset-icons/package.json
@@ -1,7 +1,7 @@
{
"name": "@unocss/preset-icons",
"type": "module",
"version": "0.59.1",
"version": "0.59.2",
"description": "Pure CSS Icons for UnoCSS",
"author": "Anthony Fu <anthonyfu117@hotmail.com>",
"license": "MIT",
Expand Down
2 changes: 1 addition & 1 deletion packages/preset-legacy-compat/package.json
@@ -1,6 +1,6 @@
{
"name": "@unocss/preset-legacy-compat",
"version": "0.59.1",
"version": "0.59.2",
"description": "Collections of legacy compatibility utilities.",
"author": "Anthony Fu <anthonyfu117@hotmail.com>",
"license": "MIT",
Expand Down
2 changes: 1 addition & 1 deletion packages/preset-mini/package.json
@@ -1,7 +1,7 @@
{
"name": "@unocss/preset-mini",
"type": "module",
"version": "0.59.1",
"version": "0.59.2",
"description": "The minimal preset for UnoCSS",
"author": "Anthony Fu <anthonyfu117@hotmail.com>",
"license": "MIT",
Expand Down
2 changes: 1 addition & 1 deletion packages/preset-mini/src/_rules/question-mark.ts
Expand Up @@ -10,7 +10,7 @@ export const questionMark: Rule[] = [
/^(where|\?)$/,
(_, { constructCSS, generator }) => {
if (generator.userConfig.envMode === 'dev')
return `@keyframes __un_qm{0%{box-shadow:inset 4px 4px #ff1e90, inset -4px -4px #ff1e90}100%{box-shadow:inset 8px 8px #3399ff, inset -8px -8px #3399ff}}\n${constructCSS({ animation: '__un_qm 0.5s ease-in-out alternate infinite' })}`
return `@keyframes __un_qm{0%{box-shadow:inset 4px 4px #ff1e90, inset -4px -4px #ff1e90}100%{box-shadow:inset 8px 8px #3399ff, inset -8px -8px #3399ff}} ${constructCSS({ animation: '__un_qm 0.5s ease-in-out alternate infinite' })}`
},
],
]
2 changes: 1 addition & 1 deletion packages/preset-rem-to-px/package.json
@@ -1,7 +1,7 @@
{
"name": "@unocss/preset-rem-to-px",
"type": "module",
"version": "0.59.1",
"version": "0.59.2",
"description": "Convert all rem to px in utils",
"author": "Anthony Fu <anthonyfu117@hotmail.com>",
"license": "MIT",
Expand Down
2 changes: 1 addition & 1 deletion packages/preset-tagify/package.json
@@ -1,7 +1,7 @@
{
"name": "@unocss/preset-tagify",
"type": "module",
"version": "0.59.1",
"version": "0.59.2",
"description": "Tagify preset for UnoCSS",
"author": "Anthony Fu <anthonyfu117@hotmail.com>",
"license": "MIT",
Expand Down
2 changes: 1 addition & 1 deletion packages/preset-typography/package.json
@@ -1,7 +1,7 @@
{
"name": "@unocss/preset-typography",
"type": "module",
"version": "0.59.1",
"version": "0.59.2",
"description": "Typography preset for UnoCSS",
"author": "Jeff Yang",
"license": "MIT",
Expand Down
2 changes: 1 addition & 1 deletion packages/preset-uno/package.json
@@ -1,7 +1,7 @@
{
"name": "@unocss/preset-uno",
"type": "module",
"version": "0.59.1",
"version": "0.59.2",
"description": "The default preset for UnoCSS",
"author": "Anthony Fu <anthonyfu117@hotmail.com>",
"license": "MIT",
Expand Down
2 changes: 1 addition & 1 deletion packages/preset-web-fonts/package.json
@@ -1,7 +1,7 @@
{
"name": "@unocss/preset-web-fonts",
"type": "module",
"version": "0.59.1",
"version": "0.59.2",
"description": "Web Fonts support for Uno CSS",
"author": "Anthony Fu <anthonyfu117@hotmail.com>",
"license": "MIT",
Expand Down
2 changes: 1 addition & 1 deletion packages/preset-wind/package.json
@@ -1,7 +1,7 @@
{
"name": "@unocss/preset-wind",
"type": "module",
"version": "0.59.1",
"version": "0.59.2",
"description": "Tailwind / Windi CSS compact preset for UnoCSS",
"author": "Anthony Fu <anthonyfu117@hotmail.com>",
"license": "MIT",
Expand Down
2 changes: 1 addition & 1 deletion packages/reset/package.json
@@ -1,7 +1,7 @@
{
"name": "@unocss/reset",
"type": "module",
"version": "0.59.1",
"version": "0.59.2",
"description": "Collection of CSS resetting",
"author": "Anthony Fu <anthonyfu117@hotmail.com>",
"license": "MIT",
Expand Down
2 changes: 1 addition & 1 deletion packages/rule-utils/package.json
@@ -1,7 +1,7 @@
{
"name": "@unocss/rule-utils",
"type": "module",
"version": "0.59.1",
"version": "0.59.2",
"description": "Utilities for UnoCSS",
"author": "Anthony Fu <anthonyfu117@hotmail.com>",
"license": "MIT",
Expand Down
2 changes: 1 addition & 1 deletion packages/runtime/package.json
@@ -1,7 +1,7 @@
{
"name": "@unocss/runtime",
"type": "module",
"version": "0.59.1",
"version": "0.59.2",
"description": "CSS-in-JS Runtime for UnoCSS",
"author": "Anthony Fu <anthonyfu117@hotmail.com>",
"license": "MIT",
Expand Down
2 changes: 1 addition & 1 deletion packages/scope/package.json
@@ -1,7 +1,7 @@
{
"name": "@unocss/scope",
"type": "module",
"version": "0.59.1",
"version": "0.59.2",
"description": "Placeholder for UnoCSS scope import",
"author": "Anthony Fu <anthonyfu117@hotmail.com>",
"license": "MIT",
Expand Down
2 changes: 1 addition & 1 deletion packages/shared-common/package.json
@@ -1,7 +1,7 @@
{
"name": "@unocss/shared-common",
"type": "module",
"version": "0.59.1",
"version": "0.59.2",
"private": true,
"dependencies": {
"@unocss/core": "workspace:*"
Expand Down
2 changes: 1 addition & 1 deletion packages/shared-docs/package.json
@@ -1,7 +1,7 @@
{
"name": "@unocss/shared-docs",
"type": "module",
"version": "0.59.1",
"version": "0.59.2",
"private": true,
"dependencies": {
"@unocss/autocomplete": "workspace:*",
Expand Down
2 changes: 1 addition & 1 deletion packages/shared-integration/package.json
@@ -1,7 +1,7 @@
{
"name": "@unocss/shared-integration",
"type": "module",
"version": "0.59.1",
"version": "0.59.2",
"private": true,
"dependencies": {
"@unocss/core": "workspace:*",
Expand Down
4 changes: 2 additions & 2 deletions packages/shared-integration/src/defaults.ts
Expand Up @@ -15,8 +15,8 @@ export const defaultFilesystemGlobs = [
export const defaultIdeMatchInclude: RegExp[] = [
// String literals
/(['"`])[^\1]*?\1/g,
// HTML tags ignore [>]
/<(?:[^<>\[\]]+|\[[^\]]*\])*>/g,
// HTML tags
/<[^>]+?>/g,
// CSS directives
/(@apply|--uno|--at-apply)[^;]*?;/g,
]
Expand Down
2 changes: 1 addition & 1 deletion packages/svelte-scoped/package.json
@@ -1,7 +1,7 @@
{
"name": "@unocss/svelte-scoped",
"type": "module",
"version": "0.59.1",
"version": "0.59.2",
"description": "Use UnoCSS in a modular fashion with styles being stored only in the Svelte component they are used in: Vite plugin for apps, Svelte preprocessor for component libraries",
"author": "Jacob Bowdoin",
"license": "MIT",
Expand Down
2 changes: 1 addition & 1 deletion packages/transformer-attributify-jsx-babel/package.json
@@ -1,7 +1,7 @@
{
"name": "@unocss/transformer-attributify-jsx-babel",
"type": "module",
"version": "0.59.1",
"version": "0.59.2",
"description": "Support valueless attributify in JSX/TSX.",
"author": "Anthony Fu <anthonyfu117@hotmail.com>",
"license": "MIT",
Expand Down
2 changes: 1 addition & 1 deletion packages/transformer-attributify-jsx/package.json
@@ -1,7 +1,7 @@
{
"name": "@unocss/transformer-attributify-jsx",
"type": "module",
"version": "0.59.1",
"version": "0.59.2",
"description": "Support valueless attributify in JSX/TSX.",
"author": "Anthony Fu <anthonyfu117@hotmail.com>",
"license": "MIT",
Expand Down
2 changes: 1 addition & 1 deletion packages/transformer-compile-class/package.json
@@ -1,7 +1,7 @@
{
"name": "@unocss/transformer-compile-class",
"type": "module",
"version": "0.59.1",
"version": "0.59.2",
"description": "Compile group of classes into one class",
"author": "Anthony Fu <anthonyfu117@hotmail.com>",
"license": "MIT",
Expand Down
2 changes: 1 addition & 1 deletion packages/transformer-directives/package.json
@@ -1,7 +1,7 @@
{
"name": "@unocss/transformer-directives",
"type": "module",
"version": "0.59.1",
"version": "0.59.2",
"description": "UnoCSS transformer for `@apply` directive",
"author": "hannoeru <me@hanlee.co>",
"license": "MIT",
Expand Down

0 comments on commit eb5bf79

Please sign in to comment.