From c574e6808fd4f004a1cce2111e541d98f85a066f Mon Sep 17 00:00:00 2001 From: Igor Minar Date: Fri, 20 May 2016 10:24:05 -0700 Subject: [PATCH] build: update to rollup@0.26.3 and remove a hack from the build --- build.sh | 7 ------- npm-shrinkwrap.clean.json | 4 ++-- npm-shrinkwrap.json | 8 ++++---- package.json | 2 +- 4 files changed, 7 insertions(+), 14 deletions(-) diff --git a/build.sh b/build.sh index 1881b0b930..8c8ea6c288 100755 --- a/build.sh +++ b/build.sh @@ -104,13 +104,6 @@ do ../../../node_modules/.bin/rollup -c rollup.config.js ) 2>&1 | grep -v "as external dependency" - # workaround for https://github.com/rollup/rollup/issues/626 - if [[ ${TRAVIS} ]]; then - sed -i "s/ class exports\./ class /g" ${UMD_ES6_PATH} - else - sed -i '' "s/ class exports\./ class /g" ${UMD_ES6_PATH} - fi - $(npm bin)/tsc \ --out ${UMD_ES5_PATH} \ --target es5 \ diff --git a/npm-shrinkwrap.clean.json b/npm-shrinkwrap.clean.json index 91ec1b513e..79904f97e7 100644 --- a/npm-shrinkwrap.clean.json +++ b/npm-shrinkwrap.clean.json @@ -4800,7 +4800,7 @@ "version": "1.1.1" }, "rollup": { - "version": "0.26.1", + "version": "0.26.3", "dependencies": { "ansi-regex": { "version": "2.0.0" @@ -5862,5 +5862,5 @@ } }, "name": "angular-srcs", - "version": "2.0.0-beta.17" + "version": "2.0.0-rc.1" } diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index 8ab877b294..9291e80125 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -1,6 +1,6 @@ { "name": "angular-srcs", - "version": "2.0.0-beta.17", + "version": "2.0.0-rc.1", "dependencies": { "abbrev": { "version": "1.0.7", @@ -7653,9 +7653,9 @@ "resolved": "https://registry.npmjs.org/rndm/-/rndm-1.1.1.tgz" }, "rollup": { - "version": "0.26.1", - "from": "rollup@>=0.26.1 <0.27.0", - "resolved": "https://registry.npmjs.org/rollup/-/rollup-0.26.1.tgz", + "version": "0.26.3", + "from": "rollup@0.26.3", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-0.26.3.tgz", "dependencies": { "ansi-regex": { "version": "2.0.0", diff --git a/package.json b/package.json index 0d6965aaa6..f2d33f4656 100644 --- a/package.json +++ b/package.json @@ -85,7 +85,7 @@ "q": "^1.0.1", "react": "^0.14.0", "rewire": "^2.3.3", - "rollup": "^0.26.1", + "rollup": "^0.26.3", "run-sequence": "^1.1.0", "selenium-webdriver": "^2.47.0", "semver": "^5.1.0",