fix hashes for modules importing builtins (#1688)

Author: mbostock

src/javascript/module.ts

@@ -6,10 +6,11 @@ import {extname, join} from "node:path/posix";
 import type {Program} from "acorn";
 import type {TransformOptions} from "esbuild";
 import {transform, transformSync} from "esbuild";
+import {resolveJsrImport} from "../jsr.js";
 import {resolveNodeImport} from "../node.js";
 import {resolveNpmImport} from "../npm.js";
 import {resolvePath} from "../path.js";
-import {builtins} from "../resolvers.js";
+import {builtins, resolveBuiltin} from "../resolvers.js";
 import type {RouteResult} from "../route.js";
 import {route} from "../route.js";
 import {findFiles} from "./files.js";
@@ -94,8 +95,12 @@ export async function getLocalModuleHash(root: string, path: string, getHash?: (
   if (info) {
     const globalPaths = new Set<string>();
     for (const i of [...info.globalStaticImports, ...info.globalDynamicImports]) {
-      if (i.startsWith("npm:") && !builtins.has(i)) {
+      if (builtins.has(i) || i.startsWith("observablehq:")) {
+        hash.update(`${resolveBuiltin(i)}?version=${process.env.npm_package_version}`); // change hash when Framework changes
+      } else if (i.startsWith("npm:")) {
         globalPaths.add(await resolveNpmImport(root, i.slice("npm:".length)));
+      } else if (i.startsWith("jsr:")) {
+        globalPaths.add(await resolveJsrImport(root, i.slice("jsr:".length)));
       } else if (!/^\w+:/.test(i)) {
         globalPaths.add(await resolveNodeImport(root, i));
       }

src/resolvers.ts

@@ -477,10 +477,8 @@ export function getModuleResolver(
   return async (specifier) => {
     return isPathImport(specifier)
       ? relativePath(servePath, resolveImportPath(root, resolvePath(path, specifier), getHash))
-      : builtins.has(specifier)
-      ? relativePath(servePath, builtins.get(specifier)!)
-      : specifier.startsWith("observablehq:")
-      ? relativePath(servePath, `/_observablehq/${specifier.slice("observablehq:".length)}${extname(specifier) ? "" : ".js"}`) // prettier-ignore
+      : builtins.has(specifier) || specifier.startsWith("observablehq:")
+      ? relativePath(servePath, resolveBuiltin(specifier))
       : specifier.startsWith("npm:")
       ? relativePath(servePath, await resolveNpmImport(root, specifier.slice("npm:".length)))
       : specifier.startsWith("jsr:")
@@ -491,6 +489,12 @@ export function getModuleResolver(
   };
 }
 
+export function resolveBuiltin(specifier: string): string {
+  if (builtins.has(specifier)) return builtins.get(specifier)!;
+  if (!specifier.startsWith("observablehq:")) throw new Error(`not built-in: ${specifier}`);
+  return `/_observablehq/${specifier.slice("observablehq:".length)}${extname(specifier) ? "" : ".js"}`;
+}
+
 export function resolveStylesheetPath(root: string, path: string): string {
   return `/${join("_import", path)}?sha=${getFileHash(root, path)}`;
 }

test/input/build/npm/index.js

@@ -0,0 +1 @@
+import "npm:@observablehq/inputs";

test/input/build/npm/index.md

@@ -0,0 +1,3 @@
+```js
+import "./index.js";
+```

test/mocks/jsdelivr.ts

@@ -15,6 +15,7 @@ const packages: [name: string, {version: string; dependencies?: Record<string, s
   ["echarts", {version: "5.5.0"}],
   ["exceljs", {version: "4.4.0"}],
   ["htl", {version: "0.3.1"}],
+  ["isoformat", {version: "0.2.1"}],
   ["jszip", {version: "3.10.1"}],
   ["katex", {version: "0.16.9"}],
   ["leaflet", {version: "1.9.4"}],

test/output/build/data-loaders/_import/import-test.e7269c4e.js

@@ -1 +1 @@
-export {test} from "./test.17d808d0.js";
+export {test} from "./test.86a60bc6.js";

test/output/build/data-loaders/_import/test.17d808d0.js renamed to test/output/build/data-loaders/_import/test.86a60bc6.js

@@ -12,7 +12,7 @@
 <link rel="modulepreload" href="./_observablehq/runtime.00000002.js">
 <link rel="modulepreload" href="./_observablehq/stdlib.00000003.js">
 <link rel="modulepreload" href="./_import/import-test.e7269c4e.js">
-<link rel="modulepreload" href="./_import/test.17d808d0.js">
+<link rel="modulepreload" href="./_import/test.86a60bc6.js">
 <script type="module">
 
 import {define} from "./_observablehq/client.00000001.js";

test/output/build/data-loaders/index.html

@@ -1,4 +1,4 @@
 import "./_observablehq/stdlib.00000003.js";
 import "./_npm/@observablehq/[email protected]/cd372fb8.js";
 import "./_npm/[email protected]/cd372fb8.js";
-export * from "./_import/chart.76ef5352.js";
+export * from "./_import/chart.2ce91e05.js";