Skip to content

B
baas-ide
Unverified Commit 3092f6d6 authored by yann300's avatar yann300 Committed by GitHub
Browse files
Options

Merge pull request #2223 from ethereum/toasterIssue

added npm-merge-driver as devdependency
parents c29815c8 81015f93
Show whitespace changes
Inline Side-by-side
Showing with 376 additions and 0 deletions
package-lock.json
View file @ 3092f6d6
...@@ -10647,6 +10647,381 @@ ...@@ -10647,6 +10647,381 @@
"rimraf": "2.6.3" "rimraf": "2.6.3"
} }
}, },
"npm-merge-driver": {
"version": "2.3.5",
"resolved": "https://registry.npmjs.org/npm-merge-driver/-/npm-merge-driver-2.3.5.tgz",
"integrity": "sha512-MUxE26ZdDWAc+wlqwyOEIhRH1EdaIXCWSZbqAQ76dUkz3uSrxrLhfgQ3nb3oZbqC5e4NyLcCdzTSDVwkisoJpg==",
"dev": true,
"requires": {
"mkdirp": "0.5.1",
"yargs": "10.0.3"
},
"dependencies": {
"ansi-regex": {
"version": "2.1.1",
"bundled": true,
"dev": true
},
"code-point-at": {
"version": "1.1.0",
"bundled": true,
"dev": true
},
"cross-spawn": {
"version": "5.1.0",
"bundled": true,
"dev": true,
"requires": {
"lru-cache": "4.1.1",
"shebang-command": "1.2.0",
"which": "1.3.0"
}
},
"decamelize": {
"version": "1.2.0",
"bundled": true,
"dev": true
},
"execa": {
"version": "0.7.0",
"bundled": true,
"dev": true,
"requires": {
"cross-spawn": "5.1.0",
"get-stream": "3.0.0",
"is-stream": "1.1.0",
"npm-run-path": "2.0.2",
"p-finally": "1.0.0",
"signal-exit": "3.0.2",
"strip-eof": "1.0.0"
}
},
"find-up": {
"version": "2.1.0",
"bundled": true,
"dev": true,
"requires": {
"locate-path": "2.0.0"
}
},
"get-caller-file": {
"version": "1.0.2",
"bundled": true,
"dev": true
},
"get-stream": {
"version": "3.0.0",
"bundled": true,
"dev": true
},
"invert-kv": {
"version": "1.0.0",
"bundled": true,
"dev": true
},
"is-fullwidth-code-point": {
"version": "1.0.0",
"bundled": true,
"dev": true,
"requires": {
"number-is-nan": "1.0.1"
}
},
"is-stream": {
"version": "1.1.0",
"bundled": true,
"dev": true
},
"isexe": {
"version": "2.0.0",
"bundled": true,
"dev": true
},
"lcid": {
"version": "1.0.0",
"bundled": true,
"dev": true,
"requires": {
"invert-kv": "1.0.0"
}
},
"locate-path": {
"version": "2.0.0",
"bundled": true,
"dev": true,
"requires": {
"p-locate": "2.0.0",
"path-exists": "3.0.0"
}
},
"lru-cache": {
"version": "4.1.1",
"bundled": true,
"dev": true,
"requires": {
"pseudomap": "1.0.2",
"yallist": "2.1.2"
}
},
"mem": {
"version": "1.1.0",
"bundled": true,
"dev": true,
"requires": {
"mimic-fn": "1.1.0"
}
},
"mimic-fn": {
"version": "1.1.0",
"bundled": true,
"dev": true
},
"minimist": {
"version": "0.0.8",
"bundled": true,
"dev": true
},
"mkdirp": {
"version": "0.5.1",
"bundled": true,
"dev": true,
"requires": {
"minimist": "0.0.8"
}
},
"npm-run-path": {
"version": "2.0.2",
"bundled": true,
"dev": true,
"requires": {
"path-key": "2.0.1"
}
},
"number-is-nan": {
"version": "1.0.1",
"bundled": true,
"dev": true
},
"os-locale": {
"version": "2.1.0",
"bundled": true,
"dev": true,
"requires": {
"execa": "0.7.0",
"lcid": "1.0.0",
"mem": "1.1.0"
}
},
"p-finally": {
"version": "1.0.0",
"bundled": true,
"dev": true
},
"p-limit": {
"version": "1.1.0",
"bundled": true,
"dev": true
},
"p-locate": {
"version": "2.0.0",
"bundled": true,
"dev": true,
"requires": {
"p-limit": "1.1.0"
}
},
"path-exists": {
"version": "3.0.0",
"bundled": true,
"dev": true
},
"path-key": {
"version": "2.0.1",
"bundled": true,
"dev": true
},
"pseudomap": {
"version": "1.0.2",
"bundled": true,
"dev": true
},
"require-directory": {
"version": "2.1.1",
"bundled": true,
"dev": true
},
"require-main-filename": {
"version": "1.0.1",
"bundled": true,
"dev": true
},
"set-blocking": {
"version": "2.0.0",
"bundled": true,
"dev": true
},
"shebang-command": {
"version": "1.2.0",
"bundled": true,
"dev": true,
"requires": {
"shebang-regex": "1.0.0"
}
},
"shebang-regex": {
"version": "1.0.0",
"bundled": true,
"dev": true
},
"signal-exit": {
"version": "3.0.2",
"bundled": true,
"dev": true
},
"string-width": {
"version": "1.0.2",
"bundled": true,
"dev": true,
"requires": {
"code-point-at": "1.1.0",
"is-fullwidth-code-point": "1.0.0",
"strip-ansi": "3.0.1"
}
},
"strip-ansi": {
"version": "3.0.1",
"bundled": true,
"dev": true,
"requires": {
"ansi-regex": "2.1.1"
}
},
"strip-eof": {
"version": "1.0.0",
"bundled": true,
"dev": true
},
"which": {
"version": "1.3.0",
"bundled": true,
"dev": true,
"requires": {
"isexe": "2.0.0"
}
},
"which-module": {
"version": "2.0.0",
"bundled": true,
"dev": true
},
"wrap-ansi": {
"version": "2.1.0",
"bundled": true,
"dev": true,
"requires": {
"string-width": "1.0.2",
"strip-ansi": "3.0.1"
}
},
"y18n": {
"version": "3.2.1",
"bundled": true,
"dev": true
},
"yallist": {
"version": "2.1.2",
"bundled": true,
"dev": true
},
"yargs": {
"version": "10.0.3",
"bundled": true,
"dev": true,
"requires": {
"cliui": "3.2.0",
"decamelize": "1.2.0",
"find-up": "2.1.0",
"get-caller-file": "1.0.2",
"os-locale": "2.1.0",
"require-directory": "2.1.1",
"require-main-filename": "1.0.1",
"set-blocking": "2.0.0",
"string-width": "2.1.1",
"which-module": "2.0.0",
"y18n": "3.2.1",
"yargs-parser": "8.0.0"
},
"dependencies": {
"ansi-regex": {
"version": "3.0.0",
"bundled": true,
"dev": true
},
"cliui": {
"version": "3.2.0",
"bundled": true,
"dev": true,
"requires": {
"string-width": "1.0.2",
"strip-ansi": "3.0.1",
"wrap-ansi": "2.1.0"
},
"dependencies": {
"string-width": {
"version": "1.0.2",
"bundled": true,
"dev": true,
"requires": {
"code-point-at": "1.1.0",
"is-fullwidth-code-point": "1.0.0",
"strip-ansi": "3.0.1"
}
}
}
},
"string-width": {
"version": "2.1.1",
"bundled": true,
"dev": true,
"requires": {
"is-fullwidth-code-point": "2.0.0",
"strip-ansi": "4.0.0"
},
"dependencies": {
"is-fullwidth-code-point": {
"version": "2.0.0",
"bundled": true,
"dev": true
},
"strip-ansi": {
"version": "4.0.0",
"bundled": true,
"dev": true,
"requires": {
"ansi-regex": "3.0.0"
}
}
}
}
}
},
"yargs-parser": {
"version": "8.0.0",
"bundled": true,
"dev": true,
"requires": {
"camelcase": "4.1.0"
},
"dependencies": {
"camelcase": {
"version": "4.1.0",
"bundled": true,
"dev": true
}
}
}
}
},
"npm-run-all": { "npm-run-all": {
"version": "4.1.5", "version": "4.1.5",
"resolved": "https://registry.npmjs.org/npm-run-all/-/npm-run-all-4.1.5.tgz", "resolved": "https://registry.npmjs.org/npm-run-all/-/npm-run-all-4.1.5.tgz",
......
package.json
View file @ 3092f6d6
...@@ -47,6 +47,7 @@ ...@@ -47,6 +47,7 @@
"nightwatch": "^0.9.20", "nightwatch": "^0.9.20",
"notify-error": "^1.2.0", "notify-error": "^1.2.0",
"npm-link-local": "^1.1.0", "npm-link-local": "^1.1.0",
"npm-merge-driver": "^2.3.5",
"npm-run-all": "^4.0.2", "npm-run-all": "^4.0.2",
"onchange": "^3.2.1", "onchange": "^3.2.1",
"remix-analyzer": "0.3.8", "remix-analyzer": "0.3.8",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment