From 7e280f27de19daa5b336029a8320a766c85a6d31 Mon Sep 17 00:00:00 2001
From: Anthony Fu <anthonyfu117@hotmail.com>
Date: Thu, 7 Jul 2022 16:38:42 +0800
Subject: [PATCH 1/7] perf: transform `#imports` to improve tree-shaking

---
 packages/kit/package.json                   |  2 +-
 packages/nuxt/package.json                  |  2 +-
 packages/nuxt/src/auto-imports/module.ts    | 11 ++++++-----
 packages/nuxt/src/auto-imports/transform.ts | 10 ++++++++--
 packages/schema/package.json                |  2 +-
 test/fixtures/basic/pages/index.vue         |  2 ++
 yarn.lock                                   | 14 +++++++-------
 7 files changed, 26 insertions(+), 17 deletions(-)

diff --git a/packages/kit/package.json b/packages/kit/package.json
index bfd2c03dcb7..44e5cf59910 100644
--- a/packages/kit/package.json
+++ b/packages/kit/package.json
@@ -29,7 +29,7 @@
     "scule": "^0.2.1",
     "semver": "^7.3.7",
     "unctx": "^1.1.4",
-    "unimport": "^0.4.1",
+    "unimport": "^0.4.3",
     "untyped": "^0.4.4"
   },
   "devDependencies": {
diff --git a/packages/nuxt/package.json b/packages/nuxt/package.json
index b80e7d7b863..0e83271803b 100644
--- a/packages/nuxt/package.json
+++ b/packages/nuxt/package.json
@@ -62,7 +62,7 @@
     "ufo": "^0.8.4",
     "unctx": "^1.1.4",
     "unenv": "^0.5.2",
-    "unimport": "^0.4.1",
+    "unimport": "^0.4.3",
     "unplugin": "^0.7.1",
     "untyped": "^0.4.4",
     "vue": "^3.2.37",
diff --git a/packages/nuxt/src/auto-imports/module.ts b/packages/nuxt/src/auto-imports/module.ts
index 447d3f67780..fdd9b23976a 100644
--- a/packages/nuxt/src/auto-imports/module.ts
+++ b/packages/nuxt/src/auto-imports/module.ts
@@ -38,6 +38,7 @@ export default defineNuxtModule<Partial<AutoImportsOptions>>({
     const ctx = createUnimport({
       presets: options.presets,
       imports: options.imports,
+      virtualImports: ['#imports'],
       addons: {
         vueTemplate: true
       }
@@ -56,11 +57,11 @@ export default defineNuxtModule<Partial<AutoImportsOptions>>({
     composablesDirs = composablesDirs.map(dir => normalize(dir))
 
     // Support for importing from '#imports'
-    addTemplate({
-      filename: 'imports.mjs',
-      getContents: () => ctx.toExports()
-    })
-    nuxt.options.alias['#imports'] = join(nuxt.options.buildDir, 'imports')
+    // addTemplate({
+    //   filename: 'imports.mjs',
+    //   getContents: () => ctx.toExports()
+    // })
+    // nuxt.options.alias['#imports'] = join(nuxt.options.buildDir, 'imports')
 
     // Transpile and injection
     // @ts-ignore temporary disabled due to #746
diff --git a/packages/nuxt/src/auto-imports/transform.ts b/packages/nuxt/src/auto-imports/transform.ts
index fb5427c4fdc..3fcd826c284 100644
--- a/packages/nuxt/src/auto-imports/transform.ts
+++ b/packages/nuxt/src/auto-imports/transform.ts
@@ -12,7 +12,7 @@ export const TransformPlugin = createUnplugin(({ ctx, options, sourcemap }: {ctx
       const { pathname, search } = parseURL(decodeURIComponent(pathToFileURL(id).href))
       const { type, macro } = parseQuery(search)
 
-      const exclude = options.transform?.exclude || [/[\\/]node_modules[\\/]/]
+      const exclude = options.transform?.exclude || []
       const include = options.transform?.include || []
 
       // Custom includes - exclude node_modules by default
@@ -34,7 +34,13 @@ export const TransformPlugin = createUnplugin(({ ctx, options, sourcemap }: {ctx
       }
     },
     async transform (_code, id) {
-      const { code, s } = await ctx.injectImports(_code, id)
+      const isNodeModule = id.match(/[\\/]node_modules[\\/]/)
+      // For modules in node_modules, we only transform `#imports` but not doing auto-imports
+      if (isNodeModule && !_code.match(/(['"])#imports\1/)) {
+        return
+      }
+
+      const { code, s } = await ctx.injectImports(_code, id, { autoImport: !isNodeModule })
       if (code === _code) {
         return
       }
diff --git a/packages/schema/package.json b/packages/schema/package.json
index 4338125247b..a6fff45b85a 100644
--- a/packages/schema/package.json
+++ b/packages/schema/package.json
@@ -29,7 +29,7 @@
     "scule": "^0.2.1",
     "std-env": "^3.1.1",
     "ufo": "^0.8.4",
-    "unimport": "^0.4.1"
+    "unimport": "^0.4.3"
   },
   "engines": {
     "node": "^14.16.0 || ^16.11.0 || ^17.0.0 || ^18.0.0"
diff --git a/test/fixtures/basic/pages/index.vue b/test/fixtures/basic/pages/index.vue
index 133f790600d..06903d38513 100644
--- a/test/fixtures/basic/pages/index.vue
+++ b/test/fixtures/basic/pages/index.vue
@@ -18,6 +18,8 @@
 </template>
 
 <script setup>
+import { useRuntimeConfig } from '#imports'
+
 const config = useRuntimeConfig()
 
 const foo = useFoo()
diff --git a/yarn.lock b/yarn.lock
index 7e78f68e784..a5b0a06e480 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1648,7 +1648,7 @@ __metadata:
     semver: ^7.3.7
     unbuild: latest
     unctx: ^1.1.4
-    unimport: ^0.4.1
+    unimport: ^0.4.3
     untyped: ^0.4.4
   languageName: unknown
   linkType: soft
@@ -1675,7 +1675,7 @@ __metadata:
     std-env: ^3.1.1
     ufo: ^0.8.4
     unbuild: latest
-    unimport: ^0.4.1
+    unimport: ^0.4.3
     vite: ^2.9.13
   languageName: unknown
   linkType: soft
@@ -9885,7 +9885,7 @@ __metadata:
     unbuild: latest
     unctx: ^1.1.4
     unenv: ^0.5.2
-    unimport: ^0.4.1
+    unimport: ^0.4.3
     unplugin: ^0.7.1
     untyped: ^0.4.4
     vue: ^3.2.37
@@ -12905,9 +12905,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"unimport@npm:^0.4.1":
-  version: 0.4.1
-  resolution: "unimport@npm:0.4.1"
+"unimport@npm:^0.4.3":
+  version: 0.4.3
+  resolution: "unimport@npm:0.4.3"
   dependencies:
     "@rollup/pluginutils": ^4.2.1
     escape-string-regexp: ^5.0.0
@@ -12919,7 +12919,7 @@ __metadata:
     scule: ^0.2.1
     strip-literal: ^0.4.0
     unplugin: ^0.7.1
-  checksum: 169d1d98eddda8f4c477bf592d3179be3812c4f82e817e14b358259ed3289dd529a9c6105de69bb7b422bcb77351291f667097a9e87abcfc5ebcfe339722e641
+  checksum: f4215eb7d5c9b6ef09f7a239780da904b5908a0f05bfd71f540d39440ef72b53f8cdde4a6c6267844dcc028fbf28afd74142abd8c005590134400bd4c85f4f15
   languageName: node
   linkType: hard
 

From 16086d56b81ba98ecc281b91216aa65299a672eb Mon Sep 17 00:00:00 2001
From: Anthony Fu <anthonyfu117@hotmail.com>
Date: Thu, 7 Jul 2022 17:02:30 +0800
Subject: [PATCH 2/7] refactor: update

---
 packages/nuxt/src/auto-imports/transform.ts | 32 ++++++++++-----------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/packages/nuxt/src/auto-imports/transform.ts b/packages/nuxt/src/auto-imports/transform.ts
index 3fcd826c284..de5f1a01abe 100644
--- a/packages/nuxt/src/auto-imports/transform.ts
+++ b/packages/nuxt/src/auto-imports/transform.ts
@@ -12,15 +12,16 @@ export const TransformPlugin = createUnplugin(({ ctx, options, sourcemap }: {ctx
       const { pathname, search } = parseURL(decodeURIComponent(pathToFileURL(id).href))
       const { type, macro } = parseQuery(search)
 
-      const exclude = options.transform?.exclude || []
-      const include = options.transform?.include || []
-
-      // Custom includes - exclude node_modules by default
-      if (exclude.some(pattern => id.match(pattern)) && !include.some(pattern => id.match(pattern))) {
+      // Included
+      if (options.transform?.include?.some(pattern => id.match(pattern))) {
+        return true
+      }
+      // Excluded
+      if (options.transform?.exclude?.some(pattern => id.match(pattern))) {
         return false
       }
 
-      // vue files
+      // Vue files
       if (
         pathname.endsWith('.vue') &&
         (type === 'template' || type === 'script' || macro || !search)
@@ -28,25 +29,24 @@ export const TransformPlugin = createUnplugin(({ ctx, options, sourcemap }: {ctx
         return true
       }
 
-      // js files
+      // JavaScript files
       if (pathname.match(/\.((c|m)?j|t)sx?$/g)) {
         return true
       }
     },
-    async transform (_code, id) {
+    async transform (code, id) {
       const isNodeModule = id.match(/[\\/]node_modules[\\/]/)
       // For modules in node_modules, we only transform `#imports` but not doing auto-imports
-      if (isNodeModule && !_code.match(/(['"])#imports\1/)) {
+      if (isNodeModule && !code.match(/(['"])#imports\1/)) {
         return
       }
 
-      const { code, s } = await ctx.injectImports(_code, id, { autoImport: !isNodeModule })
-      if (code === _code) {
-        return
-      }
-      return {
-        code,
-        map: sourcemap && s.generateMap({ source: id, includeContent: true })
+      const { s } = await ctx.injectImports(code, id, { autoImport: !isNodeModule })
+      if (s.hasChanged()) {
+        return {
+          code: s.toString(),
+          map: sourcemap && s.generateMap({ source: id, includeContent: true })
+        }
       }
     }
   }

From dc6346a8c543478771f25bf33ce9fd79e9a18a98 Mon Sep 17 00:00:00 2001
From: Anthony Fu <anthonyfu117@hotmail.com>
Date: Thu, 7 Jul 2022 17:22:00 +0800
Subject: [PATCH 3/7] test: add bad sideeffect

---
 packages/nuxt/src/auto-imports/module.ts         | 2 +-
 test/fixtures/basic/composables/badSideEffect.ts | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)
 create mode 100644 test/fixtures/basic/composables/badSideEffect.ts

diff --git a/packages/nuxt/src/auto-imports/module.ts b/packages/nuxt/src/auto-imports/module.ts
index fdd9b23976a..3806facf3b0 100644
--- a/packages/nuxt/src/auto-imports/module.ts
+++ b/packages/nuxt/src/auto-imports/module.ts
@@ -61,7 +61,7 @@ export default defineNuxtModule<Partial<AutoImportsOptions>>({
     //   filename: 'imports.mjs',
     //   getContents: () => ctx.toExports()
     // })
-    // nuxt.options.alias['#imports'] = join(nuxt.options.buildDir, 'imports')
+    nuxt.options.alias['#imports'] = join(nuxt.options.buildDir, 'imports')
 
     // Transpile and injection
     // @ts-ignore temporary disabled due to #746
diff --git a/test/fixtures/basic/composables/badSideEffect.ts b/test/fixtures/basic/composables/badSideEffect.ts
new file mode 100644
index 00000000000..01f0bd44eb2
--- /dev/null
+++ b/test/fixtures/basic/composables/badSideEffect.ts
@@ -0,0 +1,5 @@
+export function badSideEffect () {
+  // ...
+}
+
+throw new Error('composables/badSideEffect.ts should be tree-shaked')

From c00531f5e1eea2e1950ddbccd20622a3df734aad Mon Sep 17 00:00:00 2001
From: Anthony Fu <anthonyfu117@hotmail.com>
Date: Thu, 7 Jul 2022 17:29:32 +0800
Subject: [PATCH 4/7] fix: support transforming extends

---
 packages/nuxt/src/auto-imports/transform.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/nuxt/src/auto-imports/transform.ts b/packages/nuxt/src/auto-imports/transform.ts
index de5f1a01abe..55cc899e831 100644
--- a/packages/nuxt/src/auto-imports/transform.ts
+++ b/packages/nuxt/src/auto-imports/transform.ts
@@ -35,7 +35,7 @@ export const TransformPlugin = createUnplugin(({ ctx, options, sourcemap }: {ctx
       }
     },
     async transform (code, id) {
-      const isNodeModule = id.match(/[\\/]node_modules[\\/]/)
+      const isNodeModule = id.match(/[\\/]node_modules[\\/]/) && !options.transform?.include?.some(pattern => id.match(pattern))
       // For modules in node_modules, we only transform `#imports` but not doing auto-imports
       if (isNodeModule && !code.match(/(['"])#imports\1/)) {
         return

From 846bf1fd6d990de510ad6a1e12a4197ec851d6df Mon Sep 17 00:00:00 2001
From: Anthony Fu <anthonyfu117@hotmail.com>
Date: Tue, 12 Jul 2022 14:50:28 +0800
Subject: [PATCH 5/7] chore: add error

---
 packages/nuxt/src/auto-imports/module.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/nuxt/src/auto-imports/module.ts b/packages/nuxt/src/auto-imports/module.ts
index 3806facf3b0..9c4bf14addc 100644
--- a/packages/nuxt/src/auto-imports/module.ts
+++ b/packages/nuxt/src/auto-imports/module.ts
@@ -57,10 +57,10 @@ export default defineNuxtModule<Partial<AutoImportsOptions>>({
     composablesDirs = composablesDirs.map(dir => normalize(dir))
 
     // Support for importing from '#imports'
-    // addTemplate({
-    //   filename: 'imports.mjs',
-    //   getContents: () => ctx.toExports()
-    // })
+    addTemplate({
+      filename: 'imports.mjs',
+      getContents: () => ctx.toExports() + '\nthrow new Error("`#imports` should be transformed with real imports. There seems to be something wrong with the auto-imports plugin.")'
+    })
     nuxt.options.alias['#imports'] = join(nuxt.options.buildDir, 'imports')
 
     // Transpile and injection

From 5c47cc3534cfc13c33b964be5a2da1a752059a1d Mon Sep 17 00:00:00 2001
From: Anthony Fu <anthonyfu117@hotmail.com>
Date: Fri, 15 Jul 2022 09:04:16 +0800
Subject: [PATCH 6/7] fix: windows webpack

---
 packages/nuxt/src/auto-imports/transform.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/nuxt/src/auto-imports/transform.ts b/packages/nuxt/src/auto-imports/transform.ts
index 55cc899e831..77efb5a2647 100644
--- a/packages/nuxt/src/auto-imports/transform.ts
+++ b/packages/nuxt/src/auto-imports/transform.ts
@@ -3,6 +3,7 @@ import { createUnplugin } from 'unplugin'
 import { parseQuery, parseURL } from 'ufo'
 import { Unimport } from 'unimport'
 import { AutoImportsOptions } from '@nuxt/schema'
+import { normalize } from 'pathe'
 
 export const TransformPlugin = createUnplugin(({ ctx, options, sourcemap }: {ctx: Unimport, options: Partial<AutoImportsOptions>, sourcemap?: boolean }) => {
   return {
@@ -35,6 +36,7 @@ export const TransformPlugin = createUnplugin(({ ctx, options, sourcemap }: {ctx
       }
     },
     async transform (code, id) {
+      id = normalize(id)
       const isNodeModule = id.match(/[\\/]node_modules[\\/]/) && !options.transform?.include?.some(pattern => id.match(pattern))
       // For modules in node_modules, we only transform `#imports` but not doing auto-imports
       if (isNodeModule && !code.match(/(['"])#imports\1/)) {

From 1b65b1e6a0f593858fd137717451e2ccb90d4841 Mon Sep 17 00:00:00 2001
From: Anthony Fu <anthonyfu117@hotmail.com>
Date: Sat, 16 Jul 2022 14:17:40 +0800
Subject: [PATCH 7/7] chore: switch to warning

---
 packages/nuxt/src/auto-imports/module.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/nuxt/src/auto-imports/module.ts b/packages/nuxt/src/auto-imports/module.ts
index 9c4bf14addc..ab5fb933ce2 100644
--- a/packages/nuxt/src/auto-imports/module.ts
+++ b/packages/nuxt/src/auto-imports/module.ts
@@ -59,7 +59,7 @@ export default defineNuxtModule<Partial<AutoImportsOptions>>({
     // Support for importing from '#imports'
     addTemplate({
       filename: 'imports.mjs',
-      getContents: () => ctx.toExports() + '\nthrow new Error("`#imports` should be transformed with real imports. There seems to be something wrong with the auto-imports plugin.")'
+      getContents: () => ctx.toExports() + '\nif (process.dev) { console.warn("[nuxt] `#imports` should be transformed with real imports. There seems to be something wrong with the auto-imports plugin.") }'
     })
     nuxt.options.alias['#imports'] = join(nuxt.options.buildDir, 'imports')