Skip to content

chore: merge dev into main #1249

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 9 commits into from
May 27, 2025
Merged

chore: merge dev into main #1249

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
7230d1e
chore: remove unused deps (#20097)
sapphi-red May 23, 2025
e0a297b
fix(deps): update all non-major dependencies (#20061)
renovate[bot] May 26, 2025
19ac305
docs: tiny typo (#20110)
iiio2 May 26, 2025
6508146
docs(features): mention inlining in static assets section (#20109)
sapphi-red May 26, 2025
0f3e9fa
docs: clarify that rebasing `url()` references starting with a variab…
sapphi-red May 26, 2025
450c7d2
docs(en): merging all conflicts
docschina-bot May 26, 2025
2a0a22a
fix: resolved conflict
thinkasany May 27, 2025
c39a543
chore: update deps
thinkasany May 27, 2025
1d5fd67
Merge pull request #1248 from vitejs/sync-0f3e9fa6-1
thinkasany May 27, 2025
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
4 changes: 2 additions & 2 deletions guide/features.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,7 @@ npm add -D stylus

如果使用的是单文件组件，可以通过 `<style lang="sass">`（或其他预处理器）自动开启。

Vite 为 Sass 和 Less 改进了 `@import` 解析，以保证 Vite 别名也能被使用。另外，`url()` 中的相对路径引用的，与根文件不同目录中的 Sass/Less 文件会自动变基以保证正确性。
Vite 为 Sass 和 Less 改进了 `@import` 解析，以保证 Vite 别名也能被使用。另外，`url()` 中的相对路径引用的，与根文件不同目录中的 Sass/Less 文件会自动变基以保证正确性。由于 API 限制，不支持重新设置以变量或插值开头的 `url()` 引用。

由于 Stylus API 限制，`@import` 别名和 URL 变基不支持 Stylus。

Expand Down Expand Up @@ -364,7 +364,7 @@ document.getElementById('hero-img').src = imgUrl
```js twoslash
import 'vite/client'
// ---cut---
// 显式加载资源为一个 URL
// 显式加载资源为一个 URL（根据文件大小自动内联）
import assetAsURL from './asset.js?url'
```

Expand Down
8 changes: 4 additions & 4 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,19 +9,19 @@
"license": "CC BY-NC-SA 4.0",
"devDependencies": {
"@shikijs/vitepress-twoslash": "^2.5.0",
"@types/express": "^5.0.1",
"@types/express": "^5.0.2",
"feed": "^5.0.1",
"vitepress": "^1.6.3",
"vitepress-plugin-group-icons": "^1.5.2",
"vue": "^3.5.13",
"vitepress-plugin-group-icons": "^1.5.5",
"vue": "^3.5.14",
"@types/node": "^20.9.2",
"@type-challenges/utils": "^0.1.1",
"chalk": "^4.1.2",
"gray-matter": "^4.0.3",
"lodash": "^4.17.21",
"vite": "^6.3.0-beta.0",
"yorkie": "^2.0.0",
"gsap": "^3.12.4"
"gsap": "^3.13.0"
},
"packageManager": "[email protected]",
"scripts": {
Expand Down
Loading