From a4f735e8d0598e34c07ba6c6a6756a48cb086fa2 Mon Sep 17 00:00:00 2001 From: modbender Date: Sat, 9 Dec 2023 01:13:31 +0530 Subject: [PATCH] fix: prefix for components, lowlight import --- README.md | 4 ++-- src/imports/optional.ts | 7 ++----- src/module.ts | 21 +++++++++------------ 3 files changed, 13 insertions(+), 19 deletions(-) diff --git a/README.md b/README.md index 6291480..fb55ded 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ Instantly add [TipTap Editor](https://tiptap.dev/editor) with basic functionalit ## Features - 🔆Easy to integrate -- ⚡️Instantly usable components +- ⚡️Instantly usable components provided by `@tiptap`. ## Quick Setup @@ -176,7 +176,7 @@ Instantly add [TipTap Editor](https://tiptap.dev/editor) with basic functionalit redo - + diff --git a/src/imports/optional.ts b/src/imports/optional.ts index 50def98..7f32baf 100644 --- a/src/imports/optional.ts +++ b/src/imports/optional.ts @@ -1,7 +1,4 @@ export const lowlightImports = [ { name: "lowlight ", path: "lowlight" }, - { name: "CodeBlock", path: "@tiptap/extension-code-block" }, -]; - -export const optionalImports: {[key: string]: any}[] = []; -export const optionalComponents: {[key: string]: any}[] = []; \ No newline at end of file + { name: "CodeBlockLowlight", path: "@tiptap/extension-code-block-lowlight" }, +]; \ No newline at end of file diff --git a/src/module.ts b/src/module.ts index 6a931cd..821df04 100644 --- a/src/module.ts +++ b/src/module.ts @@ -21,17 +21,11 @@ export interface ModuleOptions { lowlight?: | boolean | { - /** - * Determine if lowlight should be enabled - * - * @default false - */ - enabled: boolean; /** * Languages to be loaded for highlighting * */ - languages: string[]; + // languages: string[]; }; } @@ -54,6 +48,9 @@ export default defineNuxtModule({ const transpileModules = new Set([]); + var optionalImports: { [key: string]: any }[] = []; + var optionalComponents: { [key: string]: any }[] = []; + // Do not add the extension since the `.ts` will be transpiled to `.mjs` after `npm run prepack` for (const obj of allImports.defaultComposables) { addImports({ @@ -78,7 +75,7 @@ export default defineNuxtModule({ for (const obj of allImports.defaultComponents) { addComponent({ mode: "client", - name: obj.name, + name: `${options.prefix}${obj.name}`, export: obj.name, filePath: obj.path, // _internal_install: obj.path, @@ -86,13 +83,13 @@ export default defineNuxtModule({ transpileModules.add(obj.path); } - if (options.lowlight === false) { - allImports.optionalImports.push(...allImports.lowlightImports); + if (!!options.lowlight && options.lowlight !== false) { + optionalImports = [...optionalImports, ...allImports.lowlightImports]; } - for (const obj of allImports.optionalImports) { + for (const obj of optionalImports) { addImports({ - as: obj.name, + as: `${options.prefix}${obj.name}`, name: obj.name, from: obj.path, // _internal_install: obj.path,