Merge branch 'main' into main

unocss · Oct 21, 2023 · 521b7ad · 521b7ad
2 parents 8361aaf + d0e101d
commit 521b7ad
Show file tree

Hide file tree

Showing 12 changed files with 188 additions and 296 deletions.
diff --git a/package.json b/package.json
@@ -105,7 +105,7 @@
     "prettier": "^2.8.8",
     "prettier-plugin-svelte": "^2.10.1",
     "react": "^18.2.0",
-    "rollup": "^4.0.2",
+    "rollup": "^3.29.3",
     "semver": "^7.5.4",
     "simple-git-hooks": "^2.9.0",
     "splitpanes": "^3.1.5",

diff --git a/packages/cli/src/index.ts b/packages/cli/src/index.ts
@@ -10,6 +10,7 @@ import type { SourceCodeTransformerEnforce, UserConfig } from '@unocss/core'
 import { createContext } from '../../shared-integration/src/context'
 import { applyTransformers } from '../../shared-integration/src/transformers'
 import { version } from '../package.json'
+import { SKIP_COMMENT_RE } from '../../shared-integration/src/constants'
 import { defaultConfig } from './config'
 import { PrettyError, handleError } from './errors'
 import { getWatcher } from './watcher'
@@ -131,7 +132,7 @@ export async function build(_options: CliOptions) {
     }
 
     const { css, matched } = await ctx.uno.generate(
-      [...postTransform.map(({ code, transformedCode }) => transformedCode ?? code)].join('\n'),
+      [...postTransform.map(({ code, transformedCode }) => (transformedCode ?? code).replace(SKIP_COMMENT_RE, ''))].join('\n'),
       {
         preflights: options.preflights,
         minify: options.minify,

diff --git a/packages/inspector/client/auto-imports.d.ts b/packages/inspector/client/auto-imports.d.ts
@@ -37,6 +37,7 @@ declare global {
   const h: typeof import('vue')['h']
   const ignorableWatch: typeof import('@vueuse/core')['ignorableWatch']
   const inject: typeof import('vue')['inject']
+  const injectLocal: typeof import('@vueuse/core')['injectLocal']
   const isDefined: typeof import('@vueuse/core')['isDefined']
   const isProxy: typeof import('vue')['isProxy']
   const isReactive: typeof import('vue')['isReactive']
@@ -66,6 +67,7 @@ declare global {
   const onUpdated: typeof import('vue')['onUpdated']
   const pausableWatch: typeof import('@vueuse/core')['pausableWatch']
   const provide: typeof import('vue')['provide']
+  const provideLocal: typeof import('@vueuse/core')['provideLocal']
   const reactify: typeof import('@vueuse/core')['reactify']
   const reactifyObject: typeof import('@vueuse/core')['reactifyObject']
   const reactive: typeof import('vue')['reactive']

diff --git a/packages/preset-mini/src/_rules/transform.ts b/packages/preset-mini/src/_rules/transform.ts
@@ -84,9 +84,9 @@ export const transforms: Rule[] = [
   [/^(?:transform-)?rotate-()(.+)$/, handleRotate],
   [/^(?:transform-)?rotate-([xyz])-(.+)$/, handleRotate],
   [/^(?:transform-)?skew-()(.+)$/, handleSkew],
-  [/^(?:transform-)?skew-([xy])-(.+)$/, handleSkew, { autocomplete: ['transform-skew-(x|y)-<percent>'] }],
+  [/^(?:transform-)?skew-([xy])-(.+)$/, handleSkew, { autocomplete: ['transform-skew-(x|y)-<percent>', 'skew-(x|y)-<percent>'] }],
   [/^(?:transform-)?scale-()(.+)$/, handleScale],
-  [/^(?:transform-)?scale-([xyz])-(.+)$/, handleScale, { autocomplete: [`transform-(${transformValues.join('|')})-<percent>`, `transform-(${transformValues.join('|')})-(x|y|z)-<percent>`] }],
+  [/^(?:transform-)?scale-([xyz])-(.+)$/, handleScale, { autocomplete: [`transform-(${transformValues.join('|')})-<percent>`, `transform-(${transformValues.join('|')})-(x|y|z)-<percent>`, `(${transformValues.join('|')})-<percent>`, `(${transformValues.join('|')})-(x|y|z)-<percent>`] }],
 
   // style
   [/^(?:transform-)?preserve-3d$/, () => ({ 'transform-style': 'preserve-3d' })],

diff --git a/packages/preset-mini/src/_variants/pseudo.test.ts b/packages/preset-mini/src/_variants/pseudo.test.ts
@@ -1,4 +1,4 @@
-import { expect } from 'vitest'
+import { expect, it } from 'vitest'
 import { createGenerator } from '@unocss/core'
 import { variantPseudoClassesAndElements } from './pseudo'
 

diff --git a/packages/preset-wind/src/theme.ts b/packages/preset-wind/src/theme.ts
@@ -185,8 +185,8 @@ export const theme: Theme = {
     low_contrast: '(prefers-contrast: low)',
     opacity_ok: '(prefers-reduced-transparency: no-preference)',
     opacity_not_ok: '(prefers-reduced-transparency: reduce)',
-    useData_ok: '(prefers-reduced-data: no-preference)',
-    useData_not_ok: '(prefers-reduced-data: reduce)',
+    use_data_ok: '(prefers-reduced-data: no-preference)',
+    use_data_not_ok: '(prefers-reduced-data: reduce)',
     touch: '(hover: none) and (pointer: coarse)',
     stylus: '(hover: none) and (pointer: fine)',
     pointer: '(hover) and (pointer: coarse)',

diff --git a/packages/svelte-scoped/src/_preprocess/transformClasses/parse.bench.ts b/packages/svelte-scoped/src/_preprocess/transformClasses/parse.bench.ts
@@ -1,7 +1,7 @@
 /* eslint-disable unused-imports/no-unused-vars */
 import MagicString from 'magic-string'
 import { parse } from 'svelte/compiler'
-import { describe } from 'vitest'
+import { describe, it } from 'vitest'
 import { unoMock } from './unoMock'
 import { findClasses } from './findClasses'
 import { processClasses } from './processClasses'