Merge de20ae0 into d60db67

vercel · Feb 1, 2023 · a7528f7 · a7528f7
2 parents d60db67 + de20ae0
commit a7528f7
Show file tree

Hide file tree

Showing 30 changed files with 93 additions and 2 deletions.
diff --git a/crates/turbopack-ecmascript/js/src/runtime.js b/crates/turbopack-ecmascript/js/src/runtime.js
@@ -197,6 +197,9 @@ function externalRequire(id, esm) {
   interopEsm(raw, ns, true);
   return ns;
 }
+externalRequire.resolve = (name, opt) => {
+  return require.resolve(name, opt);
+};
 
 /**
  * @param {ModuleId} from

diff --git a/crates/turbopack-node/js/src/transforms/webpack-loaders.ts b/crates/turbopack-node/js/src/transforms/webpack-loaders.ts
@@ -1,4 +1,6 @@
-declare const __turbopack_external_require__: (id: string) => any;
+declare const __turbopack_external_require__: {
+  resolve: (name: string, opt: { paths: string[] }) => string;
+} & ((id: string) => any);
 
 import type { Ipc } from "../ipc/evaluate";
 import {
@@ -58,7 +60,9 @@ const transform = (
           },
         },
         loaders: loadersWithOptions.map((loader) => ({
-          loader: require.resolve(loader.loader, { paths: [resourceDir] }),
+          loader: __turbopack_external_require__.resolve(loader.loader, {
+            paths: [resourceDir],
+          }),
           options: loader.options,
         })),
         readResource: (_filename, callback) => {

diff --git a/...hunk/output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_index_86ad1c.js b/...hunk/output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_index_86ad1c.js
diff --git a/.../chunked/output/crates_turbopack-tests_tests_snapshot_basic_chunked_input_index_7b0a2d.js b/.../chunked/output/crates_turbopack-tests_tests_snapshot_basic_chunked_input_index_7b0a2d.js
diff --git a/...utput/crates_turbopack-tests_tests_snapshot_css_absolute-uri-import_input_index_cc4e03.js b/...utput/crates_turbopack-tests_tests_snapshot_css_absolute-uri-import_input_index_cc4e03.js
diff --git a/...apshot/css/css/output/crates_turbopack-tests_tests_snapshot_css_css_input_index_ffc44e.js b/...apshot/css/css/output/crates_turbopack-tests_tests_snapshot_css_css_input_index_ffc44e.js
diff --git a/...motion/output/crates_turbopack-tests_tests_snapshot_emotion_emotion_input_index_6545dc.js b/...motion/output/crates_turbopack-tests_tests_snapshot_emotion_emotion_input_index_6545dc.js
diff --git a/...sts/snapshot/env/env/output/crates_turbopack-tests_tests_snapshot_env_env_input_79db8d.js b/...sts/snapshot/env/env/output/crates_turbopack-tests_tests_snapshot_env_env_input_79db8d.js
diff --git a/...me_entry/output/a587c_tests_snapshot_evaluated_entrry_runtime_entry_input_index_82abf8.js b/...me_entry/output/a587c_tests_snapshot_evaluated_entrry_runtime_entry_input_index_82abf8.js
diff --git a/...xample/output/crates_turbopack-tests_tests_snapshot_example_example_input_index_3ac8f1.js b/...xample/output/crates_turbopack-tests_tests_snapshot_example_example_input_index_3ac8f1.js
diff --git a/...js-2/output/crates_turbopack-tests_tests_snapshot_export-alls_cjs-2_input_index_0ea679.js b/...js-2/output/crates_turbopack-tests_tests_snapshot_export-alls_cjs-2_input_index_0ea679.js
diff --git a/...output/crates_turbopack-tests_tests_snapshot_export-alls_cjs-script_input_index_1cb91d.js b/...output/crates_turbopack-tests_tests_snapshot_export-alls_cjs-script_input_index_1cb91d.js
diff --git a/...ta/cjs/output/crates_turbopack-tests_tests_snapshot_import-meta_cjs_input_index_15c5b2.js b/...ta/cjs/output/crates_turbopack-tests_tests_snapshot_import-meta_cjs_input_index_15c5b2.js
diff --git a/...utput/79fb1_turbopack-tests_tests_snapshot_import-meta_esm-multiple_input_index_600f46.js b/...utput/79fb1_turbopack-tests_tests_snapshot_import-meta_esm-multiple_input_index_600f46.js
diff --git a/...utput/crates_turbopack-tests_tests_snapshot_import-meta_esm-mutable_input_index_821998.js b/...utput/crates_turbopack-tests_tests_snapshot_import-meta_esm-mutable_input_index_821998.js
diff --git a/...output/crates_turbopack-tests_tests_snapshot_import-meta_esm-object_input_index_3e4780.js b/...output/crates_turbopack-tests_tests_snapshot_import-meta_esm-object_input_index_3e4780.js
diff --git a/...ta/esm/output/crates_turbopack-tests_tests_snapshot_import-meta_esm_input_index_a09dae.js b/...ta/esm/output/crates_turbopack-tests_tests_snapshot_import-meta_esm_input_index_a09dae.js
diff --git a/...ta/url/output/crates_turbopack-tests_tests_snapshot_import-meta_url_input_index_5f9b2b.js b/...ta/url/output/crates_turbopack-tests_tests_snapshot_import-meta_url_input_index_5f9b2b.js
diff --git a/...ynamic/output/crates_turbopack-tests_tests_snapshot_imports_dynamic_input_index_02e5e6.js b/...ynamic/output/crates_turbopack-tests_tests_snapshot_imports_dynamic_input_index_02e5e6.js
diff --git a/...orts/json/output/crates_turbopack-tests_tests_snapshot_imports_json_input_index_6aa119.js b/...orts/json/output/crates_turbopack-tests_tests_snapshot_imports_json_input_index_6aa119.js
diff --git a/...tput/79fb1_turbopack-tests_tests_snapshot_imports_resolve_error_cjs_input_index_17aed8.js b/...tput/79fb1_turbopack-tests_tests_snapshot_imports_resolve_error_cjs_input_index_17aed8.js
diff --git a/...tput/79fb1_turbopack-tests_tests_snapshot_imports_resolve_error_esm_input_index_8b9f00.js b/...tput/79fb1_turbopack-tests_tests_snapshot_imports_resolve_error_esm_input_index_8b9f00.js
diff --git a/...put/79fb1_turbopack-tests_tests_snapshot_imports_static-and-dynamic_input_index_dbdca3.js b/...put/79fb1_turbopack-tests_tests_snapshot_imports_static-and-dynamic_input_index_dbdca3.js
diff --git a/.../static/output/crates_turbopack-tests_tests_snapshot_imports_static_input_index_9cc7ba.js b/.../static/output/crates_turbopack-tests_tests_snapshot_imports_static_input_index_9cc7ba.js
diff --git a/...ut/79fb1_turbopack-tests_tests_snapshot_node_node_protocol_external_input_index_af312f.js b/...ut/79fb1_turbopack-tests_tests_snapshot_node_node_protocol_external_input_index_af312f.js
diff --git a/...nts/output/a587c_tests_snapshot_styled_components_styled_components_input_index_114b79.js b/...nts/output/a587c_tests_snapshot_styled_components_styled_components_input_index_114b79.js
diff --git a/...ut/a587c_tests_snapshot_swc_transforms_mono_transforms_input_packages_app_index_a3868e.js b/...ut/a587c_tests_snapshot_swc_transforms_mono_transforms_input_packages_app_index_a3868e.js
diff --git a/...tput/79fb1_turbopack-tests_tests_snapshot_swc_transforms_preset_env_input_index_aeb540.js b/...tput/79fb1_turbopack-tests_tests_snapshot_swc_transforms_preset_env_input_index_aeb540.js
diff --git a/...ut/79fb1_turbopack-tests_tests_snapshot_typescript_jsconfig-baseurl_input_index_2fc4fa.js b/...ut/79fb1_turbopack-tests_tests_snapshot_typescript_jsconfig-baseurl_input_index_2fc4fa.js
diff --git a/...-baseurl/output/a587c_tests_snapshot_typescript_tsconfig-baseurl_input_index_f4a13c.ts.js b/...-baseurl/output/a587c_tests_snapshot_typescript_tsconfig-baseurl_input_index_f4a13c.ts.js