diff options
| author |  Jarred Sumner <jarred@ci.local>
| 2021-09-10 03:32:21 -0700 |
|---|---|---|
| committer | Jarred Sumner <jarred@ci.local>
| 2021-09-10 03:32:21 -0700 |
| commit | b66ef231670b84fe71b3d97a896c48a09209eb9b (patch) | |
| tree | 7d1f7d9ac63c3bdb8af01c1d3d1ab10aef3d1325 | |
| parent | 812f641ee325bdcef6b99e89d57c0771cf1ca1e2 (diff) | |
| download | bun-b66ef231670b84fe71b3d97a896c48a09209eb9b.tar.gz bun-b66ef231670b84fe71b3d97a896c48a09209eb9b.tar.zst bun-b66ef231670b84fe71b3d97a896c48a09209eb9b.zip | |
yay
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | examples/hello-next/pages/index.tsx | 11 | ||||
| m--------- | src/javascript/jsc/WebKit | 0 | ||||
| -rw-r--r-- | src/javascript/jsc/base.zig | 2 | ||||
| -rw-r--r-- | src/javascript/jsc/webcore/response.zig | 14 | ||||
| -rw-r--r-- | src/runtime.version | 2 |
6 files changed, 13 insertions, 20 deletions
@@ -12,8 +12,8 @@ sign-macos-x64: sign-macos-aarch64: gon sign.macos-aarch64.json -release-macos-x64: build-obj bun-link-lld-release sign-macos-x64 -release-macos-aarch64: build-obj bun-link-lld-release sign-macos-aarch64 +release-macos-x64: build-obj jsc-bindings-mac bun-link-lld-release sign-macos-x64 +release-macos-aarch64: build-obj jsc-bindings-mac bun-link-lld-release sign-macos-aarch64 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 diff --git a/examples/hello-next/pages/index.tsx b/examples/hello-next/pages/index.tsx index ee455470c..f733efb51 100644 --- a/examples/hello-next/pages/index.tsx +++ b/examples/hello-next/pages/index.tsx @@ -1,25 +1,16 @@ import Head from "next/head"; import Link from "next/link"; -import { useRouter } from "next/router"; import React from "react"; -import { - Tweet, - TwitterContextProvider, -} from "@jarred/react-static-tweets/src/index"; -import "@jarred/react-static-tweets/styles.css"; -import { fetchTweetAst } from "@jarred/static-tweets/src/fetchTweetAst"; -import { SWRConfig } from "swr"; import styles from "../styles/Home.module.css"; export async function getStaticProps(ctx) { return { props: { - tweetAst: await fetchTweetAst("1390084458724741121"), }, }; } -export default function Home({ tweetAst }) { +export default function Home({ }) { return ( <div className={styles.container}> <Head> diff --git a/src/javascript/jsc/WebKit b/src/javascript/jsc/WebKit -Subproject 1d5ca69e3eedd5b4d1197bbb90860b254a8a8ee +Subproject e7d31961d4bf98b3e8b1df3ea0398ea1517a61d diff --git a/src/javascript/jsc/base.zig b/src/javascript/jsc/base.zig index 3a0355503..c90101371 100644 --- a/src/javascript/jsc/base.zig +++ b/src/javascript/jsc/base.zig @@ -742,7 +742,7 @@ pub fn NewClass( var property_name_refs = std.mem.zeroes([property_names.len]js.JSStringRef); const property_name_literals = property_names; var static_properties = brk: { - var props: [property_names.len]js.JSStaticValue = undefined; + var props: [property_names.len + 1]js.JSStaticValue = undefined; std.mem.set( js.JSStaticValue, &props, diff --git a/src/javascript/jsc/webcore/response.zig b/src/javascript/jsc/webcore/response.zig index 8b698bdea..1cd60e6bb 100644 --- a/src/javascript/jsc/webcore/response.zig +++ b/src/javascript/jsc/webcore/response.zig @@ -1129,16 +1129,18 @@ pub const Body = struct { } else |err| {} } - var str = JSValue.fromRef(body_ref).toWTFString(VirtualMachine.vm.global); - const len = str.length(); - if (len == 0) { + var str: ZigString = ZigString.Empty; + JSValue.fromRef(body_ref).toZigString(&str, VirtualMachine.vm.global); + + if (str.len == 0) { body.value = .{ .String = "" }; return body; } - body.value = Value{ .String = str.characters8()[0..len] }; - body.ptr = @intToPtr([*]u8, @ptrToInt(body.value.String.ptr)); - body.len = body.value.String.len; + body.value = Value{ .String = str.slice() }; + // body.ptr = body. + // body.len = body.value.String.len;str.characters8()[0..len] }; + return body; }, .kJSTypeObject => { diff --git a/src/runtime.version b/src/runtime.version index d4f951e04..1a2dee42d 100644 --- a/src/runtime.version +++ b/src/runtime.version @@ -1 +1 @@ -c525e78958fc519b
\ No newline at end of file +3464024d7090dee8
\ No newline at end of file |