fix: inline import css compressed & upgrade deps (#9)

* feat: dynamic import deps close #8 * chore: update * chore: update * chore: update * chore: update * chore: update * chore: update * chore: update * chore: use tsup * chore: update * chore: revert change * chore: update * chore: update * chore: update * chore: update * chore: update * test: update * chore: update * chore: update
unpreset · Mar 19, 2024 · 343d2b4 · 343d2b4
1 parent 74896ed
commit 343d2b4
Show file tree

Hide file tree

Showing 29 changed files with 1,063 additions and 1,041 deletions.
diff --git a/.eslintcache b/.eslintcache
@@ -0,0 +1 @@
+[{"/Users/chris/projects/unocss-preset-useful/test/preflights.test.ts":"1"},{"size":806,"mtime":1710865966010,"results":"2","hashOfConfig":"3"},{"filePath":"4","messages":"5","suppressedMessages":"6","errorCount":0,"fatalErrorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},"vaw7uk","/Users/chris/projects/unocss-preset-useful/test/preflights.test.ts",[],[]]
diff --git a/.gitignore b/.gitignore
@@ -3,3 +3,4 @@ dist
 *.log
 .vscode
 data
+.eslintcache
diff --git a/package.json b/package.json
@@ -19,24 +19,25 @@
     "magicAnimate": "esno scripts/magicAnimate.ts"
   },
   "devDependencies": {
-    "@antfu/eslint-config": "2.6.3",
-    "@babel/types": "^7.23.9",
+    "@antfu/eslint-config": "2.8.0",
+    "@babel/types": "^7.24.0",
     "@types/fs-extra": "^11.0.4",
-    "@types/node": "^20.11.10",
+    "@types/node": "^20.11.25",
     "@types/postcss-js": "^4.0.4",
-    "@unocss/eslint-plugin": "^0.58.4",
-    "bumpp": "^9.3.0",
-    "eslint": "^8.56.0",
-    "esno": "^4.0.0",
+    "@unocss/eslint-plugin": "^0.58.5",
+    "bumpp": "^9.4.0",
+    "eslint": "^8.57.0",
+    "esno": "^4.7.0",
     "fs-extra": "^11.2.0",
-    "lint-staged": "^15.2.0",
-    "simple-git-hooks": "^2.9.0",
-    "typescript": "5.3.3",
+    "lint-staged": "^15.2.2",
+    "magic.css": "^1.4.8",
+    "simple-git-hooks": "^2.10.0",
+    "typescript": "5.4.2",
     "unbuild": "^2.0.0",
-    "unocss": "^0.58.4",
+    "unocss": "^0.58.5",
     "unocss-preset-useful": "workspace:*",
-    "vite": "^5.0.12",
-    "vitest": "^1.2.2"
+    "vite": "^5.1.5",
+    "vitest": "^1.3.1"
   },
   "simple-git-hooks": {
     "pre-commit": "npx lint-staged"

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -46,18 +46,16 @@
     "stub": "unbuild --stub"
   },
   "dependencies": {
-    "@unocss/core": "^0.58.0",
-    "@unocss/preset-attributify": "^0.58.0",
-    "@unocss/preset-icons": "^0.58.0",
-    "@unocss/preset-mini": "^0.58.0",
-    "@unocss/preset-rem-to-px": "^0.58.0",
-    "@unocss/preset-tagify": "^0.58.0",
-    "@unocss/preset-typography": "^0.58.0",
-    "@unocss/preset-uno": "^0.58.0",
-    "@unocss/preset-web-fonts": "^0.58.0",
-    "magic.css": "^1.4.8",
-    "postcss": "^8.4.32",
+    "@unocss/preset-attributify": "^0.58.5",
+    "@unocss/preset-icons": "^0.58.5",
+    "@unocss/preset-mini": "^0.58.5",
+    "@unocss/preset-rem-to-px": "^0.58.5",
+    "@unocss/preset-tagify": "^0.58.5",
+    "@unocss/preset-typography": "^0.58.5",
+    "@unocss/preset-uno": "^0.58.5",
+    "@unocss/preset-web-fonts": "^0.58.5",
+    "postcss": "^8.4.35",
     "postcss-js": "^4.0.1",
-    "unocss-preset-scrollbar": "latest"
+    "unocss-preset-scrollbar": "^0.3.1"
   }
 }
diff --git a/packages/core/src/core/autocomplete.ts b/packages/core/src/core/autocomplete.ts
@@ -1,4 +1,4 @@
-import type { UserConfig } from '@unocss/core'
+import type { UserConfig } from 'unocss'
 import { magicAnimate } from './theme/magic-animate'
 
 const keyframes = magicAnimate()?.keyframes ?? {}

diff --git a/packages/core/src/core/extractors.ts b/packages/core/src/core/extractors.ts
@@ -1,4 +1,4 @@
-import type { Extractor } from '@unocss/core'
+import type { Extractor } from 'unocss'
 
 // IN-README-START
 // https://github.com/unocss/unocss/pull/2485

diff --git a/packages/core/src/core/postprocess.ts b/packages/core/src/core/postprocess.ts
@@ -1,4 +1,4 @@
-import type { Postprocessor } from '@unocss/core'
+import type { Postprocessor } from 'unocss'
 
 const rgbaRE = /rgba\(((?:\d+,?){3}),([^)]*)\)/
 

diff --git a/packages/core/src/core/preflights/reset.ts b/packages/core/src/core/preflights/reset.ts
@@ -392,7 +392,11 @@ Make elements with the HTML hidden attribute stay hidden by default.
 }
 `.trim()
 
+function compressCSS(css: string) {
+  return css.replace(/[\s\r\n]+/g, ' ').replace(/\/\*[\s\S]*?\*\//g, '')
+}
+
 export const resetPreflight: Preflight = {
-  getCSS: () => resetCSS,
+  getCSS: () => compressCSS(resetCSS),
   layer: layerMeta.layer,
 }
diff --git a/packages/core/src/core/rules.ts b/packages/core/src/core/rules.ts
@@ -1,5 +1,5 @@
 import { parseColor } from '@unocss/preset-mini/utils'
-import type { Rule, RuleMeta } from '@unocss/core'
+import type { Rule, RuleMeta } from 'unocss'
 import { layerMeta } from '../meta'
 
 // IN-README-START

diff --git a/packages/core/src/core/shortcuts.ts b/packages/core/src/core/shortcuts.ts
@@ -1,4 +1,4 @@
-import type { RuleMeta, StaticShortcut } from '@unocss/core'
+import type { RuleMeta, StaticShortcut } from 'unocss'
 import { layerMeta } from '../meta'
 import type { CustomStaticShortcuts } from '../types'
 

diff --git a/packages/core/src/core/variants/active.ts b/packages/core/src/core/variants/active.ts
@@ -1,4 +1,4 @@
-import type { VariantObject } from '@unocss/core'
+import type { VariantObject } from 'unocss'
 
 export const v_active: VariantObject = {
   name: '@active',

diff --git a/packages/core/src/core/variants/index.ts b/packages/core/src/core/variants/index.ts
@@ -1,4 +1,4 @@
-import type { Variant } from '@unocss/core'
+import type { Variant } from 'unocss'
 import type { Theme } from '@unocss/preset-mini'
 import type { ResolvedOptions } from '../../types'
 import { v_active } from './active'

diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts
@@ -1,5 +1,5 @@
 import type { Postprocessor, PresetFactory } from 'unocss'
-import { definePreset } from '@unocss/core'
+import { definePreset } from 'unocss'
 import { PRESET_NAME } from './meta'
 import { autocomplete, extractors, preflights, rules, shortcuts, variants } from './core'
 import { importantProcess, postprocessWithUnColor } from './core/postprocess'

diff --git a/packages/core/src/meta.ts b/packages/core/src/meta.ts
@@ -1,4 +1,4 @@
-import type { RuleMeta } from '@unocss/core'
+import type { RuleMeta } from 'unocss'
 
 export const PRESET_NAME = 'useful'
 

diff --git a/packages/core/src/resolve.ts b/packages/core/src/resolve.ts
@@ -1,11 +1,6 @@
-import { presetAttributify } from '@unocss/preset-attributify'
-import { presetIcons } from '@unocss/preset-icons'
-import type { Theme } from '@unocss/preset-uno'
-import { presetUno } from '@unocss/preset-uno'
-import presetTagify from '@unocss/preset-tagify'
-import { presetTypography } from '@unocss/preset-typography'
-import presetWebFonts from '@unocss/preset-web-fonts'
-import remToPxPreset from '@unocss/preset-rem-to-px'
+import type { Theme } from '@unocss/preset-mini'
+import { presetAttributify, presetIcons, presetTagify, presetTypography, presetUno, presetWebFonts } from 'unocss'
+import presetRemToPx from '@unocss/preset-rem-to-px'
 import { presetScrollbar } from 'unocss-preset-scrollbar'
 import { nomarlizeTheme } from './core'
 import type { CustomStaticShortcuts, ResolvedOptions, UsefulOptions, UsefulTheme } from './types'
@@ -41,13 +36,16 @@ export function resolveOptions(options: UsefulOptions) {
     webFonts: presetWebFonts,
     typography: presetTypography,
     tagify: presetTagify,
-    remToPx: remToPxPreset,
+    remToPx: presetRemToPx,
     scrollbar: presetScrollbar,
   }
+
   for (const [key, preset] of Object.entries(presetMap)) {
     const option = optionsWithDefault[key as keyof typeof presetMap]
-    if (option)
-      presets.push(preset(typeof option === 'boolean' ? {} as any : option))
+    if (option) {
+      const p = preset as any
+      presets.push(p(typeof option === 'boolean' ? {} as any : option))
+    }
   }
 
   const { theme: t_theme, shortcuts } = resolveExtend(optionsWithDefault.theme.extend ?? {})

diff --git a/packages/core/src/types.ts b/packages/core/src/types.ts
@@ -6,9 +6,8 @@ import type { TypographyOptions } from '@unocss/preset-typography'
 import type { TagifyOptions } from '@unocss/preset-tagify'
 import type { RemToPxOptions } from '@unocss/preset-rem-to-px'
 import type { PresetScrollbarDefaultOption } from 'unocss-preset-scrollbar'
-import type { Preset, StaticShortcut } from '@unocss/core'
 import type { Theme } from '@unocss/preset-mini'
-import type { CSSObject } from 'unocss'
+import type { CSSObject, Preset, StaticShortcut } from 'unocss'
 
 type CustomStaticShortcut = [string | string[], StaticShortcut[1]] | [string | string[], StaticShortcut[1], StaticShortcut[2]]
 export type CustomStaticShortcuts = CustomStaticShortcut[]

diff --git a/playground/index.html b/playground/index.html
@@ -2,7 +2,6 @@
 <html lang="en">
   <head>
     <meta charset="UTF-8" />
-    <link rel="icon" type="image/svg+xml" href="/vite.svg" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>Vite + Vue + TS</title>
   </head>

diff --git a/playground/package.json b/playground/package.json
@@ -5,7 +5,7 @@
   "private": true,
   "scripts": {
     "dev": "vite",
-    "build": "vue-tsc && vite build",
+    "build": "vite build",
     "preview": "vite preview"
   },
   "dependencies": {

diff --git a/playground/src/vite-env.d.ts b/playground/src/vite-env.d.ts
diff --git a/playground/vite.config.ts b/playground/vite.config.ts
@@ -1,11 +1,11 @@
 import { defineConfig } from 'vite'
-import vue from '@vitejs/plugin-vue'
+import Vue from '@vitejs/plugin-vue'
 import UnoCSS from 'unocss/vite'
 
 // https://vitejs.dev/config/
 export default defineConfig({
   plugins: [
-    vue(),
-    UnoCSS('../uno.config.ts'),
+    Vue(),
+    UnoCSS('../unocss.config.ts') as any,
   ],
 })