Skip to content
This repository has been archived by the owner on Feb 18, 2022. It is now read-only.

Commit

Permalink
Merge 1dec5ad into 81348ef
Browse files Browse the repository at this point in the history
  • Loading branch information
tptee committed Oct 29, 2016
2 parents 81348ef + 1dec5ad commit b45fd01
Show file tree
Hide file tree
Showing 3 changed files with 5,211 additions and 21 deletions.
6 changes: 2 additions & 4 deletions .travis.yml
@@ -1,10 +1,8 @@
language: node_js

node_js:
- "0.10"
- "0.12"
- "4.2"
- "5.0"
- "4"
- "6"

# Use container-based Travis infrastructure.
sudo: false
Expand Down
33 changes: 16 additions & 17 deletions package.json
Expand Up @@ -13,34 +13,33 @@
},
"homepage": "https://github.com/FormidableLabs/radium-grid",
"scripts": {
"postinstall": "cd lib || builder run npm:postinstall || (echo 'POSTINSTALL FAILED: If using npm v2, please upgrade to npm v3. See bug https://github.com/FormidableLabs/builder/issues/35' && exit 1)",
"preversion": "builder run npm:preversion",
"version": "builder run npm:version",
"test": "builder run npm:test"
},
"dependencies": {
"builder": "^2.9.1",
"builder-radium-component": "2.1.0",
"coveralls": "^2.11.8",
"lodash.initial": "^4.0.4",
"builder": "^3.1.0",
"builder-radium-component": "^2.1.2",
"coveralls": "^2.11.14",
"lodash.initial": "^4.1.1",
"lodash.last": "^3.0.0",
"lodash.merge": "^4.4.0"
"lodash.merge": "^4.6.0"
},
"devDependencies": {
"babel-polyfill": "^6.8.0",
"babel-preset-es2015": "^6.6.0",
"babel-register": "^6.8.0",
"builder": "^2.10.1",
"builder-radium-component-dev": "2.1.0",
"babel-polyfill": "^6.16.0",
"babel-preset-es2015": "^6.18.0",
"babel-register": "^6.18.0",
"builder": "^3.1.0",
"builder-radium-component-dev": "^2.1.2",
"chai": "^3.2.0",
"mocha": "^2.3.3",
"mocha": "^3.1.2",
"radium": "^0.18.1",
"react": "^15.0.2",
"react-addons-test-utils": "^15.0.2",
"react-dom": "^15.0.2",
"sinon": "^1.17.4",
"react": "^15.3.2",
"react-addons-test-utils": "^15.3.2",
"react-dom": "^15.3.2",
"sinon": "^1.17.6",
"sinon-chai": "^2.8.0",
"webpack-dev-server": "^1.14.1"
"webpack-dev-server": "^1.16.2"
},
"peerDependencies": {
"radium": "^0.17.1",
Expand Down

0 comments on commit b45fd01

Please sign in to comment.