From e949556f50f01562931a5f5f801ea0f7e969e044 Mon Sep 17 00:00:00 2001 From: Tom MacWright Date: Wed, 5 Dec 2018 10:45:26 -0800 Subject: [PATCH 1/4] Protect RequireError mangling --- rollup.config.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rollup.config.js b/rollup.config.js index 3bbdcd6e..15899cfe 100644 --- a/rollup.config.js +++ b/rollup.config.js @@ -10,7 +10,10 @@ function config(output) { node(), terser({ toplevel: output.format === "es", - output: {preamble: copyright} + output: {preamble: copyright}, + mangle: { + reserved: ["RequireError"] + } }) ], output From 96731e4a43a443fd56e7e1055e90e4beaf64d8a5 Mon Sep 17 00:00:00 2001 From: Tom MacWright Date: Wed, 5 Dec 2018 14:40:54 -0800 Subject: [PATCH 2/4] Use src for ES entry point --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 7bac58fd..f66675e4 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "version": "1.3.0", "license": "ISC", "main": "dist/notebook-stdlib.umd.js", - "module": "dist/notebook-stdlib.js", + "module": "src/index.js", "author": { "name": "Observable, Inc.", "url": "https://observablehq.com" From 2c37107adba70bfa68b2cefc90c5b6d6d73df37d Mon Sep 17 00:00:00 2001 From: Tom MacWright Date: Wed, 5 Dec 2018 15:19:51 -0800 Subject: [PATCH 3/4] Rely on d3-require --- package.json | 2 +- yarn.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index f66675e4..4c8968ca 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,7 @@ "cjs": true }, "dependencies": { - "d3-require": "^1.1.0", + "d3-require": "https://github.com/d3/d3-require#7969f63b095bd0bb45ad79faca735c1ea33b5d50", "esm": "^3.0.5" }, "devDependencies": { diff --git a/yarn.lock b/yarn.lock index 4c06fbf8..ad54cbd0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -255,9 +255,9 @@ cssstyle@^1.0.0: dependencies: cssom "0.3.x" -d3-require@^1.1.0: +"d3-require@https://github.com/d3/d3-require#7969f63b095bd0bb45ad79faca735c1ea33b5d50": version "1.1.4" - resolved "https://registry.yarnpkg.com/d3-require/-/d3-require-1.1.4.tgz#f5b229aaab5586bfcd67383c78652147d3def72b" + resolved "https://github.com/d3/d3-require#7969f63b095bd0bb45ad79faca735c1ea33b5d50" dashdash@^1.12.0: version "1.14.1" From 264f8c5fc5c051e4dde541f89117501d98c86e0f Mon Sep 17 00:00:00 2001 From: Tom MacWright Date: Wed, 5 Dec 2018 15:26:29 -0800 Subject: [PATCH 4/4] Rely on d3-require release --- package.json | 2 +- yarn.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 4c8968ca..503fcd10 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,7 @@ "cjs": true }, "dependencies": { - "d3-require": "https://github.com/d3/d3-require#7969f63b095bd0bb45ad79faca735c1ea33b5d50", + "d3-require": "1.2.0", "esm": "^3.0.5" }, "devDependencies": { diff --git a/yarn.lock b/yarn.lock index ad54cbd0..4a7810f6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -255,9 +255,9 @@ cssstyle@^1.0.0: dependencies: cssom "0.3.x" -"d3-require@https://github.com/d3/d3-require#7969f63b095bd0bb45ad79faca735c1ea33b5d50": - version "1.1.4" - resolved "https://github.com/d3/d3-require#7969f63b095bd0bb45ad79faca735c1ea33b5d50" +d3-require@1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/d3-require/-/d3-require-1.2.0.tgz#a840fc88e4b7f3bc49dac91eb16615c1df20b42a" dashdash@^1.12.0: version "1.14.1"