Skip to content

Commit

Permalink
Update dependencies to fix support for Safari 10.1
Browse files Browse the repository at this point in the history
  • Loading branch information
developit committed Sep 5, 2019
1 parent c8eb11e commit 8cb35d7
Show file tree
Hide file tree
Showing 2 changed files with 35 additions and 19 deletions.
34 changes: 18 additions & 16 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,32 +31,34 @@
"eslint": "^4.16.0",
"eslint-config-developit": "^1.1.1",
"microbundle": "^0.11.0",
"webpack": "^4.14.0",
"workerize-loader": "^1.0.4"
"webpack": "^4.39.3",
"workerize-loader": "^1.1.0"
},
"dependencies": {
"@babel/core": "^7.4.3",
"@babel/plugin-proposal-object-rest-spread": "^7.4.3",
"@babel/core": "^7.5.5",
"@babel/plugin-proposal-object-rest-spread": "^7.5.5",
"@babel/plugin-transform-react-jsx": "^7.3.0",
"@babel/polyfill": "^7.4.3",
"@babel/preset-env": "^7.4.3",
"@babel/polyfill": "^7.4.4",
"@babel/preset-env": "^7.5.5",
"@babel/preset-stage-0": "^7.0.0",
"babel-loader": "^8.0.5",
"babel-plugin-istanbul": "^5.1.0",
"babel-loader": "^8.0.6",
"babel-plugin-istanbul": "^5.2.0",
"chalk": "^2.3.0",
"dlv": "^1.1.1",
"dlv": "^1.1.3",
"istanbul-instrumenter-loader": "^3.0.1",
"jasmine-core": "^3.3.0",
"karma": "^3.1.1",
"karma-chrome-launcher": "^2.2.0",
"karma-coverage": "^1.1.2",
"karma-firefox-launcher": "^1.1.0",
"karma": "^4.3.0",
"karma-chrome-launcher": "^3.1.0",
"karma-coverage": "^2.0.1",
"karma-firefox-launcher": "^1.2.0",
"karma-jasmine": "^2.0.1",
"karma-sauce-launcher": "^2.0.2",
"karma-sourcemap-loader": "^0.3.7",
"karma-spec-reporter": "0.0.32",
"karma-webpack": "^2.0.13",
"puppeteer": "^1.0.0",
"sade": "^1.3.1",
"karma-webpack": "^4.0.2",
"minimatch": "^3.0.4",
"puppeteer": "^1.19.0",
"sade": "^1.6.1",
"script-loader": "^0.7.2"
},
"peerDependencies": {
Expand Down
20 changes: 17 additions & 3 deletions src/configure.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import delve from 'dlv';
import { tryRequire, dedupe, cleanStack, readFile, readDir } from './lib/util';
import babelLoader from './lib/babel-loader';
import cssLoader from './lib/css-loader';
// import minimatch from 'minimatch';

const WEBPACK_VERSION = String(require('webpack').version || '3.0.0');
const WEBPACK_MAJOR = parseInt(WEBPACK_VERSION.split('.')[0], 10);
Expand Down Expand Up @@ -241,7 +242,15 @@ export default function configure(options) {
module: {
// @TODO check webpack version and use loaders VS rules as the key here appropriately:
rules: loaders.concat(
!getLoader( rule => `${rule.use},${rule.loader}`.match(/\bbabel-loader\b/) ) && babelLoader(options),
!getLoader( rule => `${rule.use},${rule.loader}`.match(/\bbabel-loader\b/) ) ? (
babelLoader(options)
) : false /*({
test: /\.[tj]sx?$/,
// include: files.map(f => minimatch.filter(f, { matchBase: true })),
exclude: /node_modules/,
enforce: 'pre',
loader: require.resolve('istanbul-instrumenter-loader')
})*/,
!getLoader('foo.css') && cssLoader(options)
).filter(Boolean)
},
Expand Down Expand Up @@ -269,11 +278,16 @@ export default function configure(options) {
let name = plugin && plugin.constructor.name;
return /^\s*(UglifyJS|HTML|ExtractText|BabelMinify)(.*Webpack)?Plugin\s*$/gi.test(name);
}),
node: webpackProp('node', {})
node: webpackProp('node', {}),
performance: {
hints: false
}
},

webpackMiddleware: {
noInfo: true
noInfo: true,
logLevel: 'error',
stats: 'errors-only'
},

colors: true,
Expand Down

0 comments on commit 8cb35d7

Please sign in to comment.