From e099d8c83985b36dde68f751be0085d24dc7e49e Mon Sep 17 00:00:00 2001 From: Rich Harris Date: Mon, 10 Jul 2017 19:43:24 -0400 Subject: [PATCH] remove weak from optionalDependencies --- package-lock.json | 24 +----------------------- package.json | 5 +---- test/leak/test.js | 18 +++++++++++++++--- 3 files changed, 17 insertions(+), 30 deletions(-) diff --git a/package-lock.json b/package-lock.json index 774577ac0e7..caecdc66d2f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "rollup", - "version": "0.43.0", + "version": "0.45.0", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -215,12 +215,6 @@ "integrity": "sha1-5tXqjF2tABMEpwsiY4RH9pyy+Ak=", "dev": true }, - "bindings": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.2.1.tgz", - "integrity": "sha1-FK1hE4EtLTfXLme0ystLtyZQXxE=", - "optional": true - }, "bl": { "version": "0.9.5", "resolved": "https://registry.npmjs.org/bl/-/bl-0.9.5.tgz", @@ -2263,12 +2257,6 @@ "integrity": "sha1-j7+rsKmKJT0xhDMfno3rc3L6xsA=", "dev": true }, - "nan": { - "version": "2.6.2", - "resolved": "https://registry.npmjs.org/nan/-/nan-2.6.2.tgz", - "integrity": "sha1-5P805slf37WuzAjeZZb0NgWn20U=", - "optional": true - }, "natural-compare": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", @@ -3381,16 +3369,6 @@ "integrity": "sha1-4xbVJXtAuGu0PLjV/qXX9U1rDKE=", "dev": true }, - "weak": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/weak/-/weak-1.0.1.tgz", - "integrity": "sha1-q5mqswcGlZqgIAy4z1RbucszuZ4=", - "optional": true, - "requires": { - "bindings": "1.2.1", - "nan": "2.6.2" - } - }, "which": { "version": "1.2.14", "resolved": "https://registry.npmjs.org/which/-/which-1.2.14.tgz", diff --git a/package.json b/package.json index 7c751e35f9a..bb719daaa3d 100644 --- a/package.json +++ b/package.json @@ -79,8 +79,5 @@ "dist", "bin/rollup", "README.md" - ], - "optionalDependencies": { - "weak": "^1.0.1" - } + ] } diff --git a/test/leak/test.js b/test/leak/test.js index 97995b56831..6b366f7228d 100644 --- a/test/leak/test.js +++ b/test/leak/test.js @@ -1,8 +1,8 @@ var path = require('path') var rollup = require('../..') -try { - var weak = require('weak') +function test() { + var weak = require('weak'); var shouldCollect = false; var isCollected = false; @@ -36,6 +36,18 @@ try { console.error(err.message); process.exit(1); }); +} + +try { + require.resolve('weak'); + test(); } catch (err) { - console.log(`skipping memory leak test`); + console.log('installing weak'); + require('child_process').exec('npm i --no-save --silent weak@1.0.1', function (err, stdout, stderr) { + if (err) { + console.log('failed to install weak'); + } else { + test(); + } + }); } \ No newline at end of file