Update d3-axis, d3-contour.

API.md

@@ -331,6 +331,7 @@ Compute contour polygons using marching squares.
 * [density.cellSize](https://github.com/d3/d3-contour/blob/master/README.md#density_cellSize) -
 * [density.thresholds](https://github.com/d3/d3-contour/blob/master/README.md#density_thresholds) -
 * [density.bandwidth](https://github.com/d3/d3-contour/blob/master/README.md#density_bandwidth) -
+* [density.weight](https://github.com/d3/d3-contour/blob/master/README.md#density_weight) -
 
 ## [Dispatches (d3-dispatch)](https://github.com/d3/d3-dispatch)
 

package.json

@@ -27,18 +27,17 @@
   "scripts": {
     "pretest": "rimraf dist && mkdir dist && json2module package.json > dist/package.js && node rollup.node",
     "test": "tape 'test/**/*-test.js'",
-    "prepublishOnly": "npm run test && rollup -c --banner \"$(preamble)\" && uglifyjs -b beautify=false,preamble=\"'$(preamble)'\" dist/d3.js -c negate_iife=false -m -o dist/d3.min.js",
+    "prepublishOnly": "yarn test && rollup -c",
     "postpublish": "git push && git push --tags && cd ../d3.github.com && git pull && cp ../d3/dist/d3.js d3.v5.js && cp ../d3/dist/d3.min.js d3.v5.min.js && git add d3.v5.js d3.v5.min.js && git commit -m \"d3 ${npm_package_version}\" && git push && cd - && cd ../d3-bower && git pull && cp ../d3/LICENSE ../d3/README.md ../d3/dist/d3.js ../d3/dist/d3.min.js . && git add -- LICENSE README.md d3.js d3.min.js && git commit -m \"${npm_package_version}\" && git tag -am \"${npm_package_version}\" v${npm_package_version} && git push && git push --tags && cd - && zip -j dist/d3.zip -- LICENSE README.md API.md CHANGES.md dist/d3.js dist/d3.min.js"
   },
   "devDependencies": {
     "json2module": "0.0",
-    "package-preamble": "0.1",
     "rimraf": "2",
-    "rollup": "0.57",
+    "rollup": "0.64",
     "rollup-plugin-ascii": "0.0",
     "rollup-plugin-node-resolve": "3",
-    "tape": "4",
-    "uglify-js": "3.2"
+    "rollup-plugin-terser": "1",
+    "tape": "4"
   },
   "dependencies": {
     "d3-array": "1",

rollup.config.js

@@ -1,14 +1,39 @@
 import ascii from "rollup-plugin-ascii";
 import node from "rollup-plugin-node-resolve";
+import {terser} from "rollup-plugin-terser";
+import * as meta from "./package.json";
 
-export default {
-  input: "index",
-  plugins: [node(), ascii()],
-  output: {
-    extend: true,
-    file: "dist/d3.js",
-    format: "umd",
-    indent: false,
-    name: "d3"
+const copyright = `// ${meta.homepage} Version ${meta.version} Copyright ${(new Date).getFullYear()} ${meta.author.name}.`;
+
+export default [
+  {
+    input: "index",
+    plugins: [
+      node(),
+      ascii()
+    ],
+    output: {
+      extend: true,
+      banner: copyright,
+      file: "dist/d3.js",
+      format: "umd",
+      indent: false,
+      name: "d3"
+    }
+  },
+  {
+    input: "index",
+    plugins: [
+      node(),
+      ascii(),
+      terser({output: {preamble: copyright}})
+    ],
+    output: {
+      extend: true,
+      file: "dist/d3.min.js",
+      format: "umd",
+      indent: false,
+      name: "d3"
+    }
   }
-};
+];