Skip to content

Commit

Permalink
chore: upgrade deps, es6ify doesn't work with latest socket.io anymore
Browse files Browse the repository at this point in the history
BREAKING CHANGE: drop IE support
  • Loading branch information
3cp committed Nov 2, 2021
1 parent cad1806 commit de56192
Show file tree
Hide file tree
Showing 8 changed files with 20 additions and 61 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
node_version: ['10', '12', '14']
node_version: ['12', '14', '16']
os: [ubuntu-latest, windows-latest, macOS-latest]

steps:
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -59,11 +59,11 @@ electron is the always available default.
| chromium-headless | Yes | Yes | Yes |
| firefox | Yes | Yes | Yes |
| firefox-headless | Yes | Yes | Yes |
| ie | | | Yes |
| edge | Yes | | Yes |
| edge-headless | Yes | | Yes |
| safari | Yes | | |

> browser-do v4+ dropped support of Microsoft IE. To work with IE, please use browser-do v3.
> browser-do v2+ only supports **Chromium based Microsoft Edge**. To work with old Microsoft Edge, please use browser-do v1.
## Usage
Expand All @@ -84,7 +84,7 @@ Options:
-h, --help output usage information
Available browsers if installed (for -b, --browser <name>):
electron (embedded, default choice), chrome, chrome-headless, chromium, chromium-headless, firefox, firefox-headless, ie, edge, edge-headless, safari
electron (embedded, default choice), chrome, chrome-headless, chromium, chromium-headless, firefox, firefox-headless, edge, edge-headless, safari
There is some tolerance on browser name, for example:
-b ChromeHeadless
Expand Down
7 changes: 4 additions & 3 deletions bin/browser-do.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ opts
.on('--help', function(){
console.log('');
console.log('Available browsers if installed (for -b, --browser <name>):');
console.log(' electron (embedded, default choice), chrome, chrome-headless, chromium, chromium-headless, firefox, firefox-headless, ie, edge, edge-headless, safari');
console.log(' electron (embedded, default choice), chrome, chrome-headless, chromium, chromium-headless, firefox, firefox-headless, edge, edge-headless, safari');
console.log('');
console.log('There is some tolerance on browser name, for example:');
console.log(' -b ChromeHeadless');
Expand All @@ -45,9 +45,10 @@ function onCoverage(result) {
'# then view coverage/lcov-report/index.html in a browser\n');
}

opts.onCoverage = onCoverage;
const options = opts.opts();
options.onCoverage = onCoverage;

const run = browserDo(opts);
const run = browserDo(options);
process.stdin
.pipe(run)
.pipe(process.stdout);
Expand Down
5 changes: 1 addition & 4 deletions build-reporter.js
Original file line number Diff line number Diff line change
@@ -1,15 +1,12 @@
const fs = require('fs');
const browserify = require('browserify');
const es6ify = require("es6ify");

try {
fs.mkdirSync('dist');
} catch (e) {
// ignore
}

browserify('reporter.js')
.add(es6ify.runtime)
.transform(es6ify)
browserify('reporter.js',)
.bundle()
.pipe(fs.createWriteStream('dist/reporter.js'));
3 changes: 0 additions & 3 deletions lib/browser-run.js
Original file line number Diff line number Diff line change
Expand Up @@ -93,9 +93,6 @@ function runner (opts, data, output) {

if (opts.mocha) {
res.write('<link rel="stylesheet" href="/mocha/mocha.css">');
if (browserName === 'ie') {
res.write('<script crossorigin="anonymous" src="https://polyfill.io/v3/polyfill.min.js?features=default"></script>');
}
}

res.write('</head><body>');
Expand Down
34 changes: 0 additions & 34 deletions lib/browsers/ie.js

This file was deleted.

25 changes: 12 additions & 13 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,28 +39,27 @@
},
"homepage": "https://github.com/3cp/browser-do#readme",
"devDependencies": {
"browserify": "^16.5.2",
"browserify": "^17.0.0",
"cat": "^0.2.0",
"chai": "^4.2.0",
"chai": "^4.3.4",
"concat-stream": "^2.0.0",
"es6ify": "^1.6.0",
"eslint": "^7.10.0",
"jasmine-core": "^3.6.0",
"mocha": "^8.1.3",
"socket.io-client": "^2.3.1",
"source-map-support": "^0.5.19",
"standard-changelog": "^2.0.24",
"tape": "^5.0.1"
"eslint": "^8.1.0",
"jasmine-core": "^3.10.1",
"mocha": "^9.1.3",
"socket.io-client": "^4.3.2",
"source-map-support": "^0.5.20",
"standard-changelog": "^2.0.27",
"tape": "^5.3.1"
},
"dependencies": {
"ansi-colors": "^4.1.1",
"commander": "^6.1.0",
"electron": "^10.1.3",
"commander": "^8.3.0",
"electron": "^15.3.0",
"finalhandler": "^1.1.2",
"lodash.kebabcase": "^4.1.1",
"serve-static": "^1.14.1",
"server-destroy": "^1.0.1",
"socket.io": "^2.3.0",
"socket.io": "^4.3.1",
"tmp": "^0.2.1",
"which": "^2.0.2"
}
Expand Down
1 change: 0 additions & 1 deletion test/e2e.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ const browsers = [
'chromium-headless',
'edge-headless',
'firefox-headless',
'ie',
'safari'
];

Expand Down

0 comments on commit de56192

Please sign in to comment.