@teambit/dependency-resolver 1.0.8 → 1.0.10

package/dist/dependency-resolver.main.runtime.d.ts

@@ -298,7 +298,7 @@ export declare class DependencyResolverMain {
     getPackageName(component: Component): string;
     getDepResolverData(component: Component): DependencyResolverComponentData | undefined;
     calcPackageName(component: Component): string;
-    getRuntimeModulePath(component: Component): string;
+    getRuntimeModulePath(component: Component, isInWorkspace?: boolean): string;
     /**
      * returns the package path in the /node_modules/ folder
      * In case you call this in order to run the code from the path, please refer to the `getRuntimeModulePath` API
@@ -439,14 +439,14 @@ export declare class DependencyResolverMain {
         }>;
         components: Component[];
         patterns?: string[];
-        forceVersionBump?: 'major' | 'minor' | 'patch';
+        forceVersionBump?: 'major' | 'minor' | 'patch' | 'compatible';
     }): Promise<MergedOutdatedPkg[]>;
     /**
      * Accepts a list of package dependency policies and returns a list of outdated policies extended with their "latestRange"
      */
     getOutdatedPkgs<T>({ rootDir, forceVersionBump, }: {
         rootDir: string;
-        forceVersionBump?: 'major' | 'minor' | 'patch';
+        forceVersionBump?: 'major' | 'minor' | 'patch' | 'compatible';
     }, pkgs: Array<{
         name: string;
         currentRange: string;

package/dist/dependency-resolver.main.runtime.js

@@ -306,8 +306,8 @@ function _envPolicy() {
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
 function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); } // TODO: it's weird we take it from here.. think about it../workspace/utils
@@ -596,13 +596,13 @@ class DependencyResolverMain {
    * Returns the location where the component is installed with its peer dependencies
    * This is used in cases you want to actually run the components and make sure all the dependencies (especially peers) are resolved correctly
    */
-  getRuntimeModulePath(component) {
+  getRuntimeModulePath(component, isInWorkspace = false) {
     if (!this.hasRootComponents()) {
       const modulePath = this.getModulePath(component);
       return modulePath;
     }
     const pkgName = this.getPackageName(component);
-    const selfRootDir = (0, _bitRoots().getRelativeRootComponentDir)(component.id.toString());
+    const selfRootDir = (0, _bitRoots().getRelativeRootComponentDir)(!isInWorkspace ? component.id.toString() : component.id.toStringWithoutVersion());
     // In case the component is it's own root we want to load it from it's own root folder
     if (_fsExtra().default.pathExistsSync(selfRootDir)) {
       const innerDir = (0, _path().join)(selfRootDir, 'node_modules', pkgName);
@@ -1269,7 +1269,10 @@ class DependencyResolverMain {
       }
     };
     const outdatedPkgs = (0, _lodash().compact)(await Promise.all(pkgs.map(async pkg => {
-      const latestVersion = await tryResolve(`${pkg.name}@${newVersionRange(pkg.currentRange, forceVersionBump)}`);
+      const latestVersion = await tryResolve(`${pkg.name}@${newVersionRange(pkg.currentRange, {
+        pkgSource: pkg.source,
+        forceVersionBump
+      })}`);
       if (!latestVersion) return null;
       const currentVersion = _semver().default.valid(pkg.currentRange.replace(/[\^~]/, ''));
       // If the current version is newer than the latest, then no need to update the dependency
@@ -1384,12 +1387,18 @@ function repeatPrefix(originalSpec, newVersion) {
       return newVersion;
   }
 }
-function newVersionRange(currentRange, forceVersionBump) {
-  if (forceVersionBump == null || forceVersionBump === 'major') return 'latest';
+function newVersionRange(currentRange, opts) {
+  if (opts.forceVersionBump == null || opts.forceVersionBump === 'major') return 'latest';
   const currentVersion = _semver().default.valid(currentRange.replace(/[\^~]/, ''));
+  if (opts.forceVersionBump === 'compatible') {
+    if ((opts.pkgSource === 'component' || opts.pkgSource === 'component-model') && currentVersion === currentRange) {
+      return `^${currentVersion}`;
+    }
+    return currentRange;
+  }
   if (!currentVersion) return null;
   const [major, minor] = currentVersion.split('.');
-  switch (forceVersionBump) {
+  switch (opts.forceVersionBump) {
     case 'patch':
       return `>=${currentVersion} <${major}.${+minor + 1}.0`;
     case 'minor':