aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Jarred Sumner <jarred@jarredsumner.com> 2022-04-04 07:39:39 -0700
committerGravatar Jarred Sumner <jarred@jarredsumner.com> 2022-04-04 07:39:39 -0700
commit41a97c5bf9f8806f5df65526e704ff9c38c40842 (patch)
tree7196e7d72782e5b58369c08783af1a2b2a92e491
parent20ed1c32d3fc4862c3956a4ea8e6c7b9e9436176 (diff)
downloadbun-41a97c5bf9f8806f5df65526e704ff9c38c40842.tar.gz
bun-41a97c5bf9f8806f5df65526e704ff9c38c40842.tar.zst
bun-41a97c5bf9f8806f5df65526e704ff9c38c40842.zip
fixup
-rw-r--r--Makefile8
-rw-r--r--packages/bun-types/.gitignore1
-rw-r--r--packages/bun-types/.npmignore1
-rw-r--r--packages/bun-types/package.json16
4 files changed, 24 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 723921239..87f061555 100644
--- a/Makefile
+++ b/Makefile
@@ -199,7 +199,8 @@ MAC_INCLUDE_DIRS := -I$(WEBKIT_RELEASE_DIR)/JavaScriptCore/PrivateHeaders \
LINUX_INCLUDE_DIRS := -I$(JSC_INCLUDE_DIR) \
-Isrc/javascript/jsc/bindings/ \
- -Isrc/javascript/jsc/bindings/webcore
+ -Isrc/javascript/jsc/bindings/webcore \
+ -I$(ZLIB_INCLUDE_DIR)
UWS_INCLUDE_DIR := -I$(BUN_DEPS_DIR)/uws/uSockets/src -I$(BUN_DEPS_DIR)/uws/src -I$(BUN_DEPS_DIR)
@@ -309,7 +310,6 @@ ifeq ($(OS_NAME), linux)
PLATFORM_LINKER_FLAGS = $(CFLAGS) \
-fuse-ld=lld \
-lc \
- -I$(ZLIB_INCLUDE_DIR) \
-Wl,-z,now \
-Wl,--as-needed \
-Wl,--gc-sections \
@@ -438,6 +438,10 @@ dev-wasm: dev-build-obj-wasm
-o packages/debug-bun-freestanding-wasm32/bun-wasm.wasm
cp packages/debug-bun-freestanding-wasm32/bun-wasm.wasm src/api/demo/public/bun-wasm.wasm
+bun-types-pkg:
+ rm -rf packages/bun-types/*.d.ts
+ cd packages/bun-types && $(NPM_CLIENT) run prepublishOnly
+
build-obj-wasm:
$(ZIG) build bun-wasm -Drelease-fast -Dtarget=wasm32-freestanding --prominent-compile-errors
emcc -sEXPORTED_FUNCTIONS="['_bun_free', '_cycleStart', '_cycleEnd', '_bun_malloc', '_scan', '_transform', '_init']" \
diff --git a/packages/bun-types/.gitignore b/packages/bun-types/.gitignore
new file mode 100644
index 000000000..cd4efd8e5
--- /dev/null
+++ b/packages/bun-types/.gitignore
@@ -0,0 +1 @@
+*.d.ts
diff --git a/packages/bun-types/.npmignore b/packages/bun-types/.npmignore
new file mode 100644
index 000000000..6c7b69a01
--- /dev/null
+++ b/packages/bun-types/.npmignore
@@ -0,0 +1 @@
+.gitignore
diff --git a/packages/bun-types/package.json b/packages/bun-types/package.json
new file mode 100644
index 000000000..af7f4feea
--- /dev/null
+++ b/packages/bun-types/package.json
@@ -0,0 +1,16 @@
+{
+ "name": "bun-types",
+ "description": "Types for bun.js",
+ "homepage": "https://bun.sh",
+ "author": {
+ "name": "Jarred Sumner",
+ "email": "jarred@jarredsumner.com"
+ },
+ "repository": "https://github.com/jarred-sumner/bun",
+ "readme": "This package is a temporary workaround until https://github.com/DefinitelyTyped/DefinitelyTyped/pull/59670 is merged.",
+ "version": "0.0.74",
+ "types": "types.d.ts",
+ "scripts": {
+ "prepublishOnly": "cp ../../types/bun/bun.d.ts types.d.ts"
+ }
+}