Merge pull request #3 from fccview/develop

Lift off

Author: fccview

.editorconfig

@@ -0,0 +1,9 @@
+root = true
+
+[*]
+indent_style = space
+indent_size = 2
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true

.gitignore

@@ -2,6 +2,8 @@
 docker-compose.test.yml
 node_modules/
 src/public/style.css
+src/public/app.js
+src/public/settings-page.js
 data/
-# fccview-degoog-extensions
+fccview-degoog-extensions
 dist

Dockerfile

@@ -9,7 +9,7 @@ FROM base AS build
 COPY package.json bun.lock* ./
 RUN bun install --frozen-lockfile
 COPY . .
-RUN bun run build:css
+RUN bun run build
 
 FROM base AS release
 RUN apt-get update && apt-get install -y --no-install-recommends git ca-certificates && rm -rf /var/lib/apt/lists/*
@@ -22,4 +22,4 @@ ENV PORT=4444
 EXPOSE 4444
 
 USER bun
-ENTRYPOINT ["bun", "run", "src/server.ts"]
+ENTRYPOINT ["bun", "run", "src/server/index.ts"]

build-css.ts

@@ -0,0 +1,21 @@
+import * as sass from "sass";
+import * as esbuild from "esbuild";
+
+const result = sass.compile("src/styles/style.scss");
+await Bun.write("src/public/style.css", result.css);
+console.log("SCSS compiled successfully.");
+
+await esbuild.build({
+  entryPoints: [
+    { in: "src/client/app.ts", out: "app" },
+    { in: "src/client/settings.ts", out: "settings-page" },
+  ],
+  bundle: true,
+  outdir: "src/public",
+  format: "esm",
+  target: ["es2022"],
+  minify: false,
+  sourcemap: false,
+});
+
+console.log("TypeScript bundled successfully.");

build.ts

@@ -0,0 +1,20 @@
+import tseslint from "typescript-eslint";
+
+export default tseslint.config(
+  {
+    ignores: ["node_modules/**", "dist/**", "src/public/**"],
+  },
+  ...tseslint.configs.recommended,
+  {
+    rules: {
+      "@typescript-eslint/no-explicit-any": "error",
+      "@typescript-eslint/no-unused-vars": [
+        "error",
+        { argsIgnorePattern: "^_", varsIgnorePattern: "^_" },
+      ],
+      "no-duplicate-imports": "error",
+      "@typescript-eslint/no-shadow": "error",
+      "no-shadow": "off",
+    },
+  },
+);

bun.lock

@@ -1,15 +1,17 @@
 {
   "name": "degoog",
-  "version": "0.5.5",
+  "version": "0.6.0",
   "type": "module",
   "scripts": {
-    "dev": "bun run --watch src/server.ts",
-    "build:css": "bun run build-css.ts",
-    "build": "bun run build:css",
+    "dev": "bun run --watch src/server/index.ts",
+    "build": "bun run build.ts",
+    "build:watch": "bun run build.ts --watch",
     "stop": "kill $(lsof -t -i:4444)",
-    "start": "bun run src/server.ts",
-    "start:dev": "DEGOOG_PORT=4445 bun run src/server.ts --debug",
+    "start": "bun run src/server/index.ts",
+    "start:dev": "DEGOOG_PORT=4445 bun run src/server/index.ts --debug",
     "typecheck": "tsc --noEmit",
+    "lint": "eslint src/ tests/",
+    "lint:fix": "eslint src/ tests/ --fix",
     "test": "bun test"
   },
   "dependencies": {
@@ -20,6 +22,9 @@
   },
   "devDependencies": {
     "@types/bun": "^1.2.0",
-    "typescript": "^5.7.0"
+    "esbuild": "^0.27.3",
+    "eslint": "^10.0.3",
+    "typescript": "^5.7.0",
+    "typescript-eslint": "^8.56.1"
   }
 }

eslint.config.js

@@ -1,3 +1,3 @@
-import { init } from "./js/init.js";
+import { init } from "./modules/init";
 
 document.addEventListener("DOMContentLoaded", init);