fix webpack loader types and virtual loader content

embroider-build · Feb 1, 2024 · fa9338a · fa9338a
1 parent 11b43c0
commit fa9338a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/packages/hbs-loader/src/index.ts b/packages/hbs-loader/src/index.ts
@@ -8,7 +8,7 @@ export interface Options {
   };
 }
 
-export default function hbsLoader(this: LoaderContext<Options>, templateContent: string) {
+export default function hbsLoader(this: LoaderContext<Options>, templateContent: string): string | undefined {
   let { compatModuleNaming } = this.getOptions();
   try {
     return hbsToJS(templateContent, { filename: this.resourcePath, compatModuleNaming });

diff --git a/packages/webpack/src/virtual-loader.ts b/packages/webpack/src/virtual-loader.ts
@@ -10,7 +10,7 @@ function setup(appRoot: string): ResolverLoader {
   return resolverLoader;
 }
 
-export default function virtualLoader(this: LoaderContext<unknown>) {
+export default function virtualLoader(this: LoaderContext<unknown>): string | undefined {
   if (typeof this.query === 'string' && this.query[0] === '?') {
     let params = new URLSearchParams(this.query);
     let filename = params.get('f');
@@ -20,7 +20,7 @@ export default function virtualLoader(this: LoaderContext<unknown>) {
     }
     let { resolver } = setup(appRoot);
     this.resourcePath = filename;
-    return virtualContent(filename, resolver);
+    return virtualContent(filename, resolver).src;
   }
   throw new Error(`@embroider/webpack/src/virtual-loader received unexpected request: ${this.query}`);
 }