Unverified Commit f5841365 authored by Niklas Mischkulnig's avatar Niklas Mischkulnig Committed by GitHub

Turbopack: trace graceful-fs calls (#97694)

parent 9fbec930
...@@ -13,6 +13,8 @@ pub enum WellKnownObjectKind { ...@@ -13,6 +13,8 @@ pub enum WellKnownObjectKind {
FsModulePromises, FsModulePromises,
FsExtraModule, FsExtraModule,
FsExtraModuleDefault, FsExtraModuleDefault,
GracefulFsModule,
GracefulFsModuleDefault,
ModuleModule, ModuleModule,
ModuleModuleDefault, ModuleModuleDefault,
UrlModule, UrlModule,
...@@ -84,6 +86,10 @@ impl WellKnownObjectKind { ...@@ -84,6 +86,10 @@ impl WellKnownObjectKind {
"fs-extra", "fs-extra",
"The Node.js fs-extra module: https://github.com/jprichardson/node-fs-extra", "The Node.js fs-extra module: https://github.com/jprichardson/node-fs-extra",
), ),
Self::GracefulFsModule | Self::GracefulFsModuleDefault => (
"graceful-fs",
"The Node.js graceful-fs module: https://github.com/isaacs/node-graceful-fs",
),
Self::FsModulePromises => ( Self::FsModulePromises => (
"fs/promises", "fs/promises",
"The Node.js fs module: https://nodejs.org/api/fs.html#promises-api", "The Node.js fs module: https://nodejs.org/api/fs.html#promises-api",
......
...@@ -696,7 +696,9 @@ async fn well_known_object_member<'a>( ...@@ -696,7 +696,9 @@ async fn well_known_object_member<'a>(
} }
WellKnownObjectKind::FsModule WellKnownObjectKind::FsModule
| WellKnownObjectKind::FsModuleDefault | WellKnownObjectKind::FsModuleDefault
| WellKnownObjectKind::FsModulePromises => { | WellKnownObjectKind::FsModulePromises
| WellKnownObjectKind::GracefulFsModule
| WellKnownObjectKind::GracefulFsModuleDefault => {
fs_module_member(arena.get_or_default(), kind, prop) fs_module_member(arena.get_or_default(), kind, prop)
} }
WellKnownObjectKind::FsExtraModule | WellKnownObjectKind::FsExtraModuleDefault => { WellKnownObjectKind::FsExtraModule | WellKnownObjectKind::FsExtraModuleDefault => {
...@@ -935,6 +937,9 @@ fn fs_extra_module_member<'a>( ...@@ -935,6 +937,9 @@ fn fs_extra_module_member<'a>(
word.into(), word.into(),
)); ));
} }
(.., "readdir" | "readdirSync") => {
return JsValue::WellKnownFunction(WellKnownFunctionKind::FsReadDir);
}
// fs-extra specific // fs-extra specific
( (
.., ..,
......
...@@ -268,6 +268,7 @@ pub fn module_value_to_well_known_object<'a>(module_value: &ModuleValue) -> Opti ...@@ -268,6 +268,7 @@ pub fn module_value_to_well_known_object<'a>(module_value: &ModuleValue) -> Opti
b"resolve-from" => JsValue::WellKnownFunction(WellKnownFunctionKind::NodeResolveFrom), b"resolve-from" => JsValue::WellKnownFunction(WellKnownFunctionKind::NodeResolveFrom),
b"@grpc/proto-loader" => JsValue::WellKnownObject(WellKnownObjectKind::NodeProtobufLoader), b"@grpc/proto-loader" => JsValue::WellKnownObject(WellKnownObjectKind::NodeProtobufLoader),
b"fs-extra" => JsValue::WellKnownObject(WellKnownObjectKind::FsExtraModule), b"fs-extra" => JsValue::WellKnownObject(WellKnownObjectKind::FsExtraModule),
b"graceful-fs" => JsValue::WellKnownObject(WellKnownObjectKind::GracefulFsModule),
_ => return None, _ => return None,
}) })
} }
......
;[ ;[
// TODO // TODO we currently don't npm install in the unit test fixture
// 'node_modules/fs-extra/lib/copy/copy-sync.js', // 'node_modules/fs-extra/lib/copy/copy-sync.js',
// 'node_modules/fs-extra/lib/copy/copy.js', // 'node_modules/fs-extra/lib/copy/copy.js',
// 'node_modules/fs-extra/lib/copy/index.js', // 'node_modules/fs-extra/lib/copy/index.js',
......
;[ ;[
'node_modules/graceful-fs/clone.js', // TODO we currently don't npm install in the unit test fixture
'node_modules/graceful-fs/graceful-fs.js', // 'node_modules/graceful-fs/clone.js',
'node_modules/graceful-fs/legacy-streams.js', // 'node_modules/graceful-fs/graceful-fs.js',
'node_modules/graceful-fs/package.json', // 'node_modules/graceful-fs/legacy-streams.js',
'node_modules/graceful-fs/polyfills.js', // 'node_modules/graceful-fs/package.json',
// 'node_modules/graceful-fs/polyfills.js',
'package.json', 'package.json',
'test/unit/asset-graceful-fs/asset.txt', 'test/unit/asset-graceful-fs/asset.txt',
'test/unit/asset-graceful-fs/input.js', 'test/unit/asset-graceful-fs/input.js',
......
...@@ -67,7 +67,7 @@ static ALLOC: turbo_tasks_malloc::TurboMalloc = turbo_tasks_malloc::TurboMalloc; ...@@ -67,7 +67,7 @@ static ALLOC: turbo_tasks_malloc::TurboMalloc = turbo_tasks_malloc::TurboMalloc;
#[case::asset_fs_inlining("asset-fs-inlining")] #[case::asset_fs_inlining("asset-fs-inlining")]
#[case::asset_fs_inlining_multi("asset-fs-inlining-multi")] #[case::asset_fs_inlining_multi("asset-fs-inlining-multi")]
#[case::asset_fs_logical("asset-fs-logical")] #[case::asset_fs_logical("asset-fs-logical")]
// #[case::asset_graceful_fs("asset-graceful-fs")] #[case::asset_graceful_fs("asset-graceful-fs")]
#[case::asset_node_require("asset-node-require")] #[case::asset_node_require("asset-node-require")]
#[case::asset_package_json("asset-package-json")] #[case::asset_package_json("asset-package-json")]
#[case::asset_symlink("asset-symlink")] #[case::asset_symlink("asset-symlink")]
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment