Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions .github/renovate.json
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
{
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
"timezone": "Europe/Belgrade",
"extends": ["config:recommended", "schedule:weekly"],
"packageRules": [
{
"matchUpdateTypes": ["minor", "patch"],
"groupName": "all non-major dependencies",
"groupSlug": "all-minor-patch",
"automerge": true,
"automergeType": "pr",
"platformAutomerge": true,
"matchPackageNames": ["*"]
"groupName": "all non-major dependencies",
"groupSlug": "all-minor-patch",
"matchPackageNames": ["*"],
"matchUpdateTypes": ["minor", "patch"],
"platformAutomerge": true
}
]
],
"timezone": "Etc/Utc"
}
16 changes: 8 additions & 8 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,22 +19,22 @@ jobs:
uses: actions/checkout@v6.0.2

- name: Pnpm 🧱
uses: pnpm/action-setup@v4.2.0
uses: pnpm/action-setup@v6.0.7

- name: Node.js ⚓
uses: actions/setup-node@v6.3.0
uses: actions/setup-node@v6.4.0
with:
node-version: latest
node-version: lts/*
cache: pnpm

- name: Install 🔧
run: |
pnpm i
pnpm playwright
run: pnpm i

- name: Install playwright 🌐
run: pnpm playwright

- name: Test 🧪
run: |
pnpm test
run: pnpm test

- name: Build 🚧
run: |
Expand Down
6 changes: 5 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
{
"css.customData": ["./.vscode/tailwind.json"],
"editor.codeActionsOnSave": {
"source.fixAll.eslint": "explicit"
},
"eslint.runtime": "node",
"eslint.validate": [
"css",
"html",
Expand All @@ -12,5 +14,7 @@
"typescriptreact",
"yaml"
],
"css.customData": ["./.vscode/tailwind.json"]
"json.schemaDownload.trustedDomains": {
"https://docs.renovatebot.com/renovate-schema.json": true
}
}
2 changes: 1 addition & 1 deletion .vscode/tailwind.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"atDirectives": [
{
"name": "@theme",
"description": "Use the @theme directive to define your project's custom design tokens, like fonts, colors, and breakpoints.",
"name": "@theme",
"references": [
{
"name": "Tailwind's “Functions & Directives” documentation",
Expand Down
6 changes: 3 additions & 3 deletions .zed/settings.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"disable_ai": true,
"code_actions_on_format": {
"source.fixAll.eslint": true
},
"disable_ai": true,
"languages": {
"CSS": {
"language_servers": ["eslint", "tailwindcss-language-server"]
Expand All @@ -11,11 +11,11 @@
"formatter": [{ "code_action": "source.fixAll.eslint" }],
"language_servers": ["eslint", "vscode-html-language-server"]
},
"JSONC": {
"JSON": {
"formatter": [{ "code_action": "source.fixAll.eslint" }],
"language_servers": ["eslint", "json-language-server"]
},
"JSON": {
"JSONC": {
"formatter": [{ "code_action": "source.fixAll.eslint" }],
"language_servers": ["eslint", "json-language-server"]
},
Expand Down
23 changes: 10 additions & 13 deletions eslint.config.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
/* eslint-disable import-x/no-named-as-default-member */
import { includeIgnoreFile } from '@eslint/compat';
import e18e from '@e18e/eslint-plugin';
import { includeIgnoreFile } from '@eslint/config-helpers';
import css from '@eslint/css';
import eslint from '@eslint/js';
import json from '@eslint/json';
import html from '@html-eslint/eslint-plugin';
import stylistic from '@stylistic/eslint-plugin';
import { createTypeScriptImportResolver } from 'eslint-import-resolver-typescript';
import { importX } from 'eslint-plugin-import-x';
import jsonc from 'eslint-plugin-jsonc';
import jsxA11y from 'eslint-plugin-jsx-a11y';
import perfectionist from 'eslint-plugin-perfectionist';
import prettierRecommended from 'eslint-plugin-prettier/recommended';
Expand Down Expand Up @@ -36,12 +37,11 @@ export default defineConfig(
eslint.configs.recommended,
tseslint.configs.strictTypeChecked,
tseslint.configs.stylisticTypeChecked,
e18e.configs.recommended,
jsxA11y.flatConfigs.strict,
// @ts-expect-error Types of property create are incompatible. (ts 2322)
solidTsConfig,
// @ts-expect-error Types of property languageOptions are incompatible. (ts 2322)
importX.flatConfigs.recommended,
// @ts-expect-error Types of property languageOptions are incompatible. (ts 2322)
importX.flatConfigs.typescript,
stylistic.configs.customize({
semi: true,
Expand All @@ -51,6 +51,7 @@ export default defineConfig(
],
files: ['**/*.{ts,tsx}'],
rules: {
'@typescript-eslint/no-import-type-side-effects': 'error',
'@typescript-eslint/restrict-template-expressions': [
'error',
{ allowNumber: true },
Expand All @@ -61,12 +62,10 @@ export default defineConfig(
},
},
{
extends: [
jsonc.configs['flat/recommended-with-jsonc'],
prettierRecommended,
jsonc.configs['flat/prettier'],
],
extends: [json.configs.recommended, prettierRecommended],
files: ['**/*.json'],
language: 'json/json',
rules: { 'json/sort-keys': ['error', 'asc', { natural: true }] },
},
{
extends: [
Expand All @@ -77,19 +76,17 @@ export default defineConfig(
files: ['**/*.{yml,yaml}'],
},
{
extends: ['css/recommended', prettierRecommended],
extends: [css.configs.recommended, prettierRecommended],
files: ['**/*.css'],
language: 'css/css',
plugins: { css },
rules: {
'css/no-invalid-at-rules': 'off',
},
},
{
extends: ['html/recommended'],
extends: [html.configs.recommended],
files: ['**/*.html'],
language: 'html/html',
plugins: { html },
rules: {
'html/attrs-newline': [
'error',
Expand Down
105 changes: 55 additions & 50 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,68 +1,73 @@
{
"type": "module",
"name": "solid-clock",
"version": "1.0.0",
"keywords": [],
"description": "Solid-js clock, inspired by sauron clock, credits to voby",
"scripts": {
"build": "vite build",
"coverage": "vitest run --coverage",
"dev": "vite",
"playwright": "playwright install --only-shell chromium",
"preview": "vite preview",
"start": "vite",
"test": "vitest run"
"dependencies": {
"solid-js": "1.9.12"
},
"description": "Solid-js clock, inspired by sauron clock, credits to voby",
"devDependencies": {
"@eslint/compat": "2.0.3",
"@eslint/css": "0.14.1",
"@eslint/js": "9.39.4",
"@html-eslint/eslint-plugin": "0.58.1",
"@e18e/eslint-plugin": "0.4.1",
"@eslint/config-helpers": "0.6.0",
"@eslint/css": "1.2.0",
"@eslint/js": "10.0.1",
"@eslint/json": "1.2.0",
"@html-eslint/eslint-plugin": "0.60.0",
"@stylistic/eslint-plugin": "5.10.0",
"@tailwindcss/vite": "4.2.1",
"@tailwindcss/vite": "4.3.0",
"@types/eslint-plugin-jsx-a11y": "6.10.1",
"@types/node": "25.3.5",
"@vitest/browser-playwright": "4.0.18",
"@vitest/coverage-v8": "4.0.18",
"eslint": "9.39.4",
"@types/node": "25.6.2",
"@vitest/browser-playwright": "4.1.5",
"@vitest/coverage-v8": "4.1.5",
"eslint": "10.3.0",
"eslint-config-prettier": "10.1.8",
"eslint-import-resolver-typescript": "4.4.4",
"eslint-plugin-import-x": "4.16.1",
"eslint-plugin-jsonc": "2.21.1",
"eslint-plugin-import-x": "4.16.2",
"eslint-plugin-jsx-a11y": "6.10.2",
"eslint-plugin-perfectionist": "5.6.0",
"eslint-plugin-perfectionist": "5.9.0",
"eslint-plugin-prettier": "5.5.5",
"eslint-plugin-solid": "0.14.5",
"eslint-plugin-yml": "3.3.1",
"happy-dom": "20.8.3",
"playwright": "1.58.2",
"prettier": "3.8.1",
"prettier-plugin-tailwindcss": "0.7.2",
"tailwindcss": "4.2.1",
"typescript": "5.9.3",
"typescript-eslint": "8.56.1",
"vite": "8.0.0-beta.16",
"vite-plugin-checker": "0.12.0",
"vite-plugin-solid": "2.11.10",
"vitest": "4.0.18",
"eslint-plugin-yml": "3.3.2",
"happy-dom": "20.9.0",
"playwright": "1.59.1",
"prettier": "3.8.3",
"prettier-plugin-tailwindcss": "0.8.0",
"tailwindcss": "4.3.0",
"typescript": "6.0.3",
"typescript-eslint": "8.59.2",
"vite": "8.0.12",
"vite-plugin-checker": "0.13.0",
"vite-plugin-solid": "2.11.12",
"vitest": "4.1.5",
"vitest-browser-solid": "1.0.1"
},
"dependencies": {
"solid-js": "1.9.11"
},
"devEngines": {
"packageManager": {
"name": "pnpm"
"name": "pnpm",
"onFail": "download",
"version": "11.1.0"
},
"runtime": {
"name": "node",
"onFail": "warn",
"version": ">=24"
}
},
"engines": {
"node": ">=24"
},
"packageManager": "pnpm@10.31.0",
"pnpm": {
"onlyBuiltDependencies": [
"esbuild",
"unrs-resolver"
"imports": {
"#*": [
"./*",
"./*.ts",
"./*.tsx"
]
}
},
"keywords": [],
"name": "solid-clock",
"scripts": {
"build": "vite build",
"coverage": "vitest run --coverage",
"dev": "vite",
"playwright": "playwright install --only-shell chromium",
"preview": "vite preview",
"start": "vite",
"test": "vitest run"
},
"type": "module",
"version": "1.0.0"
}
Loading