Merge pull request #1199 from cardstack/after-loader-refactoring-clenaup

After loader refactoring cleanup

Author: jurgenwerk

packages/host/app/lib/current-run.ts

@@ -266,11 +266,7 @@ export class CurrentRun {
     } else {
       let localPath = this.#realmPaths.local(url);
 
-      let fileRef = await this.#reader.readFileAsText(
-        localPath,
-        {},
-        this.loader,
-      );
+      let fileRef = await this.#reader.readFileAsText(localPath, {});
       if (!fileRef) {
         let error = new CardError(`missing file ${url.href}`, { status: 404 });
         error.deps = [url.href];

packages/runtime-common/realm.ts

@@ -117,7 +117,7 @@ export interface RealmAdapter {
     },
   ): AsyncGenerator<{ name: string; path: LocalPath; kind: Kind }, void>;
 
-  openFile(path: LocalPath, loader?: Loader): Promise<FileRef | undefined>;
+  openFile(path: LocalPath): Promise<FileRef | undefined>;
 
   exists(path: LocalPath): Promise<boolean>;
 
@@ -1211,7 +1211,6 @@ export class Realm {
       path,
       this.#adapter.openFile.bind(this.#adapter),
       fallbackExtensions,
-      this.loader,
     );
   }
 

packages/runtime-common/search-index.ts

@@ -36,7 +36,6 @@ export interface Reader {
   readFileAsText: (
     path: LocalPath,
     opts?: { withFallbacks?: true },
-    loader?: Loader,
   ) => Promise<{ content: string; lastModified: number } | undefined>;
   readdir: (
     path: string,

packages/runtime-common/stream.ts

@@ -1,4 +1,4 @@
-import { isNode, executableExtensions, Loader } from './index';
+import { isNode, executableExtensions } from './index';
 import type { FileRef } from './realm';
 import type { LocalPath } from './paths';
 
@@ -74,17 +74,16 @@ export async function readFileAsText(
 // explicit file extensions in your source code
 export async function getFileWithFallbacks(
   path: LocalPath,
-  openFile: (path: string, loader?: Loader) => Promise<FileRef | undefined>,
+  openFile: (path: string) => Promise<FileRef | undefined>,
   fallbackExtensions: string[],
-  loader?: Loader,
 ): Promise<FileRef | undefined> {
-  let result = await openFile(path, loader);
+  let result = await openFile(path);
   if (result) {
     return result;
   }
 
   for (let extension of fallbackExtensions) {
-    result = await openFile(path + extension, loader);
+    result = await openFile(path + extension);
     if (result) {
       return result;
     }