fix(ssr): fix expression scoping and other small fixes #4702
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
nolanlawson
commented
Oct 25, 2024
| @@ -348,6 +349,7 @@ export default function lwc(pluginOptions: RollupLwcOptions = {}): Plugin { | |||
| enableStaticContentOptimization: pluginOptions.enableStaticContentOptimization, | |||
| }), | |||
| targetSSR, | |||
| ssrMode, | |||
There was a problem hiding this comment.
This was not piped through before.
nolanlawson
commented
Oct 25, 2024
| } from 'estree'; | ||
|
|
||
| export const bImportHtmlEscape = esTemplate` | ||
| import { htmlEscape } from '@lwc/shared'; | ||
| import { htmlEscape } from '@lwc/ssr-runtime'; |
There was a problem hiding this comment.
It's simpler just to have everything at runtime imported from ssr-runtime, rather than introducing more dependencies at runtime.
nolanlawson
commented
Oct 25, 2024
| @@ -43,7 +43,7 @@ | |||
| } | |||
| } | |||
| }, | |||
| "dependencies": { | |||
| "devDependencies": { | |||
There was a problem hiding this comment.
Making this a devDep means that it's bundled into ssr-runtime which just makes things simpler (e.g. swapping packages in Tachometer tests). Plus this is what we do for engine-dom and engine-server.
nolanlawson
commented
Oct 25, 2024
| return cxt.isLocalVar(scopeReferencedId?.name) | ||
| ? expression | ||
| : b.memberExpression(b.identifier('instance'), expression); | ||
| } |
There was a problem hiding this comment.
Extracted out from for-each.ts.
nolanlawson
commented
Oct 25, 2024
| if (valueType === 'string') { | ||
| yield \`="\${prefix}\${htmlEscape(attrOrPropValue, true)}"\`; | ||
| yield \`="\${prefix}\${htmlEscape(attrValue, true)}"\`; |
There was a problem hiding this comment.
This is not a prop so don't call it a prop.
nolanlawson
commented
Oct 25, 2024
ekashida
approved these changes
Oct 25, 2024
...ine-server/src/__tests__/fixtures/very-deeply-nested-each/modules/x/component/component.html
Outdated
Show resolved
Hide resolved
…-nested-each/modules/x/component/component.html Co-authored-by: Eugene Kashida <ekashida@gmail.com>
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.
Details
Fixes attribute value expression rendering inside of loops (e.g.
for:each). Also fixes some other minor unrelated stuff.Does this pull request introduce a breaking change?
Does this pull request introduce an observable change?