@teambit/dependency-resolver 1.0.957 → 1.0.959

package/manifest/workspace-manifest-factory.ts

@@ -10,8 +10,9 @@ import { snapToSemver } from '@teambit/component-package-version';
 import type { Logger } from '@teambit/logger';
 import type { DependencyList, PackageName } from '../dependencies';
 import { ComponentDependency } from '../dependencies';
-import type { WorkspacePolicy, EnvPolicy } from '../policy';
+import type { WorkspacePolicy, EnvPolicy, VariantPolicyConfigEntryValue, VariantPolicyEntryValue } from '../policy';
 import { VariantPolicy } from '../policy';
+import { DependencyResolverAspect } from '../dependency-resolver.aspect';
 import type { VariantPolicyEntry } from '../policy/variant-policy';
 import { createVariantPolicyEntry } from '../policy/variant-policy';
 import type { DependencyResolverMain } from '../dependency-resolver.main.runtime';
@@ -464,6 +465,12 @@ export class WorkspaceManifestFactory {
       if (!this.resolveEnvPeersFromRoot) {
         // Legacy behavior: inject env peer deps into each component's manifest
         const envPeerDependencies = await this._getEnvPeerDependencies(component, packageNames);
+        // Also include packages that are explicitly listed in the component's
+        // dep-resolver config (e.g. with version "+").  Without this, a fresh
+        // workspace after `bit new`/`bit fork` hits a chicken-and-egg problem:
+        // "+" can't resolve → package absent from manifest → filter excludes it
+        // → package never installed.
+        const componentExplicitPkgs = this.getComponentExplicitPackages(component);
         if (includeAllEnvPeers ?? true) {
           peerDepsForManifest = envPeerDependencies;
         } else {
@@ -471,7 +478,8 @@ export class WorkspaceManifestFactory {
             return (
               depManifestBeforeFiltering.dependencies[pkgName] ||
               depManifestBeforeFiltering.devDependencies[pkgName] ||
-              depManifestBeforeFiltering.peerDependencies[pkgName]
+              depManifestBeforeFiltering.peerDependencies[pkgName] ||
+              componentExplicitPkgs.has(pkgName)
             );
           });
 
@@ -517,6 +525,20 @@ export class WorkspaceManifestFactory {
     return result;
   }
 
+  /**
+   * Collect package names explicitly listed in the component's dep-resolver policy,
+   * excluding entries that represent removals ("-" or `{ version: "-" }`).
+   */
+  private getComponentExplicitPackages(component: Component): Set<string> {
+    const depResolverEntry = component.get(DependencyResolverAspect.id);
+    const explicitPolicy = depResolverEntry?.config?.policy ?? {};
+    return new Set<string>([
+      ...nonRemovedEntryNames(explicitPolicy.dependencies),
+      ...nonRemovedEntryNames(explicitPolicy.devDependencies),
+      ...nonRemovedEntryNames(explicitPolicy.peerDependencies),
+    ]);
+  }
+
   private async _getEnvPeerDependencies(
     component: Component,
     packageNamesFromWorkspace: string[]
@@ -675,3 +697,20 @@ async function getMissingPackages(component: Component): Promise<{ devMissings:
     runtimeMissings,
   };
 }
+
+function nonRemovedEntryNames(policySection?: Record<string, VariantPolicyConfigEntryValue>): string[] {
+  if (!policySection) return [];
+  const names: string[] = [];
+  for (const [name, versionSpec] of Object.entries(policySection)) {
+    // Skip explicit removals expressed as "-" or as removal objects.
+    if (versionSpec !== '-' && !isRemovalObject(versionSpec)) {
+      names.push(name);
+    }
+  }
+  return names;
+}
+
+function isRemovalObject(val: VariantPolicyConfigEntryValue): boolean {
+  if (!val || typeof val !== 'object') return false;
+  return (val as VariantPolicyEntryValue).version === '-';
+}

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@teambit/dependency-resolver",
-  "version": "1.0.957",
+  "version": "1.0.959",
   "homepage": "https://bit.cloud/teambit/dependencies/dependency-resolver",
   "main": "dist/index.js",
   "componentId": {
     "scope": "teambit.dependencies",
     "name": "dependency-resolver",
-    "version": "1.0.957"
+    "version": "1.0.959"
   },
   "dependencies": {
     "chalk": "4.1.2",
@@ -55,11 +55,11 @@
     "@teambit/legacy.consumer-config": "0.0.109",
     "@teambit/toolbox.crypto.sha1": "0.0.15",
     "@teambit/toolbox.object.sorter": "0.0.2",
-    "@teambit/component": "1.0.957",
-    "@teambit/envs": "1.0.957",
-    "@teambit/aspect-loader": "1.0.957",
-    "@teambit/objects": "0.0.464",
-    "@teambit/graphql": "1.0.957"
+    "@teambit/component": "1.0.959",
+    "@teambit/envs": "1.0.959",
+    "@teambit/aspect-loader": "1.0.959",
+    "@teambit/objects": "0.0.466",
+    "@teambit/graphql": "1.0.959"
   },
   "devDependencies": {
     "@types/fs-extra": "9.0.7",

package/policy/env-policy/index.ts

@@ -1 +1 @@
-export { EnvPolicy, EnvPolicyConfigObject } from './env-policy';
+export { EnvPolicy, EnvPolicyConfigObject, EnvJsoncPolicyEntry, EnvPolicyEnvJsoncConfigObject } from './env-policy';

package/policy/index.ts

@@ -9,10 +9,11 @@ export {
 } from './workspace-policy';
 export {
   VariantPolicy,
+  VariantPolicyConfigEntryValue,
   VariantPolicyEntryValue,
   VariantPolicyConfigObject,
   SerializedVariantPolicy,
   VariantPolicyConfigArr,
 } from './variant-policy';
 
-export { EnvPolicy, EnvPolicyConfigObject } from './env-policy';
+export { EnvPolicy, EnvPolicyConfigObject, EnvPolicyEnvJsoncConfigObject } from './env-policy';

package/policy/variant-policy/index.ts

@@ -4,6 +4,7 @@ export {
   VariantPolicyFromConfigObjectOptions,
   SerializedVariantPolicy,
   VariantPolicyEntry,
+  VariantPolicyConfigEntryValue,
   VariantPolicyEntryValue,
   createVariantPolicyEntry,
   DependencySource,