Merge branch 'main' into feat/ssr-circular-import

vitejs · Jul 18, 2021 · c0f4983 · c0f4983
2 parents 40e7812 + e47a6f2
commit c0f4983
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 19 deletions.
diff --git a/.github/workflows/lock-closed-issues.yml b/.github/workflows/lock-closed-issues.yml
@@ -2,7 +2,7 @@ name: Lock Closed Issues
 
 on:
   schedule:
-    - cron: "0 0 * * *"
+    - cron: "0 0 */7 * *"
 
 permissions:
   issues: write
@@ -15,9 +15,9 @@ jobs:
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           issue-lock-inactive-days: "14"
-          issue-lock-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).
+          #issue-lock-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).
           issue-lock-reason: ""
           process-only: "issues"
diff --git a/docs/guide/api-javascript.md b/docs/guide/api-javascript.md
@@ -4,13 +4,13 @@ Vite's JavaScript APIs are fully typed, and it's recommended to use TypeScript o
 
 ## `createServer`
 
-**Type Signature**
+**Type Signature:**
 
 ```ts
 async function createServer(inlineConfig?: InlineConfig): Promise<ViteDevServer>
 ```
 
-**Example Usage**
+**Example Usage:**
 
 ```js
 const { createServer } = require('vite')
@@ -121,15 +121,15 @@ interface ViteDevServer {
 
 ## `build`
 
-**Type Signature**
+**Type Signature:**
 
 ```ts
 async function build(
   inlineConfig?: InlineConfig
 ): Promise<RollupOutput | RollupOutput[]>
 ```
 
-**Example Usage**
+**Example Usage:**
 
 ```js
 const path = require('path')
@@ -150,7 +150,7 @@ const { build } = require('vite')
 
 ## `resolveConfig`
 
-**Type Signature**
+**Type Signature:**
 
 ```ts
 async function resolveConfig(

diff --git a/docs/guide/api-plugin.md b/docs/guide/api-plugin.md
@@ -154,7 +154,7 @@ Vite plugins can also provide hooks that serve Vite-specific purposes. These hoo
 
   Modify Vite config before it's resolved. The hook receives the raw user config (CLI options merged with config file) and the current config env which exposes the `mode` and `command` being used. It can return a partial config object that will be deeply merged into existing config, or directly mutate the config (if the default merging cannot achieve the desired result).
 
-  **Example**
+  **Example:**
 
   ```js
   // return partial config (recommended)
@@ -289,7 +289,7 @@ Vite plugins can also provide hooks that serve Vite-specific purposes. These hoo
   - An array of tag descriptor objects (`{ tag, attrs, children }`) to inject to the existing HTML. Each tag can also specify where it should be injected to (default is prepending to `<head>`)
   - An object containing both as `{ html, tags }`
 
-  **Basic Example**
+  **Basic Example:**
 
   ```js
   const htmlPlugin = () => {

diff --git a/packages/playground/ssr-vue/src/App.vue b/packages/playground/ssr-vue/src/App.vue
@@ -16,7 +16,7 @@
   font-style: italic;
   font-weight: 400;
   font-display: swap;
-  src: url('./assets/fonts/Inter-Italic.woff2?#iefix') format('woff2'),
+  src: url('./assets/fonts/Inter-Italic.woff2#iefix') format('woff2'),
     url('./assets/fonts/Inter-Italic.woff') format('woff');
 }
 .inter {

diff --git a/packages/playground/ssr-vue/src/entry-server.js b/packages/playground/ssr-vue/src/entry-server.js
@@ -49,13 +49,11 @@ function renderPreloadLink(file) {
   } else if (file.endsWith('.woff2')) {
     return ` <link rel="preload" href="${file}" as="font" type="font/woff2" crossorigin>`
   } else if (file.endsWith('.gif')) {
-    return ` <link rel="preload" href="${file}" as="image" type="image/gif" crossorigin>`
-  } else if (file.endsWith('.jpg')) {
-    return ` <link rel="preload" href="${file}" as="image" type="image/jpeg" crossorigin>`
-  } else if (file.endsWith('.jpeg')) {
-    return ` <link rel="preload" href="${file}" as="image" type="image/jpeg" crossorigin>`
+    return ` <link rel="preload" href="${file}" as="image" type="image/gif">`
+  } else if (file.endsWith('.jpg') || file.endsWith('.jpeg')) {
+    return ` <link rel="preload" href="${file}" as="image" type="image/jpeg">`
   } else if (file.endsWith('.png')) {
-    return ` <link rel="preload" href="${file}" as="image" type="image/png" crossorigin>`
+    return ` <link rel="preload" href="${file}" as="image" type="image/png">`
   } else {
     // TODO
     return ''