Skip to content

Commit

Permalink
Chore: Upgrade deps and scripts to work with node 10 (#893)
Browse files Browse the repository at this point in the history
  • Loading branch information
jstoffan authored Jan 15, 2019
1 parent 57d9700 commit 279fc2e
Show file tree
Hide file tree
Showing 7 changed files with 468 additions and 621 deletions.
2 changes: 2 additions & 0 deletions .npmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
engine-strict=true
registry=https://registry.npmjs.org/
11 changes: 8 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,16 @@
language: node_js
node_js:
- '8'
- '10'
cache: yarn
before_install:
- curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version 1.13.0
- export PATH=$HOME/.yarn/bin:$PATH
jobs:
include:
- script: yarn run ci
- before_script:
- name: "Build"
script: yarn run ci
- name: "Tests"
before_script:
- python -m SimpleHTTPServer &
- 'export DISPLAY=:99.0'
- 'sh -e /etc/init.d/xvfb start'
Expand Down
1 change: 1 addition & 0 deletions .yarnrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
registry "https://registry.yarnpkg.com"
22 changes: 0 additions & 22 deletions build/release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@ major_release=false
minor_release=false
patch_release=false

# LTS compatibility
node_validation_script_path="./build/validateNodeVersion.js"

reset_tags() {
# Wipe tags
echo "----------------------------------------------------------------------"
Expand Down Expand Up @@ -181,27 +178,8 @@ push_to_github() {
fi
}

# Validates whether or not the supported version of NodeJS is being used
validate_node_version() {
$(node $node_validation_script_path)

if [ "$?" -eq "1" ] ; then
echo "----------------------------------------------------------------------"
echo "Invalid version of Node. Must be LTS version >= v8.9.4"
echo "----------------------------------------------------------------------"
exit 1
else
echo "----------------------------------------------------------------------"
echo "Valid version of Node"
echo "----------------------------------------------------------------------"
fi
}

# Check out latest code from git, build assets, increment version, and push tags
push_new_release() {
# Before running release, make sure using correct version of NodeJS
validate_node_version;

# Get latest commited code and tags
if $patch_release; then
echo "----------------------------------------------------------------------"
Expand Down
116 changes: 0 additions & 116 deletions build/validateNodeVersion.js

This file was deleted.

20 changes: 12 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
"box-annotations": "2.3.0",
"box-locales": "^0.0.1",
"box-react-ui": "^22.7.0",
"chai": "^4.1.2",
"chai-dom": "^1.5.0",
"chai": "^4.2.0",
"chai-dom": "^1.8.1",
"codeceptjs": "^1.4.6",
"conventional-changelog-cli": "^1.3.5",
"conventional-github-releaser": "^2.0.0",
Expand All @@ -51,21 +51,21 @@
"husky": "^0.14.3",
"i18n-webpack-plugin": "^1.0.0",
"jsuri": "^1.3.1",
"karma": "^1.5.0",
"karma": "^3.1.4",
"karma-chai": "^0.1.0",
"karma-chai-dom": "^1.1.0",
"karma-chrome-launcher": "^2.2.0",
"karma-coverage": "^1.1.1",
"karma-coverage": "^1.1.2",
"karma-fixture": "^0.2.6",
"karma-html2js-preprocessor": "^1.1.0",
"karma-junit-reporter": "^1.2.0",
"karma-mocha": "^1.3.0",
"karma-mocha-reporter": "^2.2.5",
"karma-phantomjs-launcher": "^1.0.4",
"karma-sinon": "^1.0.5",
"karma-sinon-chai": "^1.3.3",
"karma-sinon-chai": "^2.0.2",
"karma-sourcemap-loader": "^0.3.7",
"karma-webpack": "^2.0.6",
"karma-webpack": "^3.0.5",
"lint-staged": "^5.0.0",
"lodash": "^4.17.5",
"mocha": "^4.0.1",
Expand All @@ -87,8 +87,8 @@
"sass-loader": "^6.0.6",
"saucelabs": "^1.4.0",
"selenium-webdriver": "^3.6.0",
"sinon": "^4.1.2",
"sinon-chai": "2.14.0",
"sinon": "^7.2.2",
"sinon-chai": "3.3.0",
"string-replace-loader": "^1.3.0",
"style-loader": "^0.19.0",
"stylelint": "^8.3.1",
Expand All @@ -100,6 +100,10 @@
"webpack-bundle-analyzer": "^2.9.1",
"whatwg-fetch": "^2.0.3"
},
"engines": {
"node": ">=8.9.4",
"yarn": ">=1.10.0"
},
"scripts": {
"build": "yarn run clean && yarn run build-rb && yarn run lint && yarn run dev",
"build-ci": "./node_modules/.bin/webpack --progress --colors --config build/webpack.config.js",
Expand Down
Loading

0 comments on commit 279fc2e

Please sign in to comment.