Skip to content

Defense against incomplete config in ssr renderer #3774

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 4 commits into from
Nov 22, 2019
Merged

Defense against incomplete config in ssr renderer #3774

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b3d22e2
Defense against incomplete config in ssr renderer
oskar1233 Nov 2, 2019
85e4274
Merge branch 'release/v1.11' into feature/ssr-renderer-defense
andrzejewsky Nov 8, 2019
037889f
Merge branch 'release/v1.11' into feature/ssr-renderer-defense
andrzejewsky Nov 11, 2019
49bd1ad
fix lining issues
andrzejewsky Nov 21, 2019
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 CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Added
- Add unit test for `core/modules/checkout` - @psmyrek (#3460)
- Add defense against incomplete config in ssr renderer - @oskar1233 (#3774)
- Add unit tests for `core/modules/order` - @dz3n (#3466)

### Fixed
Expand Down
5 changes: 4 additions & 1 deletion core/scripts/utils/ssr-renderer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,10 @@ function createRenderer (bundle, clientManifest, template) {
}

function getFieldsToFilter () {
const fields = [...config.ssr.initialStateFilter, ...config.ssr.lazyHydrateFor]
const fields = [
...(config.ssr && (config.ssr.initialStateFilter || [])),
...(config.ssr && (config.ssr.lazyHydrateFor || []))
]

return fields
}
Expand Down