Update import paths for concierge handlers

genu · Jan 30, 2024 · 9134713 · 9134713
1 parent 718b915
commit 9134713
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 25 deletions.
diff --git a/playground/server/concierge/cron/ping.cron.ts b/playground/server/concierge/cron/ping.cron.ts
@@ -1,4 +1,4 @@
-import { defineCron } from "#imports";
+import { defineCron } from "#concierge-handlers";
 
 export default defineCron(
   "PingServer",

diff --git a/playground/server/concierge/queues/my-queue.ts b/playground/server/concierge/queues/my-queue.ts
@@ -1,4 +1,4 @@
-import { defineQueue } from "#imports";
+import { defineQueue } from "#concierge-handlers";
 
 export default defineQueue("SendEmail", {
   defaultJobOptions: {

diff --git a/playground/server/concierge/workers/my-worker.ts b/playground/server/concierge/workers/my-worker.ts
@@ -1,4 +1,4 @@
-import { defineWorker } from "#imports";
+import { defineWorker } from "#concierge-handlers";
 
 export default defineWorker("SendEmail", async (job) => {
   // Do something

diff --git a/src/module.ts b/src/module.ts
@@ -51,8 +51,8 @@ export default defineNuxtModule<ModuleOptions>({
     const { resolve } = createResolver(import.meta.url);
     const logger = useLogger(name);
 
-    addServerImportsDir(resolve("./runtime/server/utils"));
-    addServerImportsDir(resolve("./runtime/server/handlers"));
+    // addServerImportsDir(resolve("./runtime/server/utils"));
+    // addServerImportsDir(resolve("./runtime/server/handlers"));
 
     // Test Redis connection
     const canConnect = await isValidRedisConnection(options.redis);

diff --git a/src/runtime/server/handlers/index.ts b/src/runtime/server/handlers/index.ts
@@ -0,0 +1,3 @@
+export * from "./defineCron";
+export * from "./defineQueue";
+export * from "./defineWorker";
diff --git a/src/templates.ts b/src/templates.ts
@@ -122,29 +122,29 @@ export const createTemplateType = () => {
     );
 
     nitroConfig.alias["#concierge-handlers"] = resolve(
-      "./runtime/server/utils/handlers"
+      "./runtime/server/handlers"
     );
   });
 
-  // addTypeTemplate({
-  //   filename: "types/concierge-handlers.d.ts",
-  //   write: true,
-  //   getContents() {
-  //     return `
-  // declare module "#concierge-handlers" {
-  //  const defineQueue: typeof import("${resolve(
-  //    "./runtime/server/handlers/defineQueue"
-  //  )}").defineQueue;
-  //  const defineWorker: typeof import("${resolve(
-  //    "./runtime/server/handlers/defineWorker"
-  //  )}").defineWorker;
-  //  const defineCron: typeof import("${resolve(
-  //    "./runtime/server/handlers/defineCron"
-  //  )}").defineCron;
-  // }
-  //     `;
-  //   },
-  // });
+  addTypeTemplate({
+    filename: "types/concierge-handlers.d.ts",
+    write: true,
+    getContents() {
+      return `
+  declare module "#concierge-handlers" {
+   const defineQueue: typeof import("${resolve(
+     "./runtime/server/handlers/defineQueue"
+   )}").defineQueue;
+   const defineWorker: typeof import("${resolve(
+     "./runtime/server/handlers/defineWorker"
+   )}").defineWorker;
+   const defineCron: typeof import("${resolve(
+     "./runtime/server/handlers/defineCron"
+   )}").defineCron;
+  }
+      `;
+    },
+  });
 
   addTypeTemplate({
     filename: "types/concierge.d.ts",