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
109 changes: 109 additions & 0 deletions .zed/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,109 @@
{
"line_ending": "enforce_lf",

"languages": {
"JavaScript": {
"formatter": "none",
"format_on_save": "on",
"code_actions_on_format": {
"source.fixAll.eslint": true
}
},
"TypeScript": {
"formatter": "none",
"format_on_save": "on",
"code_actions_on_format": {
"source.fixAll.eslint": true
}
},
"TSX": {
"formatter": "none",
"format_on_save": "on",
"code_actions_on_format": {
"source.fixAll.eslint": true
},
"prettier": {
"allowed": false
}
},
"Astro": {
"language_servers": [
"astro-language-server",
"eslint"
],
"formatter": "none",
"format_on_save": "on",
"code_actions_on_format": {
"source.fixAll.eslint": true
},
"prettier": {
"allowed": false
}
},
"JSON": {
"language_servers": [
"json-language-server",
"eslint"
],
"formatter": "none",
"format_on_save": "on",
"code_actions_on_format": {
"source.fixAll.eslint": true
}
},
"JSONC": {
"language_servers": [
"json-language-server",
"eslint"
],
"formatter": "none",
"format_on_save": "on",
"code_actions_on_format": {
"source.fixAll.eslint": true
}
},
"JSON5": {
"language_servers": [
"json-language-server",
"eslint"
],
"formatter": "none",
"format_on_save": "on",
"code_actions_on_format": {
"source.fixAll.eslint": true
}
},
"TOML": {
"formatter": "none",
"format_on_save": "off"
}
},
"lsp": {
"eslint": {
"settings": {
"codeActionOnSave": {
"rules": [
"import/order",
"jsonc/array-bracket-spacing",
"jsonc/comma-dangle",
"jsonc/indent",
"@stylistic/array-bracket-spacing",
"@stylistic/arrow-parens",
"@stylistic/arrow-spacing",
"@stylistic/comma-dangle",
"@stylistic/indent",
"@stylistic/quotes",
"@stylistic/semi",
"@stylistic/space-before-blocks",
"@stylistic/space-before-function-paren",
"@stylistic/space-in-parens",
"@stylistic/template-curly-spacing"
]
}
}
}
},
"prettier": {
"allowed": false
}
}
7 changes: 4 additions & 3 deletions astro.config.ts
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
import { fileURLToPath } from "node:url";
import { defineConfig } from "astro/config";
import compress from "astro-compress";
import icon from "astro-icon";
import cloudflare from "@astrojs/cloudflare";
import mdx from "@astrojs/mdx";
import tailwindcss from "@tailwindcss/vite";
import { defaultLocale, locales } from "./src/libs/i18n/configs.ts";

export default defineConfig({
compressHTML: true,
site: "https://guildkit.net",
site: "https://guildkit.tenkumogroup.com",

output: "static",
trailingSlash: "always",

i18n: {
Expand All @@ -20,9 +21,9 @@ export default defineConfig({
},
},

adapter: cloudflare(),
integrations: [
mdx(),
icon(),
compress(),
],
vite: {
Expand Down
3 changes: 3 additions & 0 deletions eslint.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ const configs: Linter.Config[] = [
{
ignores: [
"**/*.d.ts", // generated TypeScript declaration files
".wrangler/",
],
},

Expand All @@ -27,6 +28,8 @@ const configs: Linter.Config[] = [
rules: {
// Temporarily disable this rule until eslint-plugin-import supports ESLint v10.x
"import/order": "off",
// Not working with Astro?
"@typescript-eslint/no-misused-promises": "off",
},
},
];
Expand Down
18 changes: 15 additions & 3 deletions mise.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ env = { NODE_ENV = "production" }

[tasks.lint]
run = [
"tsc --noEmit",
"astro check",
"eslint"
]
Expand All @@ -24,16 +23,29 @@ run = "git clean -dX --exclude=\"!.env\" --force"

[tasks.refresh]
depends = [ "clean" ]
run = "rm --force ./pnpm-lock.yaml && corepack enable && corepack up && pnpm install"
run = [
"rm --force ./pnpm-lock.yaml",
"corepack enable",
"corepack up",
"pnpm install",
{ task = "setup" },
]

[tasks.deploy]
run = "wrangler deploy"

[tasks.deploy-preview]
run = "wrangler versions upload"

[tasks.setup]
run = "wrangler types"

[hooks]
postinstall = "corepack enable && pnpm install --frozen-lockfile"
postinstall = [
"corepack enable",
"pnpm install --frozen-lockfile",
"mise setup",
]

[env]
_.file = ".env"
Expand Down
5 changes: 2 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@
"private": true,
"type": "module",
"dependencies": {
"@astrojs/cloudflare": "^13.5.1",
"@tailwindcss/vite": "^4.1.7",
"accessible-astro-components": "^5.2.0"
},
"devDependencies": {
"@astrojs/check": "^0.9.9",
"@astrojs/mdx": "^5.0.4",
"@astrojs/partytown": "^2.1.4",
"@cloudflare/workers-types": "^4.20240909.0",
"@iconify-json/lucide": "^1.2.44",
"@phanect/configs": "latest",
"@phanect/lint": "latest",
Expand All @@ -26,7 +26,6 @@
"astro": "^6.1.9",
"astro-compress": "^2.3.8",
"astro-eslint-parser": "^1.2.2",
"astro-icon": "^1.1.5",
"eslint": "^10.2.1",
"jiti": "latest",
"sanitize-html": "^2.17.0",
Expand All @@ -40,5 +39,5 @@
"node": "24.x",
"pnpm": ">=10.x"
},
"packageManager": "pnpm@10.33.2+sha512.a90faf6feeab71ad6c6e57f94e0fe1a12f5dcc22cd754db40ae9593eb6a3e0b6b12e3540218bb37ae083404b1f2ce6db2a4121e979829b4aff94b99f49da1cf8"
"packageManager": "pnpm@11.1.3+sha512.c85357fe17ca12dd23dd7071822666dfd7e3cb76fe214e3370b5ea2fb34f2a231185509b63e717f3cd0acb38dd3f8d82bcd5e8172400ae678b70ea4fbed0896d"
}
Loading