@teambit/merge-lanes 1.0.540 → 1.0.542
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.
|
@@ -22,7 +22,7 @@ class LanesCheckConflictsRoute {
|
|
|
22
22
|
this.logger = logger;
|
|
23
23
|
_defineProperty(this, "method", 'post');
|
|
24
24
|
_defineProperty(this, "route", '/lanes/check-conflicts');
|
|
25
|
-
_defineProperty(this, "verb", _express().Verb.
|
|
25
|
+
_defineProperty(this, "verb", _express().Verb.READ);
|
|
26
26
|
_defineProperty(this, "middlewares", [async (req, res) => {
|
|
27
27
|
const {
|
|
28
28
|
body
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_express","data","require","ownKeys","e","r","t","Object","keys","getOwnPropertySymbols","o","filter","getOwnPropertyDescriptor","enumerable","push","apply","_objectSpread","arguments","length","forEach","_defineProperty","getOwnPropertyDescriptors","defineProperties","defineProperty","_toPropertyKey","value","configurable","writable","i","_toPrimitive","Symbol","toPrimitive","call","TypeError","String","Number","LanesCheckConflictsRoute","constructor","mergeLanes","logger","Verb","
|
|
1
|
+
{"version":3,"names":["_express","data","require","ownKeys","e","r","t","Object","keys","getOwnPropertySymbols","o","filter","getOwnPropertyDescriptor","enumerable","push","apply","_objectSpread","arguments","length","forEach","_defineProperty","getOwnPropertyDescriptors","defineProperties","defineProperty","_toPropertyKey","value","configurable","writable","i","_toPrimitive","Symbol","toPrimitive","call","TypeError","String","Number","LanesCheckConflictsRoute","constructor","mergeLanes","logger","Verb","READ","req","res","body","sourceLane","targetLane","status","send","conflicts","checkLaneForConflicts","conflictsOutput","map","conflict","id","toString","json","error","exports"],"sources":["lanes-check-conflicts.route.ts"],"sourcesContent":["import { Route, Verb, Request, Response } from '@teambit/express';\nimport { Logger } from '@teambit/logger';\nimport { MergeLanesMain } from './merge-lanes.main.runtime';\n\nexport class LanesCheckConflictsRoute implements Route {\n constructor(\n private mergeLanes: MergeLanesMain,\n private logger: Logger\n ) {}\n\n method = 'post';\n route = '/lanes/check-conflicts';\n verb = Verb.READ;\n\n middlewares = [\n async (req: Request, res: Response) => {\n const { body } = req;\n const sourceLane = body.sourceLane;\n const targetLane = body.targetLane;\n if (!sourceLane) {\n return res.status(400).send('Missing sourceLane in body');\n }\n if (!targetLane) {\n return res.status(400).send('Missing targetLane in body');\n }\n try {\n const { conflicts } = await this.mergeLanes.checkLaneForConflicts(sourceLane, targetLane, {});\n const conflictsOutput = conflicts.map((conflict) => {\n return {\n ...conflict,\n id: conflict.id.toString(),\n };\n });\n return res.json({ conflicts: conflictsOutput });\n } catch (e: any) {\n this.logger.error(e.toString());\n return res.status(500).send(e.toString());\n }\n },\n ];\n}\n"],"mappings":"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","ignoreList":[]}
|
package/package.json
CHANGED
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@teambit/merge-lanes",
|
|
3
|
-
"version": "1.0.
|
|
3
|
+
"version": "1.0.542",
|
|
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.
|
|
9
|
+
"version": "1.0.542"
|
|
10
10
|
},
|
|
11
11
|
"dependencies": {
|
|
12
12
|
"chalk": "2.4.2",
|
|
@@ -19,39 +19,39 @@
|
|
|
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/express": "0.0.
|
|
23
|
-
"@teambit/logger": "0.0.
|
|
24
|
-
"@teambit/legacy.bit-map": "0.0.
|
|
22
|
+
"@teambit/express": "0.0.1217",
|
|
23
|
+
"@teambit/logger": "0.0.1211",
|
|
24
|
+
"@teambit/legacy.bit-map": "0.0.87",
|
|
25
25
|
"@teambit/legacy.cli.prompts": "0.0.15",
|
|
26
|
-
"@teambit/legacy.consumer": "0.0.
|
|
27
|
-
"@teambit/legacy.scope": "0.0.
|
|
28
|
-
"@teambit/objects": "0.0.
|
|
29
|
-
"@teambit/scope": "1.0.
|
|
30
|
-
"@teambit/checkout": "1.0.
|
|
31
|
-
"@teambit/cli": "0.0.
|
|
26
|
+
"@teambit/legacy.consumer": "0.0.30",
|
|
27
|
+
"@teambit/legacy.scope": "0.0.30",
|
|
28
|
+
"@teambit/objects": "0.0.48",
|
|
29
|
+
"@teambit/scope": "1.0.541",
|
|
30
|
+
"@teambit/checkout": "1.0.541",
|
|
31
|
+
"@teambit/cli": "0.0.1118",
|
|
32
32
|
"@teambit/legacy.utils": "0.0.17",
|
|
33
|
-
"@teambit/global-config": "0.0.
|
|
33
|
+
"@teambit/global-config": "0.0.1121",
|
|
34
34
|
"@teambit/legacy.constants": "0.0.10",
|
|
35
|
-
"@teambit/merging": "1.0.
|
|
36
|
-
"@teambit/remove": "1.0.
|
|
37
|
-
"@teambit/component.snap-distance": "0.0.
|
|
38
|
-
"@teambit/config-merger": "0.0.
|
|
39
|
-
"@teambit/export": "1.0.
|
|
35
|
+
"@teambit/merging": "1.0.541",
|
|
36
|
+
"@teambit/remove": "1.0.541",
|
|
37
|
+
"@teambit/component.snap-distance": "0.0.31",
|
|
38
|
+
"@teambit/config-merger": "0.0.408",
|
|
39
|
+
"@teambit/export": "1.0.541",
|
|
40
40
|
"@teambit/harmony.modules.feature-toggle": "0.0.18",
|
|
41
|
-
"@teambit/harmony.modules.get-basic-log": "0.0.
|
|
42
|
-
"@teambit/importer": "1.0.
|
|
43
|
-
"@teambit/lanes": "1.0.
|
|
44
|
-
"@teambit/workspace": "1.0.
|
|
41
|
+
"@teambit/harmony.modules.get-basic-log": "0.0.31",
|
|
42
|
+
"@teambit/importer": "1.0.541",
|
|
43
|
+
"@teambit/lanes": "1.0.542",
|
|
44
|
+
"@teambit/workspace": "1.0.541"
|
|
45
45
|
},
|
|
46
46
|
"devDependencies": {
|
|
47
47
|
"@types/fs-extra": "9.0.7",
|
|
48
48
|
"@types/lodash": "4.14.165",
|
|
49
49
|
"@types/mocha": "9.1.0",
|
|
50
50
|
"@teambit/harmony.envs.core-aspect-env": "0.0.69",
|
|
51
|
-
"@teambit/component.testing.mock-components": "0.0.
|
|
52
|
-
"@teambit/harmony.testing.load-aspect": "0.0.
|
|
53
|
-
"@teambit/snapping": "1.0.
|
|
54
|
-
"@teambit/workspace.testing.mock-workspace": "0.0.
|
|
51
|
+
"@teambit/component.testing.mock-components": "0.0.290",
|
|
52
|
+
"@teambit/harmony.testing.load-aspect": "0.0.285",
|
|
53
|
+
"@teambit/snapping": "1.0.541",
|
|
54
|
+
"@teambit/workspace.testing.mock-workspace": "0.0.57"
|
|
55
55
|
},
|
|
56
56
|
"peerDependencies": {
|
|
57
57
|
"chai": "4.3.0",
|
|
File without changes
|