Skip to content

Commit

Permalink
Merge branch 'master' into feature/content-footer
Browse files Browse the repository at this point in the history
  • Loading branch information
PeachScript authored Jul 30, 2023
2 parents e8e3190 + 7471ce8 commit 980a58c
Show file tree
Hide file tree
Showing 18 changed files with 869 additions and 471 deletions.
16 changes: 16 additions & 0 deletions .dumi/theme/slots/HeaderExtra/index.less
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
@import (reference) '../../../../theme-default/styles/variables.less';

.@{prefix}-lang-select.dumi-version-select {
border-inline-start: 1px solid @c-border;
margin-inline-start: 15px;
padding-inline-start: 5px;

@{dark-selector} & {
border-inline-start-color: @c-border-dark;
}

> select {
padding-top: 1px;
padding-bottom: 1px;
}
}
11 changes: 2 additions & 9 deletions .dumi/theme/slots/HeaderExtra/index.tsx
Original file line number Diff line number Diff line change
@@ -1,18 +1,11 @@
import { ReactComponent as IconDown } from '@ant-design/icons-svg/inline-svg/outlined/down.svg';
import React, { type FC } from 'react';
import './index.less';

const HeaderExtra: FC = () => {
return (
<div
className="dumi-default-lang-select"
style={{
borderInlineStart: '1px solid #d0d5d8',
marginInlineStart: 15,
paddingInlineStart: 5,
}}
>
<div className="dumi-default-lang-select dumi-version-select">
<select
style={{ paddingTop: 1, paddingBottom: 1 }}
value={process.env.DUMI_VERSION}
onChange={(e) => {
if (e.target.value !== process.env.DUMI_VERSION) {
Expand Down
1 change: 0 additions & 1 deletion docs/guide/auto-api-table.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ order: 2

- API 表格仅支持展示解析出的顶层属性
- `@description` 不支持多语言配置
- PNPM 等隔离幽灵依赖的项目解析速度会很慢,使用该特性时建议使用 Yarn 或 NPM
- Windows 操作系统上会工作不正常,目前不建议使用
:::

Expand Down
14 changes: 7 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -83,14 +83,14 @@
"@types/hast": "^2.3.4",
"@types/mdast": "^3.0.10",
"@types/nprogress": "^0.2.0",
"@umijs/bundler-utils": "^4.0.64",
"@umijs/core": "^4.0.64",
"@umijs/bundler-utils": "^4.0.73",
"@umijs/core": "^4.0.73",
"animated-scroll-to": "^2.3.0",
"classnames": "2.3.2",
"codesandbox": "^2.2.3",
"copy-to-clipboard": "^3.3.3",
"deepmerge": "^4.2.2",
"dumi-afx-deps": "^1.0.0-alpha.12",
"dumi-afx-deps": "^1.0.0-alpha.19",
"dumi-assets-types": "2.0.0-alpha.0",
"enhanced-resolve": "^5.10.0",
"estree-util-to-js": "^1.1.0",
Expand Down Expand Up @@ -131,7 +131,7 @@
"remark-rehype": "^10.1.0",
"sass": "^1.55.0",
"sitemap": "^7.1.1",
"umi": "^4.0.64",
"umi": "^4.0.73",
"unified": "^10.1.2",
"unist-util-visit": "^4.1.0",
"unist-util-visit-parents": "^5.1.1",
Expand All @@ -151,12 +151,12 @@
"@types/pluralize": "^0.0.29",
"@types/react": "^18.0.16",
"@types/react-copy-to-clipboard": "^5.0.4",
"@umijs/lint": "^4.0.64",
"@umijs/lint": "^4.0.73",
"@umijs/plugins": "4.0.32",
"dumi-theme-mobile": "workspace:*",
"eslint": "^8.20.0",
"fast-glob": "^3.2.12",
"father": "^4.1.0",
"father": "^4.3.0",
"highlight-words-core": "^1.2.2",
"husky": "^8.0.1",
"lint-staged": "^13.0.3",
Expand All @@ -166,7 +166,7 @@
"react": "^18.2.0",
"stylelint": "^15.10.1",
"ts-node": "^10.0.0",
"typescript": "~4.7.4",
"typescript": "~5.0.4",
"vitest": "^0.24.3"
},
"peerDependencies": {
Expand Down
Loading

0 comments on commit 980a58c

Please sign in to comment.