Skip to content
This repository was archived by the owner on Feb 17, 2022. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 12 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
language: node_js

node_js:
- "4"
# Disabling tests on node6 until #96 is resolved
#- "6"
- 4
- 6
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add - 8 please.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍 ✅

- 8

addons:
firefox: "49.0"

# Use container-based Travis infrastructure.
sudo: false
Expand All @@ -20,6 +23,10 @@ before_install:
- sh -e /etc/init.d/xvfb start

script:
- yarn check-ci
- node --version
- yarn --version
- yarn run check-ci

# Prune deps to just production and ensure we can still build
- yarn install --production
- yarn build
- yarn run build
5 changes: 0 additions & 5 deletions karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,6 @@
*/
var webpackCfg = require("./webpack.config.test");

// BUG: Karma 0.13 is broken for circular imports
// TODO: Upgrade Karma to 0.13 when upstream bug is fixed.
// https://github.com/FormidableLabs/
// formidable-react-component-boilerplate/issues/25

module.exports = function (config) {
// Start with the "dev" (webpack-dev-server is already running) config
// and add in the webpack stuff.
Expand Down
25 changes: 13 additions & 12 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -67,45 +67,46 @@
"babel-preset-stage-1": "^6.0.0",
"babel-standalone": "^6.4.4",
"codemirror": "^5.15.2",
"css-loader": "~0.9.0",
"prop-types": "^15.5.10",
"react": "^15.4.2",
"react-addons-test-utils": "^15.4.2",
"react-codemirror": "^1.0.0",
"react-dom": "^15.4.2",
"rimraf": "^2.4.0",
"style-loader": "~0.8.0",
"url-loader": "~0.5.5",
"webpack": "^1.10.0"
"webpack": "^1.12.3"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we ticket out upgrading to webpack@3 later?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done: #102

},
"devDependencies": {
"babel-eslint": "^5.0.0",
"chai": "^3.2.0",
"css-loader": "~0.9.0",
"eslint": "^0.24.1",
"eslint-config-defaults": "^3.0.3",
"eslint-plugin-filenames": "^0.1.1",
"eslint-plugin-react": "^2.6.4",
"file-loader": "^0.11.2",
"isparta-loader": "^2.0.0",
"karma": "^0.12.37",
"karma": "^0.13.9",
"karma-chrome-launcher": "^0.2.0",
"karma-coverage": "^0.4.2",
"karma-firefox-launcher": "^0.1.6",
"karma-firefox-launcher": "^1.0.1",
"karma-ie-launcher": "^0.2.0",
"karma-mocha": "^0.2.0",
"karma-phantomjs-launcher": "^0.2.0",
"karma-phantomjs-shim": "^1.0.0",
"karma-phantomjs-launcher": "^1.0.4",
"karma-phantomjs-shim": "^1.1.1",
"karma-safari-launcher": "^0.1.1",
"karma-sauce-launcher": "^0.2.14",
"karma-spec-reporter": "0.0.20",
"karma-webpack": "^1.6.0",
"karma-webpack": "^1.7.0",
"lodash": "^4.13.1",
"mocha": "^2.2.5",
"opener": "^1.4.1",
"phantomjs": "^1.9.17",
"phantomjs-prebuilt": "^2.1.15",
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Evidently yarn can build phantomjs-prebuilt but not phantomjs!

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

phantomjs is deprecated. phantomjs-prebuilt is the modern version.

"raw-loader": "^0.5.1",
"react-hot-loader": "^1.2.8",
"sinon": "^1.15.4",
"sinon": "^1.16.1",
"sinon-chai": "^2.8.0",
"webpack-dev-server": "^1.10.0"
"style-loader": "~0.8.0",
"url-loader": "~0.5.5",
"webpack-dev-server": "^1.14.0"
}
}
6 changes: 0 additions & 6 deletions webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,6 @@ module.exports = {
test: /\.jsx?$/,
exclude: /(node_modules)/,
loader: "babel-loader"
}, {
test: /\.css$/,
loader: "style-loader!css-loader"
}, {
test: /\.(png|jpg)$/,
loader: "url-loader?limit=8192"
}
]
},
Expand Down
Loading