Skip to content

Commit 67ef3f1

Browse files
committed
Revert Node 8 support workarounds
Revert "add ava-script to support old node" This reverts commit 1703add. Revert "use a custom script to call Rollup" This reverts commit c878398. Revert "detect the Rollup version based on Node version" This reverts commit f027f5b.
1 parent 93eeae2 commit 67ef3f1

File tree

5 files changed

+6
-46
lines changed

5 files changed

+6
-46
lines changed

package.json

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
"build:cjs": "tsc -p tsconfig.json",
1212
"build:es": "tsc -p tsconfig-esm.json",
1313
"postbuild": "npm run bundle",
14-
"bundle": "node ./scripts/rollup-script.js",
14+
"bundle": "rollup -c -f umd --file=bundle/worker.js --name=threads --silent -- dist-esm/worker/bundle-entry.js",
1515
"test": "npm run test:ava && npm run test:puppeteer:basic && npm run test:puppeteer:webpack",
16-
"test:ava": "cross-env TS_NODE_FILES=true node ./scripts/ava-script.js",
16+
"test:ava": "cross-env TS_NODE_FILES=true ava",
1717
"test:puppeteer:basic": "puppet-run --plugin=mocha --bundle=./test/workers/:workers/ --serve=./bundle/worker.js:/worker.js ./test/*.chromium*.ts",
1818
"test:puppeteer:webpack": "puppet-run --serve ./test/webpack/dist/app.web/0.worker.js --serve ./test/webpack/dist/app.web/1.worker.js --plugin=mocha ./test/webpack/webpack.chromium.mocha.ts",
1919
"posttest": "tslint --project .",
@@ -88,8 +88,6 @@
8888
"rollup": "^2.26.10",
8989
"@rollup/plugin-commonjs": "^15.0.0",
9090
"@rollup/plugin-node-resolve": "^9.0.0",
91-
"rollup-plugin-commonjs": "^10.1.0",
92-
"rollup-plugin-node-resolve": "^5.2.0",
9391
"threads-plugin": "^1.3.3",
9492
"tiny-worker": "^2.2.0",
9593
"ts-loader": "^8.0.3",

rollup.config.js

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,5 @@
1-
let commonjs, nodeResolve;
2-
if (parseFloat(process.version.match(/^v(\d+\.\d+)/)[1]) < 10) {
3-
commonjs = require("rollup-plugin-commonjs");
4-
nodeResolve = require("rollup-plugin-node-resolve");
5-
} else {
6-
commonjs = require("@rollup/plugin-commonjs");
7-
nodeResolve = require("@rollup/plugin-node-resolve").nodeResolve;
8-
}
1+
const commonjs = require("@rollup/plugin-commonjs")
2+
const { nodeResolve } = require("@rollup/plugin-node-resolve")
93

104
module.exports = {
115
plugins: [

scripts/ava-script.js

Lines changed: 0 additions & 9 deletions
This file was deleted.

scripts/rollup-script.js

Lines changed: 0 additions & 9 deletions
This file was deleted.

test/rollup/rollup.config.ts

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,6 @@
1-
/* tslint:disable */
2-
//@ts-ignore
3-
let commonjs, nodeResolve; //@ts-ignore
4-
//@ts-ignore
5-
if (parseFloat(process.version.match(/^v(\d+\.\d+)/)[1]) < 10) {
6-
//@ts-ignore
7-
commonjs = require("rollup-plugin-commonjs");
8-
//@ts-ignore
9-
nodeResolve = require("rollup-plugin-node-resolve");
10-
} else {
11-
//@ts-ignore
12-
commonjs = require("@rollup/plugin-commonjs");
13-
//@ts-ignore
14-
nodeResolve = require("@rollup/plugin-node-resolve").nodeResolve;
15-
}
1+
import commonjs from "@rollup/plugin-commonjs"
2+
import { nodeResolve } from "@rollup/plugin-node-resolve"
163

17-
//@ts-ignore
184
export default {
195
plugins: [
206
nodeResolve({

0 commit comments

Comments
 (0)