mirror of
https://github.com/wassname/react-webpack-template.git
synced 2026-06-28 18:11:39 +08:00
Compare commits
6 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 3a5fa7c80f | |||
| a6d65df3df | |||
| 32959b5f20 | |||
| ac8f7a36e0 | |||
| da0e6a06e8 | |||
| c0e5461e03 |
@@ -4,6 +4,7 @@
|
|||||||
|
|
||||||
1. Asset paths are now relative (makes it easier to use bundles in subdirectories)
|
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)
|
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:
|
## 1.5.2:
|
||||||
|
|
||||||
|
|||||||
+11
-5
@@ -29,12 +29,18 @@ module.exports = {
|
|||||||
},
|
},
|
||||||
resolve: {
|
resolve: {
|
||||||
extensions: ['', '.js', '.jsx'],
|
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: {
|
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
|
config: `${defaultSettings.srcPath}/config/` + process.env.REACT_WEBPACK_ENV
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -47,6 +47,10 @@ function getDefaultModules() {
|
|||||||
{
|
{
|
||||||
test: /\.(png|jpg|gif|woff|woff2)$/,
|
test: /\.(png|jpg|gif|woff|woff2)$/,
|
||||||
loader: 'url-loader?limit=8192'
|
loader: 'url-loader?limit=8192'
|
||||||
|
},
|
||||||
|
{
|
||||||
|
test: /\.(mp4|ogg|svg)$/,
|
||||||
|
loader: 'file-loader'
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
};
|
};
|
||||||
|
|||||||
+6
-11
@@ -1,8 +1,7 @@
|
|||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
let path = require('path');
|
let path = require('path');
|
||||||
let srcPath = path.join(__dirname, '/../src/');
|
let defaultSettings = require('./defaults');
|
||||||
|
|
||||||
let baseConfig = require('./base');
|
let baseConfig = require('./base');
|
||||||
|
|
||||||
// Add needed plugins here
|
// Add needed plugins here
|
||||||
@@ -40,15 +39,11 @@ module.exports = {
|
|||||||
},
|
},
|
||||||
resolve: {
|
resolve: {
|
||||||
extensions: [ '', '.js', '.jsx' ],
|
extensions: [ '', '.js', '.jsx' ],
|
||||||
alias: {
|
root: [].concat(
|
||||||
actions: srcPath + 'actions/',
|
baseConfig.resolve.root,
|
||||||
helpers: path.join(__dirname, '/../test/helpers'),
|
[`${defaultSettings.srcPath}/test`]
|
||||||
components: srcPath + 'components/',
|
),
|
||||||
sources: srcPath + 'sources/',
|
alias: baseConfig.resolve.alias
|
||||||
stores: srcPath + 'stores/',
|
|
||||||
styles: srcPath + 'styles/',
|
|
||||||
config: srcPath + 'config/' + process.env.REACT_WEBPACK_ENV
|
|
||||||
}
|
|
||||||
},
|
},
|
||||||
plugins: [
|
plugins: [
|
||||||
new BowerWebpackPlugin({
|
new BowerWebpackPlugin({
|
||||||
|
|||||||
+1
-1
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "react-webpack-template",
|
"name": "react-webpack-template",
|
||||||
"version": "1.5.2",
|
"version": "1.5.3",
|
||||||
"description": "A base skeleton template for react and webpack without task runners",
|
"description": "A base skeleton template for react and webpack without task runners",
|
||||||
"main": "server.js",
|
"main": "server.js",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
|
|||||||
Reference in New Issue
Block a user