From 2136f2bb960d1a81ac3b3ca04d9ebd89dba44661 Mon Sep 17 00:00:00 2001
From: Bjorn Lu <bjornlu.dev@gmail.com>
Date: Sun, 20 Feb 2022 19:25:03 +0800
Subject: [PATCH] fix: prebundle dep with colon (#7006)

---
 .../__tests__/optimize-deps.spec.ts           |  4 ++++
 packages/playground/optimize-deps/index.html  |  6 ++++++
 .../playground/optimize-deps/package.json     |  1 +
 .../playground/optimize-deps/vite.config.js   |  5 ++++-
 packages/vite/src/node/utils.ts               |  2 +-
 pnpm-lock.yaml                                | 19 +++++++++++++++++++
 6 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/packages/playground/optimize-deps/__tests__/optimize-deps.spec.ts b/packages/playground/optimize-deps/__tests__/optimize-deps.spec.ts
index 706998c288fa50..f3ae6e8147b0f4 100644
--- a/packages/playground/optimize-deps/__tests__/optimize-deps.spec.ts
+++ b/packages/playground/optimize-deps/__tests__/optimize-deps.spec.ts
@@ -87,3 +87,7 @@ test('import from hidden dir', async () => {
 test('import optimize-excluded package that imports optimized-included package', async () => {
   expect(await page.textContent('.nested-include')).toBe('nested-include')
 })
+
+test('import aliased package with colon', async () => {
+  expect(await page.textContent('.url')).toBe('vitejs.dev')
+})
diff --git a/packages/playground/optimize-deps/index.html b/packages/playground/optimize-deps/index.html
index dfb274656f1baf..8451d968d2745b 100644
--- a/packages/playground/optimize-deps/index.html
+++ b/packages/playground/optimize-deps/index.html
@@ -53,6 +53,9 @@ <h2>Dep from hidden dir</h2>
 <h2>Nested include</h2>
 <div>Module path: <span class="nested-include"></span></div>
 
+<h2>Alias with colon</h2>
+<div>URL: <span class="url"></span></div>
+
 <script type="module">
   // test dep detection in globbed files
   const globbed = import.meta.globEager('./glob/*.js')
@@ -85,6 +88,9 @@ <h2>Nested include</h2>
   import { nestedInclude } from 'nested-exclude'
   text('.nested-include', nestedInclude)
 
+  import { parse } from 'node:url'
+  text('.url', parse('https://vitejs.dev').hostname)
+
   function text(el, text) {
     document.querySelector(el).textContent = text
   }
diff --git a/packages/playground/optimize-deps/package.json b/packages/playground/optimize-deps/package.json
index 0606343e0dce3c..860474673685d3 100644
--- a/packages/playground/optimize-deps/package.json
+++ b/packages/playground/optimize-deps/package.json
@@ -23,6 +23,7 @@
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
     "resolve-linked": "workspace:0.0.0",
+    "url": "^0.11.0",
     "vue": "^3.2.25",
     "vuex": "^4.0.0"
   },
diff --git a/packages/playground/optimize-deps/vite.config.js b/packages/playground/optimize-deps/vite.config.js
index 45a50aaf85ede6..1a0ac5afab87c9 100644
--- a/packages/playground/optimize-deps/vite.config.js
+++ b/packages/playground/optimize-deps/vite.config.js
@@ -5,7 +5,10 @@ const vue = require('@vitejs/plugin-vue')
  */
 module.exports = {
   resolve: {
-    dedupe: ['react']
+    dedupe: ['react'],
+    alias: {
+      'node:url': 'url'
+    }
   },
 
   optimizeDeps: {
diff --git a/packages/vite/src/node/utils.ts b/packages/vite/src/node/utils.ts
index 3012e6d57e6c65..bc1b8588cb212d 100644
--- a/packages/vite/src/node/utils.ts
+++ b/packages/vite/src/node/utils.ts
@@ -33,7 +33,7 @@ export function unwrapId(id: string): string {
 }
 
 export const flattenId = (id: string): string =>
-  id.replace(/(\s*>\s*)/g, '__').replace(/[\/\.]/g, '_')
+  id.replace(/(\s*>\s*)/g, '__').replace(/[\/\.:]/g, '_')
 
 export const normalizeId = (id: string): string =>
   id.replace(/(\s*>\s*)/g, ' > ')
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 418cf16f0eb6b1..ab2b4a7833c686 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -284,6 +284,7 @@ importers:
       react: ^17.0.2
       react-dom: ^17.0.2
       resolve-linked: workspace:0.0.0
+      url: ^0.11.0
       vue: ^3.2.25
       vuex: ^4.0.0
     dependencies:
@@ -300,6 +301,7 @@ importers:
       react: 17.0.2
       react-dom: 17.0.2_react@17.0.2
       resolve-linked: link:../resolve-linked
+      url: 0.11.0
       vue: 3.2.26
       vuex: 4.0.2_vue@3.2.26
     devDependencies:
@@ -7663,6 +7665,10 @@ packages:
       once: 1.4.0
     dev: true
 
+  /punycode/1.3.2:
+    resolution: {integrity: sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=}
+    dev: false
+
   /punycode/2.1.1:
     resolution: {integrity: sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==}
     engines: {node: '>=6'}
@@ -7699,6 +7705,12 @@ packages:
     engines: {node: '>=0.6'}
     dev: true
 
+  /querystring/0.2.0:
+    resolution: {integrity: sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=}
+    engines: {node: '>=0.4.x'}
+    deprecated: The querystring API is considered Legacy. new code should use the URLSearchParams API instead.
+    dev: false
+
   /queue-microtask/1.2.3:
     resolution: {integrity: sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==}
 
@@ -9062,6 +9074,13 @@ packages:
       punycode: 2.1.1
     dev: true
 
+  /url/0.11.0:
+    resolution: {integrity: sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=}
+    dependencies:
+      punycode: 1.3.2
+      querystring: 0.2.0
+    dev: false
+
   /utf8-byte-length/1.0.4:
     resolution: {integrity: sha1-9F8VDExm7uloGGUFq5P8u4rWv2E=}
     dev: true