@teambit/dependency-resolver 0.0.1035 → 0.0.1037
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/dependency-installer.d.ts +5 -1
- package/dist/dependency-installer.js +25 -8
- package/dist/dependency-installer.js.map +1 -1
- package/dist/dependency-linker.d.ts +8 -1
- package/dist/dependency-linker.js +11 -3
- package/dist/dependency-linker.js.map +1 -1
- package/dist/dependency-resolver.main.runtime.d.ts +10 -3
- package/dist/dependency-resolver.main.runtime.js +27 -13
- package/dist/dependency-resolver.main.runtime.js.map +1 -1
- package/dist/package-manager.d.ts +5 -0
- package/dist/package-manager.js.map +1 -1
- package/dist/{preview-1681356521665.js → preview-1681875190881.js} +2 -2
- package/package-tar/teambit-dependency-resolver-0.0.1037.tgz +0 -0
- package/package.json +17 -17
- package/package-tar/teambit-dependency-resolver-0.0.1035.tgz +0 -0
|
@@ -387,7 +387,7 @@ class DependencyResolverMain {
|
|
|
387
387
|
*/
|
|
388
388
|
supportsDedupingOnExistingRoot() {
|
|
389
389
|
var _packageManager$suppo;
|
|
390
|
-
const packageManager = this.
|
|
390
|
+
const packageManager = this.getPackageManager();
|
|
391
391
|
return (packageManager === null || packageManager === void 0 ? void 0 : (_packageManager$suppo = packageManager.supportsDedupingOnExistingRoot) === null || _packageManager$suppo === void 0 ? void 0 : _packageManager$suppo.call(packageManager)) === true && !this.hasRootComponents();
|
|
392
392
|
}
|
|
393
393
|
hasRootComponents() {
|
|
@@ -561,12 +561,17 @@ class DependencyResolverMain {
|
|
|
561
561
|
* @returns {WorkspaceManifest}
|
|
562
562
|
* @memberof DependencyResolverMain
|
|
563
563
|
*/
|
|
564
|
-
async getWorkspaceManifest(name = _constants2().ROOT_NAME, version = new (_semver().SemVer)('1.0.0'), rootPolicy, rootDir, components, options = defaultCreateFromComponentsOptions) {
|
|
565
|
-
|
|
564
|
+
async getWorkspaceManifest(name = _constants2().ROOT_NAME, version = new (_semver().SemVer)('1.0.0'), rootPolicy, rootDir, components, options = defaultCreateFromComponentsOptions, context = {}) {
|
|
565
|
+
const statusMessage = context !== null && context !== void 0 && context.inCapsule ? `(capsule) deduping dependencies for installation in root dir ${rootDir}` : 'deduping dependencies for installation';
|
|
566
|
+
if (!(context !== null && context !== void 0 && context.inCapsule)) {
|
|
567
|
+
this.logger.setStatusLine(statusMessage);
|
|
568
|
+
}
|
|
566
569
|
const concreteOpts = _objectSpread(_objectSpread({}, defaultCreateFromComponentsOptions), options);
|
|
567
570
|
const workspaceManifestFactory = new (_manifest().WorkspaceManifestFactory)(this, this.aspectLoader);
|
|
568
571
|
const res = await workspaceManifestFactory.createFromComponents(name, version, rootPolicy, rootDir, components, concreteOpts);
|
|
569
|
-
|
|
572
|
+
if (!(context !== null && context !== void 0 && context.inCapsule)) {
|
|
573
|
+
this.logger.consoleSuccess();
|
|
574
|
+
}
|
|
570
575
|
return res;
|
|
571
576
|
}
|
|
572
577
|
|
|
@@ -626,7 +631,7 @@ class DependencyResolverMain {
|
|
|
626
631
|
const preInstallSubscribers = this.getPreInstallSubscribers();
|
|
627
632
|
const postInstallSubscribers = this.getPostInstallSubscribers();
|
|
628
633
|
// TODO: we should somehow pass the cache root dir to the package manager constructor
|
|
629
|
-
return new (_dependencyInstaller().DependencyInstaller)(packageManager, this.aspectLoader, this.logger, this, options.rootDir, cacheRootDir, preInstallSubscribers, postInstallSubscribers, this.config.nodeLinker, this.config.packageImportMethod, this.config.sideEffectsCache, this.config.nodeVersion, this.config.engineStrict, this.config.peerDependencyRules);
|
|
634
|
+
return new (_dependencyInstaller().DependencyInstaller)(packageManager, this.aspectLoader, this.logger, this, options.rootDir, cacheRootDir, preInstallSubscribers, postInstallSubscribers, this.config.nodeLinker, this.config.packageImportMethod, this.config.sideEffectsCache, this.config.nodeVersion, this.config.engineStrict, this.config.peerDependencyRules, options.installingContext);
|
|
630
635
|
}
|
|
631
636
|
getPreInstallSubscribers() {
|
|
632
637
|
return this.preInstallSlot.values().flat();
|
|
@@ -641,13 +646,22 @@ class DependencyResolverMain {
|
|
|
641
646
|
getLinker(options = {}) {
|
|
642
647
|
const linkingOptions = Object.assign({}, defaultLinkingOptions, (options === null || options === void 0 ? void 0 : options.linkingOptions) || {});
|
|
643
648
|
// TODO: we should somehow pass the cache root dir to the package manager constructor
|
|
644
|
-
return new (_dependencyLinker().DependencyLinker)(this, this.aspectLoader, this.componentAspect, this.envs, this.logger, options.rootDir, linkingOptions);
|
|
649
|
+
return new (_dependencyLinker().DependencyLinker)(this, this.aspectLoader, this.componentAspect, this.envs, this.logger, options.rootDir, linkingOptions, options.linkingContext);
|
|
650
|
+
}
|
|
651
|
+
|
|
652
|
+
/**
|
|
653
|
+
* This function returns the package manager if it exists, otherwise it returns undefined.
|
|
654
|
+
* @returns The `getPackageManager()` function returns a `PackageManager` object or `undefined`.
|
|
655
|
+
*/
|
|
656
|
+
getPackageManager() {
|
|
657
|
+
const packageManager = this.packageManagerSlot.get(this.config.packageManager);
|
|
658
|
+
return packageManager;
|
|
645
659
|
}
|
|
646
660
|
getPackageManagerName() {
|
|
647
661
|
return this.config.packageManager;
|
|
648
662
|
}
|
|
649
663
|
async getVersionResolver(options = {}) {
|
|
650
|
-
const packageManager = this.
|
|
664
|
+
const packageManager = this.getPackageManager();
|
|
651
665
|
const cacheRootDir = options.cacheRootDirectory || this.globalConfig.getSync(_constants().CFG_PACKAGE_MANAGER_CACHE);
|
|
652
666
|
if (!packageManager) {
|
|
653
667
|
throw new (_exceptions().PackageManagerNotFound)(this.config.packageManager);
|
|
@@ -739,7 +753,7 @@ class DependencyResolverMain {
|
|
|
739
753
|
return config;
|
|
740
754
|
}
|
|
741
755
|
async getNetworkConfigFromPackageManager() {
|
|
742
|
-
const packageManager = this.
|
|
756
|
+
const packageManager = this.getPackageManager();
|
|
743
757
|
let networkConfigFromPackageManager = {};
|
|
744
758
|
if (typeof (packageManager === null || packageManager === void 0 ? void 0 : packageManager.getNetworkConfig) === 'function') {
|
|
745
759
|
networkConfigFromPackageManager = await (packageManager === null || packageManager === void 0 ? void 0 : packageManager.getNetworkConfig());
|
|
@@ -751,7 +765,7 @@ class DependencyResolverMain {
|
|
|
751
765
|
return networkConfigFromPackageManager;
|
|
752
766
|
}
|
|
753
767
|
async getProxyConfigFromPackageManager() {
|
|
754
|
-
const packageManager = this.
|
|
768
|
+
const packageManager = this.getPackageManager();
|
|
755
769
|
let proxyConfigFromPackageManager = {};
|
|
756
770
|
if (packageManager !== null && packageManager !== void 0 && packageManager.getProxyConfig && typeof (packageManager === null || packageManager === void 0 ? void 0 : packageManager.getProxyConfig) === 'function') {
|
|
757
771
|
proxyConfigFromPackageManager = await (packageManager === null || packageManager === void 0 ? void 0 : packageManager.getProxyConfig());
|
|
@@ -773,7 +787,7 @@ class DependencyResolverMain {
|
|
|
773
787
|
async getMissingPeerDependencies(rootDir, rootPolicy, componentDirectoryMap, options) {
|
|
774
788
|
var _peerDependencyIssues;
|
|
775
789
|
this.logger.setStatusLine('finding missing peer dependencies');
|
|
776
|
-
const packageManager = this.
|
|
790
|
+
const packageManager = this.getPackageManager();
|
|
777
791
|
let peerDependencyIssues;
|
|
778
792
|
const installer = this.getInstaller();
|
|
779
793
|
const manifests = await installer.getComponentManifests(_objectSpread(_objectSpread({}, options), {}, {
|
|
@@ -793,7 +807,7 @@ class DependencyResolverMain {
|
|
|
793
807
|
}
|
|
794
808
|
async getRegistries() {
|
|
795
809
|
var _this$config$installF;
|
|
796
|
-
const packageManager = this.
|
|
810
|
+
const packageManager = this.getPackageManager();
|
|
797
811
|
let registries;
|
|
798
812
|
if (packageManager !== null && packageManager !== void 0 && packageManager.getRegistries && typeof (packageManager === null || packageManager === void 0 ? void 0 : packageManager.getRegistries) === 'function') {
|
|
799
813
|
registries = await (packageManager === null || packageManager === void 0 ? void 0 : packageManager.getRegistries());
|
|
@@ -1299,14 +1313,14 @@ class DependencyResolverMain {
|
|
|
1299
1313
|
* @param packageName - The injected component's packageName
|
|
1300
1314
|
*/
|
|
1301
1315
|
async getInjectedDirs(rootDir, componentDir, packageName) {
|
|
1302
|
-
const packageManager = this.
|
|
1316
|
+
const packageManager = this.getPackageManager();
|
|
1303
1317
|
if (typeof (packageManager === null || packageManager === void 0 ? void 0 : packageManager.getInjectedDirs) === 'function') {
|
|
1304
1318
|
return packageManager.getInjectedDirs(rootDir, componentDir, packageName);
|
|
1305
1319
|
}
|
|
1306
1320
|
return [];
|
|
1307
1321
|
}
|
|
1308
1322
|
getWorkspaceDepsOfBitRoots(manifests) {
|
|
1309
|
-
const packageManager = this.
|
|
1323
|
+
const packageManager = this.getPackageManager();
|
|
1310
1324
|
if (!packageManager) {
|
|
1311
1325
|
throw new (_exceptions().PackageManagerNotFound)(this.config.packageManager);
|
|
1312
1326
|
}
|