Skip to content

Commit 25d0180

Browse files
authored
update to use NodeNext moduleResolution (#1959)
1 parent 0bfb84f commit 25d0180

14 files changed

Lines changed: 33 additions & 26 deletions

File tree

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
export { mount } from "./mount";
1+
export { mount } from "./mount.js";
22
export { StartClient, StartClientTanstack } from "./StartClient.jsx";
33

packages/start/src/client/spa/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ export function mount(fn: () => JSX.Element, el: MountableElement) {
66
render(fn, el);
77
}
88

9-
export { StartClient } from "../StartClient";
9+
export { StartClient } from "../StartClient.jsx";

packages/start/src/middleware/index.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// @refresh skip
2-
import { getFetchEvent } from "../server/fetchEvent";
3-
import { H3Event as HTTPEvent, defineMiddleware, sendWebResponse } from "../server/h3";
4-
import type { FetchEvent } from "../server/types";
2+
import { getFetchEvent } from "../server/fetchEvent.js";
3+
import { H3Event as HTTPEvent, defineMiddleware, sendWebResponse } from "../server/h3.js";
4+
import type { FetchEvent } from "../server/types.js";
55

66
/** Function responsible for receiving an observable [operation]{@link Operation} and returning a [result]{@link OperationResult}. */
77

packages/start/src/server/collect-styles.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import path from "node:path";
22
import { join, resolve } from "pathe";
33
import type { ModuleNode, ViteDevServer } from "vite";
4-
import { CLIENT_BASE_PATH } from "../constants";
54

65
async function getViteModuleNode(vite: ViteDevServer, file: string, ssr = false) {
76
let nodePath = file;

packages/start/src/server/index.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
export { getServerFunctionMeta } from "../shared/serverFunction.js";
22
export { StartServer } from "./StartServer.jsx";
3-
export { createHandler } from "./handler";
3+
export { createHandler } from "./handler.js";
44

5-
export * from "./h3";
5+
export * from "./h3.js";
66

77
/**
88
* Checks if user has set a redirect status in the response.

packages/start/src/server/manifest/dev-ssr-manifest.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ export function getSsrDevManifest(target: "client" | "server") {
1212
const styles = await findStylesInModuleGraph(vite, id, target === "server");
1313

1414
return Object.entries(styles).map(([key, value]) => ({
15-
tag: "style",
15+
tag: "style" as const,
1616
attrs: {
1717
type: "text/css",
1818
key,

packages/start/src/server/manifest/prod-ssr-manifest.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { clientViteManifest } from "solid-start:client-vite-manifest"
22
import { join } from "pathe";
3-
import type { Asset } from "../renderAsset";
4-
import { CLIENT_BASE_PATH } from "../../constants";
3+
import type { Asset } from "../renderAsset.jsx";
4+
import { CLIENT_BASE_PATH } from "../../constants.js";
55

66
// Only reads from client manifest atm, might need server support for islands
77
export function getSsrProdManifest() {

packages/start/src/server/server-functions-handler.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
// @ts-ignore - seroval exports issue with NodeNext
12
import { crossSerializeStream, fromJSON, getCrossReferenceHeader } from "seroval";
23
// @ts-ignore
34
import {
@@ -58,15 +59,15 @@ function serializeToStream(id: string, value: any) {
5859
URLSearchParamsPlugin,
5960
URLPlugin
6061
],
61-
onSerialize(data, initial) {
62+
onSerialize(data: string, initial: boolean) {
6263
controller.enqueue(
6364
createChunk(initial ? `(${getCrossReferenceHeader(id)},${data})` : data)
6465
);
6566
},
6667
onDone() {
6768
controller.close();
6869
},
69-
onError(error) {
70+
onError(error: any) {
7071
controller.error(error);
7172
}
7273
});

packages/start/src/server/server-runtime.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
// @ts-ignore - seroval exports issue with NodeNext
12
import { deserialize, toJSONAsync } from "seroval";
23
import {
34
CustomEventPlugin,

packages/start/src/server/spa/StartServer.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
import type { Component } from "solid-js";
44
import { NoHydration, getRequestEvent, ssr } from "solid-js/web";
55

6-
import { TopErrorBoundary } from "../../shared/ErrorBoundary";
7-
import { renderAsset } from "../renderAsset";
8-
import type { DocumentComponentProps, PageEvent } from "../types";
9-
import { getSsrManifest } from "../manifest/ssr-manifest";
6+
import { TopErrorBoundary } from "../../shared/ErrorBoundary.jsx";
7+
import { renderAsset } from "../renderAsset.jsx";
8+
import type { DocumentComponentProps, PageEvent } from "../types.js";
9+
import { getSsrManifest } from "../manifest/ssr-manifest.js";
1010

1111
const docType = ssr("<!DOCTYPE html>");
1212

0 commit comments

Comments
 (0)