Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 12 additions & 8 deletions libs/native-federation/src/utils/angular-esbuild-adapter.ts
Original file line number Diff line number Diff line change
Expand Up @@ -202,12 +202,19 @@ async function runEsbuild(
throw new AbortedError('[angular-esbuild-adapter] Before building');
}

const projectRoot = path.dirname(tsConfigPath);
const workspaceRoot = context.workspaceRoot;

const projectMetadata = await context.getProjectMetadata(
context.target.project,
);
const projectRoot = path.join(
workspaceRoot,
(projectMetadata['root'] as string | undefined) ?? '',
);

const browsers = getSupportedBrowsers(projectRoot, context.logger as any);
const target = transformSupportedBrowsersToTargets(browsers);

const workspaceRoot = context.workspaceRoot;

const optimizationOptions = normalizeOptimization(
builderOptions.optimization,
);
Expand All @@ -221,7 +228,7 @@ async function runEsbuild(
await loadPostcssConfiguration(searchDirectories);
const tailwindConfiguration = postcssConfiguration
? undefined
: await getTailwindConfig(workspaceRoot, searchDirectories);
: await getTailwindConfig(searchDirectories);

const outputNames = {
bundles: '[name]',
Expand Down Expand Up @@ -360,7 +367,6 @@ async function runEsbuild(
}

async function getTailwindConfig(
workspaceRoot: string,
searchDirectories: { root: string; files: Set<string> }[],
): Promise<{ file: string; package: string } | undefined> {
const tailwindConfigurationPath =
Expand All @@ -372,9 +378,7 @@ async function getTailwindConfig(

return {
file: tailwindConfigurationPath,
package: createRequire(
path.join(workspaceRoot, tailwindConfigurationPath),
).resolve('tailwindcss'),
package: createRequire(tailwindConfigurationPath).resolve('tailwindcss'),
};
}

Expand Down