teambit · davidfirst · Jan 19, 2023 · Jan 19, 2023 · Jan 19, 2023 · Jan 19, 2023
diff --git a/.bitmap b/.bitmap
diff --git a/.gitignore b/.gitignore
@@ -73,5 +73,8 @@ package-lock.json
 !.yarn/sdks
 !.yarn/versions
 
+# bundle output
+/bundle
+
 # Claude Code files
 .claude/
diff --git a/components/bit/get-bit-version/esm.mjs b/components/bit/get-bit-version/esm.mjs
@@ -0,0 +1,7 @@
+// eslint-disable-next-line import/no-unresolved
+import cjsModule from './index.js';
+
+export const getBitVersion = cjsModule.getBitVersion;
+export const getBitVersionGracefully = cjsModule.getBitVersionGracefully;
+
+export default cjsModule;
diff --git a/components/bit/get-bit-version/get-bit-version.ts b/components/bit/get-bit-version/get-bit-version.ts
@@ -1,11 +1,25 @@
 import { join } from 'path';
+import { existsSync } from 'fs-extra';
 
 export function getBitVersion(): string {
-  const teambitBit = require.resolve('@teambit/bit');
-  // eslint-disable-next-line
-  const packageJson = require(join(teambitBit, '../..', 'package.json'));
-  if (packageJson.version) return packageJson.version;
-  throw new Error(`unable to find Bit version`);
+    const teambitBit = require.resolve('@teambit/bit');
+    // For bundle cases, the teambitBit point to a flat folder that contains the package.json
+    let packageJsonPath = join(teambitBit, '../', 'package.json');
+    if (!existsSync(packageJsonPath)) {
+      // for dev cases, the teambitBit point to the dist folder that doesn't contains the package.json
+      packageJsonPath = join(teambitBit, '../..', 'package.json');
+    }
+    if (!existsSync(packageJsonPath)) {
+      throw new Error('unable to find Bit version (package.json not found)');
+    }
+    // eslint-disable-next-line
+    const packageJson = require(packageJsonPath);
+    if (packageJson.version) return packageJson.version;
+    // this is running locally
+    if (packageJson.componentId && packageJson.componentId.version) {
+      return packageJson.componentId.version || `last-tag ${packageJson.componentId.version}`;
+    }
+    throw new Error('unable to find Bit version (version not found in package.json)');
 }
 
 export function getBitVersionGracefully(): string | null {

diff --git a/components/config-store/esm.mjs b/components/config-store/esm.mjs
@@ -0,0 +1,12 @@
+// eslint-disable-next-line import/no-unresolved
+import cjsModule from './index.js';
+
+export const ConfigStoreAspect = cjsModule.ConfigStoreAspect;
+export const getConfig = cjsModule.getConfig;
+export const getNumberFromConfig = cjsModule.getNumberFromConfig;
+export const listConfig = cjsModule.listConfig;
+export const Store = cjsModule.Store;
+export const setGlobalConfig = cjsModule.setGlobalConfig;
+export const delGlobalConfig = cjsModule.delGlobalConfig;
+
+export default cjsModule;
diff --git a/components/legacy/analytics/esm.mjs b/components/legacy/analytics/esm.mjs
@@ -0,0 +1,7 @@
+// eslint-disable-next-line import/no-unresolved
+import cjsModule from './index.js';
+
+export const Analytics = cjsModule.Analytics;
+export const LEVEL = cjsModule.LEVEL;
+
+export default cjsModule;
diff --git a/components/legacy/constants/esm.mjs b/components/legacy/constants/esm.mjs
@@ -0,0 +1,41 @@
+// eslint-disable-next-line import/no-unresolved
+import cjsModule from './constants.js';
+
+// Export all named exports
+export const {
+  ACCEPTABLE_NPM_VERSIONS,
+  ANGULAR_BIT_ENTRY_POINT_FILE,
+  ANGULAR_PACKAGE_IDENTIFIER,
+  AUTO_GENERATED_MSG,
+  AUTO_GENERATED_STAMP,
+  AUTO_SNAPPED_MSG,
+  BASE_COMMUNITY_DOMAIN,
+  BASE_DOCS_DOMAIN,
+  BASE_LEGACY_DOCS_DOMAIN,
+  BASE_WEB_DOMAIN,
+  BITMAP_PREFIX_MESSAGE,
+  BITS_DIRNAME,
+  BIT_CACHE_DIRNAME,
+  BIT_GIT_DIR,
+  BIT_HIDDEN_DIR,
+  BIT_JSON,
+  BIT_MAP,
+  BIT_REGISTRY,
+  BIT_ROOTS_DIR,
+  BIT_SOURCES_DIRNAME,
+  BIT_TMP_DIRNAME,
+  BIT_USAGE,
+  BIT_WORKSPACE_TMP_DIRNAME,
+  BuildStatus,
+  CACHE_GLOBALS_ENV,
+  CACHE_ROOT,
+  CENTRAL_BIT_HUB_NAME,
+  CENTRAL_BIT_HUB_URL,
+  CENTRAL_BIT_HUB_URL_IMPORTER,
+  CENTRAL_BIT_HUB_URL_IMPORTER_V2,
+  GLOBAL_CONFIG,
+  GLOBAL_LOGS,
+  // Add other constants as needed...
+} = cjsModule;
+
+export default cjsModule;
diff --git a/components/legacy/consumer-component/esm.mjs b/components/legacy/consumer-component/esm.mjs
@@ -0,0 +1,25 @@
+// eslint-disable-next-line import/no-unresolved
+import cjsModule from './index.js';
+
+export const CURRENT_SCHEMA = cjsModule.CURRENT_SCHEMA;
+export const ComponentLoadOptions = cjsModule.ComponentLoadOptions;
+export const ComponentLoader = cjsModule.ComponentLoader;
+export const ComponentNotFoundInPath = cjsModule.ComponentNotFoundInPath;
+export const ConsumerComponent = cjsModule.ConsumerComponent;
+export const DEPENDENCIES_TYPES = cjsModule.DEPENDENCIES_TYPES;
+export const DEPENDENCIES_TYPES_UI_MAP = cjsModule.DEPENDENCIES_TYPES_UI_MAP;
+export const Dependencies = cjsModule.Dependencies;
+export const Dependency = cjsModule.Dependency;
+export const DependencyLoaderOpts = cjsModule.DependencyLoaderOpts;
+export const IgnoredDirectory = cjsModule.IgnoredDirectory;
+export const ImportSpecifier = cjsModule.ImportSpecifier;
+export const InvalidComponent = cjsModule.InvalidComponent;
+export const LoadManyResult = cjsModule.LoadManyResult;
+export const ManuallyChangedDependencies = cjsModule.ManuallyChangedDependencies;
+export const RelativePath = cjsModule.RelativePath;
+export const SchemaFeature = cjsModule.SchemaFeature;
+export const SchemaName = cjsModule.SchemaName;
+export const Specifier = cjsModule.Specifier;
+export const isSchemaSupport = cjsModule.isSchemaSupport;
+
+export default cjsModule;
diff --git a/components/legacy/consumer-config/esm.mjs b/components/legacy/consumer-config/esm.mjs
@@ -0,0 +1,17 @@
+// eslint-disable-next-line import/no-unresolved
+import cjsModule from './index.js';
+
+export const ComponentConfig = cjsModule.ComponentConfig;
+export const ComponentConfigLoadOptions = cjsModule.ComponentConfigLoadOptions;
+export const ComponentOverrides = cjsModule.ComponentOverrides;
+export const ComponentOverridesData = cjsModule.ComponentOverridesData;
+export const DependenciesOverridesData = cjsModule.DependenciesOverridesData;
+export const ILegacyWorkspaceConfig = cjsModule.ILegacyWorkspaceConfig;
+export const LegacyWorkspaceConfig = cjsModule.LegacyWorkspaceConfig;
+export const LegacyWorkspaceConfigProps = cjsModule.LegacyWorkspaceConfigProps;
+export const WorkspaceConfigLoadFunction = cjsModule.WorkspaceConfigLoadFunction;
+export const componentOverridesForbiddenFields = cjsModule.componentOverridesForbiddenFields;
+export const getBindingPrefixByDefaultScope = cjsModule.getBindingPrefixByDefaultScope;
+export const nonPackageJsonFields = cjsModule.nonPackageJsonFields;
+
+export default cjsModule;
diff --git a/components/legacy/extension-data/esm.mjs b/components/legacy/extension-data/esm.mjs
@@ -0,0 +1,12 @@
+// eslint-disable-next-line import/no-unresolved
+import cjsModule from './index.js';
+
+export const ExtensionDataEntry = cjsModule.ExtensionDataEntry;
+export const ExtensionDataList = cjsModule.ExtensionDataList;
+export const REMOVE_EXTENSION_SPECIAL_SIGN = cjsModule.REMOVE_EXTENSION_SPECIAL_SIGN;
+export const ValidateBeforePersistResult = cjsModule.ValidateBeforePersistResult;
+export const configEntryToDataEntry = cjsModule.configEntryToDataEntry;
+export const getCompareExtPredicate = cjsModule.getCompareExtPredicate;
+export const removeInternalConfigFields = cjsModule.removeInternalConfigFields;
+
+export default cjsModule;
diff --git a/components/legacy/loader/esm.mjs b/components/legacy/loader/esm.mjs
@@ -0,0 +1,6 @@
+// eslint-disable-next-line import/no-unresolved
+import cjsModule from './index.js';
+
+export const loader = cjsModule.loader;
+
+export default cjsModule;
diff --git a/components/legacy/logger/esm.mjs b/components/legacy/logger/esm.mjs
@@ -0,0 +1,12 @@
+// eslint-disable-next-line import/no-unresolved
+import cjsModule from './index.js';
+
+export const IBitLogger = cjsModule.IBitLogger;
+export const ServerSendOutStream = cjsModule.ServerSendOutStream;
+export const getLevelFromArgv = cjsModule.getLevelFromArgv;
+export const logger = cjsModule.logger;
+export const printWarning = cjsModule.printWarning;
+export const shouldDisableConsole = cjsModule.shouldDisableConsole;
+export const shouldDisableLoader = cjsModule.shouldDisableLoader;
+
+export default cjsModule;
diff --git a/components/legacy/scope-api/esm.mjs b/components/legacy/scope-api/esm.mjs
@@ -0,0 +1,17 @@
+// eslint-disable-next-line import/no-unresolved
+import cjsModule from './index.js';
+
+export const CURRENT_FETCH_SCHEMA = cjsModule.CURRENT_FETCH_SCHEMA;
+export const ExternalActions = cjsModule.ExternalActions;
+export const FETCH_OPTIONS = cjsModule.FETCH_OPTIONS;
+export const LaneNotFound = cjsModule.LaneNotFound;
+export const PushOptions = cjsModule.PushOptions;
+export const action = cjsModule.action;
+export const fetch = cjsModule.fetch;
+export const initScope = cjsModule.initScope;
+export const latestVersions = cjsModule.latestVersions;
+export const put = cjsModule.put;
+export const remove = cjsModule.remove;
+export const scopeConfig = cjsModule.scopeConfig;
+
+export default cjsModule;
diff --git a/components/legacy/scope-api/lib/latest-versions.ts b/components/legacy/scope-api/lib/latest-versions.ts
@@ -2,7 +2,7 @@ import type { ComponentID } from '@teambit/component-id';
 import type { Scope } from '@teambit/legacy.scope';
 import { loadScope } from '@teambit/legacy.scope';
 
-export default (async function latestVersions(path: string, componentIdsStr: string[]): Promise<string[]> {
+export default (async function (path: string, componentIdsStr: string[]): Promise<string[]> {
   const scope: Scope = await loadScope(path);
   const bitIds: ComponentID[] = await Promise.all(componentIdsStr.map((id) => scope.getParsedId(id)));
   const componentsIds = await scope.latestVersions(bitIds);

diff --git a/components/modules/find-scope-path/esm.mjs b/components/modules/find-scope-path/esm.mjs
@@ -0,0 +1,6 @@
+// eslint-disable-next-line import/no-unresolved
+import cjsModule from './index.js';
+
+export const findScopePath = cjsModule.findScopePath;
+
+export default cjsModule;
diff --git a/package.json b/package.json
@@ -65,6 +65,7 @@
     "performance-test:debug": "npm run performance-test --debug",
     "performance-test-circle": "mocha --require ./babel-register --reporter mocha-multi-reporters --reporter-options configFile=mocha-multi-reporters-config.json --colors ./e2e/performance/*.performance*.ts",
     "bit-hub-test-circle": "mocha --require ./babel-register --reporter mocha-multi-reporters --reporter-options configFile=mocha-multi-reporters-config.json --colors ./e2e/bit-hub/*.ts",
+    "bundle": "node node_modules/@teambit/bit/dist/bundle/bundle.js",
     "clean-node-modules": "find . -type d -name node_modules -prune -exec rm -rf '{}' +",
     "setup": "bit install &&  bit compile",
     "full-setup": "rm -rf node_modules/.bin/bit && bit install && husky && bit compile",

diff --git a/scopes/compilation/bundler/esm.mjs b/scopes/compilation/bundler/esm.mjs
@@ -3,5 +3,8 @@ import cjsModule from './index.js';
 
 export const BundlerAspect = cjsModule.BundlerAspect;
 export const ComponentServer = cjsModule.ComponentServer;
+export const ComponentServerStartedEvent = cjsModule.ComponentServerStartedEvent;
+export const ComponentsServerStartedEvent = cjsModule.ComponentsServerStartedEvent;
+export const NewDevServersCreatedEvent = cjsModule.NewDevServersCreatedEvent;
 
 export default cjsModule;
diff --git a/scopes/defender/jest/jest.main.runtime.ts b/scopes/defender/jest/jest.main.runtime.ts
@@ -32,7 +32,17 @@ export class JestMain {
 
   static async provider([worker, loggerAspect]: [WorkerMain, LoggerMain]) {
     const logger = loggerAspect.createLogger(JestAspect.id);
-    const jestWorker = worker.declareWorker<JestWorker>(WORKER_NAME, require.resolve('./jest.worker'));
+    // When bundled, worker files are copied to a separate directory
+    let workerPath: string;
+    try {
+      workerPath = require.resolve('./jest.worker');
+    } catch {
+      // Fallback for bundled version where worker is in a separate directory
+      // Use dynamic path construction to avoid esbuild resolving at build time
+      const defenderPath = './defender' + '.jest/dist/jest.worker';
+      workerPath = require.resolve(defenderPath);
+    }
+    const jestWorker = worker.declareWorker<JestWorker>(WORKER_NAME, workerPath);
     return new JestMain(jestWorker, logger);
   }
 }

diff --git a/scopes/dependencies/dependency-resolver/esm.mjs b/scopes/dependencies/dependency-resolver/esm.mjs
@@ -12,6 +12,7 @@ export const DependencyList = cjsModule.DependencyList;
 export const BaseDependency = cjsModule.BaseDependency;
 export const ComponentDependency = cjsModule.ComponentDependency;
 export const KEY_NAME_BY_LIFECYCLE_TYPE = cjsModule.KEY_NAME_BY_LIFECYCLE_TYPE;
+export const COMPONENT_DEP_TYPE = cjsModule.COMPONENT_DEP_TYPE;
 export const WorkspacePolicy = cjsModule.WorkspacePolicy;
 export const VariantPolicy = cjsModule.VariantPolicy;
 export const EnvPolicy = cjsModule.EnvPolicy;

diff --git a/scopes/envs/envs/environments.main.runtime.ts b/scopes/envs/envs/environments.main.runtime.ts
@@ -1154,7 +1154,8 @@ if needed, use "bit env set" command to align the env id`;
     );
   }
 
-  private async getEnvAspectDef(envId: string): Promise<AspectDefinition> {
+  private async getEnvAspectDef(envId: string): Promise<AspectDefinition | undefined> {
+    if (this.isCoreEnv(envId)) return undefined;
     const host = this.componentMain.getHost();
     const id = await host.resolveComponentId(envId);
     // We don't want to filter by runtime here as we want to also get envs that configured as plugins. so they don't

diff --git a/scopes/envs/envs/runtime/env-runtime.ts b/scopes/envs/envs/runtime/env-runtime.ts
@@ -26,6 +26,6 @@ export class EnvRuntime {
     /**
      * Aspect definition of the env.
      */
-    readonly envAspectDefinition: AspectDefinition
+    readonly envAspectDefinition?: AspectDefinition
   ) {}
 }
diff --git a/scopes/git/ci/esm.mjs b/scopes/git/ci/esm.mjs
@@ -0,0 +1,3 @@
+import cjsModule from './index.js';
+export const CiAspect = cjsModule.CiAspect;
+export default cjsModule;
diff --git a/scopes/harmony/aspect-loader/core-aspects.ts b/scopes/harmony/aspect-loader/core-aspects.ts
@@ -1,8 +1,9 @@
 import { BitError } from '@teambit/bit-error';
-import { existsSync, readdir } from 'fs-extra';
+import { existsSync, pathExists, readdir } from 'fs-extra';
 import { join, resolve } from 'path';
 import { Config } from '@teambit/bvm.config';
 import { findCurrentBvmDir } from '@teambit/bvm.path';
+import findRoot from 'find-root';
 
 let _bvmConfig;
 
@@ -75,7 +76,13 @@ export function getAspectDir(id: string, isCore = true): string {
     dirPath = resolve(__dirname, '../..', aspectName, 'dist');
   }
   if (!existsSync(dirPath)) {
-    throw new Error(`unable to find ${aspectName} in ${dirPath}`);
+    // Maybe it's bundle
+    const aspectPackage = getCoreAspectPackageName(id);
+    try {
+      dirPath = findRoot(require.resolve(aspectPackage));
+    } catch {
+      throw new Error(`unable to find ${aspectName}`);
+    }
   }
   return dirPath;
 }
@@ -120,7 +127,9 @@ export function getAspectDirFromBvm(id: string, bvmDirOptions?: BvmDirOptions):
 }
 
 export function getAspectDistDir(id: string, isCore = true) {
-  return resolve(`${getAspectDir(id, isCore)}/dist`);
+  const aspectDir = getAspectDir(id, isCore);
+  // When running from bundle there won't be a dist folder
+  return resolve(`${aspectDir}/dist`);
 }
 
 export function getCoreAspectName(id: string): string {
@@ -146,9 +155,15 @@ function getNonCorePackageName(id: string): string {
 }
 
 export async function getAspectDef(aspectName: string, runtime?: string) {
-  const dirPath = getAspectDistDir(aspectName);
+  let dirPath = getAspectDir(aspectName);
+  const distDirPath = getAspectDistDir(aspectName);
+  const isDistDirExists = await pathExists(distDirPath);
+  if (distDirPath && isDistDirExists) {
+    dirPath = join(dirPath, '..');
+  }
 
-  const files = await readdir(dirPath);
+  const filesDir = distDirPath && isDistDirExists ? distDirPath : dirPath;
+  const files = await readdir(filesDir);
   let runtimeFile;
   if (runtime) {
     runtimeFile = files.find((file) => file.includes(`.${runtime}.runtime.js`)) || null;
@@ -157,7 +172,7 @@ export async function getAspectDef(aspectName: string, runtime?: string) {
 
   return {
     id: aspectName,
-    aspectPath: join(dirPath, '..'),
+    aspectPath: dirPath,
     aspectFilePath: aspectFile ? resolve(`${dirPath}/${aspectFile}`) : null,
     runtimePath: runtimeFile ? resolve(`${dirPath}/${runtimeFile}`) : null,
   };