@animus-ui/next-plugin 0.1.25 → 0.1.27

package/dist/index.cjs

@@ -1,10 +1,32 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_turbopack_config = require("./turbopack-config-D-6BRBYi.cjs");
+const require_turbopack_config = require("./turbopack-config-BoNfzhNu.cjs");
 let _animus_ui_extract_pipeline = require("@animus-ui/extract/pipeline");
 let _animus_ui_extract_session = require("@animus-ui/extract/session");
 let fs = require("fs");
 let path = require("path");
 let url = require("url");
+//#region src/same-directory.ts
+/** Whether two paths name one directory: by real path, which resolves a
+*  trailing slash, a symlink and the filesystem's own spelling, else by
+*  device and inode. */
+function sameDirectory(a, b) {
+	const real = (path$5) => {
+		try {
+			return fs.realpathSync.native(path$5);
+		} catch {
+			return (0, path.resolve)(path$5);
+		}
+	};
+	if (real(a) === real(b)) return true;
+	try {
+		const left = (0, fs.statSync)(a);
+		const right = (0, fs.statSync)(b);
+		return left.dev === right.dev && left.ino === right.ino;
+	} catch {
+		return false;
+	}
+}
+//#endregion
 //#region src/plugin.ts
 /** The value arrives from a consumer's `next.config`, so the union above is a
 *  model of what webpack accepts, not a proof about the value in hand. */
@@ -16,6 +38,9 @@ var AnimusWebpackPlugin = class {
 	options;
 	session;
 	initialized = false;
+	/** Left its build: the next turn joins again and catches up, retried
+	*  until it succeeds, never reusing the startup it already consumed. */
+	rejoining = false;
 	aliasesExtracted = false;
 	animusLoaderPaths;
 	lastBuiltEpoch = null;
@@ -25,13 +50,15 @@ var AnimusWebpackPlugin = class {
 	watchFailure = null;
 	/** `development` is `next dev`: an error-level diagnostic reports and the
 	*  compilation keeps publishing, whatever the emission mode. */
-	constructor(options, { development = false } = {}) {
+	constructor(options, { development = false, build } = {}) {
 		this.options = options;
-		(0, _animus_ui_extract_pipeline.assertNoRetiredEngineSelection)(options.engine);
-		(0, _animus_ui_extract_session.setSharedEngine)(options.engine ?? "v2");
-		this.session = new _animus_ui_extract_session.ExtractionSession(options);
+		(0, _animus_ui_extract_pipeline.assertSupportedEngine)(options.engine);
+		this.session = new _animus_ui_extract_session.ExtractionSession(options, { build });
 		this.session.development = development;
-		this.session.systemPropsModuleId = _animus_ui_extract_session.TURBOPACK_SYSTEM_PROPS_ID;
+		this.session.delivery = {
+			...this.session.delivery,
+			systemPropsModuleId: _animus_ui_extract_session.TURBOPACK_SYSTEM_PROPS_ID
+		};
 		this.animusLoaderPaths = /* @__PURE__ */ new Set([require_turbopack_config.resolveAnimusLoaderPath()]);
 		if (options.loaderPath) this.animusLoaderPaths.add(options.loaderPath);
 	}
@@ -51,14 +78,22 @@ var AnimusWebpackPlugin = class {
 		else if (Array.isArray(ignored)) {
 			if (!ignored.includes(epochPath)) ignored.push(epochPath);
 		} else if (isWatchIgnoreString(ignored)) watchOptions.ignored = [ignored, epochPath];
-		else if (ignored instanceof RegExp) watchOptions.ignored = (path) => path === epochPath || ignored.test(path);
-		else if (isWatchIgnoreMatcher(ignored)) watchOptions.ignored = (path) => path === epochPath || Boolean(ignored(path));
+		else if (ignored instanceof RegExp) watchOptions.ignored = (path$1) => path$1 === epochPath || ignored.test(path$1);
+		else if (isWatchIgnoreMatcher(ignored)) watchOptions.ignored = (path$2) => path$2 === epochPath || Boolean(ignored(path$2));
 	}
 	/** Webpack's export conditions select the system's kit files as they
-	*  select the bundle's; `...`, webpack's own defaults, names none. */
+	*  select the bundle's; `...`, webpack's own defaults, names none. Its
+	*  extension order and aliases are captured alongside. */
 	extractConditions(compiler) {
-		const names = compiler.options?.resolve?.conditionNames ?? [];
+		const resolve = compiler.options?.resolve;
+		const names = resolve?.conditionNames ?? [];
 		this.session.conditions = names.filter((name) => name !== "...");
+		const resolverFactory = compiler.resolverFactory;
+		if (resolverFactory !== void 0) this.session.hostResolve = (specifier, importer) => new Promise((done) => {
+			resolverFactory.get("normal", { dependencyType: "esm" }).resolve({}, importer === void 0 ? compiler.context : (0, path.dirname)(importer), specifier, {}, (error, result) => done(error !== null || !result ? null : result));
+		});
+		this.session.assetClassification = (0, _animus_ui_extract_pipeline.builtInAssetClassification)("hostOptionUnreadable", "next-webpack rules not modelled");
+		this.session.extensionPolicy = (0, _animus_ui_extract_pipeline.webpackExtensionPolicy)("next-webpack", resolve ?? {}, compiler.webpack?.version);
 	}
 	extractAliases(compiler) {
 		if (this.aliasesExtracted) return;
@@ -82,6 +117,13 @@ var AnimusWebpackPlugin = class {
 		if (built) this.session.pathAliasesJson = built.json;
 	}
 	apply(compiler) {
+		const leave = () => {
+			this.session.close();
+			this.initialized = false;
+			this.rejoining = true;
+		};
+		compiler.hooks.shutdown?.tap(PLUGIN_NAME, leave);
+		compiler.hooks.watchClose?.tap(PLUGIN_NAME, leave);
 		if (compiler.options?.name === "edge-server") return;
 		const NormalModule = compiler.webpack?.NormalModule;
 		if (NormalModule?.getCompilationHooks === void 0) throw new Error(UNSUPPORTED_WEBPACK_MESSAGE);
@@ -102,11 +144,11 @@ var AnimusWebpackPlugin = class {
 		});
 		compiler.hooks.compilation.tap(PLUGIN_NAME, (compilation) => {
 			const registerSystemDependencies = () => {
-				for (const dep of this.session.systemDependencyPaths) if ((0, fs.existsSync)(dep)) compilation.fileDependencies.add(dep);
-				else compilation.missingDependencies.add(dep);
-				for (const dep of this.session.assetDependencyPaths) if ((0, fs.existsSync)(dep)) compilation.fileDependencies.add(dep);
-				else compilation.missingDependencies.add(dep);
-				for (const root of this.session.externalWatchRoots) compilation.contextDependencies.add(root);
+				const plan = this.session.watchPlan();
+				for (const path$3 of plan.files) if ((0, fs.existsSync)(path$3)) compilation.fileDependencies.add(path$3);
+				else compilation.missingDependencies.add(path$3);
+				for (const path$4 of plan.missing) compilation.missingDependencies.add(path$4);
+				for (const root of plan.directories) compilation.contextDependencies.add(root);
 			};
 			registerSystemDependencies();
 			const stage = compiler.webpack?.Compilation.PROCESS_ASSETS_STAGE_ADDITIONAL ?? -2e3;
@@ -116,7 +158,7 @@ var AnimusWebpackPlugin = class {
 				stage
 			}, () => {
 				registerSystemDependencies();
-				const css = (0, _animus_ui_extract_session.getSharedCss)();
+				const css = this.session.rootDir ? (0, _animus_ui_extract_session.getSharedCss)(this.session.key) : "";
 				if (!css || !RawSource) return;
 				const rootDir = this.session.rootDir || compiler.context;
 				const cssPath = (0, _animus_ui_extract_session.stylesPath)((0, _animus_ui_extract_session.sessionArtifactDir)(rootDir, this.session.sessionId));
@@ -131,13 +173,18 @@ var AnimusWebpackPlugin = class {
 			this.adoptCompilerContext(_compiler);
 			this.extractAliases(_compiler);
 			this.extractConditions(_compiler);
-			const existing = (0, _animus_ui_extract_session.getAnalysisStartedPromise)();
+			if (await this.rejoin()) {
+				this.session.agreeWithSystemAuthority();
+				return;
+			}
+			const existing = (0, _animus_ui_extract_session.getAnalysisStartedPromise)(this.session.key);
 			if (existing) {
 				await existing;
+				this.session.agreeWithSystemAuthority();
 				return;
 			}
 			const promise = this.session.runFullPipeline();
-			(0, _animus_ui_extract_session.setAnalysisStartedPromise)(promise);
+			(0, _animus_ui_extract_session.setAnalysisStartedPromise)(this.session.key, promise);
 			await promise;
 		});
 		compiler.hooks.watchRun.tapPromise(PLUGIN_NAME, async (_compiler) => {
@@ -154,21 +201,38 @@ var AnimusWebpackPlugin = class {
 	}
 	/** Rejects with the analysis error; the published generation stays the
 	*  last successful one. */
+	/** Joins the build this compiler left and catches up with it: true when
+	*  the build was live, false when it starts as at first. */
+	async rejoin() {
+		if (!this.rejoining) return false;
+		this.session.reattach();
+		const live = await this.session.catchUp();
+		this.rejoining = false;
+		return live;
+	}
 	async analyzeWatchTurn(compiler) {
+		if (!this.initialized && await this.rejoin()) {
+			this.session.agreeWithSystemAuthority();
+			this.initialized = true;
+			this.lastBuiltEpoch = (0, _animus_ui_extract_session.getReplacementEpoch)(this.session.key);
+			this.epochMovedForNextCompilation = true;
+			return;
+		}
 		if (!this.initialized) {
-			let startup = (0, _animus_ui_extract_session.getAnalysisStartedPromise)();
+			let startup = (0, _animus_ui_extract_session.getAnalysisStartedPromise)(this.session.key);
 			if (!startup) {
 				startup = this.session.runFullPipeline();
-				(0, _animus_ui_extract_session.setAnalysisStartedPromise)(startup);
+				(0, _animus_ui_extract_session.setAnalysisStartedPromise)(this.session.key, startup);
 			}
 			try {
 				await startup;
 			} catch (err) {
-				if ((0, _animus_ui_extract_session.getAnalysisStartedPromise)() === startup) (0, _animus_ui_extract_session.resetAnalysisStartedPromise)();
+				if ((0, _animus_ui_extract_session.getAnalysisStartedPromise)(this.session.key) === startup) (0, _animus_ui_extract_session.resetAnalysisStartedPromise)(this.session.key);
 				throw err;
 			}
+			this.session.agreeWithSystemAuthority();
 			this.initialized = true;
-			this.lastBuiltEpoch = (0, _animus_ui_extract_session.getReplacementEpoch)();
+			this.lastBuiltEpoch = (0, _animus_ui_extract_session.getReplacementEpoch)(this.session.key);
 			this.epochMovedForNextCompilation = this.watchFailure !== null;
 			return;
 		}
@@ -176,7 +240,8 @@ var AnimusWebpackPlugin = class {
 			modifiedFiles: compiler.modifiedFiles,
 			removedFiles: compiler.removedFiles
 		});
-		const epoch = (0, _animus_ui_extract_session.getReplacementEpoch)();
+		this.session.agreeWithSystemAuthority();
+		const epoch = (0, _animus_ui_extract_session.getReplacementEpoch)(this.session.key);
 		this.epochMovedForNextCompilation = this.lastBuiltEpoch !== null && epoch !== null && epoch !== this.lastBuiltEpoch;
 		if (epoch !== null) this.lastBuiltEpoch = epoch;
 	}
@@ -189,21 +254,23 @@ var AnimusWebpackPlugin = class {
 	setRootDir(rootDir) {
 		this.session.rootDir = rootDir;
 	}
-	warnedRootDivergence = false;
+	/** Keeps Next's output directory out of discovery, whatever the user's
+	*  exclude list says. Call after `setRootDir`. */
+	excludeOutputDir(outDir) {
+		const pattern = (0, _animus_ui_extract_pipeline.outputExclusion)(this.session.rootDir, outDir);
+		if (pattern !== null) this.session.structuralExclude = [pattern];
+	}
 	/** Adopts `compiler.context` only when no config-time root exists: every
 	*  frozen derivation came from that root, so an overwrite re-keys it.
 	*  Stub path, css alias, virtual system-props target and watch-ignore are
-	*  all frozen from it, so a disagreement is warned, never reconciled. */
+	*  all frozen from it, so a disagreement fails, never reconciled. */
 	adoptCompilerContext(compiler) {
 		const context = compiler.context;
 		if (!this.session.rootDir) {
 			this.session.rootDir = context;
 			return;
 		}
-		if (context && this.session.rootDir !== context && !this.warnedRootDivergence) {
-			this.warnedRootDivergence = true;
-			console.warn(`[animus-extract] compiler.context (${context}) differs from the configured project root (${this.session.rootDir}); keeping the configured root — run next against the app directory (or align your custom webpack context) so both agree`);
-		}
+		if (context && !sameDirectory(context, this.session.rootDir)) throw new _animus_ui_extract_pipeline.AnimusConfigError(`[animus-extract] compiler.context (${context}) differs from the configured project root (${this.session.rootDir}). Run next against the app directory, or align your custom webpack context, so both agree.`);
 	}
 	get sessionDir() {
 		return this.session.sessionDir;
@@ -212,15 +279,20 @@ var AnimusWebpackPlugin = class {
 		return this.options;
 	}
 	getExternalPackageDirs() {
-		return this.session.externalPackageDirs.length > 0 ? this.session.externalPackageDirs : (0, _animus_ui_extract_session.getSharedExternalDirs)();
+		return this.session.externalPackageDirs.length > 0 ? this.session.externalPackageDirs : (0, _animus_ui_extract_session.getSharedExternalDirs)(this.session.key);
+	}
+	/** An import webpack resolved while bundling, with the resolve options of
+	*  the rules its importer matches (spec §2.2 A4). */
+	reportHostResolution(importer, request, resolved) {
+		this.session.reportHostResolution(importer, request, resolved);
 	}
 	getExternalSourceEntries() {
-		return this.session.externalSourceEntries.size > 0 ? this.session.externalSourceEntries : (0, _animus_ui_extract_session.getSharedExternalEntries)();
+		return this.session.externalSourceEntries.size > 0 ? this.session.externalSourceEntries : (0, _animus_ui_extract_session.getSharedExternalEntries)(this.session.key);
 	}
 	/** The classification of the entries `getExternalSourceEntries` returns,
 	*  from the same source. */
 	getExternalSourceSideEffects() {
-		return this.session.externalSourceEntries.size > 0 ? this.session.externalSourceSideEffects : (0, _animus_ui_extract_session.getSharedExternalSideEffects)();
+		return this.session.externalSourceEntries.size > 0 ? this.session.externalSourceSideEffects : (0, _animus_ui_extract_session.getSharedExternalSideEffects)(this.session.key);
 	}
 };
 //#endregion
@@ -234,6 +306,7 @@ const PHASE_PRODUCTION_BUILD = "phase-production-build";
 let warnedGitignore = false;
 let warnedUnstableTurbopack = false;
 function withAnimus(options) {
+	(0, _animus_ui_extract_pipeline.assertSupportedEngine)(options.engine);
 	if (!options.system) throw new Error("[animus-extract] Missing required option `system`. Provide the path to your SystemInstance module: withAnimus({ system: \"./src/ds.ts\" })");
 	(0, _animus_ui_extract_pipeline.assertKnownOptionKeys)({ ...options }, [
 		"cssImportTarget",
@@ -241,10 +314,7 @@ function withAnimus(options) {
 		"unstable_turbopack",
 		"loaderPath",
 		"phase"
-	], [{
-		key: "root",
-		reason: "this driver derives its own root — Next's `dir` under webpack, `process.cwd()` under Turbopack (Next passes no dir to a config module)"
-	}], {
+	], [], {
 		onUnknownKey: "warn",
 		warn: (message) => console.warn(`[animus-extract] ${message}`)
 	});
@@ -252,21 +322,31 @@ function withAnimus(options) {
 		warnedUnstableTurbopack = true;
 		console.warn("[animus-extract] `unstable_turbopack` is deprecated — rename it to `turbopack` (same shape)");
 	}
+	const build = (0, _animus_ui_extract_session.createBuildId)();
+	const appRoot = options.root === void 0 ? process.cwd() : (0, path.resolve)(options.root);
 	return (authoredConfig) => {
-		const nextConfig = withSourceKits(authoredConfig, process.cwd());
-		if (require_turbopack_config.resolveTurbopackMode(options)) return turbopackConfig(nextConfig, options);
+		const nextConfig = withSourceKits(authoredConfig, appRoot);
+		if (require_turbopack_config.resolveTurbopackMode(options)) {
+			warnTurbopackCwdRoot(options, appRoot);
+			return turbopackConfig(nextConfig, options, build, appRoot);
+		}
 		const existingWebpack = nextConfig.webpack;
 		return {
 			...nextConfig,
 			webpack(config, context) {
 				if (existingWebpack) config = existingWebpack(config, context);
-				const rootDir = context.dir?.length ? context.dir : process.cwd();
+				if (context.dir?.length && !sameDirectory(context.dir, appRoot)) throw new _animus_ui_extract_pipeline.AnimusConfigError(`[animus-extract] Next builds ${context.dir}, but Animus read the app's source kits from ${appRoot}. Run next from the app directory, or pass withAnimus({ root }) naming it.`);
+				const rootDir = appRoot;
 				const { mode } = (0, _animus_ui_extract_pipeline.resolveMode)(options.mode, () => context.dev === true ? "development" : "production");
 				const plugin = new AnimusWebpackPlugin({
 					...options,
 					mode
-				}, { development: context.dev === true });
+				}, {
+					development: context.dev === true,
+					build
+				});
 				plugin.setRootDir(rootDir);
+				if (nextConfig.distDir) plugin.excludeOutputDir((0, path.resolve)(rootDir, nextConfig.distDir));
 				const sessionDir = plugin.sessionDir;
 				if (!(0, fs.existsSync)(sessionDir)) (0, fs.mkdirSync)(sessionDir, { recursive: true });
 				const stubCssPath = (0, _animus_ui_extract_session.stylesPath)(sessionDir);
@@ -311,6 +391,9 @@ function withAnimus(options) {
 							}
 						});
 						nmf.hooks.afterResolve.tap("AnimusVirtualResolve", (resolveData) => {
+							const issuer = resolveData.contextInfo?.issuer;
+							const resolved = resolveData.createData?.resource;
+							if (issuer && resolved !== void 0) plugin.reportHostResolution(issuer, resolveData.request, resolved);
 							const sideEffects = redirectSideEffects.get(resolveData);
 							const settings = resolveData.createData?.settings;
 							if (!settings) return;
@@ -336,9 +419,10 @@ function withAnimus(options) {
 					use: [{
 						loader: actualLoaderPath,
 						options: {
-							strict: options.strict,
 							development: context.dev === true,
-							cssImportTarget: options.cssImportTarget
+							cssImportTarget: options.cssImportTarget,
+							build,
+							root: rootDir
 						}
 					}]
 				});
@@ -359,17 +443,35 @@ function bindTurbopackWatchDeathReport(outcome, rootDir) {
 *  source, but Next's server keeps an installed package external, and so
 *  loads its runtime entry, unless the package is transpiled; transpiling
 *  also compiles its TypeScript source. */
+let warnedTurbopackCwd = false;
+/** Turbopack's loaders get no app dir either, so a cwd that is not the app
+*  cannot be detected later: warn at startup when the cwd holds no Next
+*  config and no `root` names the app. */
+function warnTurbopackCwdRoot(options, appRoot) {
+	if (options.root !== void 0 || warnedTurbopackCwd) return;
+	if ([
+		"js",
+		"mjs",
+		"cjs",
+		"ts",
+		"mts"
+	].some((ext) => (0, fs.existsSync)((0, path.join)(appRoot, `next.config.${ext}`)))) return;
+	warnedTurbopackCwd = true;
+	console.warn(`[animus-extract] the current directory (${appRoot}) holds no next.config: under Turbopack, Animus reads the app from the current directory. Run next from the app directory, or pass withAnimus({ root }) naming it.`);
+}
 function withSourceKits(nextConfig, rootDir) {
 	const declared = nextConfig.transpilePackages ?? [];
-	const kits = (0, _animus_ui_extract_pipeline.sourceKitDependencies)(rootDir).map((kit) => kit.name).filter((name) => !declared.includes(name));
+	const kits = (0, _animus_ui_extract_pipeline.sourceKitDependencies)(rootDir, (0, _animus_ui_extract_session.requireEngine)()).map((kit) => kit.name).filter((name) => !declared.includes(name));
 	if (kits.length === 0) return nextConfig;
 	return {
 		...nextConfig,
 		transpilePackages: [...declared, ...kits]
 	};
 }
-function turbopackConfig(nextConfig, options) {
-	const load = (phase) => loadTurbopackFragment(options, phase).then((fragment) => mergeTurbopackFragment(nextConfig, fragment));
+function turbopackConfig(nextConfig, options, build, appRoot) {
+	const resolveExtensions = nextConfig.turbopack?.resolveExtensions ?? nextConfig.experimental?.turbo?.resolveExtensions;
+	const outputExclude = nextConfig.distDir ? (0, _animus_ui_extract_pipeline.outputExclusion)(appRoot, (0, path.resolve)(appRoot, nextConfig.distDir)) : null;
+	const load = (phase) => loadTurbopackFragment(options, phase, resolveExtensions, outputExclude, nextConfig.images?.disableStaticImages === true, build, appRoot).then((fragment) => mergeTurbopackFragment(nextConfig, fragment));
 	function then(onResolved, onRejected) {
 		const phase = options.phase ?? (require_turbopack_config.isTurbopackDevelopment() ? PHASE_DEVELOPMENT_SERVER : PHASE_PRODUCTION_BUILD);
 		return load(phase).then(onResolved, onRejected);
@@ -378,49 +480,67 @@ function turbopackConfig(nextConfig, options) {
 	Object.defineProperty(config, "then", { enumerable: false });
 	return config;
 }
-let liveTurbopackSession = null;
-let liveTurbopackWatcher = null;
-/** The load the live session came from. Next loads the config again after
-*  Ready (validateTurboNextConfig), and a user config may await this one
-*  besides: the same phase and root share one analysis and keep the watcher.
-*  A rejected load is dropped, so a repaired source loads again. */
-let liveTurbopackLoad = null;
-function loadTurbopackFragment(options, phase) {
-	const rootDir = process.cwd();
-	const key = JSON.stringify([phase, rootDir]);
-	if (liveTurbopackLoad?.key === key) return liveTurbopackLoad.fragment;
-	const fragment = analyzeForTurbopack(options, phase, rootDir);
+/** Each wrapper's owner, by the build it created: another wrapper of the
+*  same root is another build and never shares or closes this one's. */
+const turbopackOwners = /* @__PURE__ */ new Map();
+function turbopackOwner(build) {
+	let owner = turbopackOwners.get(build);
+	if (owner === void 0) {
+		owner = {
+			session: null,
+			watcher: null,
+			load: null
+		};
+		turbopackOwners.set(build, owner);
+	}
+	return owner;
+}
+function loadTurbopackFragment(options, phase, resolveExtensions, outputExclude, disableStaticImages, build, rootDir) {
+	const key = JSON.stringify([
+		phase,
+		rootDir,
+		resolveExtensions ?? null,
+		disableStaticImages
+	]);
+	const owner = turbopackOwner(build);
+	if (owner.load?.key === key) return owner.load.fragment;
+	const fragment = analyzeForTurbopack(options, phase, rootDir, resolveExtensions, outputExclude, disableStaticImages, build);
 	const load = {
 		key,
 		fragment
 	};
-	liveTurbopackLoad = load;
+	owner.load = load;
 	fragment.catch(() => {
-		if (liveTurbopackLoad === load) liveTurbopackLoad = null;
+		if (owner.load === load) owner.load = null;
 	});
 	return fragment;
 }
-async function analyzeForTurbopack(options, phase, rootDir) {
+async function analyzeForTurbopack(options, phase, rootDir, resolveExtensions, outputExclude, disableStaticImages, build) {
 	const development = phase === PHASE_DEVELOPMENT_SERVER;
 	const { mode } = (0, _animus_ui_extract_pipeline.resolveMode)(options.mode, () => development ? "development" : "production");
 	const session = new _animus_ui_extract_session.ExtractionSession({
 		...options,
 		mode
-	}, { unbundledComputedImports: true });
-	liveTurbopackSession?.close();
-	liveTurbopackWatcher?.close();
-	liveTurbopackWatcher = null;
-	liveTurbopackSession = session;
+	}, {
+		unbundledComputedImports: true,
+		build: `${build}-${phase}`
+	});
+	const owner = turbopackOwner(build);
+	owner.session?.close();
+	owner.watcher?.close();
+	owner.watcher = null;
+	owner.session = session;
 	session.development = development;
 	session.rootDir = rootDir;
-	const aliasPairs = (0, _animus_ui_extract_pipeline.readTsconfigAliasPairs)(rootDir);
-	const builtAliases = (0, _animus_ui_extract_pipeline.buildPathAliasesJson)(aliasPairs, rootDir);
-	if (builtAliases) session.pathAliasesJson = builtAliases.json;
+	if (outputExclude !== null) session.structuralExclude = [outputExclude];
+	session.extensionPolicy = (0, _animus_ui_extract_pipeline.turbopackExtensionPolicy)(resolveExtensions);
+	session.assetClassification = (0, _animus_ui_extract_pipeline.nextImageAssetClassification)(rootDir, disableStaticImages);
+	session.aliasesFromTsconfig = true;
 	await (0, _animus_ui_extract_session.runSessionPipeline)(session);
-	if (development && liveTurbopackSession === session) {
+	if (development && owner.session === session) {
 		const outcome = (0, _animus_ui_extract_session.startTurbopackWatcher)(session, rootDir);
 		bindTurbopackWatchDeathReport(outcome, rootDir);
-		if (outcome.kind === "started") liveTurbopackWatcher = outcome.handle;
+		if (outcome.kind === "started") owner.watcher = outcome.handle;
 	}
 	for (const line of require_turbopack_config.turbopackSideEffectsLimits(rootDir, session.externalSourceEntries, session.externalSourceSideEffects)) console.warn(line);
 	return require_turbopack_config.buildTurbopackConfig({