Bit bundle

.gitignore

@@ -73,3 +73,6 @@ package-lock.json
 !.yarn/plugins
 !.yarn/sdks
 !.yarn/versions
+
+# bundle output
+/bundle

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 {

components/legacy/scope-api/lib/latest-versions.ts

@@ -1,7 +1,7 @@
 import { ComponentID } from '@teambit/component-id';
 import { loadScope, Scope } 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);

package.json

@@ -63,6 +63,7 @@
     "performance-test:debug": "npm run performance-test --debug --keep-envs",
     "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",
     "setup": "bit install &&  bit compile",
     "full-setup": "rm -rf node_modules/.bin/bit && bit install && husky install && bit compile",
     "full-setup:bbit": "rm -rf node_modules/.bin/bbit && bbit install && husky install && bbit compile",

scopes/envs/envs/environments.main.runtime.ts

@@ -1129,7 +1129,8 @@ export class EnvsMain {
     );
   }
 
-  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

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
   ) {}
 }

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): 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;
 }
@@ -119,8 +126,23 @@ export function getAspectDirFromBvm(id: string, bvmDirOptions?: BvmDirOptions):
   return getAspectDirFromPath(id, [versionDir]);
 }
 
+// function getCoreAspectDirFromPath(resolvedModulesPath: string): string {
+//   if (!resolvedModulesPath.includes('@teambit')) {
+//     throw new Error(`unable to find core aspect in ${resolvedModulesPath}`);
+//   }
+//   let currentDir = resolvedModulesPath;
+//   let parentDir = dirname(currentDir);
+//   while (basename(parentDir) !== '@teambit') {
+//     currentDir = parentDir;
+//     parentDir = dirname(currentDir);
+//   }
+//   return currentDir;
+// }
+
 export function getAspectDistDir(id: string) {
-  return resolve(`${getAspectDir(id)}/dist`);
+  const aspectDir = getAspectDir(id);
+  // When running from bundle there won't be a dist folder
+  return resolve(`${aspectDir}/dist`);
 }
 
 export function getCoreAspectName(id: string): string {
@@ -135,9 +157,15 @@ export function getCoreAspectPackageName(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;
@@ -146,7 +174,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,
   };

scopes/harmony/bit/app.ts

@@ -23,6 +23,9 @@ if (process.argv.includes('--get-yargs-completions')) {
   process.exit(0);
 }
 
+// Export APIs from all core aspects to be used in the bundled app
+export * from './core-aspects-exports';
+
 if (process.argv.includes('server-forever')) {
   spawnPTY();
 } else if (shouldUseBitServer()) {

scopes/harmony/bit/bit.main.runtime.ts

@@ -3,19 +3,23 @@ import { ExtensionDataList } from '@teambit/legacy.extension-data';
 
 import { BitAspect } from './bit.aspect';
 import { provideBit } from './bit.provider';
-import { manifestsMap } from './manifests';
+import { getManifestsMap } from './manifests';
 
-const manifests = Object.values(manifestsMap);
+const manifestsMap = getManifestsMap();
 
 export function registerCoreExtensions() {
   const allCoreExtensionsNames = Object.keys(manifestsMap);
   ExtensionDataList.registerManyCoreExtensionNames(allCoreExtensionsNames);
 }
 
+function getDeps() {
+  return Object.values(manifestsMap);
+}
+
 export const BitMain = {
   name: 'bit',
   runtime: MainRuntime,
-  dependencies: manifests,
+  dependencies: getDeps(),
   provider: provideBit,
 };
 

scopes/harmony/bit/bit.provider.ts

@@ -1,4 +1,4 @@
-import { manifestsMap } from './manifests';
+import { getManifestsMap } from './manifests';
 
 export type BitDeps = [];
 
@@ -16,6 +16,6 @@ export type BitConfig = {
 
 export async function provideBit() {
   return {
-    manifestsMap,
+    manifestsMap: getManifestsMap(),
   };
 }

scopes/harmony/bit/bundle/bundle.ts

@@ -0,0 +1,37 @@
+import fs from 'fs-extra';
+import { omit } from 'lodash';
+import { runEsbuild } from './esbuild';
+import { generateCoreAspectsBarrelFile } from './generate-core-aspects-exports';
+import { generateCoreAspectsModules } from './generate-core-aspects-modules';
+import { generatePackageJson } from './create-package-json';
+import { generateNpmrc } from './generate-npmrc';
+// import { runTsup } from './tsup';
+import { copyFilesOfCoreAspects } from './copy-files-of-core-aspects';
+import { copyOtherFiles } from './copy-other-files';
+import { generateSeaConfig } from './generate-sea-config';
+
+// const rootOutDir = '/Users/giladshoham/dev/bit/bit/bundle';
+const rootOutDir = '/tmp/bit-bundle';
+const bundleDirName = 'bundle';
+const bundleDir = `${rootOutDir}/${bundleDirName}`;
+const appFileBaseName = 'bit.app';
+const jsAppFile = `${appFileBaseName}.js`;
+const blobAppFile = `${appFileBaseName}.blob`;
+
+async function runBundle() {
+  const esbuildRes = await runEsbuild(bundleDir, jsAppFile);
+  // const tsupRes = await runTsup(bundleDir, jsAppFile);
+  await generateCoreAspectsModules(rootOutDir, jsAppFile);
+  await copyFilesOfCoreAspects(rootOutDir, bundleDir);
+  await copyOtherFiles(bundleDir);
+  generateNpmrc(rootOutDir);
+  await generatePackageJson(rootOutDir, bundleDirName, jsAppFile);
+  await generateCoreAspectsBarrelFile();
+  await generateSeaConfig(bundleDir, jsAppFile, blobAppFile);
+  const metafile = esbuildRes.metafile;
+  await fs.writeJSON(`${bundleDir}/metafile.json`, metafile, { spaces: 2 });
+  return omit(esbuildRes, ['metafile']);
+  // return tsupRes;
+}
+
+runBundle().then((res) => console.log(JSON.stringify(res, null, 2)));