Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 package.json
Original file line number Diff line number Diff line change
Expand Up @@ -67,15 +67,15 @@
"lint-staged": "^15.2.7",
"npm-run-all2": "^6.2.2",
"picocolors": "^1.0.1",
"playwright-chromium": "^1.45.1",
"playwright-chromium": "^1.45.2",
"prettier": "3.3.3",
"rimraf": "^5.0.9",
"rollup": "^4.13.0",
"rollup-plugin-esbuild": "^6.1.1",
"simple-git-hooks": "^2.11.1",
"tslib": "^2.6.3",
"tsx": "^4.16.2",
"typescript": "^5.2.2",
"typescript": "^5.5.3",
"typescript-eslint": "^7.16.1",
"vite": "workspace:*",
"vitest": "^2.0.3"
Expand Down
2 changes: 1 addition & 1 deletion packages/create-vite/template-lit-ts/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"lit": "^3.1.4"
},
"devDependencies": {
"typescript": "^5.2.2",
"typescript": "^5.5.3",
"vite": "^5.3.4"
}
}
2 changes: 1 addition & 1 deletion packages/create-vite/template-preact-ts/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
},
"devDependencies": {
"@preact/preset-vite": "^2.9.0",
"typescript": "^5.2.2",
"typescript": "^5.5.3",
"vite": "^5.3.4"
}
}
2 changes: 1 addition & 1 deletion packages/create-vite/template-qwik-ts/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
},
"devDependencies": {
"serve": "^14.2.3",
"typescript": "^5.2.2",
"typescript": "^5.5.3",
"vite": "^5.3.4"
},
"dependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/create-vite/template-react-ts/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"eslint": "^8.57.0",
"eslint-plugin-react-hooks": "^4.6.2",
"eslint-plugin-react-refresh": "^0.4.8",
"typescript": "^5.2.2",
"typescript": "^5.5.3",
"vite": "^5.3.4"
}
}
2 changes: 1 addition & 1 deletion packages/create-vite/template-solid-ts/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"solid-js": "^1.8.18"
},
"devDependencies": {
"typescript": "^5.2.2",
"typescript": "^5.5.3",
"vite": "^5.3.4",
"vite-plugin-solid": "^2.10.2"
}
Expand Down
2 changes: 1 addition & 1 deletion packages/create-vite/template-svelte-ts/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"svelte": "^4.2.18",
"svelte-check": "^3.8.4",
"tslib": "^2.6.3",
"typescript": "^5.2.2",
"typescript": "^5.5.3",
"vite": "^5.3.4"
}
}
2 changes: 1 addition & 1 deletion packages/create-vite/template-vanilla-ts/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"preview": "vite preview"
},
"devDependencies": {
"typescript": "^5.2.2",
"typescript": "^5.5.3",
"vite": "^5.3.4"
}
}
2 changes: 1 addition & 1 deletion packages/create-vite/template-vue-ts/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
},
"devDependencies": {
"@vitejs/plugin-vue": "^5.0.5",
"typescript": "^5.2.2",
"typescript": "^5.5.3",
"vite": "^5.3.4",
"vue-tsc": "^2.0.26"
}
Expand Down
6 changes: 3 additions & 3 deletions packages/vite/rollup.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -116,9 +116,9 @@ const nodeConfig = defineConfig({
src: 'require("sugarss")',
replacement: `__require('sugarss')`,
},
'lilconfig/dist/index.js': {
pattern: /: require,/g,
replacement: `: __require,`,
'lilconfig/src/index.js': {
pattern: /: require;/g,
replacement: `: __require;`,
},
// postcss-load-config calls require after register ts-node
'postcss-load-config/src/index.js': {
Expand Down
1 change: 0 additions & 1 deletion packages/vite/src/node/build.ts
Original file line number Diff line number Diff line change
Expand Up @@ -980,7 +980,6 @@ export function onRollupWarning(
if (
warning.plugin === 'rollup-plugin-dynamic-import-variables' &&
dynamicImportWarningIgnoreList.some((msg) =>
// @ts-expect-error warning is RollupLog
warning.message.includes(msg),
)
) {
Expand Down
2 changes: 1 addition & 1 deletion packages/vite/src/runtime/sourcemap/interceptor.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ const createExecHandlers = <T extends (...args: any) => any>(
) => {
return ((...args: Parameters<T>) => {
for (const handler of handlers) {
const result = handler(...(args as []))
const result = handler(...args)
if (result) return result
}
return null
Expand Down
2 changes: 1 addition & 1 deletion playground/js-sourcemap/__tests__/js-sourcemap.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ describe.runIf(isBuild)('build tests', () => {
expect(formatSourcemapForSnapshot(JSON.parse(map))).toMatchInlineSnapshot(`
{
"ignoreList": [],
"mappings": ";w+BAAA,OAAO,2BAAuB,EAAC,wBAE/B,QAAQ,IAAI,uBAAuB",
"mappings": ";63BAAA,OAAO,2BAAuB,EAAC,wBAE/B,QAAQ,IAAI,uBAAuB",
"sources": [
"../../after-preload-dynamic.js",
],
Expand Down
7 changes: 3 additions & 4 deletions playground/test-utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,6 @@ export async function withRetry(
}

export const expectWithRetry = <T>(getActual: () => Promise<T>) => {
type A = Assertion<T>
return new Proxy(
{},
{
Expand All @@ -262,9 +261,9 @@ export const expectWithRetry = <T>(getActual: () => Promise<T>) => {
}
},
},
) as {
[K in keyof A]: (...params: Parameters<A[K]>) => Promise<ReturnType<A[K]>>
}
) as Assertion<T>['resolves']
// NOTE: `Assertion<T>['resolves']` has the special "promisify all assertion property functions"
// behaviour that we're lending here, which is the same as `PromisifyAssertion<T>` if Vitest exposes it
}

type UntilBrowserLogAfterCallback = (logs: string[]) => PromiseLike<void> | void
Expand Down
Loading