Skip to content

Commit

Permalink
Merge c190c40 into 738a575
Browse files Browse the repository at this point in the history
  • Loading branch information
boneskull committed Sep 18, 2020
2 parents 738a575 + c190c40 commit f5f3d4c
Show file tree
Hide file tree
Showing 6 changed files with 189 additions and 31 deletions.
2 changes: 1 addition & 1 deletion .lintstagedrc.json
@@ -1,5 +1,5 @@
{
"@(**/*.js|bin/*)": ["eslint --fix"],
"@(**/*.js|bin/*|*.js)": ["eslint --fix"],
"!(package*).json": ["prettier --write"],
"*.{yml,md,html}": ["prettier --write"]
}
2 changes: 2 additions & 0 deletions browser-entry.js
Expand Up @@ -3,6 +3,8 @@
/* eslint no-unused-vars: off */
/* eslint-env commonjs */

require('regenerator-runtime/runtime');

/**
* Shim process.stdout.
*/
Expand Down
20 changes: 1 addition & 19 deletions karma.conf.js
Expand Up @@ -228,32 +228,14 @@ const addSauceTests = (cfg, sauceLabs) => {
const addStandardDependencies = cfg => ({
...cfg,
files: [
require.resolve('sinon/pkg/sinon.js'),
require.resolve('unexpected/unexpected'),
{
pattern: require.resolve('unexpected/unexpected.js.map'),
included: false
},
require.resolve('unexpected-sinon'),
require.resolve('unexpected-eventemitter/dist/unexpected-eventemitter.js'),
require.resolve('./test/browser-specific/setup'),
...cfg.files
],
rollup: {
...cfg.rollup,
external: [
'sinon',
'unexpected',
'unexpected-eventemitter',
'unexpected-sinon'
],
globals: {
sinon: 'sinon',
unexpected: 'weknowhow.expect',
'unexpected-sinon': 'weknowhow.unexpectedSinon',
'unexpected-eventemitter': 'unexpectedEventEmitter'
}
}
rollup: cfg.rollup
});

/**
Expand Down
175 changes: 172 additions & 3 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion package.json
Expand Up @@ -89,11 +89,12 @@
"assetgraph-builder": "^8.1.0",
"autoprefixer": "^9.8.6",
"babel-eslint": "^10.1.0",
"babel-plugin-polyfill-corejs3": "0.0.5",
"canvas": "^2.6.1",
"chai": "^4.2.0",
"coffee-script": "^1.12.7",
"configstore": "^5.0.1",
"core-js": "^3.6.5",
"core-js-pure": "^3.6.5",
"coveralls": "^3.1.0",
"cross-env": "^7.0.2",
"cross-spawn": "^7.0.3",
Expand Down Expand Up @@ -129,6 +130,7 @@
"nps": "^5.10.0",
"nyc": "^15.1.0",
"prettier": "^1.19.1",
"regenerator-runtime": "^0.13.7",
"remark": "^12.0.1",
"remark-github": "^9.0.1",
"remark-inline-links": "^4.0.0",
Expand Down
17 changes: 10 additions & 7 deletions rollup.config.js
Expand Up @@ -36,13 +36,16 @@ const config = {
[
'@babel/preset-env',
{
modules: false,
useBuiltIns: 'usage',
forceAllTransforms: true,
corejs: {
version: 3,
proposals: false
}
modules: false
}
]
],
plugins: [
[
'polyfill-corejs3',
{
method: 'usage-pure',
proposals: true
}
]
],
Expand Down

0 comments on commit f5f3d4c

Please sign in to comment.