four-stroke 0.0.3 → 0.0.5

package/.github/workflows/ci.yml

@@ -17,4 +17,10 @@ jobs:
 
       - uses: ./.github/actions/install
 
-      - run: pnpm eslint
+      - run: pnpm oxlint
+
+      - run: pnpm oxfmt --check
+
+      - run: pnpm tsc --noEmit
+
+      - run: pnpm knip

package/.knip.json

@@ -0,0 +1,3 @@
+{
+  "entry": ["src/**/*.ts", "src/**/*.tsx"]
+}

package/bin/api-types.mjs

@@ -2,7 +2,7 @@
 
 import fs from "node:fs";
 import openapiTS from "openapi-typescript";
-import prettier from "prettier";
+import { format } from "oxfmt";
 import ts from "typescript";
 
 const services = process.argv[2].split(",");
@@ -17,6 +17,7 @@ await Promise.all(
         if ("format" in schemaObject && schemaObject.format === "uuid") {
           return schemaObject.nullable ? ts.factory.createUnionTypeNode([UUID, NULL]) : UUID;
         }
+        return null;
       },
     });
     const printer = ts.createPrinter({});
@@ -28,14 +29,17 @@ await Promise.all(
     const result = printer.printNode(ts.EmitHint.Unspecified, output[0], resultFile);
     fs.writeFileSync(
       `src/__definitions__/${service.replace("https://", "")}-definitions.ts`,
-      await prettier.format(
-        `// Autogenerated by four-stroke
+      (
+        await format(
+          `src/__definitions__/${service.replace("https://", "")}-definitions.ts`,
+          `// Autogenerated by two-stroke
 
-${fs.readFileSync("src/__definitions__/type-definitions.ts", "utf-8")}
+${fs.readFileSync("src/__definitions__/type-definitions.ts", "utf8")}
 
 ${result}`,
-        { parser: "typescript", printWidth: 100 },
-      ),
+          { parser: "typescript", printWidth: 100 },
+        )
+      ).code,
     );
   }),
 );

package/bin/deploy.mjs

@@ -1,8 +1,8 @@
 #!/usr/bin/env node
 "use strict";
 import fs from "fs";
-import { cmd } from "../src/cmd.mjs";
 import { basename } from "path";
+import { cmd } from "../src/cmd.mjs";
 
 const env = process.argv[2];
 const release = process.argv[3];

package/bin/format.mjs

@@ -2,5 +2,5 @@
 "use strict";
 import { cmd } from "../src/cmd.mjs";
 
-cmd("eslint --cache --fix");
-cmd("prettier --cache --write .");
+cmd("oxfmt");
+cmd("oxlint --fix");

package/bin/lint.mjs

@@ -3,24 +3,8 @@
 import fs from "fs";
 import { cmd } from "../src/cmd.mjs";
 
-cmd("react-router typegen");
 if (fs.existsSync("wrangler.jsonc")) {
-  const devVarsFiles = fs.globSync("**/.dev.vars");
-  const backed = [];
-
-  for (const file of devVarsFiles) {
-    const tmp = file + ".bak.bak";
-    fs.renameSync(file, tmp);
-    backed.push({ original: file, tmp });
-  }
-
-  try {
-    cmd("wrangler types --strict-vars false --check");
-  } finally {
-    for (const { original, tmp } of backed) {
-      fs.renameSync(tmp, original);
-    }
-  }
+  cmd("wrangler types --env-file /dev/null --strict-vars false --check");
 }
-cmd("eslint --cache --max-warnings=0");
-cmd("prettier --cache --check .");
+cmd("oxfmt --check");
+cmd("oxlint");

package/bin/type-check.mjs

@@ -4,22 +4,7 @@ import fs from "fs";
 import { cmd } from "../src/cmd.mjs";
 
 if (fs.existsSync("wrangler.jsonc")) {
-  const devVarsFiles = fs.globSync("**/.dev.vars");
-  const backed = [];
-
-  for (const file of devVarsFiles) {
-    const tmp = file + ".bak.bak";
-    fs.renameSync(file, tmp);
-    backed.push({ original: file, tmp });
-  }
-
-  try {
-    cmd("wrangler types --strict-vars false");
-  } finally {
-    for (const { original, tmp } of backed) {
-      fs.renameSync(tmp, original);
-    }
-  }
+  cmd("wrangler types --env-file /dev/null --strict-vars false");
 }
 cmd("vite build");
 cmd("tsc --noEmit");

package/oxfmt.config.ts

@@ -0,0 +1,15 @@
+import { defineConfig } from "oxfmt";
+
+export default defineConfig({
+  sortImports: {
+    newlinesBetween: false,
+    groups: [
+      ["value-builtin", "value-external"],
+      ["value-internal", "value-parent", "value-sibling", "value-index"],
+      { newlinesBetween: true },
+      "type-import",
+      "unknown",
+    ],
+  },
+  ignorePatterns: ["worker-configuration.d.ts", "wrangler.jsonc"],
+});

package/oxlint.config.ts

@@ -0,0 +1,90 @@
+import { defineConfig } from "oxlint";
+
+export default defineConfig({
+  plugins: ["eslint", "typescript", "unicorn", "oxc", "import", "promise", "vitest"],
+  options: {
+    typeAware: true,
+  },
+  categories: {
+    correctness: "error",
+    suspicious: "warn",
+    perf: "error",
+    style: "warn",
+  },
+  rules: {
+    "no-map-spread": "off",
+    "no-named-export": "off",
+    "no-magic-numbers": "off",
+    "consistent-indexed-object-style": "off",
+    "id-length": "off",
+    "no-await-expression-member": "off",
+    "max-nested-calls": "off",
+    "sort-keys": "off",
+    curly: "off",
+    "switch-case-braces": "off",
+    "vitest/require-hook": "off",
+    "no-ternary": "off",
+    "group-exports": "off",
+    "exports-last": "off",
+    "prefer-default-export": "off",
+    "no-null": "off",
+    "consistent-type-specifier-style": "off",
+    "max-statements": "off",
+    "consistent-type-imports": "error",
+    "relative-url-style": ["error", "always"],
+    "no-namespace": "off",
+    "no-duplicate-imports": ["error", { allowSeparateTypeImports: true }],
+    "func-style": "off",
+    "sort-imports": [
+      "error",
+      {
+        ignoreDeclarationSort: true,
+        ignoreMemberSort: false,
+      },
+    ],
+    "new-cap": "off",
+    "promise/prefer-await-to-callbacks": "off",
+    "promise/avoid-new": "off",
+    "prefer-await-to-then": "off",
+    "max-params": "off",
+    "no-underscore-dangle": "off",
+    "no-nested-ternary": "off",
+    "unicorn/no-nested-ternary": "off",
+    "no-anonymous-default-export": "off",
+    "no-continue": "off",
+    "init-declarations": "off",
+    "prefer-to-be-truthy": "off",
+    "vitest/prefer-expect-assertions": "off",
+    "vitest/prefer-importing-vitest-globals": "off",
+    "vitest/no-importing-vitest-globals": "error",
+    "vitest/require-top-level-describe": "off",
+    "vitest/max-expects": "off",
+    "vitest/no-hooks": "off",
+  },
+  overrides: [
+    {
+      files: ["*.test.ts", "*.spec.ts"],
+      rules: {
+        "@typescript-eslint/no-explicit-any": "off",
+      },
+    },
+    {
+      files: ["*-definitions.ts"],
+      rules: {
+        "no-unused-vars": "off",
+        "@typescript-eslint/no-redundant-type-constituents": "off",
+        "@typescript-eslint/no-duplicate-type-constituents": "off",
+        "group-exports": "off",
+        "exports-last": "off",
+        "consistent-indexed-object-style": "off",
+      },
+    },
+    {
+      files: ["bin/*.mjs", "src/cmd.mjs"],
+      rules: {
+        "import/no-nodejs-modules": "off",
+        "prefer-destructuring": "off",
+      },
+    },
+  ],
+});

package/package.json

@@ -1,4 +1,12 @@
 {
+  "name": "four-stroke",
+  "version": "0.0.5",
+  "description": "Simple Cloudflare Worker SSR SPA framework",
+  "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/change-engine/four-stroke"
+  },
   "bin": {
     "api-types": "./bin/api-types.mjs",
     "deploy": "./bin/deploy.mjs",
@@ -8,52 +16,31 @@
     "test": "./bin/test.mjs",
     "type-check": "./bin/type-check.mjs"
   },
+  "type": "module",
+  "main": "src/fake.ts",
   "dependencies": {
-    "@cloudflare/vitest-pool-workers": "^0.16.20",
-    "@sentry/cli": "^3.5.1",
-    "@types/node": "^26.0.1",
     "@types/react": "^19.2.17",
-    "@types/react-dom": "^19.2.3",
-    "@typescript-eslint/eslint-plugin": "^8.62.0",
-    "@typescript-eslint/parser": "^8.62.0",
-    "@vitest/runner": "^4.1.9",
-    "@vitest/snapshot": "^4.1.9",
-    "eslint-config-prettier": "^10.1.8",
-    "eslint-config-two-stroke": "^1.5.6",
-    "eslint-config-typescript": "^3.0.0",
-    "openapi-typescript": "^7.13.0",
-    "react": "^19.2.7",
-    "react-dom": "^19.2.7"
+    "openapi-typescript": "^7.13.0"
+  },
+  "devDependencies": {
+    "@cloudflare/vitest-pool-workers": "^0.18.4",
+    "knip": "^6.26.0",
+    "oxfmt": "^0.59.0",
+    "oxlint": "^1.74.0",
+    "oxlint-tsgolint": "^0.24.0",
+    "typescript": "^6.0.3",
+    "vitest": "^4.1.10"
   },
   "peerDependencies": {
-    "@sentry/cli": ">=2",
-    "eslint": ">=10",
-    "prettier": ">=3",
-    "typescript": ">=5",
+    "knip": "^6.26.0",
+    "oxfmt": "^0.59.0",
+    "oxlint": "^1.74.0",
+    "oxlint-tsgolint": "^0.24.0",
+    "typescript": "^6.0.3",
     "vitest": ">=4",
     "wrangler": ">=3"
   },
-  "description": "Simple Cloudflare Worker SSR SPA framework",
   "engines": {
     "node": "^24.9.0"
-  },
-  "license": "MIT",
-  "main": "src/index.ts",
-  "name": "four-stroke",
-  "prettier": {
-    "printWidth": 100
-  },
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/change-engine/four-stroke"
-  },
-  "type": "module",
-  "version": "0.0.3",
-  "devDependencies": {
-    "@types/eslint": "^9.6.1",
-    "eslint": "^10.5.0",
-    "prettier": "^3.8.4",
-    "typescript": "^6.0.3",
-    "vitest": "^4.1.9"
   }
 }

package/src/components/viewer-menu.tsx

@@ -1,9 +1,9 @@
 import type { Viewer } from "../util/auth";
 
-type ViewerMenuProps = {
+interface ViewerMenuProps {
   logoutUrl: string;
   viewer: Viewer;
-};
+}
 
 export default function ViewerMenu({ logoutUrl, viewer }: ViewerMenuProps): React.ReactNode {
   return (

package/src/util/auth.ts

@@ -1,7 +1,7 @@
-export type Viewer = {
+export interface Viewer {
   name: string;
   picture: string | null;
-};
+}
 
 export const getCookieValue = (request: Request, name: string): string | null => {
   const cookieHeader = request.headers.get("Cookie");
@@ -32,6 +32,7 @@ export const parseViewerFromAccessToken = (accessToken: string): Viewer | null =
   }
 
   try {
+    // oxlint-disable-next-line typescript/no-unsafe-type-assertion
     const claims = JSON.parse(decodeBase64Url(payload)) as {
       email?: unknown;
       name?: unknown;

package/tsconfig.json

@@ -14,7 +14,8 @@
     "types": [
       "./worker-configuration.d.ts",
       "vitest/globals",
-      "@cloudflare/vitest-pool-workers/types"
+      "@cloudflare/vitest-pool-workers/types",
+      "@types/react"
     ],
     "verbatimModuleSyntax": true,
     "jsx": "react-jsx"

package/worker-configuration.d.ts

@@ -1,5 +1,5 @@
 /* eslint-disable */
-// Generated by Wrangler by running `wrangler types --strict-vars=false` (hash: f0ebc0bbc8852abc1241a56510ca0186)
+// Generated by Wrangler by running `wrangler types` (hash: f0ebc0bbc8852abc1241a56510ca0186)
 // Runtime types generated with workerd@1.20260625.1 2025-09-15 disable_nodejs_fs_module,nodejs_compat
 interface __BaseEnv_Env {
 }

package/eslint.config.js

@@ -1,3 +0,0 @@
-import config from "eslint-config-two-stroke";
-
-export default config;