@teambit/install 1.0.384 → 1.0.386

package/dist/install.main.runtime.d.ts

@@ -67,6 +67,7 @@ export declare class InstallMain {
     private ipcEvents;
     private harmony;
     private visitedAspects;
+    private oldNonLoadedEnvs;
     constructor(dependencyResolver: DependencyResolverMain, logger: Logger, workspace: Workspace, variants: VariantsMain, compiler: CompilerMain, envs: EnvsMain, wsConfigFiles: WorkspaceConfigFilesMain, aspectLoader: AspectLoaderMain, app: ApplicationMain, generator: GeneratorMain, preLinkSlot: PreLinkSlot, preInstallSlot: PreInstallSlot, postInstallSlot: PostInstallSlot, ipcEvents: IpcEventsMain, harmony: Harmony);
     /**
      * Install dependencies for all components in the workspace
@@ -110,6 +111,9 @@ export declare class InstallMain {
      * @returns
      */
     private reloadMovedEnvs;
+    private reloadNonLoadedEnvs;
+    private reloadEnvs;
+    private reloadAspects;
     private _getComponentsManifestsAndRootPolicy;
     /**
      * The function `tryWriteConfigFiles` attempts to write workspace config files, and if it fails, it logs an error
@@ -125,6 +129,7 @@ export declare class InstallMain {
     private _getMissingPackagesWithoutRootDeps;
     private _getAllMissingPackages;
     private _getComponentsManifests;
+    setOldNonLoadedEnvs(): string[];
     /**
      * This function returns a list of old non-loaded environments names.
      * @returns an array of strings called `oldNonLoadedEnvs`. This array contains the names of environment variables that

package/dist/install.main.runtime.js

@@ -186,6 +186,13 @@ function _componentPackageVersion() {
   };
   return data;
 }
+function _aspectLoader() {
+  const data = require("@teambit/aspect-loader");
+  _aspectLoader = function () {
+    return data;
+  };
+  return data;
+}
 function _objectHash() {
   const data = _interopRequireDefault(require("object-hash"));
   _objectHash = function () {
@@ -242,13 +249,6 @@ function _update() {
   };
   return data;
 }
-function _aspectLoader() {
-  const data = require("@teambit/aspect-loader");
-  _aspectLoader = function () {
-    return data;
-  };
-  return data;
-}
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
@@ -275,6 +275,7 @@ class InstallMain {
     this.ipcEvents = ipcEvents;
     this.harmony = harmony;
     _defineProperty(this, "visitedAspects", new Set());
+    _defineProperty(this, "oldNonLoadedEnvs", []);
   }
   /**
    * Install dependencies for all components in the workspace
@@ -476,7 +477,9 @@ class InstallMain {
       }, pmInstallOptions);
       let cacheCleared = false;
       await this.linkCodemods(compDirMap);
+      const oldNonLoadedEnvs = this.setOldNonLoadedEnvs();
       await this.reloadMovedEnvs();
+      await this.reloadNonLoadedEnvs();
       const shouldClearCacheOnInstall = this.shouldClearCacheOnInstall();
       if (options?.compile ?? true) {
         const compileStartTime = process.hrtime();
@@ -486,9 +489,8 @@ class InstallMain {
           // We need to clear cache before compiling the components or it might compile them with the default env
           // incorrectly in case the env was not loaded correctly before the installation.
           // We don't want to clear the failed to load envs because we want to show the warning at the end
-          await this.workspace.clearCache({
-            skipClearFailedToLoadEnvs: true
-          });
+          // await this.workspace.clearCache({ skipClearFailedToLoadEnvs: true });
+          await this.workspace.clearCache();
           cacheCleared = true;
         }
         await this.compiler.compileOnWorkspace([], {
@@ -507,7 +509,6 @@ class InstallMain {
       }
       if (!dependenciesChanged) break;
       if (!options?.recurringInstall) break;
-      const oldNonLoadedEnvs = this.getOldNonLoadedEnvs();
       if (!oldNonLoadedEnvs.length) break;
       prevManifests.add(manifestsHash(current.manifests));
       // If we run compile we do the clear cache before the compilation so no need to clean it again (it's an expensive
@@ -577,10 +578,16 @@ class InstallMain {
       return !regularPathExists || !resolvedPathExists;
     });
     const idsToLoad = movedEnvs.map(env => env.id);
-    // const envPlugin = this.envs.getEnvPlugin();
-
-    if (idsToLoad.length && this.workspace) {
-      const componentIdsToLoad = idsToLoad.map(id => _component().ComponentID.fromString(id));
+    const componentIdsToLoad = idsToLoad.map(id => _component().ComponentID.fromString(id));
+    await this.reloadEnvs(componentIdsToLoad);
+  }
+  async reloadNonLoadedEnvs() {
+    const nonLoadedEnvs = this.envs.getFailedToLoadEnvs();
+    const componentIdsToLoad = nonLoadedEnvs.map(id => _component().ComponentID.fromString(id));
+    await this.reloadEnvs(componentIdsToLoad);
+  }
+  async reloadEnvs(componentIdsToLoad) {
+    if (componentIdsToLoad.length && this.workspace) {
       const aspects = await this.workspace.resolveAspects(undefined, componentIdsToLoad, {
         requestedOnly: true,
         excludeCore: true,
@@ -590,21 +597,34 @@ class InstallMain {
         // This is a bug in the flow and should be fixed.
         // skipDeps: true,
       });
-      const loadedPlugins = (0, _lodash().compact)(await Promise.all(aspects.map(aspectDef => {
-        const localPath = aspectDef.aspectPath;
-        const component = aspectDef.component;
-        if (!component) return undefined;
-        const plugins = this.aspectLoader.getPlugins(component, localPath);
-        if (plugins.has()) {
-          return plugins.load(_cli().MainRuntime.name);
-        }
-      })));
-      await Promise.all(loadedPlugins.map(plugin => {
-        const runtime = plugin.getRuntime(_cli().MainRuntime);
-        return runtime?.provider(undefined, undefined, undefined, this.harmony);
+      // This is a very special case which we need to compile our envs before loading them correctly.
+      const grouped = (0, _lodash().groupBy)(aspects, aspectDef => {
+        return aspectDef.component?.id.toStringWithoutVersion() === 'bitdev.general/envs/bit-env';
+      });
+      await this.reloadAspects(grouped.true || []);
+      const otherEnvs = grouped.false || [];
+      await Promise.all(otherEnvs.map(async aspectDef => {
+        const id = aspectDef.component?.id;
+        if (!id) return;
+        await this.workspace.clearComponentCache(id);
       }));
+      await this.reloadAspects(grouped.false || []);
     }
-    return movedEnvs;
+  }
+  async reloadAspects(aspects) {
+    const loadedPlugins = (0, _lodash().compact)(await Promise.all(aspects.map(aspectDef => {
+      const localPath = aspectDef.aspectPath;
+      const component = aspectDef.component;
+      if (!component) return undefined;
+      const plugins = this.aspectLoader.getPlugins(component, localPath);
+      if (plugins.has()) {
+        return plugins.load(_cli().MainRuntime.name);
+      }
+    })));
+    await Promise.all(loadedPlugins.map(plugin => {
+      const runtime = plugin.getRuntime(_cli().MainRuntime);
+      return runtime?.provider(undefined, undefined, undefined, this.harmony);
+    }));
   }
   async _getComponentsManifestsAndRootPolicy(installer, options) {
     const mergedRootPolicy = await this.addConfiguredAspectsToWorkspacePolicy();
@@ -755,6 +775,13 @@ class InstallMain {
       manifests
     };
   }
+  setOldNonLoadedEnvs() {
+    const nonLoadedEnvs = this.envs.getFailedToLoadEnvs();
+    const envsWithoutManifest = Array.from(this.dependencyResolver.envsWithoutManifest);
+    const oldNonLoadedEnvs = (0, _lodash().intersection)(nonLoadedEnvs, envsWithoutManifest);
+    this.oldNonLoadedEnvs = oldNonLoadedEnvs;
+    return oldNonLoadedEnvs;
+  }
 
   /**
    * This function returns a list of old non-loaded environments names.
@@ -764,10 +791,7 @@ class InstallMain {
    * correctly
    */
   getOldNonLoadedEnvs() {
-    const nonLoadedEnvs = this.envs.getFailedToLoadEnvs();
-    const envsWithoutManifest = Array.from(this.dependencyResolver.envsWithoutManifest);
-    const oldNonLoadedEnvs = (0, _lodash().intersection)(nonLoadedEnvs, envsWithoutManifest);
-    return oldNonLoadedEnvs;
+    return this.oldNonLoadedEnvs;
   }
   async _updateRootDirs(rootDirs) {
     try {