Skip to content

Commit

Permalink
Merge pull request #5 from ergofriend/update-lint
Browse files Browse the repository at this point in the history
update CI
  • Loading branch information
ergofriend authored Oct 4, 2024
2 parents 2a07f52 + d58883f commit 6ec9b6a
Show file tree
Hide file tree
Showing 9 changed files with 106 additions and 74 deletions.
20 changes: 20 additions & 0 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
name: lint

on: [push]

jobs:
build:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4
- run: corepack enable
- name: Setup
uses: actions/setup-node@v4
with:
node-version: 20
cache: 'pnpm'
- name: Install
run: pnpm i --frozen-lockfile
- name: lint
run: pnpm run ci
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ web-ext.config.ts

# Editor directories and files
.vscode/*
!.vscode/settings.json
!.vscode/extensions.json
.idea
.DS_Store
Expand Down
3 changes: 3 additions & 0 deletions .vscode/extensions.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"recommendations": ["biomejs.biome"]
}
8 changes: 8 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"editor.defaultFormatter": "biomejs.biome",
"editor.formatOnSave": true,
"editor.codeActionsOnSave": {
"quickfix.biome": "explicit",
"source.organizeImports.biome": "explicit"
}
}
72 changes: 36 additions & 36 deletions components/ui/alert.tsx
Original file line number Diff line number Diff line change
@@ -1,58 +1,58 @@
import { type VariantProps, cva } from "class-variance-authority"
import * as React from "react"
import { cva, type VariantProps } from "class-variance-authority"

import { cn } from "@/libs/utils"

const alertVariants = cva(
"relative w-full rounded-lg border p-4 [&>svg~*]:pl-7 [&>svg+div]:translate-y-[-3px] [&>svg]:absolute [&>svg]:left-4 [&>svg]:top-4 [&>svg]:text-foreground",
{
variants: {
variant: {
default: "bg-background text-foreground",
destructive:
"border-destructive/50 text-destructive dark:border-destructive [&>svg]:text-destructive",
},
},
defaultVariants: {
variant: "default",
},
}
"relative w-full rounded-lg border p-4 [&>svg~*]:pl-7 [&>svg+div]:translate-y-[-3px] [&>svg]:absolute [&>svg]:left-4 [&>svg]:top-4 [&>svg]:text-foreground",
{
variants: {
variant: {
default: "bg-background text-foreground",
destructive:
"border-destructive/50 text-destructive dark:border-destructive [&>svg]:text-destructive",
},
},
defaultVariants: {
variant: "default",
},
},
)

const Alert = React.forwardRef<
HTMLDivElement,
React.HTMLAttributes<HTMLDivElement> & VariantProps<typeof alertVariants>
HTMLDivElement,
React.HTMLAttributes<HTMLDivElement> & VariantProps<typeof alertVariants>
>(({ className, variant, ...props }, ref) => (
<div
ref={ref}
role="alert"
className={cn(alertVariants({ variant }), className)}
{...props}
/>
<div
ref={ref}
role="alert"
className={cn(alertVariants({ variant }), className)}
{...props}
/>
))
Alert.displayName = "Alert"

const AlertTitle = React.forwardRef<
HTMLParagraphElement,
React.HTMLAttributes<HTMLHeadingElement>
HTMLParagraphElement,
React.HTMLAttributes<HTMLHeadingElement>
>(({ className, ...props }, ref) => (
<h5
ref={ref}
className={cn("mb-1 font-medium leading-none tracking-tight", className)}
{...props}
/>
<h5
ref={ref}
className={cn("mb-1 font-medium leading-none tracking-tight", className)}
{...props}
/>
))
AlertTitle.displayName = "AlertTitle"

const AlertDescription = React.forwardRef<
HTMLParagraphElement,
React.HTMLAttributes<HTMLParagraphElement>
HTMLParagraphElement,
React.HTMLAttributes<HTMLParagraphElement>
>(({ className, ...props }, ref) => (
<div
ref={ref}
className={cn("text-sm [&_p]:leading-relaxed", className)}
{...props}
/>
<div
ref={ref}
className={cn("text-sm [&_p]:leading-relaxed", className)}
{...props}
/>
))
AlertDescription.displayName = "AlertDescription"

Expand Down
34 changes: 17 additions & 17 deletions components/ui/checkbox.tsx
Original file line number Diff line number Diff line change
@@ -1,27 +1,27 @@
import * as React from "react"
import * as CheckboxPrimitive from "@radix-ui/react-checkbox"
import { Check } from "lucide-react"
import * as React from "react"

import { cn } from "@/libs/utils"

const Checkbox = React.forwardRef<
React.ElementRef<typeof CheckboxPrimitive.Root>,
React.ComponentPropsWithoutRef<typeof CheckboxPrimitive.Root>
React.ElementRef<typeof CheckboxPrimitive.Root>,
React.ComponentPropsWithoutRef<typeof CheckboxPrimitive.Root>
>(({ className, ...props }, ref) => (
<CheckboxPrimitive.Root
ref={ref}
className={cn(
"peer h-4 w-4 shrink-0 rounded-sm border border-primary ring-offset-background focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50 data-[state=checked]:bg-primary data-[state=checked]:text-primary-foreground",
className
)}
{...props}
>
<CheckboxPrimitive.Indicator
className={cn("flex items-center justify-center text-current")}
>
<Check className="h-4 w-4" />
</CheckboxPrimitive.Indicator>
</CheckboxPrimitive.Root>
<CheckboxPrimitive.Root
ref={ref}
className={cn(
"peer h-4 w-4 shrink-0 rounded-sm border border-primary ring-offset-background focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50 data-[state=checked]:bg-primary data-[state=checked]:text-primary-foreground",
className,
)}
{...props}
>
<CheckboxPrimitive.Indicator
className={cn("flex items-center justify-center text-current")}
>
<Check className="h-4 w-4" />
</CheckboxPrimitive.Indicator>
</CheckboxPrimitive.Root>
))
Checkbox.displayName = CheckboxPrimitive.Root.displayName

Expand Down
16 changes: 8 additions & 8 deletions entrypoints/background.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import { searchMessaging } from "@/libs/messaging";
import { searchMessaging } from "@/libs/messaging"

export default defineBackground({
type: "module",
main() {
searchMessaging.onMessage("searchOnTab", async ({ data: { url } }) => {
await browser.tabs.create({ url });
});
},
});
type: "module",
main() {
searchMessaging.onMessage("searchOnTab", async ({ data: { url } }) => {
await browser.tabs.create({ url })
})
},
})
8 changes: 4 additions & 4 deletions libs/messaging.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { defineExtensionMessaging } from "@webext-core/messaging";
import { defineExtensionMessaging } from "@webext-core/messaging"

type SearchMessaging = {
searchOnTab: (data: { url: string }) => void;
};
export const searchMessaging = defineExtensionMessaging<SearchMessaging>();
searchOnTab: (data: { url: string }) => void
}
export const searchMessaging = defineExtensionMessaging<SearchMessaging>()
18 changes: 9 additions & 9 deletions libs/search.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { searchMessaging } from "./messaging"
import type { WxtStorageItemType, extensionConfigState } from "./storage"
import {searchMessaging} from './messaging'

type ExtensionConfig = WxtStorageItemType<typeof extensionConfigState.storage>

Expand Down Expand Up @@ -54,15 +54,15 @@ const findFilter = (
}

export const executeSearch = async (
config: ExtensionConfig,
currentTabUrl: string,
selectedText: string
config: ExtensionConfig,
currentTabUrl: string,
selectedText: string,
) => {
if (!selectedText) return
if (!selectedText) return

const target = findFilter(config, currentTabUrl).urlGenerator(selectedText)
const target = findFilter(config, currentTabUrl).urlGenerator(selectedText)

await searchMessaging.sendMessage("searchOnTab", { url: target })
await searchMessaging.sendMessage("searchOnTab", { url: target })

console.info("executeSearch:", currentTabUrl, selectedText, target)
};
console.info("executeSearch:", currentTabUrl, selectedText, target)
}

0 comments on commit 6ec9b6a

Please sign in to comment.