chore: replace

package.json

@@ -20,7 +20,6 @@
     "@hiogawa/theme-script": "^0.0.3",
     "@hiogawa/tiny-refresh": "0.0.1-pre.11",
     "@hiogawa/unocss-ts": "0.0.1-pre.0",
-    "@hiogawa/unocss-typescript-dsl": "2.0.0-pre.8",
     "@hiogawa/utils": "1.6.1-pre.9",
     "@hiogawa/utils-react": "1.3.1-pre.0",
     "@tsconfig/strictest": "^2.0.2",

packages/app/package.json

@@ -7,8 +7,8 @@
     "build:vite": "vite build",
     "build:vercel": "bash misc/vercel/build.sh",
     "preview": "vite preview",
-    "generate-tw": "unocss-typescript-dsl --outDir src/styles/tw",
-    "generate-tw-test": "unocss-typescript-dsl --stdout | diff src/styles/tw/types.ts -",
+    "generate-tw": "unocss-ts generate > src/tw-types.d.ts",
+    "generate-tw-test": "unocss-ts generate | diff src/tw-types.d.ts -",
     "release": "vercel deploy --prebuilt .",
     "release-production": "vercel deploy --prebuilt . --prod"
   },

packages/app/src/app.tsx

@@ -1,3 +1,4 @@
+import { tw } from "@hiogawa/unocss-ts";
 import React from "react";
 import {
   NavLink,
@@ -10,7 +11,6 @@ import {
 import { Drawer } from "./components/drawer";
 import * as stories from "./components/stories";
 import { ThemeSelectButton } from "./components/theme-select-button";
-import { tw } from "./styles/tw";
 import { cls } from "./utils/misc";
 
 export function App() {

packages/app/src/components/stories.tsx

@@ -8,11 +8,11 @@ import {
   useTransitionManager,
 } from "@hiogawa/tiny-transition/dist/react";
 import { ANTD_VARS } from "@hiogawa/unocss-preset-antd";
+import { tw } from "@hiogawa/unocss-ts";
 import { none, objectKeys, objectPickBy, range } from "@hiogawa/utils";
 import { Debug, toSetSetState, useDelay } from "@hiogawa/utils-react";
 import React from "react";
 import ReactSelect from "react-select";
-import { tw } from "../styles/tw";
 import { cls } from "../utils/misc";
 import { useUrlParam } from "../utils/url-utils";
 import { getCollapseProps } from "./collapse";

packages/app/src/components/theme-select-button.tsx

@@ -1,6 +1,6 @@
 import { getTheme, setTheme } from "@hiogawa/theme-script";
+import { tw } from "@hiogawa/unocss-ts";
 import React from "react";
-import { tw } from "../styles/tw";
 import { cls } from "../utils/misc";
 import { PopoverSimple } from "./popover";
 

packages/app/src/components/top-progress-bar.tsx

@@ -1,8 +1,8 @@
 import { FloatingPortal } from "@floating-ui/react";
 import { Transition } from "@hiogawa/tiny-transition/dist/react";
+import { tw } from "@hiogawa/unocss-ts";
 import { useDelay, usePrevious, useRafTime } from "@hiogawa/utils-react";
 import React from "react";
-import { tw } from "../styles/tw";
 import { cls } from "../utils/misc";
 
 // based on https://github.com/hi-ogawa/ytsub-v3/blob/859264f683e8d1c6331ca1c630101c037a78dd94/app/components/top-progress-bar.tsx#L1-L2