@teambit/merge-lanes 1.0.515 → 1.0.516

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.
Files changed (4) hide show
  1. package/artifacts/__bit_junit.xml +1 -1
  2. package/artifacts/schema.json +4 -4
  3. package/package.json +27 -27
  4. /package/dist/{preview-1736934050040.js → preview-1736997622391.js} +0 -0
package/artifacts/__bit_junit.xml CHANGED
@@ -1,6 +1,6 @@
1
1
  <?xml version="1.0" encoding="UTF-8"?>
2
2
  <testsuites tests="1" failures="0" errors="0" skipped="0">
3
- <testsuite name="teambit.lanes/merge-lanes@1.0.515" tests="1" failures="0" errors="0" skipped="0">
3
+ <testsuite name="teambit.lanes/merge-lanes@1.0.516" tests="1" failures="0" errors="0" skipped="0">
4
4
  <testcase classname="dist/merge-lane.spec.js" name="should merge successfully the specified pattern only" time="0.001"/>
5
5
  </testsuite>
6
6
  </testsuites>
package/artifacts/schema.json CHANGED
@@ -1260,7 +1260,7 @@
1260
1260
  "line": 41,
1261
1261
  "character": 3
1262
1262
  },
1263
- "signature": "(property) mergeStrategy: \"theirs\" | \"ours\" | \"manual\"",
1263
+ "signature": "(property) mergeStrategy: \"manual\" | \"theirs\" | \"ours\"",
1264
1264
  "name": "mergeStrategy",
1265
1265
  "type": {
1266
1266
  "__schema": "TypeRefSchema",
@@ -1564,7 +1564,7 @@
1564
1564
  "line": 56,
1565
1565
  "character": 3
1566
1566
  },
1567
- "signature": "(property) resolveUnrelated?: \"theirs\" | \"ours\" | \"manual\" | undefined",
1567
+ "signature": "(property) resolveUnrelated?: \"manual\" | \"theirs\" | \"ours\" | undefined",
1568
1568
  "name": "resolveUnrelated",
1569
1569
  "type": {
1570
1570
  "__schema": "TypeRefSchema",
@@ -3836,7 +3836,7 @@
3836
3836
  "componentId": {
3837
3837
  "scope": "teambit.component",
3838
3838
  "name": "snap-distance",
3839
- "version": "0.0.21"
3839
+ "version": "0.0.22"
3840
3840
  }
3841
3841
  },
3842
3842
  "isOptional": false,
@@ -4073,7 +4073,7 @@
4073
4073
  "componentId": {
4074
4074
  "scope": "teambit.lanes",
4075
4075
  "name": "merge-lanes",
4076
- "version": "1.0.515"
4076
+ "version": "1.0.516"
4077
4077
  },
4078
4078
  "taggedModuleExports": []
4079
4079
  }
package/package.json CHANGED
@@ -1,12 +1,12 @@
1
1
  {
2
2
  "name": "@teambit/merge-lanes",
3
- "version": "1.0.515",
3
+ "version": "1.0.516",
4
4
  "homepage": "https://bit.cloud/teambit/lanes/merge-lanes",
5
5
  "main": "dist/index.js",
6
6
  "componentId": {
7
7
  "scope": "teambit.lanes",
8
8
  "name": "merge-lanes",
9
- "version": "1.0.515"
9
+ "version": "1.0.516"
10
10
  },
11
11
  "dependencies": {
12
12
  "chalk": "2.4.2",
@@ -19,38 +19,38 @@
19
19
  "@teambit/lane-id": "0.0.312",
20
20
  "@teambit/harmony": "0.4.6",
21
21
  "@teambit/component-id": "1.2.2",
22
- "@teambit/legacy.bit-map": "0.0.77",
23
- "@teambit/legacy.cli.prompts": "0.0.11",
24
- "@teambit/legacy.consumer": "0.0.20",
25
- "@teambit/legacy.scope": "0.0.20",
26
- "@teambit/logger": "0.0.1185",
27
- "@teambit/objects": "0.0.22",
28
- "@teambit/scope": "1.0.515",
29
- "@teambit/checkout": "1.0.515",
30
- "@teambit/cli": "0.0.1092",
22
+ "@teambit/legacy.bit-map": "0.0.78",
23
+ "@teambit/legacy.cli.prompts": "0.0.12",
24
+ "@teambit/legacy.consumer": "0.0.21",
25
+ "@teambit/legacy.scope": "0.0.21",
26
+ "@teambit/logger": "0.0.1186",
27
+ "@teambit/objects": "0.0.23",
28
+ "@teambit/scope": "1.0.516",
29
+ "@teambit/checkout": "1.0.516",
30
+ "@teambit/cli": "0.0.1093",
31
31
  "@teambit/legacy.utils": "0.0.14",
32
- "@teambit/global-config": "0.0.1095",
33
- "@teambit/legacy.constants": "0.0.6",
34
- "@teambit/merging": "1.0.515",
35
- "@teambit/remove": "1.0.515",
36
- "@teambit/component.snap-distance": "0.0.21",
37
- "@teambit/config-merger": "0.0.382",
38
- "@teambit/export": "1.0.515",
39
- "@teambit/harmony.modules.feature-toggle": "0.0.14",
40
- "@teambit/harmony.modules.get-basic-log": "0.0.21",
41
- "@teambit/importer": "1.0.515",
42
- "@teambit/lanes": "1.0.515",
43
- "@teambit/workspace": "1.0.515"
32
+ "@teambit/global-config": "0.0.1096",
33
+ "@teambit/legacy.constants": "0.0.7",
34
+ "@teambit/merging": "1.0.516",
35
+ "@teambit/remove": "1.0.516",
36
+ "@teambit/component.snap-distance": "0.0.22",
37
+ "@teambit/config-merger": "0.0.383",
38
+ "@teambit/export": "1.0.516",
39
+ "@teambit/harmony.modules.feature-toggle": "0.0.15",
40
+ "@teambit/harmony.modules.get-basic-log": "0.0.22",
41
+ "@teambit/importer": "1.0.516",
42
+ "@teambit/lanes": "1.0.516",
43
+ "@teambit/workspace": "1.0.516"
44
44
  },
45
45
  "devDependencies": {
46
46
  "@types/fs-extra": "9.0.7",
47
47
  "@types/lodash": "4.14.165",
48
48
  "@types/mocha": "9.1.0",
49
49
  "@teambit/harmony.envs.core-aspect-env": "0.0.68",
50
- "@teambit/component.testing.mock-components": "0.0.280",
51
- "@teambit/harmony.testing.load-aspect": "0.0.275",
52
- "@teambit/snapping": "1.0.515",
53
- "@teambit/workspace.testing.mock-workspace": "0.0.47"
50
+ "@teambit/component.testing.mock-components": "0.0.281",
51
+ "@teambit/harmony.testing.load-aspect": "0.0.276",
52
+ "@teambit/snapping": "1.0.516",
53
+ "@teambit/workspace.testing.mock-workspace": "0.0.48"
54
54
  },
55
55
  "peerDependencies": {
56
56
  "chai": "4.3.0",