Update to React 0.12.2

This commit is contained in:
andrewliebchen
2015-01-06 21:43:19 -08:00
parent a8a6f6b462
commit 83454b5886
11 changed files with 26 additions and 42 deletions
+9 -9
View File
@@ -10,15 +10,15 @@
"mainInput": "<% if (reactRouter) { %>main<% } else { %><%= scriptAppName %><% } %>",
"mainOutput": "main",
"dependencies": {<% if (reactRouter) { %>
"react-router": "^0.7.0",<% } %>
"react": "~0.11.2"
"react-router": "^0.11.6",<% } %>
"react": "~0.12.2"
},
"devDependencies": {
"grunt": "~0.4.5",
"load-grunt-tasks": "~0.6.0",
"grunt-contrib-connect": "~0.8.0",
"webpack": "~1.4.3",
"jsx-loader": "~0.11.0",
"jsx-loader": "~0.12.2",
"grunt-webpack": "~1.0.8",
"style-loader": "~0.8.0",
"url-loader": "~0.5.5",
@@ -35,12 +35,12 @@
"grunt-open": "~0.2.3",
"jshint-loader": "~0.8.0",
"grunt-contrib-copy": "~0.5.0",<% if (es6) { %>
"6to5": "^1.10.10",
"6to5-loader": "^0.2.3",<% } %>
"6to5": "^2.7.1",
"6to5-loader": "^1.0.0",<% } %>
"grunt-contrib-clean": "~0.6.0",<% if (stylesLanguage === 'sass') { %>
"sass-loader": "^0.2.0",<% } %><% if (stylesLanguage === 'less') { %>
"less-loader": "^0.7.7",<% } %><% if (stylesLanguage === 'stylus') { %>
"stylus-loader": "^0.4.0",<% } %>
"react-hot-loader": "^0.4.5"
"sass-loader": "^0.3.1",<% } %><% if (stylesLanguage === 'less') { %>
"less-loader": "^2.0.0",<% } %><% if (stylesLanguage === 'stylus') { %>
"stylus-loader": "^0.5.0",<% } %>
"react-hot-loader": "^1.0.7"
}
}
+3 -3
View File
@@ -19,7 +19,7 @@ module.exports = {
devtool: false,
entry: [
'webpack/hot/only-dev-server',
'./src/scripts/components/<% if (reactRouter) { %>main<% } else { %><%= scriptAppName %><% } %>.jsx'
'./src/scripts/components/<% if (reactRouter) { %>main<% } else { %><%= scriptAppName %><% } %>.js'
],
stats: {
@@ -28,7 +28,7 @@ module.exports = {
},
resolve: {
extensions: ['', '.js', '.jsx']
extensions: ['', '.js']
},
module: {
preLoaders: [{
@@ -37,7 +37,7 @@ module.exports = {
loader: 'jshint'
}],
loaders: [{
test: /\.jsx$/,
test: /\.js$/,
loader: 'react-hot!<% if (es6) { %>6to5!<% }%>jsx-loader?harmony'
},<% if (stylesLanguage === 'sass') { %> {
test: /\.sass/,
+3 -3
View File
@@ -18,7 +18,7 @@ module.exports = {
debug: false,
devtool: false,
entry: './src/scripts/components/<% if (reactRouter) { %>main<% } else { %><%= scriptAppName %><% } %>.jsx',
entry: './src/scripts/components/<% if (reactRouter) { %>main<% } else { %><%= scriptAppName %><% } %>.js',
stats: {
colors: true,
@@ -33,7 +33,7 @@ module.exports = {
],
resolve: {
extensions: ['', '.js', '.jsx']
extensions: ['', '.js']
},
module: {
@@ -44,7 +44,7 @@ module.exports = {
}],
loaders: [{
test: /\.jsx$/,
test: /\.js$/,
loader: '<% if (es6) { %>6to5!<% }%>jsx-loader?harmony'
}, {
test: /\.css$/,
+1 -1
View File
@@ -27,7 +27,7 @@ module.exports = function (config) {
test: /\.png/,
loader: 'url-loader?limit=10000&mimetype=image/png'
}, {
test: /\.jsx$/,
test: /\.js$/,
loader: '<% if (es6) { %>6to5!<% }%>jsx-loader'
}]
}