Unverified Commit bb9ce7b1 authored by yann300's avatar yann300 Committed by GitHub

Merge pull request #874 from ethereum/solc_require_fix

Solc require fix
parents 6978af8c b915b15b
...@@ -31,8 +31,7 @@ ...@@ -31,8 +31,7 @@
}, },
"standard": { "standard": {
"ignore": [ "ignore": [
"node_modules/*", "node_modules/*"
"soljson.js"
], ],
"parser": "babel-eslint" "parser": "babel-eslint"
}, },
......
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
"npm-run-all": "^4.1.2", "npm-run-all": "^4.1.2",
"fast-async": "^6.1.2", "fast-async": "^6.1.2",
"remix-lib": "^0.2.9", "remix-lib": "^0.2.9",
"solc": "https://github.com/ethereum/solc-js" "solc": "^0.4.24"
}, },
"devDependencies": { "devDependencies": {
"standard": "^7.0.1", "standard": "^7.0.1",
...@@ -38,8 +38,7 @@ ...@@ -38,8 +38,7 @@
"scripts": { "scripts": {
"build": "mkdirp build; browserify index.js > build/app.js", "build": "mkdirp build; browserify index.js > build/app.js",
"lint": "standard | notify-error", "lint": "standard | notify-error",
"downloadsolc": "cd node_modules/solc && (test -e soljson.js || wget --no-check-certificate https://solc-bin.ethereum.org/soljson.js) && cd ..", "test": "standard && tape ./test/tests.js"
"test": "standard && npm run downloadsolc && tape ./test/tests.js"
}, },
"repository": { "repository": {
"type": "git", "type": "git",
......
...@@ -23,20 +23,17 @@ ...@@ -23,20 +23,17 @@
"fast-async": "^6.1.2", "fast-async": "^6.1.2",
"npm-run-all": "^4.0.2", "npm-run-all": "^4.0.2",
"remix-lib": "^0.2.9", "remix-lib": "^0.2.9",
"solc": "https://github.com/ethereum/solc-js", "solc": "^0.4.24",
"standard": "^7.0.1", "standard": "^7.0.1",
"tape": "^4.6.0", "tape": "^4.6.0",
"webworkify": "^1.2.1" "webworkify": "^1.2.1"
}, },
"scripts": { "scripts": {
"downloadsolc": "cd node_modules/solc && (test -e soljson.js || wget --no-check-certificate https://solc-bin.ethereum.org/soljson.js) && cd ..", "test": "standard && tape ./test/tests.js"
"prepublish": "mkdirp build; npm-run-all -ls downloadsolc",
"postinstall": "npm-run-all -ls downloadsolc"
}, },
"standard": { "standard": {
"ignore": [ "ignore": [
"node_modules/*", "node_modules/*"
"soljson.js"
], ],
"parser": "babel-eslint" "parser": "babel-eslint"
}, },
......
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