Skip to content

Commit 755adf4

Browse files
committed
Update dependencies.
1 parent daaae61 commit 755adf4

7 files changed

+1020
-32
lines changed

.eslintrc

-5
This file was deleted.

.eslintrc.json

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
{
2+
"extends": "eslint:recommended",
3+
"parserOptions": {
4+
"sourceType": "module",
5+
"ecmaVersion": 8
6+
},
7+
"env": {
8+
"es6": true,
9+
"node": true,
10+
"browser": true
11+
},
12+
"rules": {
13+
"no-cond-assign": 0
14+
}
15+
}

.npmignore

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
*.sublime-*
22
dist/*.zip
3+
img/
34
test/

d3-fetch.sublime-project

+10-6
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,16 @@
22
"folders": [
33
{
44
"path": ".",
5-
"file_exclude_patterns": [
6-
"*.sublime-workspace"
7-
],
8-
"folder_exclude_patterns": [
9-
"dist"
10-
]
5+
"file_exclude_patterns": ["*.sublime-workspace"],
6+
"folder_exclude_patterns": ["dist"]
7+
}
8+
],
9+
"build_systems": [
10+
{
11+
"name": "yarn test",
12+
"cmd": ["yarn", "test"],
13+
"file_regex": "\\((...*?):([0-9]*):([0-9]*)\\)",
14+
"working_dir": "$project_path"
1115
}
1216
]
1317
}

package.json

+11-11
Original file line numberDiff line numberDiff line change
@@ -15,26 +15,26 @@
1515
"name": "Mike Bostock",
1616
"url": "http://bost.ocks.org/mike"
1717
},
18-
"main": "dist/d3-fetch.js",
19-
"module": "index.js",
18+
"main": "dist/d3-fetch.min.js",
19+
"module": "index",
20+
"jsnext:main": "index",
2021
"repository": {
2122
"type": "git",
2223
"url": "https://github.com/d3/d3-fetch.git"
2324
},
2425
"scripts": {
25-
"pretest": "rm -rf dist && mkdir dist && rollup -c --banner \"$(preamble)\"",
26-
"test": "tape 'test/**/*-test.js'",
27-
"prepublishOnly": "npm run test && uglifyjs -b beautify=false,preamble=\"'$(preamble)'\" dist/d3-fetch.js -c -m -o dist/d3-fetch.min.js",
28-
"postpublish": "git push && git push --tags && cd ../d3.github.com && git pull && cp ../d3-fetch/dist/d3-fetch.js d3-fetch.v1.js && cp ../d3-fetch/dist/d3-fetch.min.js d3-fetch.v1.min.js && git add d3-fetch.v1.js d3-fetch.v1.min.js && git commit -m \"d3-fetch ${npm_package_version}\" && git push && cd - && zip -j dist/d3-fetch.zip -- LICENSE README.md dist/d3-fetch.js dist/d3-fetch.min.js"
26+
"pretest": "rollup -c",
27+
"test": "tape 'test/**/*-test.js' && eslint index.js src",
28+
"prepublishOnly": "rm -rf dist && yarn test",
29+
"postpublish": "git push && git push --tags && cd ../d3.github.com && git pull && cp ../${npm_package_name}/dist/${npm_package_name}.js ${npm_package_name}.v1.js && cp ../${npm_package_name}/dist/${npm_package_name}.min.js ${npm_package_name}.v1.min.js && git add ${npm_package_name}.v1.js ${npm_package_name}.v1.min.js && git commit -m \"${npm_package_name} ${npm_package_version}\" && git push && cd - && zip -j dist/${npm_package_name}.zip -- LICENSE README.md dist/${npm_package_name}.js dist/${npm_package_name}.min.js"
2930
},
3031
"dependencies": {
3132
"d3-dsv": "1"
3233
},
3334
"devDependencies": {
34-
"eslint": "4",
35-
"package-preamble": "0.1",
36-
"rollup": "0.52",
37-
"tape": "4",
38-
"uglify-js": "3.2"
35+
"eslint": "5",
36+
"rollup": "0.64",
37+
"rollup-plugin-terser": "1",
38+
"tape": "4"
3939
}
4040
}

rollup.config.js

+32-10
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,36 @@
1-
const definition = require("./package.json");
2-
const dependencies = Object.keys(definition.dependencies);
1+
import {terser} from "rollup-plugin-terser";
2+
import * as meta from "./package.json";
33

4-
export default {
5-
input: "index",
6-
external: dependencies,
4+
const config = {
5+
input: "index.js",
6+
external: Object.keys(meta.dependencies || {}),
77
output: {
8-
extend: true,
9-
file: `dist/${definition.name}.js`,
8+
file: `dist/${meta.name}.js`,
9+
name: "d3",
1010
format: "umd",
11-
globals: dependencies.reduce((p, v) => (p[v] = "d3", p), {}),
12-
name: "d3"
13-
}
11+
indent: false,
12+
extend: true,
13+
banner: `// ${meta.homepage} v${meta.version} Copyright ${(new Date).getFullYear()} ${meta.author.name}`,
14+
globals: Object.assign({}, ...Object.keys(meta.dependencies || {}).map(key => ({[key]: "d3"})))
15+
},
16+
plugins: []
1417
};
18+
19+
export default [
20+
config,
21+
{
22+
...config,
23+
output: {
24+
...config.output,
25+
file: `dist/${meta.name}.min.js`
26+
},
27+
plugins: [
28+
...config.plugins,
29+
terser({
30+
output: {
31+
preamble: config.output.banner
32+
}
33+
})
34+
]
35+
}
36+
];

0 commit comments

Comments
 (0)