rimelight-components 2.0.72 → 2.0.74

package/dist/module.json

@@ -1,6 +1,6 @@
 {
   "name": "rimelight-components",
-  "version": "2.0.72",
+  "version": "2.0.74",
   "docs": "https://rimelight.com/tools/rimelight-components",
   "configKey": "rimelightComponents",
   "compatibility": {

package/dist/module.mjs

@@ -4,7 +4,7 @@ import { readdirSync } from 'node:fs';
 import { basename } from 'node:path';
 
 const name = "rimelight-components";
-const version = "2.0.72";
+const version = "2.0.74";
 const homepage = "https://rimelight.com/tools/rimelight-components";
 
 const defaultOptions = {
@@ -56,7 +56,7 @@ function addBlockMapTemplates(blockNames) {
       let content = "export const BLOCK_RENDERER_COMPONENT_MAP = {\n";
       blockNames.forEach((name) => {
         const fullComponentName = `${name}Renderer`;
-        const componentPath = `rimelight-components/components/blocks/renderer/${fullComponentName}.vue`;
+        const componentPath = `rimelight-components/runtime/components/blocks/renderer/${fullComponentName}.vue`;
         content += `  '${name}': () => import('${componentPath}'),
 `;
       });
@@ -68,32 +68,22 @@ function addBlockMapTemplates(blockNames) {
   addTemplate({
     filename: "rimelight-block-renderer-map.d.ts",
     getContents: () => {
-      const componentImporterType = '() => Promise<{ default: import("vue").Component }>';
-      let content = `// Generated by rimelight-components Nuxt Module
-`;
-      content += `import { Component } from 'vue'
-`;
-      content += `export declare const BLOCK_RENDERER_COMPONENT_MAP: { [key: string]: ${componentImporterType} | undefined }
-`;
-      blockNames.forEach((name) => {
-        content += `export declare const ${name}: ${componentImporterType}
-`;
-      });
-      return content;
+      const importerType = '() => Promise<{ default: import("vue").Component }>';
+      return `import { Component } from 'vue'
+export declare const BLOCK_RENDERER_COMPONENT_MAP: Record<string, ${importerType}>`;
     },
     write: true
   });
   return template;
 }
 function addEditorBlockMapTemplates(blockNames) {
-  const componentImporterType = '() => Promise<{ default: import("vue").Component }>';
   const template = addTemplate({
     filename: "rimelight-block-editor-map.mjs",
     getContents: () => {
       let content = "export const BLOCK_EDITOR_COMPONENT_MAP = {\n";
       blockNames.forEach((name) => {
         const fullComponentName = `${name}Editor`;
-        const componentPath = `rimelight-components/components/blocks/editor/${fullComponentName}.vue`;
+        const componentPath = `rimelight-components/runtime/components/blocks/editor/${fullComponentName}.vue`;
         content += `  '${name}': () => import('${componentPath}'),
 `;
       });
@@ -105,17 +95,9 @@ function addEditorBlockMapTemplates(blockNames) {
   addTemplate({
     filename: "rimelight-block-editor-map.d.ts",
     getContents: () => {
-      let content = `// Generated by rimelight-components Nuxt Module
-`;
-      content += `import { Component } from 'vue'
-`;
-      content += `export declare const BLOCK_EDITOR_COMPONENT_MAP: { [key: string]: ${componentImporterType} | undefined }
-`;
-      blockNames.forEach((name) => {
-        content += `export declare const ${name}: ${componentImporterType}
-`;
-      });
-      return content;
+      const importerType = '() => Promise<{ default: import("vue").Component }>';
+      return `import { Component } from 'vue'
+export declare const BLOCK_EDITOR_COMPONENT_MAP: Record<string, ${importerType}>`;
     },
     write: true
   });
@@ -193,47 +175,40 @@ const module$1 = defineNuxtModule().with({
   },
   setup(options, nuxt) {
     const { resolve } = createResolver(import.meta.url);
+    const runtimePath = resolve("./runtime");
     nuxt.options.appConfig.rimelightComponents = defu(
       nuxt.options.appConfig.rimelightComponents || {},
       options
     );
-    nuxt.options.build.transpile.push(resolve("./runtime"));
-    nuxt.options.alias["#rimelight-components"] = resolve("./runtime");
+    nuxt.options.build.transpile.push(runtimePath);
+    nuxt.options.build.transpile.push("rimelight-components");
+    nuxt.options.alias["#rimelight-components"] = runtimePath;
     addComponentsDir({
       path: resolve("./runtime/components/"),
       pathPrefix: false,
-      //TODO Figure out if this can be typed better
       prefix: options.prefix ?? void 0,
       global: true
     });
     addImportsDir(resolve("./runtime/composables"));
     addImportsDir(resolve("./runtime/utils"));
-    const blockRendererFiles = readdirSync(
-      resolve("./runtime/components/blocks/renderer")
-    ).filter((name2) => name2.endsWith(".vue"));
-    const blockRendererNames = blockRendererFiles.map((file) => {
-      const baseName = basename(file, ".vue");
-      return baseName.replace(/Renderer$/, "");
-    });
-    const blockRendererTemplate = addBlockMapTemplates(blockRendererNames);
-    nuxt.options.alias["#rimelight-block-renderer-map"] = blockRendererTemplate.dst;
-    const blockEditorFiles = readdirSync(
-      resolve("./runtime/components/blocks/editor")
-    ).filter((name2) => name2.endsWith(".vue"));
-    const blockEditorNames = blockEditorFiles.map((file) => {
-      const baseName = basename(file, ".vue");
-      return baseName.replace(/Editor$/, "");
-    });
-    const blockEditorTemplate = addEditorBlockMapTemplates(blockEditorNames);
-    nuxt.options.alias["#rimelight-block-editor-map"] = blockEditorTemplate.dst;
+    const getBlockNames = (dir, suffix) => readdirSync(resolve(dir)).filter((f) => f.endsWith(".vue")).map((f) => basename(f, ".vue").replace(new RegExp(`${suffix}$`), ""));
+    const rendererNames = getBlockNames("./runtime/components/blocks/renderer", "Renderer");
+    const editorNames = getBlockNames("./runtime/components/blocks/editor", "Editor");
+    const blockRendererTemplate = addBlockMapTemplates(rendererNames);
+    const blockEditorTemplate = addEditorBlockMapTemplates(editorNames);
+    const rendererAlias = "#rimelight-block-renderer-map";
+    const editorAlias = "#rimelight-block-editor-map";
+    nuxt.options.build.transpile.push(resolve("./runtime"));
+    nuxt.options.build.transpile.push("rimelight-components");
     nuxt.hook("nitro:config", (nitroConfig) => {
+      nitroConfig.externals = nitroConfig.externals || {};
+      nitroConfig.externals.external = nitroConfig.externals.external || [];
+      nitroConfig.externals.external.push(resolve("./runtime"));
+      nitroConfig.externals.external.push("rimelight-components");
       nitroConfig.alias = nitroConfig.alias || {};
-      nitroConfig.alias["#rimelight-block-renderer-map"] = blockRendererTemplate.dst;
-      nitroConfig.alias["#rimelight-block-editor-map"] = blockEditorTemplate.dst;
-    });
-    nuxt.hook("prepare:types", ({ references }) => {
-      references.push({ path: blockRendererTemplate.dst });
-      references.push({ path: blockEditorTemplate.dst });
+      nitroConfig.alias[rendererAlias] = blockRendererTemplate.dst;
+      nitroConfig.virtual = nitroConfig.virtual || {};
+      nitroConfig.virtual[editorAlias] = blockEditorTemplate.dst;
     });
   }
 });

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "rimelight-components",
   "description": "A component library by Rimelight Entertainment.",
-  "version": "2.0.72",
+  "version": "2.0.74",
   "type": "module",
   "repository": {
     "type": "git",