diff options
author | 2023-08-19 13:58:39 -0700 | |
---|---|---|
committer | 2023-08-19 13:58:39 -0700 | |
commit | d39f60f49b76ad1a4a86152408a8166be9ac87e2 (patch) | |
tree | cd8bdf522c0ebf648278678846bb79dae300af59 | |
parent | b9c3db7ff914cd0c50b2ac680c35e2fbf58a0498 (diff) | |
download | bun-dave/bundler-string-length.tar.gz bun-dave/bundler-string-length.tar.zst bun-dave/bundler-string-length.zip |
remove `dedent` library from testsdave/bundler-string-length
-rwxr-xr-x | test/bun.lockb | bin | 148448 -> 148108 bytes | |||
-rw-r--r-- | test/bundler/bundler_browser.test.ts | 1 | ||||
-rw-r--r-- | test/bundler/bundler_cjs2esm.test.ts | 1 | ||||
-rw-r--r-- | test/bundler/bundler_compile.test.ts | 1 | ||||
-rw-r--r-- | test/bundler/bundler_edgecase.test.ts | 1 | ||||
-rw-r--r-- | test/bundler/bundler_jsx.test.ts | 1 | ||||
-rw-r--r-- | test/bundler/bundler_minify.test.ts | 1 | ||||
-rw-r--r-- | test/bundler/bundler_naming.test.ts | 1 | ||||
-rw-r--r-- | test/bundler/bundler_npm.test.ts | 1 | ||||
-rw-r--r-- | test/bundler/bundler_plugin.test.ts | 1 | ||||
-rw-r--r-- | test/bundler/bundler_regressions.test.ts | 1 | ||||
-rw-r--r-- | test/bundler/bundler_string.test.ts | 40 | ||||
-rw-r--r-- | test/bundler/dedent.ts | 25 | ||||
-rw-r--r-- | test/bundler/esbuild/dce.test.ts | 2 | ||||
-rw-r--r-- | test/bundler/esbuild/default.test.ts | 2 | ||||
-rw-r--r-- | test/bundler/esbuild/extra.test.ts | 1 | ||||
-rw-r--r-- | test/bundler/expectBundled.ts | 3 | ||||
-rw-r--r-- | test/package.json | 1 |
18 files changed, 50 insertions, 34 deletions
diff --git a/test/bun.lockb b/test/bun.lockb Binary files differindex 01383ce5d..d4329d75d 100755 --- a/test/bun.lockb +++ b/test/bun.lockb diff --git a/test/bundler/bundler_browser.test.ts b/test/bundler/bundler_browser.test.ts index c14e338f9..0c55fb82e 100644 --- a/test/bundler/bundler_browser.test.ts +++ b/test/bundler/bundler_browser.test.ts @@ -1,5 +1,4 @@ import assert from "assert"; -import dedent from "dedent"; import { itBundled, testForFile } from "./expectBundled"; var { describe, test, expect } = testForFile(import.meta.path); diff --git a/test/bundler/bundler_cjs2esm.test.ts b/test/bundler/bundler_cjs2esm.test.ts index 01a17356b..fe55f5048 100644 --- a/test/bundler/bundler_cjs2esm.test.ts +++ b/test/bundler/bundler_cjs2esm.test.ts @@ -1,5 +1,4 @@ import assert from "assert"; -import dedent from "dedent"; import { itBundled, testForFile } from "./expectBundled"; var { describe, test, expect } = testForFile(import.meta.path); diff --git a/test/bundler/bundler_compile.test.ts b/test/bundler/bundler_compile.test.ts index 4c890feef..1bd66fa4b 100644 --- a/test/bundler/bundler_compile.test.ts +++ b/test/bundler/bundler_compile.test.ts @@ -1,5 +1,4 @@ import assert from "assert"; -import dedent from "dedent"; import { ESBUILD, itBundled, testForFile } from "./expectBundled"; var { describe, test, expect } = testForFile(import.meta.path); diff --git a/test/bundler/bundler_edgecase.test.ts b/test/bundler/bundler_edgecase.test.ts index de2482907..1d8fc0fc2 100644 --- a/test/bundler/bundler_edgecase.test.ts +++ b/test/bundler/bundler_edgecase.test.ts @@ -1,5 +1,4 @@ import assert from "assert"; -import dedent from "dedent"; import { itBundled, testForFile } from "./expectBundled"; var { describe, test, expect } = testForFile(import.meta.path); diff --git a/test/bundler/bundler_jsx.test.ts b/test/bundler/bundler_jsx.test.ts index 5288701d6..c76f18417 100644 --- a/test/bundler/bundler_jsx.test.ts +++ b/test/bundler/bundler_jsx.test.ts @@ -1,5 +1,4 @@ import assert from "assert"; -import dedent from "dedent"; import { BundlerTestInput, itBundled, testForFile } from "./expectBundled"; var { describe, test, expect } = testForFile(import.meta.path); diff --git a/test/bundler/bundler_minify.test.ts b/test/bundler/bundler_minify.test.ts index 5c77e70e6..43a897e01 100644 --- a/test/bundler/bundler_minify.test.ts +++ b/test/bundler/bundler_minify.test.ts @@ -1,5 +1,4 @@ import assert from "assert"; -import dedent from "dedent"; import { itBundled, testForFile } from "./expectBundled"; var { describe, test, expect } = testForFile(import.meta.path); diff --git a/test/bundler/bundler_naming.test.ts b/test/bundler/bundler_naming.test.ts index 92f3d4f9a..634c97053 100644 --- a/test/bundler/bundler_naming.test.ts +++ b/test/bundler/bundler_naming.test.ts @@ -1,5 +1,4 @@ import assert from "assert"; -import dedent from "dedent"; import { ESBUILD, itBundled, testForFile } from "./expectBundled"; var { describe, test, expect } = testForFile(import.meta.path); diff --git a/test/bundler/bundler_npm.test.ts b/test/bundler/bundler_npm.test.ts index 327d68087..c55dc13fd 100644 --- a/test/bundler/bundler_npm.test.ts +++ b/test/bundler/bundler_npm.test.ts @@ -1,5 +1,4 @@ import assert from "assert"; -import dedent from "dedent"; import { ESBUILD, itBundled, testForFile } from "./expectBundled"; var { describe, test, expect } = testForFile(import.meta.path); diff --git a/test/bundler/bundler_plugin.test.ts b/test/bundler/bundler_plugin.test.ts index f8e5d8d59..3cc97439e 100644 --- a/test/bundler/bundler_plugin.test.ts +++ b/test/bundler/bundler_plugin.test.ts @@ -1,5 +1,4 @@ import assert from "assert"; -import dedent from "dedent"; import path from "path"; import { itBundled, testForFile } from "./expectBundled"; var { describe, test, expect } = testForFile(import.meta.path); diff --git a/test/bundler/bundler_regressions.test.ts b/test/bundler/bundler_regressions.test.ts index 23aa4c73e..b8792f5ea 100644 --- a/test/bundler/bundler_regressions.test.ts +++ b/test/bundler/bundler_regressions.test.ts @@ -1,5 +1,4 @@ import assert from "assert"; -import dedent from "dedent"; import { itBundled, testForFile } from "./expectBundled"; var { describe, test, expect } = testForFile(import.meta.path); diff --git a/test/bundler/bundler_string.test.ts b/test/bundler/bundler_string.test.ts index 45faaee3e..22f717198 100644 --- a/test/bundler/bundler_string.test.ts +++ b/test/bundler/bundler_string.test.ts @@ -1,5 +1,5 @@ import assert from "assert"; -import dedent from "dedent"; +import dedent from "./dedent"; import { itBundled, testForFile } from "./expectBundled"; var { describe, test, expect } = testForFile(import.meta.path); @@ -194,24 +194,26 @@ describe("bundler", () => { }, bundling: false, run: { - stdout: `hello - hello - hello world hello - hellohellohello world hello - ππ - ππ π hello - hellohellohello world hellohellohellohello world helloππππ π hello - a-f\d - #?[a-f\d]{3}[a-f\d]? - #?[a-f\d]{6}([a-f\d]{2})? - /[^#a-f\d]/gi - /^#?[a-f\d]{3}[a-f\d]?$|^#?[a-f\d]{6}([a-f\d]{2})?$/i - kNAME=OOPSj - dOOPS - OOPSl - dOOPSl - CONST_VALUE - true`, + stdout: ` + hello + hello + hello world hello + hellohellohello world hello + ππ + ππ π hello + hellohellohello world hellohellohellohello world helloππππ π hello + a-f\d + #?[a-f\d]{3}[a-f\d]? + #?[a-f\d]{6}([a-f\d]{2})? + /[^#a-f\d]/gi + /^#?[a-f\d]{3}[a-f\d]?$|^#?[a-f\d]{6}([a-f\d]{2})?$/i + kNAME=OOPSj + dOOPS + OOPSl + dOOPSl + CONST_VALUE + true + `, }, }); }); diff --git a/test/bundler/dedent.ts b/test/bundler/dedent.ts new file mode 100644 index 000000000..2e0027e58 --- /dev/null +++ b/test/bundler/dedent.ts @@ -0,0 +1,25 @@ +export default function dedent(str: string, ...args: any[]) { + if (Array.isArray(str)) { + let result = ""; + let numArgs = args.length; + for (let i = 0; i < str.length; i++) { + result += dedent(str[i]); + if (i < numArgs) result += args[i]; + } + str = result; + } + let indent = Infinity; + const lines = str + .replace(/^\s*\n/, "") + .trimEnd() + .split("\n"); + for (const line of lines) { + let thisIndent = 0; + for (const char of line) { + if (char === " ") thisIndent++; + else break; + } + if (thisIndent < indent) indent = thisIndent; + } + return lines.map(line => line.slice(indent)).join("\n"); +} diff --git a/test/bundler/esbuild/dce.test.ts b/test/bundler/esbuild/dce.test.ts index 618eb5d28..ea7d0465e 100644 --- a/test/bundler/esbuild/dce.test.ts +++ b/test/bundler/esbuild/dce.test.ts @@ -1,5 +1,5 @@ import assert from "assert"; -import dedent from "dedent"; +import dedent from "../dedent"; import { ESBUILD, itBundled, testForFile } from "../expectBundled"; var { describe, test, expect } = testForFile(import.meta.path); diff --git a/test/bundler/esbuild/default.test.ts b/test/bundler/esbuild/default.test.ts index ac820848a..bb88d4a30 100644 --- a/test/bundler/esbuild/default.test.ts +++ b/test/bundler/esbuild/default.test.ts @@ -1,5 +1,5 @@ import assert from "assert"; -import dedent from "dedent"; +import dedent from "../dedent"; import { ESBUILD_PATH, RUN_UNCHECKED_TESTS, itBundled, testForFile } from "../expectBundled"; var { describe, test, expect } = testForFile(import.meta.path); diff --git a/test/bundler/esbuild/extra.test.ts b/test/bundler/esbuild/extra.test.ts index f96f34850..26c9a13f8 100644 --- a/test/bundler/esbuild/extra.test.ts +++ b/test/bundler/esbuild/extra.test.ts @@ -1,5 +1,4 @@ import assert from "assert"; -import dedent from "dedent"; import { itBundled, testForFile } from "../expectBundled"; var { describe, test, expect } = testForFile(import.meta.path); diff --git a/test/bundler/expectBundled.ts b/test/bundler/expectBundled.ts index 3ec68ac4e..b4b242d35 100644 --- a/test/bundler/expectBundled.ts +++ b/test/bundler/expectBundled.ts @@ -3,7 +3,6 @@ */ import { existsSync, mkdirSync, mkdtempSync, readFileSync, rmSync, writeFileSync } from "fs"; import path from "path"; -import dedent from "dedent"; import { bunEnv, bunExe } from "harness"; import { tmpdir } from "os"; import { callerSourceOrigin } from "bun:jsc"; @@ -11,6 +10,7 @@ import { BuildConfig, BunPlugin, fileURLToPath } from "bun"; import type { Expect } from "bun:test"; import { PluginBuilder } from "bun"; import * as esbuild from "esbuild"; +import dedent from "./dedent"; let currentFile: string | undefined; @@ -22,6 +22,7 @@ export function testForFile(file: string): BunTestExports { var testFile = testFiles.get(file); if (!testFile) { + // @ts-ignore testFile = Bun.jest(file); testFiles.set(file, testFile); } diff --git a/test/package.json b/test/package.json index 7d8156aa0..beafe2b12 100644 --- a/test/package.json +++ b/test/package.json @@ -13,7 +13,6 @@ "bktree-fast": "0.0.7", "body-parser": "1.20.2", "comlink": "4.4.1", - "dedent": "0.7.0", "es-module-lexer": "1.3.0", "esbuild": "0.18.6", "express": "4.18.2", |