Move import type annotation lint to ESLint

2026-07-22 06:57:10 +00:00 · 2026-06-27 23:00:28 +09:00 · 2026-06-27 23:00:28 +09:00 · 2b04ed61e0
commit 2b04ed61e0
parent b316481acd
22 changed files with 27 additions and 26 deletions
--- a/eslint.config.mjs
+++ b/eslint.config.mjs
@ -44,6 +44,15 @@ export default defineConfig([
      },
    },
    rules: {
+      // Biome import restrictions do not cover `import("...").T`; keep that type syntax out before source-boundary lint runs.
+      "@typescript-eslint/consistent-type-imports": [
+        "error",
+        {
+          disallowTypeAnnotations: true,
+          fixStyle: "separate-type-imports",
+          prefer: "type-imports",
+        },
+      ],
      "@typescript-eslint/no-deprecated": "off",
      "@typescript-eslint/require-await": "off",
    },
--- a/scripts/grit/architecture/no-app-server-connection-boundary-imports.grit
+++ b/scripts/grit/architecture/no-app-server-connection-boundary-imports.grit
@ -5,7 +5,6 @@ private pattern js_module_reference() {
    JsImport(),
    JsExportNamedFromClause(),
    JsExportFromClause(),
-    TsImportType(),
    JsImportCallExpression()
  }
 }
--- a/scripts/grit/architecture/no-app-server-protocol-boundary-imports.grit
+++ b/scripts/grit/architecture/no-app-server-protocol-boundary-imports.grit
@ -5,7 +5,6 @@ private pattern js_module_reference() {
    JsImport(),
    JsExportNamedFromClause(),
    JsExportFromClause(),
-    TsImportType(),
    JsImportCallExpression()
  }
 }
--- a/scripts/grit/architecture/no-app-server-root-module-imports.grit
+++ b/scripts/grit/architecture/no-app-server-root-module-imports.grit
@ -5,7 +5,6 @@ private pattern js_module_reference() {
    JsImport(),
    JsExportNamedFromClause(),
    JsExportFromClause(),
-    TsImportType(),
    JsImportCallExpression()
  }
 }
--- a/scripts/grit/architecture/no-app-server-subfolder-root-imports.grit
+++ b/scripts/grit/architecture/no-app-server-subfolder-root-imports.grit
@ -5,7 +5,6 @@ private pattern js_module_reference() {
    JsImport(),
    JsExportNamedFromClause(),
    JsExportFromClause(),
-    TsImportType(),
    JsImportCallExpression()
  }
 }
--- a/scripts/grit/architecture/no-chat-app-server-outer-layer-imports.grit
+++ b/scripts/grit/architecture/no-chat-app-server-outer-layer-imports.grit
@ -5,7 +5,6 @@ private pattern js_module_reference() {
    JsImport(),
    JsExportNamedFromClause(),
    JsExportFromClause(),
-    TsImportType(),
    JsImportCallExpression()
  }
 }
--- a/scripts/grit/architecture/no-chat-application-outer-layer-imports.grit
+++ b/scripts/grit/architecture/no-chat-application-outer-layer-imports.grit
@ -5,7 +5,6 @@ private pattern js_module_reference() {
    JsImport(),
    JsExportNamedFromClause(),
    JsExportFromClause(),
-    TsImportType(),
    JsImportCallExpression()
  }
 }
--- a/scripts/grit/architecture/no-chat-host-rendering-layer-imports.grit
+++ b/scripts/grit/architecture/no-chat-host-rendering-layer-imports.grit
@ -5,7 +5,6 @@ private pattern js_module_reference() {
    JsImport(),
    JsExportNamedFromClause(),
    JsExportFromClause(),
-    TsImportType(),
    JsImportCallExpression()
  }
 }
--- a/scripts/grit/architecture/no-chat-panel-runtime-boundary-imports.grit
+++ b/scripts/grit/architecture/no-chat-panel-runtime-boundary-imports.grit
@ -5,7 +5,6 @@ private pattern js_module_reference() {
    JsImport(),
    JsExportNamedFromClause(),
    JsExportFromClause(),
-    TsImportType(),
    JsImportCallExpression()
  }
 }
--- a/scripts/grit/architecture/no-chat-presentation-outer-layer-imports.grit
+++ b/scripts/grit/architecture/no-chat-presentation-outer-layer-imports.grit
@ -5,7 +5,6 @@ private pattern js_module_reference() {
    JsImport(),
    JsExportNamedFromClause(),
    JsExportFromClause(),
-    TsImportType(),
    JsImportCallExpression()
  }
 }
--- a/scripts/grit/architecture/no-chat-ui-outer-layer-imports.grit
+++ b/scripts/grit/architecture/no-chat-ui-outer-layer-imports.grit
@ -5,7 +5,6 @@ private pattern js_module_reference() {
    JsImport(),
    JsExportNamedFromClause(),
    JsExportFromClause(),
-    TsImportType(),
    JsImportCallExpression()
  }
 }
--- a/scripts/grit/architecture/no-chat-workspace-boundary-imports.grit
+++ b/scripts/grit/architecture/no-chat-workspace-boundary-imports.grit
@ -5,7 +5,6 @@ private pattern js_module_reference() {
    JsImport(),
    JsExportNamedFromClause(),
    JsExportFromClause(),
-    TsImportType(),
    JsImportCallExpression()
  }
 }
--- a/scripts/grit/architecture/no-domain-outer-layer-imports.grit
+++ b/scripts/grit/architecture/no-domain-outer-layer-imports.grit
@ -5,7 +5,6 @@ private pattern js_module_reference() {
    JsImport(),
    JsExportNamedFromClause(),
    JsExportFromClause(),
-    TsImportType(),
    JsImportCallExpression()
  }
 }
--- a/scripts/grit/architecture/no-feature-workspace-boundary-imports.grit
+++ b/scripts/grit/architecture/no-feature-workspace-boundary-imports.grit
@ -5,7 +5,6 @@ private pattern js_module_reference() {
    JsImport(),
    JsExportNamedFromClause(),
    JsExportFromClause(),
-    TsImportType(),
    JsImportCallExpression()
  }
 }
--- a/scripts/grit/architecture/no-generated-app-server-boundary-imports.grit
+++ b/scripts/grit/architecture/no-generated-app-server-boundary-imports.grit
@ -5,7 +5,6 @@ private pattern js_module_reference() {
    JsImport(),
    JsExportNamedFromClause(),
    JsExportFromClause(),
-    TsImportType(),
    JsImportCallExpression()
  }
 }
--- a/scripts/grit/architecture/no-lower-level-feature-imports.grit
+++ b/scripts/grit/architecture/no-lower-level-feature-imports.grit
@ -5,7 +5,6 @@ private pattern js_module_reference() {
    JsImport(),
    JsExportNamedFromClause(),
    JsExportFromClause(),
-    TsImportType(),
    JsImportCallExpression()
  }
 }
--- a/scripts/grit/architecture/no-preact-signal-imports.grit
+++ b/scripts/grit/architecture/no-preact-signal-imports.grit
@ -5,7 +5,6 @@ private pattern js_module_reference() {
    JsImport(),
    JsExportNamedFromClause(),
    JsExportFromClause(),
-    TsImportType(),
    JsImportCallExpression()
  }
 }
--- a/scripts/grit/architecture/no-settings-app-server-boundary-imports.grit
+++ b/scripts/grit/architecture/no-settings-app-server-boundary-imports.grit
@ -5,7 +5,6 @@ private pattern js_module_reference() {
    JsImport(),
    JsExportNamedFromClause(),
    JsExportFromClause(),
-    TsImportType(),
    JsImportCallExpression()
  }
 }
--- a/scripts/grit/architecture/no-workspace-chat-internal-imports.grit
+++ b/scripts/grit/architecture/no-workspace-chat-internal-imports.grit
@ -5,7 +5,6 @@ private pattern js_module_reference() {
    JsImport(),
    JsExportNamedFromClause(),
    JsExportFromClause(),
-    TsImportType(),
    JsImportCallExpression()
  }
 }
--- a/scripts/grit/dom/no-dom-events-imports.grit
+++ b/scripts/grit/dom/no-dom-events-imports.grit
@ -5,7 +5,6 @@ private pattern js_module_reference() {
    JsImport(),
    JsExportNamedFromClause(),
    JsExportFromClause(),
-    TsImportType(),
    JsImportCallExpression()
  }
 }
--- a/scripts/grit/dom/no-ui-root-imports.grit
+++ b/scripts/grit/dom/no-ui-root-imports.grit
@ -5,7 +5,6 @@ private pattern js_module_reference() {
    JsImport(),
    JsExportNamedFromClause(),
    JsExportFromClause(),
-    TsImportType(),
    JsImportCallExpression()
  }
 }
--- a/tests/scripts/grit-policy.test.mjs
+++ b/tests/scripts/grit-policy.test.mjs
@ -202,8 +202,10 @@ export const status = signal("idle");
    await writeFile(
      path.join(cwd, "src/shared/ui/signal-escapes.tsx"),
      `
+import type { Signal } from "@preact/signals";
 export { signal } from "@preact/signals";
-export type SignalValue = import("@preact/signals").Signal<string>;
+
+export type SignalValue = Signal<string>;

 export async function loadSignals() {
  return import("@preact/signals");
@ -340,8 +342,10 @@ export const render = renderUiRoot;
    await writeFile(
      path.join(cwd, "src/features/chat/ui/root-escapes.tsx"),
      `
+import type { RootRenderer } from "../../../shared/ui/ui-root.dom";
 export { renderUiRoot } from "../../../shared/ui/ui-root.dom";
-export type RootRenderer = import("../../../shared/ui/ui-root.dom").RootRenderer;
+
+export type { RootRenderer };

 export async function loadRoot() {
  return import("../../../shared/ui/ui-root.dom");
@ -1087,7 +1091,9 @@ async function createAppServerBoundaryPolicyReport() {
  await writeFile(
    path.join(cwd, "src/features/chat/domain/generated-thread.ts"),
    `
-export type GeneratedThread = import('../../../generated/app-server/v2/Thread').Thread;
+import type { Thread } from '../../../generated/app-server/v2/Thread';
+
+export type GeneratedThread = Thread;
 `.trimStart(),
  );
  await writeFile(
@ -1101,13 +1107,17 @@ export type GeneratedThread = Thread;
  await writeFile(
    path.join(cwd, "src/app-server/connection/generated-thread.ts"),
    `
-export type GeneratedThread = import("../../generated/app-server/v2/Thread").Thread;
+import type { Thread } from "../../generated/app-server/v2/Thread";
+
+export type GeneratedThread = Thread;
 `.trimStart(),
  );
  await writeFile(
    path.join(cwd, "tests/app-server/generated-thread.test.ts"),
    `
-export type GeneratedThread = import("../../src/generated/app-server/v2/Thread").Thread;
+import type { Thread } from "../../src/generated/app-server/v2/Thread";
+
+export type GeneratedThread = Thread;
 `.trimStart(),
  );
  await writeFile(
@ -1251,8 +1261,10 @@ export type Item = MessageStreamItem;
  await writeFile(
    path.join(cwd, "src/features/chat/domain/message-stream/outer-shapes.ts"),
    `
+import type { ChatStateStore } from "../../application/state/store";
 export { createChatStateStore } from "../../application/state/store";
-export type OuterStore = import("../../application/state/store").ChatStateStore;
+
+export type OuterStore = ChatStateStore;

 export async function loadComposer() {
  return import("src/features/chat/ui/composer");