From 1d876179239f5efb5ab3c3add126dee580445848 Mon Sep 17 00:00:00 2001 From: FND Date: Fri, 22 Feb 2019 15:18:00 +0100 Subject: [PATCH] discarded workaround for legacy Node no longer needed because we dropped support for Node v6 this effectively reverts c2ed8a46aa60e731f0fd204eb3a3f8732aa70252 --- package.json | 8 ++++---- pkg/faucet-pipeline-typescript/package.json | 2 +- test/unit/test_shim.js | 9 --------- test/unit/{_test_virtual.js => test_virtual.js} | 0 4 files changed, 5 insertions(+), 14 deletions(-) delete mode 100644 test/unit/test_shim.js rename test/unit/{_test_virtual.js => test_virtual.js} (100%) diff --git a/package.json b/package.json index 62a9058..e34063f 100644 --- a/package.json +++ b/package.json @@ -27,10 +27,10 @@ }, "dependencies": { "faucet-pipeline-core": "^1.2.0", - "rollup": "~1.2.1", + "rollup": "~1.2.2", "rollup-plugin-cleanup": "~3.1.1", "rollup-plugin-commonjs": "~9.2.0", - "rollup-plugin-node-resolve": "~4.0.0" + "rollup-plugin-node-resolve": "~4.0.1" }, "devDependencies": { "eslint-config-fnd-jsx": "^1.6.0", @@ -38,8 +38,8 @@ "faucet-pipeline-jsx": "file:pkg/faucet-pipeline-jsx", "faucet-pipeline-typescript": "file:pkg/faucet-pipeline-typescript", "faucet-pipeline-jsmin": "file:pkg/faucet-pipeline-jsmin", - "json-diff": "^0.5.3", - "mocha": "^5.2.0", + "json-diff": "^0.5.4", + "mocha": "^6.0.1", "npm-run-all": "^4.1.5", "release-util-fnd": "^1.1.1" } diff --git a/pkg/faucet-pipeline-typescript/package.json b/pkg/faucet-pipeline-typescript/package.json index 416a870..5d9cc50 100644 --- a/pkg/faucet-pipeline-typescript/package.json +++ b/pkg/faucet-pipeline-typescript/package.json @@ -18,6 +18,6 @@ "dependencies": { "faucet-pipeline-js": "2.0.0", "rollup-plugin-typescript2": "~0.19.2", - "typescript": "~3.3.3" + "typescript": "~3.3.3333" } } diff --git a/test/unit/test_shim.js b/test/unit/test_shim.js deleted file mode 100644 index 701d7cb..0000000 --- a/test/unit/test_shim.js +++ /dev/null @@ -1,9 +0,0 @@ -"use strict"; - -// skip tests using modern syntax on legacy versions of Node -// NB: this is a workaround until we can drop support for Node v6 -// -let major = process.version.split(".")[0].substr(1); -if(parseInt(major, 10) > 6) { - require("./_test_virtual"); -} diff --git a/test/unit/_test_virtual.js b/test/unit/test_virtual.js similarity index 100% rename from test/unit/_test_virtual.js rename to test/unit/test_virtual.js