Skip to content

Commit 1d5030a

Browse files
committed
chore: merge main
2 parents 265e4d4 + b040d54 commit 1d5030a

Some content is hidden

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

53 files changed

+346
-158
lines changed

.github/renovate.json5

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
"node",
2323
"typescript",
2424
"@rollup/plugin-dynamic-import-vars", // prefer version using tinyglobby
25-
"@types/express", // express latest is still on v4, so types should also be v4
2625

2726
// pinned
2827
"slash3",

docs/config/server-options.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -377,6 +377,12 @@ export default defineConfig({
377377

378378
Blocklist for sensitive files being restricted to be served by Vite dev server. This will have higher priority than [`server.fs.allow`](#server-fs-allow). [picomatch patterns](https://github.com/micromatch/picomatch#globbing-features) are supported.
379379

380+
::: tip NOTE
381+
382+
This blocklist does not apply to [the public directory](/guide/assets.md#the-public-directory). All files in the public directory are served without any filtering, since they are copied directly to the output directory during build.
383+
384+
:::
385+
380386
## server.origin
381387

382388
- **Type:** `string`

docs/guide/api-environment-frameworks.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ const server = createServer()
160160
const ssrEnvironment = server.environment.ssr
161161
const input = {}
162162

163-
const { createHandler } = await ssrEnvironment.runner.import('./entry.js')
163+
const { createHandler } = await ssrEnvironment.runner.import('./entrypoint.js')
164164
const handler = createHandler(input)
165165
const response = handler(new Request('/'))
166166

docs/guide/env-and-mode.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
Vite exposes certain constants under the special `import.meta.env` object. These constants are defined as global variables during dev and statically replaced at build time to make tree-shaking effective.
44

5-
## Built-in constants
5+
## Built-in Constants
66

77
Some built-in constants are available in all cases:
88

docs/guide/index.md

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,10 @@ $ pnpm create vite
6565
$ bun create vite
6666
```
6767

68+
```bash [Deno]
69+
$ deno init --npm vite
70+
```
71+
6872
:::
6973

7074
Then follow the prompts!
@@ -90,6 +94,10 @@ $ pnpm create vite my-vue-app --template vue
9094
$ bun create vite my-vue-app --template vue
9195
```
9296

97+
```bash [Deno]
98+
$ deno init --npm vite my-vue-app --template vue
99+
```
100+
93101
:::
94102

95103
See [create-vite](https://github.com/vitejs/vite/tree/main/packages/create-vite) for more details on each supported template: `vanilla`, `vanilla-ts`, `vue`, `vue-ts`, `react`, `react-ts`, `react-swc`, `react-swc-ts`, `preact`, `preact-ts`, `lit`, `lit-ts`, `svelte`, `svelte-ts`, `solid`, `solid-ts`, `qwik`, `qwik-ts`.
@@ -134,6 +142,10 @@ $ pnpm add -D vite
134142
$ bun add -D vite
135143
```
136144

145+
```bash [Deno]
146+
$ deno add -D npm:vite
147+
```
148+
137149
:::
138150

139151
And create an `index.html` file like this:
@@ -162,6 +174,10 @@ $ pnpm vite
162174
$ bunx vite
163175
```
164176

177+
```bash [Deno]
178+
$ deno run -A npm:vite
179+
```
180+
165181
:::
166182

167183
The `index.html` will be served on `http://localhost:5173`.

docs/guide/ssr.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ This is statically replaced during build so it will allow tree-shaking of unused
6363
6464
## Setting Up the Dev Server
6565
66-
When building an SSR app, you likely want to have full control over your main server and decouple Vite from the production environment. It is therefore recommended to use Vite in middleware mode. Here is an example with [express](https://expressjs.com/) (v4):
66+
When building an SSR app, you likely want to have full control over your main server and decouple Vite from the production environment. It is therefore recommended to use Vite in middleware mode. Here is an example with [express](https://expressjs.com/):
6767
6868
```js{15-18} twoslash [server.js]
6969
import fs from 'node:fs'
@@ -93,7 +93,7 @@ async function createServer() {
9393
// middlewares). The following is valid even after restarts.
9494
app.use(vite.middlewares)
9595

96-
app.use('*', async (req, res) => {
96+
app.use('*all', async (req, res) => {
9797
// serve index.html - we will tackle this next
9898
})
9999

@@ -119,7 +119,7 @@ var app
119119
var vite
120120

121121
// ---cut---
122-
app.use('*', async (req, res, next) => {
122+
app.use('*all', async (req, res, next) => {
123123
const url = req.originalUrl
124124

125125
try {

docs/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
},
1010
"devDependencies": {
1111
"@shikijs/vitepress-twoslash": "^2.5.0",
12-
"@types/express": "^4.17.21",
12+
"@types/express": "^5.0.1",
1313
"feed": "^4.2.2",
1414
"vitepress": "^1.6.3",
1515
"vitepress-plugin-group-icons": "^1.5.2",

packages/create-vite/src/index.ts

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,13 @@ const FRAMEWORKS: Framework[] = [
150150
customCommand:
151151
'npm create -- tsrouter-app@latest TARGET_DIR --framework react --interactive',
152152
},
153+
{
154+
name: 'redwoodsdk-standard',
155+
display: 'RedwoodSDK ↗',
156+
color: red,
157+
customCommand:
158+
'npm exec degit redwoodjs/sdk/starters/standard TARGET_DIR',
159+
},
153160
],
154161
},
155162
{
@@ -281,6 +288,19 @@ const FRAMEWORKS: Framework[] = [
281288
},
282289
],
283290
},
291+
{
292+
name: 'marko',
293+
display: 'Marko',
294+
color: magenta,
295+
variants: [
296+
{
297+
name: 'marko-run',
298+
display: 'Marko Run ↗',
299+
color: magenta,
300+
customCommand: 'npm create -- marko@latest --name TARGET_DIR',
301+
},
302+
],
303+
},
284304
{
285305
name: 'others',
286306
display: 'Others',

packages/create-vite/template-lit-ts/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"lit": "^3.3.0"
1313
},
1414
"devDependencies": {
15-
"typescript": "~5.7.2",
15+
"typescript": "~5.8.3",
1616
"vite": "npm:rolldown-vite@^6.3.5"
1717
}
1818
}

packages/create-vite/template-lit-ts/tsconfig.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,15 @@
1010
/* Bundler mode */
1111
"moduleResolution": "bundler",
1212
"allowImportingTsExtensions": true,
13-
"isolatedModules": true,
13+
"verbatimModuleSyntax": true,
1414
"moduleDetection": "force",
1515
"noEmit": true,
1616

1717
/* Linting */
1818
"strict": true,
1919
"noUnusedLocals": true,
2020
"noUnusedParameters": true,
21+
"erasableSyntaxOnly": true,
2122
"noFallthroughCasesInSwitch": true,
2223
"noUncheckedSideEffectImports": true
2324
},

packages/create-vite/template-preact-ts/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
},
1414
"devDependencies": {
1515
"@preact/preset-vite": "^2.10.1",
16-
"typescript": "~5.7.2",
16+
"typescript": "~5.8.3",
1717
"vite": "npm:rolldown-vite@^6.3.5"
1818
}
1919
}

packages/create-vite/template-preact-ts/tsconfig.app.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
/* Bundler mode */
1515
"moduleResolution": "bundler",
1616
"allowImportingTsExtensions": true,
17-
"isolatedModules": true,
17+
"verbatimModuleSyntax": true,
1818
"moduleDetection": "force",
1919
"noEmit": true,
2020
"jsx": "react-jsx",
@@ -24,6 +24,7 @@
2424
"strict": true,
2525
"noUnusedLocals": true,
2626
"noUnusedParameters": true,
27+
"erasableSyntaxOnly": true,
2728
"noFallthroughCasesInSwitch": true,
2829
"noUncheckedSideEffectImports": true
2930
},

packages/create-vite/template-preact-ts/tsconfig.node.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,15 @@
99
/* Bundler mode */
1010
"moduleResolution": "bundler",
1111
"allowImportingTsExtensions": true,
12-
"isolatedModules": true,
12+
"verbatimModuleSyntax": true,
1313
"moduleDetection": "force",
1414
"noEmit": true,
1515

1616
/* Linting */
1717
"strict": true,
1818
"noUnusedLocals": true,
1919
"noUnusedParameters": true,
20+
"erasableSyntaxOnly": true,
2021
"noFallthroughCasesInSwitch": true,
2122
"noUncheckedSideEffectImports": true
2223
},

packages/create-vite/template-qwik-ts/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
},
1111
"devDependencies": {
1212
"serve": "^14.2.4",
13-
"typescript": "~5.7.2",
13+
"typescript": "~5.8.3",
1414
"vite": "npm:rolldown-vite@^6.3.5"
1515
},
1616
"dependencies": {

packages/create-vite/template-qwik-ts/tsconfig.app.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
/* Bundler mode */
1111
"moduleResolution": "bundler",
1212
"allowImportingTsExtensions": true,
13-
"isolatedModules": true,
13+
"verbatimModuleSyntax": true,
1414
"moduleDetection": "force",
1515
"noEmit": true,
1616
"jsx": "react-jsx",
@@ -20,6 +20,7 @@
2020
"strict": true,
2121
"noUnusedLocals": true,
2222
"noUnusedParameters": true,
23+
"erasableSyntaxOnly": true,
2324
"noFallthroughCasesInSwitch": true,
2425
"noUncheckedSideEffectImports": true
2526
},

packages/create-vite/template-qwik-ts/tsconfig.node.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,15 @@
99
/* Bundler mode */
1010
"moduleResolution": "bundler",
1111
"allowImportingTsExtensions": true,
12-
"isolatedModules": true,
12+
"verbatimModuleSyntax": true,
1313
"moduleDetection": "force",
1414
"noEmit": true,
1515

1616
/* Linting */
1717
"strict": true,
1818
"noUnusedLocals": true,
1919
"noUnusedParameters": true,
20+
"erasableSyntaxOnly": true,
2021
"noFallthroughCasesInSwitch": true,
2122
"noUncheckedSideEffectImports": true
2223
},

packages/create-vite/template-react-ts/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"eslint-plugin-react-hooks": "^5.2.0",
2323
"eslint-plugin-react-refresh": "^0.4.19",
2424
"globals": "^16.0.0",
25-
"typescript": "~5.7.2",
25+
"typescript": "~5.8.3",
2626
"typescript-eslint": "^8.30.1",
2727
"vite": "npm:rolldown-vite@^6.3.5"
2828
}

packages/create-vite/template-react-ts/tsconfig.app.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
/* Bundler mode */
1111
"moduleResolution": "bundler",
1212
"allowImportingTsExtensions": true,
13-
"isolatedModules": true,
13+
"verbatimModuleSyntax": true,
1414
"moduleDetection": "force",
1515
"noEmit": true,
1616
"jsx": "react-jsx",
@@ -19,6 +19,7 @@
1919
"strict": true,
2020
"noUnusedLocals": true,
2121
"noUnusedParameters": true,
22+
"erasableSyntaxOnly": true,
2223
"noFallthroughCasesInSwitch": true,
2324
"noUncheckedSideEffectImports": true
2425
},

packages/create-vite/template-react-ts/tsconfig.node.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,15 @@
99
/* Bundler mode */
1010
"moduleResolution": "bundler",
1111
"allowImportingTsExtensions": true,
12-
"isolatedModules": true,
12+
"verbatimModuleSyntax": true,
1313
"moduleDetection": "force",
1414
"noEmit": true,
1515

1616
/* Linting */
1717
"strict": true,
1818
"noUnusedLocals": true,
1919
"noUnusedParameters": true,
20+
"erasableSyntaxOnly": true,
2021
"noFallthroughCasesInSwitch": true,
2122
"noUncheckedSideEffectImports": true
2223
},

packages/create-vite/template-solid-ts/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"solid-js": "^1.9.5"
1313
},
1414
"devDependencies": {
15-
"typescript": "~5.7.2",
15+
"typescript": "~5.8.3",
1616
"vite": "npm:rolldown-vite@^6.3.5",
1717
"vite-plugin-solid": "^2.11.6"
1818
}

packages/create-vite/template-solid-ts/tsconfig.app.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
/* Bundler mode */
1111
"moduleResolution": "bundler",
1212
"allowImportingTsExtensions": true,
13-
"isolatedModules": true,
13+
"verbatimModuleSyntax": true,
1414
"moduleDetection": "force",
1515
"noEmit": true,
1616
"jsx": "preserve",
@@ -20,6 +20,7 @@
2020
"strict": true,
2121
"noUnusedLocals": true,
2222
"noUnusedParameters": true,
23+
"erasableSyntaxOnly": true,
2324
"noFallthroughCasesInSwitch": true,
2425
"noUncheckedSideEffectImports": true
2526
},

packages/create-vite/template-solid-ts/tsconfig.node.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,15 @@
99
/* Bundler mode */
1010
"moduleResolution": "bundler",
1111
"allowImportingTsExtensions": true,
12-
"isolatedModules": true,
12+
"verbatimModuleSyntax": true,
1313
"moduleDetection": "force",
1414
"noEmit": true,
1515

1616
/* Linting */
1717
"strict": true,
1818
"noUnusedLocals": true,
1919
"noUnusedParameters": true,
20+
"erasableSyntaxOnly": true,
2021
"noFallthroughCasesInSwitch": true,
2122
"noUncheckedSideEffectImports": true
2223
},

packages/create-vite/template-svelte-ts/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"@tsconfig/svelte": "^5.0.4",
1515
"svelte": "^5.28.1",
1616
"svelte-check": "^4.1.6",
17-
"typescript": "~5.7.2",
17+
"typescript": "~5.8.3",
1818
"vite": "npm:rolldown-vite@^6.3.5"
1919
}
2020
}

packages/create-vite/template-svelte-ts/tsconfig.node.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,15 @@
99
/* Bundler mode */
1010
"moduleResolution": "bundler",
1111
"allowImportingTsExtensions": true,
12-
"isolatedModules": true,
12+
"verbatimModuleSyntax": true,
1313
"moduleDetection": "force",
1414
"noEmit": true,
1515

1616
/* Linting */
1717
"strict": true,
1818
"noUnusedLocals": true,
1919
"noUnusedParameters": true,
20+
"erasableSyntaxOnly": true,
2021
"noFallthroughCasesInSwitch": true,
2122
"noUncheckedSideEffectImports": true
2223
},

packages/create-vite/template-vanilla-ts/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"preview": "vite preview"
1010
},
1111
"devDependencies": {
12-
"typescript": "~5.7.2",
12+
"typescript": "~5.8.3",
1313
"vite": "npm:rolldown-vite@^6.3.5"
1414
}
1515
}

0 commit comments

Comments
 (0)