From 968989c49a696a1fce3030b34ea810a7a2b4e3a3 Mon Sep 17 00:00:00 2001 From: INOUE Takuya Date: Mon, 6 May 2024 17:09:09 +0900 Subject: [PATCH] Support defineNuxtComponent --- .../src/lib/__snapshots__/convertSrc.test.ts.snap | 2 +- .../src/lib/convertSrc.ts | 13 +++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/packages/vue-script-setup-converter/src/lib/__snapshots__/convertSrc.test.ts.snap b/packages/vue-script-setup-converter/src/lib/__snapshots__/convertSrc.test.ts.snap index cbced71..ee75511 100644 --- a/packages/vue-script-setup-converter/src/lib/__snapshots__/convertSrc.test.ts.snap +++ b/packages/vue-script-setup-converter/src/lib/__snapshots__/convertSrc.test.ts.snap @@ -1,7 +1,7 @@ // Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html exports[`snapshot > defineNuxtComponent 1`] = ` -"import { defineNuxtComponent, useNuxtApp } from '#imports'; +"import { useNuxtApp } from '#imports'; definePageMeta({ name: 'HelloWorld', layout: 'test-layout', middleware: 'test-middleware' }); diff --git a/packages/vue-script-setup-converter/src/lib/convertSrc.ts b/packages/vue-script-setup-converter/src/lib/convertSrc.ts index 1e98846..d41319e 100644 --- a/packages/vue-script-setup-converter/src/lib/convertSrc.ts +++ b/packages/vue-script-setup-converter/src/lib/convertSrc.ts @@ -57,12 +57,13 @@ export const convertSrc = (input: string) => { .getStatements() .filter((state) => !Node.isExportAssignment(state)) .map((x) => { - if ( - x.isKind(SyntaxKind.ImportDeclaration) && - hasNamedImportIdentifier(x, "defineComponent") - ) { - removeNamedImportIdentifier(x, "defineComponent"); - return x.getText(); + if (x.isKind(SyntaxKind.ImportDeclaration)) { + if (hasNamedImportIdentifier(x, "defineComponent")) { + removeNamedImportIdentifier(x, "defineComponent"); + } + if (hasNamedImportIdentifier(x, "defineNuxtComponent")) { + removeNamedImportIdentifier(x, "defineNuxtComponent"); + } } return x.getText(); })