Unverified Commit 79107ebd authored by Jimmy Miller's avatar Jimmy Miller Committed by GitHub

Turbopack: use analyzed references for fragment facades (#100852)

Use the same analyzed references for facade graph traversal and code
generation so pruned evaluation fragments cannot leave dangling imports.

Add a regression test for a client reexport of a side-effect-free
barrel.
parent 12469cdb
export default function RootLayout({
children,
}: {
children: React.ReactNode
}) {
return (
<html>
<body>{children}</body>
</html>
)
}
'use client'
// Keep this module a pure reexport so its evaluation fragment can be pruned.
export { MotionConfig } from 'motion-lib'
import { MotionConfig } from './motion-config'
export default function Page() {
return (
<main>
<h1>home</h1>
<div id="motion">
<MotionConfig />
</div>
</main>
)
}
/** @type {import("next").NextConfig} */
module.exports = {
experimental: { turbopackModuleFragments: true },
}
export { MotionConfig } from './components/motion-config.js'
export { Unused } from './components/unused.js'
{
"name": "motion-lib",
"version": "1.0.0",
"type": "module",
"sideEffects": false,
"exports": {
"default": "./index.js"
}
}
import { nextTestSetup } from 'e2e-utils'
// A pure client reexport can have its evaluation fragment pruned. Its facade
// must expose the same references to the graph and codegen so the removed
// dependency does not leave an import to a fragment without a module ID.
describe('treeshake-client', () => {
const { next } = nextTestSetup({ files: __dirname })
it('builds a client re-export of a side-effect-free external barrel', async () => {
const browser = await next.browser('/')
expect(await browser.elementById('motion').text()).toBe('k')
})
})
use anyhow::Result;
use turbo_rcstr::{RcStr, rcstr};
use turbo_rcstr::RcStr;
use turbo_tasks::{ResolvedVc, Vc};
use turbopack_core::{
chunk::{AsyncModuleInfo, ChunkableModule, ChunkingContext, EvaluatableAsset},
ident::AssetIdent,
module::{Module, ModuleSideEffects},
module_graph::ModuleGraph,
reference::{ModuleReference, ModuleReferences, SingleChunkableModuleReference},
resolve::{ExportUsage, ModulePart},
reference::ModuleReferences,
resolve::ModulePart,
};
use crate::{
......@@ -320,33 +320,6 @@ impl Module for EcmascriptModulePartAsset {
#[turbo_tasks::function]
async fn references(&self) -> Result<Vc<ModuleReferences>> {
let part_dep = |part: ModulePart| -> Vc<Box<dyn ModuleReference>> {
let export = match &part {
ModulePart::Export(export) | ModulePart::PartialExport { export, .. } => {
ExportUsage::named(export.clone())
}
ModulePart::Evaluation => ExportUsage::evaluation(),
_ => ExportUsage::all(),
};
Vc::upcast(SingleChunkableModuleReference::new(
Vc::upcast(EcmascriptModulePartAsset::new_with_resolved_part(
*self.full_module,
part,
)),
rcstr!("part reference"),
export,
))
};
if let ModulePart::Facade = self.part {
// Facade depends on evaluation and re-exports
let mut references = vec![];
references.push(part_dep(ModulePart::evaluation()).to_resolved().await?);
references.push(part_dep(ModulePart::exports()).to_resolved().await?);
return Ok(Vc::cell(references));
}
let analyze = analyze_ecmascript_module(*self.full_module, Some(self.part.clone()));
Ok(analyze.references())
......
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