@teambit/workspace 0.0.549 → 0.0.555

package/dist/workspace.ui.runtime.d.ts

@@ -11,16 +11,47 @@ import { RouteProps } from 'react-router-dom';
 import { CommandBarUI, ComponentSearcher } from '@teambit/command-bar';
 export declare type SidebarWidgetSlot = SlotRegistry<ComponentTreeNode>;
 export declare class WorkspaceUI {
+    /**
+     * route slot.
+     */
     private routeSlot;
+    /**
+     * component ui extension.
+     */
     private componentUi;
+    /**
+     * menu slot
+     */
     private menuSlot;
     private menuItemSlot;
     private sidebar;
     private sidebarSlot;
+    /**
+     * sidebar link slot
+     */
     private sidebarItemSlot;
     private commandBarUI;
-    constructor(routeSlot: RouteSlot, componentUi: ComponentUI, menuSlot: RouteSlot, menuItemSlot: MenuItemSlot, sidebar: SidebarUI, sidebarSlot: SidebarWidgetSlot, sidebarItemSlot: SidebarItemSlot, commandBarUI: CommandBarUI, reactRouterUI: ReactRouterUI);
+    constructor(
+    /**
+     * route slot.
+     */
+    routeSlot: RouteSlot, 
+    /**
+     * component ui extension.
+     */
+    componentUi: ComponentUI, 
+    /**
+     * menu slot
+     */
+    menuSlot: RouteSlot, menuItemSlot: MenuItemSlot, sidebar: SidebarUI, sidebarSlot: SidebarWidgetSlot, 
+    /**
+     * sidebar link slot
+     */
+    sidebarItemSlot: SidebarItemSlot, commandBarUI: CommandBarUI, reactRouterUI: ReactRouterUI);
     private setKeyBindHandler;
+    /**
+     * register a route to the workspace.
+     */
     registerRoute(route: RouteProps): this;
     registerSidebarWidget(componentTreeNode: ComponentTreeNode): this;
     registerMenuItem: (menuItems: MenuItem[]) => void;

package/install.cmd.tsx

@@ -1,5 +1,5 @@
 import { Command, CommandOptions } from '@teambit/cli';
-import { DependencyLifecycleType } from '@teambit/dependency-resolver';
+import { WorkspaceDependencyLifecycleType } from '@teambit/dependency-resolver';
 import { Logger } from '@teambit/logger';
 import chalk from 'chalk';
 
@@ -7,7 +7,7 @@ import { Workspace, WorkspaceInstallOptions } from './workspace';
 
 type InstallCmdOptions = {
   variants: string;
-  type: DependencyLifecycleType;
+  type: WorkspaceDependencyLifecycleType;
   skipDedupe: boolean;
   skipImport: boolean;
   updateExisting: boolean;

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@teambit/workspace",
-  "version": "0.0.549",
+  "version": "0.0.555",
   "homepage": "https://bit.dev/teambit/workspace/workspace",
   "main": "dist/index.js",
   "componentId": {
     "scope": "teambit.workspace",
     "name": "workspace",
-    "version": "0.0.549"
+    "version": "0.0.555"
   },
   "dependencies": {
     "lodash.compact": "3.0.1",
@@ -18,6 +18,7 @@
     "@teambit/harmony": "0.2.11",
     "graphql-tag": "2.12.1",
     "fs-extra": "10.0.0",
+    "memoizee": "0.4.15",
     "react-router-dom": "5.2.0",
     "detect-indent": "5.0.0",
     "detect-newline": "3.1.0",
@@ -33,55 +34,55 @@
     "@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/bit-error": "0.0.366",
-    "@teambit/legacy-bit-id": "0.0.369",
-    "@teambit/logger": "0.0.465",
-    "@teambit/scope": "0.0.549",
-    "@teambit/cli": "0.0.380",
-    "@teambit/isolator": "0.0.549",
-    "@teambit/component-tree": "0.0.366",
-    "@teambit/component.ui.component-status-resolver": "0.0.463",
-    "@teambit/harmony.modules.resolved-component": "0.0.457",
-    "@teambit/dependency-resolver": "0.0.549",
-    "@teambit/compiler": "0.0.549",
-    "@teambit/component": "0.0.549",
-    "@teambit/graphql": "0.0.549",
-    "@teambit/aspect-loader": "0.0.549",
-    "@teambit/bundler": "0.0.549",
-    "@teambit/envs": "0.0.549",
-    "@teambit/pubsub": "0.0.549",
-    "@teambit/ui": "0.0.549",
-    "@teambit/variants": "0.0.467",
-    "@teambit/component-issues": "0.0.15",
-    "@teambit/config": "0.0.391",
-    "@teambit/harmony.modules.requireable-component": "0.0.457",
-    "@teambit/importer": "0.0.7",
-    "@teambit/workspace.modules.match-pattern": "0.0.459",
-    "@teambit/command-bar": "0.0.549",
+    "@teambit/bit-error": "0.0.372",
+    "@teambit/legacy-bit-id": "0.0.375",
+    "@teambit/logger": "0.0.471",
+    "@teambit/scope": "0.0.555",
+    "@teambit/cli": "0.0.386",
+    "@teambit/isolator": "0.0.555",
+    "@teambit/component-tree": "0.0.372",
+    "@teambit/component.ui.component-status-resolver": "0.0.467",
+    "@teambit/harmony.modules.resolved-component": "0.0.461",
+    "@teambit/dependency-resolver": "0.0.555",
+    "@teambit/compiler": "0.0.555",
+    "@teambit/component": "0.0.555",
+    "@teambit/graphql": "0.0.555",
+    "@teambit/aspect-loader": "0.0.555",
+    "@teambit/bundler": "0.0.555",
+    "@teambit/envs": "0.0.555",
+    "@teambit/pubsub": "0.0.555",
+    "@teambit/ui": "0.0.555",
+    "@teambit/variants": "0.0.473",
+    "@teambit/component-issues": "0.0.21",
+    "@teambit/config": "0.0.397",
+    "@teambit/harmony.modules.requireable-component": "0.0.461",
+    "@teambit/importer": "0.0.13",
+    "@teambit/workspace.modules.match-pattern": "0.0.465",
+    "@teambit/command-bar": "0.0.555",
     "@teambit/design.ui.surfaces.menu.link-item": "0.0.374",
-    "@teambit/graph": "0.0.549",
-    "@teambit/react-router": "0.0.549",
-    "@teambit/sidebar": "0.0.549",
-    "@teambit/ui-foundation.ui.main-dropdown": "0.0.459",
-    "@teambit/ui-foundation.ui.menu": "0.0.459",
-    "@teambit/ui-foundation.ui.react-router.slot-router": "0.0.461",
-    "@teambit/toolbox.time.time-format": "0.0.456",
-    "@teambit/component-id": "0.0.370",
-    "@teambit/ui-foundation.ui.hooks.use-data-query": "0.0.460",
-    "@teambit/deprecation": "0.0.549",
-    "@teambit/ui-foundation.ui.constants.z-indexes": "0.0.459",
-    "@teambit/ui-foundation.ui.buttons.collapser": "0.0.164",
-    "@teambit/ui-foundation.ui.corner": "0.0.466",
-    "@teambit/ui-foundation.ui.notifications.notification-context": "0.0.460",
-    "@teambit/ui-foundation.ui.top-bar": "0.0.461",
+    "@teambit/graph": "0.0.555",
+    "@teambit/react-router": "0.0.555",
+    "@teambit/sidebar": "0.0.555",
+    "@teambit/ui-foundation.ui.main-dropdown": "0.0.463",
+    "@teambit/ui-foundation.ui.menu": "0.0.463",
+    "@teambit/ui-foundation.ui.react-router.slot-router": "0.0.465",
+    "@teambit/toolbox.time.time-format": "0.0.460",
+    "@teambit/component-id": "0.0.376",
+    "@teambit/ui-foundation.ui.hooks.use-data-query": "0.0.464",
+    "@teambit/deprecation": "0.0.555",
+    "@teambit/ui-foundation.ui.constants.z-indexes": "0.0.463",
+    "@teambit/ui-foundation.ui.buttons.collapser": "0.0.168",
+    "@teambit/ui-foundation.ui.corner": "0.0.470",
+    "@teambit/ui-foundation.ui.notifications.notification-context": "0.0.464",
+    "@teambit/ui-foundation.ui.top-bar": "0.0.465",
     "@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.459",
-    "@teambit/ui-foundation.ui.side-bar": "0.0.465",
-    "@teambit/ui-foundation.ui.tree.drawer": "0.0.459",
-    "@teambit/explorer.ui.gallery.component-grid": "0.0.459",
-    "@teambit/workspace.ui.empty-workspace": "0.0.461",
-    "@teambit/workspace.ui.workspace-component-card": "0.0.462"
+    "@teambit/ui-foundation.ui.full-loader": "0.0.463",
+    "@teambit/ui-foundation.ui.side-bar": "0.0.469",
+    "@teambit/ui-foundation.ui.tree.drawer": "0.0.463",
+    "@teambit/explorer.ui.gallery.component-grid": "0.0.463",
+    "@teambit/workspace.ui.empty-workspace": "0.0.465",
+    "@teambit/workspace.ui.workspace-component-card": "0.0.466"
   },
   "devDependencies": {
     "@types/lodash.compact": "3.0.6",
@@ -89,6 +90,7 @@
     "@types/react": "^17.0.8",
     "@types/semver": "7.3.4",
     "@types/fs-extra": "9.0.7",
+    "@types/memoizee": "0.4.5",
     "@types/react-router-dom": "5.1.7",
     "@types/pluralize": "0.0.29",
     "@types/classnames": "2.2.11",
@@ -100,7 +102,7 @@
   },
   "peerDependencies": {
     "@apollo/client": "^3.0.0",
-    "@teambit/legacy": "1.0.76",
+    "@teambit/legacy": "1.0.172",
     "react-dom": "^16.8.0 || ^17.0.0",
     "react": "^16.8.0 || ^17.0.0"
   },
@@ -128,7 +130,7 @@
         "react": "-"
       },
       "peerDependencies": {
-        "@teambit/legacy": "1.0.76",
+        "@teambit/legacy": "1.0.172",
         "react-dom": "^16.8.0 || ^17.0.0",
         "react": "^16.8.0 || ^17.0.0"
       }

package/tsconfig.json

@@ -25,7 +25,6 @@
     "strict": true,
     "noImplicitAny": false,
     "rootDir": ".",
-    "removeComments": true,
     "preserveConstEnums": true,
     "resolveJsonModule": true
   },

package/workspace.ts

@@ -1,4 +1,5 @@
 import chalk from 'chalk';
+import memoize from 'memoizee';
 import mapSeries from 'p-map-series';
 import type { PubsubMain } from '@teambit/pubsub';
 import { IssuesList } from '@teambit/component-issues';
@@ -19,7 +20,7 @@ import {
 import { Importer } from '@teambit/importer';
 import { ComponentScopeDirMap, Config } from '@teambit/config';
 import {
-  DependencyLifecycleType,
+  WorkspaceDependencyLifecycleType,
   DependencyResolverMain,
   PackageManagerInstallOptions,
   ComponentDependency,
@@ -106,7 +107,7 @@ export interface EjectConfOptions {
 
 export type WorkspaceInstallOptions = {
   variants?: string;
-  lifecycleType?: DependencyLifecycleType;
+  lifecycleType?: WorkspaceDependencyLifecycleType;
   dedupe: boolean;
   import: boolean;
   copyPeerToRuntimeOnRoot?: boolean;
@@ -201,6 +202,15 @@ export class Workspace implements ComponentFactory {
     this.owner = this.config?.defaultOwner;
     this.componentLoader = new WorkspaceComponentLoader(this, logger, dependencyResolver, envs);
     this.validateConfig();
+    // memoize this method to improve performance.
+    this.componentDefaultScopeFromComponentDirAndNameWithoutConfigFile = memoize(
+      this.componentDefaultScopeFromComponentDirAndNameWithoutConfigFile.bind(this),
+      {
+        primitive: true,
+        promise: true,
+        maxAge: 60 * 1000, // 1 min
+      }
+    );
   }
 
   private validateConfig() {
@@ -1182,8 +1192,8 @@ export class Workspace implements ComponentFactory {
    */
   async install(packages?: string[], options?: WorkspaceInstallOptions) {
     if (packages && packages.length) {
-      if (!options?.variants && options?.lifecycleType === 'dev') {
-        throw new DependencyTypeNotSupportedInPolicy(options?.lifecycleType);
+      if (!options?.variants && (options?.lifecycleType as string) === 'dev') {
+        throw new DependencyTypeNotSupportedInPolicy(options?.lifecycleType as string);
       }
       this.logger.debug(`installing the following packages: ${packages.join()}`);
       const resolver = this.dependencyResolver.getVersionResolver();
@@ -1278,6 +1288,8 @@ export class Workspace implements ComponentFactory {
   private async generateFilterFnForDepsFromLocalRemote() {
     // TODO: once scope create a new API for this, replace it with the new one
     const remotes = await this.scope._legacyRemotes();
+    const reg = await this.dependencyResolver.getRegistries();
+    const packageScopes = Object.keys(reg.scopes);
     return (dependencyList: DependencyList): DependencyList => {
       const filtered = dependencyList.filter((dep) => {
         if (!(dep instanceof ComponentDependency)) {
@@ -1286,6 +1298,9 @@ export class Workspace implements ComponentFactory {
         if (remotes.isHub(dep.componentId.scope)) {
           return true;
         }
+        if (packageScopes.some((scope) => dep.packageName.startsWith(`@${scope}/`))) {
+          return true;
+        }
         return false;
       });
       return filtered;
@@ -1448,11 +1463,18 @@ your workspace.jsonc has this component-id set. you might want to remove/change
         return ComponentID.fromLegacy(legacyId);
       }
     }
-    const relativeComponentDir = this.componentDirFromLegacyId(legacyId, undefined, { relative: true });
-    const defaultScope = await this.componentDefaultScopeFromComponentDirAndName(
-      relativeComponentDir,
-      legacyId.toStringWithoutScopeAndVersion()
-    );
+    const getDefaultScope = async (bitId: BitId) => {
+      if (bitId.scope) {
+        return bitId.scope;
+      }
+      const relativeComponentDir = this.componentDirFromLegacyId(bitId, undefined, { relative: true });
+      const defaultScope = await this.componentDefaultScopeFromComponentDirAndName(
+        relativeComponentDir,
+        bitId.toStringWithoutScopeAndVersion()
+      );
+      return defaultScope;
+    };
+    const defaultScope = await getDefaultScope(legacyId);
     return ComponentID.fromLegacy(legacyId, defaultScope);
   }