From 458a2a96fb342ae402d167011fd8cdf8d0db837b Mon Sep 17 00:00:00 2001 From: Ryota Watanabe <43837308+wattanx@users.noreply.github.com> Date: Thu, 22 Jun 2023 10:28:43 +0900 Subject: [PATCH] Revert "feat: generate middleware types (#796)" This reverts commit 3c2e715ccc56fe1e64c008982c012a0199281466. --- packages/bridge-schema/src/config/index.ts | 1 + packages/bridge/src/app.ts | 6 +----- packages/bridge/src/runtime/app.ts | 1 + packages/bridge/src/type-templates.ts | 25 ++++------------------ 4 files changed, 7 insertions(+), 26 deletions(-) diff --git a/packages/bridge-schema/src/config/index.ts b/packages/bridge-schema/src/config/index.ts index c32bf907..1a3fcc6c 100644 --- a/packages/bridge-schema/src/config/index.ts +++ b/packages/bridge-schema/src/config/index.ts @@ -1,3 +1,4 @@ + import app from './app' import build from './build' import cli from './cli' diff --git a/packages/bridge/src/app.ts b/packages/bridge/src/app.ts index d4797e37..6f8c09fb 100644 --- a/packages/bridge/src/app.ts +++ b/packages/bridge/src/app.ts @@ -2,7 +2,7 @@ import { useNuxt, addTemplate, resolveAlias, addWebpackPlugin, addVitePlugin, ad import { NuxtModule } from '@nuxt/schema' import { normalize, resolve } from 'pathe' import { resolveImports } from 'mlly' -import { componentsTypeTemplate, schemaTemplate, middlewareTypeTemplate } from './type-templates' +import { componentsTypeTemplate, schemaTemplate } from './type-templates' import { distDir } from './dirs' import { VueCompat } from './vue-compat' @@ -57,12 +57,8 @@ export async function setupAppBridge (_options: any) { ...componentsTypeTemplate, options: { components, buildDir: nuxt.options.buildDir } }) - - addTemplate(middlewareTypeTemplate) - nuxt.hook('prepare:types', ({ references }) => { references.push({ path: resolve(nuxt.options.buildDir, 'types/components.d.ts') }) - references.push({ path: resolve(nuxt.options.buildDir, 'types/middleware.d.ts') }) }) // Augment schema with module types diff --git a/packages/bridge/src/runtime/app.ts b/packages/bridge/src/runtime/app.ts index cc873975..9975e174 100644 --- a/packages/bridge/src/runtime/app.ts +++ b/packages/bridge/src/runtime/app.ts @@ -1,3 +1,4 @@ + import type { NuxtAppCompat } from '@nuxt/bridge-schema' import { defineComponent, getCurrentInstance } from './composables' export const isVue2 = true diff --git a/packages/bridge/src/type-templates.ts b/packages/bridge/src/type-templates.ts index af8223a5..5013db0c 100644 --- a/packages/bridge/src/type-templates.ts +++ b/packages/bridge/src/type-templates.ts @@ -1,3 +1,4 @@ + import { isAbsolute, relative, join } from 'pathe' import type { Component, Nuxt, NuxtApp } from '@nuxt/schema' import { genDynamicImport, genString } from 'knitwork' @@ -9,11 +10,6 @@ type ComponentsTemplateOptions = { components: Component[] } -interface TemplateContext { - nuxt: Nuxt - app: NuxtApp & { templateVars: Record } -} - export const componentsTypeTemplate = { filename: 'types/components.d.ts', getContents: ({ options }: { options: ComponentsTemplateOptions }) => { @@ -32,22 +28,9 @@ export const componentNames: string[] } } -export const middlewareTypeTemplate = { - filename: 'types/middleware.d.ts', - getContents: ({ app }: TemplateContext) => { - const middleware = app.templateVars.middleware - - return [ - 'import type { NuxtAppCompat } from \'@nuxt/bridge-schema\'', - `export type MiddlewareKey = ${middleware.map(mw => genString(mw.name)).join(' | ') || 'string'}`, - 'declare module \'vue/types/options\' {', - ' export type Middleware = MiddlewareKey | ((ctx: NuxtAppCompat, cb: Function) => Promise | void)', - ' interface ComponentOptions {', - ' middleware?: Middleware | Middleware[]', - ' }', - '}' - ].join('\n') - } +interface TemplateContext { + nuxt: Nuxt + app: NuxtApp } const adHocModules = ['router', 'pages', 'auto-imports', 'meta', 'components']