Skip to content

Commit

Permalink
refactor(configuration): minor configuration updates
Browse files Browse the repository at this point in the history
fix(build): fix broken build

build(travis): remove specific npm version
  • Loading branch information
jaebradley authored and georgebabey committed May 10, 2018
1 parent 8f8a4b3 commit 69dc9e3
Show file tree
Hide file tree
Showing 8 changed files with 367 additions and 31 deletions.
11 changes: 7 additions & 4 deletions .babelrc
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
{
"presets": [
["env", {
"targets": {
"browsers": ["last 2 versions", "ie 11"]
[
"env",
{
"targets": {
"browsers": ["last 2 versions", "ie 11"]
}
}
}],
],
"babel-preset-react"
],
"plugins": [
Expand Down
9 changes: 3 additions & 6 deletions .eslintrc.js → .eslintrc
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module.exports = {
{
"extends": "eslint-config-edx",
"parser": "babel-eslint",
"rules": {
Expand All @@ -8,13 +8,10 @@ module.exports = {
"devDependencies": [
"config/*.js",
"**/*.test.jsx",
"**/*.test.js",
"**/*.test.js"
]
}
],
"class-methods-use-this": [
"off"
],
// https://github.com/evcohen/eslint-plugin-jsx-a11y/issues/340#issuecomment-338424908
"jsx-a11y/anchor-is-valid": [ "error", {
"components": [ "Link" ],
Expand All @@ -24,4 +21,4 @@ module.exports = {
"env": {
"jest": true
}
};
}
1 change: 0 additions & 1 deletion .npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
.eslintrc.json
.gitignore
.travis.yml
docker-compose.linux.yml
docker-compose.yml
Dockerfile
Makefile
Expand Down
14 changes: 8 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
language: node_js
node_js:
- 8.9.4
- 8.9.3
cache:
directories:
- "~/.npm"
Expand All @@ -12,23 +12,25 @@ notifications:
on_failure: always
hipchat:
rooms:
secure: mo7HtlCFqDnlpuiwJsRmLEoALyjovE0fGnX6GXCYHZ33MzULeohHKD12XM724iU/GiWApibv+5bB5BtmaGnQ/0ksFk/T+Aclczi5N0meYidexnf47hUMPvq6wrj2gogvmh+qwMj5+Xz4HTmgJUoUcBnRrDPIPBYAA5S1IT+pBZS6U24rVs3Hu/dOwKuTKDopGSnPOtZNUmq8/8DZzu5SXQdxLoBk2JjuiZvoKCuesDK15/MMEHBZj9vSIWHXlIE+5LzriGtzv13xsPLUpx0mBTs8oM/NFhIjRk7BrWlNjFMeG92M58yvilnJqJZNAQkNANfdO+F5AKYOnXurieRFGZ2eRVlh3qBt/zTgXNJ1xjKkknLXQu15xJ6YniE7AJ2Qsj3bU/UigPeYBl02I1c0lUaV74cvlxyAukyvuSKzrh2TuyoR7k7wU0sQHrJDRLawXvMXTmJLLY8EKVyCXk+fbQmgm4PXp0cc5DBt09dHtc89V2XPonkhn9jz/lS4i0a/WGh+IjRp7uyRwkRPm1r3ul8Itobpzj3WgXmRpCwTpURuGbkaGMe+PJBr6Hk0ZsVtz8V5+2TLovsODJb249cWpo1qfjpRcfhNhYyGaXMAgH1IR+Hr+foo07x++nW2ILkjruTdFGD782sCX+2nCP5M4yWbKZ4MtcLGcwIEIxw3++k=
secure: g5fu70/Dv5qaE7UztS2FWEwhTpEOwDo9CMA/J6jcdKrpT/vRqAkAD5x3WHrHdN2BMOJh2VeFO7xAeAuTwf072kc6Q+ND8Zi495Wc1FItKApzYiipYPBouYdgRbP0oqplII1TaGAbs7YB/7xPApkhNwG+KV2p+ih8aaRUPRqmEYgTkiXWGsrgs4E0L070TPR75Fc9GsxaTnCcZ4tCSdvlOmlMJaF9jNiF6+6zkANWsrHW70zU+7YA8muT7NLFKB1l0tcJOpxr3svWFl4SFdoiqVm2SPO6VjJE6HaxPt82lin0Hvovm5ABxc5Y953SC/9c8TteT5XNAO9PrcO7AKIivjkR2XYGkTIk0DUTex5rVPXvN4AxjA3kXGmg947fAI8MmlTXD/BgkryVfOyuh2jO7RKvnjtosVshmGjsDO8VC1cZCQQLMYrMBQHcfiBcHU0hYKCtSgH5NsIA8S4WQk0w50uR9QiZgAHEuQME1tiFQt8DozQX5nH5Im+jZgrbt/2Nzy2l7eG1QExx+X8bHhRezZuRbQOgFCnbCnr5iUtE9sQJVhdsyyo8cTS36HsYOL8868HKgWdY8UPtwoe3ZfKUo8hlORAr2B3XUv9vBz0W9GwvrNcYrJrpt+xVIqKwCdx/dxDscCAgrN7JGlw2rQQU+bqOpTp4v8Ut+fDUCZZWEUM=
before_install:
- npm install -g npm@5
- npm install -g greenkeeper-lockfile@1
- npm install -g npm
- npm install -g greenkeeper-lockfile@1.14.0
before_script: greenkeeper-lockfile-update
after_script: greenkeeper-lockfile-upload
script:
- make validate-no-uncommitted-package-lock-changes
- npm run lint
- npm run test
- npm run build
- npm run is-es5
after_success:
- npm run build:gh-pages
deploy:
local-dir: ./dist
local-dir: "./dist"
provider: pages
skip-cleanup: true
github-token: $GITHUB_TOKEN
github-token: "$GITHUB_TOKEN"
keep-history: true
name: edx-semantic-release
email: [email protected]
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Copied from https://github.com/BretFisher/node-docker-good-defaults/blob/master/Dockerfile

FROM node:8.9.4
FROM node:8.9.3

# Create app directory
RUN mkdir -p /edx/app
Expand Down
1 change: 0 additions & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

version: "2"
services:
web:
Expand Down
Loading

0 comments on commit 69dc9e3

Please sign in to comment.