From 173a504fe305c02db7f4dc0f62aaaddc047c16bf Mon Sep 17 00:00:00 2001 From: David Welling Date: Fri, 29 May 2020 15:21:43 -0400 Subject: [PATCH 1/2] fix esm/mocha bug with cleanup --- package-lock.json | 9 ++------- package.json | 2 +- src/flush-microtasks.js | 2 +- 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/package-lock.json b/package-lock.json index f3329915..c95db1a7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8077,7 +8077,6 @@ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz", "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", "dev": true, - "optional": true, "requires": { "@types/color-name": "^1.1.1", "color-convert": "^2.0.1" @@ -8087,15 +8086,13 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz", "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==", - "dev": true, - "optional": true + "dev": true }, "color-convert": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", "dev": true, - "optional": true, "requires": { "color-name": "~1.1.4" } @@ -8104,15 +8101,13 @@ "version": "1.1.4", "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true, - "optional": true + "dev": true }, "slice-ansi": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-3.0.0.tgz", "integrity": "sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==", "dev": true, - "optional": true, "requires": { "ansi-styles": "^4.0.0", "astral-regex": "^2.0.0", diff --git a/package.json b/package.json index 783f6a49..aba29e4f 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "@testing-library/react-hooks", + "name": "@sstdev/react-hooks", "version": "3.2.1", "description": "Simple and complete React hooks testing utilities that encourage good testing practices.", "main": "lib/index.js", diff --git a/src/flush-microtasks.js b/src/flush-microtasks.js index 05efcd73..0869dfef 100644 --- a/src/flush-microtasks.js +++ b/src/flush-microtasks.js @@ -16,7 +16,7 @@ try { const nodeRequire = module && module[requireString] // assuming we're in node, let's try to get node's // version of setImmediate, bypassing fake timers if any. - enqueueTask = nodeRequire('timers').setImmediate + enqueueTask = nodeRequire.call(module, 'timers').setImmediate } catch (_err) { // we're in a browser // we can't use regular timers because they may still be faked From 8e400d6fb3edb9361dff7ddd0d5ed31dfb5ede5c Mon Sep 17 00:00:00 2001 From: David Welling Date: Mon, 1 Jun 2020 12:01:27 -0400 Subject: [PATCH 2/2] #375 - branch for PR --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index aba29e4f..783f6a49 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "@sstdev/react-hooks", + "name": "@testing-library/react-hooks", "version": "3.2.1", "description": "Simple and complete React hooks testing utilities that encourage good testing practices.", "main": "lib/index.js",