@teambit/merge-lanes 0.0.75 → 0.0.76
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/merge-lane-from-scope.cmd.d.ts +14 -0
- package/dist/merge-lane-from-scope.cmd.js +30 -3
- package/dist/merge-lane-from-scope.cmd.js.map +1 -1
- package/package-tar/teambit-merge-lanes-0.0.76.tgz +0 -0
- package/package.json +12 -12
- /package/{preview-1668310914843.js → preview-1668606008821.js} +0 -0
- package/package-tar/teambit-merge-lanes-0.0.75.tgz +0 -0
|
@@ -25,4 +25,18 @@ export declare class MergeLaneFromScopeCmd implements Command {
|
|
|
25
25
|
noSquash: boolean;
|
|
26
26
|
includeDeps?: boolean;
|
|
27
27
|
}): Promise<string>;
|
|
28
|
+
json([name, pattern]: [string, string], { push, keepReadme, noSquash, includeDeps, }: {
|
|
29
|
+
push?: boolean;
|
|
30
|
+
keepReadme?: boolean;
|
|
31
|
+
noSquash: boolean;
|
|
32
|
+
includeDeps?: boolean;
|
|
33
|
+
}): Promise<{
|
|
34
|
+
code: number;
|
|
35
|
+
data: any;
|
|
36
|
+
error?: undefined;
|
|
37
|
+
} | {
|
|
38
|
+
code: number;
|
|
39
|
+
error: any;
|
|
40
|
+
data?: undefined;
|
|
41
|
+
}>;
|
|
28
42
|
}
|
|
@@ -47,9 +47,7 @@ the lane must be up-to-date with main, otherwise, conflicts might occur which ar
|
|
|
47
47
|
description: 'EXPERIMENTAL. partially merge the lane with the specified component-pattern'
|
|
48
48
|
}]);
|
|
49
49
|
(0, _defineProperty2().default)(this, "alias", '');
|
|
50
|
-
(0, _defineProperty2().default)(this, "options", [['', 'push', 'export the updated objects to the original scopes once done'], ['', 'keep-readme', 'skip deleting the lane readme component after merging'], ['', 'no-squash', 'EXPERIMENTAL. relevant for merging lanes into main, which by default squash.'],
|
|
51
|
-
// ['', 'verbose', 'show details of components that were not merged legitimately'],
|
|
52
|
-
['', 'include-deps', 'EXPERIMENTAL. relevant for "--pattern". merge also dependencies of the given components']]);
|
|
50
|
+
(0, _defineProperty2().default)(this, "options", [['', 'push', 'export the updated objects to the original scopes once done'], ['', 'keep-readme', 'skip deleting the lane readme component after merging'], ['', 'no-squash', 'EXPERIMENTAL. relevant for merging lanes into main, which by default squash.'], ['', 'include-deps', 'EXPERIMENTAL. relevant for "--pattern". merge also dependencies of the given components'], ['j', 'json', 'output as json format']]);
|
|
53
51
|
(0, _defineProperty2().default)(this, "loader", true);
|
|
54
52
|
(0, _defineProperty2().default)(this, "private", true);
|
|
55
53
|
(0, _defineProperty2().default)(this, "migration", true);
|
|
@@ -83,6 +81,35 @@ the lane must be up-to-date with main, otherwise, conflicts might occur which ar
|
|
|
83
81
|
const exportedOutput = exportedIds.length ? `\n${exportedTitle}\n${exportedIds.join('\n')}` : '';
|
|
84
82
|
return mergedOutput + nonMergedOutput + exportedOutput;
|
|
85
83
|
}
|
|
84
|
+
async json([name, pattern], {
|
|
85
|
+
push = false,
|
|
86
|
+
keepReadme = false,
|
|
87
|
+
noSquash = false,
|
|
88
|
+
includeDeps = false
|
|
89
|
+
}) {
|
|
90
|
+
if (includeDeps && !pattern) {
|
|
91
|
+
throw new (_bitError().BitError)(`"--include-deps" flag is relevant only for --pattern flag`);
|
|
92
|
+
}
|
|
93
|
+
let results;
|
|
94
|
+
try {
|
|
95
|
+
results = await this.mergeLanes.mergeFromScope(name, {
|
|
96
|
+
push,
|
|
97
|
+
keepReadme,
|
|
98
|
+
noSquash,
|
|
99
|
+
pattern,
|
|
100
|
+
includeDeps
|
|
101
|
+
});
|
|
102
|
+
return {
|
|
103
|
+
code: 0,
|
|
104
|
+
data: results
|
|
105
|
+
};
|
|
106
|
+
} catch (err) {
|
|
107
|
+
return {
|
|
108
|
+
code: 1,
|
|
109
|
+
error: err.message
|
|
110
|
+
};
|
|
111
|
+
}
|
|
112
|
+
}
|
|
86
113
|
}
|
|
87
114
|
exports.MergeLaneFromScopeCmd = MergeLaneFromScopeCmd;
|
|
88
115
|
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["MergeLaneFromScopeCmd","constructor","mergeLanes","name","description","report","pattern","push","keepReadme","noSquash","includeDeps","BitError","mergedNow","mergedPreviously","exportedIds","mergeFromScope","mergedTitle","chalk","green","length","mergedOutput","join","nonMergedTitle","bold","nonMergedOutput","exportedTitle","exportedOutput"],"sources":["merge-lane-from-scope.cmd.ts"],"sourcesContent":["import chalk from 'chalk';\nimport { Command, CommandOptions } from '@teambit/cli';\nimport { BitError } from '@teambit/bit-error';\nimport { MergeLanesMain } from './merge-lanes.main.runtime';\n\n/**\n * private command. the underscore prefix is intended.\n */\nexport class MergeLaneFromScopeCmd implements Command {\n name = '_merge-lane <lane> [pattern]';\n description = `merge a remote lane into main via a bare-scope (not workspace)`;\n extendedDescription = `to merge from a workspace, use \"bit lane merge\" command.\nthis is intended to use from the UI, which will have a button to merge an existing lane into main.\nthe lane must be up-to-date with main, otherwise, conflicts might occur which are not handled in this command`;\n arguments = [\n {\n name: 'lane',\n description: 'lane-id to merge to main',\n },\n {\n name: 'pattern',\n description: 'EXPERIMENTAL. partially merge the lane with the specified component-pattern',\n },\n ];\n alias = '';\n options = [\n ['', 'push', 'export the updated objects to the original scopes once done'],\n ['', 'keep-readme', 'skip deleting the lane readme component after merging'],\n ['', 'no-squash', 'EXPERIMENTAL. relevant for merging lanes into main, which by default squash.'],\n
|
|
1
|
+
{"version":3,"names":["MergeLaneFromScopeCmd","constructor","mergeLanes","name","description","report","pattern","push","keepReadme","noSquash","includeDeps","BitError","mergedNow","mergedPreviously","exportedIds","mergeFromScope","mergedTitle","chalk","green","length","mergedOutput","join","nonMergedTitle","bold","nonMergedOutput","exportedTitle","exportedOutput","json","results","code","data","err","error","message"],"sources":["merge-lane-from-scope.cmd.ts"],"sourcesContent":["import chalk from 'chalk';\nimport { Command, CommandOptions } from '@teambit/cli';\nimport { BitError } from '@teambit/bit-error';\nimport { MergeLanesMain } from './merge-lanes.main.runtime';\n\n/**\n * private command. the underscore prefix is intended.\n */\nexport class MergeLaneFromScopeCmd implements Command {\n name = '_merge-lane <lane> [pattern]';\n description = `merge a remote lane into main via a bare-scope (not workspace)`;\n extendedDescription = `to merge from a workspace, use \"bit lane merge\" command.\nthis is intended to use from the UI, which will have a button to merge an existing lane into main.\nthe lane must be up-to-date with main, otherwise, conflicts might occur which are not handled in this command`;\n arguments = [\n {\n name: 'lane',\n description: 'lane-id to merge to main',\n },\n {\n name: 'pattern',\n description: 'EXPERIMENTAL. partially merge the lane with the specified component-pattern',\n },\n ];\n alias = '';\n options = [\n ['', 'push', 'export the updated objects to the original scopes once done'],\n ['', 'keep-readme', 'skip deleting the lane readme component after merging'],\n ['', 'no-squash', 'EXPERIMENTAL. relevant for merging lanes into main, which by default squash.'],\n ['', 'include-deps', 'EXPERIMENTAL. relevant for \"--pattern\". merge also dependencies of the given components'],\n ['j', 'json', 'output as json format'],\n ] as CommandOptions;\n loader = true;\n private = true;\n migration = true;\n remoteOp = true;\n\n constructor(private mergeLanes: MergeLanesMain) {}\n\n async report(\n [name, pattern]: [string, string],\n {\n push = false,\n keepReadme = false,\n noSquash = false,\n includeDeps = false,\n }: {\n push?: boolean;\n keepReadme?: boolean;\n noSquash: boolean;\n includeDeps?: boolean;\n }\n ): Promise<string> {\n if (includeDeps && !pattern) {\n throw new BitError(`\"--include-deps\" flag is relevant only for --pattern flag`);\n }\n const { mergedNow, mergedPreviously, exportedIds } = await this.mergeLanes.mergeFromScope(name, {\n push,\n keepReadme,\n noSquash,\n pattern,\n includeDeps,\n });\n\n const mergedTitle = chalk.green(`successfully merged ${mergedNow.length} components from ${name} to main`);\n const mergedOutput = mergedNow.length ? `${mergedTitle}\\n${mergedNow.join('\\n')}` : '';\n\n const nonMergedTitle = chalk.bold(\n `the following ${mergedPreviously.length} components were already merged before, they were left intact`\n );\n const nonMergedOutput = mergedPreviously.length ? `\\n${nonMergedTitle}\\n${mergedPreviously.join('\\n')}` : '';\n\n const exportedTitle = chalk.green(`successfully exported ${exportedIds.length} components`);\n const exportedOutput = exportedIds.length ? `\\n${exportedTitle}\\n${exportedIds.join('\\n')}` : '';\n\n return mergedOutput + nonMergedOutput + exportedOutput;\n }\n async json(\n [name, pattern]: [string, string],\n {\n push = false,\n keepReadme = false,\n noSquash = false,\n includeDeps = false,\n }: {\n push?: boolean;\n keepReadme?: boolean;\n noSquash: boolean;\n includeDeps?: boolean;\n }\n ) {\n if (includeDeps && !pattern) {\n throw new BitError(`\"--include-deps\" flag is relevant only for --pattern flag`);\n }\n let results: any;\n try {\n results = await this.mergeLanes.mergeFromScope(name, {\n push,\n keepReadme,\n noSquash,\n pattern,\n includeDeps,\n });\n return {\n code: 0,\n data: results,\n };\n } catch (err: any) {\n return {\n code: 1,\n error: err.message,\n };\n }\n }\n}\n"],"mappings":"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"}
|
|
Binary file
|
package/package.json
CHANGED
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@teambit/merge-lanes",
|
|
3
|
-
"version": "0.0.
|
|
3
|
+
"version": "0.0.76",
|
|
4
4
|
"homepage": "https://bit.dev/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": "0.0.
|
|
9
|
+
"version": "0.0.76"
|
|
10
10
|
},
|
|
11
11
|
"dependencies": {
|
|
12
12
|
"chalk": "2.4.2",
|
|
@@ -16,17 +16,17 @@
|
|
|
16
16
|
"core-js": "^3.0.0",
|
|
17
17
|
"@teambit/harmony": "0.3.3",
|
|
18
18
|
"@teambit/bit-error": "0.0.402",
|
|
19
|
-
"@teambit/cli": "0.0.
|
|
20
|
-
"@teambit/merging": "0.0.
|
|
19
|
+
"@teambit/cli": "0.0.601",
|
|
20
|
+
"@teambit/merging": "0.0.214",
|
|
21
21
|
"@teambit/component-id": "0.0.425",
|
|
22
|
-
"@teambit/export": "0.0.
|
|
23
|
-
"@teambit/lane-id": "0.0.
|
|
24
|
-
"@teambit/lanes": "0.0.
|
|
22
|
+
"@teambit/export": "0.0.899",
|
|
23
|
+
"@teambit/lane-id": "0.0.119",
|
|
24
|
+
"@teambit/lanes": "0.0.471",
|
|
25
25
|
"@teambit/legacy-bit-id": "0.0.421",
|
|
26
|
-
"@teambit/logger": "0.0.
|
|
27
|
-
"@teambit/remove": "0.0.
|
|
28
|
-
"@teambit/scope": "0.0.
|
|
29
|
-
"@teambit/workspace": "0.0.
|
|
26
|
+
"@teambit/logger": "0.0.694",
|
|
27
|
+
"@teambit/remove": "0.0.76",
|
|
28
|
+
"@teambit/scope": "0.0.899",
|
|
29
|
+
"@teambit/workspace": "0.0.899"
|
|
30
30
|
},
|
|
31
31
|
"devDependencies": {
|
|
32
32
|
"@types/lodash": "4.14.165",
|
|
@@ -38,7 +38,7 @@
|
|
|
38
38
|
"@types/node": "12.20.4"
|
|
39
39
|
},
|
|
40
40
|
"peerDependencies": {
|
|
41
|
-
"@teambit/legacy": "1.0.
|
|
41
|
+
"@teambit/legacy": "1.0.385",
|
|
42
42
|
"react-dom": "^16.8.0 || ^17.0.0",
|
|
43
43
|
"react": "^16.8.0 || ^17.0.0"
|
|
44
44
|
},
|
|
File without changes
|
|
Binary file
|