From dd65692bf6d38b99d9723259ddebdbcaeddf0ce5 Mon Sep 17 00:00:00 2001 From: kLiHz <66966137+kLiHz@users.noreply.github.com> Date: Wed, 1 May 2024 17:33:06 +0800 Subject: [PATCH 1/3] Bump to Twind v1 https://fresh.deno.dev/docs/examples/using-twind-v1 --- fresh.config.ts | 2 +- twind.config.ts | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/fresh.config.ts b/fresh.config.ts index fd48d1b..e1ebe91 100644 --- a/fresh.config.ts +++ b/fresh.config.ts @@ -1,5 +1,5 @@ import { defineConfig } from "$fresh/server.ts"; -import twindPlugin from "$fresh/plugins/twind.ts"; +import twindPlugin from "$fresh/plugins/twindv1.ts"; import twindConfig from "./twind.config.ts"; export default defineConfig({ plugins: [twindPlugin(twindConfig)], diff --git a/twind.config.ts b/twind.config.ts index 2a7ac27..b58b8f8 100644 --- a/twind.config.ts +++ b/twind.config.ts @@ -1,5 +1,10 @@ -import { Options } from "$fresh/plugins/twind.ts"; +import { defineConfig, Preset } from "https://esm.sh/@twind/core@1.1.3"; +import presetTailwind from "https://esm.sh/@twind/preset-tailwind@1.1.4"; +import presetAutoprefix from "https://esm.sh/@twind/preset-autoprefix@1.0.7"; export default { + ...defineConfig({ + presets: [presetTailwind() as Preset, presetAutoprefix()], + }), selfURL: import.meta.url, -} as Options; +}; From 1da2c46c3e4141b25324b62e18a0c1bf0a1b7713 Mon Sep 17 00:00:00 2001 From: kLiHz <66966137+kLiHz@users.noreply.github.com> Date: Wed, 1 May 2024 17:46:24 +0800 Subject: [PATCH 2/3] Update imports to use import map --- twind.config.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/twind.config.ts b/twind.config.ts index b58b8f8..8c5b4d2 100644 --- a/twind.config.ts +++ b/twind.config.ts @@ -1,6 +1,6 @@ -import { defineConfig, Preset } from "https://esm.sh/@twind/core@1.1.3"; -import presetTailwind from "https://esm.sh/@twind/preset-tailwind@1.1.4"; -import presetAutoprefix from "https://esm.sh/@twind/preset-autoprefix@1.0.7"; +import { defineConfig, Preset } from "@twind/core"; +import presetTailwind from "@twind/preset-tailwind"; +import presetAutoprefix from "@twind/preset-autoprefix"; export default { ...defineConfig({ From 50180f80e97b2444df35c6740d3f3565d16acf04 Mon Sep 17 00:00:00 2001 From: kLiHz <66966137+kLiHz@users.noreply.github.com> Date: Wed, 1 May 2024 18:09:46 +0800 Subject: [PATCH 3/3] Remove old twind imports in deno.json --- deno.json | 2 -- 1 file changed, 2 deletions(-) diff --git a/deno.json b/deno.json index b951d2c..f6a416e 100644 --- a/deno.json +++ b/deno.json @@ -16,8 +16,6 @@ "preact-render-to-string": "https://esm.sh/*preact-render-to-string@6.2.1", "@preact/signals": "https://esm.sh/*@preact/signals@1.2.2", "@preact/signals-core": "https://esm.sh/*@preact/signals-core@1.5.1", - "twind": "https://esm.sh/twind@0.16.19", - "twind/": "https://esm.sh/twind@0.16.19/", "$gfm": "https://deno.land/x/gfm@0.1.28/mod.ts", "$prism": "https://esm.sh/prismjs@1.29.0", "$prism/": "https://esm.sh/prismjs@1.29.0/",