Skip to content

Commit

Permalink
chore: merge main
Browse files Browse the repository at this point in the history
  • Loading branch information
sapphi-red committed Oct 25, 2024
2 parents f22ae96 + 91a1acb commit 38942b1
Show file tree
Hide file tree
Showing 294 changed files with 6,113 additions and 5,145 deletions.
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/bug_report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -78,13 +78,13 @@ body:
required: true
- label: Read the [Contributing Guidelines](https://github.com/vitejs/vite/blob/main/CONTRIBUTING.md).
required: true
- label: Read the [docs](https://vitejs.dev/guide).
- label: Read the [docs](https://vite.dev/guide).
required: true
- label: Check that there isn't [already an issue](https://github.com/vitejs/vite/issues) that reports the same bug to avoid creating a duplicate.
required: true
- label: Make sure this is a Vite issue and not a framework-specific issue. For example, if it's a Vue SFC related bug, it should likely be reported to [vuejs/core](https://github.com/vuejs/core) instead.
required: true
- label: Check that this is a concrete bug. For Q&A open a [GitHub Discussion](https://github.com/vitejs/vite/discussions) or join our [Discord Chat Server](https://chat.vitejs.dev/).
- label: Check that this is a concrete bug. For Q&A open a [GitHub Discussion](https://github.com/vitejs/vite/discussions) or join our [Discord Chat Server](https://chat.vite.dev/).
required: true
- label: The provided reproduction is a [minimal reproducible example](https://stackoverflow.com/help/minimal-reproducible-example) of the bug.
required: true
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ contact_links:
url: https://github.com/vitejs/vite-plugin-vue/issues/new/choose
about: Vue related issues should be reported on the vite-plugin-vue repository.
- name: Discord Chat
url: https://chat.vitejs.dev
url: https://chat.vite.dev
about: Ask questions and discuss with other Vite users in real time.
- name: Questions & Discussions
url: https://github.com/vitejs/vite/discussions
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/docs.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: "\U0001F4DA Documentation"
description: Suggest a change or new page to be added to vitejs.dev
description: Suggest a change or new page to be added to vite.dev
labels: [documentation]
body:
- type: markdown
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/feature_request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ body:
required: true
- label: Read the [Contributing Guidelines](https://github.com/vitejs/vite/blob/main/CONTRIBUTING.md).
required: true
- label: Read the [docs](https://vitejs.dev/guide).
- label: Read the [docs](https://vite.dev/guide).
required: true
- label: Check that there isn't already an issue that request the same feature to avoid creating a duplicate.
required: true
20 changes: 18 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ jobs:

- name: Get changed files
id: changed-files
uses: tj-actions/changed-files@48d8f15b2aaa3d255ca5af3eba4870f807ce6b3c # v45.0.2
uses: tj-actions/changed-files@c3a1bb2c992d77180ae65be6ae6c166cf40f857c # v45.0.3
with:
files: |
docs/**
Expand Down Expand Up @@ -129,6 +129,22 @@ jobs:
- name: Test build
run: pnpm run test-build

test-passed:
if: (!cancelled() && !failure())
needs: test
runs-on: ubuntu-latest
name: Build & Test Passed or Skipped
steps:
- run: echo "Build & Test Passed or Skipped"

test-failed:
if: (!cancelled() && failure())
needs: test
runs-on: ubuntu-latest
name: Build & Test Failed
steps:
- run: echo "Build & Test Failed"

lint:
timeout-minutes: 10
runs-on: ubuntu-latest
Expand All @@ -155,7 +171,7 @@ jobs:
run: pnpm run lint

- name: Check formatting
run: pnpm prettier --check .
run: pnpm prettier --write --log-level=warn . && git diff --exit-code

- name: Typecheck
run: pnpm run typecheck
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lock-closed-issues.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@ jobs:
#issue-comment: |
# This issue has been locked since it has been closed for more than 14 days.
#
# If you have found a concrete bug or regression related to it, please open a new [bug report](https://github.com/vitejs/vite/issues/new/choose) with a reproduction against the latest Vite version. If you have any other comments you should join the chat at [Vite Land](https://chat.vitejs.dev) or create a new [discussion](https://github.com/vitejs/vite/discussions).
# If you have found a concrete bug or regression related to it, please open a new [bug report](https://github.com/vitejs/vite/issues/new/choose) with a reproduction against the latest Vite version. If you have any other comments you should join the chat at [Vite Land](https://chat.vite.dev) or create a new [discussion](https://github.com/vitejs/vite/discussions).
issue-lock-reason: ""
process-only: "issues"
2 changes: 1 addition & 1 deletion CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ This Code of Conduct applies both within project spaces and in public spaces whe

## Enforcement

Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team by DM at [Vite Land](https://chat.vitejs.dev). All complaints will be reviewed and investigated and will result in a response that is deemed necessary and appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team by DM at [Vite Land](https://chat.vite.dev). All complaints will be reviewed and investigated and will result in a response that is deemed necessary and appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.

Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.

Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Vite Contributing Guide

Hi! We're really excited that you're interested in contributing to Vite! Before submitting your contribution, please read through the following guide. We also suggest you read the [Project Philosophy](https://vitejs.dev/guide/philosophy) in our documentation.
Hi! We're really excited that you're interested in contributing to Vite! Before submitting your contribution, please read through the following guide. We also suggest you read the [Project Philosophy](https://vite.dev/guide/philosophy) in our documentation.

You can use [StackBlitz Codeflow](https://stackblitz.com/codeflow) to fix bugs or implement features. You'll see a Codeflow button on issues to start a PR to fix them. A button will also appear on PRs to review them without needing to check out the branch locally. When using Codeflow, the Vite repository will be cloned for you in an online editor, with the Vite package built in watch mode ready to test your changes. If you'd like to learn more, check out the [Codeflow docs](https://developer.stackblitz.com/codeflow/what-is-codeflow).

Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2019-present, Yuxi (Evan) You and Vite contributors
Copyright (c) 2019-present, VoidZero Inc. and Vite contributors

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
14 changes: 7 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<p align="center">
<a href="https://vitejs.dev" target="_blank" rel="noopener noreferrer">
<img width="180" src="https://vitejs.dev/logo.svg" alt="Vite logo">
<a href="https://vite.dev" target="_blank" rel="noopener noreferrer">
<img width="180" src="https://vite.dev/logo.svg" alt="Vite logo">
</a>
</p>
<br/>
Expand All @@ -9,7 +9,7 @@
<a href="https://nodejs.org/en/about/previous-releases"><img src="https://img.shields.io/node/v/vite.svg" alt="node compatibility"></a>
<a href="https://github.com/vitejs/vite/actions/workflows/ci.yml"><img src="https://github.com/vitejs/vite/actions/workflows/ci.yml/badge.svg?branch=main" alt="build status"></a>
<a href="https://pr.new/vitejs/vite"><img src="https://developer.stackblitz.com/img/start_pr_dark_small.svg" alt="Start new PR in StackBlitz Codeflow"></a>
<a href="https://chat.vitejs.dev"><img src="https://img.shields.io/badge/chat-discord-blue?style=flat&logo=discord" alt="discord chat"></a>
<a href="https://chat.vite.dev"><img src="https://img.shields.io/badge/chat-discord-blue?style=flat&logo=discord" alt="discord chat"></a>
</p>
<br/>

Expand All @@ -26,13 +26,13 @@

Vite (French word for "quick", pronounced [`/vit/`](https://cdn.jsdelivr.net/gh/vitejs/vite@main/docs/public/vite.mp3), like "veet") is a new breed of frontend build tooling that significantly improves the frontend development experience. It consists of two major parts:

- A dev server that serves your source files over [native ES modules](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Modules), with [rich built-in features](https://vitejs.dev/guide/features.html) and astonishingly fast [Hot Module Replacement (HMR)](https://vitejs.dev/guide/features.html#hot-module-replacement).
- A dev server that serves your source files over [native ES modules](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Modules), with [rich built-in features](https://vite.dev/guide/features.html) and astonishingly fast [Hot Module Replacement (HMR)](https://vite.dev/guide/features.html#hot-module-replacement).

- A [build command](https://vitejs.dev/guide/build.html) that bundles your code with [Rollup](https://rollupjs.org), pre-configured to output highly optimized static assets for production.
- A [build command](https://vite.dev/guide/build.html) that bundles your code with [Rollup](https://rollupjs.org), pre-configured to output highly optimized static assets for production.

In addition, Vite is highly extensible via its [Plugin API](https://vitejs.dev/guide/api-plugin.html) and [JavaScript API](https://vitejs.dev/guide/api-javascript.html) with full typing support.
In addition, Vite is highly extensible via its [Plugin API](https://vite.dev/guide/api-plugin.html) and [JavaScript API](https://vite.dev/guide/api-javascript.html) with full typing support.

[Read the Docs to Learn More](https://vitejs.dev).
[Read the Docs to Learn More](https://vite.dev).

## Packages

Expand Down
8 changes: 4 additions & 4 deletions docs/.vitepress/buildEnd.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { Feed } from 'feed'
import type { SiteConfig } from 'vitepress'
import { createContentLoader } from 'vitepress'

const siteUrl = 'https://vitejs.dev'
const siteUrl = 'https://vite.dev'
const blogUrl = `${siteUrl}/blog`

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

const posts = await createContentLoader('blog/*.md', {
Expand Down
72 changes: 53 additions & 19 deletions docs/.vitepress/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ import {
import { buildEnd } from './buildEnd.config'

const ogDescription = 'Next Generation Frontend Tooling'
const ogImage = 'https://vitejs.dev/og-image.png'
const ogImage = 'https://vite.dev/og-image.jpg'
const ogTitle = 'Vite'
const ogUrl = 'https://vitejs.dev'
const ogUrl = 'https://vite.dev'

// netlify envs
const deployURL = process.env.DEPLOY_PRIME_URL || ''
Expand Down Expand Up @@ -40,15 +40,15 @@ const versionLinks = ((): DefaultTheme.NavItemWithLink[] => {
const oldVersions: DefaultTheme.NavItemWithLink[] = [
{
text: 'Vite 4 Docs',
link: 'https://v4.vitejs.dev',
link: 'https://v4.vite.dev',
},
{
text: 'Vite 3 Docs',
link: 'https://v3.vitejs.dev',
link: 'https://v3.vite.dev',
},
{
text: 'Vite 2 Docs',
link: 'https://v2.vitejs.dev',
link: 'https://v2.vite.dev',
},
]

Expand All @@ -58,7 +58,7 @@ const versionLinks = ((): DefaultTheme.NavItemWithLink[] => {
return [
{
text: 'Vite 5 Docs (release)',
link: 'https://vitejs.dev',
link: 'https://vite.dev',
},
...oldVersions,
]
Expand Down Expand Up @@ -124,12 +124,12 @@ export default defineConfig({

locales: {
root: { label: 'English' },
zh: { label: '简体中文', link: 'https://cn.vitejs.dev' },
ja: { label: '日本語', link: 'https://ja.vitejs.dev' },
es: { label: 'Español', link: 'https://es.vitejs.dev' },
pt: { label: 'Português', link: 'https://pt.vitejs.dev' },
ko: { label: '한국어', link: 'https://ko.vitejs.dev' },
de: { label: 'Deutsch', link: 'https://de.vitejs.dev' },
zh: { label: '简体中文', link: 'https://cn.vite.dev' },
ja: { label: '日本語', link: 'https://ja.vite.dev' },
es: { label: 'Español', link: 'https://es.vite.dev' },
pt: { label: 'Português', link: 'https://pt.vite.dev' },
ko: { label: '한국어', link: 'https://ko.vite.dev' },
de: { label: 'Deutsch', link: 'https://de.vite.dev' },
},

themeConfig: {
Expand All @@ -143,7 +143,7 @@ export default defineConfig({
socialLinks: [
{ icon: 'mastodon', link: 'https://elk.zone/m.webtoo.ls/@vite' },
{ icon: 'twitter', link: 'https://twitter.com/vite_js' },
{ icon: 'discord', link: 'https://chat.vitejs.dev' },
{ icon: 'discord', link: 'https://chat.vite.dev' },
{ icon: 'github', link: 'https://github.com/vitejs/vite' },
],

Expand All @@ -163,8 +163,7 @@ export default defineConfig({

footer: {
message: `Released under the MIT License. (${commitRef})`,
copyright:
'Copyright © 2019-present Yuxi (Evan) You & Vite Contributors',
copyright: 'Copyright © 2019-present VoidZero Inc. & Vite Contributors',
},

nav: [
Expand All @@ -189,7 +188,7 @@ export default defineConfig({
},
{
text: 'Discord Chat',
link: 'https://chat.vitejs.dev',
link: 'https://chat.vite.dev',
},
{
text: 'Awesome Vite',
Expand Down Expand Up @@ -316,12 +315,33 @@ export default defineConfig({
link: '/guide/api-javascript',
},
{
text: 'Environment API',
text: 'Config Reference',
link: '/config/',
},
],
},
{
text: 'Environment API',
items: [
{
text: 'Introduction',
link: '/guide/api-environment',
},
{
text: 'Config Reference',
link: '/config/',
text: 'Environment instances',
link: '/guide/api-environment-instances',
},
{
text: 'Plugins',
link: '/guide/api-environment-plugins',
},
{
text: 'Frameworks',
link: '/guide/api-environment-frameworks',
},
{
text: 'Runtimes',
link: '/guide/api-environment-runtimes',
},
],
},
Expand Down Expand Up @@ -436,6 +456,20 @@ export default defineConfig({
},
}),
],
environments: {
client: {
dev: {
optimizeDeps: {
include: [
'@shikijs/vitepress-twoslash/client',
'gsap',
'gsap/dist/ScrollTrigger',
'gsap/dist/MotionPathPlugin',
],
},
},
},
},
},
buildEnd,
})
6 changes: 3 additions & 3 deletions docs/.vitepress/theme/components/AsideSponsors.vue
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,14 @@ const sponsors = computed(() => {
<template>
<a
class="viteconf"
href="https://viteconf.org/?utm=vite-sidebar"
href="https://viteconf.org/24/replay?utm=vite-sidebar"
target="_blank"
>
<img width="22" height="22" src="/viteconf.svg" alt="ViteConf Logo" />
<span>
<p class="extra-info">Building Together</p>
<p class="heading">ViteConf 24 - Oct 3</p>
<p class="extra-info">Get your free ticket!</p>
<p class="heading">ViteConf 2024</p>
<p class="extra-info">Watch the replay!</p>
</span>
</a>
<VPDocAsideSponsors v-if="data" :data="sponsors" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,13 @@ import HeroDiagram from './HeroDiagram.vue'
<div class="hero">
<div class="container">
<!-- ViteConf Replay Button -->
<a href="https://viteconf.org/" class="hero__pill" target="_blank">
<a
href="https://viteconf.org/24/replay?utm=vite"
class="hero__pill"
target="_blank"
>
<img src="/viteconf.svg" alt="Viteconf logo" width="20" height="20" />
<span>ViteConf 2024 - Oct 3rd & 4th</span>
<span>ViteConf 2024 Talks</span>
</a>

<!-- Heading -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@ const { isCardActive, startAnimation } = useCardAnimation(
<span class="code code__inactive">
<span class="code--red">import</span> { createServer }
<span class="code--red">from</span>
<span class="code--blue">'vite'</span><br /><br />
<span class="code--blue">&nbsp;'vite'</span><br /><br />
<span class="code--red">const</span> server =
<span class="code--red">await</span>
<span class="code--purple">createServer</span>({<br />
<span class="code--purple">&nbsp;createServer</span>({<br />
<span class="code--grey"
>&nbsp;&nbsp;&nbsp;// user config options</span
><br />
Expand Down
Loading

0 comments on commit 38942b1

Please sign in to comment.