From 5a25b971c9b487a2b6cc928202c0cfb18cbfa43e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jesper=20H=C3=A5kansson?= Date: Sun, 5 Sep 2021 15:46:08 +0200 Subject: [PATCH 1/2] fix: Add exe to binary name if windows --- npm/binary.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/npm/binary.js b/npm/binary.js index 15a12a06..d66bf98c 100644 --- a/npm/binary.js +++ b/npm/binary.js @@ -1,13 +1,14 @@ const { Binary } = require("binary-install"); const os = require("os"); -const { join } = require("path"); + +const windows = "x86_64-pc-windows-msvc"; const getPlatform = () => { const type = os.type(); const arch = os.arch(); if (type === "Windows_NT" && arch === "x64") { - return "x86_64-pc-windows-msvc"; + return windows; } if (type === "Linux" && arch === "x64") { return "x86_64-unknown-linux-musl"; @@ -25,7 +26,7 @@ const getBinary = () => { const author = "rustwasm"; const name = "wasm-pack"; const url = `https://github.com/${author}/${name}/releases/download/v${version}/${name}-v${version}-${platform}.tar.gz`; - return new Binary(name, url ); + return new Binary(platform === windows ? "wasm-pack.exe" : "wasm-pack", url); }; const run = () => { @@ -46,5 +47,5 @@ const uninstall = () => { module.exports = { install, run, - uninstall + uninstall, }; From 6d81411605afcf6418b73866d77c32616e86d442 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jesper=20H=C3=A5kansson?= Date: Sun, 5 Sep 2021 15:47:58 +0200 Subject: [PATCH 2/2] chore: Update package-lock --- npm/package-lock.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/npm/package-lock.json b/npm/package-lock.json index 2bbf475a..e8372842 100644 --- a/npm/package-lock.json +++ b/npm/package-lock.json @@ -191,9 +191,9 @@ } }, "node_modules/tar": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.0.tgz", - "integrity": "sha512-DUCttfhsnLCjwoDoFcI+B2iJgYa93vBnDUATYEeRx6sntCTdN01VnqsIuTlALXla/LWooNg0yEGeB+Y8WdFxGA==", + "version": "6.1.11", + "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.11.tgz", + "integrity": "sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA==", "dependencies": { "chownr": "^2.0.0", "fs-minipass": "^2.0.0", @@ -357,9 +357,9 @@ } }, "tar": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.0.tgz", - "integrity": "sha512-DUCttfhsnLCjwoDoFcI+B2iJgYa93vBnDUATYEeRx6sntCTdN01VnqsIuTlALXla/LWooNg0yEGeB+Y8WdFxGA==", + "version": "6.1.11", + "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.11.tgz", + "integrity": "sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA==", "requires": { "chownr": "^2.0.0", "fs-minipass": "^2.0.0",