Merge branch 'main' into main

crates/turbopack-cli/js/src/entry/client.ts

@@ -1,9 +1,9 @@
-import { connect } from "@vercel/turbopack-ecmascript-runtime/dev/client/hmr-client";
+import { connect } from "@vercel/turbopack-ecmascript-runtime/browser/dev/hmr-client/hmr-client";
 import {
   connectHMR,
   addMessageListener,
   sendMessage,
-} from "@vercel/turbopack-ecmascript-runtime/dev/client/websocket";
+} from "@vercel/turbopack-ecmascript-runtime/browser/dev/hmr-client/websocket";
 
 export function initializeHMR(options: { assetPrefix: string }) {
   connect({

crates/turbopack-ecmascript-runtime/js/package.json

@@ -6,11 +6,11 @@
   "private": true,
   "scripts": {
     "check": "run-p check:*",
-    "check:build": "tsc -p src/build",
-    "check:dev-client": "tsc -p src/dev/client",
-    "check:dev-runtime-base": "tsc -p src/dev/runtime/base",
-    "check:dev-runtime-dom": "tsc -p src/dev/runtime/dom",
-    "check:dev-runtime-edge": "tsc -p src/dev/runtime/edge"
+    "check:nodejs": "tsc -p src/nodejs",
+    "check:browser-dev-client": "tsc -p src/browser/dev/hmr-client",
+    "check:browser-dev-runtime-base": "tsc -p src/browser/dev/runtime/base",
+    "check:browser-dev-runtime-dom": "tsc -p src/browser/dev/runtime/dom",
+    "check:browser-dev-runtime-edge": "tsc -p src/browser/dev/runtime/edge"
   },
   "exports": {
     ".": "./src/main.js",

crates/turbopack-ecmascript-runtime/js/src/dev/client/hmr-client.ts → crates/turbopack-ecmascript-runtime/js/src/browser/dev/hmr-client/hmr-client.ts

@@ -1,4 +1,4 @@
-/// <reference path="../../shared/runtime-types.d.ts" />
+/// <reference path="../../../shared/runtime-types.d.ts" />
 /// <reference path="../runtime/base/globals.d.ts" />
 /// <reference path="../runtime/base/protocol.d.ts" />
 /// <reference path="../runtime/base/extensions.d.ts" />

crates/turbopack-ecmascript-runtime/js/src/dev/client/tsconfig.json → crates/turbopack-ecmascript-runtime/js/src/browser/dev/hmr-client/tsconfig.json

@@ -1,5 +1,5 @@
 {
-  "extends": "../../tsconfig.base.json",
+  "extends": "../../../tsconfig.base.json",
   "compilerOptions": {
     "skipLibCheck": true,
 

crates/turbopack-ecmascript-runtime/js/src/dev/runtime/base/dummy.ts → crates/turbopack-ecmascript-runtime/js/src/browser/dev/runtime/base/dummy.ts

@@ -5,7 +5,7 @@
  * This interface will be implemented by runtime backends.
  */
 
-/// <reference path="../../../shared/require-type.d.ts" />
+/// <reference path="../../../../shared/require-type.d.ts" />
 
 declare var BACKEND: RuntimeBackend;
 declare var _eval: (code: EcmascriptModuleEntry) => any;

crates/turbopack-ecmascript-runtime/js/src/dev/runtime/base/runtime-base.ts → crates/turbopack-ecmascript-runtime/js/src/browser/dev/runtime/base/runtime-base.ts

@@ -8,7 +8,7 @@
 
 /* eslint-disable @next/next/no-assign-module-variable */
 
-/// <reference path="../../../shared/runtime-utils.ts" />
+/// <reference path="../../../../shared/runtime-utils.ts" />
 /// <reference path="./globals.d.ts" />
 /// <reference path="./protocol.d.ts" />
 /// <reference path="./extensions.d.ts" />

crates/turbopack-ecmascript-runtime/js/src/dev/runtime/base/tsconfig.json → crates/turbopack-ecmascript-runtime/js/src/browser/dev/runtime/base/tsconfig.json

@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.base.json",
+  "extends": "../../../../tsconfig.base.json",
   "compilerOptions": {
     // environment, we need WebWorker for WebAssembly types
     "lib": ["ESNext", "WebWorker"]

crates/turbopack-ecmascript-runtime/js/src/dev/runtime/dom/runtime-backend-dom.ts → crates/turbopack-ecmascript-runtime/js/src/browser/dev/runtime/dom/runtime-backend-dom.ts

@@ -6,7 +6,7 @@
  */
 
 /// <reference path="../base/runtime-base.ts" />
-/// <reference path="../../../shared/require-type.d.ts" />
+/// <reference path="../../../../shared/require-type.d.ts" />
 
 type ChunkResolver = {
   resolved: boolean;

crates/turbopack-ecmascript-runtime/js/src/dev/runtime/dom/tsconfig.json → crates/turbopack-ecmascript-runtime/js/src/browser/dev/runtime/dom/tsconfig.json

@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.base.json",
+  "extends": "../../../../tsconfig.base.json",
   "compilerOptions": {
     // environment
     "lib": ["ESNext", "DOM"]

crates/turbopack-ecmascript-runtime/js/src/dev/runtime/edge/runtime-backend-edge.ts → crates/turbopack-ecmascript-runtime/js/src/browser/dev/runtime/edge/runtime-backend-edge.ts

@@ -6,8 +6,8 @@
  */
 
 /// <reference path="../base/runtime-base.ts" />
-/// <reference path="../../../shared-node/base-externals-utils.ts" />
-/// <reference path="../../../shared/require-type.d.ts" />
+/// <reference path="../../../../shared-node/base-externals-utils.ts" />
+/// <reference path="../../../../shared/require-type.d.ts" />
 
 type ChunkRunner = {
   requiredChunks: Set<ChunkPath>;

crates/turbopack-ecmascript-runtime/js/src/dev/runtime/edge/tsconfig.json → crates/turbopack-ecmascript-runtime/js/src/browser/dev/runtime/edge/tsconfig.json

@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.base.json",
+  "extends": "../../../../tsconfig.base.json",
   "compilerOptions": {
     // environment, we need WebWorker for WebAssembly types
     "lib": ["ESNext", "WebWorker"]

crates/turbopack-ecmascript-runtime/src/browser_runtime.rs

@@ -23,8 +23,10 @@ pub async fn get_browser_runtime_code(
 
     let shared_runtime_utils_code =
         embed_static_code(asset_context, "shared/runtime-utils.ts".into());
-    let runtime_base_code =
-        embed_static_code(asset_context, "dev/runtime/base/runtime-base.ts".into());
+    let runtime_base_code = embed_static_code(
+        asset_context,
+        "browser/dev/runtime/base/runtime-base.ts".into(),
+    );
 
     let chunk_loading = &*asset_context
         .compile_time_info()
@@ -35,12 +37,12 @@ pub async fn get_browser_runtime_code(
     let runtime_backend_code = embed_static_code(
         asset_context,
         match chunk_loading {
-            ChunkLoading::Edge => "dev/runtime/edge/runtime-backend-edge.ts".into(),
+            ChunkLoading::Edge => "browser/dev/runtime/edge/runtime-backend-edge.ts".into(),
             // This case should never be hit.
             ChunkLoading::NodeJs => {
                 panic!("Node.js runtime is not supported in the browser runtime!")
             }
-            ChunkLoading::Dom => "dev/runtime/dom/runtime-backend-dom.ts".into(),
+            ChunkLoading::Dom => "browser/dev/runtime/dom/runtime-backend-dom.ts".into(),
         },
     );
 

crates/turbopack-ecmascript-runtime/src/lib.rs

@@ -2,17 +2,17 @@
 
 pub(crate) mod asset_context;
 pub(crate) mod browser_runtime;
-pub(crate) mod build_runtime;
 #[cfg(feature = "test")]
 pub(crate) mod dummy_runtime;
 pub(crate) mod embed_js;
+pub(crate) mod nodejs_runtime;
 pub(crate) mod runtime_type;
 
 pub use browser_runtime::get_browser_runtime_code;
-pub use build_runtime::get_nodejs_runtime_code;
 #[cfg(feature = "test")]
 pub use dummy_runtime::get_dummy_runtime_code;
 pub use embed_js::{embed_file, embed_file_path, embed_fs};
+pub use nodejs_runtime::get_nodejs_runtime_code;
 pub use runtime_type::RuntimeType;
 
 pub fn register() {

crates/turbopack-ecmascript-runtime/src/build_runtime.rs → crates/turbopack-ecmascript-runtime/src/nodejs_runtime.rs

@@ -20,7 +20,7 @@ pub async fn get_nodejs_runtime_code(environment: Vc<Environment>) -> Result<Vc<
         embed_static_code(asset_context, "shared-node/node-externals-utils.ts".into());
     let shared_node_wasm_utils_code =
         embed_static_code(asset_context, "shared-node/node-wasm-utils.ts".into());
-    let runtime_code = embed_static_code(asset_context, "build/runtime.ts".into());
+    let runtime_code = embed_static_code(asset_context, "nodejs/runtime.ts".into());
 
     let mut code = CodeBuilder::default();
     code.push_code(&*shared_runtime_utils_code.await?);