Compare commits

..

6 Commits

Author SHA1 Message Date
M Clark 3a5fa7c80f Webpack test.js uses resolve.root too
I realised I should make the change in the test config as well. 

And it seems to better if the test config inherits from baseConfig and defaultSettings where possible, so I did that. That way you are testing as close to your actual config as possible. Especially because there is one test of the config path.
2016-04-06 11:43:47 +08:00
M Clark a6d65df3df Add slash 2016-04-05 14:38:56 +08:00
M Clark 32959b5f20 Keep the alias for config
This alias is needed to load the config for the env and pass ConfigTest.js
2016-04-05 14:38:05 +08:00
M Clark ac8f7a36e0 resolve.alias should be resolve.root #28
As in #28
2016-04-05 14:30:27 +08:00
Chris da0e6a06e8 1.5.3 2016-03-31 10:22:53 +02:00
Chris c0e5461e03 Added missing loaders to default config (now supports svg and mp4/ogg file types) 2016-03-31 10:22:43 +02:00
5 changed files with 23 additions and 17 deletions
+1
View File
@@ -4,6 +4,7 @@
1. Asset paths are now relative (makes it easier to use bundles in subdirectories)
2. Removed loading problems for webpack configurations overriding (see https://github.com/newtriks/generator-react-webpack/issues/194)
3. Added missing loader configuration for movies and svg file types
## 1.5.2:
+11 -5
View File
@@ -29,12 +29,18 @@ module.exports = {
},
resolve: {
extensions: ['', '.js', '.jsx'],
root: [
`${defaultSettings.srcPath}/actions`,
`${defaultSettings.srcPath}/components`,
`${defaultSettings.srcPath}/dispatchers`,
`${defaultSettings.srcPath}/sources`,
`${defaultSettings.srcPath}/stores`,
`${defaultSettings.srcPath}/styles`,
`${defaultSettings.srcPath}/helpers`,
`${defaultSettings.srcPath}/data`,
`${defaultSettings.srcPath}`
],
alias: {
actions: `${defaultSettings.srcPath}/actions/`,
components: `${defaultSettings.srcPath}/components/`,
sources: `${defaultSettings.srcPath}/sources/`,
stores: `${defaultSettings.srcPath}/stores/`,
styles: `${defaultSettings.srcPath}/styles/`,
config: `${defaultSettings.srcPath}/config/` + process.env.REACT_WEBPACK_ENV
}
},
+4
View File
@@ -47,6 +47,10 @@ function getDefaultModules() {
{
test: /\.(png|jpg|gif|woff|woff2)$/,
loader: 'url-loader?limit=8192'
},
{
test: /\.(mp4|ogg|svg)$/,
loader: 'file-loader'
}
]
};
+6 -11
View File
@@ -1,8 +1,7 @@
'use strict';
let path = require('path');
let srcPath = path.join(__dirname, '/../src/');
let defaultSettings = require('./defaults');
let baseConfig = require('./base');
// Add needed plugins here
@@ -40,15 +39,11 @@ module.exports = {
},
resolve: {
extensions: [ '', '.js', '.jsx' ],
alias: {
actions: srcPath + 'actions/',
helpers: path.join(__dirname, '/../test/helpers'),
components: srcPath + 'components/',
sources: srcPath + 'sources/',
stores: srcPath + 'stores/',
styles: srcPath + 'styles/',
config: srcPath + 'config/' + process.env.REACT_WEBPACK_ENV
}
root: [].concat(
baseConfig.resolve.root,
[`${defaultSettings.srcPath}/test`]
),
alias: baseConfig.resolve.alias
},
plugins: [
new BowerWebpackPlugin({
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "react-webpack-template",
"version": "1.5.2",
"version": "1.5.3",
"description": "A base skeleton template for react and webpack without task runners",
"main": "server.js",
"scripts": {