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
1 change: 1 addition & 0 deletions .env.example
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ASSETS_SERVER_DOMAIN="https://assets.zaneops.dev"
2 changes: 1 addition & 1 deletion .github/workflows/build-push-images-dev.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: PR preview environment
on:
pull_request:
# pull_request:
workflow_dispatch:

jobs:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/build-push-images.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
name: Build and Push Images
on:
# Triggers the workflow on push or pull request events but only for the main branch
push:
branches:
- main
# push:
# branches:
# - main
# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/close-pr-env.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: Close PR environment (DEV)
on:
pull_request:
types: [closed]
# pull_request:
# types: [closed]
workflow_dispatch:

jobs:
Expand Down
49 changes: 25 additions & 24 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,26 +1,27 @@
{
"editor.codeActionsOnSave": {
"source.organizeImports.biome": "explicit"
},
"[javascript]": {
"editor.defaultFormatter": "biomejs.biome"
},
"[typescript]": {
"editor.defaultFormatter": "biomejs.biome"
},
"[typescriptreact]": {
"editor.defaultFormatter": "biomejs.biome"
},
"editor.defaultFormatter": "biomejs.biome",
"typescript.preferences.importModuleSpecifier": "non-relative",
"typescript.tsdk": "frontend/node_modules/typescript/lib",
"[json]": {
"editor.defaultFormatter": "biomejs.biome"
},
"[html]": {
"editor.defaultFormatter": "vscode.html-language-features"
},
"github-actions.workflows.pinned.workflows": [
".github/workflows/build-push-images.yaml"
]
"editor.codeActionsOnSave": {
"source.organizeImports.biome": "explicit"
},
"[javascript]": {
"editor.defaultFormatter": "biomejs.biome"
},
"[typescript]": {
"editor.defaultFormatter": "biomejs.biome"
},
"[typescriptreact]": {
"editor.defaultFormatter": "biomejs.biome"
},
"editor.defaultFormatter": "biomejs.biome",
"typescript.preferences.importModuleSpecifier": "non-relative",
"typescript.tsdk": "node_modules/typescript/lib",
"[json]": {
"editor.defaultFormatter": "biomejs.biome"
},
"[html]": {
"editor.defaultFormatter": "vscode.html-language-features"
},
"github-actions.workflows.pinned.workflows": [
".github/workflows/build-push-images.yaml"
],
"biome.lsp.bin": "node_modules/.bin/biome"
}
46 changes: 34 additions & 12 deletions astro.config.mjs
Original file line number Diff line number Diff line change
@@ -1,15 +1,28 @@
import react from "@astrojs/react";
import starlight from "@astrojs/starlight";
import tailwind from "@astrojs/tailwind";
import { defineConfig } from "astro/config";
import tailwindcss from "@tailwindcss/vite";
import { defineConfig, envField } from "astro/config";

// https://astro.build/config
const defaultDomain = process.env.ZANE_DOMAINS?.split(",")[0] ?? "zaneops.dev";
export default defineConfig({
site: `https://${defaultDomain}`,

env: {
schema: {
ASSETS_SERVER_DOMAIN: envField.string({
context: "client",
access: "public",
url: true,
default: "https://assets.zaneops.dev"
})
}
},

devToolbar: {
enabled: false
},

integrations: [
starlight({
title: "ZaneOps documentation",
Expand All @@ -22,14 +35,21 @@ export default defineConfig({
baseUrl: "https://github.com/zane-ops/docs/edit/main/"
},
customCss: [
"./src/tailwind.css",
"./src/assets/theme.css",
"./src/assets/global.css",
"./src/assets/fonts/font-face.css"
],
social: {
github: "https://github.com/zane-ops/zane-ops",
discord: "https://discord.gg/DUdz2vrh9y"
},
social: [
{
label: "Github",
icon: "github",
href: "https://github.com/zane-ops/zane-ops"
},
{
label: "Discord",
icon: "discord",
href: "https://zaneops.dev/discord"
}
],
components: {
Footer: "./src/components/Footer.astro",
Head: "./src/components/Head.astro"
Expand Down Expand Up @@ -104,9 +124,11 @@ export default defineConfig({
}
]
}),
tailwind({
applyBaseStyles: false
}),

react()
]
],

vite: {
plugins: [tailwindcss()]
}
});
13 changes: 2 additions & 11 deletions biome.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@
"formatWithErrors": true,
"indentStyle": "tab",
"indentWidth": 2,
"lineWidth": 80,
"ignore": ["./src/api/v1.ts"]
"lineWidth": 80
},
"javascript": {
"formatter": {
Expand All @@ -24,13 +23,5 @@
"indentStyle": "space"
}
},
"files": {
"ignore": [
"./frontend/src/api/v1.ts",
"./frontend/src/routeTree.gen.ts",
"./frontend/dist/**",
"./docs/dist/**",
"node_modules/**"
]
}
"files": {}
}
26 changes: 15 additions & 11 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,20 +10,24 @@
"astro": "astro"
},
"dependencies": {
"@astrojs/check": "^0.8.2",
"@astrojs/react": "^3.6.2",
"@astrojs/starlight": "^0.25.1",
"@astrojs/starlight-tailwind": "^2.0.3",
"@astrojs/tailwind": "^5.1.0",
"@astrojs/check": "^0.9.4",
"@astrojs/react": "^4.3.0",
"@astrojs/starlight": "^0.35.1",
"@astrojs/starlight-tailwind": "^4.0.1",
"@astrojs/tailwind": "^6.0.2",
"@resvg/resvg-js": "^2.6.2",
"@types/react": "^18.3.12",
"@types/react-dom": "^18.3.1",
"astro": "^4.10.2",
"@tailwindcss/vite": "^4.1.11",
"astro": "^5.12.0",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"satori": "^0.12.0",
"satori": "^0.15.2",
"sharp": "^0.32.6",
"tailwindcss": "^3.4.6",
"typescript": "^5.5.3"
"typescript": "^5.8.3"
},
"devDependencies": {
"@biomejs/biome": "2.1.2",
"@types/react": "^19.1.8",
"@types/react-dom": "^19.1.6",
"tailwindcss": "^4.1.11"
}
}
Loading