change the directory structure

0xflotus · Jun 23, 2022 · 729d445 · 729d445
1 parent 25f820c
commit 729d445
Show file tree

Hide file tree

Showing 919 changed files with 1,958 additions and 1,727 deletions.
diff --git a/.docker/run-test.sh b/.docker/run-test.sh
@@ -3,7 +3,7 @@
 set -euxo pipefail
 
 bun install
-bun install --cwd ./integration/snippets
-bun install --cwd ./integration/scripts
+bun install --cwd ./test/snippets
+bun install --cwd ./test/scripts
 
 make $BUN_TEST_NAME
diff --git a/.dockerignore b/.dockerignore
@@ -1,6 +1,6 @@
 node_modules
 **/node_modules
-src/javascript/jsc/WebKit/LayoutTests
+src/bun.js/WebKit/LayoutTests
 zig-out
 zig-build
 **/*.o
@@ -10,7 +10,7 @@ examples
 
 **/.next
 .git
-src/javascript/jsc/WebKit
+src/bun.js/WebKit
 **/CMakeCache.txt
 packages/**/bun
 packages/**/bun-profile

diff --git a/.gitattributes b/.gitattributes
@@ -1,7 +1,7 @@
 .vscode/launch.json linguist-generated
 src/api/schema.d.ts linguist-generated
 src/api/schema.js linguist-generated
-src/javascript/jsc/bindings/sqlite/sqlite3.c linguist-vendored
-src/javascript/jsc/bindings/sqlite/sqlite3_local.h linguist-vendored
+src/bun.js/bindings/sqlite/sqlite3.c linguist-vendored
+src/bun.js/bindings/sqlite/sqlite3_local.h linguist-vendored
 *.lockb binary diff=lockb
 *.zig text eol=lf
diff --git a/.github/workflows/bun.yml b/.github/workflows/bun.yml
@@ -29,7 +29,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
       - name: Checkout submodules
-        run: git -c submodule."src/javascript/jsc/WebKit".update=none submodule update --init --recursive --depth=1 --progress -j 8
+        run: git -c submodule."src/bun.js/WebKit".update=none submodule update --init --recursive --depth=1 --progress -j 8
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v1
       - name: Login to Dockerhub
@@ -94,7 +94,7 @@ jobs:
   #     - name: Checkout
   #       uses: actions/checkout@v2
   #     - name: Checkout submodules
-  #       run: git -c submodule."src/javascript/jsc/WebKit".update=none submodule update --init --recursive --depth=1 --progress -j 8
+  #       run: git -c submodule."src/bun.js/WebKit".update=none submodule update --init --recursive --depth=1 --progress -j 8
   #     - name: Set up Docker Buildx
   #       uses: docker/setup-buildx-action@v1
   #     - name: Login to Dockerhub
@@ -127,7 +127,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
       - name: Checkout submodules
-        run: git -c submodule."src/javascript/jsc/WebKit".update=none submodule update --init --recursive --depth=1 --progress -j 8
+        run: git -c submodule."src/bun.js/WebKit".update=none submodule update --init --recursive --depth=1 --progress -j 8
       - name: Login to GitHub Container Registry
         uses: docker/login-action@v1
         with:

diff --git a/.gitmodules b/.gitmodules
@@ -1,53 +1,50 @@
-# [submodule "src/deps/zig-clap"]
-# 	path = src/deps/zig-clap
-# 	url = https://github.com/Hejsil/zig-clap
 [submodule "src/deps/picohttpparser"]
-	path = src/deps/picohttpparser
-	url = https://github.com/h2o/picohttpparser.git
-	ignore = dirty
-	depth = 1
+path = src/deps/picohttpparser
+url = https://github.com/h2o/picohttpparser.git
+ignore = dirty
+depth = 1
 [submodule "src/javascript/jsc/WebKit"]
-	path = src/javascript/jsc/WebKit
-	url = https://github.com/Jarred-Sumner/WebKit.git
-	ignore = dirty
-	depth = 1
+	path = src/bun.js/WebKit
+url = https://github.com/Jarred-Sumner/WebKit.git
+ignore = dirty
+depth = 1
 [submodule "src/deps/mimalloc"]
-	path = src/deps/mimalloc
-	url = https://github.com/Jarred-Sumner/mimalloc.git
-	ignore = dirty
-	depth = 1
+path = src/deps/mimalloc
+url = https://github.com/Jarred-Sumner/mimalloc.git
+ignore = dirty
+depth = 1
 [submodule "src/deps/zlib"]
-	path = src/deps/zlib
-	url = https://github.com/cloudflare/zlib.git
-	ignore = dirty
-	depth = 1
+path = src/deps/zlib
+url = https://github.com/cloudflare/zlib.git
+ignore = dirty
+depth = 1
 [submodule "src/deps/libarchive"]
-	path = src/deps/libarchive
-	url = https://github.com/libarchive/libarchive.git
-	ignore = dirty
-	depth = 1
+path = src/deps/libarchive
+url = https://github.com/libarchive/libarchive.git
+ignore = dirty
+depth = 1
 [submodule "src/deps/boringssl"]
-	path = src/deps/boringssl
-	url = https://github.com/google/boringssl.git
-	ignore = dirty
-	depth = 1
+path = src/deps/boringssl
+url = https://github.com/google/boringssl.git
+ignore = dirty
+depth = 1
 [submodule "src/deps/libbacktrace"]
-	path = src/deps/libbacktrace
-	url = https://github.com/ianlancetaylor/libbacktrace
-	ignore = dirty
-	depth = 1
+path = src/deps/libbacktrace
+url = https://github.com/ianlancetaylor/libbacktrace
+ignore = dirty
+depth = 1
 [submodule "src/deps/lol-html"]
-	path = src/deps/lol-html
-	url = https://github.com/cloudflare/lol-html
-	ignore = dirty
-	depth = 1
+path = src/deps/lol-html
+url = https://github.com/cloudflare/lol-html
+ignore = dirty
+depth = 1
 [submodule "src/deps/uws"]
-	path = src/deps/uws
-	url = https://github.com/Jarred-Sumner/uWebSockets
-	ignore = dirty
-	depth = 1
+path = src/deps/uws
+url = https://github.com/Jarred-Sumner/uWebSockets
+ignore = dirty
+depth = 1
 [submodule "src/deps/tinycc"]
-	path = src/deps/tinycc
-	url = https://github.com/Jarred-Sumner/tinycc.git
-	ignore = dirty
-	depth = 1
+path = src/deps/tinycc
+url = https://github.com/Jarred-Sumner/tinycc.git
+ignore = dirty
+depth = 1
diff --git a/.scripts/write-versions.sh b/.scripts/write-versions.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 set -euxo pipefail
 
-WEBKIT_VERSION=$(git rev-parse HEAD:./src/javascript/jsc/WebKit)
+WEBKIT_VERSION=$(git rev-parse HEAD:./src/bun.js/WebKit)
 MIMALLOC_VERSION=$(git rev-parse HEAD:./src/deps/mimalloc)
 LIBARCHIVE_VERSION=$(git rev-parse HEAD:./src/deps/libarchive)
 PICOHTTPPARSER_VERSION=$(git rev-parse HEAD:./src/deps/picohttpparser)

diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json
@@ -2,26 +2,24 @@
   "configurations": [
     {
       "name": "Mac",
-      "forcedInclude": [
-        "${workspaceFolder}/src/javascript/jsc/bindings/root.h"
-      ],
+      "forcedInclude": ["${workspaceFolder}/src/bun.js/bindings/root.h"],
       "includePath": [
         "${workspaceFolder}/src/JavaScript/jsc/WebKit/WebKitBuild/Release/JavaScriptCore/PrivateHeaders/",
         "${workspaceFolder}/src/JavaScript/jsc/WebKit/WebKitBuild/Release/WTF/Headers",
         "${workspaceFolder}/src/JavaScript/jsc/WebKit/WebKitBuild/Release/*",
         "${workspaceFolder}/src/JavaScript/jsc/bindings/",
         "${workspaceFolder}/src/JavaScript/jsc/WebKit/Source/bmalloc/",
-        "${workspaceFolder}/src/javascript/jsc/WebKit/WebKitBuild/Release/ICU/Headers/"
+        "${workspaceFolder}/src/bun.js/WebKit/WebKitBuild/Release/ICU/Headers/"
       ],
       "browse": {
         "path": [
-          "${workspaceFolder}/src/javascript/jsc/bindings/*",
+          "${workspaceFolder}/src/bun.js/bindings/*",
           "${workspaceFolder}/src/JavaScript/jsc/WebKit/WebKitBuild/Release/JavaScriptCore/PrivateHeaders/",
           "${workspaceFolder}/src/JavaScript/jsc/WebKit/WebKitBuild/Release/WTF/Headers/**",
           "${workspaceFolder}/src/JavaScript/jsc/WebKit/WebKitBuild/Release/*",
           "${workspaceFolder}/src/JavaScript/jsc/bindings/**",
           "${workspaceFolder}/src/JavaScript/jsc/WebKit/Source/bmalloc/**",
-          "${workspaceFolder}/src/javascript/jsc/WebKit/WebKitBuild/Release/ICU/Headers/"
+          "${workspaceFolder}/src/bun.js/WebKit/WebKitBuild/Release/ICU/Headers/"
         ],
         "limitSymbolsToIncludedHeaders": true,
         "databaseFilename": ".vscode/cppdb"

diff --git a/.vscode/launch.json b/.vscode/launch.json
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -44,9 +44,9 @@
     "**/*.xcodeproj": true,
     "packages/bun-types/*.d.ts": true,
 
-    "integration/snapshots": true,
-    "integration/snapshots-no-hmr": true,
-    "src/javascript/jsc/WebKit": true,
+    "test/snapshots": true,
+    "test/snapshots-no-hmr": true,
+    "src/bun.js/WebKit": true,
     "src/deps/libarchive": true,
     "src/deps/mimalloc": true,
     "src/deps/s2n-tls": true,
@@ -55,25 +55,25 @@
     "src/deps/uws": true,
     "src/deps/zlib": true,
     "src/deps/lol-html": true,
-    "integration/snippets/package-json-exports/_node_modules_copy": true
+    "test/snippets/package-json-exports/_node_modules_copy": true
   },
   "C_Cpp.files.exclude": {
     "**/.vscode": true,
-    "src/javascript/jsc/WebKit/JSTests": true,
-    "src/javascript/jsc/WebKit/Tools": true,
-    "src/javascript/jsc/WebKit/WebDriverTests": true,
-    "src/javascript/jsc/WebKit/WebKit.xcworkspace": true,
-    "src/javascript/jsc/WebKit/WebKitLibraries": true,
-    "src/javascript/jsc/WebKit/Websites": true,
-    "src/javascript/jsc/WebKit/resources": true,
-    "src/javascript/jsc/WebKit/LayoutTests": true,
-    "src/javascript/jsc/WebKit/ManualTests": true,
-    "src/javascript/jsc/WebKit/PerformanceTests": true,
-    "src/javascript/jsc/WebKit/WebKitLegacy": true,
-    "src/javascript/jsc/WebKit/WebCore": true,
-    "src/javascript/jsc/WebKit/WebDriver": true,
-    "src/javascript/jsc/WebKit/WebKitBuild": true,
-    "src/javascript/jsc/WebKit/WebInspectorUI": true
+    "src/bun.js/WebKit/JSTests": true,
+    "src/bun.js/WebKit/Tools": true,
+    "src/bun.js/WebKit/WebDriverTests": true,
+    "src/bun.js/WebKit/WebKit.xcworkspace": true,
+    "src/bun.js/WebKit/WebKitLibraries": true,
+    "src/bun.js/WebKit/Websites": true,
+    "src/bun.js/WebKit/resources": true,
+    "src/bun.js/WebKit/LayoutTests": true,
+    "src/bun.js/WebKit/ManualTests": true,
+    "src/bun.js/WebKit/PerformanceTests": true,
+    "src/bun.js/WebKit/WebKitLegacy": true,
+    "src/bun.js/WebKit/WebCore": true,
+    "src/bun.js/WebKit/WebDriver": true,
+    "src/bun.js/WebKit/WebKitBuild": true,
+    "src/bun.js/WebKit/WebInspectorUI": true
   },
   "[cpp]": {
     "editor.defaultFormatter": "xaver.clang-format"

diff --git a/Dockerfile b/Dockerfile
@@ -428,7 +428,7 @@ ENV PATH "${BUN_DIR}/packages/bun-linux-x64:${BUN_DIR}/packages/bun-linux-aarch6
 ENV CI 1
 ENV BROWSER_EXECUTABLE /usr/bin/chromium
 
-COPY ./integration ${BUN_DIR}/integration
+COPY ./test ${BUN_DIR}/test
 COPY Makefile ${BUN_DIR}/Makefile
 COPY package.json ${BUN_DIR}/package.json
 COPY .docker/run-test.sh ${BUN_DIR}/run-test.sh

diff --git a/Dockerfile.musl b/Dockerfile.musl
@@ -130,9 +130,9 @@
 
 # WORKDIR /bun
 
-# COPY ./integration /bun/integration
-# COPY ./integration/snippets/package-json-exports/_node_modules_copy /bun/integration/snippets/package-json-exports/_node_modules_copy 
-# CMD [ "bash", "-c", "npm install && cd /bun/integration/snippets && npm install && cd /bun && make copy-test-node-modules test-all"]
+# COPY ./test /bun/test
+# COPY ./test/snippets/package-json-exports/_node_modules_copy /bun/test/snippets/package-json-exports/_node_modules_copy 
+# CMD [ "bash", "-c", "npm install && cd /bun/test/snippets && npm install && cd /bun && make copy-test-node-modules test-all"]
 
 
 # # FROM bun