Skip to content

Commit

Permalink
Fixes #35 -- update npm req for Travis to v3+ (#36)
Browse files Browse the repository at this point in the history
- 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
  • Loading branch information
sthzg authored Jul 11, 2016
1 parent dd88e1d commit 2db0659
Show file tree
Hide file tree
Showing 9 changed files with 17 additions and 0 deletions.
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,5 @@ addons:
- g++-4.8
before_install:
- currentfolder=${PWD##*/}
- if [[ `npm -v` != 3* ]]; then npm i -g npm@3; fi
- if [ "$currentfolder" != 'react-webpack-template' ]; then cd .. && eval "mv $currentfolder react-webpack-template" && cd react-webpack-template; fi
2 changes: 2 additions & 0 deletions conf/webpack/Base.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
'use strict';

/**
* Webpack configuration base class
*/
Expand Down
2 changes: 2 additions & 0 deletions conf/webpack/Dev.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
'use strict';

/**
* Default dev server configuration.
*/
Expand Down
2 changes: 2 additions & 0 deletions conf/webpack/Dist.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
'use strict';

/**
* Dist configuration. Used to build the
* final output when running npm run dist.
Expand Down
2 changes: 2 additions & 0 deletions conf/webpack/Test.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
'use strict';

/**
* Default test configuration.
*/
Expand Down
2 changes: 2 additions & 0 deletions conf/webpack/index.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
'use strict';

const dev = require('./Dev');
const dist = require('./Dist');
const test = require('./Test');
Expand Down
2 changes: 2 additions & 0 deletions karma.conf.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
'use strict';

const webpackCfg = require('./webpack.config')('test');

module.exports = function karmaConfig(config) {
Expand Down
2 changes: 2 additions & 0 deletions test/loadtests.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
'use strict';

// Add support for Promise objects via polyfills
import 'babel-polyfill';

Expand Down
2 changes: 2 additions & 0 deletions webpack.config.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
'use strict';

/* eslint no-console: "off" */
const webpackConfigs = require('./conf/webpack');
const defaultConfig = 'dev';
Expand Down

0 comments on commit 2db0659

Please sign in to comment.