support next 16 and segregate client/server logic #1042
Conversation
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
Signed-off-by: FredrikHaraldseth <[email protected]>
Fredrhar
commented
Nov 6, 2025
| export interface MacroProps { | ||
| name: string; | ||
| children: string | React.ReactNode; | ||
| children: string | ReactNode; |
Author
There was a problem hiding this comment.
ReactNode is already directly imported
Fredrhar
commented
Nov 6, 2025
| @@ -1,14 +1,15 @@ | |||
| import React, {Suspense} from 'react'; | |||
| import {Suspense, type ReactElement} from 'react'; | |||
Author
There was a problem hiding this comment.
Import type directly to stay in line with existing code convention
Fredrhar
commented
Nov 6, 2025
| // need to display a placeholder if descriptor is empty as component is not initialized yet | ||
| if (descriptor && shouldShowPlaceholderView(meta)) { | ||
| // Server-side check | ||
| if (isComponentOutputEmptyOnServer(ComponentView)) { |
Author
There was a problem hiding this comment.
Segregating checks to preserve RSC boundaries and avoid hydration mismatch
Fredrhar
commented
Nov 6, 2025
| expect(rootEl.outerHTML).toEqual(`<div id="text-root"> | ||
| <p>Some text before <a href="/base/url/no/some/link">the link</a> and some text after.</p> | ||
| <figure><a href="/base/url/no/some/image"><img src="/base/url/no/some/image.jpg" alt="Some image"></a><figcaption>Some caption</figcaption></figure> | ||
| <figure><a href="/base/url/no/some/image"><img alt="Some image" src="/base/url/no/some/image.jpg"></a><figcaption>Some caption</figcaption></figure> |
Author
There was a problem hiding this comment.
Order of props is changed to pass tests
Fredrhar
commented
Nov 6, 2025
| "@edge-runtime/jest-environment": "^4.0.0", | ||
| "@enonic-types/core": "^7.15.4", | ||
| "@enonic/eslint-config": "^2.1.0", | ||
| "@testing-library/dom": "^10.4.1", |
Author
There was a problem hiding this comment.
Added dev dependencies to aid local development and testing
Author
|
Closes #1006 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
Developer's Certificate of Origin 1.1
By making a contribution to this project, I certify that:
(a) The contribution was created in whole or in part by me and I have the right to submit it under the open source license indicated in the file; or
(b) The contribution is based upon previous work that, to the best of my knowledge, is covered under an appropriate open source license and I have the right under that license to submit that work with modifications, whether created in whole or in part by me, under the same open source license (unless I am permitted to submit under a different license), as indicated in the file; or
(c) The contribution was provided directly to me by some other person who certified 1., 2. or 3. and I have not modified it.
(d) I understand and agree that this project and the contribution are public and that a record of the contribution (including all personal information I submit with it, including my sign-off) is maintained indefinitely and may be redistributed consistent with this project or the open source license(s) involved.
I adhere to these requirements by adding a Signed-off-by line to commit messages, using the same name and email address that are used in my Github profile.
Example: