Skip to content

Commit 002b3e9

Browse files
committed
Added back absolute paths to [make subroutes in react-router work](react-webpack-generators/generator-react-webpack#228)
Updated package dev dependencies to latest stable (karma-coverage, karma-mocha) Updated karma.conf.js to set test env automatically, adjusted run port to match default webpack port (8000 instead 8080)
1 parent 41f94fd commit 002b3e9

5 files changed

Lines changed: 14 additions & 5 deletions

File tree

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
# react-webpack-template - Changelog
22

3+
## 1.6.2:
4+
5+
1. Added back absolute paths to [make subroutes in react-router work](https://github.com/newtriks/generator-react-webpack/issues/228)
6+
2. Updated package dev dependencies to latest stable (karma-coverage, karma-mocha)
7+
3. Updated karma.conf.js to set test env automatically, adjusted run port to match default webpack port (8000 instead 8080)
8+
39
## 1.6.1:
410

511
1. Updated eslint-plugin-react to 5.x

cfg/base.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ module.exports = {
1717
output: {
1818
path: path.join(__dirname, '/../dist/assets'),
1919
filename: 'app.js',
20-
publicPath: `.${defaultSettings.publicPath}`
20+
publicPath: defaultSettings.publicPath
2121
},
2222
devServer: {
2323
contentBase: './src/',

karma.conf.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,16 @@
11
var webpackCfg = require('./webpack.config');
22

3+
// Set node environment to testing
4+
process.env.NODE_ENV = 'test';
5+
36
module.exports = function(config) {
47
config.set({
58
basePath: '',
69
browsers: [ 'PhantomJS' ],
710
files: [
811
'test/loadtests.js'
912
],
10-
port: 8080,
13+
port: 8000,
1114
captureTimeout: 60000,
1215
frameworks: [ 'mocha', 'chai' ],
1316
client: {

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@
5454
"isparta-instrumenter-loader": "^1.0.0",
5555
"karma": "^0.13.9",
5656
"karma-chai": "^0.1.0",
57-
"karma-coverage": "^0.5.3",
58-
"karma-mocha": "^0.2.0",
57+
"karma-coverage": "^1.0.0",
58+
"karma-mocha": "^1.0.0",
5959
"karma-mocha-reporter": "^2.0.0",
6060
"karma-phantomjs-launcher": "^1.0.0",
6161
"karma-sourcemap-loader": "^0.3.5",

src/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@
1111
<div id="app">APPLICATION CONTENT</div>
1212

1313
<script>__REACT_DEVTOOLS_GLOBAL_HOOK__ = parent.__REACT_DEVTOOLS_GLOBAL_HOOK__</script>
14-
<script type="text/javascript" src="./assets/app.js"></script>
14+
<script type="text/javascript" src="/assets/app.js"></script>
1515
</body>
1616
</html>

0 commit comments

Comments
 (0)