From e75342eaee992cba907449f66b6692150baa4b90 Mon Sep 17 00:00:00 2001 From: Chris Matzenbach Date: Thu, 13 Apr 2023 15:52:59 -0500 Subject: [PATCH 1/2] Metis version bump --- package-lock.json | 17 ++++++++++++----- package.json | 2 +- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index 34cf5985e..40f8aa012 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1615,11 +1615,10 @@ } }, "@heavyai/data-layer": { - "version": "npm:mapd-data-layer-2@0.0.25", - "resolved": "https://registry.npmjs.org/mapd-data-layer-2/-/mapd-data-layer-2-0.0.25.tgz", - "integrity": "sha512-KdLIOBdSO5RLAmo6DGOgFqB/nZdn93/zpPI3KuiwGCSFetQM2ng/Yc4hfD5ZZYFTb/5UFnUJkSrs+sx+JB4LLQ==", + "version": "git+https://github.com/heavyai/metis.git#6b552ff806df3e3160cafb16058e6a2c2656f575", + "from": "git+https://github.com/heavyai/metis.git#6b552ff", "requires": { - "invariant": "^2.2.2" + "flow-bin": "^0.55.0" } }, "@heavyai/draw": { @@ -7631,6 +7630,11 @@ "integrity": "sha512-dVsPA/UwQ8+2uoFe5GHtiBMu48dWLTdsuEd7CKGlZlD78r1TTWBvDuFaFGKCo/ZfEr95Uk56vZoX86OsHkUeIg==", "dev": true }, + "flow-bin": { + "version": "0.55.0", + "resolved": "https://registry.npmjs.org/flow-bin/-/flow-bin-0.55.0.tgz", + "integrity": "sha512-IW08TxhIAymsPFOpQhgJQwiP63nGnPGVUsPf4eU4Aediss6+RwKqW/y6qtzpXiPN5VK7kkOu8jfu8kt9aHs6wQ==" + }, "follow-redirects": { "version": "1.5.10", "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.10.tgz", @@ -9268,6 +9272,7 @@ "version": "2.2.4", "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz", "integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==", + "dev": true, "requires": { "loose-envify": "^1.0.0" } @@ -10010,7 +10015,8 @@ "js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", - "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==" + "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==", + "dev": true }, "js-yaml": { "version": "3.7.0", @@ -10558,6 +10564,7 @@ "version": "1.4.0", "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz", "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==", + "dev": true, "requires": { "js-tokens": "^3.0.0 || ^4.0.0" } diff --git a/package.json b/package.json index 96c519720..25a3cb2c7 100644 --- a/package.json +++ b/package.json @@ -53,7 +53,7 @@ "test:unit": "find ./src -name '*.spec.js' | BABEL_ENV=test NODE_PATH=./src xargs nyc mocha --opts ./test/mocha.unit.opts" }, "dependencies": { - "@heavyai/data-layer": "npm:mapd-data-layer-2@0.0.25", + "@heavyai/data-layer": "https://github.com/heavyai/metis.git#6b552ff", "@heavyai/draw": "https://github.com/heavyai/mapd-draw.git#fc0b065", "@mapbox/unitbezier": "0.0.0", "@mapd/connector": "github:omnisci/mapd-connector#d75148077a2a4b23d66d89c63d05c20e5735af2e", From b10a500257048630c5e38512951efb0f9a7f03b0 Mon Sep 17 00:00:00 2001 From: Chris Matzenbach Date: Fri, 14 Apr 2023 12:46:38 -0500 Subject: [PATCH 2/2] Use ssh link instead of https --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 40f8aa012..a7f40c908 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1615,8 +1615,8 @@ } }, "@heavyai/data-layer": { - "version": "git+https://github.com/heavyai/metis.git#6b552ff806df3e3160cafb16058e6a2c2656f575", - "from": "git+https://github.com/heavyai/metis.git#6b552ff", + "version": "git+ssh://git@github.com/heavyai/metis.git#6b552ff806df3e3160cafb16058e6a2c2656f575", + "from": "git+ssh://git@github.com/heavyai/metis.git#6b552ff", "requires": { "flow-bin": "^0.55.0" } diff --git a/package.json b/package.json index 25a3cb2c7..b9cf10cad 100644 --- a/package.json +++ b/package.json @@ -53,7 +53,7 @@ "test:unit": "find ./src -name '*.spec.js' | BABEL_ENV=test NODE_PATH=./src xargs nyc mocha --opts ./test/mocha.unit.opts" }, "dependencies": { - "@heavyai/data-layer": "https://github.com/heavyai/metis.git#6b552ff", + "@heavyai/data-layer": "git+ssh://git@github.com/heavyai/metis.git#6b552ff", "@heavyai/draw": "https://github.com/heavyai/mapd-draw.git#fc0b065", "@mapbox/unitbezier": "0.0.0", "@mapd/connector": "github:omnisci/mapd-connector#d75148077a2a4b23d66d89c63d05c20e5735af2e",