@teambit/lanes 1.0.107 → 1.0.109

package/dist/switch-lanes.js

@@ -131,7 +131,6 @@ to be up to date with the remote lane, please run "bit checkout head""`);
     }
   }
   async saveLanesData() {
-    var _this$laneToSwitchTo;
     const localLaneName = this.switchProps.alias || this.laneIdToSwitchTo.name;
     if (this.switchProps.remoteLane) {
       if (!this.switchProps.localTrackedLane) {
@@ -142,7 +141,7 @@ to be up to date with the remote lane, please run "bit checkout head""`);
         });
       }
     }
-    this.consumer.setCurrentLane(this.laneIdToSwitchTo, !((_this$laneToSwitchTo = this.laneToSwitchTo) !== null && _this$laneToSwitchTo !== void 0 && _this$laneToSwitchTo.isNew));
+    this.consumer.setCurrentLane(this.laneIdToSwitchTo, !this.laneToSwitchTo?.isNew);
     this.consumer.bitMap.syncWithIds(_componentId().ComponentIdList.fromArray(this.switchProps.ids || []), _componentId().ComponentIdList.fromArray(this.switchProps.laneBitIds || []));
   }
 }

package/dist/switch-lanes.js.map

@@ -1 +1 @@
-{"version":3,"names":["_laneId","data","require","_componentId","_bitError","_createLane","ownKeys","e","r","t","Object","keys","getOwnPropertySymbols","o","filter","getOwnPropertyDescriptor","enumerable","push","apply","_objectSpread","arguments","length","forEach","_defineProperty","getOwnPropertyDescriptors","defineProperties","defineProperty","obj","key","value","_toPropertyKey","configurable","writable","i","_toPrimitive","String","Symbol","toPrimitive","call","TypeError","Number","LaneSwitcher","constructor","workspace","logger","switchProps","checkoutProps","Lanes","consumer","switch","setStatusLine","isOnMain","throwForStagedComponents","populateSwitchProps","bitMapIds","bitmapIdsFromCurrentLaneIncludeRemoved","idsToSwitch","ids","idsWithVersion","map","id","bitMapId","searchWithoutVersion","resolveMultipleComponentIds","allowAddingComponentsFromScope","versionPerId","lane","laneToSwitchTo","results","checkout","saveLanesData","onDestroy","laneId","scope","lanes","parseLaneIdFromString","laneName","localLane","loadLane","mainIds","getIdsOfDefaultLane","isDefault","populatePropsAccordingToDefaultLane","laneIds","populatePropsAccordingToLocalLane","populatePropsAccordingToRemoteLane","idsOnLaneOnly","find","isEqualWithoutVersion","idsOnMainOnly","laneBitIds","pattern","bitMap","getAllBitIdsFromAllLanes","BitError","allIds","patternIds","filterIdsFromPoolIdsByPattern","remoteLaneId","laneIdToSwitchTo","debug","toString","throwForSwitchingToCurrentLane","remoteLane","fetchLaneWithItsComponents","name","localTrackedLane","getAliasByLaneId","undefined","components","l","changeVersion","head","LaneId","from","DEFAULT_LANE","toLaneId","c","getCurrentLaneId","isEqual","laneIdStr","_this$laneToSwitchTo","localLaneName","alias","trackLane","remoteScope","setCurrentLane","isNew","syncWithIds","ComponentIdList","fromArray","exports"],"sources":["switch-lanes.ts"],"sourcesContent":["import { Consumer } from '@teambit/legacy/dist/consumer';\nimport { LaneId, DEFAULT_LANE } from '@teambit/lane-id';\nimport { ComponentID, ComponentIdList } from '@teambit/component-id';\nimport { ApplyVersionResults } from '@teambit/merging';\nimport { Lane } from '@teambit/legacy/dist/scope/models';\nimport { CheckoutPropsLegacy, CheckoutProps } from '@teambit/checkout';\nimport { Workspace } from '@teambit/workspace';\nimport { Logger } from '@teambit/logger';\nimport { BitError } from '@teambit/bit-error';\nimport { LanesMain } from './lanes.main.runtime';\nimport { throwForStagedComponents } from './create-lane';\n\nexport type SwitchProps = {\n  laneName: string;\n  ids?: ComponentID[];\n  laneBitIds?: ComponentID[]; // only needed for the deprecated onLanesOnly prop. once this prop is removed, this prop can be removed as well.\n  pattern?: string;\n  existingOnWorkspaceOnly: boolean;\n  remoteLane?: Lane;\n  localTrackedLane?: string;\n  alias?: string;\n};\n\nexport class LaneSwitcher {\n  private consumer: Consumer;\n  private laneIdToSwitchTo: LaneId; // populated by `this.populateSwitchProps()`\n  private laneToSwitchTo: Lane | undefined; // populated by `this.populateSwitchProps()`, if default-lane, it's undefined\n  constructor(\n    private workspace: Workspace,\n    private logger: Logger,\n    private switchProps: SwitchProps,\n    private checkoutProps: CheckoutPropsLegacy,\n    private Lanes: LanesMain\n  ) {\n    this.consumer = this.workspace.consumer;\n  }\n\n  async switch(): Promise<ApplyVersionResults> {\n    this.logger.setStatusLine(`switching lanes`);\n    if (this.workspace.isOnMain()) {\n      await throwForStagedComponents(this.consumer);\n    }\n    await this.populateSwitchProps();\n    const bitMapIds = this.workspace.consumer.bitmapIdsFromCurrentLaneIncludeRemoved;\n    const idsToSwitch = this.switchProps.ids || [];\n    const idsWithVersion = idsToSwitch.map((id) => {\n      const bitMapId = bitMapIds.searchWithoutVersion(id);\n      return bitMapId || id;\n    });\n    const ids = await this.workspace.resolveMultipleComponentIds(idsWithVersion);\n\n    const checkoutProps: CheckoutProps = {\n      ...this.checkoutProps,\n      ids,\n      allowAddingComponentsFromScope: true,\n      versionPerId: await this.workspace.resolveMultipleComponentIds(idsToSwitch),\n      lane: this.laneToSwitchTo,\n    };\n\n    const results = await this.Lanes.checkout.checkout(checkoutProps);\n\n    await this.saveLanesData();\n    await this.consumer.onDestroy('lane-switch');\n\n    return results;\n  }\n\n  private async populateSwitchProps() {\n    const laneId = await this.consumer.scope.lanes.parseLaneIdFromString(this.switchProps.laneName);\n\n    const localLane = await this.consumer.scope.loadLane(laneId);\n    const mainIds = await this.consumer.getIdsOfDefaultLane();\n    if (laneId.isDefault()) {\n      await this.populatePropsAccordingToDefaultLane();\n      this.switchProps.ids = mainIds;\n    } else {\n      const laneIds = localLane\n        ? this.populatePropsAccordingToLocalLane(localLane)\n        : await this.populatePropsAccordingToRemoteLane(laneId);\n      const idsOnLaneOnly = laneIds.filter((id) => !mainIds.find((i) => i.isEqualWithoutVersion(id)));\n      const idsOnMainOnly = mainIds.filter((id) => !laneIds.find((i) => i.isEqualWithoutVersion(id)));\n      this.switchProps.ids = [...idsOnMainOnly, ...laneIds];\n      this.switchProps.laneBitIds = idsOnLaneOnly;\n    }\n\n    if (this.switchProps.pattern) {\n      if (this.consumer.bitMap.getAllBitIdsFromAllLanes().length) {\n        // if the workspace is not empty, it's possible that it has components from lane-x, and is now switching\n        // partially to lane-y, while lane-y has the same components as lane-x. in which case, the user ends up with\n        // an invalid state of components from lane-x and lane-y together.\n        throw new BitError('error: use --pattern only when the workspace is empty');\n      }\n      const allIds = await this.workspace.resolveMultipleComponentIds(this.switchProps.ids || []);\n      const patternIds = await this.workspace.filterIdsFromPoolIdsByPattern(this.switchProps.pattern, allIds);\n      this.switchProps.ids = patternIds.map((id) => id);\n    }\n  }\n\n  private async populatePropsAccordingToRemoteLane(remoteLaneId: LaneId): Promise<ComponentID[]> {\n    this.laneIdToSwitchTo = remoteLaneId;\n    this.logger.debug(`populatePropsAccordingToRemoteLane, remoteLaneId: ${remoteLaneId.toString()}`);\n    this.throwForSwitchingToCurrentLane();\n    const remoteLane = await this.Lanes.fetchLaneWithItsComponents(remoteLaneId);\n    this.switchProps.laneName = remoteLaneId.name;\n    this.switchProps.localTrackedLane = this.consumer.scope.lanes.getAliasByLaneId(remoteLaneId) || undefined;\n    this.switchProps.remoteLane = remoteLane;\n    this.laneToSwitchTo = remoteLane;\n    this.logger.debug(`populatePropsAccordingToRemoteLane, completed`);\n    return remoteLane.components.map((l) => l.id.changeVersion(l.head.toString()));\n  }\n\n  private async populatePropsAccordingToDefaultLane() {\n    this.laneIdToSwitchTo = LaneId.from(DEFAULT_LANE, this.consumer.scope.name);\n    this.throwForSwitchingToCurrentLane();\n  }\n\n  private populatePropsAccordingToLocalLane(localLane: Lane): ComponentID[] {\n    this.laneIdToSwitchTo = localLane.toLaneId();\n    this.laneToSwitchTo = localLane;\n    this.throwForSwitchingToCurrentLane();\n    return localLane.components.map((c) => c.id.changeVersion(c.head.toString()));\n  }\n\n  private throwForSwitchingToCurrentLane() {\n    if (this.consumer.getCurrentLaneId().isEqual(this.laneIdToSwitchTo)) {\n      const laneIdStr = this.laneIdToSwitchTo.isDefault()\n        ? this.laneIdToSwitchTo.name\n        : this.laneIdToSwitchTo.toString();\n      throw new BitError(`already checked out to \"${laneIdStr}\".\nto be up to date with the remote lane, please run \"bit checkout head\"\"`);\n    }\n  }\n\n  private async saveLanesData() {\n    const localLaneName = this.switchProps.alias || this.laneIdToSwitchTo.name;\n    if (this.switchProps.remoteLane) {\n      if (!this.switchProps.localTrackedLane) {\n        this.consumer.scope.lanes.trackLane({\n          localLane: localLaneName,\n          remoteLane: this.laneIdToSwitchTo.name,\n          remoteScope: this.laneIdToSwitchTo.scope,\n        });\n      }\n    }\n\n    this.consumer.setCurrentLane(this.laneIdToSwitchTo, !this.laneToSwitchTo?.isNew);\n    this.consumer.bitMap.syncWithIds(\n      ComponentIdList.fromArray(this.switchProps.ids || []),\n      ComponentIdList.fromArray(this.switchProps.laneBitIds || [])\n    );\n  }\n}\n"],"mappings":"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"}
+{"version":3,"names":["_laneId","data","require","_componentId","_bitError","_createLane","ownKeys","e","r","t","Object","keys","getOwnPropertySymbols","o","filter","getOwnPropertyDescriptor","enumerable","push","apply","_objectSpread","arguments","length","forEach","_defineProperty","getOwnPropertyDescriptors","defineProperties","defineProperty","obj","key","value","_toPropertyKey","configurable","writable","i","_toPrimitive","String","Symbol","toPrimitive","call","TypeError","Number","LaneSwitcher","constructor","workspace","logger","switchProps","checkoutProps","Lanes","consumer","switch","setStatusLine","isOnMain","throwForStagedComponents","populateSwitchProps","bitMapIds","bitmapIdsFromCurrentLaneIncludeRemoved","idsToSwitch","ids","idsWithVersion","map","id","bitMapId","searchWithoutVersion","resolveMultipleComponentIds","allowAddingComponentsFromScope","versionPerId","lane","laneToSwitchTo","results","checkout","saveLanesData","onDestroy","laneId","scope","lanes","parseLaneIdFromString","laneName","localLane","loadLane","mainIds","getIdsOfDefaultLane","isDefault","populatePropsAccordingToDefaultLane","laneIds","populatePropsAccordingToLocalLane","populatePropsAccordingToRemoteLane","idsOnLaneOnly","find","isEqualWithoutVersion","idsOnMainOnly","laneBitIds","pattern","bitMap","getAllBitIdsFromAllLanes","BitError","allIds","patternIds","filterIdsFromPoolIdsByPattern","remoteLaneId","laneIdToSwitchTo","debug","toString","throwForSwitchingToCurrentLane","remoteLane","fetchLaneWithItsComponents","name","localTrackedLane","getAliasByLaneId","undefined","components","l","changeVersion","head","LaneId","from","DEFAULT_LANE","toLaneId","c","getCurrentLaneId","isEqual","laneIdStr","localLaneName","alias","trackLane","remoteScope","setCurrentLane","isNew","syncWithIds","ComponentIdList","fromArray","exports"],"sources":["switch-lanes.ts"],"sourcesContent":["import { Consumer } from '@teambit/legacy/dist/consumer';\nimport { LaneId, DEFAULT_LANE } from '@teambit/lane-id';\nimport { ComponentID, ComponentIdList } from '@teambit/component-id';\nimport { ApplyVersionResults } from '@teambit/merging';\nimport { Lane } from '@teambit/legacy/dist/scope/models';\nimport { CheckoutPropsLegacy, CheckoutProps } from '@teambit/checkout';\nimport { Workspace } from '@teambit/workspace';\nimport { Logger } from '@teambit/logger';\nimport { BitError } from '@teambit/bit-error';\nimport { LanesMain } from './lanes.main.runtime';\nimport { throwForStagedComponents } from './create-lane';\n\nexport type SwitchProps = {\n  laneName: string;\n  ids?: ComponentID[];\n  laneBitIds?: ComponentID[]; // only needed for the deprecated onLanesOnly prop. once this prop is removed, this prop can be removed as well.\n  pattern?: string;\n  existingOnWorkspaceOnly: boolean;\n  remoteLane?: Lane;\n  localTrackedLane?: string;\n  alias?: string;\n};\n\nexport class LaneSwitcher {\n  private consumer: Consumer;\n  private laneIdToSwitchTo: LaneId; // populated by `this.populateSwitchProps()`\n  private laneToSwitchTo: Lane | undefined; // populated by `this.populateSwitchProps()`, if default-lane, it's undefined\n  constructor(\n    private workspace: Workspace,\n    private logger: Logger,\n    private switchProps: SwitchProps,\n    private checkoutProps: CheckoutPropsLegacy,\n    private Lanes: LanesMain\n  ) {\n    this.consumer = this.workspace.consumer;\n  }\n\n  async switch(): Promise<ApplyVersionResults> {\n    this.logger.setStatusLine(`switching lanes`);\n    if (this.workspace.isOnMain()) {\n      await throwForStagedComponents(this.consumer);\n    }\n    await this.populateSwitchProps();\n    const bitMapIds = this.workspace.consumer.bitmapIdsFromCurrentLaneIncludeRemoved;\n    const idsToSwitch = this.switchProps.ids || [];\n    const idsWithVersion = idsToSwitch.map((id) => {\n      const bitMapId = bitMapIds.searchWithoutVersion(id);\n      return bitMapId || id;\n    });\n    const ids = await this.workspace.resolveMultipleComponentIds(idsWithVersion);\n\n    const checkoutProps: CheckoutProps = {\n      ...this.checkoutProps,\n      ids,\n      allowAddingComponentsFromScope: true,\n      versionPerId: await this.workspace.resolveMultipleComponentIds(idsToSwitch),\n      lane: this.laneToSwitchTo,\n    };\n\n    const results = await this.Lanes.checkout.checkout(checkoutProps);\n\n    await this.saveLanesData();\n    await this.consumer.onDestroy('lane-switch');\n\n    return results;\n  }\n\n  private async populateSwitchProps() {\n    const laneId = await this.consumer.scope.lanes.parseLaneIdFromString(this.switchProps.laneName);\n\n    const localLane = await this.consumer.scope.loadLane(laneId);\n    const mainIds = await this.consumer.getIdsOfDefaultLane();\n    if (laneId.isDefault()) {\n      await this.populatePropsAccordingToDefaultLane();\n      this.switchProps.ids = mainIds;\n    } else {\n      const laneIds = localLane\n        ? this.populatePropsAccordingToLocalLane(localLane)\n        : await this.populatePropsAccordingToRemoteLane(laneId);\n      const idsOnLaneOnly = laneIds.filter((id) => !mainIds.find((i) => i.isEqualWithoutVersion(id)));\n      const idsOnMainOnly = mainIds.filter((id) => !laneIds.find((i) => i.isEqualWithoutVersion(id)));\n      this.switchProps.ids = [...idsOnMainOnly, ...laneIds];\n      this.switchProps.laneBitIds = idsOnLaneOnly;\n    }\n\n    if (this.switchProps.pattern) {\n      if (this.consumer.bitMap.getAllBitIdsFromAllLanes().length) {\n        // if the workspace is not empty, it's possible that it has components from lane-x, and is now switching\n        // partially to lane-y, while lane-y has the same components as lane-x. in which case, the user ends up with\n        // an invalid state of components from lane-x and lane-y together.\n        throw new BitError('error: use --pattern only when the workspace is empty');\n      }\n      const allIds = await this.workspace.resolveMultipleComponentIds(this.switchProps.ids || []);\n      const patternIds = await this.workspace.filterIdsFromPoolIdsByPattern(this.switchProps.pattern, allIds);\n      this.switchProps.ids = patternIds.map((id) => id);\n    }\n  }\n\n  private async populatePropsAccordingToRemoteLane(remoteLaneId: LaneId): Promise<ComponentID[]> {\n    this.laneIdToSwitchTo = remoteLaneId;\n    this.logger.debug(`populatePropsAccordingToRemoteLane, remoteLaneId: ${remoteLaneId.toString()}`);\n    this.throwForSwitchingToCurrentLane();\n    const remoteLane = await this.Lanes.fetchLaneWithItsComponents(remoteLaneId);\n    this.switchProps.laneName = remoteLaneId.name;\n    this.switchProps.localTrackedLane = this.consumer.scope.lanes.getAliasByLaneId(remoteLaneId) || undefined;\n    this.switchProps.remoteLane = remoteLane;\n    this.laneToSwitchTo = remoteLane;\n    this.logger.debug(`populatePropsAccordingToRemoteLane, completed`);\n    return remoteLane.components.map((l) => l.id.changeVersion(l.head.toString()));\n  }\n\n  private async populatePropsAccordingToDefaultLane() {\n    this.laneIdToSwitchTo = LaneId.from(DEFAULT_LANE, this.consumer.scope.name);\n    this.throwForSwitchingToCurrentLane();\n  }\n\n  private populatePropsAccordingToLocalLane(localLane: Lane): ComponentID[] {\n    this.laneIdToSwitchTo = localLane.toLaneId();\n    this.laneToSwitchTo = localLane;\n    this.throwForSwitchingToCurrentLane();\n    return localLane.components.map((c) => c.id.changeVersion(c.head.toString()));\n  }\n\n  private throwForSwitchingToCurrentLane() {\n    if (this.consumer.getCurrentLaneId().isEqual(this.laneIdToSwitchTo)) {\n      const laneIdStr = this.laneIdToSwitchTo.isDefault()\n        ? this.laneIdToSwitchTo.name\n        : this.laneIdToSwitchTo.toString();\n      throw new BitError(`already checked out to \"${laneIdStr}\".\nto be up to date with the remote lane, please run \"bit checkout head\"\"`);\n    }\n  }\n\n  private async saveLanesData() {\n    const localLaneName = this.switchProps.alias || this.laneIdToSwitchTo.name;\n    if (this.switchProps.remoteLane) {\n      if (!this.switchProps.localTrackedLane) {\n        this.consumer.scope.lanes.trackLane({\n          localLane: localLaneName,\n          remoteLane: this.laneIdToSwitchTo.name,\n          remoteScope: this.laneIdToSwitchTo.scope,\n        });\n      }\n    }\n\n    this.consumer.setCurrentLane(this.laneIdToSwitchTo, !this.laneToSwitchTo?.isNew);\n    this.consumer.bitMap.syncWithIds(\n      ComponentIdList.fromArray(this.switchProps.ids || []),\n      ComponentIdList.fromArray(this.switchProps.laneBitIds || [])\n    );\n  }\n}\n"],"mappings":"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"}

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@teambit/lanes",
-  "version": "1.0.107",
+  "version": "1.0.109",
   "homepage": "https://bit.cloud/teambit/lanes/lanes",
   "main": "dist/index.js",
   "componentId": {
     "scope": "teambit.lanes",
     "name": "lanes",
-    "version": "1.0.107"
+    "version": "1.0.109"
   },
   "dependencies": {
     "lodash": "4.17.21",
@@ -16,8 +16,6 @@
     "graphql-tag": "2.12.1",
     "p-map-series": "2.1.0",
     "p-map": "4.0.0",
-    "core-js": "^3.0.0",
-    "@babel/runtime": "7.20.0",
     "@teambit/bit-error": "0.0.404",
     "@teambit/component-version": "1.0.3",
     "@teambit/lane-id": "0.0.311",
@@ -38,44 +36,40 @@
     "@teambit/ui-foundation.ui.menu": "0.0.502",
     "@teambit/ui-foundation.ui.react-router.slot-router": "0.0.506",
     "@teambit/ui-foundation.ui.react-router.use-query": "0.0.501",
-    "@teambit/scope": "1.0.107",
-    "@teambit/snapping": "1.0.107",
-    "@teambit/workspace": "1.0.107",
-    "@teambit/cli": "0.0.839",
-    "@teambit/express": "0.0.938",
-    "@teambit/logger": "0.0.932",
-    "@teambit/graphql": "1.0.107",
-    "@teambit/checkout": "1.0.107",
-    "@teambit/component-compare": "1.0.107",
-    "@teambit/component-writer": "1.0.107",
-    "@teambit/component": "1.0.107",
-    "@teambit/export": "1.0.107",
-    "@teambit/importer": "1.0.107",
-    "@teambit/lanes.entities.lane-diff": "0.0.164",
+    "@teambit/scope": "1.0.109",
+    "@teambit/snapping": "1.0.109",
+    "@teambit/workspace": "1.0.109",
+    "@teambit/cli": "0.0.841",
+    "@teambit/express": "0.0.940",
+    "@teambit/logger": "0.0.934",
+    "@teambit/graphql": "1.0.109",
+    "@teambit/checkout": "1.0.109",
+    "@teambit/component-compare": "1.0.109",
+    "@teambit/component-writer": "1.0.109",
+    "@teambit/component": "1.0.109",
+    "@teambit/export": "1.0.109",
+    "@teambit/importer": "1.0.109",
     "@teambit/lanes.modules.diff": "0.0.438",
-    "@teambit/merging": "1.0.107",
-    "@teambit/remove": "1.0.107",
-    "@teambit/ui": "1.0.107"
+    "@teambit/merging": "1.0.109",
+    "@teambit/remove": "1.0.109",
+    "@teambit/lanes.entities.lane-diff": "0.0.164",
+    "@teambit/ui": "1.0.109"
   },
   "devDependencies": {
     "@types/lodash": "4.14.165",
-    "@types/react": "^17.0.8",
-    "@types/chai": "4.2.15",
-    "chai": "4.3.0",
     "@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",
-    "@teambit/component.testing.mock-components": "0.0.179",
-    "@teambit/harmony.testing.load-aspect": "0.0.178",
+    "@types/jest": "^29.2.2",
+    "@types/testing-library__jest-dom": "^5.9.5",
+    "@teambit/harmony.envs.core-aspect-env": "0.0.14",
+    "@teambit/component.testing.mock-components": "0.0.181",
+    "@teambit/harmony.testing.load-aspect": "0.0.180",
     "@teambit/workspace.testing.mock-workspace": "0.0.18"
   },
   "peerDependencies": {
-    "react-router-dom": "^6.0.0",
-    "@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",
+    "react-router-dom": "^6.8.1",
+    "@types/react": "^18.2.12",
+    "@teambit/legacy": "1.0.624"
   },
   "license": "Apache-2.0",
   "optionalDependencies": {},
@@ -89,7 +83,7 @@
   },
   "private": false,
   "engines": {
-    "node": ">=12.22.0"
+    "node": ">=16.0.0"
   },
   "repository": {
     "type": "git",
@@ -98,12 +92,9 @@
   "keywords": [
     "bit",
     "bit-aspect",
+    "bit-core-aspect",
     "components",
     "collaboration",
-    "web",
-    "react",
-    "react-components",
-    "angular",
-    "angular-components"
+    "web"
   ]
 }

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;
+}