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
11 changes: 11 additions & 0 deletions fission/.editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
root = true

[*]
end_of_line = lf
insert_final_newline = true
charset = utf-8
indent_style = space
indent_size = 4

[*.json]
indent_size = 2
168 changes: 136 additions & 32 deletions fission/biome.json
Original file line number Diff line number Diff line change
@@ -1,20 +1,24 @@
{
"$schema": "https://biomejs.dev/schemas/2.2.0/schema.json",
"vcs": { "enabled": true, "clientKind": "git", "useIgnoreFile": true, "defaultBranch": "dev" },
"files": { "ignoreUnknown": false },
"vcs": {
"enabled": true,
"clientKind": "git",
"useIgnoreFile": true,
"defaultBranch": "dev"
},
"files": {
"ignoreUnknown": false
},
"formatter": {
"enabled": true,
"formatWithErrors": false,
"indentStyle": "space",
"indentWidth": 4,
"lineEnding": "lf",

@0xda157 0xda157 Jun 22, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

note that I'm remove these here because biome inherits them from the newly added editorconfig

"lineWidth": 120,
"attributePosition": "auto",
"bracketSameLine": false,
"bracketSpacing": true,
"expand": "auto",
"useEditorconfig": true,
"includes": ["src/**", "!dist"]
"includes": ["**", "!dist"]
},
"linter": {
"enabled": true,
Expand Down Expand Up @@ -74,51 +78,131 @@
"strictCase": false,
"requireAscii": true,
"conventions": [
{ "selector": { "kind": "class" }, "match": "([^_]*)", "formats": ["PascalCase"] },
{
"selector": { "kind": "classProperty", "modifiers": ["readonly", "static"] },
"selector": {
"kind": "class"
},
"match": "([^_]*)",
"formats": ["PascalCase"]
},
{
"selector": {
"kind": "classProperty",
"modifiers": ["readonly", "static"]
},
"match": "[^_]((.*)[^_])?",
"formats": ["CONSTANT_CASE"]
},
{ "selector": { "kind": "classMethod" }, "match": "([^_]*)", "formats": ["camelCase"] },
{
"selector": { "kind": "classMember", "modifiers": ["private"] },
"selector": {
"kind": "classMethod"
},
"match": "([^_]*)",
"formats": ["camelCase"]
},
{
"selector": {
"kind": "classMember",
"modifiers": ["private"]
},
"match": "_([^_]*)",
"formats": ["camelCase"]
},

{ "selector": { "kind": "enumMember" }, "match": "[^_]((.*)[^_])?", "formats": ["CONSTANT_CASE"] },
{ "selector": { "kind": "function" }, "match": "([^_]*)", "formats": ["camelCase"] },

{ "selector": { "kind": "objectLiteralMethod" }, "match": "([^_]*)", "formats": ["camelCase"] },
{
"selector": { "kind": "objectLiteralProperty" },
"selector": {
"kind": "enumMember"
},
"match": "[^_]((.*)[^_])?",
"formats": ["CONSTANT_CASE"]
},
{
"selector": {
"kind": "function"
},
"match": "([^_]*)",
"formats": ["camelCase"]
},
{
"selector": {
"kind": "objectLiteralMethod"
},
"match": "([^_]*)",
"formats": ["camelCase"]
},
{
"selector": {
"kind": "objectLiteralProperty"
},
"match": "[^_]((.*)[^_])?",
"formats": ["camelCase", "snake_case", "PascalCase", "CONSTANT_CASE"]
},
{ "selector": { "kind": "typeMethod" }, "match": "(.*)[^_]", "formats": ["camelCase"] },
{ "selector": { "kind": "typeProperty" }, "match": "(.*)[^_]", "formats": ["camelCase", "PascalCase"] },
{ "selector": { "kind": "classMethod" }, "match": "(.*)[^_]", "formats": ["camelCase"] },
{
"selector": { "kind": "importNamespace" },
"selector": {
"kind": "typeMethod"
},
"match": "(.*)[^_]",
"formats": ["camelCase"]
},
{
"selector": {
"kind": "typeProperty"
},
"match": "(.*)[^_]",
"formats": ["camelCase", "PascalCase"]
},
{
"selector": {
"kind": "classMethod"
},
"match": "(.*)[^_]",
"formats": ["camelCase"]
},
{
"selector": {
"kind": "importNamespace"
},
"match": "([^_]*)",
"formats": ["camelCase", "PascalCase", "CONSTANT_CASE"]
},
{
"selector": { "kind": "importAlias" },
"selector": {
"kind": "importAlias"
},
"match": "([^_]*)",
"formats": ["camelCase", "PascalCase", "CONSTANT_CASE"]
},

{ "selector": { "kind": "functionParameter" }, "match": "([^_]*)", "formats": ["camelCase"] },
{
"selector": { "kind": "const" },
"selector": {
"kind": "functionParameter"
},
"match": "([^_]*)",
"formats": ["camelCase"]
},
{
"selector": {
"kind": "const"
},
"match": "[^_]((.*)[^_])?",
"formats": ["PascalCase", "camelCase", "CONSTANT_CASE"]
},
{ "selector": { "kind": "variable" }, "match": "[^_]((.*)[^_])?", "formats": ["camelCase"] },
{ "selector": { "kind": "typeLike" }, "match": "([^_]*)", "formats": ["PascalCase", "camelCase"] },
{ "match": "_?([^_]*)", "formats": ["camelCase"] }
{
"selector": {
"kind": "variable"
},
"match": "[^_]((.*)[^_])?",
"formats": ["camelCase"]
},
{
"selector": {
"kind": "typeLike"
},
"match": "([^_]*)",
"formats": ["PascalCase", "camelCase"]
},
{
"match": "_?([^_]*)",
"formats": ["camelCase"]
}
]
}
}
Expand Down Expand Up @@ -175,11 +259,31 @@
},
"globals": ["COMMIT_HASH", "MAIN_WINDOW_VITE_DEV_SERVER_URL", "MAIN_WINDOW_VITE_NAME"]
},
"html": { "formatter": { "selfCloseVoidElements": "always" } },
"html": {
"formatter": {
"selfCloseVoidElements": "always"
}
},
"overrides": [
{ "includes": ["*.json"], "formatter": { "indentWidth": 2 } },
{ "includes": ["src/proto/**/*"], "linter": { "enabled": false } }
{
"includes": ["*.json"],
"formatter": {
"indentWidth": 2
}
},
{
"includes": ["src/proto/**/*"],
"linter": {
"enabled": false
}
}
],

"assist": { "enabled": true, "actions": { "source": { "organizeImports": "off" } } }
"assist": {
"enabled": true,
"actions": {
"source": {
"organizeImports": "off"
}
}
}
}
2 changes: 1 addition & 1 deletion fission/manifest.d.ts
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export type ManifestFileType = Record<"robots"|"private"|"fields", { filename: string, hash: string }[]>
export type ManifestFileType = Record<"robots" | "private" | "fields", { filename: string; hash: string }[]>
8 changes: 4 additions & 4 deletions fission/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@
"preview": "vite preview --base=/fission/",
"lint": "bunx biome lint",
"lint:fix": "bunx biome lint --write",
"fmt": "bunx biome format src",
"fmt:fix": "bunx biome format src --write",
"style": "bunx biome check src",
"style:fix": "bunx biome check src --write",
"fmt": "bunx biome format",
"fmt:fix": "bunx biome format --write",
"style": "bunx biome check",
"style:fix": "bunx biome check --write",
"assetpack": "git lfs pull && (rm -rf public/Downloadables;tar -xf public/assetpack.zip -C public/)",
"assetpack:update": "bun update_manifest.ts && cd public && zip -FS -r assetpack.zip Downloadables -x '**/.*' -x '**/__MACOSX'",
"assetpack:merge": "git checkout --theirs public/assetpack.zip && rm -rf public/Downloadables && tar -xf public/assetpack.zip -C public/ && git checkout --ours public/assetpack.zip && tar -xf public/assetpack.zip -C public/ && bun run assetpack:update",
Expand Down
4 changes: 2 additions & 2 deletions fission/postcss.config.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
export default {
plugins: {
'@tailwindcss/postcss': {},
"@tailwindcss/postcss": {},
...(process.env.NODE_ENV === "production" ? { cssnano: {} } : {}),
},
}
}
2 changes: 1 addition & 1 deletion fission/src/shaders/fragment.glsl
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,4 @@ void main() {
vec3 color = getColor(noiseValue, rColor, gColor, bColor);

gl_FragColor = vec4(color, 1.0);
}
}
2 changes: 1 addition & 1 deletion fission/src/shaders/vertex.glsl
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ void main() {

vec4 modelViewPosition = modelViewMatrix * vec4(position, 1.0);
gl_Position = projectionMatrix * modelViewPosition;
}
}
77 changes: 37 additions & 40 deletions fission/tailwind.config.mjs
Original file line number Diff line number Diff line change
@@ -1,61 +1,58 @@
let colors = {
'interactive-element-solid': 'var(--interactive-element-solid)',
'interactive-element-left': 'var(--interactive-element-left)',
'interactive-element-right': 'var(--interactive-element-right)',
'background': 'var(--background)',
'background-secondary': 'var(--background-secondary)',
'interactive-background': 'var(--interactive-background)',
'background-hud': 'var(--background-hud)',
'interactive-hover': 'var(--interactive-hover)',
'interactive-select': 'var(--interactive-select)',
'main-text': 'var(--main-text)',
'scrollbar': 'var(--scrollbar)',
'accept-button': 'var(--accept-button)',
'cancel-button': 'var(--cancel-button)',
'interactive-element-text': 'var(--interactive-element-text)',
'icon': 'var(--icon)',
'main-hud-icon': 'var(--main-hud-icon)',
'main-hud-close-icon': 'var(--main-hud-close-icon)',
'highlight-hover': 'var(--highlight-hover)',
'highlight-select': 'var(--highlight-select)',
'skybox-top': 'var(--skybox-top)',
'skybox-bottom': 'var(--skybox-bottom)',
'floor-grid': 'var(--floor-grid)',
'accept-cancel-button-text': 'var(--accept-cancel-button-text)',
'match-red-alliance': 'var(--match-red-alliance)',
'match-blue-alliance': 'var(--match-blue-alliance)',
'toast-info': 'var(--toast-info)',
'toast-warning': 'var(--toast-warning)',
'toast-error': 'var(--toast-error)',
"interactive-element-solid": "var(--interactive-element-solid)",
"interactive-element-left": "var(--interactive-element-left)",
"interactive-element-right": "var(--interactive-element-right)",
background: "var(--background)",
"background-secondary": "var(--background-secondary)",
"interactive-background": "var(--interactive-background)",
"background-hud": "var(--background-hud)",
"interactive-hover": "var(--interactive-hover)",
"interactive-select": "var(--interactive-select)",
"main-text": "var(--main-text)",
scrollbar: "var(--scrollbar)",
"accept-button": "var(--accept-button)",
"cancel-button": "var(--cancel-button)",
"interactive-element-text": "var(--interactive-element-text)",
icon: "var(--icon)",
"main-hud-icon": "var(--main-hud-icon)",
"main-hud-close-icon": "var(--main-hud-close-icon)",
"highlight-hover": "var(--highlight-hover)",
"highlight-select": "var(--highlight-select)",
"skybox-top": "var(--skybox-top)",
"skybox-bottom": "var(--skybox-bottom)",
"floor-grid": "var(--floor-grid)",
"accept-cancel-button-text": "var(--accept-cancel-button-text)",
"match-red-alliance": "var(--match-red-alliance)",
"match-blue-alliance": "var(--match-blue-alliance)",
"toast-info": "var(--toast-info)",
"toast-warning": "var(--toast-warning)",
"toast-error": "var(--toast-error)",
}

let safelist = Object.keys(colors).map(c => "bg-" + c);
let safelist = Object.keys(colors).map(c => "bg-" + c)

/** @type {import('tailwindcss').Config} */
export default {
content: [
"./index.html",
"./src/**/*.{js,jsx,ts,tsx}"
],
content: ["./index.html", "./src/**/*.{js,jsx,ts,tsx}"],
theme: {
fontFamily: {
'artifakt-normal': 'Artifakt',
"artifakt-normal": "Artifakt",
},
fontWeight: {
'regular': '400',
'medium': '700',
regular: "400",
medium: "700",
},
extend: {
colors: colors,
maxHeight: {
'70vh': '70vh',
"70vh": "70vh",
},
spacing: {
'20vw': '20vw',
"20vw": "20vw",
},
aspectRatio: {
'toast': '6.44 / 1.0'
}
toast: "6.44 / 1.0",
},
},
},
safelist: safelist,
Expand Down
Loading
Loading