feat(envs): remove core envs from the manifest, load them as regular envs

.bitmap

@@ -583,6 +583,20 @@
         "mainFile": "index.ts",
         "rootDir": "scopes/workspace/eject"
     },
+    "empty-env": {
+        "name": "empty-env",
+        "scope": "",
+        "version": "",
+        "defaultScope": "teambit.harmony",
+        "mainFile": "index.ts",
+        "rootDir": "scopes/harmony/empty-env",
+        "config": {
+            "teambit.harmony/envs/core-aspect-env@1.0.0": {},
+            "teambit.envs/envs": {
+                "env": "teambit.harmony/envs/core-aspect-env"
+            }
+        }
+    },
     "entities/lane-diff": {
         "name": "entities/lane-diff",
         "scope": "teambit.lanes",

components/legacy/e2e-helper/e2e-env-helper.ts

@@ -1,4 +1,5 @@
 import * as path from 'path';
+import fs from 'fs-extra';
 import { getRootComponentDir } from '@teambit/workspace.root-components';
 import type CommandHelper from './e2e-command-helper';
 import type ExtensionsHelper from './e2e-extensions-helper';
@@ -14,6 +15,38 @@ type SetCustomEnvOpts = {
   skipLink?: boolean;
 };
 
+/**
+ * env packages that the old-format env fixtures import. these envs used to be core aspects, so
+ * their packages were always available. now they need to be installed. the versions should match
+ * the pinned versions in legacy-core-envs.ts (scopes/envs/envs).
+ */
+const FIXTURE_ENV_BASE_PACKAGES: Record<string, string> = {
+  '@teambit/node': '@teambit/node@1.0.1042',
+  '@teambit/react': '@teambit/react@1.0.1042',
+  '@teambit/mdx': '@teambit/mdx@1.0.1043',
+};
+
+/**
+ * the env configured on the old-format env fixtures (see setCustomEnv). it used to be a core
+ * aspect, now its package must be installed for the fixture env to be compiled and loaded.
+ */
+const ENVS_ENV_PACKAGE = '@teambit/env@1.0.1042';
+
+/**
+ * peers required by the published legacy env packages (via @teambit/cloud UI hooks) that yarn's
+ * hoisted linker doesn't auto-install (pnpm auto-installs peers). without them the env fails to
+ * load under yarn with "Cannot find module '@apollo/client'".
+ */
+export const NODE_ENV_HOISTED_PEERS = '@apollo/client@3.14.1';
+
+/**
+ * the env configured on old-format aspect-style env fixtures (see setBabelWithTsHarmony). it used
+ * to be a core aspect, now its package must be installed for the fixture env to be loaded.
+ * the node env is a runtime dependency of the aspect env and must be installed at the root as
+ * well for the aspect env to load.
+ */
+const ASPECT_ENV_PACKAGES = ['@teambit/aspect@1.0.1042', '@teambit/node@1.0.1042'];
+
 export const ENV_POLICY = {
   peers: [
     {
@@ -139,7 +172,7 @@ export default class EnvHelper {
         },
       },
     });
-    this.command.install();
+    this.command.install([...ASPECT_ENV_PACKAGES, ...this.getFixtureEnvBasePackages(EXTENSIONS_BASE_FOLDER)].join(' '));
     this.command.compile();
     return EXTENSIONS_BASE_FOLDER;
   }
@@ -154,18 +187,62 @@ export default new EmptyEnv();
     this.fs.outputFile('empty-env/index.ts', `export { EmptyEnv } from './empty-env.bit-env';`);
     this.command.addComponent('empty-env');
     this.command.setEnv('empty-env', 'teambit.envs/env');
+    // teambit.envs/env is no longer a core aspect - install it so the .bit-env plugin compiles
+    this.command.install(ENVS_ENV_PACKAGE);
+  }
+
+  /**
+   * set the legacy `teambit.harmony/node` env on the given variant and install its package.
+   * this env used to be a core aspect so no installation was needed, now it must be installed
+   * (with the version pinned in legacy-core-envs.ts, see FIXTURE_ENV_BASE_PACKAGES).
+   * `extraPackages` is for peers the env package needs but the package manager doesn't
+   * auto-install (see NODE_ENV_HOISTED_PEERS for yarn).
+   */
+  setNodeEnv(variantPattern = '*', extraPackages = '') {
+    this.extensions.addExtensionToVariant(variantPattern, 'teambit.harmony/node', {});
+    this.command.install(`${FIXTURE_ENV_BASE_PACKAGES['@teambit/node']} ${extraPackages}`.trim());
+    // the env is loaded only at the end of the first install. run a second install so its
+    // dependency policies (e.g. @types/jest as a dev dep) are applied to the components - the
+    // standard flow for old-style envs (see the "run bit install again" suggestion).
+    this.command.install();
+  }
+
+  /**
+   * install the packages of the legacy `teambit.harmony/aspect` env (and its node env runtime
+   * dependency). needed after configuring the aspect env on a component the old way (versionless).
+   */
+  installAspectEnv() {
+    this.command.install(ASPECT_ENV_PACKAGES.join(' '));
   }
 
   setCustomEnv(extensionsBaseFolder = 'node-env', options: SetCustomEnvOpts = {}): string {
     this.fixtures.copyFixtureExtensions(extensionsBaseFolder);
     this.command.addComponent(extensionsBaseFolder);
     this.extensions.addExtensionToVariant(extensionsBaseFolder, 'teambit.envs/env');
     if (!options.skipLink) this.command.link();
-    if (!options.skipInstall) this.command.install();
+    if (!options.skipInstall) {
+      this.command.install([ENVS_ENV_PACKAGE, ...this.getFixtureEnvBasePackages(extensionsBaseFolder)].join(' '));
+    }
     if (!options.skipCompile) this.command.compile();
     return extensionsBaseFolder;
   }
 
+  /**
+   * find which env packages the given fixture imports, so they can be installed (see
+   * FIXTURE_ENV_BASE_PACKAGES).
+   */
+  getFixtureEnvBasePackages(extensionsBaseFolder: string): string[] {
+    const extensionDir = path.join(this.scopes.localPath, extensionsBaseFolder);
+    const allContent = fs
+      .readdirSync(extensionDir)
+      .filter((file) => file.endsWith('.ts'))
+      .map((file) => fs.readFileSync(path.join(extensionDir, file)).toString())
+      .join('\n');
+    return Object.keys(FIXTURE_ENV_BASE_PACKAGES)
+      .filter((pkg) => allContent.includes(`'${pkg}'`) || allContent.includes(`"${pkg}"`))
+      .map((pkg) => FIXTURE_ENV_BASE_PACKAGES[pkg]);
+  }
+
   /**
    * This will generate env in the new format (using the *.bit-env.* plugin)
    * @param extensionsBaseFolder

components/legacy/e2e-helper/excluded-fixtures/extensions/babel-env/babel-env.extension.ts

@@ -1,3 +1,7 @@
+// @ts-nocheck
+// the e2e runs inside the bit repo, where core-aspect types (e.g. @teambit/compiler) resolve
+// to the repo sources while the env tree in the capsule brings the published @teambit/builder.
+// the two BuildContext types are structurally identical but nominally different - skip checking.
 import { EnvsMain, EnvsAspect } from '@teambit/envs';
 import { ReactAspect, ReactMain } from '@teambit/react';
 import { BabelAspect, BabelMain } from '@teambit/babel';

components/legacy/e2e-helper/excluded-fixtures/extensions/multiple-compilers-env/multiple-compilers-env.extension.ts

@@ -1,3 +1,7 @@
+// @ts-nocheck
+// the e2e runs inside the bit repo, where core-aspect types (e.g. @teambit/compiler) resolve
+// to the repo sources while the env tree in the capsule brings the published @teambit/builder.
+// the two BuildContext types are structurally identical but nominally different - skip checking.
 import { EnvsMain, EnvsAspect } from '@teambit/envs';
 import { ReactAspect, ReactMain } from '@teambit/react';
 import { BabelAspect, BabelMain } from '@teambit/babel';

components/legacy/e2e-helper/excluded-fixtures/extensions/node-env/node-env.extension.ts

@@ -1,3 +1,7 @@
+// @ts-nocheck
+// the e2e runs inside the bit repo, where core-aspect types (e.g. @teambit/envs) resolve to the
+// repo sources while the env tree in the capsule brings the published packages. the types are
+// structurally identical but nominally different - skip checking.
 import { EnvsMain, EnvsAspect } from '@teambit/envs';
 import { NodeMain, NodeAspect } from '@teambit/node';
 

components/legacy/e2e-helper/index.ts

@@ -43,5 +43,5 @@ export {
 };
 
 export { Helper, FileStatusWithoutChalk } from './e2e-helper';
-export { ENV_POLICY } from './e2e-env-helper';
+export { ENV_POLICY, NODE_ENV_HOISTED_PEERS } from './e2e-env-helper';
 export { NpmCiRegistry, supportNpmCiRegistryTesting } from './npm-ci-registry';

contrib/claude-skill-bit-cli/SKILL.md

@@ -43,10 +43,10 @@ Subcommands: list, get, set, unset, replace, update
 scope <sub-command> - manage component scope names and assignments
 Subcommands: set, trust, rename, rename-owner, fork
 eject-conf <pattern> - create component.json configuration files for components
-local-only <sub-command> - manage components that exist only in the workspace
-Subcommands: set, unset, list
 aspect <sub-command> - manage component aspects and their configurations
 Subcommands: list, list-core, get, set, unset, update
+local-only <sub-command> - manage components that exist only in the workspace
+Subcommands: set, unset, list
 
 Collaboration & Remote
 remote - manage remote scopes for self-hosted environments

e2e/commands/reset.e2e.ts

@@ -311,6 +311,7 @@ describe('bit reset command', function () {
         helper.scopeHelper.setWorkspaceWithRemoteScope();
         helper.fixtures.populateComponents(1);
         helper.command.setEnv('comp1', 'teambit.react/react');
+        helper.command.install('@teambit/react@1.0.1042');
         helper.command.snapAllComponentsWithoutBuild();
         helper.command.snapAllComponentsWithoutBuild('--unmodified');
         helper.command.resetAll();
@@ -325,6 +326,7 @@ describe('bit reset command', function () {
         helper.scopeHelper.setWorkspaceWithRemoteScope();
         helper.fixtures.populateComponents(1);
         helper.command.setEnv('comp1', 'teambit.react/react');
+        helper.command.install('@teambit/react@1.0.1042 @teambit/node@1.0.1042');
         helper.command.snapAllComponentsWithoutBuild();
         helper.command.setEnv('comp1', 'teambit.harmony/node');
         helper.command.snapAllComponentsWithoutBuild();
@@ -340,6 +342,7 @@ describe('bit reset command', function () {
         helper.scopeHelper.setWorkspaceWithRemoteScope();
         helper.fixtures.populateComponents(1);
         helper.command.setEnv('comp1', 'teambit.react/react');
+        helper.command.install('@teambit/react@1.0.1042');
         helper.command.snapAllComponentsWithoutBuild();
         helper.command.dependenciesSet('comp1', 'lodash@4.17.21');
         helper.command.snapAllComponentsWithoutBuild();

e2e/commands/watch.e2e.ts

@@ -23,7 +23,7 @@ chai.use(chaiFs);
       helper.fixtures.populateComponentsTS();
       helper.fixtures.createComponentBarFoo();
       helper.fixtures.addComponentBarFoo();
-      helper.extensions.addExtensionToVariant('*', 'teambit.harmony/node', {});
+      helper.env.setNodeEnv();
     });
     describe('run bit watch', () => {
       let watchRunner: WatchRunner;
@@ -113,7 +113,7 @@ chai.use(chaiFs);
       before(async () => {
         helper.scopeHelper.setWorkspaceWithRemoteScope({ initGit });
         helper.fixtures.populateComponentsTS();
-        helper.extensions.addExtensionToVariant('*', 'teambit.harmony/node', {});
+        helper.env.setNodeEnv();
         watchRunner = new WatchRunner(helper, true);
         await watchRunner.watch();
         allOutput = '';

e2e/functionalities/dev-dependencies.e2e.ts

@@ -187,6 +187,11 @@ describe('dev-dependencies functionality', function () {
       helper.extensions.addExtensionToVariant('*', envId);
       helper.fixtures.populateComponents(1, false);
       helper.fs.outputFile(`comp1/index.js`, `const isPositive = require('is-positive');`);
+      // the custom env composes @teambit/node, whose aspect chain also requires the react and
+      // aspect env packages from the workspace root (they used to be core aspects). install them
+      // so the env loads, then run another install so its dependency policies (is-positive as a
+      // dev dep) are applied to the components.
+      helper.command.install('@teambit/react@1.0.1042 @teambit/aspect@1.0.1042');
       helper.command.install();
       helper.command.tagWithoutBuild();
     });

e2e/functionalities/env-peer-deps-install.e2e.ts

@@ -33,7 +33,11 @@ describe('env peer dependencies should be installed for created components', fun
   describe('bit create react and then check-types', () => {
     before(() => {
       helper.scopeHelper.setWorkspaceWithRemoteScope();
-      helper.command.create('react', 'button');
+      // the react env is not a core aspect anymore, its template is loaded on demand via --env
+      helper.command.create('react', 'button', '--env teambit.react/react');
+      // the env is loaded only at the end of the install that installed it. run another install
+      // so its dependency policies (e.g. @types/react) are applied to the components.
+      helper.command.install();
     });
 
     it('should install env peer deps like @types/react in node_modules', () => {

e2e/harmony/babel.e2e.ts

@@ -39,7 +39,9 @@ describe('babel compiler', function () {
             },
           },
         });
-        helper.command.install();
+        // the aspect and react envs used to be core aspects, now their packages must be installed
+        // for the babel-env fixture (which composes on the react env) to be compiled and loaded
+        helper.command.install('@teambit/aspect@1.0.1042 @teambit/node@1.0.1042 @teambit/react@1.0.1042');
         helper.command.compile(); // compile the new env
 
         helper.fs.outputFile('bar/foo.js', 'export function sayHello() { console.log("hello"); }; sayHello();');

e2e/harmony/ci-commands.e2e.ts

@@ -449,6 +449,10 @@ describe('ci commands', function () {
     before(() => {
       helper.scopeHelper.setWorkspaceWithRemoteScope();
       setupGitRemote();
+      // a workspace env is used for the env-set below: it loads deterministically (unlike an
+      // external env that must be fetched and built in a capsule), and it is NOT the default env
+      // (the default env config is normalized away on tag, so it won't propagate).
+      helper.env.setEmptyEnv();
       const defaultBranch = setupComponentsAndInitialCommit();
 
       // First PR commit + ci pr — lane is created with comp1's original (default) env.
@@ -460,7 +464,7 @@ describe('ci commands', function () {
 
       // Main moves ahead: change comp1's env, tag, export, push.
       helper.command.runCmd(`git checkout ${defaultBranch}`);
-      helper.command.setEnv('comp1', 'teambit.harmony/aspect');
+      helper.command.setEnv('comp1', 'empty-env');
       helper.command.tagAllWithoutBuild();
       helper.command.export();
       helper.command.runCmd('git add .');
@@ -483,7 +487,7 @@ describe('ci commands', function () {
       expect(
         envData.config.env,
         `expected comp1's env to be updated from main, got: ${JSON.stringify(envData.config)}`
-      ).to.equal('teambit.harmony/aspect');
+      ).to.equal(`${helper.scopes.remote}/empty-env`);
     });
   });
 
@@ -864,11 +868,29 @@ ${helper.scopes.remote}/comp3: 1.5.0`;
     before(() => {
       helper.scopeHelper.setWorkspaceWithRemoteScope();
       setupGitRemote();
+      // a workspace env is used for the env-set below: it loads deterministically (unlike an
+      // external env that must be fetched and built in a capsule), and it is NOT the default env
+      // (the default env config is normalized away on tag).
+      helper.env.setEmptyEnv();
       const defaultBranch = setupComponentsAndInitialCommit();
 
-      // Create lane and change env on comp1
+      // use the env on another component on main from the start, so the env is loaded (and
+      // registered) in every process. otherwise, during `bit ci merge` - which starts on main
+      // where no component uses this env - comp1 receives the env mid-process via the lane's
+      // merged config, when it's too late for the env to load, and the tag fails on an
+      // env data/config mismatch.
+      helper.command.setEnv('comp2', 'empty-env');
+      // skip the auto-tag so comp1 (a dependent of comp2) keeps its original version - the
+      // version assertions below expect the ci merge to create comp1's second version.
+      helper.command.tagAllWithoutBuild('--skip-auto-tag');
+      helper.command.export();
+      helper.command.runCmd('git add .');
+      helper.command.runCmd('git commit -m "chore: use the workspace env on comp2"');
+      helper.command.runCmd(`git push origin ${defaultBranch}`);
+
+      // Create lane and change env on comp1.
       helper.command.createLane('config-lane');
-      helper.command.setEnv('comp1', 'teambit.harmony/aspect');
+      helper.command.setEnv('comp1', 'empty-env');
       helper.command.snapAllComponentsWithoutBuild();
       helper.command.export();
 
@@ -885,7 +907,7 @@ ${helper.scopes.remote}/comp3: 1.5.0`;
     });
     it('should preserve the env config from the lane', () => {
       const envData = helper.command.showAspectConfig('comp1', 'teambit.envs/envs');
-      expect(envData.config.env).to.equal('teambit.harmony/aspect');
+      expect(envData.config.env).to.equal(`${helper.scopes.remote}/empty-env`);
     });
     it('should tag the component', () => {
       expect(mergeOutput).to.include('Merged PR');

e2e/harmony/compile.e2e.ts

@@ -21,7 +21,7 @@ describe('compile extension', function () {
     let appOutput: string;
     before(() => {
       helper.scopeHelper.setWorkspaceWithRemoteScope();
-      helper.extensions.addExtensionToVariant('*', 'teambit.harmony/node', {});
+      helper.env.setNodeEnv();
       appOutput = helper.fixtures.populateComponentsTS(3);
       scopeBeforeTag = helper.scopeHelper.cloneWorkspace();
     });
@@ -144,7 +144,7 @@ describe('compile extension', function () {
   describe('component with unsupported compiler files', () => {
     before(() => {
       helper.scopeHelper.setWorkspaceWithRemoteScope();
-      helper.extensions.addExtensionToVariant('*', 'teambit.harmony/node', {});
+      helper.env.setNodeEnv();
       helper.fixtures.populateComponentsTS(1);
       helper.fs.outputFile('comp1/style.css', 'h1{}');
       helper.fs.outputFile('comp1/types.d.ts', 'export const myField: number');
@@ -180,6 +180,7 @@ describe('compile extension', function () {
   describe('component with nested directories', () => {
     before(() => {
       helper.scopeHelper.setWorkspaceWithRemoteScope({ addRemoteScopeAsDefaultScope: false });
+      helper.env.setNodeEnv();
       helper.fixtures.populateComponentsTS(1);
       helper.fs.outputFile('comp1/nested/foo.ts');
       helper.command.compile();
@@ -195,6 +196,7 @@ describe('compile extension', function () {
   describe('compile by directory path', () => {
     before(() => {
       helper.scopeHelper.setWorkspaceWithRemoteScope();
+      helper.env.setNodeEnv();
       helper.fixtures.populateComponentsTS(3);
       helper.command.move('comp1', 'nested/comp1');
       helper.command.move('comp2', 'nested/comp2');

e2e/harmony/create.e2e.ts

@@ -168,6 +168,8 @@ describe('create extension', function () {
     before(() => {
       helper.scopeHelper.setWorkspaceWithRemoteScope();
       helper.extensions.addExtensionToVariant('*', 'teambit.react/react', {});
+      // the react env is not a core aspect anymore, install it so it's recognized as the env
+      helper.command.install('@teambit/react@1.0.1042');
       helper.command.create('bit-aspect', 'my-aspect', `--scope ${helper.scopes.remote}`);
     });
     it('should set the env according to the variant', () => {
@@ -208,11 +210,13 @@ describe('create extension', function () {
       // create a new workspace that uses an external package manager
       helper.scopeHelper.cleanWorkspace();
       helper.command.init('--external-package-manager');
-      helper.command.create('module', 'simple');
+      // the node env is not a core aspect anymore, its template is loaded on demand via --env
+      helper.command.create('module', 'simple', '--env teambit.harmony/node');
       pkgJson = helper.fs.readJsonFile('package.json');
     });
     it('should write dependencies of the component to package.json', () => {
-      expect(pkgJson.dependencies['@bitdev/node.node-env'] != null).to.eq(true);
+      // the env set via --env is written as a dependency with its pinned version
+      expect(pkgJson.dependencies['@teambit/node'] != null).to.eq(true);
     });
     it('should not write dependencies of the env to package.json', () => {
       expect(pkgJson.dependencies.eslint == null).to.eq(true);