-
Notifications
You must be signed in to change notification settings - Fork 23
feat(ra-data-simple-prisma): add /server subpath export to keep react-admin out of server bundles #113
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.
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
Open
dan2811
wants to merge
1
commit into
codeledge:main
Choose a base branch
from
dan2811:ra-data-simple-prisma/server-subpath-export
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
feat(ra-data-simple-prisma): add /server subpath export to keep react-admin out of server bundles #113
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| --- | ||
| "ra-data-simple-prisma": minor | ||
| --- | ||
|
|
||
| Add `ra-data-simple-prisma/server` subpath export for server-side use. | ||
|
|
||
| The server entry contains only the Prisma request handlers and helpers | ||
| and has no dependency on `react-admin` (and therefore no transitive | ||
| dependency on `ra-core`, `ra-ui-materialui`, or `react-router-dom`). | ||
| Importing from this subpath inside Next.js / Vercel serverless functions | ||
| avoids tracing UI-only packages into the function bundle and fixes ESM | ||
| resolution failures caused by `react-router-dom@7.x`'s `exports` field. | ||
|
|
||
| The top-level `ra-data-simple-prisma` import is unchanged and still | ||
| re-exports both the client-side `dataProvider` and the server-side | ||
| handlers, so this is a non-breaking change. `react-admin` is now marked | ||
| as an optional peer dependency for server-only consumers. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| import { | ||
| import type { | ||
| CreateParams, | ||
| DeleteManyParams, | ||
| DeleteParams, | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| // Server-only entry point. | ||
| // This module intentionally excludes any code that depends on `react-admin` | ||
| // (notably the `dataProvider` and `HttpError`) so that Next.js / Vercel | ||
| // serverless functions importing handlers do not transitively pull in | ||
| // `react-admin`, `ra-core`, `ra-ui-materialui`, or `react-router-dom`. | ||
| // | ||
| // Use `ra-data-simple-prisma/server` from server-side code, and the | ||
| // top-level `ra-data-simple-prisma` import from client-side code. | ||
|
|
||
| export * from "./audit"; | ||
| export * from "./createHandler"; | ||
| export * from "./defaultHandler"; | ||
| export * from "./deleteHandler"; | ||
| export * from "./deleteManyHandler"; | ||
| export * from "./extractOrderBy"; | ||
| export * from "./extractSkipTake"; | ||
| export * from "./extractWhere"; | ||
| export * from "./getInfiniteListHandler"; | ||
| export * from "./getListHandler"; | ||
| export * from "./getManyHandler"; | ||
| export * from "./getManyReferenceHandler"; | ||
| export * from "./getOneHandler"; | ||
| export * from "./hasFieldChanged"; | ||
| export * from "./Http"; | ||
| export * from "./isExport"; | ||
| export * from "./permissions"; | ||
| export * from "./updateHandler"; | ||
| export * from "./updateManyHandler"; | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| import { describe, expect, test } from "@jest/globals"; | ||
| import { existsSync, readFileSync } from "fs"; | ||
| import { join } from "path"; | ||
|
|
||
| const distDir = join(__dirname, "..", "dist"); | ||
|
|
||
| // These tests only run if `pnpm build` has been executed beforehand. | ||
| // They guard against a regression in which the server-only entry | ||
| // transitively imports `react-admin`, which would pull react-admin (and | ||
| // its transitive deps) into Next.js / Vercel serverless bundles that | ||
| // only need the Prisma-side handlers. | ||
| const maybeDescribe = existsSync(join(distDir, "server.js")) ? describe : describe.skip; | ||
|
|
||
| maybeDescribe("dist/server bundle", () => { | ||
| test("CJS server bundle does not reference react-admin", () => { | ||
| const contents = readFileSync(join(distDir, "server.js"), "utf8"); | ||
| expect(contents).not.toMatch(/['"]react-admin['"]/); | ||
| }); | ||
|
|
||
| test("ESM server bundle does not reference react-admin", () => { | ||
| const contents = readFileSync(join(distDir, "server.mjs"), "utf8"); | ||
| expect(contents).not.toMatch(/['"]react-admin['"]/); | ||
| }); | ||
| }); |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hi I very much understand the full picture and thank you for chipping in - but most these exports (audit, http) have dependency on react-admin... so not sure where the trick is? 🤔
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
as a matter of fact this is an exact copy of the top-level index....