Miscellaneous refactors (#1762)

* Update file form key

* Update links in ESLint config

* Disable unicorn/better-regex ESLint rule

* Be more specific in gitignore rules

* Refactor Zod number schemas into a separate file

* Add tsc to `npm run lint`

.eslintrc.cjs

@@ -7,11 +7,10 @@ module.exports = {
 
   // Comments link to blockers for flat config
   plugins: [
-    // https://github.com/import-js/eslint-plugin-import/pull/2873
+    // https://github.com/import-js/eslint-plugin-import/pull/3061
     // https://github.com/import-js/eslint-plugin-import/issues/2948
-    // https://github.com/un-ts/eslint-plugin-import-x/issues/29
+    // https://github.com/un-ts/eslint-plugin-import-x/issues/90
     'import',
-    // https://github.com/levibuzolic/eslint-plugin-no-only-tests/issues/43
     'no-only-tests',
     'simple-import-sort',
     'unused-imports',
@@ -20,17 +19,13 @@ module.exports = {
   extends: [
     'eslint:recommended',
 
-    // https://github.com/jsx-eslint/eslint-plugin-react/issues/3699
     'plugin:react/recommended',
     'plugin:react/jsx-runtime',
     // https://github.com/facebook/react/issues/28313
     'plugin:react-hooks/recommended',
-    // https://github.com/jsx-eslint/eslint-plugin-jsx-a11y/pull/891
-    // https://github.com/jsx-eslint/eslint-plugin-jsx-a11y/issues/978
     'plugin:jsx-a11y/recommended',
     'plugin:playwright/recommended',
 
-    // https://github.com/typescript-eslint/typescript-eslint/milestone/9
     'plugin:@typescript-eslint/strict-type-checked',
     'plugin:@typescript-eslint/stylistic-type-checked',
 
@@ -40,6 +35,7 @@ module.exports = {
   ],
 
   rules: {
+    'no-plusplus': 'error',
     'object-shorthand': 'warn',
     quotes: ['warn', 'single', { avoidEscape: true }],
     'require-unicode-regexp': 'warn',
@@ -90,6 +86,7 @@ module.exports = {
         requireDefaultForNonUnion: true,
       },
     ],
+    'unicorn/better-regex': 'off',
     'unicorn/filename-case': 'off',
     'unicorn/no-array-callback-reference': 'off',
     'unicorn/no-null': 'off',

.gitignore

@@ -1,11 +1,11 @@
 .DS_Store
 node_modules/
 .cache/
-build/
+/build/
 .env*
 
 # runtime
-upload
+/upload
 
 # Playwright
 /test-results/

app/ffmpeg.server/ffmpeg.ts

@@ -2,7 +2,7 @@ import { spawn } from 'node:child_process';
 
 import { z } from 'zod';
 
-const integerString = z.string().regex(/^\d+$/u).transform(Number);
+import { integerString } from '~/utils/zod-number-schemas';
 
 /**
  * Parses a string containing progress output in `key=value` format from FFmpeg.

app/ffmpeg.server/ffprobe.ts

@@ -2,10 +2,7 @@ import { spawn } from 'node:child_process';
 
 import { z } from 'zod';
 
-const numericString = z
-  .string()
-  .regex(/^\d+(?:\.\d+)?$/u)
-  .transform(Number);
+import { numericString } from '~/utils/zod-number-schemas';
 
 /**
  * Parses a string containing JSON output from `ffprobe`.

app/forms/show/schema.ts

@@ -10,7 +10,7 @@ export const setSchema = z.object({
   audioFileId: zfd.text(z.string().optional()),
 });
 
-const COLOR_REGEX = /^#[\da-f]{6}$/iu;
+const COLOR_REGEX = /^#[0-9a-f]{6}$/iu;
 
 function isValidTimeZone(timeZone: string): boolean {
   try {

app/forms/upload-file.ts

@@ -1 +1 @@
-export const UPLOAD_FILE_FORM_KEY = 'uploadFile';
+export const UPLOAD_FILE_FORM_KEY = 'file';

app/utils/zod-number-schemas.ts

@@ -0,0 +1,11 @@
+import { z } from 'zod';
+
+export const integerString = z
+  .string()
+  .regex(/^[0-9]+$/u)
+  .transform(Number);
+
+export const numericString = z
+  .string()
+  .regex(/^[0-9]+(?:\.[0-9]+)?$/u)
+  .transform(Number);

package.json

@@ -16,14 +16,15 @@
     "lint:eslint": "eslint . --ignore-path .gitignore --max-warnings 0",
     "lint:stylelint": "stylelint \"**/*.css\" --ignore-path .gitignore --max-warnings 0",
     "lint:prettier": "prettier . --check --ignore-path .gitignore --log-level warn",
-    "lint:dpdm": "dpdm 'app/routes/*' --no-tree --no-warning --exit-code circular:1",
     "lint:knip": "knip-bun",
+    "lint:dpdm": "dpdm 'app/routes/*' --no-tree --no-warning --exit-code circular:1",
+    "lint:tsc": "tsc",
     "lint": "npm-run-all lint:*",
     "format:eslint": "eslint . --fix --ignore-path .gitignore",
     "format:stylelint": "stylelint \"**/*.css\" --fix --ignore-path .gitignore",
     "format:prettier": "prettier . --write --ignore-path .gitignore --log-level warn",
     "format:knip": "knip-bun --fix",
-    "format": "npm-run-all format:* lint:dpdm",
+    "format": "npm-run-all format:*",
     "test": "playwright test",
     "test-ct": "playwright test -c playwright-ct.config.ts"
   },

playwright/ct-tests/AudioController/AudioController.spec.tsx

@@ -235,15 +235,15 @@ function commonTests({ forceSkipAudioContext = false }) {
       await expect(
         component.locator('audio').nth(0),
         '10 seconds before the end of the first set',
-      ).toHaveAttribute('src', /\?1(#t=\d+)?$/u);
+      ).toHaveAttribute('src', /\?1(#t=[0-9]+)?$/u);
 
       await component.getByTestId('alternate-button').click();
 
       await page.waitForTimeout(1000);
       await expect(
         component.locator('audio').nth(0),
         '9 seconds before the end of the first set',
-      ).toHaveAttribute('src', /\?1(#t=\d+)?$/u);
+      ).toHaveAttribute('src', /\?1(#t=[0-9]+)?$/u);
     });
   });