feat(core): enable package hoisting in workspaces

Author: manfredsteyer

.vscode/settings.json

@@ -32,5 +32,6 @@
     "**/CVS": true,
     "**/.DS_Store": true,
     "**/Thumbs.db": true
-  }
+  },
+  "hide-files.files": []
 }

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

@@ -9,8 +9,9 @@ import {
   prepareSkipList,
   SkipList,
 } from '../core/default-skip-list';
-import { findPackageJsonFiles, getVersionMaps, VersionMap } from '../utils/package-info';
+import { findDepPackageJson, findPackageJsonFiles, getVersionMaps, VersionMap } from '../utils/package-info';
 import { getConfigContext } from './configuration-context';
+import { logger } from '../utils/logger';
 
 let inferVersion = false;
 
@@ -150,7 +151,7 @@ function findSecondaries(
 
 function getSecondaries(
   includeSecondaries: IncludeSecondariesOptions,
-  packagePath: string,
+  libPath: string,
   key: string,
   shareObject: SharedConfig
 ): Record<string, SharedConfig> | null {
@@ -164,7 +165,7 @@ function getSecondaries(
     }
   }
 
-  const libPath = path.join(path.dirname(packagePath), 'node_modules', key);
+  // const libPath = path.join(path.dirname(packagePath), 'node_modules', key);
 
   if (!fs.existsSync(libPath)) {
     return {};
@@ -331,9 +332,19 @@ export function share(shareObjects: Config, projectPath = ''): Config {
     result[key] = shareObject;
 
     if (includeSecondaries) {
+
+      const libPackageJson = findDepPackageJson(key, path.dirname(packagePath));
+
+      if (!libPackageJson) {
+        logger.error('Could not find folder containing dep ' + key);
+        continue;
+      }
+
+      const libPath = path.dirname(libPackageJson);
+
       const secondaries = getSecondaries(
         includeSecondaries,
-        packagePath,
+        libPath,
         key,
         shareObject
       );

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

@@ -54,7 +54,7 @@ function normalizeShared(
       {}
     );
 
-    result = share(result) as Record<string, NormalizedSharedConfig>;
+    //result = share(result) as Record<string, NormalizedSharedConfig>;
   }
 
   result = Object.keys(result)

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

@@ -1,4 +1,4 @@
-import { useWorkspace } from '../config/configuration-context';
+import { getConfigContext, useWorkspace } from '../config/configuration-context';
 import { NormalizedFederationConfig } from '../config/federation-config';
 import { BuildAdapter, setBuildAdapter } from './build-adapter';
 import { buildForFederation, defaultBuildParams } from './build-for-federation';
@@ -20,6 +20,7 @@ async function init(params: BuildHelperParams): Promise<void> {
   fedOptions = params.options;
   useWorkspace(params.options.workspaceRoot);
   config = await loadFederationConfig(fedOptions);
+  params.options.workspaceRoot = getConfigContext().workspaceRoot ?? params.options.workspaceRoot;
   externals = getExternals(config);
 }
 

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

@@ -1,3 +1,4 @@
+import { dir } from 'console';
 import * as fs from 'fs';
 import * as path from 'path';
 import { logger } from './logger';
@@ -54,6 +55,7 @@ export function expandFolders(child: string, parent: string): string[] {
   return result;
 }
 
+
 export function getPackageInfo(
   packageName: string,
   workspaceRoot: string,
@@ -70,7 +72,7 @@ export function getPackageInfo(
   const packageJsonInfos = getPackageJsonFiles(projectRoot, workspaceRoot);
 
   for (const info of packageJsonInfos) {
-    const cand = _getPackageInfo(packageName, info);
+    const cand = _getPackageInfo(packageName, info.directory);
     if (cand) {
       return cand;
     }
@@ -102,8 +104,8 @@ export function getPackageJsonFiles(project: string, workspace: string): Package
 
   maps = findPackageJsonFiles(project, workspace)
     .map(f => {
-      const content = fs.readFileSync(f, 'utf-8');
-      const directory = path.dirname(f);
+      const content = JSON.parse(fs.readFileSync(f, 'utf-8'));
+      const directory = normalize(path.dirname(f), true);
       const result: PackageJsonInfo = {
         content, directory
       };
@@ -114,26 +116,51 @@ export function getPackageJsonFiles(project: string, workspace: string): Package
   return maps;
 }
 
-export function _getPackageInfo(
-  packageName: string,
-  packageJsonInfo: PackageJsonInfo,
-): PackageInfo | null {
-
+export function findDepPackageJson(packageName: string, projectRoot: string): string | null {
   const mainPkgName = getPkgFolder(packageName);
 
-  const mainPkgPath = path.join(packageJsonInfo.directory, 'node_modules', mainPkgName);
-  // const mainPkgJsonPath = path.join(mainPkgPath, 'package.json');
+  let mainPkgPath = path.join(projectRoot, 'node_modules', mainPkgName);
+  let mainPkgJsonPath = path.join(mainPkgPath, 'package.json');
+
+  let directory = projectRoot;
+
+  while (path.dirname(directory) !== directory) {
+
+    if (fs.existsSync(mainPkgJsonPath)) {
+      break;
+    }
+
+    directory = normalize(path.dirname(directory), true);
+
+    mainPkgPath = path.join(directory, 'node_modules', mainPkgName);
+    mainPkgJsonPath = path.join(mainPkgPath, 'package.json');
+  }
 
-  if (!fs.existsSync(mainPkgPath)) {
+  if (!fs.existsSync(mainPkgJsonPath)) {
     // TODO: Add logger
     // context.logger.warn('No package.json found for ' + packageName);
     logger.verbose('No package.json found for ' + packageName + ' in ' + mainPkgPath);
 
     return null;
   }
+  return mainPkgJsonPath;
+
+}
+
+export function _getPackageInfo(
+  packageName: string,
+  directory: string,
+): PackageInfo | null {
+
+  const mainPkgName = getPkgFolder(packageName);
+  const mainPkgJsonPath = findDepPackageJson(packageName, directory);
+
+  if (!mainPkgJsonPath) {
+    return null;
+  }
 
-  //const mainPkgJson = readJson(mainPkgJsonPath);
-  const mainPkgJson = packageJsonInfo.content;
+  const mainPkgPath = path.dirname(mainPkgJsonPath);
+  const mainPkgJson = readJson(mainPkgJsonPath);
 
   const version = mainPkgJson['version'] as string;
   const esm = mainPkgJson['type'] === 'module';
@@ -206,7 +233,7 @@ export function _getPackageInfo(
     };
   }
 
-  const secondaryPgkPath = path.join(packageJsonInfo.directory, 'node_modules', packageName);
+  const secondaryPgkPath = path.join(mainPkgPath, relSecondaryPath);
   const secondaryPgkJsonPath = path.join(secondaryPgkPath, 'package.json');
   let secondaryPgkJson: PartialPackageJson | null = null;
   if (fs.existsSync(secondaryPgkJsonPath)) {

libs/native-federation/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@angular-architects/native-federation",
-  "version": "1.0.0-beta.1",
+  "version": "1.1.0-beta.0",
   "main": "src/index.js",
   "generators": "./collection.json",
   "builders": "./builders.json",
@@ -23,8 +23,8 @@
     "rollup-plugin-node-externals": "^4.1.1",
     "esbuild": "^0.15.5",
     "@babel/core": "^7.19.0",
-    "@softarc/native-federation": "1.0.0",
-    "@softarc/native-federation-runtime": "1.0.0",
+    "@softarc/native-federation": "1.1.0-beta.0",
+    "@softarc/native-federation-runtime": "1.1.0-beta.0",
     "@rollup/plugin-json": "^4.1.0",
     "cross-spawn": "^7.0.3",
     "rollup-plugin-terser": "^7.0.2",

update-local.bat

@@ -1,14 +1,14 @@
 call npm unpublish @softarc/native-federation@1.1.0-beta.0 --registry http://localhost:4873
 call npm unpublish @softarc/native-federation-runtime@1.1.0-beta.0 --registry http://localhost:4873
 call npm unpublish @softarc/native-federation-esbuild@1.1.0-beta.0 --registry http://localhost:4873
-REM call npm unpublish @angular-architects/native-federation@1.0.0-beta.1 --registry http://localhost:4873
+call npm unpublish @angular-architects/native-federation@1.1.0-beta.0 --registry http://localhost:4873
 
-REM call nx build native-federation
+call nx build native-federation
 call nx build native-federation-core
 call nx build native-federation-runtime
 call nx build native-federation-esbuild
 
 call npm publish dist\libs\native-federation-core --registry http://localhost:4873
-REM call npm publish dist\libs\native-federation --registry http://localhost:4873
+call npm publish dist\libs\native-federation --registry http://localhost:4873
 call npm publish dist\libs\native-federation-runtime --registry http://localhost:4873
 call npm publish dist\libs\native-federation-esbuild --registry http://localhost:4873