Skip to content

Commit

Permalink
refactor(babel-polyfill): remove it
Browse files Browse the repository at this point in the history
  • Loading branch information
levithomason committed May 2, 2016
1 parent cc7666f commit 163f376
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 5 deletions.
10 changes: 8 additions & 2 deletions build/karma.conf.babel.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,16 @@ module.exports = (karmaConfig) => {
singleRun: !argv.watch,
reporters: ['mocha'],
files: [
require.resolve('babel-polyfill/browser'),
'./test/tests.bundle.js',
],
frameworks: ['mocha'],
frameworks: [
'phantomjs-shim',
'mocha',
],
phantomjsLauncher: {
// exit on ResourceError, useful if karma exits without killing phantom
exitOnResourceError: true,
},
preprocessors: {
'**/*.bundle.js': ['webpack'],
},
Expand Down
2 changes: 0 additions & 2 deletions build/webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ const webpackHotMiddlewareEntry = 'webpack-hot-middleware/client?' + _.map({
}, (val, key) => `&${key}=${val}`).join('')

const APP_ENTRY = [
require.resolve('babel-polyfill'),
paths.docsSrc('DocsApp.js'),
]

Expand All @@ -45,7 +44,6 @@ webpackConfig.entry = {
: [...APP_ENTRY],
vendor: [
webpackHotMiddlewareEntry,
'babel-polyfill',
...config.compiler_vendor,
],
}
Expand Down
2 changes: 1 addition & 1 deletion circle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ general:

machine:
node:
version: 5
version: 6

dependencies:
pre:
Expand Down
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@
"karma-mocha": "^0.2.2",
"karma-mocha-reporter": "^2.0.0",
"karma-phantomjs-launcher": "^1.0.0",
"karma-phantomjs-shim": "github:technologyadvice/karma-phantomjs-shim",
"karma-webpack-with-fast-source-maps": "^1.9.2",
"mocha": "^2.3.3",
"mocha-loader": "^0.7.1",
Expand Down

0 comments on commit 163f376

Please sign in to comment.