feat: upgrade unimport to 0.7.0 (nuxt#8483)

studiad · Oct 26, 2022 · bbea416 · bbea416
1 parent 12808f1
commit bbea416
Show file tree

Hide file tree

Showing 7 changed files with 62 additions and 20 deletions.
diff --git a/packages/kit/package.json b/packages/kit/package.json
@@ -29,7 +29,7 @@
     "scule": "^0.3.2",
     "semver": "^7.3.8",
     "unctx": "^2.0.2",
-    "unimport": "^0.6.8",
+    "unimport": "^0.7.0",
     "untyped": "^0.5.0"
   },
   "devDependencies": {

diff --git a/packages/nuxt/package.json b/packages/nuxt/package.json
@@ -70,7 +70,7 @@
     "ultrahtml": "^0.4.0",
     "unctx": "^2.0.2",
     "unenv": "^0.6.2",
-    "unimport": "^0.6.8",
+    "unimport": "^0.7.0",
     "unplugin": "^0.10.1",
     "untyped": "^0.5.0",
     "vue": "^3.2.41",

diff --git a/packages/nuxt/src/imports/module.ts b/packages/nuxt/src/imports/module.ts
@@ -34,7 +34,8 @@ export default defineNuxtModule<Partial<ImportsOptions>>({
     // Allow modules extending sources
     await nuxt.callHook('imports:sources', options.presets as ImportPresetWithDeprecation[])
 
-    options.presets?.forEach((i: ImportPresetWithDeprecation | string) => {
+    options.presets?.forEach((_i) => {
+      const i = _i as ImportPresetWithDeprecation | string
       if (typeof i !== 'string' && i.names && !i.imports) {
         i.imports = i.names
         logger.warn('imports: presets.names is deprecated, use presets.imports instead')
@@ -72,7 +73,7 @@ export default defineNuxtModule<Partial<ImportsOptions>>({
     // Support for importing from '#imports'
     addTemplate({
       filename: 'imports.mjs',
-      getContents: () => ctx.toExports() + '\nif (process.dev) { console.warn("[nuxt] `#imports` should be transformed with real imports. There seems to be something wrong with the imports plugin.") }'
+      getContents: async () => await ctx.toExports() + '\nif (process.dev) { console.warn("[nuxt] `#imports` should be transformed with real imports. There seems to be something wrong with the imports plugin.") }'
     })
     nuxt.options.alias['#imports'] = join(nuxt.options.buildDir, 'imports')
 
@@ -81,8 +82,8 @@ export default defineNuxtModule<Partial<ImportsOptions>>({
       // Add all imports to globalThis in development mode
       addPluginTemplate({
         filename: 'imports.mjs',
-        getContents: () => {
-          const imports = ctx.getImports()
+        getContents: async () => {
+          const imports = await ctx.getImports()
           const importStatement = toImports(imports)
           const globalThisSet = imports.map(i => `globalThis.${i.as} = ${i.as};`).join('\n')
           return `${importStatement}\n\n${globalThisSet}\n\nexport default () => {};`
@@ -164,9 +165,9 @@ function addDeclarationTemplates (ctx: Unimport, options: Partial<ImportsOptions
 
   addTemplate({
     filename: 'types/imports.d.ts',
-    getContents: () => '// Generated by auto imports\n' + (
+    getContents: async () => '// Generated by auto imports\n' + (
       options.autoImport
-        ? ctx.generateTypeDeclarations({ resolvePath: r })
+        ? await ctx.generateTypeDeclarations({ resolvePath: r })
         : '// Implicit auto importing is disabled, you can use explicitly import from `#imports` instead.'
     )
   })

diff --git a/packages/nuxt/src/imports/presets.ts b/packages/nuxt/src/imports/presets.ts
@@ -1,6 +1,6 @@
-import { defineUnimportPreset, Preset } from 'unimport'
+import { defineUnimportPreset, InlinePreset } from 'unimport'
 
-const commonPresets: Preset[] = [
+const commonPresets: InlinePreset[] = [
   // #head
   defineUnimportPreset({
     from: '#head',
@@ -137,7 +137,7 @@ const vuePreset = defineUnimportPreset({
   ] as Array<keyof typeof import('vue')>
 })
 
-export const defaultPresets = [
+export const defaultPresets: InlinePreset[] = [
   ...commonPresets,
   appPreset,
   vuePreset

diff --git a/packages/schema/package.json b/packages/schema/package.json
@@ -33,7 +33,7 @@
     "scule": "^0.3.2",
     "std-env": "^3.3.0",
     "ufo": "^0.8.6",
-    "unimport": "^0.6.8",
+    "unimport": "^0.7.0",
     "untyped": "^0.5.0"
   },
   "engines": {

diff --git a/packages/schema/src/types/hooks.ts b/packages/schema/src/types/hooks.ts
@@ -7,7 +7,7 @@ import type { Manifest } from 'vue-bundle-renderer'
 import type { EventHandler } from 'h3'
 import type { ModuleContainer } from './module'
 import type { NuxtTemplate, Nuxt, NuxtApp, ResolvedNuxtTemplate } from './nuxt'
-import type { Preset as ImportPreset, Import } from 'unimport'
+import type { Import, InlinePreset } from 'unimport'
 import type { NuxtConfig, NuxtOptions } from './config'
 import type { Nitro, NitroConfig } from 'nitropack'
 import type { Component, ComponentsOptions } from './components'
@@ -59,7 +59,7 @@ export type NuxtLayout = {
   file: string
 }
 
-export interface ImportPresetWithDeprecation extends ImportPreset {
+export interface ImportPresetWithDeprecation extends InlinePreset {
   /**
    * @deprecated renamed to `imports`
    */

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml