diff --git a/packages/solid/src/adapters/valiField.ts b/packages/solid/src/adapters/valiField.ts
index 253c1f68..5665ec92 100644
--- a/packages/solid/src/adapters/valiField.ts
+++ b/packages/solid/src/adapters/valiField.ts
@@ -1,5 +1,5 @@
 import type { BaseSchema, BaseSchemaAsync } from 'valibot';
-import type { FieldValue, ValidateField, Maybe } from '../types';
+import type { FieldValue, ValidateField, Maybe } from '../types/index.js';
 
 /**
  * Creates a validation functions that parses the Valibot schema of a field.
diff --git a/packages/solid/src/adapters/valiForm.ts b/packages/solid/src/adapters/valiForm.ts
index ed31e04c..7af4ea98 100644
--- a/packages/solid/src/adapters/valiForm.ts
+++ b/packages/solid/src/adapters/valiForm.ts
@@ -4,7 +4,7 @@ import type {
   ValidateForm,
   PartialValues,
   FormErrors,
-} from '../types';
+} from '../types/index.js';
 
 /**
  * Creates a validation functions that parses the Valibot schema of a form.
diff --git a/packages/solid/src/adapters/zodField.ts b/packages/solid/src/adapters/zodField.ts
index 718f8f48..a7b0b5bc 100644
--- a/packages/solid/src/adapters/zodField.ts
+++ b/packages/solid/src/adapters/zodField.ts
@@ -1,5 +1,5 @@
 import type { ZodType } from 'zod';
-import type { FieldValue, ValidateField, Maybe } from '../types';
+import type { FieldValue, ValidateField, Maybe } from '../types/index.js';
 
 /**
  * Creates a validation functions that parses the Zod schema of a field.
diff --git a/packages/solid/src/adapters/zodForm.ts b/packages/solid/src/adapters/zodForm.ts
index 3118796d..49e93e5a 100644
--- a/packages/solid/src/adapters/zodForm.ts
+++ b/packages/solid/src/adapters/zodForm.ts
@@ -4,7 +4,7 @@ import type {
   ValidateForm,
   PartialValues,
   FormErrors,
-} from '../types';
+} from '../types/index.js';
 
 /**
  * Creates a validation functions that parses the Zod schema of a form.
diff --git a/packages/solid/src/components/Field.tsx b/packages/solid/src/components/Field.tsx
index 0388f47c..c7fce8b4 100644
--- a/packages/solid/src/components/Field.tsx
+++ b/packages/solid/src/components/Field.tsx
@@ -20,7 +20,7 @@ import type {
   ResponseData,
   TransformField,
   ValidateField,
-} from '../types';
+} from '../types/index.js';
 import {
   getElementInput,
   handleFieldEvent,
diff --git a/packages/solid/src/components/FieldArray.tsx b/packages/solid/src/components/FieldArray.tsx
index 4a4f960d..2cdd9f57 100644
--- a/packages/solid/src/components/FieldArray.tsx
+++ b/packages/solid/src/components/FieldArray.tsx
@@ -8,7 +8,7 @@ import type {
   MaybeArray,
   ResponseData,
   ValidateFieldArray,
-} from '../types';
+} from '../types/index.js';
 import { initializeFieldArrayStore } from '../utils';
 
 /**
diff --git a/packages/solid/src/components/Form.tsx b/packages/solid/src/components/Form.tsx
index 2c9155f2..b5b6ba4d 100644
--- a/packages/solid/src/components/Form.tsx
+++ b/packages/solid/src/components/Form.tsx
@@ -9,7 +9,7 @@ import type {
   Maybe,
   MaybePromise,
   ResponseData,
-} from '../types';
+} from '../types/index.js';
 
 /**
  * Value type of the submit event object.
diff --git a/packages/solid/src/exceptions/FormError.ts b/packages/solid/src/exceptions/FormError.ts
index 5d8eaa4f..96dee652 100644
--- a/packages/solid/src/exceptions/FormError.ts
+++ b/packages/solid/src/exceptions/FormError.ts
@@ -1,4 +1,4 @@
-import type { FieldValues, FormErrors, Maybe } from '../types';
+import type { FieldValues, FormErrors, Maybe } from '../types/index.js';
 
 /**
  * An explicit form error with useful information for the user.
diff --git a/packages/solid/src/index.ts b/packages/solid/src/index.ts
index af34d4dc..c5c0add4 100644
--- a/packages/solid/src/index.ts
+++ b/packages/solid/src/index.ts
@@ -1,8 +1,8 @@
-export * from './adapters';
-export * from './components';
-export * from './exceptions';
-export * from './methods';
-export { createForm, createFormStore } from './primitives';
-export * from './transformation';
-export * from './types';
-export * from './validation';
+export * from './adapters/index.js';
+export * from './components/index.js';
+export * from './exceptions/index.js';
+export * from './methods/index.js';
+export { createForm, createFormStore } from './primitives/index.js';
+export * from './transformation/index.js';
+export * from './types/index.js';
+export * from './validation/index.js';
diff --git a/packages/solid/src/methods/clearError.ts b/packages/solid/src/methods/clearError.ts
index 134555bf..07b28dea 100644
--- a/packages/solid/src/methods/clearError.ts
+++ b/packages/solid/src/methods/clearError.ts
@@ -5,7 +5,7 @@ import type {
   FieldPath,
   FieldArrayPath,
   Maybe,
-} from '../types';
+} from '../types/index.js';
 import { setError, type SetErrorOptions } from './setError';
 
 /**
diff --git a/packages/solid/src/methods/clearResponse.ts b/packages/solid/src/methods/clearResponse.ts
index a9678e78..cfe3b31b 100644
--- a/packages/solid/src/methods/clearResponse.ts
+++ b/packages/solid/src/methods/clearResponse.ts
@@ -1,4 +1,4 @@
-import type { FieldValues, FormStore, ResponseData } from '../types';
+import type { FieldValues, FormStore, ResponseData } from '../types/index.js';
 
 /**
  * Clears the response of the form.
diff --git a/packages/solid/src/methods/focus.ts b/packages/solid/src/methods/focus.ts
index 1f15f97b..ec88a393 100644
--- a/packages/solid/src/methods/focus.ts
+++ b/packages/solid/src/methods/focus.ts
@@ -1,5 +1,5 @@
 import { untrack } from 'solid-js';
-import type { FieldPath, FieldValues, FormStore, ResponseData } from '../types';
+import type { FieldPath, FieldValues, FormStore, ResponseData } from '../types/index.js';
 import { getFieldStore } from '../utils';
 
 /**
diff --git a/packages/solid/src/methods/getError.ts b/packages/solid/src/methods/getError.ts
index a67e5e3a..8abf5af6 100644
--- a/packages/solid/src/methods/getError.ts
+++ b/packages/solid/src/methods/getError.ts
@@ -5,7 +5,7 @@ import type {
   FormStore,
   Maybe,
   ResponseData,
-} from '../types';
+} from '../types/index.js';
 import { getFieldStore, getFieldArrayStore } from '../utils';
 
 /**
diff --git a/packages/solid/src/methods/getErrors.ts b/packages/solid/src/methods/getErrors.ts
index 2098acb1..1185e9d4 100644
--- a/packages/solid/src/methods/getErrors.ts
+++ b/packages/solid/src/methods/getErrors.ts
@@ -6,7 +6,7 @@ import type {
   FormStore,
   Maybe,
   ResponseData,
-} from '../types';
+} from '../types/index.js';
 import {
   getFieldArrayStore,
   getFieldStore,
diff --git a/packages/solid/src/methods/getValue.ts b/packages/solid/src/methods/getValue.ts
index 21599618..69a99656 100644
--- a/packages/solid/src/methods/getValue.ts
+++ b/packages/solid/src/methods/getValue.ts
@@ -5,7 +5,7 @@ import type {
   FormStore,
   Maybe,
   ResponseData,
-} from '../types';
+} from '../types/index.js';
 import { initializeFieldStore } from '../utils';
 
 /**
diff --git a/packages/solid/src/methods/getValues.ts b/packages/solid/src/methods/getValues.ts
index 090cd271..7f82f602 100644
--- a/packages/solid/src/methods/getValues.ts
+++ b/packages/solid/src/methods/getValues.ts
@@ -7,7 +7,7 @@ import type {
   Maybe,
   PartialValues,
   ResponseData,
-} from '../types';
+} from '../types/index.js';
 import {
   getFieldArrayStore,
   getFieldStore,
diff --git a/packages/solid/src/methods/hasField.ts b/packages/solid/src/methods/hasField.ts
index 3d4ec326..de8f657f 100644
--- a/packages/solid/src/methods/hasField.ts
+++ b/packages/solid/src/methods/hasField.ts
@@ -5,7 +5,7 @@ import type {
   FormStore,
   Maybe,
   ResponseData,
-} from '../types';
+} from '../types/index.js';
 import { getFieldStore } from '../utils';
 
 /**
diff --git a/packages/solid/src/methods/hasFieldArray.ts b/packages/solid/src/methods/hasFieldArray.ts
index 9fae30d8..3352a93d 100644
--- a/packages/solid/src/methods/hasFieldArray.ts
+++ b/packages/solid/src/methods/hasFieldArray.ts
@@ -5,7 +5,7 @@ import type {
   FormStore,
   Maybe,
   ResponseData,
-} from '../types';
+} from '../types/index.js';
 import { getFieldArrayStore } from '../utils';
 
 /**
diff --git a/packages/solid/src/methods/insert.ts b/packages/solid/src/methods/insert.ts
index 90f687e7..3167d0ca 100644
--- a/packages/solid/src/methods/insert.ts
+++ b/packages/solid/src/methods/insert.ts
@@ -6,7 +6,7 @@ import type {
   FormStore,
   Maybe,
   ResponseData,
-} from '../types';
+} from '../types/index.js';
 import {
   getFieldArrayStore,
   getFieldArrayState,
diff --git a/packages/solid/src/methods/move.ts b/packages/solid/src/methods/move.ts
index 6fe8638a..32b756e0 100644
--- a/packages/solid/src/methods/move.ts
+++ b/packages/solid/src/methods/move.ts
@@ -7,7 +7,7 @@ import type {
   RawFieldArrayState,
   RawFieldState,
   ResponseData,
-} from '../types';
+} from '../types/index.js';
 import {
   getFieldArrayNames,
   getFieldArrayState,
diff --git a/packages/solid/src/methods/remove.ts b/packages/solid/src/methods/remove.ts
index 9c711875..05fecac9 100644
--- a/packages/solid/src/methods/remove.ts
+++ b/packages/solid/src/methods/remove.ts
@@ -4,7 +4,7 @@ import type {
   FieldValues,
   FormStore,
   ResponseData,
-} from '../types';
+} from '../types/index.js';
 import {
   getFieldArrayNames,
   getFieldArrayState,
diff --git a/packages/solid/src/methods/replace.ts b/packages/solid/src/methods/replace.ts
index 4b7160bb..1ab94114 100644
--- a/packages/solid/src/methods/replace.ts
+++ b/packages/solid/src/methods/replace.ts
@@ -5,7 +5,7 @@ import type {
   FieldValues,
   FormStore,
   ResponseData,
-} from '../types';
+} from '../types/index.js';
 import { getFieldArrayStore, getUniqueId, setFieldArrayValue } from '../utils';
 
 /**
diff --git a/packages/solid/src/methods/reset.ts b/packages/solid/src/methods/reset.ts
index 1896cc2e..be20bc58 100644
--- a/packages/solid/src/methods/reset.ts
+++ b/packages/solid/src/methods/reset.ts
@@ -8,7 +8,7 @@ import type {
   Maybe,
   FieldArrayPath,
   PartialValues,
-} from '../types';
+} from '../types/index.js';
 import {
   getFilteredNames,
   getOptions,
diff --git a/packages/solid/src/methods/setError.ts b/packages/solid/src/methods/setError.ts
index c0b63bb0..9831290f 100644
--- a/packages/solid/src/methods/setError.ts
+++ b/packages/solid/src/methods/setError.ts
@@ -6,7 +6,7 @@ import type {
   FieldPath,
   FieldArrayPath,
   Maybe,
-} from '../types';
+} from '../types/index.js';
 import { getFieldArrayStore, getFieldStore, updateFormInvalid } from '../utils';
 import { focus } from './focus';
 
diff --git a/packages/solid/src/methods/setResponse.ts b/packages/solid/src/methods/setResponse.ts
index c6e79e06..5f2de755 100644
--- a/packages/solid/src/methods/setResponse.ts
+++ b/packages/solid/src/methods/setResponse.ts
@@ -5,7 +5,7 @@ import type {
   FormStore,
   Maybe,
   ResponseData,
-} from '../types';
+} from '../types/index.js';
 
 /**
  * Value type of the set response options.
diff --git a/packages/solid/src/methods/setValue.ts b/packages/solid/src/methods/setValue.ts
index 5f054fce..2ce19ce7 100644
--- a/packages/solid/src/methods/setValue.ts
+++ b/packages/solid/src/methods/setValue.ts
@@ -6,7 +6,7 @@ import type {
   FormStore,
   Maybe,
   ResponseData,
-} from '../types';
+} from '../types/index.js';
 import {
   initializeFieldStore,
   updateFieldDirty,
diff --git a/packages/solid/src/methods/setValues.ts b/packages/solid/src/methods/setValues.ts
index e620700e..117ecd80 100644
--- a/packages/solid/src/methods/setValues.ts
+++ b/packages/solid/src/methods/setValues.ts
@@ -8,7 +8,7 @@ import type {
   Maybe,
   PartialValues,
   ResponseData,
-} from '../types';
+} from '../types/index.js';
 import { getUniqueId, initializeFieldArrayStore } from '../utils';
 import { setValue } from './setValue';
 import { validate } from './validate';
diff --git a/packages/solid/src/methods/submit.ts b/packages/solid/src/methods/submit.ts
index 96a81f51..cc09d80b 100644
--- a/packages/solid/src/methods/submit.ts
+++ b/packages/solid/src/methods/submit.ts
@@ -1,5 +1,5 @@
 import { untrack } from 'solid-js';
-import type { FieldValues, FormStore, ResponseData } from '../types';
+import type { FieldValues, FormStore, ResponseData } from '../types/index.js';
 
 /**
  * Validates and submits the form.
diff --git a/packages/solid/src/methods/swap.ts b/packages/solid/src/methods/swap.ts
index dcfd6159..1cfd12db 100644
--- a/packages/solid/src/methods/swap.ts
+++ b/packages/solid/src/methods/swap.ts
@@ -7,7 +7,7 @@ import type {
   RawFieldArrayState,
   RawFieldState,
   ResponseData,
-} from '../types';
+} from '../types/index.js';
 import {
   getFieldArrayNames,
   getFieldArrayState,
diff --git a/packages/solid/src/methods/validate.ts b/packages/solid/src/methods/validate.ts
index cec28a75..5d59ced7 100644
--- a/packages/solid/src/methods/validate.ts
+++ b/packages/solid/src/methods/validate.ts
@@ -7,7 +7,7 @@ import type {
   FieldPath,
   FieldArrayPath,
   FormErrors,
-} from '../types';
+} from '../types/index.js';
 import {
   getFilteredNames,
   getOptions,
diff --git a/packages/solid/src/primitives/createForm.ts b/packages/solid/src/primitives/createForm.ts
index d27b69c4..f2110dca 100644
--- a/packages/solid/src/primitives/createForm.ts
+++ b/packages/solid/src/primitives/createForm.ts
@@ -11,7 +11,7 @@ import type {
   MaybeValue,
   PartialKey,
   ResponseData,
-} from '../types';
+} from '../types/index.js';
 import { createFormStore } from './createFormStore';
 
 /**
diff --git a/packages/solid/src/primitives/createFormStore.ts b/packages/solid/src/primitives/createFormStore.ts
index 3d7424e6..71f7e53c 100644
--- a/packages/solid/src/primitives/createFormStore.ts
+++ b/packages/solid/src/primitives/createFormStore.ts
@@ -7,7 +7,7 @@ import type {
   FormStore,
   PartialValues,
   ResponseData,
-} from '../types';
+} from '../types/index.js';
 import { createSignal } from './createSignal';
 
 /**
diff --git a/packages/solid/src/primitives/createLifecycle.ts b/packages/solid/src/primitives/createLifecycle.ts
index c45cea7c..116e4074 100644
--- a/packages/solid/src/primitives/createLifecycle.ts
+++ b/packages/solid/src/primitives/createLifecycle.ts
@@ -14,7 +14,7 @@ import type {
   TransformField,
   ValidateField,
   ValidateFieldArray,
-} from '../types';
+} from '../types/index.js';
 import { getUniqueId, updateFormState } from '../utils';
 
 /**
diff --git a/packages/solid/src/primitives/index.ts b/packages/solid/src/primitives/index.ts
index 87b2b463..62822b45 100644
--- a/packages/solid/src/primitives/index.ts
+++ b/packages/solid/src/primitives/index.ts
@@ -1,4 +1,4 @@
-export * from './createForm';
-export * from './createFormStore';
-export * from './createLifecycle';
-export * from './createSignal';
+export * from './createForm.js';
+export * from './createFormStore.js';
+export * from './createLifecycle.js';
+export * from './createSignal.js';
diff --git a/packages/solid/src/transformation/index.ts b/packages/solid/src/transformation/index.ts
index 48cc3f8d..1bde5854 100644
--- a/packages/solid/src/transformation/index.ts
+++ b/packages/solid/src/transformation/index.ts
@@ -1,4 +1,4 @@
-export * from './toCustom';
-export * from './toLowerCase';
-export * from './toTrimmed';
-export * from './toUpperCase';
+export * from './toCustom.js';
+export * from './toLowerCase.js';
+export * from './toTrimmed.js';
+export * from './toUpperCase.js';
diff --git a/packages/solid/src/transformation/toCustom.ts b/packages/solid/src/transformation/toCustom.ts
index f5f10661..1c57b0d0 100644
--- a/packages/solid/src/transformation/toCustom.ts
+++ b/packages/solid/src/transformation/toCustom.ts
@@ -1,4 +1,4 @@
-import type { FieldEvent, FieldValue, Maybe, TransformField } from '../types';
+import type { FieldEvent, FieldValue, Maybe, TransformField } from '../types/index.js';
 
 /**
  * Value type of the transform mode.
diff --git a/packages/solid/src/transformation/toLowerCase.ts b/packages/solid/src/transformation/toLowerCase.ts
index 0dcab330..b08e92f3 100644
--- a/packages/solid/src/transformation/toLowerCase.ts
+++ b/packages/solid/src/transformation/toLowerCase.ts
@@ -1,4 +1,4 @@
-import type { Maybe, MaybeValue, TransformField } from '../types';
+import type { Maybe, MaybeValue, TransformField } from '../types/index.js';
 import { toCustom, type TransformOptions } from './toCustom';
 
 /**
diff --git a/packages/solid/src/transformation/toTrimmed.ts b/packages/solid/src/transformation/toTrimmed.ts
index 7910cfe4..2461fed3 100644
--- a/packages/solid/src/transformation/toTrimmed.ts
+++ b/packages/solid/src/transformation/toTrimmed.ts
@@ -1,4 +1,4 @@
-import type { Maybe, MaybeValue, TransformField } from '../types';
+import type { Maybe, MaybeValue, TransformField } from '../types/index.js';
 import { toCustom, type TransformOptions } from './toCustom';
 
 /**
diff --git a/packages/solid/src/transformation/toUpperCase.ts b/packages/solid/src/transformation/toUpperCase.ts
index 8449c53e..4555eec3 100644
--- a/packages/solid/src/transformation/toUpperCase.ts
+++ b/packages/solid/src/transformation/toUpperCase.ts
@@ -1,4 +1,4 @@
-import type { Maybe, MaybeValue, TransformField } from '../types';
+import type { Maybe, MaybeValue, TransformField } from '../types/index.js';
 import { toCustom, type TransformOptions } from './toCustom';
 
 /**
diff --git a/packages/solid/src/types/index.ts b/packages/solid/src/types/index.ts
index e9ed06ad..0913bdb2 100644
--- a/packages/solid/src/types/index.ts
+++ b/packages/solid/src/types/index.ts
@@ -1,5 +1,5 @@
-export * from './field';
-export * from './fieldArray';
-export * from './form';
-export * from './path';
-export * from './utils';
+export * from './field.js';
+export * from './fieldArray.js';
+export * from './form.js';
+export * from './path.js';
+export * from './utils.js';
diff --git a/packages/solid/src/utils/getElementInput.ts b/packages/solid/src/utils/getElementInput.ts
index 816f82f9..806d03c1 100644
--- a/packages/solid/src/utils/getElementInput.ts
+++ b/packages/solid/src/utils/getElementInput.ts
@@ -7,7 +7,7 @@ import type {
   FieldValues,
   InternalFieldStore,
   Maybe,
-} from '../types';
+} from '../types/index.js';
 
 /**
  * Returns the current input of the element.
diff --git a/packages/solid/src/utils/getFieldAndArrayStores.ts b/packages/solid/src/utils/getFieldAndArrayStores.ts
index bac64291..33ec25d0 100644
--- a/packages/solid/src/utils/getFieldAndArrayStores.ts
+++ b/packages/solid/src/utils/getFieldAndArrayStores.ts
@@ -5,7 +5,7 @@ import type {
   InternalFieldArrayStore,
   InternalFieldStore,
   ResponseData,
-} from '../types';
+} from '../types/index.js';
 
 /**
  * Returns a tuple with all field and field array stores of a form.
diff --git a/packages/solid/src/utils/getFieldArrayNames.ts b/packages/solid/src/utils/getFieldArrayNames.ts
index e1a419a4..3bcf299b 100644
--- a/packages/solid/src/utils/getFieldArrayNames.ts
+++ b/packages/solid/src/utils/getFieldArrayNames.ts
@@ -5,7 +5,7 @@ import type {
   FieldArrayPath,
   FormStore,
   Maybe,
-} from '../types';
+} from '../types/index.js';
 import { removeInvalidNames } from './removeInvalidNames';
 
 /**
diff --git a/packages/solid/src/utils/getFieldArrayState.ts b/packages/solid/src/utils/getFieldArrayState.ts
index 15c4e3c4..b0d887cf 100644
--- a/packages/solid/src/utils/getFieldArrayState.ts
+++ b/packages/solid/src/utils/getFieldArrayState.ts
@@ -6,7 +6,7 @@ import type {
   Maybe,
   RawFieldArrayState,
   ResponseData,
-} from '../types';
+} from '../types/index.js';
 import { getFieldArrayStore } from './getFieldArrayStore';
 
 /**
diff --git a/packages/solid/src/utils/getFieldArrayStore.ts b/packages/solid/src/utils/getFieldArrayStore.ts
index bbd460ae..f992e3d1 100644
--- a/packages/solid/src/utils/getFieldArrayStore.ts
+++ b/packages/solid/src/utils/getFieldArrayStore.ts
@@ -5,7 +5,7 @@ import type {
   InternalFieldArrayStore,
   Maybe,
   ResponseData,
-} from '../types';
+} from '../types/index.js';
 
 /**
  * Returns the store of a field array.
diff --git a/packages/solid/src/utils/getFieldNames.ts b/packages/solid/src/utils/getFieldNames.ts
index 49498e73..243519e9 100644
--- a/packages/solid/src/utils/getFieldNames.ts
+++ b/packages/solid/src/utils/getFieldNames.ts
@@ -5,7 +5,7 @@ import type {
   FormStore,
   Maybe,
   ResponseData,
-} from '../types';
+} from '../types/index.js';
 import { removeInvalidNames } from './removeInvalidNames';
 
 /**
diff --git a/packages/solid/src/utils/getFieldState.ts b/packages/solid/src/utils/getFieldState.ts
index 332a8540..5a3abbf2 100644
--- a/packages/solid/src/utils/getFieldState.ts
+++ b/packages/solid/src/utils/getFieldState.ts
@@ -6,7 +6,7 @@ import type {
   Maybe,
   RawFieldState,
   ResponseData,
-} from '../types';
+} from '../types/index.js';
 import { getFieldStore } from './getFieldStore';
 
 /**
diff --git a/packages/solid/src/utils/getFieldStore.ts b/packages/solid/src/utils/getFieldStore.ts
index c7ca2ef0..49752290 100644
--- a/packages/solid/src/utils/getFieldStore.ts
+++ b/packages/solid/src/utils/getFieldStore.ts
@@ -5,7 +5,7 @@ import type {
   InternalFieldStore,
   Maybe,
   ResponseData,
-} from '../types';
+} from '../types/index.js';
 
 /**
  * Returns the store of a field.
diff --git a/packages/solid/src/utils/getFilteredNames.ts b/packages/solid/src/utils/getFilteredNames.ts
index 3c685ef8..701d5ed6 100644
--- a/packages/solid/src/utils/getFilteredNames.ts
+++ b/packages/solid/src/utils/getFilteredNames.ts
@@ -6,7 +6,7 @@ import type {
   FormStore,
   Maybe,
   ResponseData,
-} from '../types';
+} from '../types/index.js';
 import { getFieldArrayNames } from './getFieldArrayNames';
 import { getFieldNames } from './getFieldNames';
 
diff --git a/packages/solid/src/utils/getPathIndex.ts b/packages/solid/src/utils/getPathIndex.ts
index 7d9e1c46..94f47629 100644
--- a/packages/solid/src/utils/getPathIndex.ts
+++ b/packages/solid/src/utils/getPathIndex.ts
@@ -1,4 +1,4 @@
-import type { FieldArrayPath, FieldPath, FieldValues } from '../types';
+import type { FieldArrayPath, FieldPath, FieldValues } from '../types/index.js';
 
 /**
  * Returns the index of the path in the field array.
diff --git a/packages/solid/src/utils/getPathValue.ts b/packages/solid/src/utils/getPathValue.ts
index fd263ab3..7bbf1c29 100644
--- a/packages/solid/src/utils/getPathValue.ts
+++ b/packages/solid/src/utils/getPathValue.ts
@@ -6,7 +6,7 @@ import type {
   FieldValues,
   Maybe,
   PartialValues,
-} from '../types';
+} from '../types/index.js';
 
 /**
  * Returns the value of a dot path in an object.
diff --git a/packages/solid/src/utils/handleFieldEvent.ts b/packages/solid/src/utils/handleFieldEvent.ts
index 3a0191e5..36997dd9 100644
--- a/packages/solid/src/utils/handleFieldEvent.ts
+++ b/packages/solid/src/utils/handleFieldEvent.ts
@@ -8,7 +8,7 @@ import type {
   InternalFieldStore,
   ResponseData,
   ValidationMode,
-} from '../types';
+} from '../types/index.js';
 import { updateFieldDirty } from './updateFieldDirty';
 import { validateIfRequired } from './validateIfRequired';
 
diff --git a/packages/solid/src/utils/index.ts b/packages/solid/src/utils/index.ts
index 4b8019a1..a947f3ae 100644
--- a/packages/solid/src/utils/index.ts
+++ b/packages/solid/src/utils/index.ts
@@ -1,29 +1,29 @@
-export * from './getElementInput';
-export * from './getFieldAndArrayStores';
-export * from './getFieldArrayNames';
-export * from './getFieldArrayState';
-export * from './getFieldArrayStore';
-export * from './getFieldNames';
-export * from './getFieldState';
-export * from './getFieldStore';
-export * from './getFilteredNames';
-export * from './getOptions';
-export * from './getPathIndex';
-export * from './getPathValue';
-export * from './getUniqueId';
-export * from './handleFieldEvent';
-export * from './initializeFieldArrayStore';
-export * from './initializeFieldStore';
-export * from './isFieldDirty';
-export * from './removeInvalidNames';
-export * from './setErrorResponse';
-export * from './setFieldArrayState';
-export * from './setFieldArrayValue';
-export * from './setFieldState';
-export * from './sortArrayPathIndex';
-export * from './updateFieldArrayDirty';
-export * from './updateFieldDirty';
-export * from './updateFormDirty';
-export * from './updateFormInvalid';
-export * from './updateFormState';
-export * from './validateIfRequired';
+export * from './getElementInput.js';
+export * from './getFieldAndArrayStores.js';
+export * from './getFieldArrayNames.js';
+export * from './getFieldArrayState.js';
+export * from './getFieldArrayStore.js';
+export * from './getFieldNames.js';
+export * from './getFieldState.js';
+export * from './getFieldStore.js';
+export * from './getFilteredNames.js';
+export * from './getOptions.js';
+export * from './getPathIndex.js';
+export * from './getPathValue.js';
+export * from './getUniqueId.js';
+export * from './handleFieldEvent.js';
+export * from './initializeFieldArrayStore.js';
+export * from './initializeFieldStore.js';
+export * from './isFieldDirty.js';
+export * from './removeInvalidNames.js';
+export * from './setErrorResponse.js';
+export * from './setFieldArrayState.js';
+export * from './setFieldArrayValue.js';
+export * from './setFieldState.js';
+export * from './sortArrayPathIndex.js';
+export * from './updateFieldArrayDirty.js';
+export * from './updateFieldDirty.js';
+export * from './updateFormDirty.js';
+export * from './updateFormInvalid.js';
+export * from './updateFormState.js';
+export * from './validateIfRequired.js';
diff --git a/packages/solid/src/utils/initializeFieldArrayStore.ts b/packages/solid/src/utils/initializeFieldArrayStore.ts
index 776926a1..e4c11158 100644
--- a/packages/solid/src/utils/initializeFieldArrayStore.ts
+++ b/packages/solid/src/utils/initializeFieldArrayStore.ts
@@ -5,7 +5,7 @@ import type {
   FormStore,
   InternalFieldArrayStore,
   ResponseData,
-} from '../types';
+} from '../types/index.js';
 import { getFieldArrayStore } from './getFieldArrayStore';
 import { getPathValue } from './getPathValue';
 import { getUniqueId } from './getUniqueId';
diff --git a/packages/solid/src/utils/initializeFieldStore.ts b/packages/solid/src/utils/initializeFieldStore.ts
index 76a9064a..ce50c0ca 100644
--- a/packages/solid/src/utils/initializeFieldStore.ts
+++ b/packages/solid/src/utils/initializeFieldStore.ts
@@ -8,7 +8,7 @@ import type {
   InternalFieldStore,
   Maybe,
   ResponseData,
-} from '../types';
+} from '../types/index.js';
 import { getFieldStore } from './getFieldStore';
 import { getPathValue } from './getPathValue';
 
diff --git a/packages/solid/src/utils/isFieldDirty.ts b/packages/solid/src/utils/isFieldDirty.ts
index ba5976ab..8825accc 100644
--- a/packages/solid/src/utils/isFieldDirty.ts
+++ b/packages/solid/src/utils/isFieldDirty.ts
@@ -1,4 +1,4 @@
-import type { FieldValue, Maybe } from '../types';
+import type { FieldValue, Maybe } from '../types/index.js';
 
 /**
  * Returns whether the field is dirty.
diff --git a/packages/solid/src/utils/removeInvalidNames.ts b/packages/solid/src/utils/removeInvalidNames.ts
index 0eb57396..41dd8bdc 100644
--- a/packages/solid/src/utils/removeInvalidNames.ts
+++ b/packages/solid/src/utils/removeInvalidNames.ts
@@ -5,7 +5,7 @@ import type {
   FieldValues,
   FormStore,
   ResponseData,
-} from '../types';
+} from '../types/index.js';
 import { getFieldArrayNames } from './getFieldArrayNames';
 import { getFieldArrayStore } from './getFieldArrayStore';
 import { getPathIndex } from './getPathIndex';
diff --git a/packages/solid/src/utils/setErrorResponse.ts b/packages/solid/src/utils/setErrorResponse.ts
index a9dbeaf3..d2ffa773 100644
--- a/packages/solid/src/utils/setErrorResponse.ts
+++ b/packages/solid/src/utils/setErrorResponse.ts
@@ -7,7 +7,7 @@ import type {
   FormStore,
   Maybe,
   ResponseData,
-} from '../types';
+} from '../types/index.js';
 import { getFieldArrayStore } from './getFieldArrayStore';
 import { getFieldStore } from './getFieldStore';
 
diff --git a/packages/solid/src/utils/setFieldArrayState.ts b/packages/solid/src/utils/setFieldArrayState.ts
index b1bef057..ddc1bc64 100644
--- a/packages/solid/src/utils/setFieldArrayState.ts
+++ b/packages/solid/src/utils/setFieldArrayState.ts
@@ -4,7 +4,7 @@ import type {
   FormStore,
   RawFieldArrayState,
   ResponseData,
-} from '../types';
+} from '../types/index.js';
 import { initializeFieldArrayStore } from './initializeFieldArrayStore';
 
 /**
diff --git a/packages/solid/src/utils/setFieldArrayValue.ts b/packages/solid/src/utils/setFieldArrayValue.ts
index 7860661d..eb6c2269 100644
--- a/packages/solid/src/utils/setFieldArrayValue.ts
+++ b/packages/solid/src/utils/setFieldArrayValue.ts
@@ -6,7 +6,7 @@ import type {
   FieldValues,
   FormStore,
   ResponseData,
-} from '../types';
+} from '../types/index.js';
 import { getUniqueId } from './getUniqueId';
 import { setFieldArrayState } from './setFieldArrayState';
 import { setFieldState } from './setFieldState';
diff --git a/packages/solid/src/utils/setFieldState.ts b/packages/solid/src/utils/setFieldState.ts
index 137d4eff..48e63d77 100644
--- a/packages/solid/src/utils/setFieldState.ts
+++ b/packages/solid/src/utils/setFieldState.ts
@@ -4,7 +4,7 @@ import type {
   FormStore,
   RawFieldState,
   ResponseData,
-} from '../types';
+} from '../types/index.js';
 import { initializeFieldStore } from './initializeFieldStore';
 
 /**
diff --git a/packages/solid/src/utils/sortArrayPathIndex.ts b/packages/solid/src/utils/sortArrayPathIndex.ts
index cc5e1dba..5a509351 100644
--- a/packages/solid/src/utils/sortArrayPathIndex.ts
+++ b/packages/solid/src/utils/sortArrayPathIndex.ts
@@ -1,4 +1,4 @@
-import type { FieldArrayPath, FieldPath, FieldValues } from '../types';
+import type { FieldArrayPath, FieldPath, FieldValues } from '../types/index.js';
 import { getPathIndex } from '../utils';
 
 /**
diff --git a/packages/solid/src/utils/updateFieldArrayDirty.ts b/packages/solid/src/utils/updateFieldArrayDirty.ts
index 5d3c99cc..39bfaacb 100644
--- a/packages/solid/src/utils/updateFieldArrayDirty.ts
+++ b/packages/solid/src/utils/updateFieldArrayDirty.ts
@@ -4,7 +4,7 @@ import type {
   FieldValues,
   FormStore,
   ResponseData,
-} from '../types';
+} from '../types/index.js';
 import { updateFormDirty } from './updateFormDirty';
 
 /**
diff --git a/packages/solid/src/utils/updateFieldDirty.ts b/packages/solid/src/utils/updateFieldDirty.ts
index 93a19fd2..2f403efe 100644
--- a/packages/solid/src/utils/updateFieldDirty.ts
+++ b/packages/solid/src/utils/updateFieldDirty.ts
@@ -7,7 +7,7 @@ import type {
   InternalFieldStore,
   Maybe,
   ResponseData,
-} from '../types';
+} from '../types/index.js';
 import { isFieldDirty } from './isFieldDirty';
 import { updateFormDirty } from './updateFormDirty';
 
diff --git a/packages/solid/src/utils/updateFormDirty.ts b/packages/solid/src/utils/updateFormDirty.ts
index e96d00a8..2ec850c5 100644
--- a/packages/solid/src/utils/updateFormDirty.ts
+++ b/packages/solid/src/utils/updateFormDirty.ts
@@ -1,5 +1,5 @@
 import { untrack } from 'solid-js';
-import type { FieldValues, FormStore, Maybe, ResponseData } from '../types';
+import type { FieldValues, FormStore, Maybe, ResponseData } from '../types/index.js';
 import { getFieldAndArrayStores } from './getFieldAndArrayStores';
 
 /**
diff --git a/packages/solid/src/utils/updateFormInvalid.ts b/packages/solid/src/utils/updateFormInvalid.ts
index 1098ecd9..dd0a13ca 100644
--- a/packages/solid/src/utils/updateFormInvalid.ts
+++ b/packages/solid/src/utils/updateFormInvalid.ts
@@ -1,5 +1,5 @@
 import { untrack } from 'solid-js';
-import type { FieldValues, FormStore, Maybe, ResponseData } from '../types';
+import type { FieldValues, FormStore, Maybe, ResponseData } from '../types/index.js';
 import { getFieldAndArrayStores } from './getFieldAndArrayStores';
 
 /**
diff --git a/packages/solid/src/utils/updateFormState.ts b/packages/solid/src/utils/updateFormState.ts
index 073c5e15..64a7584f 100644
--- a/packages/solid/src/utils/updateFormState.ts
+++ b/packages/solid/src/utils/updateFormState.ts
@@ -1,5 +1,5 @@
 import { batch, untrack } from 'solid-js';
-import type { FieldValues, FormStore, ResponseData } from '../types';
+import type { FieldValues, FormStore, ResponseData } from '../types/index.js';
 import { getFieldAndArrayStores } from './getFieldAndArrayStores';
 
 /**
diff --git a/packages/solid/src/utils/validateIfRequired.ts b/packages/solid/src/utils/validateIfRequired.ts
index 8c001144..90cdecbe 100644
--- a/packages/solid/src/utils/validateIfRequired.ts
+++ b/packages/solid/src/utils/validateIfRequired.ts
@@ -9,7 +9,7 @@ import type {
   Maybe,
   ResponseData,
   ValidationMode,
-} from '../types';
+} from '../types/index.js';
 import { validate } from '../methods';
 
 /**
diff --git a/packages/solid/src/validation/custom.ts b/packages/solid/src/validation/custom.ts
index 18cf4f61..1f29d3ed 100644
--- a/packages/solid/src/validation/custom.ts
+++ b/packages/solid/src/validation/custom.ts
@@ -1,4 +1,4 @@
-import type { FieldValue, Maybe, MaybePromise } from '../types';
+import type { FieldValue, Maybe, MaybePromise } from '../types/index.js';
 
 /**
  * Creates a custom validation function.
diff --git a/packages/solid/src/validation/email.ts b/packages/solid/src/validation/email.ts
index 677c2608..8e869d01 100644
--- a/packages/solid/src/validation/email.ts
+++ b/packages/solid/src/validation/email.ts
@@ -1,4 +1,4 @@
-import type { MaybeValue } from '../types';
+import type { MaybeValue } from '../types/index.js';
 
 type Value = MaybeValue<string>;
 
diff --git a/packages/solid/src/validation/index.ts b/packages/solid/src/validation/index.ts
index f9786e76..5abd2fff 100644
--- a/packages/solid/src/validation/index.ts
+++ b/packages/solid/src/validation/index.ts
@@ -1,15 +1,15 @@
-export * from './custom';
-export * from './email';
-export * from './maxLength';
-export * from './maxRange';
-export * from './maxSize';
-export * from './maxTotalSize';
-export * from './mimeType';
-export * from './minLength';
-export * from './minRange';
-export * from './minSize';
-export * from './minTotalSize';
-export * from './pattern';
-export * from './required';
-export * from './url';
-export * from './value';
+export * from './custom.js';
+export * from './email.js';
+export * from './maxLength.js';
+export * from './maxRange.js';
+export * from './maxSize.js';
+export * from './maxTotalSize.js';
+export * from './mimeType.js';
+export * from './minLength.js';
+export * from './minRange.js';
+export * from './minSize.js';
+export * from './minTotalSize.js';
+export * from './pattern.js';
+export * from './required.js';
+export * from './url.js';
+export * from './value.js';
diff --git a/packages/solid/src/validation/maxLength.ts b/packages/solid/src/validation/maxLength.ts
index c915727c..fbd4b784 100644
--- a/packages/solid/src/validation/maxLength.ts
+++ b/packages/solid/src/validation/maxLength.ts
@@ -1,4 +1,4 @@
-import type { MaybeValue } from '../types';
+import type { MaybeValue } from '../types/index.js';
 
 type Value = MaybeValue<string | string[] | number[] | File[]>;
 
diff --git a/packages/solid/src/validation/maxRange.ts b/packages/solid/src/validation/maxRange.ts
index 6442ec86..3426bdff 100644
--- a/packages/solid/src/validation/maxRange.ts
+++ b/packages/solid/src/validation/maxRange.ts
@@ -1,4 +1,4 @@
-import type { MaybeValue } from '../types';
+import type { MaybeValue } from '../types/index.js';
 
 type Value = MaybeValue<string | number | Date>;
 
diff --git a/packages/solid/src/validation/maxSize.ts b/packages/solid/src/validation/maxSize.ts
index 64caa275..566b4991 100644
--- a/packages/solid/src/validation/maxSize.ts
+++ b/packages/solid/src/validation/maxSize.ts
@@ -1,4 +1,4 @@
-import type { MaybeValue } from '../types';
+import type { MaybeValue } from '../types/index.js';
 
 type Value = MaybeValue<File | File[]>;
 
diff --git a/packages/solid/src/validation/maxTotalSize.ts b/packages/solid/src/validation/maxTotalSize.ts
index a3ae52cb..881b39f5 100644
--- a/packages/solid/src/validation/maxTotalSize.ts
+++ b/packages/solid/src/validation/maxTotalSize.ts
@@ -1,4 +1,4 @@
-import type { MaybeValue } from '../types';
+import type { MaybeValue } from '../types/index.js';
 
 type Value = MaybeValue<File[]>;
 
diff --git a/packages/solid/src/validation/mimeType.ts b/packages/solid/src/validation/mimeType.ts
index c5919d9b..038856af 100644
--- a/packages/solid/src/validation/mimeType.ts
+++ b/packages/solid/src/validation/mimeType.ts
@@ -1,4 +1,4 @@
-import type { MaybeValue } from '../types';
+import type { MaybeValue } from '../types/index.js';
 
 type Value = MaybeValue<File | File[]>;
 
diff --git a/packages/solid/src/validation/minLength.ts b/packages/solid/src/validation/minLength.ts
index 4ff30929..593d68a4 100644
--- a/packages/solid/src/validation/minLength.ts
+++ b/packages/solid/src/validation/minLength.ts
@@ -1,4 +1,4 @@
-import type { MaybeValue } from '../types';
+import type { MaybeValue } from '../types/index.js';
 
 type Value = MaybeValue<string | string[] | number[] | File[]>;
 
diff --git a/packages/solid/src/validation/minRange.ts b/packages/solid/src/validation/minRange.ts
index bff85f33..626bcf36 100644
--- a/packages/solid/src/validation/minRange.ts
+++ b/packages/solid/src/validation/minRange.ts
@@ -1,4 +1,4 @@
-import type { MaybeValue } from '../types';
+import type { MaybeValue } from '../types/index.js';
 
 type Value = MaybeValue<string | number | Date>;
 
diff --git a/packages/solid/src/validation/minSize.ts b/packages/solid/src/validation/minSize.ts
index d3e789d2..387a922a 100644
--- a/packages/solid/src/validation/minSize.ts
+++ b/packages/solid/src/validation/minSize.ts
@@ -1,4 +1,4 @@
-import type { MaybeValue } from '../types';
+import type { MaybeValue } from '../types/index.js';
 
 type Value = MaybeValue<File | File[]>;
 
diff --git a/packages/solid/src/validation/minTotalSize.ts b/packages/solid/src/validation/minTotalSize.ts
index fe7f970e..0cf56a75 100644
--- a/packages/solid/src/validation/minTotalSize.ts
+++ b/packages/solid/src/validation/minTotalSize.ts
@@ -1,4 +1,4 @@
-import type { MaybeValue } from '../types';
+import type { MaybeValue } from '../types/index.js';
 
 type Value = MaybeValue<File[]>;
 
diff --git a/packages/solid/src/validation/pattern.ts b/packages/solid/src/validation/pattern.ts
index 795c4fb2..fb3c2991 100644
--- a/packages/solid/src/validation/pattern.ts
+++ b/packages/solid/src/validation/pattern.ts
@@ -1,4 +1,4 @@
-import type { MaybeValue } from '../types';
+import type { MaybeValue } from '../types/index.js';
 
 type Value = MaybeValue<string>;
 
diff --git a/packages/solid/src/validation/required.ts b/packages/solid/src/validation/required.ts
index ec3bfaf1..74f08113 100644
--- a/packages/solid/src/validation/required.ts
+++ b/packages/solid/src/validation/required.ts
@@ -1,4 +1,4 @@
-import type { FieldValue, Maybe } from '../types';
+import type { FieldValue, Maybe } from '../types/index.js';
 
 type Value<TFieldValue extends FieldValue> = Maybe<TFieldValue> | number[];
 
diff --git a/packages/solid/src/validation/url.ts b/packages/solid/src/validation/url.ts
index 9d3c97b0..92edc8e5 100644
--- a/packages/solid/src/validation/url.ts
+++ b/packages/solid/src/validation/url.ts
@@ -1,4 +1,4 @@
-import type { MaybeValue } from '../types';
+import type { MaybeValue } from '../types/index.js';
 
 type Value = MaybeValue<string>;
 
diff --git a/packages/solid/src/validation/value.ts b/packages/solid/src/validation/value.ts
index 0ff86843..1063f957 100644
--- a/packages/solid/src/validation/value.ts
+++ b/packages/solid/src/validation/value.ts
@@ -1,4 +1,4 @@
-import type { MaybeValue } from '../types';
+import type { MaybeValue } from '../types/index.js';
 
 type Value = MaybeValue<string | number>;
 
diff --git a/packages/solid/tsconfig.json b/packages/solid/tsconfig.json
index 8ba0ec63..04afbb33 100644
--- a/packages/solid/tsconfig.json
+++ b/packages/solid/tsconfig.json
@@ -4,8 +4,8 @@
     "skipLibCheck": true,
     "lib": ["ESNext", "DOM", "DOM.Iterable"],
     "target": "ESNext",
-    "module": "ESNext",
-    "moduleResolution": "node",
+    "module": "NodeNext",
+    "moduleResolution": "NodeNext",
     "jsx": "preserve",
     "jsxImportSource": "solid-js"
   },