@teambit/workspace 0.0.520 → 0.0.524

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@teambit/workspace",
-  "version": "0.0.520",
+  "version": "0.0.524",
   "homepage": "https://bit.dev/teambit/workspace/workspace",
   "main": "dist/index.js",
   "componentId": {
     "scope": "teambit.workspace",
     "name": "workspace",
-    "version": "0.0.520"
+    "version": "0.0.524"
   },
   "dependencies": {
     "chalk": "2.4.2",
@@ -32,54 +32,54 @@
     "@teambit/base-ui.surfaces.split-pane.hover-splitter": "1.0.0",
     "@teambit/base-ui.surfaces.split-pane.split-pane": "1.0.0",
     "@teambit/base-ui.graph.tree.recursive-tree": "1.0.0",
-    "@teambit/cli": "0.0.379",
-    "@teambit/isolator": "0.0.520",
-    "@teambit/component-tree": "0.0.365",
-    "@teambit/component.ui.component-status-resolver": "0.0.449",
-    "@teambit/harmony.modules.resolved-component": "0.0.443",
-    "@teambit/dependency-resolver": "0.0.520",
-    "@teambit/logger": "0.0.449",
-    "@teambit/component": "0.0.520",
-    "@teambit/graphql": "0.0.520",
-    "@teambit/aspect-loader": "0.0.520",
-    "@teambit/bundler": "0.0.520",
-    "@teambit/envs": "0.0.520",
-    "@teambit/pubsub": "0.0.520",
-    "@teambit/scope": "0.0.520",
-    "@teambit/ui": "0.0.520",
-    "@teambit/variants": "0.0.451",
-    "@teambit/legacy-bit-id": "0.0.368",
-    "@teambit/bit-error": "0.0.365",
-    "@teambit/component-issues": "0.0.14",
-    "@teambit/config": "0.0.390",
-    "@teambit/harmony.modules.requireable-component": "0.0.443",
-    "@teambit/workspace.modules.match-pattern": "0.0.445",
-    "@teambit/command-bar": "0.0.520",
-    "@teambit/design.ui.surfaces.menu.link-item": "0.0.373",
-    "@teambit/graph": "0.0.520",
-    "@teambit/react-router": "0.0.520",
-    "@teambit/sidebar": "0.0.520",
-    "@teambit/ui-foundation.ui.main-dropdown": "0.0.445",
-    "@teambit/ui-foundation.ui.menu": "0.0.445",
-    "@teambit/ui-foundation.ui.react-router.slot-router": "0.0.447",
-    "@teambit/toolbox.time.time-format": "0.0.442",
-    "@teambit/compiler": "0.0.520",
-    "@teambit/component-id": "0.0.369",
-    "@teambit/ui-foundation.ui.hooks.use-data-query": "0.0.446",
-    "@teambit/deprecation": "0.0.520",
-    "@teambit/ui-foundation.ui.constants.z-indexes": "0.0.445",
-    "@teambit/ui-foundation.ui.buttons.collapser": "0.0.150",
-    "@teambit/ui-foundation.ui.corner": "0.0.452",
-    "@teambit/ui-foundation.ui.notifications.notification-context": "0.0.446",
-    "@teambit/ui-foundation.ui.top-bar": "0.0.447",
-    "@teambit/design.ui.styles.ellipsis": "0.0.345",
-    "@teambit/design.ui.styles.muted-italic": "0.0.34",
-    "@teambit/ui-foundation.ui.full-loader": "0.0.445",
-    "@teambit/ui-foundation.ui.side-bar": "0.0.449",
-    "@teambit/ui-foundation.ui.tree.drawer": "0.0.445",
-    "@teambit/explorer.ui.gallery.component-grid": "0.0.445",
-    "@teambit/workspace.ui.empty-workspace": "0.0.447",
-    "@teambit/workspace.ui.workspace-component-card": "0.0.448"
+    "@teambit/cli": "0.0.380",
+    "@teambit/isolator": "0.0.524",
+    "@teambit/component-tree": "0.0.366",
+    "@teambit/component.ui.component-status-resolver": "0.0.450",
+    "@teambit/harmony.modules.resolved-component": "0.0.444",
+    "@teambit/dependency-resolver": "0.0.524",
+    "@teambit/logger": "0.0.450",
+    "@teambit/compiler": "0.0.524",
+    "@teambit/component": "0.0.524",
+    "@teambit/graphql": "0.0.524",
+    "@teambit/aspect-loader": "0.0.524",
+    "@teambit/bundler": "0.0.524",
+    "@teambit/envs": "0.0.524",
+    "@teambit/pubsub": "0.0.524",
+    "@teambit/scope": "0.0.524",
+    "@teambit/ui": "0.0.524",
+    "@teambit/variants": "0.0.452",
+    "@teambit/legacy-bit-id": "0.0.369",
+    "@teambit/bit-error": "0.0.366",
+    "@teambit/component-issues": "0.0.15",
+    "@teambit/config": "0.0.391",
+    "@teambit/harmony.modules.requireable-component": "0.0.444",
+    "@teambit/workspace.modules.match-pattern": "0.0.446",
+    "@teambit/command-bar": "0.0.524",
+    "@teambit/design.ui.surfaces.menu.link-item": "0.0.374",
+    "@teambit/graph": "0.0.524",
+    "@teambit/react-router": "0.0.524",
+    "@teambit/sidebar": "0.0.524",
+    "@teambit/ui-foundation.ui.main-dropdown": "0.0.446",
+    "@teambit/ui-foundation.ui.menu": "0.0.446",
+    "@teambit/ui-foundation.ui.react-router.slot-router": "0.0.448",
+    "@teambit/toolbox.time.time-format": "0.0.443",
+    "@teambit/component-id": "0.0.370",
+    "@teambit/ui-foundation.ui.hooks.use-data-query": "0.0.447",
+    "@teambit/deprecation": "0.0.524",
+    "@teambit/ui-foundation.ui.constants.z-indexes": "0.0.446",
+    "@teambit/ui-foundation.ui.buttons.collapser": "0.0.151",
+    "@teambit/ui-foundation.ui.corner": "0.0.453",
+    "@teambit/ui-foundation.ui.notifications.notification-context": "0.0.447",
+    "@teambit/ui-foundation.ui.top-bar": "0.0.448",
+    "@teambit/design.ui.styles.ellipsis": "0.0.346",
+    "@teambit/design.ui.styles.muted-italic": "0.0.35",
+    "@teambit/ui-foundation.ui.full-loader": "0.0.446",
+    "@teambit/ui-foundation.ui.side-bar": "0.0.450",
+    "@teambit/ui-foundation.ui.tree.drawer": "0.0.446",
+    "@teambit/explorer.ui.gallery.component-grid": "0.0.446",
+    "@teambit/workspace.ui.empty-workspace": "0.0.448",
+    "@teambit/workspace.ui.workspace-component-card": "0.0.449"
   },
   "devDependencies": {
     "@types/react": "^17.0.8",
@@ -101,7 +101,7 @@
     "react-dom": "^16.8.0 || ^17.0.0",
     "react": "^16.8.0 || ^17.0.0"
   },
-  "license": "SEE LICENSE IN LICENSE",
+  "license": "Apache-2.0",
   "bit": {
     "bindingPrefix": "@teambit",
     "env": {},

package/tag-cmd.ts

@@ -40,7 +40,7 @@ ${WILDCARD_HELP('tag')}`;
     ['I', 'ignore-newest-version', 'ignore existing of newer versions (default = false)'],
     ['', 'skip-tests', 'skip running component tests during tag process'],
     ['', 'skip-auto-tag', 'skip auto tagging dependents'],
-    ['', 'build', 'EXPERIMENTAL. not needed for now. run the pipeline build and complete the tag'],
+    ['b', 'build', 'EXPERIMENTAL. not needed for now. run the pipeline build and complete the tag'],
     ['', 'soft', 'do not persist. only keep note of the changes to be made'],
     ['', 'persist', 'persist the changes generated by --soft tag'],
     ['', 'disable-deploy-pipeline', 'DEPRECATED. use --disable-tag-pipeline instead'],

package/watch/watcher.ts

@@ -14,6 +14,7 @@ import { ChildProcess } from 'child_process';
 import chokidar, { FSWatcher } from 'chokidar';
 import ComponentMap from '@teambit/legacy/dist/consumer/bit-map/component-map';
 import { PathLinux, PathOsBasedAbsolute } from '@teambit/legacy/dist/utils/path';
+import { CompilationInitiator } from '@teambit/compiler';
 import { WorkspaceAspect } from '../';
 import { OnComponentChangeEvent, OnComponentAddEvent, OnComponentRemovedEvent } from '../events';
 import { Workspace } from '../workspace';
@@ -40,7 +41,7 @@ export class Watcher {
     return this.workspace.consumer;
   }
 
-  async watchAll(opts?: { msgs; verbose?: boolean }) {
+  async watchAll(opts?: { msgs; verbose?: boolean; initiator?: CompilationInitiator }) {
     // TODO: run build in the beginning of process (it's work like this in other envs)
     const _verbose = opts?.verbose || false;
     await this.createWatcher();
@@ -58,7 +59,7 @@ export class Watcher {
       // eslint-disable-next-line @typescript-eslint/no-misused-promises
       watcher.on('change', async (filePath) => {
         const startTime = new Date().getTime();
-        const buildResults = (await this.handleChange(filePath)) || [];
+        const buildResults = (await this.handleChange(filePath, opts?.initiator)) || [];
         const duration = new Date().getTime() - startTime;
         opts?.msgs?.onChange(filePath, buildResults, _verbose, duration);
       });
@@ -81,7 +82,7 @@ export class Watcher {
     });
   }
 
-  private async handleChange(filePath: string): Promise<OnComponentEventResult[]> {
+  private async handleChange(filePath: string, initiator?: CompilationInitiator): Promise<OnComponentEventResult[]> {
     try {
       if (filePath.endsWith(BIT_MAP)) {
         const buildResults = await this.handleBitmapChanges();
@@ -94,7 +95,7 @@ export class Watcher {
         return this.completeWatch();
       }
 
-      const buildResults = await this.executeWatchOperationsOnComponent(componentId);
+      const buildResults = await this.executeWatchOperationsOnComponent(componentId, true, initiator);
       this.completeWatch();
       return buildResults;
     } catch (err: any) {
@@ -137,7 +138,8 @@ export class Watcher {
 
   private async executeWatchOperationsOnComponent(
     componentId: ComponentID,
-    isChange = true
+    isChange = true,
+    initiator?: CompilationInitiator
   ): Promise<OnComponentEventResult[]> {
     if (this.isComponentWatchedExternally(componentId)) {
       // update capsule, once done, it automatically triggers the external watcher
@@ -157,7 +159,7 @@ export class Watcher {
     let buildResults: OnComponentEventResult[];
     try {
       buildResults = isChange
-        ? await this.workspace.triggerOnComponentChange(componentId)
+        ? await this.workspace.triggerOnComponentChange(componentId, initiator)
         : await this.workspace.triggerOnComponentAdd(componentId);
     } catch (err: any) {
       // do not exist the watch process on errors, just print them

package/workspace.ts

@@ -61,10 +61,11 @@ import componentIdToPackageName from '@teambit/legacy/dist/utils/bit/component-i
 import { PathOsBased, PathOsBasedRelative, PathOsBasedAbsolute } from '@teambit/legacy/dist/utils/path';
 import { BitError } from '@teambit/bit-error';
 import fs from 'fs-extra';
-import { slice, uniqBy, difference } from 'lodash';
+import { slice, uniqBy, difference, compact } from 'lodash';
 import path from 'path';
 import ConsumerComponent from '@teambit/legacy/dist/consumer/component';
 import type { ComponentLog } from '@teambit/legacy/dist/scope/models/model-component';
+import { CompilationInitiator } from '@teambit/compiler';
 import { ComponentConfigFile } from './component-config-file';
 import { DependencyTypeNotSupportedInPolicy } from './exceptions';
 import {
@@ -467,7 +468,7 @@ export class Workspace implements ComponentFactory {
     this.componentList = new ComponentsList(this.consumer);
   }
 
-  async triggerOnComponentChange(id: ComponentID): Promise<OnComponentEventResult[]> {
+  async triggerOnComponentChange(id: ComponentID, initiator?: CompilationInitiator): Promise<OnComponentEventResult[]> {
     const component = await this.get(id);
     // if a new file was added, upon component-load, its .bitmap entry is updated to include the
     // new file. write these changes to the .bitmap file so then other processes have access to
@@ -476,7 +477,7 @@ export class Workspace implements ComponentFactory {
     const onChangeEntries = this.onComponentChangeSlot.toArray(); // e.g. [ [ 'teambit.bit/compiler', [Function: bound onComponentChange] ] ]
     const results: Array<{ extensionId: string; results: SerializableResults }> = [];
     await mapSeries(onChangeEntries, async ([extension, onChangeFunc]) => {
-      const onChangeResult = await onChangeFunc(component);
+      const onChangeResult = await onChangeFunc(component, initiator);
       results.push({ extensionId: extension, results: onChangeResult });
     });
 
@@ -930,10 +931,17 @@ export class Workspace implements ComponentFactory {
     const { workspaceComps, scopeComps } = await this.groupComponentsByWorkspaceAndScope(aspects);
     // load the scope first because we might need it for custom envs that extend external aspects
     const scopeIds = scopeComps.map((aspect) => aspect.id.toString());
-    await this.scope.loadAspects(scopeIds, throwOnError);
-
     const workspaceAspects = await this.requireComponents(workspaceComps);
-    await this.aspectLoader.loadRequireableExtensions(workspaceAspects, throwOnError);
+    const workspaceManifests = await this.aspectLoader.getManifestsFromRequireableExtensions(
+      workspaceAspects,
+      throwOnError
+    );
+    const manifestsIds = workspaceManifests.map((m) => m.id);
+
+    const scopeManifests = await this.scope.getManifestsGraphRecursively(scopeIds, compact(manifestsIds), throwOnError);
+
+    const allManifests = [...scopeManifests, ...workspaceManifests];
+    await this.aspectLoader.loadExtensionsByManifests(allManifests, throwOnError);
   }
 
   async resolveAspects(runtimeName?: string, componentIds?: ComponentID[]): Promise<AspectDefinition[]> {
@@ -1075,6 +1083,11 @@ export class Workspace implements ComponentFactory {
       }
 
       const requireFunc = async () => {
+        const plugins = this.aspectLoader.getPlugins(component, localPath);
+        if (plugins.has()) {
+          return plugins.load(MainRuntime.name);
+        }
+
         // eslint-disable-next-line global-require, import/no-dynamic-require
         const aspect = require(localPath);
         // require aspect runtimes