Skip to content

Commit 619d973

Browse files
committed
Merge upstream main - 合并上游更新并保留文档存储配置功能
- 从 doocs/md 合并 16 个新提交 - 保留文档存储配置功能 - 新增模板管理功能 - 修复 DocumentStorageDialog 中 store 导入路径 - 更新依赖和其他优化
1 parent fba5f09 commit 619d973

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+8740
-12483
lines changed

.github/workflows/cloudflare-preview.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
pull-requests: write
2020
steps:
2121
- name: Checkout
22-
uses: actions/checkout@v5
22+
uses: actions/checkout@v6
2323
with:
2424
ref: ${{ github.event.pull_request.head.sha }}
2525

.github/workflows/deploy-gitee.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
if: github.repository == 'doocs/md'
1616
steps:
1717
- name: Checkout
18-
uses: actions/checkout@v5
18+
uses: actions/checkout@v6
1919
with:
2020
fetch-depth: 0 # 获取完整历史,便于推送到新分支
2121

.github/workflows/deploy.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
if: github.repository == 'doocs/md'
1616
steps:
1717
- name: Checkout
18-
uses: actions/checkout@v5
18+
uses: actions/checkout@v6
1919
with:
2020
persist-credentials: false
2121

@@ -74,7 +74,7 @@ jobs:
7474
if: github.repository == 'doocs/md'
7575
steps:
7676
- name: Checkout
77-
uses: actions/checkout@v5
77+
uses: actions/checkout@v6
7878

7979
- name: Set up node
8080
uses: actions/setup-node@v6

.github/workflows/docker.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
if: github.repository == 'doocs/md'
1313
steps:
1414
- name: Checkout code
15-
uses: actions/checkout@v5
15+
uses: actions/checkout@v6
1616

1717
- name: Set up QEMU
1818
uses: docker/setup-qemu-action@v3

.github/workflows/release-cli.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
runs-on: ubuntu-latest
1515
if: github.repository == 'doocs/md'
1616
steps:
17-
- uses: actions/checkout@v5
17+
- uses: actions/checkout@v6
1818

1919
- uses: actions/setup-node@v6
2020
with:

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
if: github.repository == 'doocs/md'
1313
steps:
1414
- name: Checkout code
15-
uses: actions/checkout@v5
15+
uses: actions/checkout@v6
1616

1717
- name: Extract Changelog for Tag
1818
id: changelog

.github/workflows/surge-preview-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
runs-on: ubuntu-latest
1010
if: github.repository == 'doocs/md'
1111
steps:
12-
- uses: actions/checkout@v5
12+
- uses: actions/checkout@v6
1313
with:
1414
ref: ${{ github.event.pull_request.head.sha }}
1515

apps/vscode/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -81,14 +81,14 @@
8181
"@md/core": "workspace:*",
8282
"@md/shared": "workspace:*",
8383
"@types/webpack": "^5.28.5",
84-
"isomorphic-dompurify": "^2.31.0",
85-
"postcss": "^8.5.1",
84+
"isomorphic-dompurify": "^2.32.0",
85+
"postcss": "^8.5.6",
8686
"ts-loader": "^9.5.4",
8787
"tsconfig-paths-webpack-plugin": "^4.2.0"
8888
},
8989
"devDependencies": {
90-
"@types/vscode": "^1.105.0",
91-
"@vscode/vsce": "^3.6.2",
90+
"@types/vscode": "^1.106.1",
91+
"@vscode/vsce": "^3.7.0",
9292
"webpack-cli": "^6.0.1"
9393
}
9494
}

apps/vscode/src/extension.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import type { ThemeName } from '@md/shared'
22
import { initRenderer } from '@md/core/renderer'
3-
import { generateCSSVariables, modifyHtmlContent } from '@md/core/utils'
3+
import { generateCSSVariables } from '@md/core/theme'
4+
import { modifyHtmlContent } from '@md/core/utils'
45
import { baseCSSContent, themeMap } from '@md/shared'
56
import * as vscode from 'vscode'
67
import { css } from './css'

apps/vscode/tsconfig.json

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"compilerOptions": {
33
"target": "ES2022",
44
"lib": ["ES2022"],
5-
"module": "es2015",
5+
"module": "esnext",
66
"moduleResolution": "bundler",
77
"paths": {
88
"@/*": ["../*"]
@@ -12,6 +12,9 @@
1212
"sourceMap": true,
1313
"esModuleInterop": true
1414
},
15-
"include": ["src/**/*"],
15+
"include": [
16+
"src/**/*",
17+
"../../packages/shared/src/global.d.ts"
18+
],
1619
"exclude": ["node_modules", "dist"]
1720
}

0 commit comments

Comments
 (0)