From c7fc08056ac2588c2305017e1c6d0677bdb69448 Mon Sep 17 00:00:00 2001 From: Jarred Sumner Date: Wed, 27 Oct 2021 17:38:05 -0700 Subject: [PATCH] part 1 of try to fix the npm install process --- Makefile | 6 +++--- packages/bun-cli-darwin-aarch64/package.json | 6 ++++-- packages/bun-cli-darwin-x64/package.json | 10 ++++++---- packages/bun-cli-linux-x64/package.json | 17 ++++++++++------- packages/bun-cli-mac/package.json | 7 ++++--- 5 files changed, 27 insertions(+), 19 deletions(-) diff --git a/Makefile b/Makefile index def97239c6..0a95582ccc 100644 --- a/Makefile +++ b/Makefile @@ -552,21 +552,21 @@ release-bin-check-npm: mkdir -p $(RELEASE_BIN_CHECK_DIR); echo "{\"name\": \"bun-test-$(PACKAGE_JSON_VERSION)\"}" > $(RELEASE_BIN_CHECK_DIR)/package.json cd $(RELEASE_BIN_CHECK_DIR) && npm install --save $(BUN_DEPLOY_TGZ) - test "$(PACKAGE_JSON_VERSION)" == "$(shell eval $(RELEASE_BIN_CHECK_DIR)/node_modules/.bin/bun --version || echo "FAIL" )" + test "$(PACKAGE_JSON_VERSION)" == "$(shell eval $(RELEASE_BIN_CHECK_DIR)/node_modules/$(PACKAGE_NAME)/bin/bun --version || echo "FAIL" )" release-bin-check-yarn: rm -rf $(RELEASE_BIN_CHECK_DIR); mkdir -p $(RELEASE_BIN_CHECK_DIR); echo "{\"name\": \"bun-test-$(PACKAGE_JSON_VERSION)\"}" > $(RELEASE_BIN_CHECK_DIR)/package.json cd $(RELEASE_BIN_CHECK_DIR) && yarn add $(BUN_DEPLOY_TGZ) - test "$(PACKAGE_JSON_VERSION)" == "$(shell eval $(RELEASE_BIN_CHECK_DIR)/node_modules/.bin/bun --version || echo "FAIL" )" + test "$(PACKAGE_JSON_VERSION)" == "$(shell eval $(RELEASE_BIN_CHECK_DIR)/node_modules/$(PACKAGE_NAME)/bin/bun --version || echo "FAIL" )" release-bin-check-pnpm: rm -rf $(RELEASE_BIN_CHECK_DIR); mkdir -p $(RELEASE_BIN_CHECK_DIR); echo "{\"name\": \"bun-test-$(PACKAGE_JSON_VERSION)\"}" > $(RELEASE_BIN_CHECK_DIR)/package.json cd $(RELEASE_BIN_CHECK_DIR) && pnpm add $(BUN_DEPLOY_TGZ) - test "$(PACKAGE_JSON_VERSION)" == "$(shell eval $(RELEASE_BIN_CHECK_DIR)/node_modules/.bin/bun --version || echo "FAIL" )" + test "$(PACKAGE_JSON_VERSION)" == "$(shell eval $(RELEASE_BIN_CHECK_DIR)/node_modules/$(PACKAGE_NAME)/bin/bun --version || echo "FAIL" )" release-bin-check: release-bin-check-npm release-bin-check-yarn release-bin-check-pnpm diff --git a/packages/bun-cli-darwin-aarch64/package.json b/packages/bun-cli-darwin-aarch64/package.json index 65240bff58..e0ccedad30 100644 --- a/packages/bun-cli-darwin-aarch64/package.json +++ b/packages/bun-cli-darwin-aarch64/package.json @@ -2,10 +2,12 @@ "cpu": [ "arm64" ], - "directories": { - "bin": "bin" + "bugs": { + "url": "https://github.com/jarred-sumner/bun/issues" }, + "homepage": "https://bun.sh", "name": "bun-cli-darwin-aarch64", + "private": false, "os": [ "darwin" ], diff --git a/packages/bun-cli-darwin-x64/package.json b/packages/bun-cli-darwin-x64/package.json index 0e217eb8c8..225b9f058a 100644 --- a/packages/bun-cli-darwin-x64/package.json +++ b/packages/bun-cli-darwin-x64/package.json @@ -1,14 +1,16 @@ { + "bugs": { + "url": "https://github.com/jarred-sumner/bun/issues" + }, "cpu": [ "x64" ], - "directories": { - "bin": "bin" - }, + "homepage": "https://bun.sh", "name": "bun-cli-darwin-x64", "os": [ "darwin" ], + "private": false, "repository": "https://github.com/jarred-sumner/bun", - "version": "0.0.37" + "version": "0.0.38" } diff --git a/packages/bun-cli-linux-x64/package.json b/packages/bun-cli-linux-x64/package.json index c1090a2874..e2f2928afd 100644 --- a/packages/bun-cli-linux-x64/package.json +++ b/packages/bun-cli-linux-x64/package.json @@ -1,14 +1,17 @@ { - "directories": { - "bin": "bin" + "cpu": [ + "x64" + ], + "bugs": { + "url": "https://github.com/jarred-sumner/bun/issues" }, + "homepage": "https://bun.sh", + "description": "Linux build of Bun", "name": "bun-cli-linux-x64", - "repository": "https://github.com/jarred-sumner/bun", - "version": "0.0.28", + "private": false, "os": [ "linux" ], - "cpu": [ - "x64" - ] + "repository": "https://github.com/jarred-sumner/bun", + "version": "0.0.37" } diff --git a/packages/bun-cli-mac/package.json b/packages/bun-cli-mac/package.json index 0e5562f31a..0c5b6e8945 100644 --- a/packages/bun-cli-mac/package.json +++ b/packages/bun-cli-mac/package.json @@ -4,14 +4,15 @@ "arm64" ], "description": "macOS build of Bun", - "directories": { - "bin": "bin" + "bugs": { + "url": "https://github.com/jarred-sumner/bun/issues" }, + "homepage": "https://bun.sh", "name": "bun-cli-mac", "os": [ "darwin" ], - "private": "false", + "private": false, "repository": "https://github.com/jarred-sumner/bun", "version": "0.0.37" }