Permalink
Browse files

update all deps #3

  • Loading branch information...
rnicholus committed Feb 11, 2016
1 parent 8d9515f commit ae683e31daa7993f06d9d452e64cde3b84bf1fde
Showing with 41 additions and 33 deletions.
  1. +4 −1 .gitignore
  2. +2 −1 app/names-list.jsx
  3. +2 −5 config/karma.conf.js
  4. +7 −4 config/webpack.config.js
  5. +26 −22 package.json
View
@@ -1,3 +1,6 @@
.DS_Store
.idea
BrowserStackLocal*
node_modules
site/bundle*
server/test/bin
site/bundle*
View
@@ -1,4 +1,5 @@
var React = require('react'),
Falcor = require('falcor'),
model = require('./model.js');
class NamesList extends React.Component {
@@ -12,7 +13,7 @@ class NamesList extends React.Component {
}
render() {
var names = Object.keys(this.state.names).map(idx => {
var names = Falcor.keys(this.state.names).map(idx => {
return <li key={idx}>{this.state.names[idx].name}</li>
})
return (
View
@@ -1,14 +1,11 @@
var webpackConfig = require('./webpack.config')
webpackConfig.module.loaders[0].query = {plugins: ['babel-plugin-rewire']}
webpackConfig.module.loaders[0].query.plugins = ['rewire']
module.exports = function (config) {
config.set({
basePath: '../',
browsers: ['PhantomJS'],
files: [
'node_modules/es5-shim/es5-shim.js', // only used by PhantomJS 1.x
'app/test/tests.bundle.js'
],
files: ['app/test/tests.bundle.js'],
frameworks: ['jasmine'],
plugins: [
require('karma-webpack'),
View
@@ -6,11 +6,14 @@ module.exports = {
module: {
loaders: [
{
test: /\.js/,
loader: 'babel',
exclude: /node_modules/
test: /\.js/,
loader: 'babel',
exclude: /node_modules/,
query: {
presets: ['es2015', 'react']
}
}
]
},
devtool: 'source-map'
}
}
View
@@ -6,34 +6,38 @@
"author": "",
"license": "MIT",
"dependencies": {
"body-parser": "1.14.1",
"express": "4.13.3",
"falcor": "0.1.13",
"body-parser": "1.15.0",
"express": "4.13.4",
"falcor": "0.1.16",
"falcor-express": "0.1.2",
"falcor-http-datasource": "0.1.2",
"falcor-router": "0.2.9",
"react": "0.14.0",
"react-dom": "0.14.0"
"falcor-http-datasource": "0.1.3",
"falcor-router": "0.2.12",
"react": "0.14.7",
"react-dom": "0.14.7"
},
"devDependencies": {
"babel-loader": "5.3.2",
"babel-plugin-rewire": "0.1.22",
"es5-shim": "4.2.0",
"jasmine": "2.3.2",
"karma": "0.13.11",
"karma-jasmine": "0.3.6",
"karma-phantomjs-launcher": "0.2.1",
"karma-spec-reporter": "0.0.20",
"babel-cli": "6.5.1",
"babel-core": "6.5.1",
"babel-loader": "6.2.2",
"babel-plugin-rewire": "1.0.0-beta-5",
"babel-preset-es2015": "6.5.0",
"babel-preset-react": "6.5.0",
"jasmine": "2.4.1",
"jasmine-core": "2.4.1",
"karma": "0.13.19",
"karma-jasmine": "0.3.7",
"karma-phantomjs-launcher": "1.0.0",
"karma-spec-reporter": "0.0.24",
"karma-webpack": "1.7.0",
"phantomjs": "1.9.18",
"rewire": "2.3.4",
"webdriverio": "3.2.6",
"webpack": "1.12.2"
"phantomjs-prebuilt": "2.1.4",
"rewire": "2.5.1",
"webdriverio": "4.0.3",
"webpack": "1.12.13"
},
"scripts": {
"server": "node --harmony server/server",
"setup-webdriver": "(mkdir server/test/bin; cd server/test/bin; curl -O http://selenium-release.storage.googleapis.com/2.47/selenium-server-standalone-2.47.0.jar server/test)",
"start-webdriver": "java -jar server/test/bin/selenium-server-standalone-2.47.0.jar",
"start": "node --harmony server/server",
"setup-webdriver": "(mkdir server/test/bin; cd server/test/bin; curl -O http://selenium-release.storage.googleapis.com/2.51/selenium-server-standalone-2.51.0.jar server/test)",
"start-webdriver": "java -jar server/test/bin/selenium-server-standalone-2.51.0.jar",
"test-client": "karma start config/karma.conf.js",
"test-integration": "node server/test/integration",
"test-server": "jasmine JASMINE_CONFIG_PATH=config/jasmine.json",

0 comments on commit ae683e3

Please sign in to comment.