Skip to content

Commit d7843b4

Browse files
committed
Support ES/20xx user agent header
1 parent 37fdd30 commit d7843b4

File tree

4 files changed

+11
-10
lines changed

4 files changed

+11
-10
lines changed

server/compat.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -189,15 +189,15 @@ func getBuildTargetByUA(ua string) string {
189189
if ua == "" || strings.HasPrefix(ua, "curl/") {
190190
return "esnext"
191191
}
192-
if strings.HasPrefix(ua, "esm/") {
193-
t := ua[4:]
192+
if strings.HasPrefix(ua, "ES/") {
193+
t := "es" + ua[3:]
194194
if _, ok := targets[t]; ok {
195195
return t
196196
}
197197
return "esnext"
198198
}
199199
if strings.HasPrefix(ua, "Deno/") {
200-
uaVersion, err := semver.NewVersion(strings.TrimPrefix(ua, "Deno/"))
200+
uaVersion, err := semver.NewVersion(ua[5:])
201201
if err == nil && uaVersion.LessThan(v1_33_2) {
202202
return "deno"
203203
}

test/esm-worker/test.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -529,6 +529,7 @@ Deno.test("esm-worker", { sanitizeOps: false, sanitizeResources: false }, async
529529
};
530530
assertEquals(await getTarget("Deno/1.33.1"), "deno");
531531
assertEquals(await getTarget("Deno/1.33.2"), "denonext");
532+
assertEquals(await getTarget("ES/2022"), "es2022");
532533
});
533534

534535
await t.step("cache for different UAs", async () => {
@@ -556,7 +557,7 @@ Deno.test("esm-worker", { sanitizeOps: false, sanitizeResources: false }, async
556557
),
557558
"/es2021/",
558559
);
559-
assertStringIncludes(await fetchModule("/react@18.2.0", "esm/es2022"), "/es2022/");
560+
assertStringIncludes(await fetchModule("/react@18.2.0", "ES/2022"), "/es2022/");
560561
});
561562

562563
await t.step("fix urls", async () => {

worker/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"@cloudflare/workers-types": "4.20240620.0",
1818
"compare-versions": "6.1.0",
1919
"esbuild": "0.21.5" ,
20-
"esm-compat": "0.0.6"
20+
"esm-compat": "0.0.8"
2121
},
2222
"repository": "https://github.com/esm-dev/esm.sh",
2323
"license": "MIT"

worker/pnpm-lock.yaml

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)