@unocss/preset-uno 0.23.0 → 0.24.0

package/README.md

@@ -1,6 +1,6 @@
 # @unocss/preset-uno
 
-The default preset for [UnoCSS](https://github.com/antfu/unocss).
+The default preset for [UnoCSS](https://github.com/unocss/unocss).
 
 > Please note that this preset is more like a playground at the current stage to experiment with the possibility of UnoCSS and also as a reference for making a custom preset. It does NOT follow semver and subjects to changes without further notice. We don't recommend using it on serious works. Use custom rules instead to ensure a stable outcome.
 
@@ -33,7 +33,7 @@ For example, both `ml-3` (Tailwind), `ms-2` (Bootstrap), `ma4` (Tachyons), `mt-1
 .mt-10px { margin-top: 10px; }
 ```
 
-For more details about the default preset, you can check out our [playground](https://unocss.antfu.me/) and try out. Meanwhile, you can also check out [the implementation](./src/rules).
+For more details about the default preset, you can check out our [playground](https://unocss.antfu.me/) and try out. Meanwhile, you can also check out [the implementations](https://github.com/unocss/unocss/tree/main/packages).
 
 ## License
 

package/dist/index.cjs

@@ -3,10 +3,70 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 const presetWind = require('@unocss/preset-wind');
+const utils = require('@unocss/preset-mini/utils');
 
-const presetUno = presetWind.presetWind;
+const mixComponent = (v1, v2, w) => `calc(${v2} + (${v1} - ${v2}) * ${w} / 100)`;
+const mixColor = (color1, color2, weight) => {
+  const colors = [color1, color2];
+  const cssColors = [];
+  for (let c = 0; c < 2; ++c) {
+    const color = typeof colors[c] === "string" ? utils.parseCssColor(colors[c]) : colors[c];
+    if (!color || !["rgb", "rgba"].includes(color.type))
+      return;
+    cssColors.push(color);
+  }
+  const newComponents = [];
+  for (let x = 0; x < 3; ++x)
+    newComponents.push(mixComponent(cssColors[0].components[x], cssColors[1].components[x], weight));
+  return {
+    type: "rgb",
+    components: newComponents,
+    alpha: mixComponent(cssColors[0].alpha ?? 1, cssColors[1].alpha ?? 1, weight)
+  };
+};
+const tint = (color, weight) => mixColor("#fff", color, weight);
+const shade = (color, weight) => mixColor("#000", color, weight);
+const shift = (color, weight) => parseInt(`${weight}`, 10) > 0 ? shade(color, weight) : tint(color, `-${weight}`);
+const fns = { tint, shade, shift };
+const variantColorMix = (matcher) => {
+  const m = matcher.match(/^mix-(tint|shade|shift)-(-?\d{1,3})[-:]/);
+  if (m) {
+    return {
+      matcher: matcher.slice(m[0].length),
+      body: (body) => {
+        body.forEach((v) => {
+          if (v[1]) {
+            const color = utils.parseCssColor(`${v[1]}`);
+            if (color) {
+              const mixed = fns[m[1]](color, m[2]);
+              if (mixed) {
+                const { alpha, components } = mixed;
+                v[1] = `rgb(${components.join(",")},${alpha})`;
+              }
+            }
+          }
+        });
+        return body;
+      }
+    };
+  }
+};
+
+const presetUno = (options = {}) => {
+  options.dark = options.dark ?? "class";
+  options.attributifyPseudo = options.attributifyPseudo ?? false;
+  return {
+    name: "@unocss/preset-uno",
+    theme: presetWind.theme,
+    rules: presetWind.rules,
+    shortcuts: presetWind.shortcuts,
+    variants: [
+      ...presetWind.variants(options),
+      variantColorMix
+    ],
+    options
+  };
+};
 
-exports.colors = presetWind.colors;
-exports.theme = presetWind.theme;
 exports["default"] = presetUno;
 exports.presetUno = presetUno;

package/dist/index.d.ts

@@ -1,11 +1,9 @@
-import * as _unocss_core from '@unocss/core';
-import * as _unocss_preset_wind from '@unocss/preset-wind';
-export { colors, theme } from '@unocss/preset-wind';
+import { Preset } from '@unocss/core';
 import { PresetMiniOptions, Theme } from '@unocss/preset-mini';
 export { Theme } from '@unocss/preset-mini';
 
 interface PresetUnoOptions extends PresetMiniOptions {
 }
-declare const presetUno: (options?: _unocss_preset_wind.UnoOptions | undefined) => _unocss_core.Preset<Theme>;
+declare const presetUno: (options?: PresetUnoOptions) => Preset<Theme>;
 
 export { PresetUnoOptions, presetUno as default, presetUno };

package/dist/index.mjs

@@ -1,6 +1,67 @@
-import { presetWind } from '@unocss/preset-wind';
-export { colors, theme } from '@unocss/preset-wind';
+import { theme, rules, shortcuts, variants } from '@unocss/preset-wind';
+import { parseCssColor } from '@unocss/preset-mini/utils';
 
-const presetUno = presetWind;
+const mixComponent = (v1, v2, w) => `calc(${v2} + (${v1} - ${v2}) * ${w} / 100)`;
+const mixColor = (color1, color2, weight) => {
+  const colors = [color1, color2];
+  const cssColors = [];
+  for (let c = 0; c < 2; ++c) {
+    const color = typeof colors[c] === "string" ? parseCssColor(colors[c]) : colors[c];
+    if (!color || !["rgb", "rgba"].includes(color.type))
+      return;
+    cssColors.push(color);
+  }
+  const newComponents = [];
+  for (let x = 0; x < 3; ++x)
+    newComponents.push(mixComponent(cssColors[0].components[x], cssColors[1].components[x], weight));
+  return {
+    type: "rgb",
+    components: newComponents,
+    alpha: mixComponent(cssColors[0].alpha ?? 1, cssColors[1].alpha ?? 1, weight)
+  };
+};
+const tint = (color, weight) => mixColor("#fff", color, weight);
+const shade = (color, weight) => mixColor("#000", color, weight);
+const shift = (color, weight) => parseInt(`${weight}`, 10) > 0 ? shade(color, weight) : tint(color, `-${weight}`);
+const fns = { tint, shade, shift };
+const variantColorMix = (matcher) => {
+  const m = matcher.match(/^mix-(tint|shade|shift)-(-?\d{1,3})[-:]/);
+  if (m) {
+    return {
+      matcher: matcher.slice(m[0].length),
+      body: (body) => {
+        body.forEach((v) => {
+          if (v[1]) {
+            const color = parseCssColor(`${v[1]}`);
+            if (color) {
+              const mixed = fns[m[1]](color, m[2]);
+              if (mixed) {
+                const { alpha, components } = mixed;
+                v[1] = `rgb(${components.join(",")},${alpha})`;
+              }
+            }
+          }
+        });
+        return body;
+      }
+    };
+  }
+};
+
+const presetUno = (options = {}) => {
+  options.dark = options.dark ?? "class";
+  options.attributifyPseudo = options.attributifyPseudo ?? false;
+  return {
+    name: "@unocss/preset-uno",
+    theme,
+    rules,
+    shortcuts,
+    variants: [
+      ...variants(options),
+      variantColorMix
+    ],
+    options
+  };
+};
 
 export { presetUno as default, presetUno };

package/package.json

@@ -1,18 +1,18 @@
 {
   "name": "@unocss/preset-uno",
-  "version": "0.23.0",
+  "version": "0.24.0",
   "description": "The default preset for UnoCSS",
   "keywords": [
     "unocss",
     "unocss-preset"
   ],
-  "homepage": "https://github.com/antfu/unocss/tree/main/packages/preset-uno#readme",
+  "homepage": "https://github.com/unocss/unocss/tree/main/packages/preset-uno#readme",
   "bugs": {
-    "url": "https://github.com/antfu/unocss/issues"
+    "url": "https://github.com/unocss/unocss/issues"
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/antfu/unocss.git",
+    "url": "git+https://github.com/unocss/unocss.git",
     "directory": "packages/preset-uno"
   },
   "funding": "https://github.com/sponsors/antfu",
@@ -50,9 +50,9 @@
     "*.css"
   ],
   "dependencies": {
-    "@unocss/core": "0.23.0",
-    "@unocss/preset-wind": "0.23.0",
-    "@unocss/preset-mini": "0.23.0"
+    "@unocss/core": "0.24.0",
+    "@unocss/preset-wind": "0.24.0",
+    "@unocss/preset-mini": "0.24.0"
   },
   "scripts": {
     "build": "unbuild",