chore(core): remove projectRoot from config and helper functions

Author: manfredsteyer

libs/native-federation-core/src/lib/config/share-utils.ts

@@ -70,9 +70,9 @@ function readVersionMap(packagePath: string): VersionMap {
   return versions;
 }
 
-function lookupVersion(key: string, projectRoot: string, workspaceRoot: string): string {
+function lookupVersion(key: string, workspaceRoot: string): string {
 
-  const versionMaps = getVersionMaps(projectRoot, workspaceRoot);
+  const versionMaps = getVersionMaps(workspaceRoot, workspaceRoot);
 
   for (const versionMap of versionMaps) {
 
@@ -292,14 +292,6 @@ export function share(shareObjects: Config, projectPath = ''): Config {
     projectPath = cwd();
   }
 
-  let workspacePath: string | undefined = undefined;
-
-  workspacePath = getConfigContext().workspaceRoot ?? '';
-
-  if (!workspacePath) {
-    workspacePath = projectPath;
-  }
-  
   const packagePath = findPackageJson(projectPath);
 
   // const versions = readVersionMap(packagePath);
@@ -314,7 +306,7 @@ export function share(shareObjects: Config, projectPath = ''): Config {
       shareObject.requiredVersion === 'auto' ||
       (inferVersion && typeof shareObject.requiredVersion === 'undefined')
     ) {
-      const version = lookupVersion(key, projectPath, workspacePath);
+      const version = lookupVersion(key, projectPath);
 
       shareObject.requiredVersion = version;
       shareObject.version = version.replace(/^\D*/, '');

libs/native-federation-core/src/lib/core/bundle-exposed.ts

@@ -22,7 +22,7 @@ export async function bundleExposed(
 
     const localPath = normalize(
       path.join(
-        options.projectRoot ?? options.workspaceRoot, 
+        options.workspaceRoot, 
         config.exposes[key])
     );
 
@@ -79,7 +79,7 @@ export function describeExposed(
   for (const key in config.exposes) {
     const localPath = normalize(
       path.join(
-        options.projectRoot ?? options.workspaceRoot, 
+        options.workspaceRoot, 
         config.exposes[key])
     );
 

libs/native-federation-core/src/lib/core/bundle-shared.ts

@@ -7,7 +7,6 @@ import { SharedInfo } from '@softarc/native-federation-runtime';
 import { FederationOptions } from './federation-options';
 import { copySrcMapIfExists } from '../utils/copy-src-map-if-exists';
 import { logger } from '../utils/logger';
-import { hashFile } from '../utils/hash-file';
 import { normalize } from '../utils/normalize';
 
 export async function bundleShared(
@@ -21,7 +20,6 @@ export async function bundleShared(
     .map((packageName) => getPackageInfo(
       packageName, 
       fedOptions.workspaceRoot,
-      fedOptions.projectRoot ?? fedOptions.workspaceRoot
     ))
     .filter((pi) => !!pi) as PackageInfo[];
 
@@ -110,7 +108,7 @@ export async function bundleShared(
     });
 
     const fullOutputPath = path.join(
-      fedOptions.projectRoot ?? fedOptions.workspaceRoot,
+      fedOptions.workspaceRoot,
       fedOptions.outputPath,
       outFileName
     );

libs/native-federation-core/src/lib/core/federation-options.ts

@@ -1,9 +1,5 @@
 export interface FederationOptions {
   workspaceRoot: string;
-  /**
-   * Defaults to workspaceRoot
-   */
-  projectRoot?: string;
   outputPath: string;
   federationConfig: string;
   tsConfig?: string;

libs/native-federation-core/src/lib/core/load-federation-config.ts

@@ -7,7 +7,7 @@ export async function loadFederationConfig(
   fedOptions: FederationOptions
 ): Promise<NormalizedFederationConfig> {
   const fullConfigPath = path.join(
-    fedOptions.projectRoot ?? fedOptions.workspaceRoot,
+    fedOptions.workspaceRoot,
     fedOptions.federationConfig
   );
 

libs/native-federation-core/src/lib/core/write-federation-info.ts

@@ -8,7 +8,7 @@ export function writeFederationInfo(
   fedOptions: FederationOptions
 ) {
   const metaDataPath = path.join(
-    fedOptions.projectRoot ?? fedOptions.workspaceRoot,
+    fedOptions.workspaceRoot,
     fedOptions.outputPath,
     'remoteEntry.json'
   );

libs/native-federation-core/src/lib/core/write-import-map.ts

@@ -16,7 +16,7 @@ export function writeImportMap(
 
   const importMap = { imports };
   const importMapPath = path.join(
-    fedOption.projectRoot ?? fedOption.workspaceRoot,
+    fedOption.workspaceRoot,
     fedOption.outputPath,
     'importmap.json'
   );

libs/native-federation-core/src/lib/utils/package-info.ts

@@ -58,18 +58,13 @@ export function expandFolders(child: string, parent: string): string[] {
 
 export function getPackageInfo(
   packageName: string,
-  workspaceRoot: string,
-  projectRoot: string
+  workspaceRoot: string
 ): PackageInfo | null {
 
   workspaceRoot = normalize(workspaceRoot, true);
-  projectRoot = normalize(projectRoot, true);
 
-  if (!projectRoot.startsWith(workspaceRoot)) {
-    throw new Error(`Workspace folder ${workspaceRoot} needs to be a parent of the project folder ${projectRoot}`);
-  }
 
-  const packageJsonInfos = getPackageJsonFiles(projectRoot, workspaceRoot);
+  const packageJsonInfos = getPackageJsonFiles(workspaceRoot, workspaceRoot);
 
   for (const info of packageJsonInfos) {
     const cand = _getPackageInfo(packageName, info.directory);