Skip to content

Commit c126ba5

Browse files
committed
Merge remote-tracking branch 'upstream/main' into 1538
# Conflicts: # guide/migration.md
2 parents d7119b9 + 4354b58 commit c126ba5

File tree

118 files changed

+10145
-1723
lines changed

Some content is hidden

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

118 files changed

+10145
-1723
lines changed

.vitepress/buildEnd.config.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { Feed } from 'feed'
44
import type { SiteConfig } from 'vitepress'
55
import { createContentLoader } from 'vitepress'
66

7-
const siteUrl = 'https://vitejs.dev'
7+
const siteUrl = 'https://vite.dev'
88
const blogUrl = `${siteUrl}/blog`
99

1010
export const buildEnd = async (config: SiteConfig): Promise<void> => {
@@ -14,9 +14,9 @@ export const buildEnd = async (config: SiteConfig): Promise<void> => {
1414
id: blogUrl,
1515
link: blogUrl,
1616
language: 'en',
17-
image: 'https://vitejs.dev/og-image.png',
18-
favicon: 'https://vitejs.dev/logo.svg',
19-
copyright: 'Copyright © 2019-present Evan You & Vite Contributors',
17+
image: 'https://vite.dev/og-image.png',
18+
favicon: 'https://vite.dev/logo.svg',
19+
copyright: 'Copyright © 2019-present VoidZero Inc. & Vite Contributors',
2020
})
2121

2222
const posts = await createContentLoader('blog/*.md', {

.vitepress/config.ts

Lines changed: 95 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,16 @@
11
import type { DefaultTheme } from 'vitepress'
22
import { defineConfig } from 'vitepress'
33
import { transformerTwoslash } from '@shikijs/vitepress-twoslash'
4+
import {
5+
groupIconMdPlugin,
6+
groupIconVitePlugin,
7+
} from 'vitepress-plugin-group-icons'
48
import { buildEnd } from './buildEnd.config'
59

610
const ogDescription = '次世代フロントエンドツール'
7-
const ogImage = 'https://vitejs.dev/og-image.png'
11+
const ogImage = 'https://vite.dev/og-image.jpg'
812
const ogTitle = 'Vite'
9-
const ogUrl = 'https://vitejs.dev'
13+
const ogUrl = 'https://vite.dev'
1014

1115
// netlify envs
1216
const deployURL = process.env.DEPLOY_PRIME_URL || ''
@@ -36,15 +40,15 @@ const versionLinks = ((): DefaultTheme.NavItemWithLink[] => {
3640
const oldVersions: DefaultTheme.NavItemWithLink[] = [
3741
{
3842
text: 'Vite 4 ドキュメント',
39-
link: 'https://v4.vitejs.dev',
43+
link: 'https://v4.vite.dev',
4044
},
4145
{
4246
text: 'Vite 3 ドキュメント',
43-
link: 'https://v3.vitejs.dev',
47+
link: 'https://v3.vite.dev',
4448
},
4549
{
4650
text: 'Vite 2 ドキュメント',
47-
link: 'https://v2.vitejs.dev',
51+
link: 'https://v2.vite.dev',
4852
},
4953
]
5054

@@ -54,7 +58,7 @@ const versionLinks = ((): DefaultTheme.NavItemWithLink[] => {
5458
return [
5559
{
5660
text: 'Vite 5 ドキュメント(リリース)',
57-
link: 'https://vitejs.dev',
61+
link: 'https://vite.dev',
5862
},
5963
...oldVersions,
6064
]
@@ -73,6 +77,30 @@ export default defineConfig({
7377
'link',
7478
{ rel: 'alternate', type: 'application/rss+xml', href: '/blog.rss' },
7579
],
80+
['link', { rel: 'preconnect', href: 'https://fonts.googleapis.com' }],
81+
[
82+
'link',
83+
{
84+
rel: 'preconnect',
85+
href: 'https://fonts.gstatic.com',
86+
crossorigin: 'true',
87+
},
88+
],
89+
[
90+
'link',
91+
{
92+
rel: 'preload',
93+
href: 'https://fonts.googleapis.com/css2?family=Inter:wght@400;500;600&family=Manrope:wght@600&family=IBM+Plex+Mono:wght@400&display=swap',
94+
as: 'style',
95+
},
96+
],
97+
[
98+
'link',
99+
{
100+
rel: 'stylesheet',
101+
href: 'https://fonts.googleapis.com/css2?family=Inter:wght@400;500;600&family=Manrope:wght@600&family=IBM+Plex+Mono:wght@400&display=swap',
102+
},
103+
],
76104
['link', { rel: 'me', href: 'https://m.webtoo.ls/@vite' }],
77105
['meta', { property: 'og:type', content: 'website' }],
78106
['meta', { property: 'og:title', content: ogTitle }],
@@ -96,12 +124,12 @@ export default defineConfig({
96124

97125
locales: {
98126
root: { label: '日本語' },
99-
en: { label: 'English', link: 'https://vitejs.dev' },
100-
zh: { label: '简体中文', link: 'https://cn.vitejs.dev' },
101-
es: { label: 'Español', link: 'https://es.vitejs.dev' },
102-
pt: { label: 'Português', link: 'https://pt.vitejs.dev' },
103-
ko: { label: '한국어', link: 'https://ko.vitejs.dev' },
104-
de: { label: 'Deutsch', link: 'https://de.vitejs.dev' },
127+
en: { label: 'English', link: 'https://vite.dev' },
128+
zh: { label: '简体中文', link: 'https://cn.vite.dev' },
129+
es: { label: 'Español', link: 'https://es.vite.dev' },
130+
pt: { label: 'Português', link: 'https://pt.vite.dev' },
131+
ko: { label: '한국어', link: 'https://ko.vite.dev' },
132+
de: { label: 'Deutsch', link: 'https://de.vite.dev' },
105133
},
106134

107135
themeConfig: {
@@ -115,13 +143,13 @@ export default defineConfig({
115143
socialLinks: [
116144
{ icon: 'mastodon', link: 'https://elk.zone/m.webtoo.ls/@vite' },
117145
{ icon: 'twitter', link: 'https://twitter.com/vite_js' },
118-
{ icon: 'discord', link: 'https://chat.vitejs.dev' },
146+
{ icon: 'discord', link: 'https://chat.vite.dev' },
119147
{ icon: 'github', link: 'https://github.com/vitejs/vite' },
120148
],
121149

122150
algolia: {
123151
appId: '7H67QR5P0A',
124-
apiKey: 'deaab78bcdfe96b599497d25acc6460e',
152+
apiKey: '208bb9c14574939326032b937431014b',
125153
indexName: 'vitejs',
126154
searchParameters: {
127155
facetFilters: ['tags:en'],
@@ -142,7 +170,7 @@ export default defineConfig({
142170

143171
footer: {
144172
message: `Released under the MIT License. (${commitRef})`,
145-
copyright: 'Copyright © 2019-present Evan You & Vite Contributors',
173+
copyright: 'Copyright © 2019-present VoidZero Inc. & Vite Contributors',
146174
},
147175

148176
nav: [
@@ -167,7 +195,7 @@ export default defineConfig({
167195
},
168196
{
169197
text: 'Discord Chat',
170-
link: 'https://chat.vitejs.dev',
198+
link: 'https://chat.vite.dev',
171199
},
172200
{
173201
text: 'Awesome Vite',
@@ -294,12 +322,33 @@ export default defineConfig({
294322
link: '/guide/api-javascript',
295323
},
296324
{
297-
text: 'Environment API',
325+
text: '設定リファレンス',
326+
link: '/config/',
327+
},
328+
],
329+
},
330+
{
331+
text: 'Environment API',
332+
items: [
333+
{
334+
text: 'はじめに',
298335
link: '/guide/api-environment',
299336
},
300337
{
301-
text: '設定リファレンス',
302-
link: '/config/',
338+
text: '環境インスタンス',
339+
link: '/guide/api-environment-instances',
340+
},
341+
{
342+
text: 'プラグイン',
343+
link: '/guide/api-environment-plugins',
344+
},
345+
{
346+
text: 'フレームワーク',
347+
link: '/guide/api-environment-frameworks',
348+
},
349+
{
350+
text: 'ランタイム',
351+
link: '/guide/api-environment-runtimes',
303352
},
304353
],
305354
},
@@ -401,6 +450,33 @@ export default defineConfig({
401450
},
402451
markdown: {
403452
codeTransformers: [transformerTwoslash()],
453+
config(md) {
454+
md.use(groupIconMdPlugin)
455+
},
456+
},
457+
vite: {
458+
plugins: [
459+
groupIconVitePlugin({
460+
customIcon: {
461+
firebase: 'vscode-icons:file-type-firebase',
462+
'.gitlab-ci.yml': 'vscode-icons:file-type-gitlab',
463+
},
464+
}),
465+
],
466+
environments: {
467+
client: {
468+
dev: {
469+
optimizeDeps: {
470+
include: [
471+
'@shikijs/vitepress-twoslash/client',
472+
'gsap',
473+
'gsap/dist/ScrollTrigger',
474+
'gsap/dist/MotionPathPlugin',
475+
],
476+
},
477+
},
478+
},
479+
},
404480
},
405481
buildEnd,
406482
})

.vitepress/theme/components/AsideSponsors.vue

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@ const sponsors = computed(() => {
2020
<template>
2121
<a
2222
class="viteconf"
23-
href="https://viteconf.org/?utm=vite-sidebar"
23+
href="https://viteconf.org/24/replay?utm=vite-sidebar"
2424
target="_blank"
2525
>
26-
<img width="22" height="22" src="/viteconf.svg" />
26+
<img width="22" height="22" src="/viteconf.svg" alt="ViteConf Logo" />
2727
<span>
2828
<p class="extra-info">Building Together</p>
29-
<p class="heading">ViteConf 24 - Oct 3</p>
30-
<p class="extra-info">Get your free ticket!</p>
29+
<p class="heading">ViteConf 2024</p>
30+
<p class="extra-info">リプレイを視聴する!</p>
3131
</span>
3232
</a>
3333
<VPDocAsideSponsors v-if="data" :data="sponsors" />

.vitepress/theme/components/BlogIndex.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<script setup lang="ts">
2-
import { data as posts } from './blog.data'
2+
import { data as posts } from '../../../_data/blog.data'
33
44
function getDateTime(time: number) {
55
return new Date(time).toISOString()

.vitepress/theme/components/HomeSponsors.vue

Lines changed: 0 additions & 66 deletions
This file was deleted.

0 commit comments

Comments
 (0)