From df479a7cffead7e3b31f0a5bd739fcf3f5c4d561 Mon Sep 17 00:00:00 2001
From: Saumitra Kulkarni <kulkarnisaumitra98@gmail.com>
Date: Fri, 6 Dec 2024 20:48:33 +0530
Subject: [PATCH 1/2] remove resolve config
---
examples/37_css/package.json | 2 +-
examples/37_css/vite.config.ts | 4 +-
.../src/lib/middleware/dev-server-impl.ts | 6 +-
pnpm-lock.yaml | 310 ++----------------
4 files changed, 34 insertions(+), 288 deletions(-)
diff --git a/examples/37_css/package.json b/examples/37_css/package.json
index 9a9defe98..6aa5c8e96 100644
--- a/examples/37_css/package.json
+++ b/examples/37_css/package.json
@@ -20,7 +20,7 @@
"devDependencies": {
"@types/react": "18.3.12",
"@types/react-dom": "18.3.1",
- "@vanilla-extract/vite-plugin": "4.0.10",
+ "@vanilla-extract/vite-plugin": "4.0.18",
"typescript": "5.7.2",
"vite": "5.4.10",
"vite-plugin-stylex-dev": "0.7.5"
diff --git a/examples/37_css/vite.config.ts b/examples/37_css/vite.config.ts
index 64053fcfa..5e51938c0 100644
--- a/examples/37_css/vite.config.ts
+++ b/examples/37_css/vite.config.ts
@@ -5,9 +5,9 @@ import { stylexPlugin } from 'vite-plugin-stylex-dev';
export default {
plugins: [
{
- name: 'hack-css-plugin-why-do-we-need-this-FIXME',
+ name: 'hack-css-plugin-needed-for-stylex-dev-FIXME',
resolveId(id: string) {
- if (id.endsWith('.css')) {
+ if (id.endsWith('.css') && !id.endsWith('.vanilla.css')) {
return id;
}
},
diff --git a/packages/waku/src/lib/middleware/dev-server-impl.ts b/packages/waku/src/lib/middleware/dev-server-impl.ts
index 6623cb846..633e0e6d5 100644
--- a/packages/waku/src/lib/middleware/dev-server-impl.ts
+++ b/packages/waku/src/lib/middleware/dev-server-impl.ts
@@ -1,7 +1,7 @@
import { Readable, Writable } from 'node:stream';
import { Server } from 'node:http';
import { AsyncLocalStorage } from 'node:async_hooks';
-import { createServer as createViteServer } from 'vite';
+import { createServer as createViteServer, type InlineConfig } from 'vite';
import viteReact from '@vitejs/plugin-react';
import type { EntriesDev } from '../../minimal/server.js';
@@ -84,7 +84,7 @@ const createMainViteServer = (
configPromise: ReturnType<typeof resolveConfig>,
) => {
const vitePromise = configPromise.then(async (config) => {
- const mergedViteConfig = await mergeUserViteConfig({
+ const mergedViteConfig: InlineConfig = {
// Since we have multiple instances of vite, different ones might overwrite the others' cache.
cacheDir: 'node_modules/.vite/waku-dev-server-main',
base: config.basePath,
@@ -125,7 +125,7 @@ const createMainViteServer = (
},
appType: 'mpa',
server: { middlewareMode: true },
- });
+ };
const vite = await createViteServer(mergedViteConfig);
registerHotUpdateCallback((payload) => hotUpdate(vite, payload));
return vite;
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index db436c7a3..0c9f5db51 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -866,8 +866,8 @@ importers:
specifier: 18.3.1
version: 18.3.1
'@vanilla-extract/vite-plugin':
- specifier: 4.0.10
- version: 4.0.10(@types/node@22.10.1)(terser@5.36.0)(vite@5.4.10(@types/node@22.10.1)(terser@5.36.0))
+ specifier: 4.0.18
+ version: 4.0.18(@types/node@22.10.1)(terser@5.36.0)(vite@5.4.10(@types/node@22.10.1)(terser@5.36.0))
typescript:
specifier: 5.7.2
version: 5.7.2
@@ -1095,7 +1095,7 @@ importers:
version: 7.4.3
tsup:
specifier: ^8.3.5
- version: 8.3.5(@swc/core@1.9.3)(jiti@2.4.1)(postcss@8.4.49)(typescript@5.7.2)(yaml@2.6.1)
+ version: 8.3.5(@swc/core@1.9.3(@swc/helpers@0.5.15))(jiti@2.4.1)(postcss@8.4.49)(typescript@5.7.2)(yaml@2.6.1)
update-check:
specifier: ^1.5.4
version: 1.5.4
@@ -1323,10 +1323,6 @@ packages:
peerDependencies:
'@babel/core': ^7.0.0
- '@babel/helper-plugin-utils@7.25.7':
- resolution: {integrity: sha512-eaPZai0PiqCi09pPs3pAFfl/zYgGaE6IdXtYvmf0qlcDTd3WCtO7JWCcRd64e0EQrcYgiHibEZnOGsSY4QSgaw==}
- engines: {node: '>=6.9.0'}
-
'@babel/helper-plugin-utils@7.25.9':
resolution: {integrity: sha512-kSMlyUVdWe25rEsRGviIgOWnoT/nfABVWlqt9N19/dIPWViAOW2s9wznP5tURbs/IDuNk4gPy3YdYRgH3uxhBw==}
engines: {node: '>=6.9.0'}
@@ -1381,8 +1377,8 @@ packages:
engines: {node: '>=6.0.0'}
hasBin: true
- '@babel/plugin-syntax-typescript@7.25.7':
- resolution: {integrity: sha512-rR+5FDjpCHqqZN2bzZm18bVYGaejGq5ZkpVCJLXor/+zlSrSoc4KWcHI0URVWjl/68Dyr1uwZUz/1njycEAv9g==}
+ '@babel/plugin-syntax-typescript@7.25.9':
+ resolution: {integrity: sha512-hjMgRy5hb8uJJjUcdWunWVcoi9bGpJp8p5Ol1229PoN6aytsLwNMgmdftO23wnCLMfVmTwZDWMPNq/D1SY60JQ==}
engines: {node: '>=6.9.0'}
peerDependencies:
'@babel/core': ^7.0.0-0
@@ -1496,12 +1492,6 @@ packages:
cpu: [ppc64]
os: [aix]
- '@esbuild/aix-ppc64@0.23.1':
- resolution: {integrity: sha512-6VhYk1diRqrhBAqpJEdjASR/+WVRtfjpqKuNw11cLiaWpAT/Uu+nokB+UJnevzy/P9C/ty6AOe0dwueMrGh/iQ==}
- engines: {node: '>=18'}
- cpu: [ppc64]
- os: [aix]
-
'@esbuild/aix-ppc64@0.24.0':
resolution: {integrity: sha512-WtKdFM7ls47zkKHFVzMz8opM7LkcsIp9amDUBIAWirg70RM71WRSjdILPsY5Uv1D42ZpUfaPILDlfactHgsRkw==}
engines: {node: '>=18'}
@@ -1520,12 +1510,6 @@ packages:
cpu: [arm64]
os: [android]
- '@esbuild/android-arm64@0.23.1':
- resolution: {integrity: sha512-xw50ipykXcLstLeWH7WRdQuysJqejuAGPd30vd1i5zSyKK3WE+ijzHmLKxdiCMtH1pHz78rOg0BKSYOSB/2Khw==}
- engines: {node: '>=18'}
- cpu: [arm64]
- os: [android]
-
'@esbuild/android-arm64@0.24.0':
resolution: {integrity: sha512-Vsm497xFM7tTIPYK9bNTYJyF/lsP590Qc1WxJdlB6ljCbdZKU9SY8i7+Iin4kyhV/KV5J2rOKsBQbB77Ab7L/w==}
engines: {node: '>=18'}
@@ -1544,12 +1528,6 @@ packages:
cpu: [arm]
os: [android]
- '@esbuild/android-arm@0.23.1':
- resolution: {integrity: sha512-uz6/tEy2IFm9RYOyvKl88zdzZfwEfKZmnX9Cj1BHjeSGNuGLuMD1kR8y5bteYmwqKm1tj8m4cb/aKEorr6fHWQ==}
- engines: {node: '>=18'}
- cpu: [arm]
- os: [android]
-
'@esbuild/android-arm@0.24.0':
resolution: {integrity: sha512-arAtTPo76fJ/ICkXWetLCc9EwEHKaeya4vMrReVlEIUCAUncH7M4bhMQ+M9Vf+FFOZJdTNMXNBrWwW+OXWpSew==}
engines: {node: '>=18'}
@@ -1568,12 +1546,6 @@ packages:
cpu: [x64]
os: [android]
- '@esbuild/android-x64@0.23.1':
- resolution: {integrity: sha512-nlN9B69St9BwUoB+jkyU090bru8L0NA3yFvAd7k8dNsVH8bi9a8cUAUSEcEEgTp2z3dbEDGJGfP6VUnkQnlReg==}
- engines: {node: '>=18'}
- cpu: [x64]
- os: [android]
-
'@esbuild/android-x64@0.24.0':
resolution: {integrity: sha512-t8GrvnFkiIY7pa7mMgJd7p8p8qqYIz1NYiAoKc75Zyv73L3DZW++oYMSHPRarcotTKuSs6m3hTOa5CKHaS02TQ==}
engines: {node: '>=18'}
@@ -1592,12 +1564,6 @@ packages:
cpu: [arm64]
os: [darwin]
- '@esbuild/darwin-arm64@0.23.1':
- resolution: {integrity: sha512-YsS2e3Wtgnw7Wq53XXBLcV6JhRsEq8hkfg91ESVadIrzr9wO6jJDMZnCQbHm1Guc5t/CdDiFSSfWP58FNuvT3Q==}
- engines: {node: '>=18'}
- cpu: [arm64]
- os: [darwin]
-
'@esbuild/darwin-arm64@0.24.0':
resolution: {integrity: sha512-CKyDpRbK1hXwv79soeTJNHb5EiG6ct3efd/FTPdzOWdbZZfGhpbcqIpiD0+vwmpu0wTIL97ZRPZu8vUt46nBSw==}
engines: {node: '>=18'}
@@ -1616,12 +1582,6 @@ packages:
cpu: [x64]
os: [darwin]
- '@esbuild/darwin-x64@0.23.1':
- resolution: {integrity: sha512-aClqdgTDVPSEGgoCS8QDG37Gu8yc9lTHNAQlsztQ6ENetKEO//b8y31MMu2ZaPbn4kVsIABzVLXYLhCGekGDqw==}
- engines: {node: '>=18'}
- cpu: [x64]
- os: [darwin]
-
'@esbuild/darwin-x64@0.24.0':
resolution: {integrity: sha512-rgtz6flkVkh58od4PwTRqxbKH9cOjaXCMZgWD905JOzjFKW+7EiUObfd/Kav+A6Gyud6WZk9w+xu6QLytdi2OA==}
engines: {node: '>=18'}
@@ -1640,12 +1600,6 @@ packages:
cpu: [arm64]
os: [freebsd]
- '@esbuild/freebsd-arm64@0.23.1':
- resolution: {integrity: sha512-h1k6yS8/pN/NHlMl5+v4XPfikhJulk4G+tKGFIOwURBSFzE8bixw1ebjluLOjfwtLqY0kewfjLSrO6tN2MgIhA==}
- engines: {node: '>=18'}
- cpu: [arm64]
- os: [freebsd]
-
'@esbuild/freebsd-arm64@0.24.0':
resolution: {integrity: sha512-6Mtdq5nHggwfDNLAHkPlyLBpE5L6hwsuXZX8XNmHno9JuL2+bg2BX5tRkwjyfn6sKbxZTq68suOjgWqCicvPXA==}
engines: {node: '>=18'}
@@ -1664,12 +1618,6 @@ packages:
cpu: [x64]
os: [freebsd]
- '@esbuild/freebsd-x64@0.23.1':
- resolution: {integrity: sha512-lK1eJeyk1ZX8UklqFd/3A60UuZ/6UVfGT2LuGo3Wp4/z7eRTRYY+0xOu2kpClP+vMTi9wKOfXi2vjUpO1Ro76g==}
- engines: {node: '>=18'}
- cpu: [x64]
- os: [freebsd]
-
'@esbuild/freebsd-x64@0.24.0':
resolution: {integrity: sha512-D3H+xh3/zphoX8ck4S2RxKR6gHlHDXXzOf6f/9dbFt/NRBDIE33+cVa49Kil4WUjxMGW0ZIYBYtaGCa2+OsQwQ==}
engines: {node: '>=18'}
@@ -1688,12 +1636,6 @@ packages:
cpu: [arm64]
os: [linux]
- '@esbuild/linux-arm64@0.23.1':
- resolution: {integrity: sha512-/93bf2yxencYDnItMYV/v116zff6UyTjo4EtEQjUBeGiVpMmffDNUyD9UN2zV+V3LRV3/on4xdZ26NKzn6754g==}
- engines: {node: '>=18'}
- cpu: [arm64]
- os: [linux]
-
'@esbuild/linux-arm64@0.24.0':
resolution: {integrity: sha512-TDijPXTOeE3eaMkRYpcy3LarIg13dS9wWHRdwYRnzlwlA370rNdZqbcp0WTyyV/k2zSxfko52+C7jU5F9Tfj1g==}
engines: {node: '>=18'}
@@ -1712,12 +1654,6 @@ packages:
cpu: [arm]
os: [linux]
- '@esbuild/linux-arm@0.23.1':
- resolution: {integrity: sha512-CXXkzgn+dXAPs3WBwE+Kvnrf4WECwBdfjfeYHpMeVxWE0EceB6vhWGShs6wi0IYEqMSIzdOF1XjQ/Mkm5d7ZdQ==}
- engines: {node: '>=18'}
- cpu: [arm]
- os: [linux]
-
'@esbuild/linux-arm@0.24.0':
resolution: {integrity: sha512-gJKIi2IjRo5G6Glxb8d3DzYXlxdEj2NlkixPsqePSZMhLudqPhtZ4BUrpIuTjJYXxvF9njql+vRjB2oaC9XpBw==}
engines: {node: '>=18'}
@@ -1736,12 +1672,6 @@ packages:
cpu: [ia32]
os: [linux]
- '@esbuild/linux-ia32@0.23.1':
- resolution: {integrity: sha512-VTN4EuOHwXEkXzX5nTvVY4s7E/Krz7COC8xkftbbKRYAl96vPiUssGkeMELQMOnLOJ8k3BY1+ZY52tttZnHcXQ==}
- engines: {node: '>=18'}
- cpu: [ia32]
- os: [linux]
-
'@esbuild/linux-ia32@0.24.0':
resolution: {integrity: sha512-K40ip1LAcA0byL05TbCQ4yJ4swvnbzHscRmUilrmP9Am7//0UjPreh4lpYzvThT2Quw66MhjG//20mrufm40mA==}
engines: {node: '>=18'}
@@ -1760,12 +1690,6 @@ packages:
cpu: [loong64]
os: [linux]
- '@esbuild/linux-loong64@0.23.1':
- resolution: {integrity: sha512-Vx09LzEoBa5zDnieH8LSMRToj7ir/Jeq0Gu6qJ/1GcBq9GkfoEAoXvLiW1U9J1qE/Y/Oyaq33w5p2ZWrNNHNEw==}
- engines: {node: '>=18'}
- cpu: [loong64]
- os: [linux]
-
'@esbuild/linux-loong64@0.24.0':
resolution: {integrity: sha512-0mswrYP/9ai+CU0BzBfPMZ8RVm3RGAN/lmOMgW4aFUSOQBjA31UP8Mr6DDhWSuMwj7jaWOT0p0WoZ6jeHhrD7g==}
engines: {node: '>=18'}
@@ -1784,12 +1708,6 @@ packages:
cpu: [mips64el]
os: [linux]
- '@esbuild/linux-mips64el@0.23.1':
- resolution: {integrity: sha512-nrFzzMQ7W4WRLNUOU5dlWAqa6yVeI0P78WKGUo7lg2HShq/yx+UYkeNSE0SSfSure0SqgnsxPvmAUu/vu0E+3Q==}
- engines: {node: '>=18'}
- cpu: [mips64el]
- os: [linux]
-
'@esbuild/linux-mips64el@0.24.0':
resolution: {integrity: sha512-hIKvXm0/3w/5+RDtCJeXqMZGkI2s4oMUGj3/jM0QzhgIASWrGO5/RlzAzm5nNh/awHE0A19h/CvHQe6FaBNrRA==}
engines: {node: '>=18'}
@@ -1808,12 +1726,6 @@ packages:
cpu: [ppc64]
os: [linux]
- '@esbuild/linux-ppc64@0.23.1':
- resolution: {integrity: sha512-dKN8fgVqd0vUIjxuJI6P/9SSSe/mB9rvA98CSH2sJnlZ/OCZWO1DJvxj8jvKTfYUdGfcq2dDxoKaC6bHuTlgcw==}
- engines: {node: '>=18'}
- cpu: [ppc64]
- os: [linux]
-
'@esbuild/linux-ppc64@0.24.0':
resolution: {integrity: sha512-HcZh5BNq0aC52UoocJxaKORfFODWXZxtBaaZNuN3PUX3MoDsChsZqopzi5UupRhPHSEHotoiptqikjN/B77mYQ==}
engines: {node: '>=18'}
@@ -1832,12 +1744,6 @@ packages:
cpu: [riscv64]
os: [linux]
- '@esbuild/linux-riscv64@0.23.1':
- resolution: {integrity: sha512-5AV4Pzp80fhHL83JM6LoA6pTQVWgB1HovMBsLQ9OZWLDqVY8MVobBXNSmAJi//Csh6tcY7e7Lny2Hg1tElMjIA==}
- engines: {node: '>=18'}
- cpu: [riscv64]
- os: [linux]
-
'@esbuild/linux-riscv64@0.24.0':
resolution: {integrity: sha512-bEh7dMn/h3QxeR2KTy1DUszQjUrIHPZKyO6aN1X4BCnhfYhuQqedHaa5MxSQA/06j3GpiIlFGSsy1c7Gf9padw==}
engines: {node: '>=18'}
@@ -1856,12 +1762,6 @@ packages:
cpu: [s390x]
os: [linux]
- '@esbuild/linux-s390x@0.23.1':
- resolution: {integrity: sha512-9ygs73tuFCe6f6m/Tb+9LtYxWR4c9yg7zjt2cYkjDbDpV/xVn+68cQxMXCjUpYwEkze2RcU/rMnfIXNRFmSoDw==}
- engines: {node: '>=18'}
- cpu: [s390x]
- os: [linux]
-
'@esbuild/linux-s390x@0.24.0':
resolution: {integrity: sha512-ZcQ6+qRkw1UcZGPyrCiHHkmBaj9SiCD8Oqd556HldP+QlpUIe2Wgn3ehQGVoPOvZvtHm8HPx+bH20c9pvbkX3g==}
engines: {node: '>=18'}
@@ -1880,12 +1780,6 @@ packages:
cpu: [x64]
os: [linux]
- '@esbuild/linux-x64@0.23.1':
- resolution: {integrity: sha512-EV6+ovTsEXCPAp58g2dD68LxoP/wK5pRvgy0J/HxPGB009omFPv3Yet0HiaqvrIrgPTBuC6wCH1LTOY91EO5hQ==}
- engines: {node: '>=18'}
- cpu: [x64]
- os: [linux]
-
'@esbuild/linux-x64@0.24.0':
resolution: {integrity: sha512-vbutsFqQ+foy3wSSbmjBXXIJ6PL3scghJoM8zCL142cGaZKAdCZHyf+Bpu/MmX9zT9Q0zFBVKb36Ma5Fzfa8xA==}
engines: {node: '>=18'}
@@ -1904,24 +1798,12 @@ packages:
cpu: [x64]
os: [netbsd]
- '@esbuild/netbsd-x64@0.23.1':
- resolution: {integrity: sha512-aevEkCNu7KlPRpYLjwmdcuNz6bDFiE7Z8XC4CPqExjTvrHugh28QzUXVOZtiYghciKUacNktqxdpymplil1beA==}
- engines: {node: '>=18'}
- cpu: [x64]
- os: [netbsd]
-
'@esbuild/netbsd-x64@0.24.0':
resolution: {integrity: sha512-hjQ0R/ulkO8fCYFsG0FZoH+pWgTTDreqpqY7UnQntnaKv95uP5iW3+dChxnx7C3trQQU40S+OgWhUVwCjVFLvg==}
engines: {node: '>=18'}
cpu: [x64]
os: [netbsd]
- '@esbuild/openbsd-arm64@0.23.1':
- resolution: {integrity: sha512-3x37szhLexNA4bXhLrCC/LImN/YtWis6WXr1VESlfVtVeoFJBRINPJ3f0a/6LV8zpikqoUg4hyXw0sFBt5Cr+Q==}
- engines: {node: '>=18'}
- cpu: [arm64]
- os: [openbsd]
-
'@esbuild/openbsd-arm64@0.24.0':
resolution: {integrity: sha512-MD9uzzkPQbYehwcN583yx3Tu5M8EIoTD+tUgKF982WYL9Pf5rKy9ltgD0eUgs8pvKnmizxjXZyLt0z6DC3rRXg==}
engines: {node: '>=18'}
@@ -1940,12 +1822,6 @@ packages:
cpu: [x64]
os: [openbsd]
- '@esbuild/openbsd-x64@0.23.1':
- resolution: {integrity: sha512-aY2gMmKmPhxfU+0EdnN+XNtGbjfQgwZj43k8G3fyrDM/UdZww6xrWxmDkuz2eCZchqVeABjV5BpildOrUbBTqA==}
- engines: {node: '>=18'}
- cpu: [x64]
- os: [openbsd]
-
'@esbuild/openbsd-x64@0.24.0':
resolution: {integrity: sha512-4ir0aY1NGUhIC1hdoCzr1+5b43mw99uNwVzhIq1OY3QcEwPDO3B7WNXBzaKY5Nsf1+N11i1eOfFcq+D/gOS15Q==}
engines: {node: '>=18'}
@@ -1964,12 +1840,6 @@ packages:
cpu: [x64]
os: [sunos]
- '@esbuild/sunos-x64@0.23.1':
- resolution: {integrity: sha512-RBRT2gqEl0IKQABT4XTj78tpk9v7ehp+mazn2HbUeZl1YMdaGAQqhapjGTCe7uw7y0frDi4gS0uHzhvpFuI1sA==}
- engines: {node: '>=18'}
- cpu: [x64]
- os: [sunos]
-
'@esbuild/sunos-x64@0.24.0':
resolution: {integrity: sha512-jVzdzsbM5xrotH+W5f1s+JtUy1UWgjU0Cf4wMvffTB8m6wP5/kx0KiaLHlbJO+dMgtxKV8RQ/JvtlFcdZ1zCPA==}
engines: {node: '>=18'}
@@ -1988,12 +1858,6 @@ packages:
cpu: [arm64]
os: [win32]
- '@esbuild/win32-arm64@0.23.1':
- resolution: {integrity: sha512-4O+gPR5rEBe2FpKOVyiJ7wNDPA8nGzDuJ6gN4okSA1gEOYZ67N8JPk58tkWtdtPeLz7lBnY6I5L3jdsr3S+A6A==}
- engines: {node: '>=18'}
- cpu: [arm64]
- os: [win32]
-
'@esbuild/win32-arm64@0.24.0':
resolution: {integrity: sha512-iKc8GAslzRpBytO2/aN3d2yb2z8XTVfNV0PjGlCxKo5SgWmNXx82I/Q3aG1tFfS+A2igVCY97TJ8tnYwpUWLCA==}
engines: {node: '>=18'}
@@ -2012,12 +1876,6 @@ packages:
cpu: [ia32]
os: [win32]
- '@esbuild/win32-ia32@0.23.1':
- resolution: {integrity: sha512-BcaL0Vn6QwCwre3Y717nVHZbAa4UBEigzFm6VdsVdT/MbZ38xoj1X9HPkZhbmaBGUD1W8vxAfffbDe8bA6AKnQ==}
- engines: {node: '>=18'}
- cpu: [ia32]
- os: [win32]
-
'@esbuild/win32-ia32@0.24.0':
resolution: {integrity: sha512-vQW36KZolfIudCcTnaTpmLQ24Ha1RjygBo39/aLkM2kmjkWmZGEJ5Gn9l5/7tzXA42QGIoWbICfg6KLLkIw6yw==}
engines: {node: '>=18'}
@@ -2036,12 +1894,6 @@ packages:
cpu: [x64]
os: [win32]
- '@esbuild/win32-x64@0.23.1':
- resolution: {integrity: sha512-BHpFFeslkWrXWyUPnbKm+xYYVYruCinGcftSBaa8zoF9hZO4BcSCFUvHVTtzpIY6YzUnYtuEhZ+C9iEXjxnasg==}
- engines: {node: '>=18'}
- cpu: [x64]
- os: [win32]
-
'@esbuild/win32-x64@0.24.0':
resolution: {integrity: sha512-7IAFPrjSQIJrGsK6flwg7NFmwBoSTyF3rl7If0hNUFQU4ilTsEPL6GuMuU9BfIWVVGuRnuIidkSMC+c0Otu8IA==}
engines: {node: '>=18'}
@@ -2782,14 +2634,14 @@ packages:
'@vanilla-extract/css@1.16.1':
resolution: {integrity: sha512-3jKxH5ty/ZjmGoLAx8liY7e87FRCIJfnuufX/K9fQklu0YHP3ClrNisU++LkZuD+GZleqMSAQMF0r8Otln+OPQ==}
- '@vanilla-extract/integration@7.1.10':
- resolution: {integrity: sha512-EXe8l0u51ta2H78kksf7gJENkdYnvDW9c+18FUvKfxtjHmpc4KthXnUTuALt5k9wbAjfFakIR4IsqzvOP43cDQ==}
+ '@vanilla-extract/integration@7.1.11':
+ resolution: {integrity: sha512-IGRaLrpkjyVHTHDZQBQvFBl399yRfSMJoVI2KaocEZB33aP+H4Qup83od2hc6R5IxGWdvbiiCOJCYsnmFiy85Q==}
'@vanilla-extract/private@1.0.6':
resolution: {integrity: sha512-ytsG/JLweEjw7DBuZ/0JCN4WAQgM9erfSTdS1NQY778hFQSZ6cfCDEZZ0sgVm4k54uNz6ImKB33AYvSR//fjxw==}
- '@vanilla-extract/vite-plugin@4.0.10':
- resolution: {integrity: sha512-bjX5ioQeBTKuV/MOweeSCrGU5m7z4a76yf8J/r4gC5MGJrEvYu0YHaQIiiL7o2wlFSc929JUEUO1ahnVXUET6A==}
+ '@vanilla-extract/vite-plugin@4.0.18':
+ resolution: {integrity: sha512-j5vJVbvW33THGXG3ZI+nfgeYCknlBEWTJVphZWSAGmLO4XO4690m/iQQg+3gUtla3wvU8eyA2qmJNa05Wa7mVA==}
peerDependencies:
vite: 5.4.10
@@ -3550,11 +3402,6 @@ packages:
engines: {node: '>=12'}
hasBin: true
- esbuild@0.23.1:
- resolution: {integrity: sha512-VVNz/9Sa0bs5SELtn3f7qhJCDPCF5oMEl5cO9/SSinpE9hbPVvxbd572HH5AKiP7WD8INO53GgfDDhRjkylHEg==}
- engines: {node: '>=18'}
- hasBin: true
-
esbuild@0.24.0:
resolution: {integrity: sha512-FuLPevChGDshgSicjisSooU0cemp/sGXR841D5LHMB7mTVOmsEHcAxaH3irL53+8YDIeVNQEySh4DaYU/iuPqQ==}
engines: {node: '>=18'}
@@ -4577,8 +4424,8 @@ packages:
engines: {node: '>=10'}
hasBin: true
- mlly@1.7.2:
- resolution: {integrity: sha512-tN3dvVHYVz4DhSXinXIk7u9syPYaJvio118uomkovAtWBT+RdbP6Lfh/5Lvo519YMmwBafwlh20IPTXIStscpA==}
+ mlly@1.7.3:
+ resolution: {integrity: sha512-xUsx5n/mN0uQf4V548PKQ+YShA4/IW0KI1dZhrNrPCLG+xizETbHTkOa1f8/xut9JRPp8kQuMnz0oqwkTiLo/A==}
modern-ahocorasick@1.1.0:
resolution: {integrity: sha512-sEKPVl2rM+MNVkGQt3ChdmD8YsigmXdn5NifZn6jiwn9LRJpWm8F3guhaqrJT/JOat6pwpbXEk6kv+b9DMIjsQ==}
@@ -6116,8 +5963,6 @@ snapshots:
transitivePeerDependencies:
- supports-color
- '@babel/helper-plugin-utils@7.25.7': {}
-
'@babel/helper-plugin-utils@7.25.9': {}
'@babel/helper-simple-access@7.25.7':
@@ -6164,10 +6009,10 @@ snapshots:
dependencies:
'@babel/types': 7.26.0
- '@babel/plugin-syntax-typescript@7.25.7(@babel/core@7.25.8)':
+ '@babel/plugin-syntax-typescript@7.25.9(@babel/core@7.26.0)':
dependencies:
- '@babel/core': 7.25.8
- '@babel/helper-plugin-utils': 7.25.7
+ '@babel/core': 7.26.0
+ '@babel/helper-plugin-utils': 7.25.9
'@babel/plugin-transform-react-jsx-self@7.25.9(@babel/core@7.26.0)':
dependencies:
@@ -6281,9 +6126,6 @@ snapshots:
'@esbuild/aix-ppc64@0.21.5':
optional: true
- '@esbuild/aix-ppc64@0.23.1':
- optional: true
-
'@esbuild/aix-ppc64@0.24.0':
optional: true
@@ -6293,9 +6135,6 @@ snapshots:
'@esbuild/android-arm64@0.21.5':
optional: true
- '@esbuild/android-arm64@0.23.1':
- optional: true
-
'@esbuild/android-arm64@0.24.0':
optional: true
@@ -6305,9 +6144,6 @@ snapshots:
'@esbuild/android-arm@0.21.5':
optional: true
- '@esbuild/android-arm@0.23.1':
- optional: true
-
'@esbuild/android-arm@0.24.0':
optional: true
@@ -6317,9 +6153,6 @@ snapshots:
'@esbuild/android-x64@0.21.5':
optional: true
- '@esbuild/android-x64@0.23.1':
- optional: true
-
'@esbuild/android-x64@0.24.0':
optional: true
@@ -6329,9 +6162,6 @@ snapshots:
'@esbuild/darwin-arm64@0.21.5':
optional: true
- '@esbuild/darwin-arm64@0.23.1':
- optional: true
-
'@esbuild/darwin-arm64@0.24.0':
optional: true
@@ -6341,9 +6171,6 @@ snapshots:
'@esbuild/darwin-x64@0.21.5':
optional: true
- '@esbuild/darwin-x64@0.23.1':
- optional: true
-
'@esbuild/darwin-x64@0.24.0':
optional: true
@@ -6353,9 +6180,6 @@ snapshots:
'@esbuild/freebsd-arm64@0.21.5':
optional: true
- '@esbuild/freebsd-arm64@0.23.1':
- optional: true
-
'@esbuild/freebsd-arm64@0.24.0':
optional: true
@@ -6365,9 +6189,6 @@ snapshots:
'@esbuild/freebsd-x64@0.21.5':
optional: true
- '@esbuild/freebsd-x64@0.23.1':
- optional: true
-
'@esbuild/freebsd-x64@0.24.0':
optional: true
@@ -6377,9 +6198,6 @@ snapshots:
'@esbuild/linux-arm64@0.21.5':
optional: true
- '@esbuild/linux-arm64@0.23.1':
- optional: true
-
'@esbuild/linux-arm64@0.24.0':
optional: true
@@ -6389,9 +6207,6 @@ snapshots:
'@esbuild/linux-arm@0.21.5':
optional: true
- '@esbuild/linux-arm@0.23.1':
- optional: true
-
'@esbuild/linux-arm@0.24.0':
optional: true
@@ -6401,9 +6216,6 @@ snapshots:
'@esbuild/linux-ia32@0.21.5':
optional: true
- '@esbuild/linux-ia32@0.23.1':
- optional: true
-
'@esbuild/linux-ia32@0.24.0':
optional: true
@@ -6413,9 +6225,6 @@ snapshots:
'@esbuild/linux-loong64@0.21.5':
optional: true
- '@esbuild/linux-loong64@0.23.1':
- optional: true
-
'@esbuild/linux-loong64@0.24.0':
optional: true
@@ -6425,9 +6234,6 @@ snapshots:
'@esbuild/linux-mips64el@0.21.5':
optional: true
- '@esbuild/linux-mips64el@0.23.1':
- optional: true
-
'@esbuild/linux-mips64el@0.24.0':
optional: true
@@ -6437,9 +6243,6 @@ snapshots:
'@esbuild/linux-ppc64@0.21.5':
optional: true
- '@esbuild/linux-ppc64@0.23.1':
- optional: true
-
'@esbuild/linux-ppc64@0.24.0':
optional: true
@@ -6449,9 +6252,6 @@ snapshots:
'@esbuild/linux-riscv64@0.21.5':
optional: true
- '@esbuild/linux-riscv64@0.23.1':
- optional: true
-
'@esbuild/linux-riscv64@0.24.0':
optional: true
@@ -6461,9 +6261,6 @@ snapshots:
'@esbuild/linux-s390x@0.21.5':
optional: true
- '@esbuild/linux-s390x@0.23.1':
- optional: true
-
'@esbuild/linux-s390x@0.24.0':
optional: true
@@ -6473,9 +6270,6 @@ snapshots:
'@esbuild/linux-x64@0.21.5':
optional: true
- '@esbuild/linux-x64@0.23.1':
- optional: true
-
'@esbuild/linux-x64@0.24.0':
optional: true
@@ -6485,15 +6279,9 @@ snapshots:
'@esbuild/netbsd-x64@0.21.5':
optional: true
- '@esbuild/netbsd-x64@0.23.1':
- optional: true
-
'@esbuild/netbsd-x64@0.24.0':
optional: true
- '@esbuild/openbsd-arm64@0.23.1':
- optional: true
-
'@esbuild/openbsd-arm64@0.24.0':
optional: true
@@ -6503,9 +6291,6 @@ snapshots:
'@esbuild/openbsd-x64@0.21.5':
optional: true
- '@esbuild/openbsd-x64@0.23.1':
- optional: true
-
'@esbuild/openbsd-x64@0.24.0':
optional: true
@@ -6515,9 +6300,6 @@ snapshots:
'@esbuild/sunos-x64@0.21.5':
optional: true
- '@esbuild/sunos-x64@0.23.1':
- optional: true
-
'@esbuild/sunos-x64@0.24.0':
optional: true
@@ -6527,9 +6309,6 @@ snapshots:
'@esbuild/win32-arm64@0.21.5':
optional: true
- '@esbuild/win32-arm64@0.23.1':
- optional: true
-
'@esbuild/win32-arm64@0.24.0':
optional: true
@@ -6539,9 +6318,6 @@ snapshots:
'@esbuild/win32-ia32@0.21.5':
optional: true
- '@esbuild/win32-ia32@0.23.1':
- optional: true
-
'@esbuild/win32-ia32@0.24.0':
optional: true
@@ -6551,9 +6327,6 @@ snapshots:
'@esbuild/win32-x64@0.21.5':
optional: true
- '@esbuild/win32-x64@0.23.1':
- optional: true
-
'@esbuild/win32-x64@0.24.0':
optional: true
@@ -7260,7 +7033,7 @@ snapshots:
'@vanilla-extract/babel-plugin-debug-ids@1.1.0':
dependencies:
- '@babel/core': 7.25.8
+ '@babel/core': 7.26.0
transitivePeerDependencies:
- supports-color
@@ -7281,18 +7054,18 @@ snapshots:
transitivePeerDependencies:
- babel-plugin-macros
- '@vanilla-extract/integration@7.1.10(@types/node@22.10.1)(terser@5.36.0)':
+ '@vanilla-extract/integration@7.1.11(@types/node@22.10.1)(terser@5.36.0)':
dependencies:
- '@babel/core': 7.25.8
- '@babel/plugin-syntax-typescript': 7.25.7(@babel/core@7.25.8)
+ '@babel/core': 7.26.0
+ '@babel/plugin-syntax-typescript': 7.25.9(@babel/core@7.26.0)
'@vanilla-extract/babel-plugin-debug-ids': 1.1.0
'@vanilla-extract/css': 1.16.1
dedent: 1.5.3
- esbuild: 0.23.1
+ esbuild: 0.21.5
eval: 0.1.8
find-up: 5.0.0
javascript-stringify: 2.1.0
- mlly: 1.7.2
+ mlly: 1.7.3
vite: 5.4.10(@types/node@22.10.1)(terser@5.36.0)
vite-node: 1.6.0(@types/node@22.10.1)(terser@5.36.0)
transitivePeerDependencies:
@@ -7309,9 +7082,9 @@ snapshots:
'@vanilla-extract/private@1.0.6': {}
- '@vanilla-extract/vite-plugin@4.0.10(@types/node@22.10.1)(terser@5.36.0)(vite@5.4.10(@types/node@22.10.1)(terser@5.36.0))':
+ '@vanilla-extract/vite-plugin@4.0.18(@types/node@22.10.1)(terser@5.36.0)(vite@5.4.10(@types/node@22.10.1)(terser@5.36.0))':
dependencies:
- '@vanilla-extract/integration': 7.1.10(@types/node@22.10.1)(terser@5.36.0)
+ '@vanilla-extract/integration': 7.1.11(@types/node@22.10.1)(terser@5.36.0)
vite: 5.4.10(@types/node@22.10.1)(terser@5.36.0)
transitivePeerDependencies:
- '@types/node'
@@ -8245,33 +8018,6 @@ snapshots:
'@esbuild/win32-ia32': 0.21.5
'@esbuild/win32-x64': 0.21.5
- esbuild@0.23.1:
- optionalDependencies:
- '@esbuild/aix-ppc64': 0.23.1
- '@esbuild/android-arm': 0.23.1
- '@esbuild/android-arm64': 0.23.1
- '@esbuild/android-x64': 0.23.1
- '@esbuild/darwin-arm64': 0.23.1
- '@esbuild/darwin-x64': 0.23.1
- '@esbuild/freebsd-arm64': 0.23.1
- '@esbuild/freebsd-x64': 0.23.1
- '@esbuild/linux-arm': 0.23.1
- '@esbuild/linux-arm64': 0.23.1
- '@esbuild/linux-ia32': 0.23.1
- '@esbuild/linux-loong64': 0.23.1
- '@esbuild/linux-mips64el': 0.23.1
- '@esbuild/linux-ppc64': 0.23.1
- '@esbuild/linux-riscv64': 0.23.1
- '@esbuild/linux-s390x': 0.23.1
- '@esbuild/linux-x64': 0.23.1
- '@esbuild/netbsd-x64': 0.23.1
- '@esbuild/openbsd-arm64': 0.23.1
- '@esbuild/openbsd-x64': 0.23.1
- '@esbuild/sunos-x64': 0.23.1
- '@esbuild/win32-arm64': 0.23.1
- '@esbuild/win32-ia32': 0.23.1
- '@esbuild/win32-x64': 0.23.1
-
esbuild@0.24.0:
optionalDependencies:
'@esbuild/aix-ppc64': 0.24.0
@@ -8325,7 +8071,7 @@ snapshots:
debug: 4.3.7
enhanced-resolve: 5.17.1
eslint: 8.57.0
- eslint-module-utils: 2.12.0(@typescript-eslint/parser@8.16.0(eslint@8.57.0)(typescript@5.7.2))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@8.16.0(eslint@8.57.0)(typescript@5.7.2))(eslint-plugin-import@2.31.0)(eslint@8.57.0))(eslint@8.57.0)
+ eslint-module-utils: 2.12.0(@typescript-eslint/parser@8.16.0(eslint@8.57.0)(typescript@5.7.2))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3)(eslint@8.57.0)
fast-glob: 3.3.2
get-tsconfig: 4.8.1
is-bun-module: 1.3.0
@@ -8338,7 +8084,7 @@ snapshots:
- eslint-import-resolver-webpack
- supports-color
- eslint-module-utils@2.12.0(@typescript-eslint/parser@8.16.0(eslint@8.57.0)(typescript@5.7.2))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@8.16.0(eslint@8.57.0)(typescript@5.7.2))(eslint-plugin-import@2.31.0)(eslint@8.57.0))(eslint@8.57.0):
+ eslint-module-utils@2.12.0(@typescript-eslint/parser@8.16.0(eslint@8.57.0)(typescript@5.7.2))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3)(eslint@8.57.0):
dependencies:
debug: 3.2.7
optionalDependencies:
@@ -8360,7 +8106,7 @@ snapshots:
doctrine: 2.1.0
eslint: 8.57.0
eslint-import-resolver-node: 0.3.9
- eslint-module-utils: 2.12.0(@typescript-eslint/parser@8.16.0(eslint@8.57.0)(typescript@5.7.2))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@8.16.0(eslint@8.57.0)(typescript@5.7.2))(eslint-plugin-import@2.31.0)(eslint@8.57.0))(eslint@8.57.0)
+ eslint-module-utils: 2.12.0(@typescript-eslint/parser@8.16.0(eslint@8.57.0)(typescript@5.7.2))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3)(eslint@8.57.0)
hasown: 2.0.2
is-core-module: 2.15.1
is-glob: 4.0.3
@@ -9565,7 +9311,7 @@ snapshots:
mkdirp@3.0.1: {}
- mlly@1.7.2:
+ mlly@1.7.3:
dependencies:
acorn: 8.14.0
pathe: 1.1.2
@@ -9766,7 +9512,7 @@ snapshots:
pkg-types@1.2.1:
dependencies:
confbox: 0.1.8
- mlly: 1.7.2
+ mlly: 1.7.3
pathe: 1.1.2
playwright-core@1.49.0: {}
@@ -10624,7 +10370,7 @@ snapshots:
tslib@2.8.1: {}
- tsup@8.3.5(@swc/core@1.9.3)(jiti@2.4.1)(postcss@8.4.49)(typescript@5.7.2)(yaml@2.6.1):
+ tsup@8.3.5(@swc/core@1.9.3(@swc/helpers@0.5.15))(jiti@2.4.1)(postcss@8.4.49)(typescript@5.7.2)(yaml@2.6.1):
dependencies:
bundle-require: 5.0.0(esbuild@0.24.0)
cac: 6.7.14
From e396e523185e0f0d4cf3366ab26c7b0efd8d55fc Mon Sep 17 00:00:00 2001
From: daishi <daishi@axlight.com>
Date: Sat, 14 Dec 2024 09:06:05 +0900
Subject: [PATCH 2/2] remove mergeUserViteConfig completely
---
.../src/lib/middleware/dev-server-impl.ts | 11 ++--
.../waku/src/lib/utils/merge-vite-config.ts | 55 -------------------
2 files changed, 4 insertions(+), 62 deletions(-)
delete mode 100644 packages/waku/src/lib/utils/merge-vite-config.ts
diff --git a/packages/waku/src/lib/middleware/dev-server-impl.ts b/packages/waku/src/lib/middleware/dev-server-impl.ts
index f791979d0..ded3a7f13 100644
--- a/packages/waku/src/lib/middleware/dev-server-impl.ts
+++ b/packages/waku/src/lib/middleware/dev-server-impl.ts
@@ -1,7 +1,7 @@
import { Readable, Writable } from 'node:stream';
import { Server } from 'node:http';
import { AsyncLocalStorage } from 'node:async_hooks';
-import { createServer as createViteServer, type InlineConfig } from 'vite';
+import { createServer as createViteServer } from 'vite';
import viteReact from '@vitejs/plugin-react';
import type { EntriesDev } from '../../minimal/server.js';
@@ -24,7 +24,6 @@ import { rscEnvPlugin } from '../plugins/vite-plugin-rsc-env.js';
import { rscPrivatePlugin } from '../plugins/vite-plugin-rsc-private.js';
import { rscManagedPlugin } from '../plugins/vite-plugin-rsc-managed.js';
import { rscDelegatePlugin } from '../plugins/vite-plugin-rsc-delegate.js';
-import { mergeUserViteConfig } from '../utils/merge-vite-config.js';
import type { ClonableModuleNode, Middleware } from './types.js';
import { fsRouterTypegenPlugin } from '../plugins/vite-plugin-fs-router-typegen.js';
@@ -84,7 +83,7 @@ const createMainViteServer = (
configPromise: ReturnType<typeof resolveConfig>,
) => {
const vitePromise = configPromise.then(async (config) => {
- const mergedViteConfig: InlineConfig = {
+ const vite = await createViteServer({
// Since we have multiple instances of vite, different ones might overwrite the others' cache.
cacheDir: 'node_modules/.vite/waku-dev-server-main',
base: config.basePath,
@@ -125,8 +124,7 @@ const createMainViteServer = (
},
appType: 'mpa',
server: { middlewareMode: true },
- };
- const vite = await createViteServer(mergedViteConfig);
+ });
registerHotUpdateCallback((payload) => hotUpdate(vite, payload));
return vite;
});
@@ -219,7 +217,7 @@ const createRscViteServer = (
const dummyServer = new Server(); // FIXME we hope to avoid this hack
const vitePromise = configPromise.then(async (config) => {
- const mergedViteConfig = await mergeUserViteConfig({
+ const vite = await createViteServer({
// Since we have multiple instances of vite, different ones might overwrite the others' cache.
cacheDir: 'node_modules/.vite/waku-dev-server-rsc',
plugins: [
@@ -262,7 +260,6 @@ const createRscViteServer = (
appType: 'custom',
server: { middlewareMode: true, hmr: { server: dummyServer } },
});
- const vite = await createViteServer(mergedViteConfig);
return vite;
});
diff --git a/packages/waku/src/lib/utils/merge-vite-config.ts b/packages/waku/src/lib/utils/merge-vite-config.ts
deleted file mode 100644
index 7072c91de..000000000
--- a/packages/waku/src/lib/utils/merge-vite-config.ts
+++ /dev/null
@@ -1,55 +0,0 @@
-import type { UserConfig, PluginOption } from 'vite';
-import {
- resolveConfig as resolveViteConfig,
- mergeConfig as mergeViteConfig,
-} from 'vite';
-
-// Avoid terser warning and "path" error for each time we instantiate a vite server
-// Avoid vite finding the config itself, instead, we handle it ourselves with the config argument
-export async function mergeUserViteConfig(config: UserConfig) {
- const resolvedViteConfig = await resolveViteConfig({}, 'serve');
- const filterPlugins = (plugin: PluginOption[]): PluginOption[] =>
- plugin.flatMap((plugin) => {
- if (Array.isArray(plugin)) {
- return [filterPlugins(plugin)];
- }
- if (plugin && 'name' in plugin) {
- if (resolvedViteConfig.plugins.some((p) => p.name === plugin.name)) {
- return [];
- }
- return [plugin];
- }
- return [plugin];
- });
-
- const mergedViteConfig = mergeViteConfig(
- {
- ...resolvedViteConfig,
- configFile: false,
- // FIXME weird error around plugin duplication when removed
- plugins: resolvedViteConfig.plugins.filter(
- (plugin) =>
- ![
- 'vite:css',
- 'vite:css-post',
- 'vite:import-analysis',
- 'vite:json',
- 'vite:client-inject',
- ].includes(plugin.name),
- ),
- },
- {
- ...config,
- plugins: config.plugins && filterPlugins(config.plugins),
- },
- );
-
- // vite sets terserOptions to {} in resolveViteConfig and minify to 'esbuild' at the same time which shows a warning
- if (!Object.keys(mergedViteConfig.build.terserOptions).length) {
- mergedViteConfig.build.terserOptions = null;
- }
-
- // HACK: Vite bug: TypeError [ERR_INVALID_ARG_TYPE]: The "path" argument must be of type string. Received function assetsInclude
- mergedViteConfig.assetsInclude = null;
- return mergedViteConfig;
-}