Skip to content
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

fix: merge app context #5630

Merged
merged 1 commit into from
Nov 29, 2022
Merged

fix: merge app context #5630

merged 1 commit into from
Nov 29, 2022

Conversation

chenjun1011
Copy link
Collaborator

Document 中同时存在 DataScript 组件时,需要 merge 二者的数据。(搭建 SSR)

@ClarkXia ClarkXia merged commit b058de7 into release/3.0 Nov 29, 2022
@ClarkXia ClarkXia deleted the fix-merge-context branch November 29, 2022 02:28
@ClarkXia ClarkXia mentioned this pull request Nov 29, 2022
11 tasks
ClarkXia added a commit that referenced this pull request Nov 29, 2022
* chore: version

* feat: redirect imports (#5590)

* feat: redirect imports

* test: data loader size

* chore: change log

* chore: change log

* feat: support partial match of redirect import (#5591)

* feat: support partial match of redirect import

* fix: optimize code

* feat: server external (#5572)

* feat: server only external

* refactor: alias to resolve

* fix: resolve path

* fix: type

* fix: lint

* fix: pass a timeout value for long-running test (#5604)

* fix: pass a timeout value for long-running test

* fix: configure testTimeout

* fix: re-order compilation of redirect import (#5606)

* fix: get route config by route id in plugin pha (#5609)

* fix: route match of plugin pha

* Update manifestHelpers.ts

* chore: changelog

* feat: support multiple runtime entry of development (#5596)

* feat: support multiple runtime entry of development

* feat: optimize code

* fix: bump versions of dependencies (#5598)

* fix: bump versions of dependencies

* fix: update lock

* chore: changelog

* fix: server output files (#5608)

* fix: not generate source map file when set sourceMap to true

* feat: remove reduplicative server files

* fix: comment

* fix: test error

* feat: path is incorrect in windows

* chore: add log

* fix: test fail in windows

* fix: fail to run in windows

* Feat/lock version (#5616)

* refactor: lock file by ice bundles

* fix: using lower case for swc plugin export

* chore: update repo and changelog (#5618)

* chore: add changelog and docs update

* docs: update docs repo

* Update CHANGELOG.md

* fix: add temp file to cache dir (#5623)

* fix: support custom config file (#5622)

* fix: merge context for component(#5630)

Co-authored-by: 水澜 <shuilan.cj@taobao.com>
Co-authored-by: luhc228 <44047106+luhc228@users.noreply.github.com>
Co-authored-by: ZeroLing <i@zeroling.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants