From 6c48779e737401f18cf98de5c96ebf59119af0d7 Mon Sep 17 00:00:00 2001 From: Matthias Kretschmann Date: Mon, 3 Dec 2018 12:00:59 +0100 Subject: [PATCH] fix all the build things --- .babelrc | 2 +- .travis.yml | 9 +++++---- _ci/setup.sh | 2 +- package.json | 13 +++++++------ 4 files changed, 14 insertions(+), 12 deletions(-) diff --git a/.babelrc b/.babelrc index 002b4aa..1320b9a 100644 --- a/.babelrc +++ b/.babelrc @@ -1,3 +1,3 @@ { - "presets": ["env"] + "presets": ["@babel/preset-env"] } diff --git a/.travis.yml b/.travis.yml index 6016704..c705772 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,13 +8,14 @@ cache: - $TRAVIS_BUILD_DIR/node_modules before_install: - - nvm install 10 - - pip install --user awscli - - export PATH=$PATH:$HOME/.local/bin + - nvm install node before_script: "_ci/setup.sh" script: "_ci/build.sh" -after_success: "_ci/deploy.sh" +after_success: + - pip install --user awscli + - export PATH=$PATH:$HOME/.local/bin + - "_ci/deploy.sh" notifications: email: false diff --git a/_ci/setup.sh b/_ci/setup.sh index fef53ce..7d0149d 100755 --- a/_ci/setup.sh +++ b/_ci/setup.sh @@ -7,7 +7,7 @@ echo " Installing dependencies " echo "=============================================" echo "$(tput sgr0)" # reset -npm install gulpjs/gulp.git#4.0 -g +npm install gulp@4.0.0 -g npm install # Travis does that automatically after selecting ruby diff --git a/package.json b/package.json index 04459c9..0d1db3a 100644 --- a/package.json +++ b/package.json @@ -36,29 +36,30 @@ "parsleyjs": "^2.8.1", "popper.js": "^1.14.4", "select2": "^4.0.5", - "smooth-scroll": "^14.2.1", + "smooth-scroll": "^15.0.0", "svg4everybody": "^2.1.9", "textarea-autogrow": "^1.0.0", "vivus": "^0.4.4" }, "devDependencies": { + "@babel/core": "^7.1.6", + "@babel/preset-env": "^7.1.6", + "@babel/register": "^7.0.0", "acorn": "^6.0.0", - "babel-core": "^6.26.3", - "babel-preset-env": "^1.7.0", - "browser-sync": "^2.24.7", + "browser-sync": "^2.26.3", "concurrent-transform": "^1.0.0", "critical": "^1.3.4", "cross-spawn": "^6.0.5", "del": "^3.0.0", "gulp": "^4.0.0", "gulp-autoprefixer": "^6.0.0", - "gulp-clean-css": "^3.10.0", + "gulp-clean-css": "^4.0.0", "gulp-cli": "^2.0.1", "gulp-concat": "^2.6.1", "gulp-header": "^2.0.5", "gulp-htmlmin": "^5.0.1", "gulp-if": "^2.0.2", - "gulp-imagemin": "^4.1.0", + "gulp-imagemin": "^5.0.3", "gulp-include": "^2.3.1", "gulp-load-plugins": "^1.5.0", "gulp-rename": "^1.4.0",