From eceb3c6a28d52a3820c4ea5442385c7630c2a966 Mon Sep 17 00:00:00 2001 From: Ignat Shining Date: Sat, 6 Feb 2016 23:39:16 +0300 Subject: [PATCH 1/2] PhantomJS Promise support --- karma.conf.js | 1 + package.json | 1 + 2 files changed, 2 insertions(+) diff --git a/karma.conf.js b/karma.conf.js index 4ef657b..0b1c903 100644 --- a/karma.conf.js +++ b/karma.conf.js @@ -5,6 +5,7 @@ module.exports = function(config) { basePath: '', browsers: [ 'PhantomJS' ], files: [ + 'node_modules/babel-polyfill/dist/polyfill.js', 'test/loadtests.js' ], port: 8080, diff --git a/package.json b/package.json index dc71508..82e087f 100644 --- a/package.json +++ b/package.json @@ -39,6 +39,7 @@ "babel-core": "^6.0.0", "babel-eslint": "^5.0.0-beta4", "babel-loader": "^6.0.0", + "babel-polyfill": "^6.3.14", "babel-preset-es2015": "^6.0.15", "babel-preset-react": "^6.0.15", "bower-webpack-plugin": "^0.1.9", From de2e4bb5eb2f8b3b1890aabdb81e3e3e07503182 Mon Sep 17 00:00:00 2001 From: Ignat Shining Date: Mon, 8 Feb 2016 10:15:28 +0300 Subject: [PATCH 2/2] Move babel-polyfill to loadtests.js --- README.md | 1 + karma.conf.js | 1 - test/loadtests.js | 1 + 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 0fa1115..4d2ea19 100644 --- a/README.md +++ b/README.md @@ -109,3 +109,4 @@ react-webpack-template is available under MIT-License and can therefore be used - Martin Jul (martin@mjul.com) - Stephan Herzog (sthzgvie@gmail.com) - Kashif Iqbal Khan +- Ignat Shining (mail@igonato.com) diff --git a/karma.conf.js b/karma.conf.js index 0b1c903..4ef657b 100644 --- a/karma.conf.js +++ b/karma.conf.js @@ -5,7 +5,6 @@ module.exports = function(config) { basePath: '', browsers: [ 'PhantomJS' ], files: [ - 'node_modules/babel-polyfill/dist/polyfill.js', 'test/loadtests.js' ], port: 8080, diff --git a/test/loadtests.js b/test/loadtests.js index 416bc13..6e80a96 100644 --- a/test/loadtests.js +++ b/test/loadtests.js @@ -1,5 +1,6 @@ 'use strict'; +require('babel-polyfill'); require('core-js/fn/object/assign'); // Add support for all files in the test directory