@teambit/dependency-resolver 0.0.1168 → 1.0.0
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/apply-updates.js +2 -2
- package/dist/apply-updates.js.map +1 -1
- package/dist/dependencies/dependency-list-factory.js +2 -2
- package/dist/dependencies/dependency-list-factory.js.map +1 -1
- package/dist/dependency-resolver.main.runtime.d.ts +0 -4
- package/dist/dependency-resolver.main.runtime.js +22 -34
- package/dist/dependency-resolver.main.runtime.js.map +1 -1
- package/dist/index.d.ts +2 -2
- package/dist/index.js +2 -2
- package/dist/index.js.map +1 -1
- package/dist/manifest/deduping/hoist-dependencies.js +1 -1
- package/dist/manifest/deduping/hoist-dependencies.js.map +1 -1
- package/dist/manifest/deduping/index-by-dep-id.js +1 -1
- package/dist/manifest/deduping/index-by-dep-id.js.map +1 -1
- package/dist/{preview-1695093455493.js → preview-1695157474900.js} +2 -2
- package/package.json +23 -21
package/dist/apply-updates.js
CHANGED
|
@@ -49,7 +49,7 @@ function applyUpdates(outdatedPkgs, {
|
|
|
49
49
|
break;
|
|
50
50
|
case 'variants':
|
|
51
51
|
if (outdatedPkg.variantPattern) {
|
|
52
|
-
var _variantPoliciesByPat
|
|
52
|
+
var _variantPoliciesByPat;
|
|
53
53
|
const {
|
|
54
54
|
variantPattern,
|
|
55
55
|
targetField,
|
|
@@ -57,7 +57,7 @@ function applyUpdates(outdatedPkgs, {
|
|
|
57
57
|
} = outdatedPkg;
|
|
58
58
|
updatedVariants.add(outdatedPkg.variantPattern);
|
|
59
59
|
// eslint-disable-next-line dot-notation
|
|
60
|
-
if ((_variantPoliciesByPat = variantPoliciesByPatterns[variantPattern]) !== null && _variantPoliciesByPat !== void 0 && (
|
|
60
|
+
if ((_variantPoliciesByPat = variantPoliciesByPatterns[variantPattern]) !== null && _variantPoliciesByPat !== void 0 && (_variantPoliciesByPat = _variantPoliciesByPat[targetField]) !== null && _variantPoliciesByPat !== void 0 && (_variantPoliciesByPat = _variantPoliciesByPat[name]) !== null && _variantPoliciesByPat !== void 0 && _variantPoliciesByPat['version']) {
|
|
61
61
|
// eslint-disable-line
|
|
62
62
|
variantPoliciesByPatterns[variantPattern][targetField][name]['version'] = outdatedPkg.latestRange; // eslint-disable-line
|
|
63
63
|
} else {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["applyUpdates","outdatedPkgs","variantPoliciesByPatterns","updatedWorkspacePolicyEntries","updatedVariants","Set","updatedComponents","Map","outdatedPkg","_outdatedPkg$dependen","source","dependentComponents","length","isAuto","componentId","forEach","id","toString","has","set","config","policy","get","targetField","name","latestRange","push","dependencyId","value","version","lifecycleType","variantPattern","_variantPoliciesByPat","
|
|
1
|
+
{"version":3,"names":["applyUpdates","outdatedPkgs","variantPoliciesByPatterns","updatedWorkspacePolicyEntries","updatedVariants","Set","updatedComponents","Map","outdatedPkg","_outdatedPkg$dependen","source","dependentComponents","length","isAuto","componentId","forEach","id","toString","has","set","config","policy","get","targetField","name","latestRange","push","dependencyId","value","version","lifecycleType","variantPattern","_variantPoliciesByPat","add","Error","Array","from","values"],"sources":["apply-updates.ts"],"sourcesContent":["import { ComponentID } from '@teambit/component';\nimport { MergedOutdatedPkg } from './dependency-resolver.main.runtime';\nimport { VariantPolicyConfigObject, WorkspacePolicyEntry } from './policy';\n\nexport interface UpdatedComponent {\n componentId: ComponentID;\n config: Record<string, any>;\n}\n\n/**\n * Applies updates to policies.\n */\nexport function applyUpdates(\n outdatedPkgs: Array<Omit<MergedOutdatedPkg, 'currentRange'>>,\n {\n variantPoliciesByPatterns,\n }: {\n variantPoliciesByPatterns: Record<string, VariantPolicyConfigObject>;\n }\n): {\n updatedVariants: string[];\n updatedComponents: UpdatedComponent[];\n updatedWorkspacePolicyEntries: WorkspacePolicyEntry[];\n} {\n const updatedWorkspacePolicyEntries: WorkspacePolicyEntry[] = [];\n const updatedVariants = new Set<string>();\n const updatedComponents = new Map<string, UpdatedComponent>();\n\n for (const outdatedPkg of outdatedPkgs) {\n if (\n outdatedPkg.source === 'component' ||\n (outdatedPkg.source === 'rootPolicy' && outdatedPkg.dependentComponents?.length && !outdatedPkg.isAuto)\n ) {\n // eslint-disable-next-line\n (outdatedPkg.dependentComponents ?? [outdatedPkg.componentId!]).forEach((componentId) => {\n const id = componentId.toString();\n if (!updatedComponents.has(id)) {\n updatedComponents.set(id, { componentId, config: { policy: {} } });\n }\n const { config } = updatedComponents.get(id)!; // eslint-disable-line\n if (!config.policy[outdatedPkg.targetField]) {\n config.policy[outdatedPkg.targetField] = {};\n }\n config.policy[outdatedPkg.targetField][outdatedPkg.name] = outdatedPkg.latestRange;\n });\n } else {\n switch (outdatedPkg.source) {\n case 'rootPolicy':\n case 'component-model':\n updatedWorkspacePolicyEntries.push({\n dependencyId: outdatedPkg.name,\n value: {\n version: outdatedPkg.latestRange,\n },\n lifecycleType: outdatedPkg.targetField === 'peerDependencies' ? 'peer' : 'runtime',\n });\n break;\n case 'variants':\n if (outdatedPkg.variantPattern) {\n const { variantPattern, targetField, name } = outdatedPkg;\n updatedVariants.add(outdatedPkg.variantPattern);\n // eslint-disable-next-line dot-notation\n if (variantPoliciesByPatterns[variantPattern]?.[targetField]?.[name]?.['version']) {\n // eslint-disable-line\n variantPoliciesByPatterns[variantPattern][targetField]![name]['version'] = outdatedPkg.latestRange; // eslint-disable-line\n } else {\n variantPoliciesByPatterns[variantPattern][targetField]![name] = outdatedPkg.latestRange; // eslint-disable-line\n }\n }\n break;\n default:\n throw new Error(`Unsupported policy source for update: ${outdatedPkg.source}`);\n }\n }\n }\n return {\n updatedVariants: Array.from(updatedVariants),\n updatedComponents: Array.from(updatedComponents.values()),\n updatedWorkspacePolicyEntries,\n };\n}\n"],"mappings":";;;;;;AASA;AACA;AACA;AACO,SAASA,YAAYA,CAC1BC,YAA4D,EAC5D;EACEC;AAGF,CAAC,EAKD;EACA,MAAMC,6BAAqD,GAAG,EAAE;EAChE,MAAMC,eAAe,GAAG,IAAIC,GAAG,CAAS,CAAC;EACzC,MAAMC,iBAAiB,GAAG,IAAIC,GAAG,CAA2B,CAAC;EAE7D,KAAK,MAAMC,WAAW,IAAIP,YAAY,EAAE;IAAA,IAAAQ,qBAAA;IACtC,IACED,WAAW,CAACE,MAAM,KAAK,WAAW,IACjCF,WAAW,CAACE,MAAM,KAAK,YAAY,KAAAD,qBAAA,GAAID,WAAW,CAACG,mBAAmB,cAAAF,qBAAA,eAA/BA,qBAAA,CAAiCG,MAAM,IAAI,CAACJ,WAAW,CAACK,MAAO,EACvG;MACA;MACA,CAACL,WAAW,CAACG,mBAAmB,IAAI,CAACH,WAAW,CAACM,WAAW,CAAE,EAAEC,OAAO,CAAED,WAAW,IAAK;QACvF,MAAME,EAAE,GAAGF,WAAW,CAACG,QAAQ,CAAC,CAAC;QACjC,IAAI,CAACX,iBAAiB,CAACY,GAAG,CAACF,EAAE,CAAC,EAAE;UAC9BV,iBAAiB,CAACa,GAAG,CAACH,EAAE,EAAE;YAAEF,WAAW;YAAEM,MAAM,EAAE;cAAEC,MAAM,EAAE,CAAC;YAAE;UAAE,CAAC,CAAC;QACpE;QACA,MAAM;UAAED;QAAO,CAAC,GAAGd,iBAAiB,CAACgB,GAAG,CAACN,EAAE,CAAE,CAAC,CAAC;QAC/C,IAAI,CAACI,MAAM,CAACC,MAAM,CAACb,WAAW,CAACe,WAAW,CAAC,EAAE;UAC3CH,MAAM,CAACC,MAAM,CAACb,WAAW,CAACe,WAAW,CAAC,GAAG,CAAC,CAAC;QAC7C;QACAH,MAAM,CAACC,MAAM,CAACb,WAAW,CAACe,WAAW,CAAC,CAACf,WAAW,CAACgB,IAAI,CAAC,GAAGhB,WAAW,CAACiB,WAAW;MACpF,CAAC,CAAC;IACJ,CAAC,MAAM;MACL,QAAQjB,WAAW,CAACE,MAAM;QACxB,KAAK,YAAY;QACjB,KAAK,iBAAiB;UACpBP,6BAA6B,CAACuB,IAAI,CAAC;YACjCC,YAAY,EAAEnB,WAAW,CAACgB,IAAI;YAC9BI,KAAK,EAAE;cACLC,OAAO,EAAErB,WAAW,CAACiB;YACvB,CAAC;YACDK,aAAa,EAAEtB,WAAW,CAACe,WAAW,KAAK,kBAAkB,GAAG,MAAM,GAAG;UAC3E,CAAC,CAAC;UACF;QACF,KAAK,UAAU;UACb,IAAIf,WAAW,CAACuB,cAAc,EAAE;YAAA,IAAAC,qBAAA;YAC9B,MAAM;cAAED,cAAc;cAAER,WAAW;cAAEC;YAAK,CAAC,GAAGhB,WAAW;YACzDJ,eAAe,CAAC6B,GAAG,CAACzB,WAAW,CAACuB,cAAc,CAAC;YAC/C;YACA,KAAAC,qBAAA,GAAI9B,yBAAyB,CAAC6B,cAAc,CAAC,cAAAC,qBAAA,gBAAAA,qBAAA,GAAzCA,qBAAA,CAA4CT,WAAW,CAAC,cAAAS,qBAAA,gBAAAA,qBAAA,GAAxDA,qBAAA,CAA2DR,IAAI,CAAC,cAAAQ,qBAAA,eAAhEA,qBAAA,CAAmE,SAAS,CAAC,EAAE;cACjF;cACA9B,yBAAyB,CAAC6B,cAAc,CAAC,CAACR,WAAW,CAAC,CAAEC,IAAI,CAAC,CAAC,SAAS,CAAC,GAAGhB,WAAW,CAACiB,WAAW,CAAC,CAAC;YACtG,CAAC,MAAM;cACLvB,yBAAyB,CAAC6B,cAAc,CAAC,CAACR,WAAW,CAAC,CAAEC,IAAI,CAAC,GAAGhB,WAAW,CAACiB,WAAW,CAAC,CAAC;YAC3F;UACF;;UACA;QACF;UACE,MAAM,IAAIS,KAAK,CAAE,yCAAwC1B,WAAW,CAACE,MAAO,EAAC,CAAC;MAClF;IACF;EACF;EACA,OAAO;IACLN,eAAe,EAAE+B,KAAK,CAACC,IAAI,CAAChC,eAAe,CAAC;IAC5CE,iBAAiB,EAAE6B,KAAK,CAACC,IAAI,CAAC9B,iBAAiB,CAAC+B,MAAM,CAAC,CAAC,CAAC;IACzDlC;EACF,CAAC;AACH"}
|
|
@@ -80,10 +80,10 @@ class DependencyListFactory {
|
|
|
80
80
|
* @param legacyComponent
|
|
81
81
|
*/
|
|
82
82
|
async getMissingDependenciesByComponentFromModel(legacyComponent) {
|
|
83
|
-
var _legacyComponent$issu
|
|
83
|
+
var _legacyComponent$issu;
|
|
84
84
|
const missingPackages = (0, _lodash().flatten)(
|
|
85
85
|
// Use getIssueByName to prevent issues when getting different instances while using both bit from bvm and from the repo
|
|
86
|
-
Object.values(((_legacyComponent$issu = legacyComponent.issues) === null || _legacyComponent$issu === void 0
|
|
86
|
+
Object.values(((_legacyComponent$issu = legacyComponent.issues) === null || _legacyComponent$issu === void 0 || (_legacyComponent$issu = _legacyComponent$issu.getIssueByName('MissingPackagesDependenciesOnFs')) === null || _legacyComponent$issu === void 0 ? void 0 : _legacyComponent$issu.data) || {}));
|
|
87
87
|
const componentFromModel = legacyComponent.componentFromModel;
|
|
88
88
|
if (!missingPackages || !missingPackages.length || !componentFromModel) {
|
|
89
89
|
return _dependencyList().DependencyList.fromArray([]);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_pMapSeries","data","_interopRequireDefault","require","_lodash","_dependencyList","_exceptions","_dependencyResolver","obj","__esModule","default","DependencyListFactory","constructor","factories","fromSerializedDependencies","serializedDependencies","dependencies","mapSeries","serializedDependency","type","__type","factory","UnknownDepType","dependency","parse","DependencyList","fromLegacyComponent","legacyComponent","lists","Object","values","missingDepsFromModel","getMissingDependenciesByComponentFromModel","push","merge","_legacyComponent$issu","
|
|
1
|
+
{"version":3,"names":["_pMapSeries","data","_interopRequireDefault","require","_lodash","_dependencyList","_exceptions","_dependencyResolver","obj","__esModule","default","DependencyListFactory","constructor","factories","fromSerializedDependencies","serializedDependencies","dependencies","mapSeries","serializedDependency","type","__type","factory","UnknownDepType","dependency","parse","DependencyList","fromLegacyComponent","legacyComponent","lists","Object","values","missingDepsFromModel","getMissingDependenciesByComponentFromModel","push","merge","_legacyComponent$issu","missingPackages","flatten","issues","getIssueByName","componentFromModel","length","fromArray","depListFromModel","getDependenciesFromLegacyModelComponent","filteredDepList","filter","dep","_dep$getPackageName","packageName","getPackageName","call","includes","entry","extensions","findCoreExtension","DependencyResolverAspect","id","get","exports"],"sources":["dependency-list-factory.ts"],"sourcesContent":["import mapSeries from 'p-map-series';\nimport { get, flatten } from 'lodash';\nimport LegacyComponent from '@teambit/legacy/dist/consumer/component';\nimport { DependencyFactory } from './dependency-factory';\nimport { SerializedDependency } from './dependency';\nimport { DependencyList } from './dependency-list';\nimport { UnknownDepType } from './exceptions';\nimport { DependencyResolverAspect } from '../dependency-resolver.aspect';\n\nexport class DependencyListFactory {\n constructor(private factories: Record<string, DependencyFactory>) {}\n\n async fromSerializedDependencies(serializedDependencies: SerializedDependency[]): Promise<DependencyList> {\n const dependencies = await mapSeries(serializedDependencies, async (serializedDependency) => {\n const type = serializedDependency.__type;\n const factory = this.factories[type];\n if (!factory) {\n throw new UnknownDepType(type);\n }\n const dependency = await factory.parse(serializedDependency);\n return dependency;\n });\n return new DependencyList(dependencies);\n }\n\n async fromLegacyComponent(legacyComponent: LegacyComponent): Promise<DependencyList> {\n const lists = await mapSeries(Object.values(this.factories), async (factory) => {\n if (factory.fromLegacyComponent && typeof factory.fromLegacyComponent === 'function') {\n return factory.fromLegacyComponent(legacyComponent);\n }\n return new DependencyList([]);\n });\n\n // This is an important step, see comment for the function to better understand\n const missingDepsFromModel = await this.getMissingDependenciesByComponentFromModel(legacyComponent);\n lists.push(missingDepsFromModel);\n return DependencyList.merge(lists);\n }\n\n /**\n * Some time after importing component (for example), there are required dependencies which are not installed yet, they will consider as missing.\n * since the installer it self used the calculated deps for installing we need them to be listed as well.\n * what we do here, is to add deps from the model in case they considered as missing deps in the fs\n * we don't want just to add all of them since some of them might be removed by the user in the fs (in the source code).\n * by intersect the missing deps (deps which are still required in source code) with the deps from model we have a list of deps with all the required\n * data of them\n * @param legacyComponent\n */\n private async getMissingDependenciesByComponentFromModel(legacyComponent: LegacyComponent): Promise<DependencyList> {\n const missingPackages: string[] = flatten(\n // Use getIssueByName to prevent issues when getting different instances while using both bit from bvm and from the repo\n Object.values(legacyComponent.issues?.getIssueByName('MissingPackagesDependenciesOnFs')?.data || {})\n );\n const componentFromModel = legacyComponent.componentFromModel;\n if (!missingPackages || !missingPackages.length || !componentFromModel) {\n return DependencyList.fromArray([]);\n }\n // All deps defined in model\n const depListFromModel = await this.getDependenciesFromLegacyModelComponent(componentFromModel);\n // Only deps from model which are also required in the current component on fs (currently missing)\n const filteredDepList = depListFromModel.filter((dep) => {\n const packageName = dep.getPackageName?.();\n if (!packageName) {\n return false;\n }\n return missingPackages.includes(packageName);\n });\n return filteredDepList;\n }\n\n /**\n * Get dependencies based on the component from model attached to the legacy (consumer component)\n * @param legacyComponent\n */\n private async getDependenciesFromLegacyModelComponent(legacyComponent: LegacyComponent): Promise<DependencyList> {\n const entry = legacyComponent.extensions.findCoreExtension(DependencyResolverAspect.id);\n if (!entry) {\n return DependencyList.fromArray([]);\n }\n const serializedDependencies: SerializedDependency[] = get(entry, ['data', 'dependencies'], []);\n return this.fromSerializedDependencies(serializedDependencies);\n }\n}\n"],"mappings":";;;;;;AAAA,SAAAA,YAAA;EAAA,MAAAC,IAAA,GAAAC,sBAAA,CAAAC,OAAA;EAAAH,WAAA,YAAAA,CAAA;IAAA,OAAAC,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAG,QAAA;EAAA,MAAAH,IAAA,GAAAE,OAAA;EAAAC,OAAA,YAAAA,CAAA;IAAA,OAAAH,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAIA,SAAAI,gBAAA;EAAA,MAAAJ,IAAA,GAAAE,OAAA;EAAAE,eAAA,YAAAA,CAAA;IAAA,OAAAJ,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAK,YAAA;EAAA,MAAAL,IAAA,GAAAE,OAAA;EAAAG,WAAA,YAAAA,CAAA;IAAA,OAAAL,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAM,oBAAA;EAAA,MAAAN,IAAA,GAAAE,OAAA;EAAAI,mBAAA,YAAAA,CAAA;IAAA,OAAAN,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAAyE,SAAAC,uBAAAM,GAAA,WAAAA,GAAA,IAAAA,GAAA,CAAAC,UAAA,GAAAD,GAAA,KAAAE,OAAA,EAAAF,GAAA;AAElE,MAAMG,qBAAqB,CAAC;EACjCC,WAAWA,CAASC,SAA4C,EAAE;IAAA,KAA9CA,SAA4C,GAA5CA,SAA4C;EAAG;EAEnE,MAAMC,0BAA0BA,CAACC,sBAA8C,EAA2B;IACxG,MAAMC,YAAY,GAAG,MAAM,IAAAC,qBAAS,EAACF,sBAAsB,EAAE,MAAOG,oBAAoB,IAAK;MAC3F,MAAMC,IAAI,GAAGD,oBAAoB,CAACE,MAAM;MACxC,MAAMC,OAAO,GAAG,IAAI,CAACR,SAAS,CAACM,IAAI,CAAC;MACpC,IAAI,CAACE,OAAO,EAAE;QACZ,MAAM,KAAIC,4BAAc,EAACH,IAAI,CAAC;MAChC;MACA,MAAMI,UAAU,GAAG,MAAMF,OAAO,CAACG,KAAK,CAACN,oBAAoB,CAAC;MAC5D,OAAOK,UAAU;IACnB,CAAC,CAAC;IACF,OAAO,KAAIE,gCAAc,EAACT,YAAY,CAAC;EACzC;EAEA,MAAMU,mBAAmBA,CAACC,eAAgC,EAA2B;IACnF,MAAMC,KAAK,GAAG,MAAM,IAAAX,qBAAS,EAACY,MAAM,CAACC,MAAM,CAAC,IAAI,CAACjB,SAAS,CAAC,EAAE,MAAOQ,OAAO,IAAK;MAC9E,IAAIA,OAAO,CAACK,mBAAmB,IAAI,OAAOL,OAAO,CAACK,mBAAmB,KAAK,UAAU,EAAE;QACpF,OAAOL,OAAO,CAACK,mBAAmB,CAACC,eAAe,CAAC;MACrD;MACA,OAAO,KAAIF,gCAAc,EAAC,EAAE,CAAC;IAC/B,CAAC,CAAC;;IAEF;IACA,MAAMM,oBAAoB,GAAG,MAAM,IAAI,CAACC,0CAA0C,CAACL,eAAe,CAAC;IACnGC,KAAK,CAACK,IAAI,CAACF,oBAAoB,CAAC;IAChC,OAAON,gCAAc,CAACS,KAAK,CAACN,KAAK,CAAC;EACpC;;EAEA;AACF;AACA;AACA;AACA;AACA;AACA;AACA;AACA;EACE,MAAcI,0CAA0CA,CAACL,eAAgC,EAA2B;IAAA,IAAAQ,qBAAA;IAClH,MAAMC,eAAyB,GAAG,IAAAC,iBAAO;IACvC;IACAR,MAAM,CAACC,MAAM,CAAC,EAAAK,qBAAA,GAAAR,eAAe,CAACW,MAAM,cAAAH,qBAAA,gBAAAA,qBAAA,GAAtBA,qBAAA,CAAwBI,cAAc,CAAC,iCAAiC,CAAC,cAAAJ,qBAAA,uBAAzEA,qBAAA,CAA2ElC,IAAI,KAAI,CAAC,CAAC,CACrG,CAAC;IACD,MAAMuC,kBAAkB,GAAGb,eAAe,CAACa,kBAAkB;IAC7D,IAAI,CAACJ,eAAe,IAAI,CAACA,eAAe,CAACK,MAAM,IAAI,CAACD,kBAAkB,EAAE;MACtE,OAAOf,gCAAc,CAACiB,SAAS,CAAC,EAAE,CAAC;IACrC;IACA;IACA,MAAMC,gBAAgB,GAAG,MAAM,IAAI,CAACC,uCAAuC,CAACJ,kBAAkB,CAAC;IAC/F;IACA,MAAMK,eAAe,GAAGF,gBAAgB,CAACG,MAAM,CAAEC,GAAG,IAAK;MAAA,IAAAC,mBAAA;MACvD,MAAMC,WAAW,IAAAD,mBAAA,GAAGD,GAAG,CAACG,cAAc,cAAAF,mBAAA,uBAAlBA,mBAAA,CAAAG,IAAA,CAAAJ,GAAqB,CAAC;MAC1C,IAAI,CAACE,WAAW,EAAE;QAChB,OAAO,KAAK;MACd;MACA,OAAOb,eAAe,CAACgB,QAAQ,CAACH,WAAW,CAAC;IAC9C,CAAC,CAAC;IACF,OAAOJ,eAAe;EACxB;;EAEA;AACF;AACA;AACA;EACE,MAAcD,uCAAuCA,CAACjB,eAAgC,EAA2B;IAC/G,MAAM0B,KAAK,GAAG1B,eAAe,CAAC2B,UAAU,CAACC,iBAAiB,CAACC,8CAAwB,CAACC,EAAE,CAAC;IACvF,IAAI,CAACJ,KAAK,EAAE;MACV,OAAO5B,gCAAc,CAACiB,SAAS,CAAC,EAAE,CAAC;IACrC;IACA,MAAM3B,sBAA8C,GAAG,IAAA2C,aAAG,EAACL,KAAK,EAAE,CAAC,MAAM,EAAE,cAAc,CAAC,EAAE,EAAE,CAAC;IAC/F,OAAO,IAAI,CAACvC,0BAA0B,CAACC,sBAAsB,CAAC;EAChE;AACF;AAAC4C,OAAA,CAAAhD,qBAAA,GAAAA,qBAAA"}
|
|
@@ -29,10 +29,6 @@ import { PackageImportMethod, PackageManager, PackageManagerGetPeerDependencyIss
|
|
|
29
29
|
import { SerializedDependency, DependencyFactory, DependencyList, ComponentDependency } from './dependencies';
|
|
30
30
|
import { DependencyDetector } from './dependency-detector';
|
|
31
31
|
import { EnvPolicy } from './policy/env-policy';
|
|
32
|
-
/**
|
|
33
|
-
* @deprecated use BIT_CLOUD_REGISTRY instead
|
|
34
|
-
*/
|
|
35
|
-
export declare const BIT_DEV_REGISTRY = "https://node.bit.dev/";
|
|
36
32
|
export declare const BIT_CLOUD_REGISTRY: string;
|
|
37
33
|
export declare const NPM_REGISTRY = "https://registry.npmjs.org/";
|
|
38
34
|
export { ProxyConfig, NetworkConfig } from '@teambit/legacy/dist/scope/network/http';
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
Object.defineProperty(exports, "__esModule", {
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
|
-
exports.NPM_REGISTRY = exports.DependencyResolverMain = exports.
|
|
6
|
+
exports.NPM_REGISTRY = exports.DependencyResolverMain = exports.BIT_CLOUD_REGISTRY = void 0;
|
|
7
7
|
Object.defineProperty(exports, "NetworkConfig", {
|
|
8
8
|
enumerable: true,
|
|
9
9
|
get: function () {
|
|
@@ -311,12 +311,7 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
|
|
|
311
311
|
function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
|
|
312
312
|
function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
|
|
313
313
|
function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); } // TODO: it's weird we take it from here.. think about it../workspace/utils
|
|
314
|
-
|
|
315
|
-
* @deprecated use BIT_CLOUD_REGISTRY instead
|
|
316
|
-
*/
|
|
317
|
-
const BIT_DEV_REGISTRY = 'https://node.bit.dev/';
|
|
318
|
-
exports.BIT_DEV_REGISTRY = BIT_DEV_REGISTRY;
|
|
319
|
-
const BIT_CLOUD_REGISTRY = `https://node.${(0, _constants().getCloudDomain)()}/`;
|
|
314
|
+
const BIT_CLOUD_REGISTRY = `https://node-registry.${(0, _constants().getCloudDomain)()}/`;
|
|
320
315
|
exports.BIT_CLOUD_REGISTRY = BIT_CLOUD_REGISTRY;
|
|
321
316
|
const NPM_REGISTRY = 'https://registry.npmjs.org/';
|
|
322
317
|
exports.NPM_REGISTRY = NPM_REGISTRY;
|
|
@@ -382,7 +377,7 @@ class DependencyResolverMain {
|
|
|
382
377
|
supportsDedupingOnExistingRoot() {
|
|
383
378
|
var _packageManager$suppo;
|
|
384
379
|
const packageManager = this.getPackageManager();
|
|
385
|
-
return (packageManager === null || packageManager === void 0
|
|
380
|
+
return (packageManager === null || packageManager === void 0 || (_packageManager$suppo = packageManager.supportsDedupingOnExistingRoot) === null || _packageManager$suppo === void 0 ? void 0 : _packageManager$suppo.call(packageManager)) === true && !this.isolatedCapsules();
|
|
386
381
|
}
|
|
387
382
|
hasRootComponents() {
|
|
388
383
|
return Boolean(this.config.rootComponents);
|
|
@@ -496,7 +491,7 @@ class DependencyResolverMain {
|
|
|
496
491
|
if (!entry) {
|
|
497
492
|
return _dependencies().DependencyList.fromArray([]);
|
|
498
493
|
}
|
|
499
|
-
const serializedDependencies = (entry === null || entry === void 0
|
|
494
|
+
const serializedDependencies = (entry === null || entry === void 0 || (_entry$data = entry.data) === null || _entry$data === void 0 ? void 0 : _entry$data.dependencies) || [];
|
|
500
495
|
const depList = await this.getDependenciesFromSerializedDependencies(serializedDependencies);
|
|
501
496
|
if (includeHidden) return depList;
|
|
502
497
|
return depList.filterHidden();
|
|
@@ -833,16 +828,15 @@ class DependencyResolverMain {
|
|
|
833
828
|
if (!systemPm.getRegistries) throw new Error('system package manager must implement `getRegistries()`');
|
|
834
829
|
registries = await systemPm.getRegistries();
|
|
835
830
|
}
|
|
836
|
-
const bitScope = registries.scopes.bit;
|
|
837
831
|
const getDefaultBitRegistry = () => {
|
|
838
832
|
const bitGlobalConfigRegistry = this.globalConfig.getSync(_constants().CFG_REGISTRY_URL_KEY);
|
|
839
|
-
const bitRegistry = bitGlobalConfigRegistry ||
|
|
833
|
+
const bitRegistry = bitGlobalConfigRegistry || BIT_CLOUD_REGISTRY;
|
|
840
834
|
const {
|
|
841
835
|
bitOriginalAuthType,
|
|
842
836
|
bitAuthHeaderValue,
|
|
843
837
|
bitOriginalAuthValue
|
|
844
|
-
} = this.getBitAuthConfig(
|
|
845
|
-
const alwaysAuth = bitAuthHeaderValue
|
|
838
|
+
} = this.getBitAuthConfig();
|
|
839
|
+
const alwaysAuth = !!bitAuthHeaderValue;
|
|
846
840
|
const bitDefaultRegistry = new (_registry().Registry)(bitRegistry, alwaysAuth, bitAuthHeaderValue, bitOriginalAuthType, bitOriginalAuthValue);
|
|
847
841
|
return bitDefaultRegistry;
|
|
848
842
|
};
|
|
@@ -858,27 +852,23 @@ class DependencyResolverMain {
|
|
|
858
852
|
// then in the registry server it should be use it when proxies
|
|
859
853
|
registries = registries.setDefaultRegistry(bitDefaultRegistry);
|
|
860
854
|
}
|
|
861
|
-
|
|
862
|
-
if (!bitScope || bitScope && !bitScope.alwaysAuth) {
|
|
863
|
-
registries = registries.updateScopedRegistry('bit', bitDefaultRegistry);
|
|
864
|
-
}
|
|
865
|
-
registries = this.addAuthToScopedBitRegistries(registries, bitScope);
|
|
855
|
+
registries = this.addAuthToScopedBitRegistries(registries);
|
|
866
856
|
return registries;
|
|
867
857
|
}
|
|
868
858
|
|
|
869
859
|
/**
|
|
870
860
|
* This will mutate any registry which point to BIT_DEV_REGISTRY to have the auth config from the @bit scoped registry or from the user.token in bit's config
|
|
871
861
|
*/
|
|
872
|
-
addAuthToScopedBitRegistries(registries
|
|
862
|
+
addAuthToScopedBitRegistries(registries) {
|
|
873
863
|
const {
|
|
874
864
|
bitOriginalAuthType,
|
|
875
865
|
bitAuthHeaderValue,
|
|
876
866
|
bitOriginalAuthValue
|
|
877
|
-
} = this.getBitAuthConfig(
|
|
867
|
+
} = this.getBitAuthConfig();
|
|
878
868
|
const alwaysAuth = bitAuthHeaderValue !== undefined;
|
|
879
869
|
let updatedRegistries = registries;
|
|
880
870
|
Object.entries(registries.scopes).map(([name, registry]) => {
|
|
881
|
-
if (!registry.authHeaderValue &&
|
|
871
|
+
if (!registry.authHeaderValue && BIT_CLOUD_REGISTRY.includes(registry.uri)) {
|
|
882
872
|
const registryWithAuth = new (_registry().Registry)(registry.uri, alwaysAuth, bitAuthHeaderValue, bitOriginalAuthType, bitOriginalAuthValue);
|
|
883
873
|
updatedRegistries = updatedRegistries.updateScopedRegistry(name, registryWithAuth);
|
|
884
874
|
}
|
|
@@ -886,23 +876,21 @@ class DependencyResolverMain {
|
|
|
886
876
|
});
|
|
887
877
|
return updatedRegistries;
|
|
888
878
|
}
|
|
889
|
-
getBitAuthConfig(
|
|
879
|
+
getBitAuthConfig() {
|
|
890
880
|
const bitGlobalConfigToken = this.globalConfig.getSync(_constants().CFG_USER_TOKEN_KEY);
|
|
891
|
-
|
|
892
|
-
|
|
893
|
-
|
|
881
|
+
const res = {
|
|
882
|
+
bitOriginalAuthType: '',
|
|
883
|
+
bitAuthHeaderValue: '',
|
|
884
|
+
bitOriginalAuthValue: ''
|
|
885
|
+
};
|
|
894
886
|
|
|
895
887
|
// In case there is no auth configuration in the npmrc, but there is token in bit config, take it from the config
|
|
896
|
-
if (
|
|
897
|
-
bitOriginalAuthType = 'authToken';
|
|
898
|
-
bitAuthHeaderValue = `Bearer ${bitGlobalConfigToken}`;
|
|
899
|
-
bitOriginalAuthValue = bitGlobalConfigToken;
|
|
888
|
+
if (bitGlobalConfigToken) {
|
|
889
|
+
res.bitOriginalAuthType = 'authToken';
|
|
890
|
+
res.bitAuthHeaderValue = `Bearer ${bitGlobalConfigToken}`;
|
|
891
|
+
res.bitOriginalAuthValue = bitGlobalConfigToken;
|
|
900
892
|
}
|
|
901
|
-
return
|
|
902
|
-
bitOriginalAuthType,
|
|
903
|
-
bitAuthHeaderValue,
|
|
904
|
-
bitOriginalAuthValue
|
|
905
|
-
};
|
|
893
|
+
return res;
|
|
906
894
|
}
|
|
907
895
|
get packageManagerName() {
|
|
908
896
|
return this.config.packageManager;
|