From 8ace51941c8151b3ca1a072d6ac0c076c54b6454 Mon Sep 17 00:00:00 2001 From: Andy Boughton Date: Mon, 28 Feb 2022 14:30:50 -0500 Subject: [PATCH 1/2] Use newest Lz.js 0.14.0-beta.4 to test improved resize behaviors --- README.md | 4 ++-- package-lock.json | 23 +++++++---------------- package.json | 4 ++-- 3 files changed, 11 insertions(+), 20 deletions(-) diff --git a/README.md b/README.md index b5b3ae1..f5ad12e 100644 --- a/README.md +++ b/README.md @@ -17,11 +17,11 @@ For production deployment instructions, see [docs/deploy/index.md](docs/deploy/i - In one tab, build assets (in local development, this is currently done on the host system, outside of Docker): -`$ yarn run prod` +`$ npm run prod` or with live rebuilding, if you intend to be changing JS code as you work: -`$ yarn run dev` +`$ npm run dev` - In a second open terminal:: diff --git a/package-lock.json b/package-lock.json index 190e2dc..ebcaafc 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4309,13 +4309,13 @@ } }, "localzoom": { - "version": "git+https://github.com/statgen/localzoom.git#e6df08d71dba983b301d663d36ad915df43b51c2", - "from": "git+https://github.com/statgen/localzoom.git#e6df08d", + "version": "git+https://github.com/statgen/localzoom.git#eb105242597d5a039bb473df3fb059c2c37b05d2", + "from": "git+https://github.com/statgen/localzoom.git#eb10524", "requires": { "@sentry/browser": "^4.5.2", "bootstrap": "^4.4.1", "bootstrap-vue": "^2.21.2", - "locuszoom": "git+https://github.com/statgen/locuszoom.git#33316cd", + "locuszoom": "git+https://github.com/statgen/locuszoom.git#674d25c", "lodash": "^4.17.11", "tabulator-tables": "^4.9.3", "vue": "^2.6.14", @@ -4333,14 +4333,14 @@ } }, "locuszoom": { - "version": "git+https://github.com/statgen/locuszoom.git#33316cde4b0270aa7b8c027a68b8f65b1bd843f5", - "from": "git+https://github.com/statgen/locuszoom.git#33316cd", + "version": "git+https://github.com/statgen/locuszoom.git#674d25cc7fb338ff6c2b378e538e6de2b0ec5a8a", + "from": "git+https://github.com/statgen/locuszoom.git#674d25c", "requires": { + "@hapi/topo": "^5.1.0", "d3": "^5.16.0", "gwas-credible-sets": "^0.1.0", "just-clone": "^3.2.1", - "tabix-reader": "^1.0.1", - "undercomplicate": "^0.1.1" + "tabix-reader": "^1.0.1" } }, "lodash": { @@ -6610,15 +6610,6 @@ "mime-types": "~2.1.24" } }, - "undercomplicate": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/undercomplicate/-/undercomplicate-0.1.1.tgz", - "integrity": "sha512-F/rOQ2x3YgH5YcEU+xUKxbv1GGF1znTrBi7MRvqtcDgwubNQ/HGLZbgZh2mHpX0z9AM0T2Pg3zqPwKWYK+VJhQ==", - "requires": { - "@hapi/topo": "^5.1.0", - "just-clone": "^3.2.1" - } - }, "unicode-canonical-property-names-ecmascript": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz", diff --git a/package.json b/package.json index d898e54..ae3170e 100644 --- a/package.json +++ b/package.json @@ -31,8 +31,8 @@ "d3": "^5.16.0", "d3-tip": "0.9.1", "gwas-credible-sets": "^0.1.0", - "localzoom": "git+https://github.com/statgen/localzoom.git#e6df08d", - "locuszoom": "git+https://github.com/statgen/locuszoom.git#33316cd", + "localzoom": "git+https://github.com/statgen/localzoom.git#eb10524", + "locuszoom": "git+https://github.com/statgen/locuszoom.git#674d25c", "lodash": "^4.17.21", "pako": "^1.0.11", "tabulator-tables": "^4.9.3", From 9d46a6b4427b255be7f668a049acf9d02b622563 Mon Sep 17 00:00:00 2001 From: Andy Boughton Date: Mon, 28 Feb 2022 14:33:06 -0500 Subject: [PATCH 2/2] Update pinned dependencies --- package-lock.json | 34 ++++++++++++++++++++++++++++------ 1 file changed, 28 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index ebcaafc..6fc1bfe 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4541,9 +4541,9 @@ "dev": true }, "nanoid": { - "version": "3.1.30", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.30.tgz", - "integrity": "sha512-zJpuPDwOv8D2zq2WRoMe1HsfZthVewpel9CAvTfc/2mBD1uUT/agc5f7GHGWXlYkFvi1mVxe4IjvP2HNrop7nQ==", + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.1.tgz", + "integrity": "sha512-n6Vs/3KGyxPQd6uO0eH4Bv0ojGSUvuLlIHtC3Y0kEO23YRge8H9x1GCzLn28YX0H66pMkxuaeESFq4tKISKwdw==", "dev": true }, "natural-compare": { @@ -4569,9 +4569,12 @@ "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==" }, "node-fetch": { - "version": "2.6.1", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz", - "integrity": "sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==" + "version": "2.6.7", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz", + "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==", + "requires": { + "whatwg-url": "^5.0.0" + } }, "node-gyp": { "version": "3.8.0", @@ -6544,6 +6547,11 @@ "punycode": "^2.1.1" } }, + "tr46": { + "version": "0.0.3", + "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", + "integrity": "sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o=" + }, "trim-newlines": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz", @@ -6806,6 +6814,11 @@ "graceful-fs": "^4.1.2" } }, + "webidl-conversions": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", + "integrity": "sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE=" + }, "webpack": { "version": "5.65.0", "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.65.0.tgz", @@ -6934,6 +6947,15 @@ "integrity": "sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g==", "dev": true }, + "whatwg-url": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", + "integrity": "sha1-lmRU6HZUYuN2RNNib2dCzotwll0=", + "requires": { + "tr46": "~0.0.3", + "webidl-conversions": "^3.0.0" + } + }, "which": { "version": "1.3.1", "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",