@teambit/isolator 1.0.107 → 1.0.108

package/network.ts

@@ -0,0 +1,103 @@
+import { ComponentID } from '@teambit/component';
+import { PathOsBasedAbsolute } from '@teambit/legacy/dist/utils/path';
+import { compact } from 'lodash';
+import CapsuleList from './capsule-list';
+
+/**
+ * collection of isolated components (capsules).
+ * normally, "seeders" are the components that this network was created for.
+ * "graphCapsules" is the graph created from the seeders and it includes also the dependencies.
+ *
+ * however, during "bit build"/"bit tag"/"bit snap", things are more complex because there is one more variable in the
+ * picture, which is the "env". the Network is created per env.
+ * in practice, for "build-task", a task is called per env, and the network passed to the task is relevant to that env.
+ * the "originalSeeders" are the ones the network was created for, but only for this env.
+ * the "seeders" are similar to the "graphCapsules" above, which contains also the dependencies, but only for this env.
+ * the "graphCapsules" is the entire graph, including capsules from other envs.
+ *
+ * for example:
+ * comp1 depends on comp2. comp1 env is "react". comp2 env is "aspect".
+ *
+ * when the user is running "bit build comp1", two `Network` instances will be created with the following:
+ * Network for "react" env:  originalSeeders: ['comp1'], seeders: ['comp1'], graphCapsules: ['comp1', 'comp2'].
+ * Network for "aspect" env: originalSeeders: [], seeders: ['comp2'], graphCapsules: ['comp2'].
+ *
+ * on the other hand, when the user is running "bit capsule create comp1", only one `Network` instance is created:
+ * Network: originalSeeders: ['comp1'], seeders: ['comp1'], graphCapsules: ['comp1', 'comp2'].
+ *
+ * (as a side note, another implementation was attempt to have the "seeders" as the original-seeders for build,
+ * however, it's failed. see https://github.com/teambit/bit/pull/5407 for more details).
+ */
+export class Network {
+  _originalSeeders: ComponentID[] | undefined;
+  constructor(
+    private _graphCapsules: CapsuleList,
+    private seedersIds: ComponentID[],
+    private _capsulesRootDir: string
+  ) {}
+
+  /**
+   * for build-tasks (during bit build/tag/snap), this includes the component graph of the current env only.
+   * otherwise, this includes the original components the network was created for.
+   */
+  get seedersCapsules(): CapsuleList {
+    const capsules = this.seedersIds.map((seederId) => {
+      const capsule = this.graphCapsules.getCapsule(seederId);
+      if (!capsule) throw new Error(`unable to find ${seederId.toString()} in the capsule list`);
+      return capsule;
+    });
+    return CapsuleList.fromArray(capsules);
+  }
+
+  /**
+   * for build-tasks (during bit build/tag/snap), this includes the original components of the current env.
+   * otherwise, this is the same as `this.seedersCapsules()`.
+   */
+  get originalSeedersCapsules(): CapsuleList {
+    const capsules = this.getOriginalSeeders().map((seederId) => {
+      const capsule = this.graphCapsules.getCapsule(seederId);
+      if (!capsule) throw new Error(`unable to find ${seederId.toString()} in the capsule list`);
+      return capsule;
+    });
+    return CapsuleList.fromArray(capsules);
+  }
+
+  /**
+   * some of the capsules (non-modified) are written already with the dists files, so no need to re-compile them.
+   * this method helps optimizing compilers that are running on the capsules.
+   */
+  async getCapsulesToCompile() {
+    const originalSeedersCapsules = this.originalSeedersCapsules;
+    const capsules = await Promise.all(
+      this.seedersCapsules.map(async (seederCapsule) => {
+        if (originalSeedersCapsules.getCapsule(seederCapsule.component.id)) {
+          return seederCapsule;
+        }
+        const capsuleUsePreviouslySavedDists = await CapsuleList.capsuleUsePreviouslySavedDists(
+          seederCapsule.component
+        );
+        return capsuleUsePreviouslySavedDists ? null : seederCapsule;
+      })
+    );
+    return CapsuleList.fromArray(compact(capsules));
+  }
+
+  /**
+   * originalSeeders are not always set (currently, only during build process), so if they're missing, just provide the
+   * seeders, which are probably the original-seeders
+   */
+  private getOriginalSeeders(): ComponentID[] {
+    return this._originalSeeders || this.seedersIds;
+  }
+
+  /**
+   * all capsules, including the dependencies of the seeders. (even when they belong to another env)
+   */
+  get graphCapsules(): CapsuleList {
+    return this._graphCapsules;
+  }
+
+  get capsulesRootDir(): PathOsBasedAbsolute {
+    return this._capsulesRootDir;
+  }
+}

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@teambit/isolator",
-  "version": "1.0.107",
+  "version": "1.0.108",
   "homepage": "https://bit.cloud/teambit/component/isolator",
   "main": "dist/index.js",
   "componentId": {
     "scope": "teambit.component",
     "name": "isolator",
-    "version": "1.0.107"
+    "version": "1.0.108"
   },
   "dependencies": {
     "chalk": "2.4.2",
@@ -24,39 +24,35 @@
     "glob": "7.1.6",
     "debug": "4.3.4",
     "execa": "2.1.0",
-    "core-js": "^3.0.0",
-    "@babel/runtime": "7.20.0",
     "@teambit/component-id": "1.2.0",
     "@teambit/graph.cleargraph": "0.0.1",
     "@teambit/harmony": "0.4.6",
-    "@teambit/component": "1.0.107",
-    "@teambit/dependency-resolver": "1.0.107",
-    "@teambit/aspect-loader": "1.0.107",
-    "@teambit/cli": "0.0.839",
-    "@teambit/component-package-version": "0.0.430",
+    "@teambit/component": "1.0.108",
+    "@teambit/dependency-resolver": "1.0.108",
+    "@teambit/aspect-loader": "1.0.108",
+    "@teambit/cli": "0.0.840",
+    "@teambit/component-package-version": "0.0.431",
     "@teambit/dependencies.fs.linked-dependencies": "0.0.6",
-    "@teambit/global-config": "0.0.841",
-    "@teambit/graph": "1.0.107",
-    "@teambit/logger": "0.0.932",
-    "@teambit/workspace.modules.node-modules-linker": "0.0.157"
+    "@teambit/global-config": "0.0.842",
+    "@teambit/graph": "1.0.108",
+    "@teambit/logger": "0.0.933",
+    "@teambit/workspace.modules.node-modules-linker": "0.0.158"
   },
   "devDependencies": {
-    "@types/react": "^17.0.8",
     "@types/fs-extra": "9.0.7",
     "@types/lodash": "4.14.165",
     "@types/object-hash": "1.3.4",
     "@types/semver": "7.3.4",
     "@types/uuid": "8.3.4",
     "@types/mocha": "9.1.0",
-    "@types/node": "12.20.4",
-    "@types/react-dom": "^17.0.5",
-    "@types/jest": "^26.0.0",
-    "@types/testing-library__jest-dom": "5.9.5"
+    "@types/jest": "^29.2.2",
+    "@types/testing-library__jest-dom": "^5.9.5",
+    "@teambit/harmony.envs.core-aspect-env": "0.0.13"
   },
   "peerDependencies": {
-    "@teambit/legacy": "1.0.624",
-    "react": "^16.8.0 || ^17.0.0",
-    "react-dom": "^16.8.0 || ^17.0.0"
+    "react": "^17.0.0 || ^18.0.0",
+    "@types/react": "^18.2.12",
+    "@teambit/legacy": "1.0.624"
   },
   "license": "Apache-2.0",
   "optionalDependencies": {},
@@ -70,7 +66,7 @@
   },
   "private": false,
   "engines": {
-    "node": ">=12.22.0"
+    "node": ">=16.0.0"
   },
   "repository": {
     "type": "git",
@@ -79,12 +75,9 @@
   "keywords": [
     "bit",
     "bit-aspect",
+    "bit-core-aspect",
     "components",
     "collaboration",
-    "web",
-    "react",
-    "react-components",
-    "angular",
-    "angular-components"
+    "web"
   ]
 }

package/symlink-dependencies-to-capsules.ts

@@ -0,0 +1,68 @@
+import { LinkDetail } from '@teambit/dependency-resolver';
+import { Logger } from '@teambit/logger';
+import { ComponentID } from '@teambit/component-id';
+import ConsumerComponent from '@teambit/legacy/dist/consumer/component';
+import componentIdToPackageName from '@teambit/legacy/dist/utils/bit/component-id-to-package-name';
+import path from 'path';
+
+import { Capsule } from './capsule';
+import CapsuleList from './capsule-list';
+
+export async function symlinkDependenciesToCapsules(
+  capsules: Capsule[],
+  capsuleList: CapsuleList,
+  logger: Logger
+): Promise<Record<string, Record<string, string>>> {
+  logger.debug(`symlinkDependenciesToCapsules, ${capsules.length} capsules`);
+  return Object.fromEntries(
+    await Promise.all(
+      capsules.map((capsule) => {
+        return symlinkComponent(capsule.component.state._consumer, capsuleList, logger);
+      })
+    )
+  );
+}
+
+export async function symlinkOnCapsuleRoot(
+  capsuleList: CapsuleList,
+  logger: Logger,
+  capsuleRoot: string
+): Promise<LinkDetail[]> {
+  const modulesPath = path.join(capsuleRoot, 'node_modules');
+  return capsuleList.map((capsule) => {
+    const packageName = componentIdToPackageName(capsule.component.state._consumer);
+    const dest = path.join(modulesPath, packageName);
+    return {
+      from: capsule.path,
+      to: dest,
+      packageName,
+    };
+  });
+}
+
+async function symlinkComponent(
+  component: ConsumerComponent,
+  capsuleList: CapsuleList,
+  logger: Logger
+): Promise<[string, Record<string, string>]> {
+  const componentCapsule = capsuleList.getCapsuleIgnoreVersion(component.id);
+  if (!componentCapsule) throw new Error(`unable to find the capsule for ${component.id.toString()}`);
+  const allDeps = component.getAllDependenciesIds();
+  const linkResults = allDeps.reduce((acc, depId: ComponentID) => {
+    // TODO: this is dangerous - we might have 2 capsules for the same component with different version, then we might link to the wrong place
+    const devCapsule = capsuleList.getCapsuleIgnoreVersion(depId);
+    if (!devCapsule) {
+      // happens when a dependency is not in the workspace. (it gets installed via the package manager)
+      logger.debug(
+        `symlinkComponentToCapsule: unable to find the capsule for ${depId.toStringWithoutVersion()}. skipping`
+      );
+      return acc;
+    }
+    const packageName = componentIdToPackageName(devCapsule.component.state._consumer);
+    const devCapsulePath = devCapsule.path;
+    acc[packageName] = `link:${devCapsulePath}`;
+    return acc;
+  }, {});
+
+  return [componentCapsule.path, linkResults];
+}

package/tsconfig.json

@@ -1,38 +1,33 @@
 {
   "compilerOptions": {
     "lib": [
-      "es2019",
-      "DOM",
-      "ES6",
-      "DOM.Iterable",
-      "ScriptHost"
+      "esnext",
+      "dom",
+      "dom.Iterable"
     ],
-    "target": "es2015",
-    "module": "CommonJS",
-    "jsx": "react",
-    "allowJs": true,
-    "composite": true,
+    "target": "es2020",
+    "module": "es2020",
+    "jsx": "react-jsx",
     "declaration": true,
     "sourceMap": true,
-    "skipLibCheck": true,
     "experimentalDecorators": true,
-    "outDir": "dist",
+    "skipLibCheck": true,
     "moduleResolution": "node",
     "esModuleInterop": true,
-    "rootDir": ".",
     "resolveJsonModule": true,
-    "emitDeclarationOnly": true,
-    "emitDecoratorMetadata": true,
-    "allowSyntheticDefaultImports": true,
-    "strictPropertyInitialization": false,
-    "strict": true,
-    "noImplicitAny": false,
-    "preserveConstEnums": true
+    "allowJs": true,
+    "outDir": "dist",
+    "emitDeclarationOnly": true
   },
   "exclude": [
+    "artifacts",
+    "public",
     "dist",
+    "node_modules",
+    "package.json",
     "esm.mjs",
-    "package.json"
+    "**/*.cjs",
+    "./dist"
   ],
   "include": [
     "**/*",

package/types/asset.d.ts

@@ -5,12 +5,12 @@ declare module '*.png' {
 declare module '*.svg' {
   import type { FunctionComponent, SVGProps } from 'react';
 
-  export const ReactComponent: FunctionComponent<SVGProps<SVGSVGElement> & { title?: string }>;
+  export const ReactComponent: FunctionComponent<
+    SVGProps<SVGSVGElement> & { title?: string }
+  >;
   const src: string;
   export default src;
 }
-
-// @TODO Gilad
 declare module '*.jpg' {
   const value: any;
   export = value;
@@ -27,3 +27,15 @@ declare module '*.bmp' {
   const value: any;
   export = value;
 }
+declare module '*.otf' {
+  const value: any;
+  export = value;
+}
+declare module '*.woff' {
+  const value: any;
+  export = value;
+}
+declare module '*.woff2' {
+  const value: any;
+  export = value;
+}