⬆️ Upgrade dependencies

sikessem · Oct 7, 2023 · 3d05ca5 · 3d05ca5
1 parent 2f4c19c
commit 3d05ca5
Show file tree

Hide file tree

Showing 28 changed files with 1,570 additions and 1,162 deletions.
diff --git a/rome.json → biome.json b/rome.json → biome.json
diff --git a/composer.json b/composer.json
@@ -28,11 +28,11 @@
     },
     "require": {
         "php": "^8.1||^8.2",
-        "illuminate/view": "^10.19"
+        "illuminate/view": "^10.26"
     },
     "require-dev": {
-        "sikessem/framework": "^0.1.0",
-        "sikessem/laravel-devtools": "^0.4.0"
+        "sikessem/framework": "^0.2.0",
+        "sikessem/laravel-devtools": "^0.6.0"
     },
     "autoload": {
         "psr-4": {

diff --git a/composer.lock b/composer.lock
diff --git a/package.json b/package.json
@@ -48,15 +48,15 @@
     },
     "scripts": {
         "build": "tsm scripts/build.ts",
-        "check": "rome ci .",
-        "check.format": "rome format .",
-        "check.lint": "rome check .",
+        "check": "biome ci .",
+        "check.format": "biome format .",
+        "check.lint": "biome check .",
         "debug": "pnpm check && pnpm test",
         "dev": "concurrently \"vite --host\" \"vitest\"",
         "fix": "pnpm lint && pnpm format",
-        "format": "rome format --write .",
+        "format": "biome format --write .",
         "inspect": "node --inspect-brk ./node_modules/vite/bin/vite.js --force",
-        "lint": "rome check --apply-unsafe .",
+        "lint": "biome check --apply-unsafe .",
         "preview": "vite preview",
         "test": "vitest run",
         "test.ui": "vitest --ui",
@@ -65,25 +65,25 @@
         "watch": "tsm scripts/build.ts --watch"
     },
     "devDependencies": {
+        "@biomejs/biome": "^1.2.2",
         "@tailwindcss/nesting": "0.0.0-insiders.565cd3e",
-        "@types/node": "^20.5.3",
-        "@vitest/coverage-istanbul": "^0.34.2",
-        "autoprefixer": "^10.4.15",
+        "@types/node": "^20.8.3",
+        "@vitest/coverage-istanbul": "^0.34.6",
+        "autoprefixer": "^10.4.16",
         "brotli-size": "^4.0.0",
         "concurrently": "^8.2.1",
-        "esbuild": "^0.19.2",
-        "postcss": "^8.4.28",
+        "esbuild": "^0.19.4",
+        "postcss": "^8.4.31",
         "postcss-import": "^15.1.0",
         "postcss-load-config": "^4.0.1",
         "postcss-nested": "^6.0.1",
-        "rome": "^12.1.3",
         "tailwindcss": "^3.3.3",
         "ts-node": "^10.9.1",
         "tslib": "^2.6.2",
         "tsm": "^2.3.0",
-        "typescript": "^5.1.6",
-        "vite": "^4.4.9",
-        "vite-tsconfig-paths": "^4.2.0",
-        "vitest": "^0.34.2"
+        "typescript": "^5.2.2",
+        "vite": "^4.4.11",
+        "vite-tsconfig-paths": "^4.2.1",
+        "vitest": "^0.34.6"
     }
 }
diff --git a/plugin/colors.ts b/plugin/colors.ts
@@ -1,3 +1,4 @@
+import colors from "tailwindcss/colors";
 import {
     append_style,
     darken_class,
@@ -15,7 +16,6 @@ import {
     StyleCallbacks,
     UtilityList,
 } from "./types";
-import colors from "tailwindcss/colors";
 
 export class Colors extends Plugin<void> {
     readonly components: ComponentList = {

diff --git a/plugin/contracts/plugin.d.ts b/plugin/contracts/plugin.d.ts
@@ -1,5 +1,5 @@
-import { ComponentList, UtilityList } from "../types";
 import { PluginAPI } from "tailwindcss/types/config";
+import { ComponentList, UtilityList } from "../types";
 
 export interface PluginContract<T> {
     readonly api: PluginAPI;

diff --git a/plugin/edges.ts b/plugin/edges.ts
@@ -1,6 +1,6 @@
+import defaultTheme from "tailwindcss/defaultTheme";
 import { Plugin } from "./plugin";
 import { ComponentList, RequiredEdgeOptions, UtilityList } from "./types";
-import defaultTheme from "tailwindcss/defaultTheme";
 
 export class Edges extends Plugin<RequiredEdgeOptions> {
     readonly components: ComponentList = {};

diff --git a/plugin/helpers.ts b/plugin/helpers.ts
@@ -1,4 +1,4 @@
-import { Util } from "./util";
+import * as Util from "./util";
 
 export const {
     darken,

diff --git a/plugin/index.ts b/plugin/index.ts
@@ -1,4 +1,4 @@
-import Plugger from "./plugger";
+import * as Plugger from "./plugger";
 
 export const UI = Plugger.plugUI();
 export const UIColors = Plugger.plugColors();

diff --git a/plugin/plugger.ts b/plugin/plugger.ts
@@ -9,90 +9,71 @@ import type {
     UIOptions,
 } from "./types";
 
+import plugin from "tailwindcss/plugin";
+import { PluginAPI } from "tailwindcss/types/config";
 import { Colors } from "./colors";
 import { Edges } from "./edges";
 import { Links } from "./links";
-import plugin from "tailwindcss/plugin";
-import { PluginAPI } from "tailwindcss/types/config";
 
-export class Plugger {
-    static DEFAULT_OPTIONS: RequiredUIOptions = {
-        linkClass: "link",
-        entryClass: "entry",
-        buttonClass: "button",
-    };
+export const DEFAULT_OPTIONS: RequiredUIOptions = {
+    linkClass: "link",
+    entryClass: "entry",
+    buttonClass: "button",
+};
 
-    static plugUI(): PluginWithOptions<UIOptions> {
-        return plugin.withOptions(
-            (options: UIOptions = Plugger.DEFAULT_OPTIONS) => (api) => {
-                this.useColors(api);
-                this.useLinks(api, {
-                    linkClass:
-                        options.linkClass || Plugger.DEFAULT_OPTIONS.linkClass,
-                });
-                this.useEdges(api, {
-                    entryClass:
-                        options.entryClass ||
-                        Plugger.DEFAULT_OPTIONS.entryClass,
-                    buttonClass:
-                        options.buttonClass ||
-                        Plugger.DEFAULT_OPTIONS.buttonClass,
-                });
-            },
-        );
-    }
-
-    static plugColors(): PluginWithoutOptions {
-        return plugin((api) => this.useColors(api));
-    }
+export function plugUI(): PluginWithOptions<UIOptions> {
+    return plugin.withOptions((options: UIOptions = DEFAULT_OPTIONS) =>
+        (api) => {
+            useColors(api);
+            useLinks(api, {
+                linkClass: options.linkClass || DEFAULT_OPTIONS.linkClass,
+            });
+            useEdges(api, {
+                entryClass: options.entryClass || DEFAULT_OPTIONS.entryClass,
+                buttonClass: options.buttonClass || DEFAULT_OPTIONS.buttonClass,
+            });
+        });
+}
 
-    static plugLinks(): PluginWithOptions<LinkOptions> {
-        return plugin.withOptions(
-            (
-                    options: LinkOptions = {
-                        linkClass: Plugger.DEFAULT_OPTIONS.linkClass,
-                    },
-                ) =>
-                (api) =>
-                    this.useLinks(api, options as RequiredLinkOptions),
-        );
-    }
+export function plugColors(): PluginWithoutOptions {
+    return plugin((api) => useColors(api));
+}
 
-    static plugEdges(): PluginWithOptions<EdgeOptions> {
-        return plugin.withOptions(
-            (
-                    options: EdgeOptions = {
-                        entryClass: Plugger.DEFAULT_OPTIONS.entryClass,
-                        buttonClass: Plugger.DEFAULT_OPTIONS.buttonClass,
-                    },
-                ) =>
-                (api) => {
-                    const plugin = new Edges(
-                        api,
-                        options as RequiredEdgeOptions,
-                    );
-                    return plugin.create();
+export function plugLinks(): PluginWithOptions<LinkOptions> {
+    return plugin.withOptions(
+        (
+                options: LinkOptions = {
+                    linkClass: DEFAULT_OPTIONS.linkClass,
                 },
-        );
-    }
+            ) =>
+            (api) =>
+                useLinks(api, options as RequiredLinkOptions),
+    );
+}
 
-    protected static useColors(api: PluginAPI): Colors {
-        return new Colors(api).create();
-    }
+export function plugEdges(): PluginWithOptions<EdgeOptions> {
+    return plugin.withOptions(
+        (
+                options: EdgeOptions = {
+                    entryClass: DEFAULT_OPTIONS.entryClass,
+                    buttonClass: DEFAULT_OPTIONS.buttonClass,
+                },
+            ) =>
+            (api) => {
+                const plugin = new Edges(api, options as RequiredEdgeOptions);
+                return plugin.create();
+            },
+    );
+}
 
-    protected static useLinks(
-        api: PluginAPI,
-        options: RequiredLinkOptions,
-    ): Links {
-        return new Links(api, options as RequiredLinkOptions).create();
-    }
+function useColors(api: PluginAPI): Colors {
+    return new Colors(api).create();
+}
 
-    protected static useEdges(
-        api: PluginAPI,
-        options: RequiredEdgeOptions,
-    ): Edges {
-        return new Edges(api, options as RequiredEdgeOptions).create();
-    }
+function useLinks(api: PluginAPI, options: RequiredLinkOptions): Links {
+    return new Links(api, options as RequiredLinkOptions).create();
 }
 
-export default Plugger;
+function useEdges(api: PluginAPI, options: RequiredEdgeOptions): Edges {
+    return new Edges(api, options as RequiredEdgeOptions).create();
+}
diff --git a/plugin/plugin.ts b/plugin/plugin.ts
@@ -1,3 +1,4 @@
+import { DarkModeConfig, PluginAPI } from "tailwindcss/types/config";
 import { PluginContract } from "./contracts/plugin";
 import {
     append_style,
@@ -18,7 +19,6 @@ import type {
     UtilityList,
     UtilityName,
 } from "./types";
-import { DarkModeConfig, PluginAPI } from "tailwindcss/types/config";
 
 export abstract class Plugin<T> implements PluginContract<T> {
     readonly darkMode: DarkMode = ["media", "prefers-color-scheme: dark"];

diff --git a/plugin/types/index.d.ts b/plugin/types/index.d.ts
@@ -1,5 +1,5 @@
-import type { ClassName } from "./styles";
 import type { Config, PluginCreator } from "tailwindcss/types/config";
+import type { ClassName } from "./styles";
 
 export type PluginWithoutOptions =
     | PluginCreator