Merge branch 'd3-v4' of github.com:openstreetmap/iD into d3-v4

This commit is contained in:
Tom MacWright
2016-09-01 08:47:42 -04:00
3 changed files with 4 additions and 3 deletions

1
.gitignore vendored
View File

@@ -4,5 +4,6 @@ node_modules
npm-debug.log
dist/*.js
dist/*.css
dist/*.map
dist/img/*.svg
data/data.js

View File

@@ -38,7 +38,7 @@ function build() {
if (process.argv[2] === 'develop') {
build();
gaze('modules/**.js', function(err, watcher) {
gaze('modules/**/**.js', function(err, watcher) {
watcher.on('all', function() {
build();
});

View File

@@ -38,10 +38,10 @@
"brfs": "1.4.3",
"chai": "~3.5.0",
"d3": "4.2.1",
"ecstatic": "2.1.0",
"ecstatic": "~2.1.0",
"editor-layer-index": "git://github.com/osmlab/editor-layer-index.git#gh-pages",
"eslint": "~3.3.1",
"gaze": "1.1.1",
"gaze": "~1.1.1",
"glob": "~7.0.5",
"happen": "~0.3.1",
"js-yaml": "~3.6.1",