teambit · GiladShoham · Nov 2, 2023 · Jul 25, 2023 · Jul 25, 2023 · Jul 25, 2023
diff --git a/README.md b/README.md
@@ -23,28 +23,27 @@
 <a href="https://github.com/prettier/prettier"><img alt ="Styled with Prettier" src="https://img.shields.io/badge/styled_with-prettier-ff69b4.svg">
 <a href="https://join.slack.com/t/bit-dev-community/shared_invite/zt-1vq1vcxxu-CEVobR1p9BurmW8QnQFh1w" ><img alt="Join Slack" src="https://img.shields.io/badge/Slack-Join%20Bit%20Slack-blueviolet"/></a>
 
-
 Bit is a build system for development of **composable software**. It makes the composition of applications from independently versioned components seamless and fast.
 
-Bit is similar in sense, but stands as the opposite for the "Monorepo" approach, which aims to center all code under a central repository. Instead, Bit is bringing simplicity for distribution of source code into  independently versioned components, depending on each other.
+Bit is similar in sense, but stands as the opposite for the "Monorepo" approach, which aims to center all code under a central repository. Instead, Bit is bringing simplicity for distribution of source code into independently versioned components, depending on each other.
 
 People often use Bit to run a Monorepo, a Polyrepo or without using repositories at all.
 
 The core innovation of Bit is the ["Bit Component"](https://bit.dev/#component), a composable and versioned container for source code, whereas dependencies are first-class citizens. Components can be used as packages, ESM modules, runtime scripts, and any other artifact a build task can generate.
 
 - 📦 **Descriptive module names**. Use components through descriptive package names. No aliases required.
-- 🚀 **Dependency versioning.** Automatic detection and versioning of dependency changes. No more redundant  package.json files.
+- 🚀 **Dependency versioning.** Automatic detection and versioning of dependency changes. No more redundant package.json files.
 - ⚓ **Reusable development environments.** Reusable components including all of your dev config. No more duplication of countless `tsconfig.json`, `eslintrc` or `pretterrc` configs.
 - ⚒️ **Build pipelines**. Independently build and store packages, bundles, and binaries.
 - 👓 **Preview and auto-generated docs**. Every component is an asset with auto-generated docs and component previews.
 - 🛫 **Change review**. Use Lanes to propose and preview changes and collaborate on them with others.
 - 🧑‍💻 **Component generators**. Create new components using pre-built or custom templates for any type of component.
 
-
 ## Getting started
 
 ### Install Bit
-Use the Bit installer to install Bit to be available on your PATH. 
+
+Use the Bit installer to install Bit to be available on your PATH.
 
 ```bash
 npx @teambit/bvm install
@@ -55,8 +54,9 @@ For better VSCode dev experience, install the [Bit VSCode Plugin](https://market
 ### Create a new workspace
 
 Run the following to create a workspace with a few components included, using the hello-world starter:
+
 ```bash
-bit new hello-world my-hello-world --env teambit.community/starters/hello-world 
+bit new hello-world my-hello-world --env teambit.community/starters/hello-world
 ```
 
 For the quick start, we use two React components and one Node module, though you can create components using any JS-based framework. You can explore our [official starters](https://bit.dev/docs) for [Vue](https://bit.dev/docs/quick-start/hello-world-vue), [Angular](https://bit.dev/docs/quick-start/hello-world-angular), and other supported tools or [learn how to create your own](https://bit.dev/docs/node-env/set-up-your-env).
@@ -72,6 +72,7 @@ bit run hello-world-app
 You can get any component to become an app by adding a single file to it.
 
 ### Create components
+
 Start creating components using the default component generators, or [create your own](https://bit.dev/docs/node-env/generators).
 
 ```bash
@@ -99,8 +100,9 @@ bit login
 ```
 
 Once done, change to your own owner and scope names using this command:
+
 ```bash
-bit scope rename org.scope-name my-org.my-scope-name --refactor 
+bit scope rename org.scope-name my-org.my-scope-name --refactor
 ```
 
 This command will refactor your components to use the new owner and scope names.
@@ -119,7 +121,7 @@ By default, components are built using bit.cloud's CI platform, Ripple CI. Howev
 
 ### Export components to a remote scope
 
-Export your staged components from your workspace to their remote scopes. This will make them available to 
+Export your staged components from your workspace to their remote scopes. This will make them available to
 be used by components outside of your workspace, and from your other projects.
 
 ```bash
@@ -129,6 +131,7 @@ bit export
 Head over to your bit.cloud account to see your components build progress. Once the build process is completed, the components will be available for use in their remote scopes. 🎉🎉🎉
 
 ## Contributors
+
 Bit is entirely built with Bit and you can find all its components on [Bit Cloud](https://bit.cloud/teambit/~scopes).
 
 <a href="../../graphs/contributors"><img src="https://opencollective.com/bit/contributors.svg?width=890&button=false" /></a>
@@ -137,6 +140,6 @@ Your contribution, no matter how big or small, is much appreciated. Before contr
 
 See [Contributing](CONTRIBUTING.md).
 
-## License 
+## License
 
 [Apache License, Version 2.0](https://github.com/teambit/bit/blob/master/LICENSE)
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/scopes/dependencies/dependency-resolver/dependency-linker.ts b/scopes/dependencies/dependency-resolver/dependency-linker.ts
@@ -4,6 +4,7 @@ import { uniq, compact, flatten, head, omit } from 'lodash';
 import { Stats } from 'fs';
 import fs from 'fs-extra';
 import resolveFrom from 'resolve-from';
+import { findCurrentBvmDir } from '@teambit/bvm.path';
 import { ComponentMap, Component, ComponentID, ComponentMain } from '@teambit/component';
 import { Logger } from '@teambit/logger';
 import { PathAbsolute } from '@teambit/legacy/dist/utils/path';
@@ -110,6 +111,8 @@ type NestedModuleFolderEntry = {
 };
 
 export class DependencyLinker {
+  private _currentBitDir: string | null;
+
   constructor(
     private dependencyResolver: DependencyResolverMain,
 
@@ -126,7 +129,9 @@ export class DependencyLinker {
     private linkingOptions?: LinkingOptions,
 
     private linkingContext: DepLinkerContext = {}
-  ) {}
+  ) {
+    this._currentBitDir = findCurrentBvmDir();
+  }
 
   async calculateLinkedDeps(
     rootDir: string | undefined,
@@ -630,6 +635,9 @@ export class DependencyLinker {
 
     const packageName = `@teambit/${name}`;
     const target = path.join(rootDir, 'node_modules', packageName);
+    if (this._currentBitDir) {
+      return { packageName, from: path.join(this._currentBitDir, 'node_modules', packageName), to: target };
+    }
     const isDistDirExist = fs.pathExistsSync(distDir);
     if (!isDistDirExist) {
       const newDir = getDistDirForDevEnv(packageName);

diff --git a/scopes/docs/docs/docs.ui.runtime.tsx b/scopes/docs/docs/docs.ui.runtime.tsx
@@ -32,7 +32,7 @@ export class DocsUI {
   private _emptyState?: ComponentType;
 
   registerEmptyState(emptyState: ComponentType) {
-    return this._emptyState = emptyState;
+    return (this._emptyState = emptyState);
   }
 
   getEmptyState() {

diff --git a/scopes/harmony/aspect-loader/core-aspects.ts b/scopes/harmony/aspect-loader/core-aspects.ts
@@ -2,6 +2,7 @@ import { BitError } from '@teambit/bit-error';
 import { existsSync, readdir } from 'fs-extra';
 import { join, resolve } from 'path';
 import { Config } from '@teambit/bvm.config';
+import { findCurrentBvmDir } from '@teambit/bvm.path';
 
 let _bvmConfig;
 
@@ -13,7 +14,14 @@ function getAspectDirFromPath(id: string, pathsToResolveAspects?: string[]): str
   if (pathsToResolveAspects && pathsToResolveAspects.length) {
     moduleDirectory = require.resolve(packageName, { paths: pathsToResolveAspects });
   } else {
-    moduleDirectory = require.resolve(packageName);
+    try {
+      moduleDirectory = require.resolve(packageName);
+    } catch {
+      const currentBitDir = findCurrentBvmDir();
+      if (currentBitDir) {
+        return resolve(currentBitDir, 'node_modules', packageName);
+      }
+    }
   }
   const dirPath = join(moduleDirectory, '../..'); // to remove the "index.js" at the end
   if (!existsSync(dirPath)) {

diff --git a/workspace.jsonc b/workspace.jsonc
@@ -106,6 +106,7 @@
         "@teambit/base-ui.utils.time-ago": "1.0.1",
         "@teambit/bit.content.what-is-bit": "1.96.2",
         "@teambit/bvm.config": "0.2.2",
+        "@teambit/bvm.path": "^0.1.2",
         "@teambit/capsule": "0.0.12",
         "@teambit/code.ui.code-compare": "^0.0.281",
         "@teambit/code.ui.code-compare-section": "0.0.5",