From fb631742af2bd71985dd89a1547f34bf01d1b534 Mon Sep 17 00:00:00 2001 From: Liam DeBeasi Date: Fri, 26 Feb 2021 14:26:06 -0500 Subject: [PATCH] chore(): run build --- core/package-lock.json | 35 +++++++++++++++++++++++++---------- 1 file changed, 25 insertions(+), 10 deletions(-) diff --git a/core/package-lock.json b/core/package-lock.json index ee71247807..af09a28e5f 100644 --- a/core/package-lock.json +++ b/core/package-lock.json @@ -1013,17 +1013,12 @@ "integrity": "sha512-5O7H5c/7YlojphYNrK02LlDIV2GNPYisKwHm2QTKjNZeEzezCbwYs9swJySv2UfPMyZ0VdsmMv7jIlD/IKYQpQ==", "dev": true, "dependencies": { -<<<<<<< HEAD - "@jest/console": "^26.6.2", - "@jest/types": "^26.6.2", - "@types/istanbul-lib-coverage": "^2.0.0", - "collect-v8-coverage": "^1.0.0" -======= "@bcoe/v8-coverage": "^0.2.3", - "@jest/console": "^26.3.0", + "@jest/console": "^26.6.2", "@jest/test-result": "^26.3.0", "@jest/transform": "^26.3.0", - "@jest/types": "^26.3.0", + "@jest/types": "^26.6.2", + "@types/istanbul-lib-coverage": "^2.0.0", "chalk": "^4.0.0", "collect-v8-coverage": "^1.0.0", "exit": "^0.1.2", @@ -1043,7 +1038,6 @@ "string-length": "^4.0.1", "terminal-link": "^2.0.0", "v8-to-istanbul": "^5.0.1" ->>>>>>> 594be7db7... fix(vue): account for event name changes in vue 3.0.6+ (#22980) }, "engines": { "node": ">= 10.14.2" @@ -14616,10 +14610,31 @@ "integrity": "sha512-5O7H5c/7YlojphYNrK02LlDIV2GNPYisKwHm2QTKjNZeEzezCbwYs9swJySv2UfPMyZ0VdsmMv7jIlD/IKYQpQ==", "dev": true, "requires": { + "@bcoe/v8-coverage": "^0.2.3", "@jest/console": "^26.6.2", + "@jest/test-result": "^26.3.0", + "@jest/transform": "^26.3.0", "@jest/types": "^26.6.2", "@types/istanbul-lib-coverage": "^2.0.0", - "collect-v8-coverage": "^1.0.0" + "chalk": "^4.0.0", + "collect-v8-coverage": "^1.0.0", + "exit": "^0.1.2", + "glob": "^7.1.2", + "graceful-fs": "^4.2.4", + "istanbul-lib-coverage": "^3.0.0", + "istanbul-lib-instrument": "^4.0.3", + "istanbul-lib-report": "^3.0.0", + "istanbul-lib-source-maps": "^4.0.0", + "istanbul-reports": "^3.0.2", + "jest-haste-map": "^26.3.0", + "jest-resolve": "^26.4.0", + "jest-util": "^26.3.0", + "jest-worker": "^26.3.0", + "slash": "^3.0.0", + "source-map": "^0.6.0", + "string-length": "^4.0.1", + "terminal-link": "^2.0.0", + "v8-to-istanbul": "^5.0.1" }, "dependencies": { "@jest/types": {