@teambit/isolator 1.0.330 → 1.0.331

package/dist/isolator.main.runtime.d.ts

@@ -9,7 +9,7 @@ import { Logger, LoggerMain } from '@teambit/logger';
 import { ComponentID, ComponentIdList } from '@teambit/component-id';
 import LegacyScope from '@teambit/legacy/dist/scope/scope';
 import { GlobalConfigMain } from '@teambit/global-config';
-import { PathOsBasedAbsolute } from '@teambit/legacy/dist/utils/path';
+import { PathOsBasedAbsolute } from '@teambit/legacy.utils';
 import { Scope } from '@teambit/legacy/dist/scope';
 import DataToPersist from '@teambit/legacy/dist/consumer/component/sources/data-to-persist';
 import { Capsule } from './capsule';

package/dist/isolator.main.runtime.js

@@ -137,9 +137,23 @@ function _artifactFiles() {
   };
   return data;
 }
-function _path() {
-  const data = require("@teambit/legacy/dist/utils/path");
-  _path = function () {
+function _legacy() {
+  const data = require("@teambit/legacy.utils");
+  _legacy = function () {
+    return data;
+  };
+  return data;
+}
+function _harmonyModules() {
+  const data = require("@teambit/harmony.modules.concurrency");
+  _harmonyModules = function () {
+    return data;
+  };
+  return data;
+}
+function _pkgModules() {
+  const data = require("@teambit/pkg.modules.component-package-name");
+  _pkgModules = function () {
     return data;
   };
   return data;
@@ -158,9 +172,9 @@ function _objectHash() {
   };
   return data;
 }
-function _path2() {
+function _path() {
   const data = _interopRequireWildcard(require("path"));
-  _path2 = function () {
+  _path = function () {
     return data;
   };
   return data;
@@ -186,20 +200,6 @@ function _workspaceModules() {
   };
   return data;
 }
-function _componentIdToPackageName() {
-  const data = _interopRequireDefault(require("@teambit/legacy/dist/utils/bit/component-id-to-package-name"));
-  _componentIdToPackageName = function () {
-    return data;
-  };
-  return data;
-}
-function _concurrency() {
-  const data = require("@teambit/legacy/dist/utils/concurrency");
-  _concurrency = function () {
-    return data;
-  };
-  return data;
-}
 function _pMap() {
   const data = _interopRequireDefault(require("p-map"));
   _pMap = function () {
@@ -378,13 +378,13 @@ class IsolatorMain {
       withFileTypes: true
     });
     const capsuleDirents = allDirs.filter(dir => dir.isDirectory() && dir.name !== 'node_modules');
-    return capsuleDirents.map(dir => _path2().default.join(rootDir, dir.name));
+    return capsuleDirents.map(dir => _path().default.join(rootDir, dir.name));
   }
   async moveCapsulesLockFileToTargetDir(capsulesDirs, sourceRootDir, targetCapsuleDir) {
     this.logger.info(`start moving lock files from ${sourceRootDir} to ${targetCapsuleDir}`);
     const promises = capsulesDirs.map(async sourceDir => {
-      const dirname = _path2().default.basename(sourceDir);
-      const sourceLockFile = _path2().default.join(sourceDir, 'pnpm-lock.yaml');
+      const dirname = _path().default.basename(sourceDir);
+      const sourceLockFile = _path().default.join(sourceDir, 'pnpm-lock.yaml');
       // Lock file is not exist, don't copy it to the cache
       if (!_fsExtra().default.pathExistsSync(sourceLockFile)) {
         // It was already moved during the process, do not show the log for it
@@ -393,8 +393,8 @@ class IsolatorMain {
         }
         return;
       }
-      const targetDir = _path2().default.join(targetCapsuleDir, dirname);
-      const targetLockFile = _path2().default.join(targetDir, 'pnpm-lock.yaml');
+      const targetDir = _path().default.join(targetCapsuleDir, dirname);
+      const targetLockFile = _path().default.join(targetDir, 'pnpm-lock.yaml');
       const targetLockFileExists = await _fsExtra().default.pathExists(targetLockFile);
       if (targetLockFileExists) {
         // Lock file is already in the cache, no need to move it
@@ -407,7 +407,7 @@ class IsolatorMain {
       this.logger.debug(`moving lock file from ${sourceLockFile} to ${targetDir}`);
       const mvFunc = this.getCapsuleTransferFn();
       try {
-        await mvFunc(sourceLockFile, _path2().default.join(targetDir, 'pnpm-lock.yaml'));
+        await mvFunc(sourceLockFile, _path().default.join(targetDir, 'pnpm-lock.yaml'));
         this._movedLockFiles.add(sourceLockFile);
       } catch (err) {
         this.logger.error(`failed moving lock file from ${sourceLockFile} to ${targetDir}`, err);
@@ -418,15 +418,15 @@ class IsolatorMain {
   async moveCapsulesToTargetDir(capsulesDirs, sourceRootDir, targetCapsuleDir) {
     this.logger.info(`start moving capsules from ${sourceRootDir} to ${targetCapsuleDir}`);
     const promises = capsulesDirs.map(async sourceDir => {
-      const dirname = _path2().default.basename(sourceDir);
+      const dirname = _path().default.basename(sourceDir);
       const sourceCapsuleReadyFile = this.getCapsuleReadyFilePath(sourceDir);
       if (!_fsExtra().default.pathExistsSync(sourceCapsuleReadyFile)) {
         // Capsule is not ready, don't copy it to the cache
         this.logger.console(`skipping moving capsule to cache as it is not ready ${sourceDir}`);
         return;
       }
-      const targetDir = _path2().default.join(targetCapsuleDir, dirname);
-      if (_fsExtra().default.pathExistsSync(_path2().default.join(targetCapsuleDir, dirname))) {
+      const targetDir = _path().default.join(targetCapsuleDir, dirname);
+      if (_fsExtra().default.pathExistsSync(_path().default.join(targetCapsuleDir, dirname))) {
         const targetCapsuleReadyFile = this.getCapsuleReadyFilePath(targetDir);
         if (_fsExtra().default.pathExistsSync(targetCapsuleReadyFile)) {
           // Capsule is already in the cache, no need to move it
@@ -514,7 +514,7 @@ class IsolatorMain {
     }));
     // validate all capsules in the real location exists and valid
     const allCapsulesExists = componentsToIsolate.every(component => {
-      const capsuleDir = _path2().default.join(realCapsulesDir, _capsule().Capsule.getCapsuleDirName(component));
+      const capsuleDir = _path().default.join(realCapsulesDir, _capsule().Capsule.getCapsuleDirName(component));
       const readyFilePath = this.getCapsuleReadyFilePath(capsuleDir);
       return _fsExtra().default.existsSync(capsuleDir) && _fsExtra().default.existsSync(readyFilePath);
     });
@@ -605,13 +605,13 @@ class IsolatorMain {
         await Promise.all(capsuleList.map(async (capsule, index) => {
           const newCapsuleList = _capsuleList().default.fromArray([capsule]);
           if (opts.cacheCapsulesDir && capsulesDir !== opts.cacheCapsulesDir && opts.cacheLockFileOnly) {
-            const cacheCapsuleDir = _path2().default.join(opts.cacheCapsulesDir, (0, _path2().basename)(capsule.path));
-            const lockFilePath = _path2().default.join(cacheCapsuleDir, 'pnpm-lock.yaml');
+            const cacheCapsuleDir = _path().default.join(opts.cacheCapsulesDir, (0, _path().basename)(capsule.path));
+            const lockFilePath = _path().default.join(cacheCapsuleDir, 'pnpm-lock.yaml');
             const lockExists = await _fsExtra().default.pathExists(lockFilePath);
             if (lockExists) {
               try {
                 // this.logger.console(`moving lock file from ${lockFilePath} to ${capsule.path}`);
-                await (0, _fsExtra().copyFile)(lockFilePath, _path2().default.join(capsule.path, 'pnpm-lock.yaml'));
+                await (0, _fsExtra().copyFile)(lockFilePath, _path().default.join(capsule.path, 'pnpm-lock.yaml'));
               } catch (err) {
                 // We can ignore the error, we don't want to break the flow. the file will be anyway re-generated
                 // in the target capsule. it will only be a bit slower.
@@ -689,7 +689,7 @@ class IsolatorMain {
     _fsExtra().default.writeFileSync(readyFilePath, '');
   }
   getCapsuleReadyFilePath(capsulePath) {
-    return _path2().default.join(capsulePath, CAPSULE_READY_FILE);
+    return _path().default.join(capsulePath, CAPSULE_READY_FILE);
   }
   async installInCapsules(capsulesDir, capsuleList, isolateInstallOptions, opts) {
     const installer = this.dependencyResolver.getInstaller({
@@ -826,7 +826,7 @@ class IsolatorMain {
     try {
       const capsules = await _fsExtra().default.readdir(rootDir);
       const withoutNodeModules = capsules.filter(c => c !== 'node_modules');
-      const capsuleFullPaths = withoutNodeModules.map(c => _path2().default.join(rootDir, c));
+      const capsuleFullPaths = withoutNodeModules.map(c => _path().default.join(rootDir, c));
       return {
         capsules: capsuleFullPaths
       };
@@ -888,10 +888,10 @@ class IsolatorMain {
           this._datedHashForName.set(finalDatedDirId, hashDir);
         }
       }
-      return _path2().default.join(capsulesRootBaseDir, datedBaseDir, dateDir, hashDir);
+      return _path().default.join(capsulesRootBaseDir, datedBaseDir, dateDir, hashDir);
     }
     const dir = getCapsuleDirOptsWithDefaults.useHash ? (0, _objectHash().default)(getCapsuleDirOptsWithDefaults.baseDir).substring(0, CAPSULE_DIR_LENGTH) : getCapsuleDirOptsWithDefaults.baseDir;
-    return _path2().default.join(capsulesRootBaseDir, dir);
+    return _path().default.join(capsulesRootBaseDir, dir);
   }
   async deleteCapsules(rootDir) {
     const dirToDelete = rootDir || this.getRootDirOfAllCapsules();
@@ -903,7 +903,7 @@ class IsolatorMain {
     const capsules = await (0, _pMap().default)(components, component => {
       return _capsule().Capsule.createFromComponent(component, baseDir, opts);
     }, {
-      concurrency: (0, _concurrency().concurrentComponentsLimit)()
+      concurrency: (0, _harmonyModules().concurrentComponentsLimit)()
     });
     return capsules;
   }
@@ -921,7 +921,7 @@ class IsolatorMain {
   }
   async getCapsulesPreviousPackageJson(capsules) {
     return Promise.all(capsules.map(async capsule => {
-      const packageJsonPath = _path2().default.join(capsule.path, 'package.json');
+      const packageJsonPath = _path().default.join(capsule.path, 'package.json');
       let previousPackageJson = null;
       try {
         const previousPackageJsonRaw = await capsule.fs.promises.readFile(packageJsonPath, {
@@ -1021,7 +1021,7 @@ class IsolatorMain {
       return dependencies.reduce((acc, depId) => {
         if (Array.isArray(ignoreBitDependencies) && ignoreBitDependencies.searchWithoutVersion(depId)) return acc;
         const packageDependency = depId.version;
-        const packageName = (0, _componentIdToPackageName().default)(_objectSpread(_objectSpread({}, legacyComp), {}, {
+        const packageName = (0, _pkgModules().componentIdToPackageName)(_objectSpread(_objectSpread({}, legacyComp), {}, {
           id: depId,
           isDependency: true
         }));
@@ -1033,7 +1033,7 @@ class IsolatorMain {
     const bitDevDependencies = getBitDependencies(legacyComp.devDependencies.getAllIds());
     const bitExtensionDependencies = getBitDependencies(legacyComp.extensions.extensionsBitIds);
     const packageJson = _packageJsonFile().default.createFromComponent(bitDir, legacyComp);
-    const main = (0, _path().pathNormalizeToLinux)(legacyComp.mainFile);
+    const main = (0, _legacy().pathNormalizeToLinux)(legacyComp.mainFile);
     packageJson.addOrUpdateProperty('main', main);
     const addDependencies = packageJsonFile => {
       packageJsonFile.addDependencies(bitDependencies);