diff options
author | 2021-11-16 10:22:22 -0800 | |
---|---|---|
committer | 2021-11-22 10:21:29 -0800 | |
commit | 7f62169b5e50a6c01d261915a827bfcea98d522d (patch) | |
tree | 6a336c97ba13b884a104aa4d621ee18a6683e835 | |
parent | 5b2c7ad1f3300feba7a1bcdbbe5b8a7172575a9c (diff) | |
download | bun-7f62169b5e50a6c01d261915a827bfcea98d522d.tar.gz bun-7f62169b5e50a6c01d261915a827bfcea98d522d.tar.zst bun-7f62169b5e50a6c01d261915a827bfcea98d522d.zip |
add prettier to root
-rw-r--r-- | package.json | 4 | ||||
-rw-r--r-- | packages/bun-framework-next/package.json | 4 | ||||
-rw-r--r-- | packages/bun-framework-next/server-polyfills.tsx | 14 | ||||
-rw-r--r-- | packages/bun-framework-next/text-encoder-polyfill.js | 302 | ||||
-rw-r--r-- | pnpm-lock.yaml | 6 |
5 files changed, 10 insertions, 320 deletions
diff --git a/package.json b/package.json index 563000fa7..8955f7ef2 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,6 @@ "highlight.js": "^11.3.1", "moment": "^2.29.1", "peechy": "0.4.20", - "prettier": "latest", "puppeteer": "^10.2.0", "react": "^17.0.2", "react-dom": "^17.0.2" @@ -15,7 +14,8 @@ }, "devDependencies": { "@types/node": "^16.9.2", - "@types/puppeteer": "^5.4.4" + "@types/puppeteer": "^5.4.4", + "prettier": "^2.4.1" }, "version": "0.0.0" } diff --git a/packages/bun-framework-next/package.json b/packages/bun-framework-next/package.json index 953ca29c3..d715a8ba4 100644 --- a/packages/bun-framework-next/package.json +++ b/packages/bun-framework-next/package.json @@ -11,7 +11,9 @@ "author": "", "license": "MIT", "dependencies": { - "react-is": "^17.0.2" + "fast-text-encoding": "^1.0.3", + "react-is": "^17.0.2", + "url-polyfill": "^1.1.12" }, "peerDependencies": { "next": "^12.0.0" diff --git a/packages/bun-framework-next/server-polyfills.tsx b/packages/bun-framework-next/server-polyfills.tsx index 8942154b7..887621978 100644 --- a/packages/bun-framework-next/server-polyfills.tsx +++ b/packages/bun-framework-next/server-polyfills.tsx @@ -1,21 +1,13 @@ globalThis.global = globalThis; import { Buffer } from "buffer"; +import { URL } from "url-polyfill"; +import { TextEncoder, TextDecoder } from "fast-text-encoding"; globalThis.Buffer = Buffer; import * as React from "react"; -class URL { - pathname: string; - href: string; - - constructor(base: string, source: string) { - this.pathname = source; - this.href = base + source; - } -} - var onlyChildPolyfill = React.Children.only; React.Children.only = function (children) { @@ -32,7 +24,5 @@ React.Children.only = function (children) { globalThis.URL = URL; -import { TextEncoder, TextDecoder } from "./text-encoder-polyfill"; - globalThis.TextEncoder ||= TextEncoder; globalThis.TextDecoder ||= TextDecoder; diff --git a/packages/bun-framework-next/text-encoder-polyfill.js b/packages/bun-framework-next/text-encoder-polyfill.js deleted file mode 100644 index 3dd95009f..000000000 --- a/packages/bun-framework-next/text-encoder-polyfill.js +++ /dev/null @@ -1,302 +0,0 @@ -/* - * Copyright 2017 Sam Thorogood. All rights reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ - -/** - * @fileoverview Polyfill for TextEncoder and TextDecoder. - * - * You probably want `text.min.js`, and not this file directly. - */ - -// used for FastTextDecoder -const validUtfLabels = ["utf-8", "utf8", "unicode-1-1-utf-8"]; - -/** - * @constructor - */ -function FastTextEncoder() { - // This does not accept an encoding, and always uses UTF-8: - // https://www.w3.org/TR/encoding/#dom-textencoder -} - -Object.defineProperty(FastTextEncoder.prototype, "encoding", { - value: "utf-8", -}); - -/** - * @param {string} string - * @param {{stream: boolean}=} options - * @return {!Uint8Array} - */ -FastTextEncoder.prototype["encode"] = function ( - string, - options = { stream: false } -) { - if (options.stream) { - throw new Error(`Failed to encode: the 'stream' option is unsupported.`); - } - - let pos = 0; - const len = string.length; - - let at = 0; // output position - let tlen = Math.max(32, len + (len >>> 1) + 7); // 1.5x size - let target = new Uint8Array((tlen >>> 3) << 3); // ... but at 8 byte offset - - while (pos < len) { - let value = string.charCodeAt(pos++); - if (value >= 0xd800 && value <= 0xdbff) { - // high surrogate - if (pos < len) { - const extra = string.charCodeAt(pos); - if ((extra & 0xfc00) === 0xdc00) { - ++pos; - value = ((value & 0x3ff) << 10) + (extra & 0x3ff) + 0x10000; - } - } - if (value >= 0xd800 && value <= 0xdbff) { - continue; // drop lone surrogate - } - } - - // expand the buffer if we couldn't write 4 bytes - if (at + 4 > target.length) { - tlen += 8; // minimum extra - tlen *= 1.0 + (pos / string.length) * 2; // take 2x the remaining - tlen = (tlen >>> 3) << 3; // 8 byte offset - - const update = new Uint8Array(tlen); - update.set(target); - target = update; - } - - if ((value & 0xffffff80) === 0) { - // 1-byte - target[at++] = value; // ASCII - continue; - } else if ((value & 0xfffff800) === 0) { - // 2-byte - target[at++] = ((value >>> 6) & 0x1f) | 0xc0; - } else if ((value & 0xffff0000) === 0) { - // 3-byte - target[at++] = ((value >>> 12) & 0x0f) | 0xe0; - target[at++] = ((value >>> 6) & 0x3f) | 0x80; - } else if ((value & 0xffe00000) === 0) { - // 4-byte - target[at++] = ((value >>> 18) & 0x07) | 0xf0; - target[at++] = ((value >>> 12) & 0x3f) | 0x80; - target[at++] = ((value >>> 6) & 0x3f) | 0x80; - } else { - continue; // out of range - } - - target[at++] = (value & 0x3f) | 0x80; - } - - // Use subarray if slice isn't supported (IE11). This will use more memory - // because the original array still exists. - return target.slice ? target.slice(0, at) : target.subarray(0, at); -}; - -/** - * @constructor - * @param {string=} utfLabel - * @param {{fatal: boolean}=} options - */ -function FastTextDecoder(utfLabel = "utf-8", options = { fatal: false }) { - if (validUtfLabels.indexOf(utfLabel.toLowerCase()) === -1) { - throw new RangeError( - `Failed to construct 'TextDecoder': The encoding label provided ('${utfLabel}') is invalid.` - ); - } - if (options.fatal) { - throw new Error( - `Failed to construct 'TextDecoder': the 'fatal' option is unsupported.` - ); - } -} - -Object.defineProperty(FastTextDecoder.prototype, "encoding", { - value: "utf-8", -}); - -Object.defineProperty(FastTextDecoder.prototype, "fatal", { value: false }); - -Object.defineProperty(FastTextDecoder.prototype, "ignoreBOM", { - value: false, -}); - -/** - * @param {!Uint8Array} bytes - * @return {string} - */ -function decodeBuffer(bytes) { - return Buffer.from(bytes.buffer, bytes.byteOffset, bytes.byteLength).toString( - "utf-8" - ); -} - -/** - * @param {!Uint8Array} bytes - * @return {string} - */ -function decodeSyncXHR(bytes) { - const b = new Blob([bytes], { type: "text/plain;charset=UTF-8" }); - const u = URL.createObjectURL(b); - - // This hack will fail in non-Edgium Edge because sync XHRs are disabled (and - // possibly in other places), so ensure there's a fallback call. - try { - const x = new XMLHttpRequest(); - x.open("GET", u, false); - x.send(); - return x.responseText; - } catch (e) { - return decodeFallback(bytes); - } finally { - URL.revokeObjectURL(u); - } -} - -/** - * @param {!Uint8Array} bytes - * @return {string} - */ -function decodeFallback(bytes) { - let inputIndex = 0; - - // Create a working buffer for UTF-16 code points, but don't generate one - // which is too large for small input sizes. UTF-8 to UCS-16 conversion is - // going to be at most 1:1, if all code points are ASCII. The other extreme - // is 4-byte UTF-8, which results in two UCS-16 points, but this is still 50% - // fewer entries in the output. - const pendingSize = Math.min(256 * 256, bytes.length + 1); - const pending = new Uint16Array(pendingSize); - const chunks = []; - let pendingIndex = 0; - - for (;;) { - const more = inputIndex < bytes.length; - - // If there's no more data or there'd be no room for two UTF-16 values, - // create a chunk. This isn't done at the end by simply slicing the data - // into equal sized chunks as we might hit a surrogate pair. - if (!more || pendingIndex >= pendingSize - 1) { - // nb. .apply and friends are *really slow*. Low-hanging fruit is to - // expand this to literally pass pending[0], pending[1], ... etc, but - // the output code expands pretty fast in this case. - chunks.push( - String.fromCharCode.apply(null, pending.subarray(0, pendingIndex)) - ); - - if (!more) { - return chunks.join(""); - } - - // Move the buffer forward and create another chunk. - bytes = bytes.subarray(inputIndex); - inputIndex = 0; - pendingIndex = 0; - } - - // The native TextDecoder will generate "REPLACEMENT CHARACTER" where the - // input data is invalid. Here, we blindly parse the data even if it's - // wrong: e.g., if a 3-byte sequence doesn't have two valid continuations. - - const byte1 = bytes[inputIndex++]; - if ((byte1 & 0x80) === 0) { - // 1-byte or null - pending[pendingIndex++] = byte1; - } else if ((byte1 & 0xe0) === 0xc0) { - // 2-byte - const byte2 = bytes[inputIndex++] & 0x3f; - pending[pendingIndex++] = ((byte1 & 0x1f) << 6) | byte2; - } else if ((byte1 & 0xf0) === 0xe0) { - // 3-byte - const byte2 = bytes[inputIndex++] & 0x3f; - const byte3 = bytes[inputIndex++] & 0x3f; - pending[pendingIndex++] = ((byte1 & 0x1f) << 12) | (byte2 << 6) | byte3; - } else if ((byte1 & 0xf8) === 0xf0) { - // 4-byte - const byte2 = bytes[inputIndex++] & 0x3f; - const byte3 = bytes[inputIndex++] & 0x3f; - const byte4 = bytes[inputIndex++] & 0x3f; - - // this can be > 0xffff, so possibly generate surrogates - let codepoint = - ((byte1 & 0x07) << 0x12) | (byte2 << 0x0c) | (byte3 << 0x06) | byte4; - if (codepoint > 0xffff) { - // codepoint &= ~0x10000; - codepoint -= 0x10000; - pending[pendingIndex++] = ((codepoint >>> 10) & 0x3ff) | 0xd800; - codepoint = 0xdc00 | (codepoint & 0x3ff); - } - pending[pendingIndex++] = codepoint; - } else { - // invalid initial byte - } - } -} - -// Decoding a string is pretty slow, but use alternative options where possible. -let decodeImpl = decodeFallback; -if (typeof Buffer === "function" && Buffer.from) { - // Buffer.from was added in Node v5.10.0 (2015-11-17). - decodeImpl = decodeBuffer; -} else if ( - typeof Blob === "function" && - typeof URL === "function" && - typeof URL.createObjectURL === "function" -) { - // Blob and URL.createObjectURL are available from IE10, Safari 6, Chrome 19 - // (all released in 2012), Firefox 19 (2013), ... - decodeImpl = decodeSyncXHR; -} - -/** - * @param {(!ArrayBuffer|!ArrayBufferView)} buffer - * @param {{stream: boolean}=} options - * @return {string} - */ -FastTextDecoder.prototype["decode"] = function ( - buffer, - options = { stream: false } -) { - if (options["stream"]) { - throw new Error(`Failed to decode: the 'stream' option is unsupported.`); - } - - let bytes; - - if (buffer instanceof Uint8Array) { - // Accept Uint8Array instances as-is. - bytes = buffer; - } else if (buffer.buffer instanceof ArrayBuffer) { - // Look for ArrayBufferView, which isn't a real type, but basically - // represents all the valid TypedArray types plus DataView. They all have - // ".buffer" as an instance of ArrayBuffer. - bytes = new Uint8Array(buffer.buffer); - } else { - // The only other valid argument here is that "buffer" is an ArrayBuffer. - // We also try to convert anything else passed to a Uint8Array, as this - // catches anything that's array-like. Native code would throw here. - bytes = new Uint8Array(buffer); - } - - return decodeImpl(/** @type {!Uint8Array} */ (bytes)); -}; - -export { FastTextEncoder as TextEncoder }; -export { FastTextDecoder as TextDecoder }; diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 5a5574998..9fe0236df 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -10,7 +10,7 @@ importers: highlight.js: ^11.3.1 moment: ^2.29.1 peechy: 0.4.20 - prettier: latest + prettier: ^2.4.1 puppeteer: ^10.2.0 react: ^17.0.2 react-dom: ^17.0.2 @@ -19,13 +19,13 @@ importers: highlight.js: 11.3.1 moment: 2.29.1 peechy: 0.4.20 - prettier: 2.4.1 puppeteer: 10.4.0 react: 17.0.2 react-dom: 17.0.2_react@17.0.2 devDependencies: '@types/node': 16.11.4 '@types/puppeteer': 5.4.4 + prettier: 2.4.1 packages/bun-error: specifiers: @@ -1835,7 +1835,7 @@ packages: resolution: {integrity: sha512-9fbDAXSBcc6Bs1mZrDYb3XKzDLm4EXXL9sC1LqKP5rZkT6KRr/rf9amVUcODVXgguK/isJz0d0hP72WeaKWsvA==} engines: {node: '>=10.13.0'} hasBin: true - dev: false + dev: true /pretty-format/3.8.0: resolution: {integrity: sha1-v77VbV6ad2ZF9LH/eqGjrE+jw4U=} |