Skip to content

Import Next's CJS AsyncLocalStorage modules #3634

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 6, 2023
Merged

Import Next's CJS AsyncLocalStorage modules #3634

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cd8d62b
Import CJS modules
jridgewell Feb 4, 2023
f455cef
Add test case
jridgewell Feb 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ default-members = [
"crates/next-binding",
"crates/next-core",
"crates/next-dev",
"crates/next-dev-tests",
"crates/next-transform-dynamic",
"crates/next-transform-strip-page-exports",
"crates/node-file-trace",
Expand Down
4 changes: 3 additions & 1 deletion crates/next-core/js/src/entry/app-renderer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,9 @@ async function runOperation(renderData: RenderData) {
body = result.toUnchunkedString();
}
return {
headers: [["Content-Type", result.contentType() ?? MIME_TEXT_HTML_UTF8]],
headers: [
["Content-Type", result.contentType() ?? MIME_TEXT_HTML_UTF8],
] as [string, string][],
body,
};
}
Expand Down
6 changes: 3 additions & 3 deletions crates/next-core/js/src/entry/app/layout-entry.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ export { default as AppRouter } from "next/dist/client/components/app-router.js"
export { default as LayoutRouter } from "next/dist/client/components/layout-router.js";
export { default as RenderFromTemplateContext } from "next/dist/client/components/render-from-template-context.js";
export { default as GlobalError } from "next/dist/client/components/error-boundary.js";
export { staticGenerationAsyncStorage } from "next/dist/esm/client/components/static-generation-async-storage.js";
export { requestAsyncStorage } from "next/dist/esm/client/components/request-async-storage.js";
import * as serverHooks from "next/dist/esm/client/components/hooks-server-context.js";
export { staticGenerationAsyncStorage } from "next/dist/client/components/static-generation-async-storage.js";
export { requestAsyncStorage } from "next/dist/client/components/request-async-storage.js";
import * as serverHooks from "next/dist/client/components/hooks-server-context.js";
export { serverHooks };
export { renderToReadableStream } from "next/dist/compiled/react-server-dom-webpack/server.browser";

Expand Down
2 changes: 1 addition & 1 deletion crates/next-core/js/src/entry/edge-bootstrap.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
declare const PAGE: string;

import { adapter, enhanceGlobals } from "next/dist/esm/server/web/adapter";
import { adapter, enhanceGlobals } from "next/dist/server/web/adapter";

enhanceGlobals();

Expand Down
6 changes: 3 additions & 3 deletions crates/next-core/js/types/modules.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
declare module "next/dist/esm/client/components/static-generation-async-storage.js";
declare module "next/dist/esm/client/components/request-async-storage.js";
declare module "next/dist/esm/client/components/hooks-server-context.js";
declare module "next/dist/client/components/static-generation-async-storage.js";
declare module "next/dist/client/components/request-async-storage.js";
declare module "next/dist/client/components/hooks-server-context.js";
declare module "next/dist/compiled/react-server-dom-webpack/server.browser";
12 changes: 12 additions & 0 deletions crates/next-dev-tests/tests/integration/next/app/async-local-storage/input/app/layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
import { cookies } from "next/headers";

export default function RootLayout({ children }: { children: any }) {
return (
<html>
<body>
{JSON.stringify(cookies(), null, 2)}
{children}
</body>
</html>
);
}
9 changes: 9 additions & 0 deletions crates/next-dev-tests/tests/integration/next/app/async-local-storage/input/app/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
import Test from "./test";

export default function Page() {
return (
<div>
<Test />
</div>
);
}
12 changes: 12 additions & 0 deletions crates/next-dev-tests/tests/integration/next/app/async-local-storage/input/app/test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
"use client";

import { useEffect } from "react";

export default function Test() {
useEffect(() => {
import("@turbo/pack-test-harness").then(() => {
it("should run", () => {});
});
return () => {};
}, []);
}
5 changes: 5 additions & 0 deletions crates/next-dev-tests/tests/integration/next/app/async-local-storage/input/next.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
module.exports = {
experimental: {
appDir: true,
},
};