-
Notifications
You must be signed in to change notification settings - Fork 1.6k
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
feat!: beta-next #7620
Merged
feat!: beta-next #7620
Conversation
This file contains 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 PR ensures that the payload config is 100% server-only. Instead of importing custom components into your config directly, they are now defined as file paths and rendered only when needed. That way, the payload 3.0 release does not rely on vercel/next.js#65415 which will likely will not get merged. Now, the Payload config will be significantly more lightweight. Related discussion: #6938 ## The issue This PR fixes a few issues: #4085 #6598 #6441 #7261 #7339 ### Local API within Next.js routes Previously, if you used the payload local API within Next.js pages, all the client-side modules are being added to the bundle for that specific page, even if you only need server-side functionality. This `/test` route, which uses the payload local API, was previously 460 kb. It is now down to 91 kb and does not bundle the payload client-side admin panel anymore. All tests done [here](https://github.com/payloadcms/payload-3.0-demo/tree/feat/path-test) with beta.67/PR, db-mongodb and default richtext-lexical: **dev /admin before:** ![CleanShot 2024-07-29 at 22 49 12@2x](https://github.com/user-attachments/assets/4428e766-b368-4bcf-8c18-d0187ab64f3e) **dev /admin after:** ![CleanShot 2024-07-29 at 22 50 49@2x](https://github.com/user-attachments/assets/f494c848-7247-4b02-a650-a3fab4000de6) --- **dev /test before:** ![CleanShot 2024-07-29 at 22 56 18@2x](https://github.com/user-attachments/assets/1a7e9500-b859-4761-bf63-abbcdac6f8d6) **dev /test after:** ![CleanShot 2024-07-29 at 22 47 45@2x](https://github.com/user-attachments/assets/f89aa76d-f2d5-4572-9753-2267f034a45a) --- **build before:** ![CleanShot 2024-07-29 at 22 57 14@2x](https://github.com/user-attachments/assets/5f8f7281-2a4a-40a5-a788-c30ddcdd51b5) **build after::** ![CleanShot 2024-07-29 at 22 56 39@2x](https://github.com/user-attachments/assets/ea8772fd-512f-4db0-9a81-4b014715a1b7) ### Usage of the payload local API / config outside of Next.js This will make it a lot easier to use the payload config / local API in other, server-side contexts. Previously, you might encounter errors due to client files (like .scss files) not being allowed to be imported. ### Custom Client Components are not server-rendered anymore Previously, custom components would be server-rendered in `buildComponentMap`, no matter if they are server or client components. Now, only server components are rendered in `buildComponentMap`. Client components simply get passed through, using `MappedComponent` as a container. It is then the client's responsibility to render those. This makes rendering them on the client a little bit more complex, as you now have to check if that component is a server component (=> already has been rendered) or a client component (=> not rendered yet, has to be rendered here). However, this added complexity has been alleviated through the easy-to-use `<RenderMappedComponent />` helper. This helper now also handles rendering arrays of custom components (e.g. beforeList, beforeLogin ...), which actually makes rendering custom components easier in some cases. The benefit of this change: Custom client components can now receive props. Previously, the only way for them to receive dynamic props from a parent client component was to use hooks, e.g. `useFieldProps()`. Now, we do have the option of passing in props to the custom components directly, if they are client components. This will be simpler than having to look for the correct hook, ### Misc improvements This PR includes misc, breaking changes. For example, we previously allowed unions between components and config object for the same property. E.g. for the custom view property, you were allowed to pass in a custom component or an object with other properties, alongside a custom component. Those union types are now gone. You can now either pass an object, or a component. The previous `{ View: MyViewComponent}` is now `{ View: { Component: MyViewComponent} }` or `{ View: { Default: { Component: MyViewComponent} } }`. This dramatically simplifies the way we read & process those properties, especially in buildComponentMap. We can now simply check for the existence of one specific property, which always has to be a component, instead of running cursed runtime checks on a shared union property which could contain a component, but could also contain functions or objects. ![CleanShot 2024-07-29 at 23 07 07@2x](https://github.com/user-attachments/assets/1e75aa4c-7a4c-419f-9070-216bb7b9a5e5) ![CleanShot 2024-07-29 at 23 09 40@2x](https://github.com/user-attachments/assets/b4c96450-6b7e-496c-a4f7-59126bfd0991) ## Custom Components In order to reference any custom components in the payload config, you now have to specify a string path to the component instead of importing it. E.g. ```ts import { MyComponent2} from './MyComponent2.js' admin: { components: { Label: MyComponent2 }, }, ``` Now becomes: ```ts admin: { components: { Label: '/collections/Posts/MyComponent2.js#MyComponent2', // <= has to be a relative path based on a baseDir configured in the payload config - NOT relative based on the importing file }, }, ``` ## Concepts: MappedComponent and PayloadComponent Instead of `React.FC` / `React.ComponentType`, props within the payload config that accept components now accept `PayloadComponent`. These are basically the paths to the component. They can be a string, or an object containing other properties like serverProps and clientProps - giving you full control over the props this component will eventually receive. `MappedComponent` is the result of buildComponentMap processing all those `PayloadComponent`s. It contains the server-rendered component, or unrendered/rendered client component. Any `MappedComponent` can be rendered on both either the client and the server using the `RenderMappedComponent` helper component. ## Try it out This can be tested out here: https://github.com/payloadcms/payload-3.0-demo/tree/feat/path-test ## Todo - Migrate all payload plugins to new import pattern & get it to build - Migrate test suites to new import pattern - Clean-up, simplify component handling within core, add JSDocs - Add Docs - Collect all breaking changes --------- Co-authored-by: PatrikKozak <[email protected]> Co-authored-by: Paul <[email protected]> Co-authored-by: Paul Popus <[email protected]>
## Description Deprecates the component map by merging its logic into the client config. The main goal of this change is for performance and simplification. There was no need to deeply iterate over the Payload config twice, once for the component map, and another for the client config. Instead, we can do everything in the client config one time. This has also dramatically simplified the client side prop drilling through the UI library. Now, all components can share the same client config which matches the exact shape of their Payload config (with the exception of non-serializable props and mapped custom components). One other important change here is that we need to ensure the HTML isn't bloated when using deeply nested fields. We need to ensure that React maintains a single reference for props that are drilled and ensure that as few `$undefined` strings make their way into the client-side bundle as possible. There are a few things left to do here still, which will come in separate PRs: 1. Migrate rich text from component map to client config 2. Fully passing tests. Most are already passing (with the exception of rich text related tests), but some fail to run due to the import map resolving to `undefined` on startup. CI will definitely fail because TS currently prevents build. 2. Resolve the broken types. Inferring field types based on `type` property has been broken due to using `Omit`. Need to resolve this across the board. This is breaking change. The `useComponentMap` hook no longer exists, and most component props have changed (for the better): ```ts const { componentMap } = useComponentMap() // old const { config } = useConfig() // new ``` The `useConfig` hook has also changed in shape, `config` is now a property _within_ the context obj: ```ts const config = useConfig() // old const { config } = useConfig() // new ``` - [x] I have read and understand the [CONTRIBUTING.md](https://github.com/payloadcms/payload/blob/main/CONTRIBUTING.md) document in this repository.
…b.defaultIDType` (#7544)
…ds test suite is booting up (#7559)
…t blocks form updates, minimize usage of spreads, fix some css
## Description Custom views and tabs are now fully config objects, no longer accepting raw components on their root keys as the capital casing might suggest. To better reflect this change semantically, these keys are now lowercase to indicate they are in fact config objects and never components themselves. Similar to the change made to view tabs here: c4c5cee Breaking change: Old: ```tsx // collection.ts { // ... admin: { views: { Edit: { Default: MyDefaultView, CustomView: { // ... Tab: MyCustomTab } }, List: MyListView } } } ``` New: ```tsx // collection.ts { // ... admin: { views: { edit: { default: { Component: 'path-to-my-default-view' }, customView: { // ... tab: { Component: 'path-to-my-custom-tab' } } }, list: { Component: 'path-to-my-custom-view' } } } } ``` - [x] I have read and understand the [CONTRIBUTING.md](https://github.com/payloadcms/payload/blob/main/CONTRIBUTING.md) document in this repository.
…n.admin.description not being displayed
This was referenced Aug 13, 2024
5 tasks
jacobsfletch
added a commit
that referenced
this pull request
Aug 14, 2024
…ault edit view (#7673) ## Description We've since lost the ability to override the document view at the root-level. This was a feature that made it possible to override _the entire document routing/view structure_, including the document header/tabs and all nested routes within, i.e. the API route/view, the Live Preview route/view, etc. This is distinct from the "default" edit view, which _only_ targets the component rendered within the "edit" tab. This regression was introduced when types were simplified down to better support "component paths" here: #7620. The `default` key was incorrectly used as the "root" view override. To continue to support stricter types _and_ root view overrides, a new `root` key has been added to the `views` config. You were previously able to do this: ```tsx import { MyComponent } from './MyComponent.js' export const MyCollection = { // ... admin: { views: { Edit: MyComponent } } } ``` This is now done like this: ```tsx export const MyCollection = { // ... admin: { views: { edit: { root: { Component: './path-to-my-component.js' } } } } } ``` Some of the documentation was also incorrect according to the new component paths API. - [x] I have read and understand the [CONTRIBUTING.md](https://github.com/payloadcms/payload/blob/main/CONTRIBUTING.md) document in this repository. ## Type of change - [x] Bug fix (non-breaking change which fixes an issue) - [x] This change requires a documentation update ## Checklist: - [x] Existing test suite passes locally with my changes - [x] I have made corresponding changes to the documentation
4 tasks
jacobsfletch
added a commit
that referenced
this pull request
Aug 20, 2024
#7754) ## Description Threads the field config to all "field subcomponents" through props, i.e. field label, description, error, etc. This way, the field config that controls any particular component is easily accessible and strongly typed, i.e. `props.field.maxLength`. This is true for both server and client components, whose server-side props are now also contextually typed. This behavior was temporarily removed in #7474 due to bloating HTML, but has since been resolved in #7620. This PR also makes significant improvements to component types by exporting explicit types for _every component of every field_, each with its own client/server variation. Now, a custom component can look something like this: ```tsx import type { TextFieldLabelServerComponent } from 'payload' import React from 'react' export const CustomLabel: TextFieldLabelServerComponent = (props) => { return ( <div>{`The max length of this field is: ${props?.field?.maxLength}`}</div> ) } ``` The following types are now available: ```ts import type { TextFieldClientComponent, TextFieldServerComponent, TextFieldLabelClientComponent, TextFieldLabelServerComponent, TextFieldDescriptionClientComponent, TextFieldDescriptionServerComponent, TextFieldErrorClientComponent, TextFieldErrorServerComponent, // ...and so one for each field } from 'payload' ``` BREAKING CHANGES: In order to strictly type these components, a few breaking changes have been made _solely to type definitions_. This only effects you if you are heavily using custom components. Old ```ts import type { ErrorComponent, LabelComponent, DescriptionComponent } from 'payload' ``` New: ```ts import type { FieldErrorClientComponent, FieldErrorServerComponent, FieldLabelClientComponent, FieldLabelServerComponent, FieldDescriptionClientComponent, FieldDescriptionServerComponent, // Note: these are the generic, underlying types of the more stricter types described above ^ // For example, you should use the type that is explicit for your particular field and environment // i.e. `TextFieldLabelClientComponent` and not simply `FieldLabelClientComponent` } from 'payload' ``` - [x] I have read and understand the [CONTRIBUTING.md](https://github.com/payloadcms/payload/blob/main/CONTRIBUTING.md) document in this repository. ## Type of change - [x] Bug fix (non-breaking change which fixes an issue) ## Checklist: - [x] I have added tests that prove my fix is effective or that my feature works - [x] Existing test suite passes locally with my changes
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This PR makes three major changes to the codebase:
Component Paths
Instead of importing custom components into your config directly, they are now defined as file paths and rendered only when needed. That way the Payload config will be significantly more lightweight, and ensures that the Payload config is 100% server-only and Node-safe. Related discussion: RFC: Payload Admin Components Abstraction #6938
Client Config
Deprecates the component map by merging its logic into the client config. The main goal of this change is for performance and simplification. There was no need to deeply iterate over the Payload config twice, once for the component map, and another for the client config. Instead, we can do everything in the client config one time. This has also dramatically simplified the client side prop drilling through the UI library. Now, all components can share the same client config which matches the exact shape of their Payload config (with the exception of non-serializable props and mapped custom components).
Custom client component are no longer server-rendered
Previously, custom components would be server-rendered, no matter if they are server or client components. Now, only server components are rendered on the server. Client components are automatically detected, and simply get passed through as
MappedComponent
to be rendered fully client-side.Component Paths
Instead of importing custom components into your config directly, they are now defined as file paths and rendered only when needed. That way the Payload config will be significantly more lightweight, and ensures that the Payload config is 100% server-only and Node-safe. Related discussion: #6938
In order to reference any custom components in the Payload config, you now have to specify a string path to the component instead of importing it.
Old:
New:
Local API within Next.js routes
Previously, if you used the Payload Local API within Next.js pages, all the client-side modules are being added to the bundle for that specific page, even if you only need server-side functionality.
This
/test
route, which uses the Payload local API, was previously 460 kb. It is now down to 91 kb and does not bundle the Payload client-side admin panel anymore.All tests done here with beta.67/PR, db-mongodb and default richtext-lexical:
dev /admin before:
dev /admin after:
dev /test before:
dev /test after:
build before:
build after::
Usage of the Payload Local API / config outside of Next.js
This will make it a lot easier to use the Payload config / local API in other, server-side contexts. Previously, you might encounter errors due to client files (like .scss files) not being allowed to be imported.
Client Config
Deprecates the component map by merging its logic into the client config. The main goal of this change is for performance and simplification. There was no need to deeply iterate over the Payload config twice, once for the component map, and another for the client config. Instead, we can do everything in the client config one time. This has also dramatically simplified the client side prop drilling through the UI library. Now, all components can share the same client config which matches the exact shape of their Payload config (with the exception of non-serializable props and mapped custom components).
This is breaking change. The
useComponentMap
hook no longer exists, and most component props have changed (for the better):The
useConfig
hook has also changed in shape,config
is now a property within the context obj:Custom Client Components are no longer server rendered
Previously, custom components would be server-rendered, no matter if they are server or client components. Now, only server components are rendered on the server. Client components are automatically detected, and simply get passed through as
MappedComponent
to be rendered fully client-side.The benefit of this change:
Custom client components can now receive props. Previously, the only way for them to receive dynamic props from a parent client component was to use hooks, e.g.
useFieldProps()
. Now, we do have the option of passing in props to the custom components directly, if they are client components. This will be simpler than having to look for the correct hook.This makes rendering them on the client a little bit more complex, as you now have to check if that component is a server component (=> already has been rendered) or a client component (=> not rendered yet, has to be rendered here). However, this added complexity has been alleviated through the easy-to-use
<RenderMappedComponent />
helper.This helper now also handles rendering arrays of custom components (e.g. beforeList, beforeLogin ...), which actually makes rendering custom components easier in some cases.
Misc improvements
This PR includes misc, breaking changes. For example, we previously allowed unions between components and config object for the same property. E.g. for the custom view property, you were allowed to pass in a custom component or an object with other properties, alongside a custom component.
Those union types are now gone. You can now either pass an object, or a component. The previous
{ View: MyViewComponent}
is now{ View: { Component: MyViewComponent} }
or{ View: { Default: { Component: MyViewComponent} } }
.This dramatically simplifies the way we read & process those properties, especially in buildComponentMap. We can now simply check for the existence of one specific property, which always has to be a component, instead of running cursed runtime checks on a shared union property which could contain a component, but could also contain functions or objects.