Skip to content

Commit 8cb35d7

Browse files
committed
Update dependencies to fix support for Safari 10.1
1 parent c8eb11e commit 8cb35d7

File tree

2 files changed

+35
-19
lines changed

2 files changed

+35
-19
lines changed

package.json

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -31,32 +31,34 @@
3131
"eslint": "^4.16.0",
3232
"eslint-config-developit": "^1.1.1",
3333
"microbundle": "^0.11.0",
34-
"webpack": "^4.14.0",
35-
"workerize-loader": "^1.0.4"
34+
"webpack": "^4.39.3",
35+
"workerize-loader": "^1.1.0"
3636
},
3737
"dependencies": {
38-
"@babel/core": "^7.4.3",
39-
"@babel/plugin-proposal-object-rest-spread": "^7.4.3",
38+
"@babel/core": "^7.5.5",
39+
"@babel/plugin-proposal-object-rest-spread": "^7.5.5",
4040
"@babel/plugin-transform-react-jsx": "^7.3.0",
41-
"@babel/polyfill": "^7.4.3",
42-
"@babel/preset-env": "^7.4.3",
41+
"@babel/polyfill": "^7.4.4",
42+
"@babel/preset-env": "^7.5.5",
4343
"@babel/preset-stage-0": "^7.0.0",
44-
"babel-loader": "^8.0.5",
45-
"babel-plugin-istanbul": "^5.1.0",
44+
"babel-loader": "^8.0.6",
45+
"babel-plugin-istanbul": "^5.2.0",
4646
"chalk": "^2.3.0",
47-
"dlv": "^1.1.1",
47+
"dlv": "^1.1.3",
48+
"istanbul-instrumenter-loader": "^3.0.1",
4849
"jasmine-core": "^3.3.0",
49-
"karma": "^3.1.1",
50-
"karma-chrome-launcher": "^2.2.0",
51-
"karma-coverage": "^1.1.2",
52-
"karma-firefox-launcher": "^1.1.0",
50+
"karma": "^4.3.0",
51+
"karma-chrome-launcher": "^3.1.0",
52+
"karma-coverage": "^2.0.1",
53+
"karma-firefox-launcher": "^1.2.0",
5354
"karma-jasmine": "^2.0.1",
5455
"karma-sauce-launcher": "^2.0.2",
5556
"karma-sourcemap-loader": "^0.3.7",
5657
"karma-spec-reporter": "0.0.32",
57-
"karma-webpack": "^2.0.13",
58-
"puppeteer": "^1.0.0",
59-
"sade": "^1.3.1",
58+
"karma-webpack": "^4.0.2",
59+
"minimatch": "^3.0.4",
60+
"puppeteer": "^1.19.0",
61+
"sade": "^1.6.1",
6062
"script-loader": "^0.7.2"
6163
},
6264
"peerDependencies": {

src/configure.js

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import delve from 'dlv';
55
import { tryRequire, dedupe, cleanStack, readFile, readDir } from './lib/util';
66
import babelLoader from './lib/babel-loader';
77
import cssLoader from './lib/css-loader';
8+
// import minimatch from 'minimatch';
89

910
const WEBPACK_VERSION = String(require('webpack').version || '3.0.0');
1011
const WEBPACK_MAJOR = parseInt(WEBPACK_VERSION.split('.')[0], 10);
@@ -241,7 +242,15 @@ export default function configure(options) {
241242
module: {
242243
// @TODO check webpack version and use loaders VS rules as the key here appropriately:
243244
rules: loaders.concat(
244-
!getLoader( rule => `${rule.use},${rule.loader}`.match(/\bbabel-loader\b/) ) && babelLoader(options),
245+
!getLoader( rule => `${rule.use},${rule.loader}`.match(/\bbabel-loader\b/) ) ? (
246+
babelLoader(options)
247+
) : false /*({
248+
test: /\.[tj]sx?$/,
249+
// include: files.map(f => minimatch.filter(f, { matchBase: true })),
250+
exclude: /node_modules/,
251+
enforce: 'pre',
252+
loader: require.resolve('istanbul-instrumenter-loader')
253+
})*/,
245254
!getLoader('foo.css') && cssLoader(options)
246255
).filter(Boolean)
247256
},
@@ -269,11 +278,16 @@ export default function configure(options) {
269278
let name = plugin && plugin.constructor.name;
270279
return /^\s*(UglifyJS|HTML|ExtractText|BabelMinify)(.*Webpack)?Plugin\s*$/gi.test(name);
271280
}),
272-
node: webpackProp('node', {})
281+
node: webpackProp('node', {}),
282+
performance: {
283+
hints: false
284+
}
273285
},
274286

275287
webpackMiddleware: {
276-
noInfo: true
288+
noInfo: true,
289+
logLevel: 'error',
290+
stats: 'errors-only'
277291
},
278292

279293
colors: true,

0 commit comments

Comments
 (0)