From 2ba96993831b862b70e74897e77fd99f80346b51 Mon Sep 17 00:00:00 2001 From: yann300 Date: Wed, 29 Nov 2017 13:04:21 +0100 Subject: [PATCH] pull remix (dont use npm version) --- .gitignore | 1 + .travis.yml | 2 +- package.json | 3 +++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 128b36dbb3..349416d020 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ soljson.js npm-debug.log* babelify-src package-lock.json +remix diff --git a/.travis.yml b/.travis.yml index dc03c584f3..22dca2fde2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,7 @@ language: node_js node_js: - "7" script: - - npm run lint && npm run test && npm run downloadsolc && npm run make-mock-compiler && npm run build + - npm run lint && npm run test && npm run downloadsolc && npm run make-mock-compiler && npm run pullremix && npm run linkremix && npm run build - ./ci/browser_tests.sh deploy: - provider: script diff --git a/package.json b/package.json index e85a2cc897..d3ee62a8fa 100644 --- a/package.json +++ b/package.json @@ -19,6 +19,7 @@ "csjs-inject": "^1.0.1", "csslint": "^1.0.2", "deep-equal": "^1.0.1", + "npm-link-local": "^1.1.0", "remix-core": "latest", "remix-lib": "latest", "remix-solidity": "latest", @@ -136,6 +137,8 @@ ] }, "scripts": { + "pullremix": "mkdir remix; git clone https://github.com/ethereum/remix; cd ..", + "linkremix": "npm-link-local ./remix/remix-lib && npm-link-local ./remix/remix-core && npm-link-local ./remix/remix-solidity && npm-link-local ./remix/remix-debugger", "build": "browserify src/index.js -o build/app.js", "browsertest": "sleep 5 && npm run nightwatch_local", "csslint": "csslint --ignore=order-alphabetical --errors='errors,duplicate-properties,empty-rules' --exclude-list='assets/css/font-awesome.min.css' assets/css/",