Skip to content

Commit 2db0659

Browse files
authored
Fixes #35 -- update npm req for Travis to v3+ (#36)
- updated .travis.yml to ensure npm3 for tests #35 - explicitly set various config files in strict mode to silence errors about unsupported keywords (let, const, ...) on Node 4
1 parent dd88e1d commit 2db0659

File tree

9 files changed

+17
-0
lines changed

9 files changed

+17
-0
lines changed

.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,5 @@ addons:
1212
- g++-4.8
1313
before_install:
1414
- currentfolder=${PWD##*/}
15+
- if [[ `npm -v` != 3* ]]; then npm i -g npm@3; fi
1516
- if [ "$currentfolder" != 'react-webpack-template' ]; then cd .. && eval "mv $currentfolder react-webpack-template" && cd react-webpack-template; fi

conf/webpack/Base.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
'use strict';
2+
13
/**
24
* Webpack configuration base class
35
*/

conf/webpack/Dev.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
'use strict';
2+
13
/**
24
* Default dev server configuration.
35
*/

conf/webpack/Dist.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
'use strict';
2+
13
/**
24
* Dist configuration. Used to build the
35
* final output when running npm run dist.

conf/webpack/Test.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
'use strict';
2+
13
/**
24
* Default test configuration.
35
*/

conf/webpack/index.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
'use strict';
2+
13
const dev = require('./Dev');
24
const dist = require('./Dist');
35
const test = require('./Test');

karma.conf.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
'use strict';
2+
13
const webpackCfg = require('./webpack.config')('test');
24

35
module.exports = function karmaConfig(config) {

test/loadtests.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
'use strict';
2+
13
// Add support for Promise objects via polyfills
24
import 'babel-polyfill';
35

webpack.config.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
'use strict';
2+
13
/* eslint no-console: "off" */
24
const webpackConfigs = require('./conf/webpack');
35
const defaultConfig = 'dev';

0 commit comments

Comments
 (0)