Fix formatted files, add prettier config, fix dotenvx scripts

LA1CH3 · LA1CH3 · commit 63e00fa0ad1e · 2024-05-12T21:39:47.000-04:00
diff --git a/.eslintrc.cjs b/.eslintrc.cjs
@@ -7,8 +7,8 @@
 /** @type {import('eslint').Linter.Config} */
 module.exports = {
   parserOptions: {
-    ecmaVersion: "latest",
-    sourceType: "module",
+    ecmaVersion: 'latest',
+    sourceType: 'module',
     ecmaFeatures: {
       jsx: true,
     },
@@ -19,70 +19,70 @@ module.exports = {
     es6: true,
   },
   ignorePatterns: [
-    "build/*",
-    "node_modules/*",
-    ".wrangler/*",
-    "tmp/*",
-    "pnpm-lock.yaml",
-    ".eslintcache",
+    'build/*',
+    'node_modules/*',
+    '.wrangler/*',
+    'tmp/*',
+    'pnpm-lock.yaml',
+    '.eslintcache',
   ],
 
   // Base config
-  extends: ["eslint:recommended", "prettier"],
+  extends: ['eslint:recommended', 'prettier'],
 
   overrides: [
     // React
     {
-      files: ["**/*.{js,jsx,ts,tsx}"],
-      plugins: ["react", "jsx-a11y"],
+      files: ['**/*.{js,jsx,ts,tsx}'],
+      plugins: ['react', 'jsx-a11y'],
       extends: [
-        "plugin:react/recommended",
-        "plugin:react/jsx-runtime",
-        "plugin:react-hooks/recommended",
-        "plugin:jsx-a11y/recommended",
+        'plugin:react/recommended',
+        'plugin:react/jsx-runtime',
+        'plugin:react-hooks/recommended',
+        'plugin:jsx-a11y/recommended',
       ],
       settings: {
         react: {
-          version: "detect",
+          version: 'detect',
         },
-        formComponents: ["Form"],
+        formComponents: ['Form'],
         linkComponents: [
-          { name: "Link", linkAttribute: "to" },
-          { name: "NavLink", linkAttribute: "to" },
+          { name: 'Link', linkAttribute: 'to' },
+          { name: 'NavLink', linkAttribute: 'to' },
         ],
-        "import/resolver": {
+        'import/resolver': {
           typescript: {},
         },
       },
     },
 
     // Typescript
     {
-      files: ["**/*.{ts,tsx}"],
-      plugins: ["@typescript-eslint", "import", "drizzle"],
-      parser: "@typescript-eslint/parser",
+      files: ['**/*.{ts,tsx}'],
+      plugins: ['@typescript-eslint', 'import', 'drizzle'],
+      parser: '@typescript-eslint/parser',
       settings: {
-        "import/internal-regex": "^~/",
-        "import/resolver": {
+        'import/internal-regex': '^~/',
+        'import/resolver': {
           node: {
-            extensions: [".ts", ".tsx"],
+            extensions: ['.ts', '.tsx'],
           },
           typescript: {
             alwaysTryTypes: true,
           },
         },
       },
       extends: [
-        "plugin:@typescript-eslint/recommended",
-        "plugin:import/recommended",
-        "plugin:import/typescript",
-        "plugin:drizzle/recommended",
+        'plugin:@typescript-eslint/recommended',
+        'plugin:import/recommended',
+        'plugin:import/typescript',
+        'plugin:drizzle/recommended',
       ],
     },
 
     // Node
     {
-      files: [".eslintrc.js"],
+      files: ['.eslintrc.js'],
       env: {
         node: true,
       },
diff --git a/.prettierrc b/.prettierrc
@@ -0,0 +1,6 @@
+{
+  "trailingComma": "all",
+  "tabWidth": 2,
+  "semi": true,
+  "singleQuote": true
+}
diff --git a/app/root.tsx b/app/root.tsx
@@ -1,7 +1,7 @@
-import { type LoaderFunctionArgs, json } from "@remix-run/cloudflare";
-import { Links, Meta, Outlet, Scripts, useLoaderData } from "@remix-run/react";
-import { books } from "db/schema";
-import { drizzle } from "drizzle-orm/d1";
+import { type LoaderFunctionArgs, json } from '@remix-run/cloudflare';
+import { Links, Meta, Outlet, Scripts, useLoaderData } from '@remix-run/react';
+import { books } from 'db/schema';
+import { drizzle } from 'drizzle-orm/d1';
 
 export const loader = async ({ context }: LoaderFunctionArgs) => {
   const db = drizzle(context.cloudflare.env.DB);
diff --git a/app/services/auth/session.ts b/app/services/auth/session.ts
@@ -1,21 +1,20 @@
-import { createCookieSessionStorage } from "@remix-run/node";
-import { Authenticator } from "remix-auth";
-import { FormStrategy } from "remix-auth-form";
-import { AppDB, getDB } from "../db/utilities";
-import { AppLoadContext } from "@remix-run/cloudflare";
-import { pbkdf2Sync } from "crypto";
-
-// export the whole sessionStorage object
+import { createCookieSessionStorage } from '@remix-run/node';
+import { Authenticator } from 'remix-auth';
+import { FormStrategy } from 'remix-auth-form';
+import { AppDB, getDB } from '../db/utilities';
+import { AppLoadContext } from '@remix-run/cloudflare';
+import { pbkdf2Sync } from 'crypto';
+
 const sessionStorage = createCookieSessionStorage({
   cookie: {
-    name: "_session",
-    sameSite: "lax",
-    path: "/",
+    name: '_session',
+    sameSite: 'lax',
+    path: '/',
     httpOnly: true,
     ...(process.env.SESSION_SECRET
       ? { secrets: [process.env.SESSION_SECRET] }
       : {}),
-    secure: process.env.NODE_ENV === "production",
+    secure: process.env.NODE_ENV === 'production',
   },
 });
 
@@ -24,8 +23,8 @@ export const authenticator = new Authenticator(sessionStorage).use(
     if (context) {
       const db = getDB(context as AppLoadContext);
 
-      const username = form.get("username")?.toString();
-      const password = form.get("password")?.toString();
+      const username = form.get('username')?.toString();
+      const password = form.get('password')?.toString();
 
       if (username && password) {
         const user = await login(username, password, db);
@@ -34,7 +33,7 @@ export const authenticator = new Authenticator(sessionStorage).use(
       }
     }
   }),
-  "user-pass",
+  'user-pass',
 );
 
 export const login = async (username: string, password: string, db: AppDB) => {
@@ -47,7 +46,7 @@ export const login = async (username: string, password: string, db: AppDB) => {
   }
 
   const validPassword =
-    pbkdf2Sync(password, user.salt, 1000, 64, "sha512").toString("hex") ===
+    pbkdf2Sync(password, user.salt, 1000, 64, 'sha512').toString('hex') ===
     user.password;
 
   if (!validPassword) {
diff --git a/app/services/db/utilities.ts b/app/services/db/utilities.ts
@@ -1,6 +1,6 @@
-import { AppLoadContext } from "@remix-run/cloudflare";
-import { drizzle } from "drizzle-orm/d1";
-import * as schema from "db/schema";
+import { AppLoadContext } from '@remix-run/cloudflare';
+import { drizzle } from 'drizzle-orm/d1';
+import * as schema from 'db/schema';
 
 export const getDB = (context: AppLoadContext) =>
   drizzle(context.cloudflare.env.DB, { schema });
diff --git a/app/types/load-context.ts b/app/types/load-context.ts
@@ -1,8 +1,8 @@
-import type { PlatformProxy } from "wrangler";
+import type { PlatformProxy } from 'wrangler';
 
-type Cloudflare = Omit<PlatformProxy<Env>, "dispose">;
+type Cloudflare = Omit<PlatformProxy<Env>, 'dispose'>;
 
-declare module "@remix-run/cloudflare" {
+declare module '@remix-run/cloudflare' {
   interface AppLoadContext {
     cloudflare: Cloudflare;
   }
diff --git a/db/schema.ts b/db/schema.ts
@@ -1,15 +1,15 @@
-import { sqliteTable, text, integer } from "drizzle-orm/sqlite-core";
+import { sqliteTable, text, integer } from 'drizzle-orm/sqlite-core';
 
-export const books = sqliteTable("books", {
-  id: integer("id").primaryKey(),
-  title: text("title").unique().notNull(),
-  author: text("author").notNull(),
-  description: text("description").notNull(),
+export const books = sqliteTable('books', {
+  id: integer('id').primaryKey(),
+  title: text('title').unique().notNull(),
+  author: text('author').notNull(),
+  description: text('description').notNull(),
 });
 
-export const users = sqliteTable("users", {
-  id: integer("id").primaryKey(),
-  username: text("username").unique().notNull(),
-  password: text("password").notNull(),
-  salt: text("salt").notNull(),
+export const users = sqliteTable('users', {
+  id: integer('id').primaryKey(),
+  username: text('username').unique().notNull(),
+  password: text('password').notNull(),
+  salt: text('salt').notNull(),
 });
diff --git a/drizzle.config.ts b/drizzle.config.ts
@@ -1,33 +1,33 @@
-import { defineConfig } from "drizzle-kit";
+import { defineConfig } from 'drizzle-kit';
 
 const {
   LOCAL_DB_PATH,
   WRANGLER_CONFIG,
-  DB_NAME = "math-rock-stack",
+  DB_NAME = 'math-rock-stack',
 } = process.env;
 
 export default defineConfig(
   LOCAL_DB_PATH
     ? {
-        dialect: "sqlite",
-        schema: "./db/schema.ts",
+        dialect: 'sqlite',
+        schema: './db/schema.ts',
         dbCredentials: {
           url: LOCAL_DB_PATH,
         },
       }
     : {
-        dialect: "sqlite",
-        schema: "./db/schema.ts",
-        out: "./migrations",
-        driver: "d1",
+        dialect: 'sqlite',
+        schema: './db/schema.ts',
+        out: './migrations',
+        driver: 'd1',
         dbCredentials: {
           wranglerConfigPath:
-            new URL("wrangler.toml", import.meta.url).pathname +
+            new URL('wrangler.toml', import.meta.url).pathname +
             // This is a hack to inject additional cli flags to wrangler
             // since drizzle-kit doesn't support specifying environments
             WRANGLER_CONFIG
               ? ` ${WRANGLER_CONFIG}`
-              : "",
+              : '',
           dbName: DB_NAME,
         },
       },
diff --git a/functions/[[path]].ts b/functions/[[path]].ts
@@ -1,8 +1,8 @@
-import { createPagesFunctionHandler } from "@remix-run/cloudflare-pages";
+import { createPagesFunctionHandler } from '@remix-run/cloudflare-pages';
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore - the server build file is generated by `remix vite:build`
 // eslint-disable-next-line import/no-unresolved
-import * as build from "../build/server";
+import * as build from '../build/server';
 
 export const onRequest = createPagesFunctionHandler({ build });
diff --git a/package.json b/package.json
@@ -7,15 +7,15 @@
   "main": "build/client/index.js",
   "scripts": {
     "dev": "dotenvx run -f .env.local -- remix vite:dev --open",
-    "build": "dotenv run -f .env.prod -- remix vite:build",
+    "build": "dotenvx run -f .env.prod -- remix vite:build",
     "lint": "eslint . --cache",
     "format:check": "prettier . --check",
     "format:write": "prettier . --write",
     "cf-typegen": "wrangler types",
     "db:update": "drizzle-kit up",
     "db:migrate:create": "drizzle-kit generate:sqlite",
     "db:migrate:apply:local": "dotenvx run -f .env.local -- sh scripts/db-migrate.sh",
-    "db:migrate:apply:prod": "dotenvx run -- -f .env.prod sh scripts/db-migrate-prod.sh",
+    "db:migrate:apply:prod": "dotenvx run -f .env.prod -- sh scripts/db-migrate-prod.sh",
     "db:studio:local": "LOCAL_DB_PATH=$(find .wrangler/state/v3/d1/miniflare-D1DatabaseObject -type f -name '*.sqlite' -print -quit) drizzle-kit studio",
     "db:sync": "dotenvx run -f .env.local -- sh scripts/db-sync.sh"
   },
diff --git a/vite.config.ts b/vite.config.ts
@@ -1,9 +1,9 @@
 import {
   vitePlugin as remix,
   cloudflareDevProxyVitePlugin as remixCloudflareDevProxy,
-} from "@remix-run/dev";
-import { defineConfig } from "vite";
-import tsconfigPaths from "vite-tsconfig-paths";
+} from '@remix-run/dev';
+import { defineConfig } from 'vite';
+import tsconfigPaths from 'vite-tsconfig-paths';
 
 export default defineConfig({
   plugins: [remixCloudflareDevProxy(), remix(), tsconfigPaths()],
diff --git a/worker-configuration.d.ts b/worker-configuration.d.ts
@@ -2,6 +2,6 @@
 // by running `wrangler types`
 
 interface Env {
-  CLOUDFLARE_ACCOUNT_ID: "887644ede3080f7152aa22e9ecf52f0f";
+  CLOUDFLARE_ACCOUNT_ID: '887644ede3080f7152aa22e9ecf52f0f';
   DB: D1Database;
 }

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,6 @@`
`2`	`2`	// by running `wrangler types`
`3`	`3`
`4`	`4`	`interface Env {`
`5`		`- CLOUDFLARE_ACCOUNT_ID: "887644ede3080f7152aa22e9ecf52f0f";`
	`5`	`+ CLOUDFLARE_ACCOUNT_ID: '887644ede3080f7152aa22e9ecf52f0f';`
`6`	`6`	`DB: D1Database;`
`7`	`7`	`}`