Skip to content
Merged
Show file tree
Hide file tree
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
11 changes: 2 additions & 9 deletions libs/native-federation-core/src/lib/core/build-for-federation.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import { logger } from '../utils/logger';
import { getCachePath } from './../utils/bundle-caching';
import { normalizePackageName } from '../utils/normalize';
import { AbortedError } from '../utils/errors';
import { resolveProjectName } from '../utils/config-utils';

export interface BuildParams {
skipMappingsAndExposed: boolean;
Expand Down Expand Up @@ -64,15 +65,7 @@ export async function buildForFederation(
? describeExposed(config, fedOptions)
: artefactInfo.exposes;

const normalizedCacheFolder = normalizePackageName(config.name);
if (normalizedCacheFolder.length < 1) {
logger.warn(
"Project name in 'federation.config.js' is empty, defaulting to 'shell' cache folder (could collide with other projects in the workspace).",
);
}
const cacheProjectFolder =
normalizedCacheFolder.length < 1 ? 'shell' : normalizedCacheFolder;

const cacheProjectFolder = resolveProjectName(config);
const pathToCache = getCachePath(
fedOptions.workspaceRoot,
cacheProjectFolder,
Expand Down
10 changes: 7 additions & 3 deletions libs/native-federation-core/src/lib/core/remove-unused-deps.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import { getPackageInfo, PackageInfo } from '../utils/package-info';
import { getExternalImports as extractExternalImports } from '../utils/get-external-imports';
import { MappedPath } from '../utils/mapped-paths';
import { normalizePackageName } from '../utils/normalize';
import { resolveProjectName } from '../utils/config-utils';

export function removeUnusedDeps(
config: NormalizedFederationConfig,
Expand All @@ -21,9 +22,11 @@ export function removeUnusedDeps(
const usedPackageNames = usedDeps.usedPackageNames;
const usedMappings = usedDeps.usedMappings;

const projectName = resolveProjectName(config);
const usedPackageNamesWithTransient = addTransientDeps(
usedPackageNames,
workspaceRoot,
projectName
);
const filteredShared = filterShared(config, usedPackageNamesWithTransient);

Expand Down Expand Up @@ -82,7 +85,7 @@ function findUsedDeps(
return { usedPackageNames, usedMappings };
}

function addTransientDeps(packages: Set<string>, workspaceRoot: string) {
function addTransientDeps(packages: Set<string>, workspaceRoot: string, projectName: string) {
const packagesAndPeers = new Set<string>([...packages]);
const discovered = new Set<string>(packagesAndPeers);
const stack = [...packagesAndPeers];
Expand All @@ -100,7 +103,7 @@ function addTransientDeps(packages: Set<string>, workspaceRoot: string) {
continue;
}

const peerDeps = getExternalImports(pInfo, workspaceRoot);
const peerDeps = getExternalImports(pInfo, workspaceRoot, projectName);

for (const peerDep of peerDeps) {
if (!discovered.has(peerDep)) {
Expand All @@ -113,12 +116,13 @@ function addTransientDeps(packages: Set<string>, workspaceRoot: string) {
return packagesAndPeers;
}

function getExternalImports(pInfo: PackageInfo, workspaceRoot: string) {
function getExternalImports(pInfo: PackageInfo, workspaceRoot: string, projectName: string) {
const encodedPackageName = normalizePackageName(pInfo.packageName);
const cacheFileName = `${encodedPackageName}-${pInfo.version}.deps.json`;
const cachePath = path.join(
workspaceRoot,
'node_modules/.cache/native-federation/_externals-metadata',
projectName
);
const cacheFilePath = path.join(cachePath, cacheFileName);

Expand Down
14 changes: 14 additions & 0 deletions libs/native-federation-core/src/lib/utils/config-utils.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
import { NormalizedFederationConfig } from '../config/federation-config';
import { logger } from './logger';
import { normalizePackageName } from './normalize';

export function resolveProjectName(config: NormalizedFederationConfig): string {
const normalizedProjectName = normalizePackageName(config.name);
if (normalizedProjectName.length < 1) {
logger.warn(
"Project name in 'federation.config.js' is empty, defaulting to 'shell' cache folder (could collide with other projects in the workspace).",
);
}

return normalizedProjectName.length < 1 ? 'shell' : normalizedProjectName;
}
Loading