Skip to content

Commit 1c06274

Browse files
authored
fix resolvers in prod (#309)
1 parent 48c1c7b commit 1c06274

File tree

5 files changed

+13
-10
lines changed

5 files changed

+13
-10
lines changed

packages/engine/src/resolvers/ExternalModuleResolver.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
export abstract class ExternalModuleResolver {
2+
public abstract readonly name: string;
3+
24
public abstract getURLForModule(
35
moduleName: string,
46
parent: string

packages/engine/src/resolvers/ImportShimResolver.ts

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -53,23 +53,18 @@ export class ImportShimResolver {
5353
for (let resolver of this.resolvers) {
5454
try {
5555
const module = await this.importShim(
56-
"use$" + resolver.constructor.name + "$" + moduleName
57-
);
58-
console.log(
59-
"loaded module",
60-
moduleName,
61-
"using",
62-
resolver.constructor.name
56+
"use$" + resolver.name + "$" + moduleName
6357
);
58+
console.log("loaded module", moduleName, "using", resolver.name);
6459
return {
6560
module,
6661
dispose: () => {},
6762
};
6863
} catch (e) {
69-
console.error("failed loading module", resolver.constructor.name, e);
64+
console.error("failed loading module", resolver.name, e);
7065
}
7166
}
72-
throw new Error("couldn't resolve module" + moduleName);
67+
throw new Error("couldn't resolve module " + moduleName);
7368
}
7469

7570
/**
@@ -213,7 +208,7 @@ export class ImportShimResolver {
213208
if (parts.length !== 3) {
214209
throw new Error("expected resolver name in import" + id);
215210
}
216-
resolver = this.resolvers.find((r) => r.constructor.name === parts[1])!;
211+
resolver = this.resolvers.find((r) => r.name === parts[1])!;
217212
id = parts[2];
218213
} else {
219214
if (!parent) {

packages/engine/src/resolvers/cdns/ESMshResolver.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
import { ExternalModuleResolver } from "../ExternalModuleResolver";
22

33
export class ESMshResolver extends ExternalModuleResolver {
4+
public readonly name = "esm.sh";
5+
46
public async getModuleInfoFromURL(url: string) {
57
// https://cdn.esm.sh/v66/@tldraw/[email protected]/es2021/core.js
68

packages/engine/src/resolvers/cdns/JSPMResolver.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
import { ExternalModuleResolver } from "../ExternalModuleResolver";
22

33
export class JSPMResolver extends ExternalModuleResolver {
4+
public readonly name = "jspm";
5+
46
public async getModuleInfoFromURL(url: string) {
57
// TODO: should also pass version identifier (@xx)
68

packages/engine/src/resolvers/cdns/SkypackResolver.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
import { ExternalModuleResolver } from "../ExternalModuleResolver";
22

33
export class SkypackResolver extends ExternalModuleResolver {
4+
public readonly name = "skypack";
5+
46
public async getModuleInfoFromURL(url: string) {
57
// skypack, e.g.: https://cdn.skypack.dev/-/[email protected]/dist=es2020,mode=imports/unoptimized/dist/index.cjs.js
68
// TODO: should also pass version identifier (@xx)

0 commit comments

Comments
 (0)