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: multi-instance bug and unhandled error for live demo feature #2078

Merged
merged 3 commits into from
Apr 24, 2024

Conversation

Jinbao1001
Copy link
Member

🤔 这个变动的性质是?/ What is the nature of this change?

  • 新特性提交 / New feature
  • bug 修复 / Fix bug
  • 样式优化 / Style optimization
  • 代码风格优化 / Code style optimization
  • 性能优化 / Performance optimization
  • 构建优化 / Build optimization
  • 网站、文档、Demo 改进 / Website, documentation, demo improvements
  • 重构代码或样式 / Refactor code or style
  • 测试相关 / Test related
  • 其他 / Other

🔗 相关 Issue / Related Issue

💡 需求背景和解决方案 / Background or solution

2.3.0发布前内部应用测试

externals 的依赖项不再处理为绝对路径
livedemo场景跳过一些 server-render 错误处理, 直接交给客户端渲染

📝 更新日志 / Changelog

Language Changelog
🇺🇸 English external resolve and skip server render handle for liveDemo
🇨🇳 Chinese 依赖项处理以及跳过livedemo场景的一些server-render错误处理

Copy link

vercel bot commented Apr 23, 2024

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name Status Preview Comments Updated (UTC)
dumi ✅ Ready (Inspect) Visit Preview 💬 Add feedback Apr 24, 2024 11:54am

@Jinbao1001 Jinbao1001 changed the title fix: external resolve and skip server render handle for liveDemo fix: external resolve and skip server render error for liveDemo Apr 23, 2024
@@ -80,7 +82,11 @@ async function parseBlockAsset(opts: {
value: pkg.version,
};

result.resolveMap[args.path] = resolved;
result.resolveMap[args.path] = Object.keys(
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

线下讨论结果同步:改成直接用 args.path 而非绝对路径,也不需要判断 externals 了

@@ -8,11 +9,11 @@ import transform, {
type IMdTransformerResult,
} from './transformer';
import { CONTENT_TEXTS_OBJ_NAME } from './transformer/rehypeText';

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

空行保留

ret.push(...Object.values(demo.resolveMap));
ret.push(
...Object.values(demo.resolveMap).filter((path) =>
path.startsWith('/'),
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

改用 path.isAbsolute

@PeachScript PeachScript changed the title fix: external resolve and skip server render error for liveDemo fix: multi-instance bug and unhandled error for live demo feature Apr 24, 2024
Copy link
Member

@PeachScript PeachScript left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

+1

@PeachScript PeachScript merged commit 0df859e into feature/2.3.0 Apr 24, 2024
3 checks passed
@PeachScript PeachScript deleted the Jinbao/patch-03 branch April 24, 2024 11:57
PeachScript added a commit that referenced this pull request Apr 26, 2024
* refactor: extract inline plugin templates as independent files (#1874)

* refactor: mv to tmpl

* refactor: more info

* refactor: to template

* docs: add customize page

* refactor: to contant

* chore: revert config

* chore: rm tmpl

* chore: dir path

* chore: clean up

* feat: split markdown meta loader (#1875)

* feat: split mdLoader type

* feat: split mdLoader

* chore: code optimize

* fix: use winPath

* chore: update getter

* refactor: extract runtime tpl (#1883)

* refactor: load text data from self in markdown loader (#1881)

* refactor: provider `useDemoData` which is given by `getDemoById` (#1876)

* chore: all pass to lazy

* chore: match route

* chore: meta demos

* chore: support getDemoById

* chore: split code

* chore: back of it

* chore: getDemoById

* chore: support demo sus

* chore: all demos

* chore: demo extract

* chore: clean up

* chore: clean up

* chore: rm fallback

* refactor: remove full demos from context (#1885)

* chore: rm demos

* chore: update lock file

* chore: rm texts (#1886)

* refactor: useRouteMeta & useTabMeta with getRouteMetaById (#1888)

* refactor: useRouteMeta & useTabMeta

* fix: route meta

* refactor: fix sidebar

* chore: code clean

* refactor: useRouteMeta fully use getRouteMetaById (#1889)

* fix: useRouteMeta fully use getRouteMetaById

* refactor: runtime get frontmatter directly

* refactor: use sync frontmatter

* refactor: better frontmatter code (#1892)

* refactor: better frontmatter code

* fix: render loop

* refactor: clean up meta (#1894)

* refactor: clean up meta

* chore: clean up

* feat: Make searchable again (#1898)

* chore: search data

* chore: fill content

* chore: fix loading

* chore: support loading state

* feat: merge chunk & optimize meta loading (#1906)

* feat: use new loader for search

* feat: search support tsx

* feat: split meta chunk

* feat: load meta on hover

* chore: code clena

* perf: loadSearchData on focus & show loading only once (#1915)

* fix: demo should export html file (#1931)

* fix: demo should export html file

* chore: code clean

* feat: support live demo (#1905)

* feat: support live code

* feat: split live plugin

* feat: enabled by live config

* feat: add error catcher

* docs: add docs

* docs: add docs

* feat: update single file logic

* docs: rm docs

* feat: put Live Components into theme-default slots

* feat: update regexp & fix enable logic

* feat: make LiveEditor derivate Editor

* feat: enhance live regexp (#1946)

* refactor: optimize async route meta solution (#1974)

* refactor: optimize async route meta solution

* refactor: simplify markdown loader rules

* refactor: correct async tab meta load logic

* refactor: page suspense add fallback

* feat: add default loading skeleton (#1512)

* feat: add global loading logic

# This is the 1st commit message:

feat: add global loading logic

# This is the commit message #2:

chore: update

# This is the commit message #3:

feat: add Loading Skeleton

# This is the commit message #4:

feat: update

# This is the commit message #5:

chore: update Loading

# This is the commit message #6:

chore: update pnpm-lock.yaml

# This is the commit message #7:

chore: fix lock file

# This is the commit message #8:

Revert "chore: fix lock file"

This reverts commit 73dee02.

# This is the commit message #9:

Revert "chore: update pnpm-lock.yaml"

This reverts commit 3f6f579.

# This is the commit message #10:

chore: fix lock file

# This is the commit message #11:

chore: update logic

# This is the commit message #12:

chore(deps): bump umi@4.0.54

# This is the commit message #13:

Revert "chore(deps): bump umi@4.0.54"

This reverts commit 011ecf9.

# This is the commit message #14:

fix: fix path error on windows platform

# This is the commit message #15:

chore(deps): bump umi@4.0.54

# This is the commit message #16:

chore: revert @umi/lint 4.0.54 => 4.0.53

Because there is breaking change

# This is the commit message #17:

chore(deps): upgrade umi@4.0.55

# This is the commit message #18:

chore: update type

# This is the commit message #19:

chore: update Loading

# This is the commit message #20:

refactor: site template ignore dist dir (#1518)

add /dist > .gitignore
# This is the commit message #21:

refactor: improve content padding when disable footer (#1517)

* chore(theme): improve the default theme style

* chore: update Content style

* chore: update
# This is the commit message #22:

refactor: make chunk name clean for theme routes (#1513)

fix: special links not working bug in markdown (#1524)

* fix: absolute links and schema links lost bug in markdown

* refactor: update relative link condition

* refactor: update relative link condition for data url

* Update src/loaders/markdown/transformer/rehypeLink.ts

* Update src/loaders/markdown/transformer/rehypeLink.ts

* refactor: new way to handle special links

fix: workaround for helmet lost in ssr since umi@4.0.54 (#1525)

* fix: helmet lost in ssr since umi@4.0.53

* refactor: patch helmet for version range

* style: update

fix: react types is missing in react template (#1526)

build: release 2.1.15

Revert "Merge branch 'master' into wuxh/feat-1463"

This reverts commit