From 1d45ae16218956cea808736198671b3505410130 Mon Sep 17 00:00:00 2001
From: jashkenas <jashkenas@gmail.com>
Date: Fri, 18 Oct 2019 11:22:23 -0700
Subject: [PATCH 01/12] Using file-attachments branch of stdlib

---
 package.json | 2 +-
 yarn.lock    | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 5ea86417..d5675c74 100644
--- a/package.json
+++ b/package.json
@@ -35,7 +35,7 @@
   ],
   "dependencies": {
     "@observablehq/inspector": "^3.1.0",
-    "@observablehq/stdlib": "^3.0.0",
+    "@observablehq/stdlib": "https://github.com/observablehq/stdlib#bfdb699694ed08baafa15410731cc25f7bac66d5",
     "esm": "^3.0.84"
   },
   "devDependencies": {
diff --git a/yarn.lock b/yarn.lock
index 9f1a2da3..485897bc 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -25,13 +25,11 @@
   dependencies:
     esm "^3.0.84"
 
-"@observablehq/stdlib@^3.0.0":
+"@observablehq/stdlib@https://github.com/observablehq/stdlib#bfdb699694ed08baafa15410731cc25f7bac66d5":
   version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@observablehq/stdlib/-/stdlib-3.1.1.tgz#65e4368cba5920aa649c8c2a0c9d8f23bb51150f"
-  integrity sha512-lwt+ThlV5QIFg7WCIKn7IvCnGpEsGw8BkASPd5yyNZ7hU8gxubE7jOChVte8Lf+yMQmZsju55bCsk813+u4GxQ==
+  resolved "https://github.com/observablehq/stdlib#bfdb699694ed08baafa15410731cc25f7bac66d5"
   dependencies:
     d3-require "^1.2.0"
-    esm "^3.0.84"
     marked "https://github.com/observablehq/marked.git#94c6b946f462fd25db4465d71a6859183f86c57f"
 
 "@types/estree@*":

From 4d1a187f81a1427762134fb948a8138896a982cf Mon Sep 17 00:00:00 2001
From: jashkenas <jashkenas@gmail.com>
Date: Mon, 21 Oct 2019 11:09:22 -0700
Subject: [PATCH 02/12] Bumping stdlib test version

---
 package.json | 2 +-
 yarn.lock    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index d5675c74..2bc5a283 100644
--- a/package.json
+++ b/package.json
@@ -35,7 +35,7 @@
   ],
   "dependencies": {
     "@observablehq/inspector": "^3.1.0",
-    "@observablehq/stdlib": "https://github.com/observablehq/stdlib#bfdb699694ed08baafa15410731cc25f7bac66d5",
+    "@observablehq/stdlib": "https://github.com/observablehq/stdlib#d0c10dc4c987cedddfa5eea31d7df7367ad4aa00",
     "esm": "^3.0.84"
   },
   "devDependencies": {
diff --git a/yarn.lock b/yarn.lock
index 485897bc..fda05198 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -25,9 +25,9 @@
   dependencies:
     esm "^3.0.84"
 
-"@observablehq/stdlib@https://github.com/observablehq/stdlib#bfdb699694ed08baafa15410731cc25f7bac66d5":
+"@observablehq/stdlib@https://github.com/observablehq/stdlib#d0c10dc4c987cedddfa5eea31d7df7367ad4aa00":
   version "3.1.1"
-  resolved "https://github.com/observablehq/stdlib#bfdb699694ed08baafa15410731cc25f7bac66d5"
+  resolved "https://github.com/observablehq/stdlib#d0c10dc4c987cedddfa5eea31d7df7367ad4aa00"
   dependencies:
     d3-require "^1.2.0"
     marked "https://github.com/observablehq/marked.git#94c6b946f462fd25db4465d71a6859183f86c57f"

From 87df00cb211dd18dd650f71553dc36528d246c82 Mon Sep 17 00:00:00 2001
From: jashkenas <jashkenas@gmail.com>
Date: Mon, 21 Oct 2019 12:18:00 -0700
Subject: [PATCH 03/12] Exporting FileAttachment in parallel to Library

---
 src/index.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/index.js b/src/index.js
index d3febb9e..db9a4a9f 100644
--- a/src/index.js
+++ b/src/index.js
@@ -1,6 +1,6 @@
 import {Inspector} from "@observablehq/inspector";
-import {Library} from "@observablehq/stdlib";
+import {Library, FileAttachment} from "@observablehq/stdlib";
 import {RuntimeError} from "./errors";
 import Runtime from "./runtime";
 
-export {Inspector, Library, Runtime, RuntimeError};
+export {Inspector, Library, FileAttachment, Runtime, RuntimeError};

From 06ad81741ad1eca39fab56bfbb666ea0bd265a57 Mon Sep 17 00:00:00 2001
From: jashkenas <jashkenas@gmail.com>
Date: Mon, 21 Oct 2019 14:51:30 -0700
Subject: [PATCH 04/12] Bumping d3-require to latest version

---
 package.json |  2 +-
 yarn.lock    | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/package.json b/package.json
index 2bc5a283..f4a2e17e 100644
--- a/package.json
+++ b/package.json
@@ -35,7 +35,7 @@
   ],
   "dependencies": {
     "@observablehq/inspector": "^3.1.0",
-    "@observablehq/stdlib": "https://github.com/observablehq/stdlib#d0c10dc4c987cedddfa5eea31d7df7367ad4aa00",
+    "@observablehq/stdlib": "https://github.com/observablehq/stdlib#811d89ba1722bfb5c02cfb1fcfd5d2b8c683b55d",
     "esm": "^3.0.84"
   },
   "devDependencies": {
diff --git a/yarn.lock b/yarn.lock
index fda05198..b5b2d948 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -25,11 +25,11 @@
   dependencies:
     esm "^3.0.84"
 
-"@observablehq/stdlib@https://github.com/observablehq/stdlib#d0c10dc4c987cedddfa5eea31d7df7367ad4aa00":
+"@observablehq/stdlib@https://github.com/observablehq/stdlib#811d89ba1722bfb5c02cfb1fcfd5d2b8c683b55d":
   version "3.1.1"
-  resolved "https://github.com/observablehq/stdlib#d0c10dc4c987cedddfa5eea31d7df7367ad4aa00"
+  resolved "https://github.com/observablehq/stdlib#811d89ba1722bfb5c02cfb1fcfd5d2b8c683b55d"
   dependencies:
-    d3-require "^1.2.0"
+    d3-require "^1.2.4"
     marked "https://github.com/observablehq/marked.git#94c6b946f462fd25db4465d71a6859183f86c57f"
 
 "@types/estree@*":
@@ -327,10 +327,10 @@ cssstyle@^1.2.2:
   dependencies:
     cssom "0.3.x"
 
-d3-require@^1.2.0:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/d3-require/-/d3-require-1.2.3.tgz#65a1c2137e69c5c442f1ca2a04f72a3965124c16"
-  integrity sha512-zfat3WTZRZmh7jCrTIhg4zZvivA0DZvez8lZq0JwYG9aW8LcSUFO4eiPnL5F2MolHcLE8CLfEt06sPP8N7y3AQ==
+d3-require@^1.2.4:
+  version "1.2.4"
+  resolved "https://registry.npmjs.org/d3-require/-/d3-require-1.2.4.tgz#59afc591d5089f99fecd8c45ef7539e1fee112b3"
+  integrity sha512-8UseEGCkBkBxIMouLMPONUBmU8DUPC1q12LARV1Lk/2Jwa32SVgmRfX8GdIeR06ZP+CG85YD3N13K2s14qCNyA==
 
 dashdash@^1.12.0:
   version "1.14.1"

From 2d4da0adeedc88bd61246dbf135550100d62b81e Mon Sep 17 00:00:00 2001
From: jashkenas <jashkenas@gmail.com>
Date: Mon, 21 Oct 2019 19:32:54 -0700
Subject: [PATCH 05/12] While init-ing a module, allow additions to specials.

---
 src/module.js  |  5 +++++
 src/runtime.js | 10 ++++++++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/module.js b/src/module.js
index 37567c9f..50d1b30e 100644
--- a/src/module.js
+++ b/src/module.js
@@ -22,6 +22,7 @@ export default function Module(runtime, special) {
 Object.defineProperties(Module.prototype, {
   _copy: {value: module_copy, writable: true, configurable: true},
   _resolve: {value: module_resolve, writable: true, configurable: true},
+  _setSpecial: {value: module_set_special, writable: true, configurable: true},
   redefine: {value: module_redefine, writable: true, configurable: true},
   define: {value: module_define, writable: true, configurable: true},
   derive: {value: module_derive, writable: true, configurable: true},
@@ -134,6 +135,10 @@ function module_resolve(name) {
   return variable;
 }
 
+function module_set_special(name, value) {
+  this._special.set(name, value);
+}
+
 function variable_name(variable) {
   return variable._name;
 }
diff --git a/src/runtime.js b/src/runtime.js
index 3e1ada92..c24d6763 100644
--- a/src/runtime.js
+++ b/src/runtime.js
@@ -52,16 +52,22 @@ function runtime_dispose() {
 
 function runtime_module(define, observer = noop, special = {}) {
   let module;
+  const specialEntries = Object.entries(special);
   if (define === undefined) {
     if (module = this._init) {
       this._init = null;
+      if (specialEntries.length) {
+        for (let [name, value] of specialEntries) {
+          module._setSpecial(name, value);
+        }
+      }
       return module;
     }
-    return new Module(this, Object.entries(special));
+    return new Module(this, specialEntries);
   }
   module = this._modules.get(define);
   if (module) return module;
-  this._init = module = new Module(this, Object.entries(special));
+  this._init = module = new Module(this, specialEntries);
   this._modules.set(define, module);
   try {
     define(this, observer);

From 051aa6b9c1e788f37db193ce3bade9b652d46d2e Mon Sep 17 00:00:00 2001
From: jashkenas <jashkenas@gmail.com>
Date: Tue, 22 Oct 2019 14:51:44 -0700
Subject: [PATCH 06/12] Expose ResolveFileAttachment as a property on a runtime
 instance, for embeds

---
 package.json   | 2 +-
 src/index.js   | 4 ++--
 src/runtime.js | 5 +++--
 yarn.lock      | 4 ++--
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/package.json b/package.json
index f4a2e17e..6bae3d73 100644
--- a/package.json
+++ b/package.json
@@ -35,7 +35,7 @@
   ],
   "dependencies": {
     "@observablehq/inspector": "^3.1.0",
-    "@observablehq/stdlib": "https://github.com/observablehq/stdlib#811d89ba1722bfb5c02cfb1fcfd5d2b8c683b55d",
+    "@observablehq/stdlib": "https://github.com/observablehq/stdlib#590fffdb0f6f480360005d1d01d59eb41fd2d32a",
     "esm": "^3.0.84"
   },
   "devDependencies": {
diff --git a/src/index.js b/src/index.js
index db9a4a9f..d3febb9e 100644
--- a/src/index.js
+++ b/src/index.js
@@ -1,6 +1,6 @@
 import {Inspector} from "@observablehq/inspector";
-import {Library, FileAttachment} from "@observablehq/stdlib";
+import {Library} from "@observablehq/stdlib";
 import {RuntimeError} from "./errors";
 import Runtime from "./runtime";
 
-export {Inspector, Library, FileAttachment, Runtime, RuntimeError};
+export {Inspector, Library, Runtime, RuntimeError};
diff --git a/src/runtime.js b/src/runtime.js
index c24d6763..2817b513 100644
--- a/src/runtime.js
+++ b/src/runtime.js
@@ -1,4 +1,4 @@
-import {Library} from "@observablehq/stdlib";
+import {Library, ResolveFileAttachment} from "@observablehq/stdlib";
 import {RuntimeError} from "./errors";
 import generatorish from "./generatorish";
 import load from "./load";
@@ -38,7 +38,8 @@ Object.defineProperties(Runtime.prototype, {
   _computeSoon: {value: runtime_computeSoon, writable: true, configurable: true},
   _computeNow: {value: runtime_computeNow, writable: true, configurable: true},
   dispose: {value: runtime_dispose, writable: true, configurable: true},
-  module: {value: runtime_module, writable: true, configurable: true}
+  module: {value: runtime_module, writable: true, configurable: true},
+  ResolveFileAttachment: {value: ResolveFileAttachment, writable: true, configurable: true}
 });
 
 function runtime_dispose() {
diff --git a/yarn.lock b/yarn.lock
index b5b2d948..3bd39f82 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -25,9 +25,9 @@
   dependencies:
     esm "^3.0.84"
 
-"@observablehq/stdlib@https://github.com/observablehq/stdlib#811d89ba1722bfb5c02cfb1fcfd5d2b8c683b55d":
+"@observablehq/stdlib@https://github.com/observablehq/stdlib#590fffdb0f6f480360005d1d01d59eb41fd2d32a":
   version "3.1.1"
-  resolved "https://github.com/observablehq/stdlib#811d89ba1722bfb5c02cfb1fcfd5d2b8c683b55d"
+  resolved "https://github.com/observablehq/stdlib#590fffdb0f6f480360005d1d01d59eb41fd2d32a"
   dependencies:
     d3-require "^1.2.4"
     marked "https://github.com/observablehq/marked.git#94c6b946f462fd25db4465d71a6859183f86c57f"

From 067695192aa579a2c3845bf21320ee4d0a975c4c Mon Sep 17 00:00:00 2001
From: jashkenas <jashkenas@gmail.com>
Date: Wed, 23 Oct 2019 10:04:03 -0700
Subject: [PATCH 07/12] Bump stdlib

---
 package.json   | 2 +-
 src/runtime.js | 4 ++--
 yarn.lock      | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 6bae3d73..ec67e074 100644
--- a/package.json
+++ b/package.json
@@ -35,7 +35,7 @@
   ],
   "dependencies": {
     "@observablehq/inspector": "^3.1.0",
-    "@observablehq/stdlib": "https://github.com/observablehq/stdlib#590fffdb0f6f480360005d1d01d59eb41fd2d32a",
+    "@observablehq/stdlib": "https://github.com/observablehq/stdlib#e06f7882546784fed0019cba5d85e23917c3baa7",
     "esm": "^3.0.84"
   },
   "devDependencies": {
diff --git a/src/runtime.js b/src/runtime.js
index 2817b513..56b0e4a9 100644
--- a/src/runtime.js
+++ b/src/runtime.js
@@ -1,4 +1,4 @@
-import {Library, ResolveFileAttachment} from "@observablehq/stdlib";
+import {Library, FileAttachments} from "@observablehq/stdlib";
 import {RuntimeError} from "./errors";
 import generatorish from "./generatorish";
 import load from "./load";
@@ -39,7 +39,7 @@ Object.defineProperties(Runtime.prototype, {
   _computeNow: {value: runtime_computeNow, writable: true, configurable: true},
   dispose: {value: runtime_dispose, writable: true, configurable: true},
   module: {value: runtime_module, writable: true, configurable: true},
-  ResolveFileAttachment: {value: ResolveFileAttachment, writable: true, configurable: true}
+  fileAttachments: {value: FileAttachments, writable: true, configurable: true}
 });
 
 function runtime_dispose() {
diff --git a/yarn.lock b/yarn.lock
index 3bd39f82..f1e4a83e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -25,9 +25,9 @@
   dependencies:
     esm "^3.0.84"
 
-"@observablehq/stdlib@https://github.com/observablehq/stdlib#590fffdb0f6f480360005d1d01d59eb41fd2d32a":
+"@observablehq/stdlib@https://github.com/observablehq/stdlib#e06f7882546784fed0019cba5d85e23917c3baa7":
   version "3.1.1"
-  resolved "https://github.com/observablehq/stdlib#590fffdb0f6f480360005d1d01d59eb41fd2d32a"
+  resolved "https://github.com/observablehq/stdlib#e06f7882546784fed0019cba5d85e23917c3baa7"
   dependencies:
     d3-require "^1.2.4"
     marked "https://github.com/observablehq/marked.git#94c6b946f462fd25db4465d71a6859183f86c57f"

From e804a8682c98268c83b510bb5698e99d484e4ce6 Mon Sep 17 00:00:00 2001
From: Mike Bostock <mbostock@gmail.com>
Date: Wed, 23 Oct 2019 15:05:27 -0700
Subject: [PATCH 08/12] Rename specials to module builtins.

---
 src/module.js                | 22 +++++++++++-----------
 src/runtime.js               | 12 +++---------
 test/module/builtin-test.js  | 23 +++++++++++++++++++++++
 test/module/special-test.js  | 30 ------------------------------
 test/variable/derive-test.js |  6 +++---
 5 files changed, 40 insertions(+), 53 deletions(-)
 create mode 100644 test/module/builtin-test.js
 delete mode 100644 test/module/special-test.js

diff --git a/src/module.js b/src/module.js
index 50d1b30e..d8c6df12 100644
--- a/src/module.js
+++ b/src/module.js
@@ -6,14 +6,14 @@ import rethrow from "./rethrow";
 import {variable_invalidation, variable_visibility} from "./runtime";
 import Variable, {TYPE_DUPLICATE, TYPE_IMPLICIT, TYPE_NORMAL, no_observer} from "./variable";
 
-export default function Module(runtime, special) {
+export default function Module(runtime, builtins = []) {
   Object.defineProperties(this, {
     _runtime: {value: runtime},
     _scope: {value: new Map},
-    _special: {value: new Map([
+    _builtins: {value: new Map([
       ["invalidation", variable_invalidation],
       ["visibility", variable_visibility],
-      ...special
+      ...builtins
     ])},
     _source: {value: null, writable: true}
   });
@@ -22,13 +22,13 @@ export default function Module(runtime, special) {
 Object.defineProperties(Module.prototype, {
   _copy: {value: module_copy, writable: true, configurable: true},
   _resolve: {value: module_resolve, writable: true, configurable: true},
-  _setSpecial: {value: module_set_special, writable: true, configurable: true},
   redefine: {value: module_redefine, writable: true, configurable: true},
   define: {value: module_define, writable: true, configurable: true},
   derive: {value: module_derive, writable: true, configurable: true},
   import: {value: module_import, writable: true, configurable: true},
   value: {value: module_value, writable: true, configurable: true},
-  variable: {value: module_variable, writable: true, configurable: true}
+  variable: {value: module_variable, writable: true, configurable: true},
+  builtin: {value: module_builtin, writable: true, configurable: true}
 });
 
 function module_redefine(name) {
@@ -64,7 +64,7 @@ async function module_value(name) {
 }
 
 function module_derive(injects, injectModule) {
-  var copy = new Module(this._runtime, this._special);
+  var copy = new Module(this._runtime, this._builtins);
   copy._source = this;
   forEach.call(injects, function(inject) {
     if (typeof inject !== "object") inject = {name: inject + ""};
@@ -102,7 +102,7 @@ function module_copy(copy, map) {
           sourceModule = sourceInput._module;
       copy.import(sourceInput._name, name, map.get(sourceModule)
         || (sourceModule._source
-           ? sourceModule._copy(new Module(copy._runtime, copy._special), map) // import-with
+           ? sourceModule._copy(new Module(copy._runtime, copy._builtins), map) // import-with
            : sourceModule));
     } else {
       copy.define(name, source._inputs.map(variable_name), source._definition);
@@ -115,8 +115,8 @@ function module_resolve(name) {
   var variable = this._scope.get(name), value;
   if (!variable) {
     variable = new Variable(TYPE_IMPLICIT, this);
-    if (this._special.has(name)) {
-      variable.define(name, this._special.get(name));
+    if (this._builtins.has(name)) {
+      variable.define(name, constant(this._builtins.get(name)));
     } else if (this._runtime._builtin._scope.has(name)) {
       variable.import(name, this._runtime._builtin);
     } else {
@@ -135,8 +135,8 @@ function module_resolve(name) {
   return variable;
 }
 
-function module_set_special(name, value) {
-  this._special.set(name, value);
+function module_builtin(name, value) {
+  this._builtins.set(name, value);
 }
 
 function variable_name(variable) {
diff --git a/src/runtime.js b/src/runtime.js
index 56b0e4a9..6e396c5c 100644
--- a/src/runtime.js
+++ b/src/runtime.js
@@ -51,24 +51,18 @@ function runtime_dispose() {
   });
 }
 
-function runtime_module(define, observer = noop, special = {}) {
+function runtime_module(define, observer = noop) {
   let module;
-  const specialEntries = Object.entries(special);
   if (define === undefined) {
     if (module = this._init) {
       this._init = null;
-      if (specialEntries.length) {
-        for (let [name, value] of specialEntries) {
-          module._setSpecial(name, value);
-        }
-      }
       return module;
     }
-    return new Module(this, specialEntries);
+    return new Module(this);
   }
   module = this._modules.get(define);
   if (module) return module;
-  this._init = module = new Module(this, specialEntries);
+  this._init = module = new Module(this);
   this._modules.set(define, module);
   try {
     define(this, observer);
diff --git a/test/module/builtin-test.js b/test/module/builtin-test.js
new file mode 100644
index 00000000..d18964d6
--- /dev/null
+++ b/test/module/builtin-test.js
@@ -0,0 +1,23 @@
+import {Runtime} from "../../src";
+import tape from "../tape";
+import valueof from "../variable/valueof";
+
+tape("module.builtin(name, value) defines a module-specific builtin variable", async test => {
+  const runtime = new Runtime();
+  const module = runtime.module();
+  module.builtin("foo", 42);
+  const bar = module.variable(true).define("bar", ["foo"], foo => foo + 1);
+  await new Promise(setImmediate);
+  test.deepEqual(await valueof(bar), {value: 43});
+});
+
+tape("module.builtin(name, value) can be overridden by a normal variable", async test => {
+  const runtime = new Runtime();
+  const module = runtime.module();
+  module.builtin("foo", 0);
+  const foo = module.variable(true).define("foo", [], () => 42);
+  const bar = module.variable(true).define("bar", ["foo"], foo => foo + 1);
+  await new Promise(setImmediate);
+  test.deepEqual(await valueof(foo), {value: 42});
+  test.deepEqual(await valueof(bar), {value: 43});
+});
diff --git a/test/module/special-test.js b/test/module/special-test.js
deleted file mode 100644
index f7a9fb3b..00000000
--- a/test/module/special-test.js
+++ /dev/null
@@ -1,30 +0,0 @@
-import {Runtime} from "../../src";
-import tape from "../tape";
-import valueof from "../variable/valueof";
-import noop from "../../src/noop";
-
-tape("runtime.module(…, special) defines a module special variable", async test => {
-  const runtime = new Runtime();
-  const module = runtime.module(noop, undefined, {foo: () => 42});
-  const bar = module.variable(true).define("bar", ["foo"], foo => foo + 1);
-  await new Promise(setImmediate);
-  test.deepEqual(await valueof(bar), {value: 43});
-});
-
-tape("runtime.module(…, special) can be a constant", async test => {
-  const runtime = new Runtime();
-  const module = runtime.module(noop, undefined, {foo: 42});
-  const bar = module.variable(true).define("bar", ["foo"], foo => foo + 1);
-  await new Promise(setImmediate);
-  test.deepEqual(await valueof(bar), {value: 43});
-});
-
-tape("runtime.module(…, special) can be overridden by a normal variable", async test => {
-  const runtime = new Runtime();
-  const module = runtime.module(noop, undefined, {foo: 0});
-  const foo = module.variable(true).define("foo", [], () => 42);
-  const bar = module.variable(true).define("bar", ["foo"], foo => foo + 1);
-  await new Promise(setImmediate);
-  test.deepEqual(await valueof(foo), {value: 42});
-  test.deepEqual(await valueof(bar), {value: 43});
-});
diff --git a/test/variable/derive-test.js b/test/variable/derive-test.js
index 88a6f879..e514d2fa 100644
--- a/test/variable/derive-test.js
+++ b/test/variable/derive-test.js
@@ -1,7 +1,6 @@
 import {Runtime} from "../../src/";
 import tape from "../tape";
 import valueof from "./valueof";
-import noop from "../../src/noop";
 
 tape("module.derive(overrides, module) injects variables into a copied module", async test => {
   const runtime = new Runtime();
@@ -20,9 +19,10 @@ tape("module.derive(overrides, module) injects variables into a copied module",
   test.deepEqual(await valueof(d1), {value: 42});
 });
 
-tape("module.derive(…) copies special variables", async test => {
+tape("module.derive(…) copies module-specific builtins", async test => {
   const runtime = new Runtime();
-  const module0 = runtime.module(noop, undefined, {a: 1});
+  const module0 = runtime.module();
+  module0.builtin("a", 1);
   const b0 = module0.variable(true).define("b", ["a"], a => a + 1);
   const module1_0 = module0.derive([], module0);
   const c1 = module1_0.variable(true).define("c", ["a"], a => a + 2);

From 57ec39f7131c6deb14cccdc16c755f3dd923a6dd Mon Sep 17 00:00:00 2001
From: Mike Bostock <mbostock@gmail.com>
Date: Fri, 25 Oct 2019 14:21:43 -0700
Subject: [PATCH 09/12] 4.5.0-rc.1

---
 package.json | 7 +++++--
 yarn.lock    | 7 ++++---
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index ec67e074..096a6efd 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,9 @@
 {
   "name": "@observablehq/runtime",
-  "version": "4.4.7",
+  "version": "4.5.0-rc.1",
+  "publishConfig": {
+    "tag": "next"
+  },
   "license": "ISC",
   "main": "dist/runtime.umd.js",
   "module": "src/index.js",
@@ -35,7 +38,7 @@
   ],
   "dependencies": {
     "@observablehq/inspector": "^3.1.0",
-    "@observablehq/stdlib": "https://github.com/observablehq/stdlib#e06f7882546784fed0019cba5d85e23917c3baa7",
+    "@observablehq/stdlib": "3.2.0-rc.1",
     "esm": "^3.0.84"
   },
   "devDependencies": {
diff --git a/yarn.lock b/yarn.lock
index f1e4a83e..df0e2018 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -25,9 +25,10 @@
   dependencies:
     esm "^3.0.84"
 
-"@observablehq/stdlib@https://github.com/observablehq/stdlib#e06f7882546784fed0019cba5d85e23917c3baa7":
-  version "3.1.1"
-  resolved "https://github.com/observablehq/stdlib#e06f7882546784fed0019cba5d85e23917c3baa7"
+"@observablehq/stdlib@3.2.0-rc.1":
+  version "3.2.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@observablehq/stdlib/-/stdlib-3.2.0-rc.1.tgz#24f16c242784174fa1af333a2ec6fe22908eb519"
+  integrity sha512-XAU60z3v2HJ0FZpx3QgUXkMIiDFCWVlTTO4+egNbLgLESSnjL6rl5p5YasiSgI7udYYFQl/goVAqkbhLuiSHPg==
   dependencies:
     d3-require "^1.2.4"
     marked "https://github.com/observablehq/marked.git#94c6b946f462fd25db4465d71a6859183f86c57f"

From 58bbc3907546da82ad040075d734b06ee704286e Mon Sep 17 00:00:00 2001
From: Mike Bostock <mbostock@gmail.com>
Date: Mon, 28 Oct 2019 13:16:39 -0700
Subject: [PATCH 10/12] 4.5.0-rc.2

---
 package.json | 4 ++--
 yarn.lock    | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/package.json b/package.json
index 096a6efd..a81bef44 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@observablehq/runtime",
-  "version": "4.5.0-rc.1",
+  "version": "4.5.0-rc.2",
   "publishConfig": {
     "tag": "next"
   },
@@ -38,7 +38,7 @@
   ],
   "dependencies": {
     "@observablehq/inspector": "^3.1.0",
-    "@observablehq/stdlib": "3.2.0-rc.1",
+    "@observablehq/stdlib": "3.2.0-rc.2",
     "esm": "^3.0.84"
   },
   "devDependencies": {
diff --git a/yarn.lock b/yarn.lock
index df0e2018..8aaf1a1f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -25,10 +25,10 @@
   dependencies:
     esm "^3.0.84"
 
-"@observablehq/stdlib@3.2.0-rc.1":
-  version "3.2.0-rc.1"
-  resolved "https://registry.yarnpkg.com/@observablehq/stdlib/-/stdlib-3.2.0-rc.1.tgz#24f16c242784174fa1af333a2ec6fe22908eb519"
-  integrity sha512-XAU60z3v2HJ0FZpx3QgUXkMIiDFCWVlTTO4+egNbLgLESSnjL6rl5p5YasiSgI7udYYFQl/goVAqkbhLuiSHPg==
+"@observablehq/stdlib@3.2.0-rc.2":
+  version "3.2.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@observablehq/stdlib/-/stdlib-3.2.0-rc.2.tgz#56cd536f1dfc1a8a47154c649d634cd1610a34c4"
+  integrity sha512-UaQO5qOF7kFSNRHkhp0Qpy7PIGXFJlvNokrKZSZ5Rk0CPNvBmyH3TVN2yg9qt5SHfKe5M+RSbNNi4cCj26kXsA==
   dependencies:
     d3-require "^1.2.4"
     marked "https://github.com/observablehq/marked.git#94c6b946f462fd25db4465d71a6859183f86c57f"

From 9579e34481ef04b1f3124b6b9003bafb711a1dd6 Mon Sep 17 00:00:00 2001
From: Mike Bostock <mbostock@gmail.com>
Date: Mon, 28 Oct 2019 14:32:49 -0700
Subject: [PATCH 11/12] 4.5.0-rc.3

---
 package.json | 4 ++--
 yarn.lock    | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/package.json b/package.json
index a81bef44..053054d2 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@observablehq/runtime",
-  "version": "4.5.0-rc.2",
+  "version": "4.5.0-rc.3",
   "publishConfig": {
     "tag": "next"
   },
@@ -38,7 +38,7 @@
   ],
   "dependencies": {
     "@observablehq/inspector": "^3.1.0",
-    "@observablehq/stdlib": "3.2.0-rc.2",
+    "@observablehq/stdlib": "3.2.0-rc.3",
     "esm": "^3.0.84"
   },
   "devDependencies": {
diff --git a/yarn.lock b/yarn.lock
index 8aaf1a1f..8cbffa78 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -25,10 +25,10 @@
   dependencies:
     esm "^3.0.84"
 
-"@observablehq/stdlib@3.2.0-rc.2":
-  version "3.2.0-rc.2"
-  resolved "https://registry.yarnpkg.com/@observablehq/stdlib/-/stdlib-3.2.0-rc.2.tgz#56cd536f1dfc1a8a47154c649d634cd1610a34c4"
-  integrity sha512-UaQO5qOF7kFSNRHkhp0Qpy7PIGXFJlvNokrKZSZ5Rk0CPNvBmyH3TVN2yg9qt5SHfKe5M+RSbNNi4cCj26kXsA==
+"@observablehq/stdlib@3.2.0-rc.3":
+  version "3.2.0-rc.3"
+  resolved "https://registry.yarnpkg.com/@observablehq/stdlib/-/stdlib-3.2.0-rc.3.tgz#37544525d4bb4be9ec9f2b6cb4951b4fda8a7087"
+  integrity sha512-6rz+9tcFs+bJDMsq7+d6JqpOlcTF93GiPxXR4byluTSuRQdZR14PtLBOEplZd/ibtP4v0fvX4Uwyvb4ti1mazw==
   dependencies:
     d3-require "^1.2.4"
     marked "https://github.com/observablehq/marked.git#94c6b946f462fd25db4465d71a6859183f86c57f"

From 979af6fc194eae434faa8f8a4843ea08e2714962 Mon Sep 17 00:00:00 2001
From: Mike Bostock <mbostock@gmail.com>
Date: Mon, 28 Oct 2019 21:53:52 -0700
Subject: [PATCH 12/12] 4.5.0-rc.4

---
 package.json | 4 ++--
 yarn.lock    | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/package.json b/package.json
index 053054d2..dd80f192 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@observablehq/runtime",
-  "version": "4.5.0-rc.3",
+  "version": "4.5.0-rc.4",
   "publishConfig": {
     "tag": "next"
   },
@@ -38,7 +38,7 @@
   ],
   "dependencies": {
     "@observablehq/inspector": "^3.1.0",
-    "@observablehq/stdlib": "3.2.0-rc.3",
+    "@observablehq/stdlib": "3.2.0-rc.5",
     "esm": "^3.0.84"
   },
   "devDependencies": {
diff --git a/yarn.lock b/yarn.lock
index 8cbffa78..65b9b1e7 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -25,10 +25,10 @@
   dependencies:
     esm "^3.0.84"
 
-"@observablehq/stdlib@3.2.0-rc.3":
-  version "3.2.0-rc.3"
-  resolved "https://registry.yarnpkg.com/@observablehq/stdlib/-/stdlib-3.2.0-rc.3.tgz#37544525d4bb4be9ec9f2b6cb4951b4fda8a7087"
-  integrity sha512-6rz+9tcFs+bJDMsq7+d6JqpOlcTF93GiPxXR4byluTSuRQdZR14PtLBOEplZd/ibtP4v0fvX4Uwyvb4ti1mazw==
+"@observablehq/stdlib@3.2.0-rc.5":
+  version "3.2.0-rc.5"
+  resolved "https://registry.yarnpkg.com/@observablehq/stdlib/-/stdlib-3.2.0-rc.5.tgz#e7b001d320ee8eb8d41f69fb37933e227d261dcc"
+  integrity sha512-qfNiq5il0jQiR9/gihZSBCI/kLaNBDHIrBcUI0aqYspXkz0D7ZJ45QZNwF/siLZVMYhUfmXWqjZb+JZ+034iMA==
   dependencies:
     d3-require "^1.2.4"
     marked "https://github.com/observablehq/marked.git#94c6b946f462fd25db4465d71a6859183f86c57f"