From 5a89f30841bb3d4390f14b3175d6429bb25ae327 Mon Sep 17 00:00:00 2001 From: Jarred Sumner Date: Wed, 15 Sep 2021 23:34:17 -0700 Subject: [PATCH] Switch to 0.0.x instead of 0.0.0-x to fix the npm install issue --- Makefile | 10 ++++++---- build-id | 2 +- packages/bun-cli-darwin-x64/package.json | 2 +- packages/bun-cli/package.json | 2 +- src/global.zig | 4 ++-- src/javascript/jsc/WebKit | 2 +- 6 files changed, 12 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile index e5866a2eb6..1906ee67fb 100644 --- a/Makefile +++ b/Makefile @@ -10,7 +10,7 @@ BIN_DIR := $(PACKAGE_DIR)/bin RELEASE_BIN := $(BIN_DIR)/bun DEBUG_BIN := $(DEBUG_PACKAGE_DIR)/bin BUILD_ID := $(shell cat ./build-id) -PACKAGE_JSON_VERSION := 0.0.0-$(BUILD_ID) +PACKAGE_JSON_VERSION := 0.0.$(BUILD_ID) BUN_BUILD_TAG := bun-v$(PACKAGE_JSON_VERSION) bun: vendor build-obj bun-link-lld-release @@ -26,7 +26,9 @@ sign-macos-x64: sign-macos-aarch64: gon sign.macos-aarch64.json -release-macos: build-obj jsc-bindings-mac bun-link-lld-release +release-macos: all-js build-obj jsc-bindings-mac bun-link-lld-release + +all-js: runtime_js fallback_decoder bun_error node-fallbacks bin-dir: @echo $(BIN_DIR) @@ -35,7 +37,7 @@ api: npm install; ./node_modules/.bin/peechy --schema src/api/schema.peechy --esm src/api/schema.js --ts src/api/schema.d.ts --zig src/api/schema.zig node-fallbacks: - cd src/node-fallbacks; npm install; npm run --silent build + @cd src/node-fallbacks; npm install; npm run --silent build fallback_decoder: @esbuild --target=esnext --bundle src/fallback.ts --format=iife --platform=browser --minify > src/fallback.out.js @@ -44,7 +46,7 @@ runtime_js: @NODE_ENV=production esbuild --define:process.env.NODE_ENV="production" --target=esnext --bundle src/runtime/index.ts --format=iife --platform=browser --global-name=BUN_RUNTIME --minify --external:/bun:* > src/runtime.out.js; cat src/runtime.footer.js >> src/runtime.out.js bun_error: - cd packages/bun-error; npm install; npm run --silent build + @cd packages/bun-error; npm install; npm run --silent build jsc: jsc-build jsc-bindings jsc-build: jsc-build-mac jsc-copy-headers diff --git a/build-id b/build-id index 8351c19397..60d3b2f4a4 100644 --- a/build-id +++ b/build-id @@ -1 +1 @@ -14 +15 diff --git a/packages/bun-cli-darwin-x64/package.json b/packages/bun-cli-darwin-x64/package.json index 247c676d58..05333fedec 100644 --- a/packages/bun-cli-darwin-x64/package.json +++ b/packages/bun-cli-darwin-x64/package.json @@ -4,5 +4,5 @@ }, "name": "bun-cli-darwin-x64", "repository": "https://github.com/jarred-sumner/bun", - "version": "0.0.0-14" + "version": "0.0.15" } diff --git a/packages/bun-cli/package.json b/packages/bun-cli/package.json index 782df09bc6..e2c9c02543 100644 --- a/packages/bun-cli/package.json +++ b/packages/bun-cli/package.json @@ -9,5 +9,5 @@ "postinstall": "node postinstall.js", "prepublishOnly": "rm -rf ./bin/bun; chmod +x ./reset-bin.js; cp ./reset-bin.js ./bin/bun" }, - "version": "0.0.0-14" + "version": "0.0.15" } diff --git a/src/global.zig b/src/global.zig index f82f8bc1dc..1d696cc65c 100644 --- a/src/global.zig +++ b/src/global.zig @@ -386,9 +386,9 @@ pub const Output = struct { pub const Global = struct { pub const build_id = std.fmt.parseInt(u64, std.mem.trim(u8, @embedFile("../build-id"), "\n \r\t"), 10) catch unreachable; pub const package_json_version = if (isDebug) - std.fmt.comptimePrint("0.0.0-{d}_debug", .{build_id}) + std.fmt.comptimePrint("0.0.{d}_debug", .{build_id}) else - std.fmt.comptimePrint("0.0.0-{d}", .{build_id}); + std.fmt.comptimePrint("0.0.{d}", .{build_id}); pub fn panic(comptime fmt: string, args: anytype) noreturn { @setCold(true); diff --git a/src/javascript/jsc/WebKit b/src/javascript/jsc/WebKit index e7d31961d4..47a606f4a5 160000 --- a/src/javascript/jsc/WebKit +++ b/src/javascript/jsc/WebKit @@ -1 +1 @@ -Subproject commit e7d31961d4bf98b3e8b1df3ea0398ea1517a61df +Subproject commit 47a606f4a5f7b72335d2d1af2af1cc434d825b62