Use paths with extensions

alexeyr · alexeyr · commit ad193ee56b36 · 2025-04-03T09:03:34.000Z
diff --git a/eslint.config.ts b/eslint.config.ts
@@ -128,6 +128,12 @@ const config = tsEslint.config([
       'jsx-a11y/anchor-is-valid': 'off',
     },
   },
+  {
+    files: ['node_package/src/**/*'],
+    rules: {
+      'import/extensions': ['error', 'ignorePackages'],
+    },
+  },
   {
     files: ['lib/generators/react_on_rails/templates/**/*'],
     rules: {
diff --git a/node_package/src/Authenticity.ts b/node_package/src/Authenticity.ts
@@ -1,4 +1,4 @@
-import type { AuthenticityHeaders } from './types/index';
+import type { AuthenticityHeaders } from './types/index.ts';
 
 export default {
   authenticityToken(): string | null {
diff --git a/node_package/src/CallbackRegistry.ts b/node_package/src/CallbackRegistry.ts
@@ -1,6 +1,6 @@
-import { ItemRegistrationCallback } from './types';
-import { onPageLoaded, onPageUnloaded } from './pageLifecycle';
-import { getContextAndRailsContext } from './context';
+import { ItemRegistrationCallback } from './types/index.ts';
+import { onPageLoaded, onPageUnloaded } from './pageLifecycle.ts';
+import { getContextAndRailsContext } from './context.ts';
 
 /**
  * Represents information about a registered item including its value,
diff --git a/node_package/src/ClientSideRenderer.ts b/node_package/src/ClientSideRenderer.ts
@@ -3,14 +3,14 @@
 
 import * as ReactDOM from 'react-dom';
 import type { ReactElement } from 'react';
-import type { RailsContext, RegisteredComponent, RenderFunction, Root } from './types';
-
-import { getContextAndRailsContext, resetContextAndRailsContext, type Context } from './context';
-import createReactOutput from './createReactOutput';
-import { isServerRenderHash } from './isServerRenderResult';
-import reactHydrateOrRender from './reactHydrateOrRender';
-import { supportsRootApi } from './reactApis';
-import { debugTurbolinks } from './turbolinksUtils';
+import type { RailsContext, RegisteredComponent, RenderFunction, Root } from './types/index.ts';
+
+import { getContextAndRailsContext, resetContextAndRailsContext, type Context } from './context.ts';
+import createReactOutput from './createReactOutput.ts';
+import { isServerRenderHash } from './isServerRenderResult.ts';
+import reactHydrateOrRender from './reactHydrateOrRender.ts';
+import { supportsRootApi } from './reactApis.ts';
+import { debugTurbolinks } from './turbolinksUtils.ts';
 
 const REACT_ON_RAILS_STORE_ATTRIBUTE = 'data-js-react-on-rails-store';
 
diff --git a/node_package/src/ComponentRegistry.ts b/node_package/src/ComponentRegistry.ts
@@ -1,6 +1,6 @@
-import { type RegisteredComponent, type ReactComponentOrRenderFunction } from './types';
-import isRenderFunction from './isRenderFunction';
-import CallbackRegistry from './CallbackRegistry';
+import { type RegisteredComponent, type ReactComponentOrRenderFunction } from './types/index.ts';
+import isRenderFunction from './isRenderFunction.ts';
+import CallbackRegistry from './CallbackRegistry.ts';
 
 const componentRegistry = new CallbackRegistry<RegisteredComponent>('component');
 
diff --git a/node_package/src/RSCClientRoot.ts b/node_package/src/RSCClientRoot.ts
@@ -3,9 +3,9 @@
 import * as React from 'react';
 import * as ReactDOMClient from 'react-dom/client';
 import { createFromReadableStream } from 'react-on-rails-rsc/client';
-import { fetch } from './utils';
-import transformRSCStreamAndReplayConsoleLogs from './transformRSCStreamAndReplayConsoleLogs';
-import { RailsContext, RenderFunction } from './types';
+import { fetch } from './utils.ts';
+import transformRSCStreamAndReplayConsoleLogs from './transformRSCStreamAndReplayConsoleLogs.ts';
+import { RailsContext, RenderFunction } from './types/index.ts';
 
 const { use } = React;
 
diff --git a/node_package/src/ReactOnRails.client.ts b/node_package/src/ReactOnRails.client.ts
@@ -1,12 +1,12 @@
 import type { ReactElement } from 'react';
-import * as ClientStartup from './clientStartup';
-import { renderOrHydrateComponent, hydrateStore } from './ClientSideRenderer';
-import ComponentRegistry from './ComponentRegistry';
-import StoreRegistry from './StoreRegistry';
-import buildConsoleReplay from './buildConsoleReplay';
-import createReactOutput from './createReactOutput';
-import Authenticity from './Authenticity';
-import context from './context';
+import * as ClientStartup from './clientStartup.ts';
+import { renderOrHydrateComponent, hydrateStore } from './ClientSideRenderer.ts';
+import ComponentRegistry from './ComponentRegistry.ts';
+import StoreRegistry from './StoreRegistry.ts';
+import buildConsoleReplay from './buildConsoleReplay.ts';
+import createReactOutput from './createReactOutput.ts';
+import Authenticity from './Authenticity.ts';
+import context from './context.ts';
 import type {
   RegisteredComponent,
   RenderResult,
@@ -16,8 +16,8 @@ import type {
   Store,
   StoreGenerator,
   ReactOnRailsOptions,
-} from './types';
-import reactHydrateOrRender from './reactHydrateOrRender';
+} from './types/index.ts';
+import reactHydrateOrRender from './reactHydrateOrRender.ts';
 
 const ctx = context();
 
@@ -203,5 +203,5 @@ ctx.ReactOnRails.resetOptions();
 
 ClientStartup.clientStartup(ctx);
 
-export * from './types';
+export * from './types/index.ts';
 export default ctx.ReactOnRails;
diff --git a/node_package/src/ReactOnRails.full.ts b/node_package/src/ReactOnRails.full.ts
@@ -1,8 +1,8 @@
-import handleError from './handleError';
-import serverRenderReactComponent from './serverRenderReactComponent';
-import type { RenderParams, RenderResult, ErrorOptions } from './types';
+import handleError from './handleError.ts';
+import serverRenderReactComponent from './serverRenderReactComponent.ts';
+import type { RenderParams, RenderResult, ErrorOptions } from './types/index.ts';
 
-import Client from './ReactOnRails.client';
+import Client from './ReactOnRails.client.ts';
 
 if (typeof window !== 'undefined') {
   console.log(
@@ -15,5 +15,5 @@ Client.handleError = (options: ErrorOptions): string | undefined => handleError(
 Client.serverRenderReactComponent = (options: RenderParams): null | string | Promise<RenderResult> =>
   serverRenderReactComponent(options);
 
-export * from './types';
+export * from './types/index.ts';
 export default Client;
diff --git a/node_package/src/ReactOnRails.node.ts b/node_package/src/ReactOnRails.node.ts
@@ -1,8 +1,8 @@
-import ReactOnRails from './ReactOnRails.full';
-import streamServerRenderedReactComponent from './streamServerRenderedReactComponent';
+import ReactOnRails from './ReactOnRails.full.ts';
+import streamServerRenderedReactComponent from './streamServerRenderedReactComponent.ts';
 
 ReactOnRails.streamServerRenderedReactComponent = streamServerRenderedReactComponent;
 
-export * from './ReactOnRails.full';
+export * from './ReactOnRails.full.ts';
 // eslint-disable-next-line no-restricted-exports -- see https://github.com/eslint/eslint/issues/15617
-export { default } from './ReactOnRails.full';
+export { default } from './ReactOnRails.full.ts';
diff --git a/node_package/src/ReactOnRailsRSC.ts b/node_package/src/ReactOnRailsRSC.ts
@@ -2,17 +2,17 @@ import { renderToPipeableStream } from 'react-on-rails-rsc/server.node';
 import { PassThrough, Readable } from 'stream';
 import type { ReactElement } from 'react';
 
-import { RSCRenderParams, StreamRenderState } from './types';
-import ReactOnRails from './ReactOnRails.full';
-import buildConsoleReplay from './buildConsoleReplay';
-import handleError from './handleError';
-import { convertToError, createResultObject } from './serverRenderUtils';
+import { RSCRenderParams, StreamRenderState } from './types/index.ts';
+import ReactOnRails from './ReactOnRails.full.ts';
+import buildConsoleReplay from './buildConsoleReplay.ts';
+import handleError from './handleError.ts';
+import { convertToError, createResultObject } from './serverRenderUtils.ts';
 
 import {
   streamServerRenderedComponent,
   transformRenderStreamChunksToResultObject,
-} from './streamServerRenderedReactComponent';
-import loadReactClientManifest from './loadReactClientManifest';
+} from './streamServerRenderedReactComponent.ts';
+import loadReactClientManifest from './loadReactClientManifest.ts';
 
 const stringToStream = (str: string) => {
   const stream = new PassThrough();
@@ -65,5 +65,5 @@ ReactOnRails.serverRenderRSCReactComponent = (options: RSCRenderParams) => {
   }
 };
 
-export * from './types';
+export * from './types/index.ts';
 export default ReactOnRails;
diff --git a/node_package/src/StoreRegistry.ts b/node_package/src/StoreRegistry.ts
@@ -1,5 +1,5 @@
 import CallbackRegistry from './CallbackRegistry';
-import type { Store, StoreGenerator } from './types';
+import type { Store, StoreGenerator } from './types/index.ts';
 
 const storeGeneratorRegistry = new CallbackRegistry<StoreGenerator>('store generator');
 const hydratedStoreRegistry = new CallbackRegistry<Store>('hydrated store');
diff --git a/node_package/src/buildConsoleReplay.ts b/node_package/src/buildConsoleReplay.ts
@@ -1,5 +1,5 @@
-import RenderUtils from './RenderUtils';
-import scriptSanitizedVal from './scriptSanitizedVal';
+import RenderUtils from './RenderUtils.ts';
+import scriptSanitizedVal from './scriptSanitizedVal.ts';
 
 declare global {
   interface Console {
diff --git a/node_package/src/clientStartup.ts b/node_package/src/clientStartup.ts
@@ -1,13 +1,13 @@
-import { type Context, isWindow } from './context';
+import { type Context, isWindow } from './context.ts';
 import {
   renderOrHydrateForceLoadedComponents,
   renderOrHydrateAllComponents,
   hydrateForceLoadedStores,
   hydrateAllStores,
   unmountAll,
-} from './ClientSideRenderer';
-import { onPageLoaded, onPageUnloaded } from './pageLifecycle';
-import { debugTurbolinks } from './turbolinksUtils';
+} from './ClientSideRenderer.ts';
+import { onPageLoaded, onPageUnloaded } from './pageLifecycle.ts';
+import { debugTurbolinks } from './turbolinksUtils.ts';
 
 export async function reactOnRailsPageLoaded() {
   debugTurbolinks('reactOnRailsPageLoaded');
diff --git a/node_package/src/context.ts b/node_package/src/context.ts
@@ -1,4 +1,4 @@
-import type { ReactOnRailsInternal as ReactOnRailsType, RailsContext } from './types';
+import type { ReactOnRailsInternal as ReactOnRailsType, RailsContext } from './types/index.ts';
 
 declare global {
   interface Window {
diff --git a/node_package/src/createReactOutput.ts b/node_package/src/createReactOutput.ts
@@ -5,8 +5,8 @@ import type {
   ReactComponent,
   RenderFunction,
   CreateReactOutputResult,
-} from './types/index';
-import { isServerRenderHash, isPromise } from './isServerRenderResult';
+} from './types/index.ts';
+import { isServerRenderHash, isPromise } from './isServerRenderResult.ts';
 
 /**
  * Logic to either call the renderFunction or call React.createElement to get the
diff --git a/node_package/src/handleError.ts b/node_package/src/handleError.ts
@@ -1,6 +1,6 @@
 import * as React from 'react';
 import * as ReactDOMServer from 'react-dom/server';
-import type { ErrorOptions } from './types/index';
+import type { ErrorOptions } from './types/index.ts';
 
 function handleRenderFunctionIssue(options: ErrorOptions): string {
   const { e, name } = options;
diff --git a/node_package/src/isRenderFunction.ts b/node_package/src/isRenderFunction.ts
@@ -1,6 +1,6 @@
 // See discussion:
 // https://discuss.reactjs.org/t/how-to-determine-if-js-object-is-react-component/2825/2
-import { ReactComponentOrRenderFunction, RenderFunction } from './types/index';
+import { ReactComponentOrRenderFunction, RenderFunction } from './types/index.ts';
 
 /**
  * Used to determine we'll call be calling React.createElement on the component of if this is a
diff --git a/node_package/src/isServerRenderResult.ts b/node_package/src/isServerRenderResult.ts
@@ -1,4 +1,4 @@
-import type { CreateReactOutputResult, ServerRenderResult } from './types/index';
+import type { CreateReactOutputResult, ServerRenderResult } from './types/index.ts';
 
 export function isServerRenderHash(testValue: CreateReactOutputResult): testValue is ServerRenderResult {
   return !!(
diff --git a/node_package/src/pageLifecycle.ts b/node_package/src/pageLifecycle.ts
@@ -4,7 +4,7 @@ import {
   turbolinksSupported,
   turboInstalled,
   turbolinksVersion5,
-} from './turbolinksUtils';
+} from './turbolinksUtils.ts';
 
 type PageLifecycleCallback = () => void | Promise<void>;
 type PageState = 'load' | 'unload' | 'initial';
diff --git a/node_package/src/reactHydrateOrRender.ts b/node_package/src/reactHydrateOrRender.ts
@@ -1,7 +1,7 @@
 import type { ReactElement } from 'react';
 import * as ReactDOM from 'react-dom';
-import type { RenderReturnType } from './types';
-import { supportsRootApi } from './reactApis';
+import type { RenderReturnType } from './types/index.ts';
+import { supportsRootApi } from './reactApis.ts';
 
 type HydrateOrRenderType = (domNode: Element, reactElement: ReactElement) => RenderReturnType;
 
diff --git a/node_package/src/registerServerComponent/client.ts b/node_package/src/registerServerComponent/client.ts
@@ -1,6 +1,6 @@
-import ReactOnRails from '../ReactOnRails.client';
-import RSCClientRoot from '../RSCClientRoot';
-import { RegisterServerComponentOptions, RailsContext, ReactComponentOrRenderFunction } from '../types';
+import ReactOnRails from '../ReactOnRails.client.ts';
+import RSCClientRoot from '../RSCClientRoot.ts';
+import { RegisterServerComponentOptions, RailsContext, ReactComponentOrRenderFunction } from '../types/index.ts';
 
 /**
  * Registers React Server Components (RSC) with React on Rails.
diff --git a/node_package/src/registerServerComponent/server.ts b/node_package/src/registerServerComponent/server.ts
@@ -1,5 +1,5 @@
-import ReactOnRails from '../ReactOnRails.client';
-import { ReactComponent } from '../types';
+import ReactOnRails from '../ReactOnRails.client.ts';
+import { ReactComponent } from '../types/index.ts';
 
 /**
  * Registers React Server Components (RSC) with React on Rails for both server and RSC bundles.
diff --git a/node_package/src/serverRenderReactComponent.ts b/node_package/src/serverRenderReactComponent.ts
@@ -1,20 +1,20 @@
 import * as ReactDOMServer from 'react-dom/server';
 import type { ReactElement } from 'react';
 
-import ComponentRegistry from './ComponentRegistry';
-import createReactOutput from './createReactOutput';
-import { isPromise, isServerRenderHash } from './isServerRenderResult';
-import buildConsoleReplay from './buildConsoleReplay';
-import handleError from './handleError';
-import { createResultObject, convertToError, validateComponent } from './serverRenderUtils';
+import ComponentRegistry from './ComponentRegistry.ts';
+import createReactOutput from './createReactOutput.ts';
+import { isPromise, isServerRenderHash } from './isServerRenderResult.ts';
+import buildConsoleReplay from './buildConsoleReplay.ts';
+import handleError from './handleError.ts';
+import { createResultObject, convertToError, validateComponent } from './serverRenderUtils.ts';
 import type {
   CreateReactOutputResult,
   RenderParams,
   RenderResult,
   RenderState,
   RenderOptions,
   ServerRenderResult,
-} from './types';
+} from './types/index.ts';
 
 function processServerRenderHash(result: ServerRenderResult, options: RenderOptions): RenderState {
   const { redirectLocation, routeError } = result;
diff --git a/node_package/src/serverRenderUtils.ts b/node_package/src/serverRenderUtils.ts
@@ -1,4 +1,4 @@
-import type { RegisteredComponent, RenderResult, RenderState, StreamRenderState } from './types';
+import type { RegisteredComponent, RenderResult, RenderState, StreamRenderState } from './types/index.ts';
 
 export function createResultObject(
   html: string | null,
diff --git a/node_package/src/streamServerRenderedReactComponent.ts b/node_package/src/streamServerRenderedReactComponent.ts
@@ -2,13 +2,13 @@ import * as ReactDOMServer from 'react-dom/server';
 import { PassThrough, Readable } from 'stream';
 import type { ReactElement } from 'react';
 
-import ComponentRegistry from './ComponentRegistry';
-import createReactOutput from './createReactOutput';
-import { isPromise, isServerRenderHash } from './isServerRenderResult';
-import buildConsoleReplay from './buildConsoleReplay';
-import handleError from './handleError';
-import { createResultObject, convertToError, validateComponent } from './serverRenderUtils';
-import type { RenderParams, StreamRenderState } from './types';
+import ComponentRegistry from './ComponentRegistry.ts';
+import createReactOutput from './createReactOutput.ts';
+import { isPromise, isServerRenderHash } from './isServerRenderResult.ts';
+import buildConsoleReplay from './buildConsoleReplay.ts';
+import handleError from './handleError.ts';
+import { createResultObject, convertToError, validateComponent } from './serverRenderUtils.ts';
+import type { RenderParams, StreamRenderState } from './types/index.ts';
 
 const stringToStream = (str: string): Readable => {
   const stream = new PassThrough();
diff --git a/node_package/src/transformRSCStreamAndReplayConsoleLogs.ts b/node_package/src/transformRSCStreamAndReplayConsoleLogs.ts
@@ -1,4 +1,4 @@
-import { RenderResult } from './types';
+import { RenderResult } from './types/index.ts';
 
 export default function transformRSCStreamAndReplayConsoleLogs(stream: ReadableStream<Uint8Array>) {
   return new ReadableStream({
diff --git a/node_package/src/turbolinksUtils.ts b/node_package/src/turbolinksUtils.ts
@@ -1,4 +1,4 @@
-import { reactOnRailsContext } from './context';
+import { reactOnRailsContext } from './context.ts';
 
 declare global {
   namespace Turbolinks {
diff --git a/package.json b/package.json
@@ -76,7 +76,7 @@
     "react-on-rails-rsc": "19.0.0",
     "redux": "^4.2.1",
     "ts-jest": "^29.2.5",
-    "typescript": "^5.6.2"
+    "typescript": "^5.8.2"
   },
   "peerDependencies": {
     "react": ">= 16",
diff --git a/tsconfig.json b/tsconfig.json
@@ -12,6 +12,8 @@
     "outDir": "node_package/lib/esm",
     "strict": true,
     "incremental": true,
+    "allowImportingTsExtensions": true,
+    "rewriteRelativeImportExtensions": true,
     "target": "es2020",
     "typeRoots": ["./node_modules/@types", "./node_package/types"]
   },
diff --git a/yarn.lock b/yarn.lock
@@ -6009,10 +6009,10 @@ typescript@5.6.1-rc:
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.6.1-rc.tgz#d5e4d7d8170174fed607b74cc32aba3d77018e02"
   integrity sha512-E3b2+1zEFu84jB0YQi9BORDjz9+jGbwwy1Zi3G0LUNw7a7cePUrHMRNy8aPh53nXpkFGVHSxIZo5vKTfYaFiBQ==
 
-typescript@^5.6.2:
-  version "5.6.2"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.6.2.tgz#d1de67b6bef77c41823f822df8f0b3bcff60a5a0"
-  integrity sha512-NW8ByodCSNCwZeghjN3o+JX5OFH0Ojg6sadjEKY4huZ52TqbJTJnDo5+Tw98lSy63NZvi4n+ez5m2u5d4PkZyw==
+typescript@^5.8.2:
+  version "5.8.2"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.8.2.tgz#8170b3702f74b79db2e5a96207c15e65807999e4"
+  integrity sha512-aJn6wq13/afZp/jT9QZmwEjDqqvSGp1VT5GVg+f/t6/oVyrgXM6BY1h9BRh/O5p3PlUPAe+WuiEZOmb/49RqoQ==
 
 unbox-primitive@^1.1.0:
   version "1.1.0"

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import type { AuthenticityHeaders } from './types/index';`
	`1`	`+import type { AuthenticityHeaders } from './types/index.ts';`
`2`	`2`
`3`	`3`	`export default {`
`4`	`4`	`authenticityToken(): string \| null {`