diff --git a/oxlint.json b/oxlint.json
index dc3cf067a81..04bc27a4124 100644
--- a/oxlint.json
+++ b/oxlint.json
@@ -11,7 +11,9 @@
     {
       "name": "@shopify/cli",
       "specifier": "./packages/eslint-plugin-cli/index.js"
-    }
+    },
+    "eslint-plugin-no-catch-all",
+    "eslint-plugin-tsdoc"
   ],
   "categories": {
     "correctness": "off"
@@ -104,9 +106,7 @@
     "**/bin/bundle.js",
     "**/*.d.ts",
     "**/*.cjs",
-    "packages/e2e/scripts/**",
-    "packages/ui-extensions-server-kit/**",
-    "packages/ui-extensions-test-utils/**"
+    "packages/e2e/scripts/**"
   ],
   "rules": {
     "array-callback-return": "error",
@@ -350,6 +350,8 @@
     "@shopify/cli/banner-headline-format": "error",
     "@shopify/cli/required-fields-when-loading-app": "error",
     "@shopify/cli/no-inline-graphql": "error",
+    "no-catch-all/no-catch-all": "error",
+    "tsdoc/syntax": "error",
     "typescript/consistent-return": "error",
     "typescript/dot-notation": [
       "error",
diff --git a/packages/ui-extensions-server-kit/tsconfig.json b/packages/ui-extensions-server-kit/tsconfig.json
index 999e647105a..30c549b13a7 100644
--- a/packages/ui-extensions-server-kit/tsconfig.json
+++ b/packages/ui-extensions-server-kit/tsconfig.json
@@ -12,16 +12,16 @@
     "strict": true,
     "forceConsistentCasingInFileNames": true,
     "module": "ESNext",
-    "moduleResolution": "Node",
+    "moduleResolution": "Bundler",
     "resolveJsonModule": true,
     "isolatedModules": true,
     "noEmit": false,
     "jsx": "react",
     "paths": {
-      "@shopify/ui-extensions-test-utils": ["../../ui-extensions-test-utils/src"],
+      "@shopify/ui-extensions-test-utils": ["../ui-extensions-test-utils/src"],
+      "i18n.js": ["./src/i18n.ts"]
     },
     "outDir": "dist",
-    "baseUrl": "src",
     "rootDir": "src",
     "tsBuildInfoFile": "dist/tsconfig.tsbuildinfo"
   },
diff --git a/packages/ui-extensions-test-utils/tsconfig.json b/packages/ui-extensions-test-utils/tsconfig.json
index 31d032502a3..fb143e8c997 100644
--- a/packages/ui-extensions-test-utils/tsconfig.json
+++ b/packages/ui-extensions-test-utils/tsconfig.json
@@ -12,13 +12,12 @@
     "strict": true,
     "forceConsistentCasingInFileNames": true,
     "module": "ESNext",
-    "moduleResolution": "Node",
+    "moduleResolution": "Bundler",
     "resolveJsonModule": true,
     "isolatedModules": true,
     "noEmit": false,
     "jsx": "react",
     "outDir": "dist",
-    "baseUrl": "src",
     "rootDir": "src",
     "tsBuildInfoFile": "dist/tsconfig.tsbuildinfo"
   },