Merge branch 'master' into enhance-tar-corruption-debugging

Author: davidfirst

.bitmap

@@ -368,7 +368,7 @@ commands:
       - restore_cache:
           key: bitsrc-registry10
       - restore_cache:
-          key: core-aspect-env-v0.0.80-v1
+          key: core-aspect-env-v0.1.0-v1
       - run: npm view @teambit/bit version > ./version.txt
       - restore_cache:
           key: v3-linux-bvm-folder-{{ checksum "version.txt" }}
@@ -451,7 +451,7 @@ commands:
       - restore_cache:
           key: bitsrc-registry10
       - restore_cache:
-          key: core-aspect-env-v0.0.80-v1
+          key: core-aspect-env-v0.1.0-v1
       - run: npm view @teambit/bit version > ./version.txt
       - restore_cache:
           key: v3-linux-bvm-folder-{{ checksum "version.txt" }}
@@ -557,7 +557,7 @@ jobs:
           name: bbit install
           command: cd bit && bbit install
       - save_cache:
-          key: core-aspect-env-v0.0.80-v1
+          key: core-aspect-env-v0.1.0-v1
           paths:
             - /home/circleci/Library/Caches/Bit/capsules/caec9a107
       # - run: cd bit && bbit compile
@@ -612,7 +612,7 @@ jobs:
       - restore_cache:
           key: bitsrc-registry10
       - restore_cache:
-          key: core-aspect-env-v0.0.80-v1
+          key: core-aspect-env-v0.1.0-v1
       - run:
           name: 'check circular dependencies'
           command: 'cd bit && ./scripts/circular-deps-check/ci-check.sh'

.circleci/config.yml

@@ -39,9 +39,9 @@
     "packageManager": "teambit.dependencies/pnpm",
     "policy": {
       "dependencies": {
-        "@teambit/mdx.ui.mdx-scope-context": "1.0.0",
-        "@teambit/react.react-env": "1.0.77",
-        "@teambit/typescript.typescript-compiler": "2.0.38"
+        "@teambit/mdx.ui.mdx-scope-context": "1.0.7",
+        "@teambit/react.react-env": "1.2.0",
+        "@teambit/typescript.typescript-compiler": "2.0.64"
       },
       "peerDependencies": {}
     },

components/legacy/e2e-helper/excluded-fixtures/workspace-with-tsconfig-issue/workspace.jsonc

@@ -22,7 +22,7 @@ export class CheckoutCmd implements Command {
     {
       name: 'to',
       description:
-        "permitted values: [head, latest, reset, {specific-version}, {head~x}]. 'head' - last snap/tag. 'latest' - semver latest tag. 'reset' - removes local changes",
+        "permitted values: `[head, latest, reset, {specific-version}, {head~x}]`. 'head' - last snap/tag. 'latest' - semver latest tag. 'reset' - removes local changes",
     },
     {
       name: 'component-pattern',

pnpm-lock.yaml

@@ -5,7 +5,7 @@ labels: ['string', 'utility']
 
 import { humanizeCompositionId } from './humanize'
 
-```jsx live=true
+```jsx live
 () => {
   return (
     <>

scopes/component/checkout/checkout-cmd.ts

@@ -572,8 +572,14 @@ export class DependencyResolverMain {
     }
   ) {
     const envId = this.envs.getEnvId(component);
+    const envIdWithoutVersion = ComponentID.fromString(envId).toStringWithoutVersion();
     const rootComponentsRelativePath = relative(options.workspacePath, options.rootComponentsPath);
-    return getRootComponentDir(rootComponentsRelativePath ?? '', envId);
+    const rootComponentDirWithVersion = getRootComponentDir(rootComponentsRelativePath ?? '', envId);
+    const rootComponentDirWithoutVersion = getRootComponentDir(rootComponentsRelativePath ?? '', envIdWithoutVersion);
+    if (fs.pathExistsSync(rootComponentDirWithoutVersion)) {
+      return rootComponentDirWithoutVersion;
+    }
+    return rootComponentDirWithVersion;
   }
 
   /**

scopes/compositions/model/composition-id/humanize.docs.md

@@ -101,7 +101,7 @@ Now that you have a basic customized extension to start from, you can go ahead a
 Node implements a set of APIs you can use to merge your preferred configuration with its defaults. These APIs are called **transformers** and they all start with the `override` pre-fix. Find [Available transformers here](#transformers-api-docs).
 In case of a conflict, your config will override the default.
 
-```typescript {4,14} title="Customized TypeScript configuration"
+```typescript title="Customized TypeScript configuration"
 import { EnvsMain, EnvsAspect } from '@teambit/envs';
 import { NodeAspect, NodeMain } from '@teambit/node';
 
@@ -135,7 +135,7 @@ The below example uses the `overrideCompiler` transformer to override the `getCo
 1. Create a new Babel compiler using the Babel aspect, and initialize it with the above babelConfig
 1. Use the `compose` Env API to apply the compiler override transformer and add Babel as a transpiler in the environment
 
-```typescript {3,5,10-12,15,17-18,22-23}
+```typescript
 import { EnvsMain, EnvsAspect } from '@teambit/envs';
 import { NodeAspect, NodeMain } from '@teambit/node';
 import { BabelAspect, BabelMain } from '@teambit/babel';

scopes/dependencies/dependency-resolver/dependency-resolver.main.runtime.ts

@@ -73,11 +73,11 @@ export class SetAspectCmd implements Command {
     },
     {
       name: 'aspect-id',
-      description: "the aspect's component id",
+      description: `the aspect's component id`,
     },
     {
       name: 'config',
-      description: `the aspect config. enter the config as a stringified JSON (e.g. '{"foo":"bar"}' ). when no config is provided, an aspect is set with an empty config ({}).`,
+      description: `the aspect config. enter the config as a stringified JSON (e.g. \`{"foo":"bar"}\` ). when no config is provided, an aspect is set with an empty config ({}).`,
     },
   ];
   options = [

scopes/harmony/aspect-docs/node/node.mdx

@@ -57,9 +57,10 @@ function consoleFileReadUsages() {
     return;
   }
   let numR = 0;
-  const print = (filename: string) => {
+  const print = (filename: string | URL) => {
+    const path = filename instanceof URL ? filename.pathname : String(filename);
     // eslint-disable-next-line no-console
-    console.log(`#${numR}`, filename);
+    console.log(`#${numR}`, path);
   };
   const originalReadFile = fs.readFile;
   const originalReadFileSync = fs.readFileSync;