@teambit/dependency-resolver 1.0.576 → 1.0.578
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.
|
@@ -37,8 +37,9 @@ function updateDependencyVersion(dependency, rootPolicy, variantPolicy) {
|
|
|
37
37
|
if (dependency.getPackageName) {
|
|
38
38
|
const packageName = dependency.getPackageName();
|
|
39
39
|
const variantVersion = variantPolicy?.getDepVersion(packageName, dependency.lifecycle);
|
|
40
|
-
const
|
|
41
|
-
const
|
|
40
|
+
const specialChars = ['-', '+', '*'];
|
|
41
|
+
const variantVersionWithoutSpecialChar = variantVersion && !specialChars.includes(variantVersion) ? variantVersion : undefined;
|
|
42
|
+
const version = variantVersionWithoutSpecialChar || rootPolicy?.getValidSemverDepVersion(packageName, dependency.lifecycle === 'peer' ? 'peer' : 'runtime') || (0, _componentPackageVersion().snapToSemver)(dependency.version) || '0.0.1-new';
|
|
42
43
|
dependency.setVersion(version);
|
|
43
44
|
}
|
|
44
45
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_componentPackageVersion","data","require","updateDependencyVersion","dependency","rootPolicy","variantPolicy","getPackageName","packageName","variantVersion","getDepVersion","lifecycle","
|
|
1
|
+
{"version":3,"names":["_componentPackageVersion","data","require","updateDependencyVersion","dependency","rootPolicy","variantPolicy","getPackageName","packageName","variantVersion","getDepVersion","lifecycle","specialChars","variantVersionWithoutSpecialChar","includes","undefined","version","getValidSemverDepVersion","snapToSemver","setVersion"],"sources":["update-dependency-version.ts"],"sourcesContent":["import { snapToSemver } from '@teambit/component-package-version';\nimport { Dependency } from '../dependencies';\nimport { VariantPolicy, WorkspacePolicy } from '../policy';\n\n/**\n * This will create a function that will modify the version of the component dependencies before calling the package manager install\n * It's important for this use case:\n * between 2 bit components we are not allowing a range, only a specific version as dependency\n * therefor, when resolve a component dependency we take the version from the actual installed version in the file system\n * imagine the following case\n * I have in my policy my-dep:0.0.10\n * during installation it is installed (hoisted to the root)\n * now i'm changing it to be ^0.0.11\n * On the next bit install, when I will look at the component deps I'll see it with version 0.0.10 always (that's resolved from the FS)\n * so the version ^0.0.11 will be never installed.\n * For installation purpose we want a different resolve method, we want to take the version from the policies so we will install the correct one\n * this function will get the root deps / policy, and a function to merge the component policies (by the dep resolver extension).\n * it will then search for the dep version in the component policy, than in the workspace policy and take it from there\n * now in the described case, it will be change to ^0.0.11 and will be install correctly\n * then on the next calculation for tagging it will have the installed version\n *\n * @param {Component} component\n * @param {ManifestDependenciesObject} rootDependencies\n * @param {MergeDependenciesFunc} mergeDependenciesFunc\n * @returns {DepVersionModifierFunc}\n */\nexport function updateDependencyVersion(\n dependency: Dependency,\n rootPolicy?: WorkspacePolicy,\n variantPolicy?: VariantPolicy\n): void {\n if (dependency.getPackageName) {\n const packageName = dependency.getPackageName();\n const variantVersion = variantPolicy?.getDepVersion(packageName, dependency.lifecycle);\n const specialChars = ['-', '+', '*'];\n const variantVersionWithoutSpecialChar = variantVersion && !specialChars.includes(variantVersion)\n ? variantVersion\n : undefined;\n const version =\n variantVersionWithoutSpecialChar ||\n rootPolicy?.getValidSemverDepVersion(packageName, dependency.lifecycle === 'peer' ? 'peer' : 'runtime') ||\n snapToSemver(dependency.version) ||\n '0.0.1-new';\n\n dependency.setVersion(version);\n }\n}\n"],"mappings":";;;;;;AAAA,SAAAA,yBAAA;EAAA,MAAAC,IAAA,GAAAC,OAAA;EAAAF,wBAAA,YAAAA,CAAA;IAAA,OAAAC,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAIA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACO,SAASE,uBAAuBA,CACrCC,UAAsB,EACtBC,UAA4B,EAC5BC,aAA6B,EACvB;EACN,IAAIF,UAAU,CAACG,cAAc,EAAE;IAC7B,MAAMC,WAAW,GAAGJ,UAAU,CAACG,cAAc,CAAC,CAAC;IAC/C,MAAME,cAAc,GAAGH,aAAa,EAAEI,aAAa,CAACF,WAAW,EAAEJ,UAAU,CAACO,SAAS,CAAC;IACtF,MAAMC,YAAY,GAAG,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC;IACpC,MAAMC,gCAAgC,GAAGJ,cAAc,IAAI,CAACG,YAAY,CAACE,QAAQ,CAACL,cAAc,CAAC,GAC7FA,cAAc,GACdM,SAAS;IACb,MAAMC,OAAO,GACXH,gCAAgC,IAChCR,UAAU,EAAEY,wBAAwB,CAACT,WAAW,EAAEJ,UAAU,CAACO,SAAS,KAAK,MAAM,GAAG,MAAM,GAAG,SAAS,CAAC,IACvG,IAAAO,uCAAY,EAACd,UAAU,CAACY,OAAO,CAAC,IAChC,WAAW;IAEbZ,UAAU,CAACe,UAAU,CAACH,OAAO,CAAC;EAChC;AACF","ignoreList":[]}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import * as compositions_0 from '/home/circleci/Library/Caches/Bit/capsules/8891be5ad/teambit.dependencies_dependency-resolver@1.0.
|
|
2
|
-
import * as overview_0 from '/home/circleci/Library/Caches/Bit/capsules/8891be5ad/teambit.dependencies_dependency-resolver@1.0.
|
|
1
|
+
import * as compositions_0 from '/home/circleci/Library/Caches/Bit/capsules/8891be5ad/teambit.dependencies_dependency-resolver@1.0.578/dist/dependency-resolver.composition.js';
|
|
2
|
+
import * as overview_0 from '/home/circleci/Library/Caches/Bit/capsules/8891be5ad/teambit.dependencies_dependency-resolver@1.0.578/dist/dependency-resolver.docs.mdx';
|
|
3
3
|
|
|
4
4
|
export const compositions = [compositions_0];
|
|
5
5
|
export const overview = [overview_0];
|
|
@@ -32,9 +32,12 @@ export function updateDependencyVersion(
|
|
|
32
32
|
if (dependency.getPackageName) {
|
|
33
33
|
const packageName = dependency.getPackageName();
|
|
34
34
|
const variantVersion = variantPolicy?.getDepVersion(packageName, dependency.lifecycle);
|
|
35
|
-
const
|
|
35
|
+
const specialChars = ['-', '+', '*'];
|
|
36
|
+
const variantVersionWithoutSpecialChar = variantVersion && !specialChars.includes(variantVersion)
|
|
37
|
+
? variantVersion
|
|
38
|
+
: undefined;
|
|
36
39
|
const version =
|
|
37
|
-
|
|
40
|
+
variantVersionWithoutSpecialChar ||
|
|
38
41
|
rootPolicy?.getValidSemverDepVersion(packageName, dependency.lifecycle === 'peer' ? 'peer' : 'runtime') ||
|
|
39
42
|
snapToSemver(dependency.version) ||
|
|
40
43
|
'0.0.1-new';
|
package/package.json
CHANGED
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@teambit/dependency-resolver",
|
|
3
|
-
"version": "1.0.
|
|
3
|
+
"version": "1.0.578",
|
|
4
4
|
"homepage": "https://bit.cloud/teambit/dependencies/dependency-resolver",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"componentId": {
|
|
7
7
|
"scope": "teambit.dependencies",
|
|
8
8
|
"name": "dependency-resolver",
|
|
9
|
-
"version": "1.0.
|
|
9
|
+
"version": "1.0.578"
|
|
10
10
|
},
|
|
11
11
|
"dependencies": {
|
|
12
12
|
"chalk": "4.1.2",
|
|
@@ -34,26 +34,26 @@
|
|
|
34
34
|
"@teambit/legacy-bit-id": "1.1.2",
|
|
35
35
|
"@teambit/component-version": "1.0.4",
|
|
36
36
|
"@teambit/toolbox.object.sorter": "0.0.2",
|
|
37
|
-
"@teambit/component": "1.0.
|
|
38
|
-
"@teambit/envs": "1.0.
|
|
39
|
-
"@teambit/dependencies": "1.0.
|
|
40
|
-
"@teambit/aspect-loader": "1.0.
|
|
41
|
-
"@teambit/logger": "0.0.
|
|
42
|
-
"@teambit/objects": "0.0.
|
|
37
|
+
"@teambit/component": "1.0.578",
|
|
38
|
+
"@teambit/envs": "1.0.578",
|
|
39
|
+
"@teambit/dependencies": "1.0.578",
|
|
40
|
+
"@teambit/aspect-loader": "1.0.578",
|
|
41
|
+
"@teambit/logger": "0.0.1248",
|
|
42
|
+
"@teambit/objects": "0.0.85",
|
|
43
43
|
"@teambit/toolbox.path.path": "0.0.8",
|
|
44
44
|
"@teambit/pkg.modules.component-package-name": "0.0.51",
|
|
45
|
-
"@teambit/graphql": "1.0.
|
|
46
|
-
"@teambit/cli": "0.0.
|
|
45
|
+
"@teambit/graphql": "1.0.578",
|
|
46
|
+
"@teambit/cli": "0.0.1155",
|
|
47
47
|
"@teambit/component.sources": "0.0.96",
|
|
48
|
-
"@teambit/config-store": "0.0.
|
|
49
|
-
"@teambit/config": "0.0.
|
|
48
|
+
"@teambit/config-store": "0.0.35",
|
|
49
|
+
"@teambit/config": "0.0.1329",
|
|
50
50
|
"@teambit/harmony.modules.feature-toggle": "0.0.19",
|
|
51
51
|
"@teambit/harmony.modules.requireable-component": "0.0.502",
|
|
52
52
|
"@teambit/legacy.constants": "0.0.11",
|
|
53
53
|
"@teambit/legacy.consumer-component": "0.0.45",
|
|
54
54
|
"@teambit/legacy.extension-data": "0.0.46",
|
|
55
55
|
"@teambit/scope.network": "0.0.44",
|
|
56
|
-
"@teambit/snapping": "1.0.
|
|
56
|
+
"@teambit/snapping": "1.0.578",
|
|
57
57
|
"@teambit/workspace.modules.node-modules-linker": "0.0.272",
|
|
58
58
|
"@teambit/component-issues": "0.0.157",
|
|
59
59
|
"@teambit/component-package-version": "0.0.438",
|