@teambit/aspect-loader 0.0.607 → 0.0.615

package/dist/core-aspects.js

@@ -38,15 +38,10 @@ function _path() {
 function getAspectDir(id) {
   const aspectName = getCoreAspectName(id);
   const packageName = getCoreAspectPackageName(id);
-  let dirPath; // in case the aspect is running outside of bit-bin, it should find it in the cwd.
-  // otherwise, use the `__dirname` for the location of the core-aspects file.
-
-  const pathsToResolveAspects = [process.cwd(), __dirname];
+  let dirPath;
 
   try {
-    const moduleDirectory = require.resolve(packageName, {
-      paths: pathsToResolveAspects
-    });
+    const moduleDirectory = require.resolve(packageName);
 
     dirPath = (0, _path().join)(moduleDirectory, '../..'); // to remove the "index.js" at the end
   } catch (err) {

package/dist/core-aspects.js.map

@@ -1 +1 @@
-{"version":3,"sources":["core-aspects.ts"],"names":["getAspectDir","id","aspectName","getCoreAspectName","packageName","getCoreAspectPackageName","dirPath","pathsToResolveAspects","process","cwd","__dirname","moduleDirectory","require","resolve","paths","err","Error","getAspectDistDir","name","split","join","getAspectDef","runtime","files","runtimeFile","find","file","includes","aspectPath","runtimePath"],"mappings":";;;;;;;;;;;;;;;;;AAAA;AAAA;;AAAA;AAAA;AAAA;;AAAA;AAAA;;AACA;AAAA;;AAAA;AAAA;AAAA;;AAAA;AAAA;;AAEO,SAASA,YAAT,CAAsBC,EAAtB,EAA0C;AAC/C,QAAMC,UAAU,GAAGC,iBAAiB,CAACF,EAAD,CAApC;AACA,QAAMG,WAAW,GAAGC,wBAAwB,CAACJ,EAAD,CAA5C;AACA,MAAIK,OAAJ,CAH+C,CAI/C;AACA;;AACA,QAAMC,qBAAqB,GAAG,CAACC,OAAO,CAACC,GAAR,EAAD,EAAgBC,SAAhB,CAA9B;;AACA,MAAI;AACF,UAAMC,eAAe,GAAGC,OAAO,CAACC,OAAR,CAAgBT,WAAhB,EAA6B;AAAEU,MAAAA,KAAK,EAAEP;AAAT,KAA7B,CAAxB;;AACAD,IAAAA,OAAO,GAAG,kBAAKK,eAAL,EAAsB,OAAtB,CAAV,CAFE,CAEwC;AAC3C,GAHD,CAGE,OAAOI,GAAP,EAAiB;AACjBT,IAAAA,OAAO,GAAG,qBAAQI,SAAR,EAAmB,OAAnB,EAA4BR,UAA5B,EAAwC,MAAxC,CAAV;AACD;;AACD,MAAI,CAAC,2BAAWI,OAAX,CAAL,EAA0B;AACxB,UAAM,IAAIU,KAAJ,CAAW,kBAAiBd,UAAW,OAAMI,OAAQ,EAArD,CAAN;AACD;;AACD,SAAOA,OAAP;AACD;;AAEM,SAASW,gBAAT,CAA0BhB,EAA1B,EAAsC;AAC3C,SAAO,qBAAS,GAAED,YAAY,CAACC,EAAD,CAAK,OAA5B,CAAP;AACD;;AAEM,SAASE,iBAAT,CAA2BF,EAA3B,EAA+C;AACpD,QAAM,GAAG,GAAGiB,IAAN,IAAcjB,EAAE,CAACkB,KAAH,CAAS,GAAT,CAApB;AACA,QAAMjB,UAAU,GAAGgB,IAAI,CAACE,IAAL,CAAU,GAAV,CAAnB;AACA,SAAOlB,UAAP;AACD;;AAEM,SAASG,wBAAT,CAAkCJ,EAAlC,EAAsD;AAC3D,QAAMC,UAAU,GAAGC,iBAAiB,CAACF,EAAD,CAApC;AACA,SAAQ,YAAWC,UAAW,EAA9B;AACD;;AAEM,eAAemB,YAAf,CAA4BnB,UAA5B,EAAgDoB,OAAhD,EAAkE;AACvE,QAAMhB,OAAO,GAAGW,gBAAgB,CAACf,UAAD,CAAhC;AAEA,QAAMqB,KAAK,GAAG,MAAM,wBAAQjB,OAAR,CAApB;AACA,MAAIkB,WAAJ;;AACA,MAAIF,OAAJ,EAAa;AACXE,IAAAA,WAAW,GAAGD,KAAK,CAACE,IAAN,CAAYC,IAAD,IAAUA,IAAI,CAACC,QAAL,CAAe,IAAGL,OAAQ,aAA1B,CAArB,KAAiE,IAA/E;AACD;;AAED,SAAO;AACLrB,IAAAA,EAAE,EAAEC,UADC;AAEL0B,IAAAA,UAAU,EAAE,kBAAKtB,OAAL,EAAc,IAAd,CAFP;AAGLuB,IAAAA,WAAW,EAAEL,WAAW,GAAG,qBAAS,GAAElB,OAAQ,IAAGkB,WAAY,EAAlC,CAAH,GAA0C;AAH7D,GAAP;AAKD","sourcesContent":["import { existsSync, readdir } from 'fs-extra';\nimport { join, resolve } from 'path';\n\nexport function getAspectDir(id: string): string {\n  const aspectName = getCoreAspectName(id);\n  const packageName = getCoreAspectPackageName(id);\n  let dirPath: string;\n  // in case the aspect is running outside of bit-bin, it should find it in the cwd.\n  // otherwise, use the `__dirname` for the location of the core-aspects file.\n  const pathsToResolveAspects = [process.cwd(), __dirname];\n  try {\n    const moduleDirectory = require.resolve(packageName, { paths: pathsToResolveAspects });\n    dirPath = join(moduleDirectory, '../..'); // to remove the \"index.js\" at the end\n  } catch (err: any) {\n    dirPath = resolve(__dirname, '../..', aspectName, 'dist');\n  }\n  if (!existsSync(dirPath)) {\n    throw new Error(`unable to find ${aspectName} in ${dirPath}`);\n  }\n  return dirPath;\n}\n\nexport function getAspectDistDir(id: string) {\n  return resolve(`${getAspectDir(id)}/dist`);\n}\n\nexport function getCoreAspectName(id: string): string {\n  const [, ...name] = id.split('/');\n  const aspectName = name.join('.');\n  return aspectName;\n}\n\nexport function getCoreAspectPackageName(id: string): string {\n  const aspectName = getCoreAspectName(id);\n  return `@teambit/${aspectName}`;\n}\n\nexport async function getAspectDef(aspectName: string, runtime?: string) {\n  const dirPath = getAspectDistDir(aspectName);\n\n  const files = await readdir(dirPath);\n  let runtimeFile;\n  if (runtime) {\n    runtimeFile = files.find((file) => file.includes(`.${runtime}.runtime.js`)) || null;\n  }\n\n  return {\n    id: aspectName,\n    aspectPath: join(dirPath, '..'),\n    runtimePath: runtimeFile ? resolve(`${dirPath}/${runtimeFile}`) : null,\n  };\n}\n"]}
+{"version":3,"sources":["core-aspects.ts"],"names":["getAspectDir","id","aspectName","getCoreAspectName","packageName","getCoreAspectPackageName","dirPath","moduleDirectory","require","resolve","err","__dirname","Error","getAspectDistDir","name","split","join","getAspectDef","runtime","files","runtimeFile","find","file","includes","aspectPath","runtimePath"],"mappings":";;;;;;;;;;;;;;;;;AAAA;AAAA;;AAAA;AAAA;AAAA;;AAAA;AAAA;;AACA;AAAA;;AAAA;AAAA;AAAA;;AAAA;AAAA;;AAEO,SAASA,YAAT,CAAsBC,EAAtB,EAA0C;AAC/C,QAAMC,UAAU,GAAGC,iBAAiB,CAACF,EAAD,CAApC;AACA,QAAMG,WAAW,GAAGC,wBAAwB,CAACJ,EAAD,CAA5C;AACA,MAAIK,OAAJ;;AACA,MAAI;AACF,UAAMC,eAAe,GAAGC,OAAO,CAACC,OAAR,CAAgBL,WAAhB,CAAxB;;AACAE,IAAAA,OAAO,GAAG,kBAAKC,eAAL,EAAsB,OAAtB,CAAV,CAFE,CAEwC;AAC3C,GAHD,CAGE,OAAOG,GAAP,EAAiB;AACjBJ,IAAAA,OAAO,GAAG,qBAAQK,SAAR,EAAmB,OAAnB,EAA4BT,UAA5B,EAAwC,MAAxC,CAAV;AACD;;AACD,MAAI,CAAC,2BAAWI,OAAX,CAAL,EAA0B;AACxB,UAAM,IAAIM,KAAJ,CAAW,kBAAiBV,UAAW,OAAMI,OAAQ,EAArD,CAAN;AACD;;AACD,SAAOA,OAAP;AACD;;AAEM,SAASO,gBAAT,CAA0BZ,EAA1B,EAAsC;AAC3C,SAAO,qBAAS,GAAED,YAAY,CAACC,EAAD,CAAK,OAA5B,CAAP;AACD;;AAEM,SAASE,iBAAT,CAA2BF,EAA3B,EAA+C;AACpD,QAAM,GAAG,GAAGa,IAAN,IAAcb,EAAE,CAACc,KAAH,CAAS,GAAT,CAApB;AACA,QAAMb,UAAU,GAAGY,IAAI,CAACE,IAAL,CAAU,GAAV,CAAnB;AACA,SAAOd,UAAP;AACD;;AAEM,SAASG,wBAAT,CAAkCJ,EAAlC,EAAsD;AAC3D,QAAMC,UAAU,GAAGC,iBAAiB,CAACF,EAAD,CAApC;AACA,SAAQ,YAAWC,UAAW,EAA9B;AACD;;AAEM,eAAee,YAAf,CAA4Bf,UAA5B,EAAgDgB,OAAhD,EAAkE;AACvE,QAAMZ,OAAO,GAAGO,gBAAgB,CAACX,UAAD,CAAhC;AAEA,QAAMiB,KAAK,GAAG,MAAM,wBAAQb,OAAR,CAApB;AACA,MAAIc,WAAJ;;AACA,MAAIF,OAAJ,EAAa;AACXE,IAAAA,WAAW,GAAGD,KAAK,CAACE,IAAN,CAAYC,IAAD,IAAUA,IAAI,CAACC,QAAL,CAAe,IAAGL,OAAQ,aAA1B,CAArB,KAAiE,IAA/E;AACD;;AAED,SAAO;AACLjB,IAAAA,EAAE,EAAEC,UADC;AAELsB,IAAAA,UAAU,EAAE,kBAAKlB,OAAL,EAAc,IAAd,CAFP;AAGLmB,IAAAA,WAAW,EAAEL,WAAW,GAAG,qBAAS,GAAEd,OAAQ,IAAGc,WAAY,EAAlC,CAAH,GAA0C;AAH7D,GAAP;AAKD","sourcesContent":["import { existsSync, readdir } from 'fs-extra';\nimport { join, resolve } from 'path';\n\nexport function getAspectDir(id: string): string {\n  const aspectName = getCoreAspectName(id);\n  const packageName = getCoreAspectPackageName(id);\n  let dirPath: string;\n  try {\n    const moduleDirectory = require.resolve(packageName);\n    dirPath = join(moduleDirectory, '../..'); // to remove the \"index.js\" at the end\n  } catch (err: any) {\n    dirPath = resolve(__dirname, '../..', aspectName, 'dist');\n  }\n  if (!existsSync(dirPath)) {\n    throw new Error(`unable to find ${aspectName} in ${dirPath}`);\n  }\n  return dirPath;\n}\n\nexport function getAspectDistDir(id: string) {\n  return resolve(`${getAspectDir(id)}/dist`);\n}\n\nexport function getCoreAspectName(id: string): string {\n  const [, ...name] = id.split('/');\n  const aspectName = name.join('.');\n  return aspectName;\n}\n\nexport function getCoreAspectPackageName(id: string): string {\n  const aspectName = getCoreAspectName(id);\n  return `@teambit/${aspectName}`;\n}\n\nexport async function getAspectDef(aspectName: string, runtime?: string) {\n  const dirPath = getAspectDistDir(aspectName);\n\n  const files = await readdir(dirPath);\n  let runtimeFile;\n  if (runtime) {\n    runtimeFile = files.find((file) => file.includes(`.${runtime}.runtime.js`)) || null;\n  }\n\n  return {\n    id: aspectName,\n    aspectPath: join(dirPath, '..'),\n    runtimePath: runtimeFile ? resolve(`${dirPath}/${runtimeFile}`) : null,\n  };\n}\n"]}

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@teambit/aspect-loader",
-  "version": "0.0.607",
+  "version": "0.0.615",
   "homepage": "https://bit.dev/teambit/harmony/aspect-loader",
   "main": "dist/index.js",
   "componentId": {
     "scope": "teambit.harmony",
     "name": "aspect-loader",
-    "version": "0.0.607"
+    "version": "0.0.615"
   },
   "dependencies": {
     "@teambit/harmony": "0.2.11",
@@ -15,14 +15,14 @@
     "fs-extra": "10.0.0",
     "@babel/runtime": "7.12.18",
     "core-js": "^3.0.0",
-    "@teambit/component": "0.0.607",
-    "@teambit/bit": "0.0.609",
-    "@teambit/cli": "0.0.419",
-    "@teambit/envs": "0.0.607",
+    "@teambit/component": "0.0.615",
+    "@teambit/bit": "0.0.617",
+    "@teambit/cli": "0.0.423",
+    "@teambit/envs": "0.0.615",
     "@teambit/harmony.modules.requireable-component": "0.0.483",
     "@teambit/legacy-bit-id": "0.0.397",
-    "@teambit/logger": "0.0.508",
-    "@teambit/scope": "0.0.607",
+    "@teambit/logger": "0.0.512",
+    "@teambit/scope": "0.0.615",
     "@teambit/bit-error": "0.0.394"
   },
   "devDependencies": {
@@ -36,7 +36,7 @@
     "@types/node": "12.20.4"
   },
   "peerDependencies": {
-    "@teambit/legacy": "1.0.202",
+    "@teambit/legacy": "1.0.204",
     "react-dom": "^16.8.0 || ^17.0.0",
     "react": "^16.8.0 || ^17.0.0"
   },
@@ -64,7 +64,7 @@
         "react": "-"
       },
       "peerDependencies": {
-        "@teambit/legacy": "1.0.202",
+        "@teambit/legacy": "1.0.204",
         "react-dom": "^16.8.0 || ^17.0.0",
         "react": "^16.8.0 || ^17.0.0"
       }