From 41f381b4af985180cc13bf32cedd3b0678d8d2bc Mon Sep 17 00:00:00 2001
From: ivan <sun_day500@163.com>
Date: Tue, 14 Mar 2023 17:34:50 +0800
Subject: [PATCH 1/2] fix(optimizer): # symbol of deps id stripped in url

---
 packages/vite/src/node/utils.ts              | 1 +
 playground/resolve/__tests__/resolve.spec.ts | 2 +-
 playground/resolve/index.html                | 4 +++-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/packages/vite/src/node/utils.ts b/packages/vite/src/node/utils.ts
index b614da2696318c..75aa4a0b81d6a8 100644
--- a/packages/vite/src/node/utils.ts
+++ b/packages/vite/src/node/utils.ts
@@ -76,6 +76,7 @@ export function unwrapId(id: string): string {
 
 export const flattenId = (id: string): string =>
   id
+    .replace(/\/#/g, '/[sharp]')
     .replace(/[/:]/g, '_')
     .replace(/\./g, '__')
     .replace(/(\s*>\s*)/g, '___')
diff --git a/playground/resolve/__tests__/resolve.spec.ts b/playground/resolve/__tests__/resolve.spec.ts
index f30fc3e9338140..38de04e9d47c30 100644
--- a/playground/resolve/__tests__/resolve.spec.ts
+++ b/playground/resolve/__tests__/resolve.spec.ts
@@ -155,7 +155,7 @@ test('resolve.conditions', async () => {
 
 test('resolve package that contains # in path', async () => {
   expect(await page.textContent('.path-contains-sharp-symbol')).toMatch(
-    '[success]',
+    '[success] true',
   )
 })
 
diff --git a/playground/resolve/index.html b/playground/resolve/index.html
index 0966f050bbd580..87a0ca749aa36a 100644
--- a/playground/resolve/index.html
+++ b/playground/resolve/index.html
@@ -334,7 +334,9 @@ <h2>resolve package that contains # in path</h2>
   text('.inline-pkg', inlineMsg)
 
   import es5Ext from 'es5-ext'
-  text('.path-contains-sharp-symbol', '[success]')
+  import contains from 'es5-ext/string/#/contains'
+
+  text('.path-contains-sharp-symbol', `[success] ${contains.call('#', '#')}`)
 </script>
 
 <style>

From c3e456ae3dc012ff45db2adfc51fa54f0902c851 Mon Sep 17 00:00:00 2001
From: sun0day <sun_day500@163.com>
Date: Tue, 14 Mar 2023 22:18:40 +0800
Subject: [PATCH 2/2] chore(optimizer): replace # with _____

Co-authored-by: patak <matias.capeletto@gmail.com>
---
 packages/vite/src/node/utils.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/vite/src/node/utils.ts b/packages/vite/src/node/utils.ts
index 75aa4a0b81d6a8..b73f1b8e545737 100644
--- a/packages/vite/src/node/utils.ts
+++ b/packages/vite/src/node/utils.ts
@@ -76,10 +76,10 @@ export function unwrapId(id: string): string {
 
 export const flattenId = (id: string): string =>
   id
-    .replace(/\/#/g, '/[sharp]')
     .replace(/[/:]/g, '_')
     .replace(/\./g, '__')
     .replace(/(\s*>\s*)/g, '___')
+    .replace(/#/g, '____')
 
 export const normalizeId = (id: string): string =>
   id.replace(/(\s*>\s*)/g, ' > ')