@teambit/stash 1.0.938 → 1.0.940
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/stash.cmd.js
CHANGED
|
@@ -4,9 +4,9 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
6
|
exports.StashSaveCmd = exports.StashLoadCmd = exports.StashListCmd = exports.StashCmd = void 0;
|
|
7
|
-
function
|
|
8
|
-
const data =
|
|
9
|
-
|
|
7
|
+
function _cli() {
|
|
8
|
+
const data = require("@teambit/cli");
|
|
9
|
+
_cli = function () {
|
|
10
10
|
return data;
|
|
11
11
|
};
|
|
12
12
|
return data;
|
|
@@ -25,7 +25,6 @@ function _bitError() {
|
|
|
25
25
|
};
|
|
26
26
|
return data;
|
|
27
27
|
}
|
|
28
|
-
function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
|
|
29
28
|
function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
|
|
30
29
|
function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
|
|
31
30
|
function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); } // eslint-disable-next-line max-classes-per-file
|
|
@@ -49,7 +48,7 @@ class StashSaveCmd {
|
|
|
49
48
|
message,
|
|
50
49
|
includeNew
|
|
51
50
|
});
|
|
52
|
-
return
|
|
51
|
+
return (0, _cli().formatSuccessSummary)(`stashed ${compIds.length} components`);
|
|
53
52
|
}
|
|
54
53
|
}
|
|
55
54
|
exports.StashSaveCmd = StashSaveCmd;
|
|
@@ -97,7 +96,7 @@ class StashLoadCmd {
|
|
|
97
96
|
forceTheirs
|
|
98
97
|
};
|
|
99
98
|
const compIds = await this.stash.loadLatest(checkoutProps, stashId);
|
|
100
|
-
return
|
|
99
|
+
return (0, _cli().formatSuccessSummary)(`checked out ${compIds.length} components according to the latest stash`);
|
|
101
100
|
}
|
|
102
101
|
}
|
|
103
102
|
exports.StashLoadCmd = StashLoadCmd;
|
|
@@ -114,7 +113,7 @@ allows saving work-in-progress changes and switching context, then restoring cha
|
|
|
114
113
|
_defineProperty(this, "commands", []);
|
|
115
114
|
}
|
|
116
115
|
async report([unrecognizedSubcommand]) {
|
|
117
|
-
return
|
|
116
|
+
return `${_cli().errorSymbol} "${unrecognizedSubcommand}" is not a subcommand of "stash", please run "bit stash --help" to list the subcommands`;
|
|
118
117
|
}
|
|
119
118
|
}
|
|
120
119
|
exports.StashCmd = StashCmd;
|
package/dist/stash.cmd.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["
|
|
1
|
+
{"version":3,"names":["_cli","data","require","_legacy","_bitError","_defineProperty","e","r","t","_toPropertyKey","Object","defineProperty","value","enumerable","configurable","writable","i","_toPrimitive","Symbol","toPrimitive","call","TypeError","String","Number","StashSaveCmd","constructor","stash","COMPONENT_PATTERN_HELP","report","_arg","pattern","message","includeNew","compIds","save","formatSuccessSummary","length","exports","StashListCmd","list","map","listItem","id","components","join","StashLoadCmd","stashId","autoMergeResolve","forceOurs","forceTheirs","manual","BitError","checkoutProps","mergeStrategy","loadLatest","StashCmd","unrecognizedSubcommand","errorSymbol"],"sources":["stash.cmd.ts"],"sourcesContent":["// eslint-disable-next-line max-classes-per-file\nimport type { MergeStrategy } from '@teambit/component.modules.merge-helper';\nimport type { Command, CommandOptions } from '@teambit/cli';\nimport { formatSuccessSummary, errorSymbol } from '@teambit/cli';\nimport type { CheckoutProps } from '@teambit/checkout';\nimport { COMPONENT_PATTERN_HELP } from '@teambit/legacy.constants';\nimport { BitError } from '@teambit/bit-error';\nimport type { StashMain } from './stash.main.runtime';\n\nexport class StashSaveCmd implements Command {\n name = 'save';\n alias = 's';\n description = 'stash modified components';\n group = 'version-control';\n options = [\n ['p', 'pattern', COMPONENT_PATTERN_HELP],\n [\n '',\n 'include-new',\n 'EXPERIMENTAL. by default, only modified components are stashed. use this flag to include new components',\n ],\n ['m', 'message <string>', 'message to be attached to the stashed components'],\n ] as CommandOptions;\n loader = true;\n\n constructor(private stash: StashMain) {}\n\n async report(\n _arg: any,\n {\n pattern,\n message,\n includeNew,\n }: {\n pattern?: string;\n message?: string;\n includeNew?: boolean;\n }\n ) {\n const compIds = await this.stash.save({ pattern, message, includeNew });\n return formatSuccessSummary(`stashed ${compIds.length} components`);\n }\n}\n\nexport class StashListCmd implements Command {\n name = 'list';\n description = 'list stash';\n group = 'version-control';\n options = [] as CommandOptions;\n loader = true;\n\n constructor(private stash: StashMain) {}\n\n async report() {\n const list = await this.stash.list();\n return list\n .map((listItem) => `${listItem.id} (${listItem.components.length} components) ${listItem.message || ''}`)\n .join('\\n');\n }\n}\n\ntype StashLoadOpts = {\n autoMergeResolve?: MergeStrategy;\n manual?: boolean;\n forceOurs?: boolean;\n forceTheirs?: boolean;\n};\n\nexport class StashLoadCmd implements Command {\n name = 'load [stash-id]';\n alias = 'pop';\n description = 'apply the changes according to the stash. if no stash-id provided, it loads the latest stash';\n group = 'version-control';\n options = [\n [\n 'r',\n 'auto-merge-resolve <merge-strategy>',\n 'in case of merge conflict, resolve according to the provided strategy: [ours, theirs, manual]',\n ],\n [\n '',\n 'manual',\n 'same as \"--auto-merge-resolve manual\". in case of merge conflict, write the files with the conflict markers',\n ],\n ['', 'force-ours', 'do not merge, preserve local files as is'],\n ['', 'force-theirs', 'do not merge, just overwrite with incoming files'],\n ] as CommandOptions;\n loader = true;\n\n constructor(private stash: StashMain) {}\n\n async report([stashId]: [string], { autoMergeResolve, forceOurs, forceTheirs, manual }: StashLoadOpts) {\n if (forceOurs && forceTheirs) {\n throw new BitError('please use either --force-ours or --force-theirs, not both');\n }\n if (\n autoMergeResolve &&\n autoMergeResolve !== 'ours' &&\n autoMergeResolve !== 'theirs' &&\n autoMergeResolve !== 'manual'\n ) {\n throw new BitError('--auto-merge-resolve must be one of the following: [ours, theirs, manual]');\n }\n if (manual) autoMergeResolve = 'manual';\n\n const checkoutProps: CheckoutProps = {\n mergeStrategy: autoMergeResolve,\n forceOurs,\n forceTheirs,\n };\n const compIds = await this.stash.loadLatest(checkoutProps, stashId);\n return formatSuccessSummary(`checked out ${compIds.length} components according to the latest stash`);\n }\n}\n\nexport class StashCmd implements Command {\n name = 'stash <sub-command>';\n description = 'temporarily save and restore component changes';\n extendedDescription = `temporarily stores modified component files without creating versions.\nallows saving work-in-progress changes and switching context, then restoring changes later.`;\n group = 'version-control';\n options = [\n ['p', 'pattern', COMPONENT_PATTERN_HELP],\n ['m', 'message <string>', 'message to be attached to the stashed components'],\n ] as CommandOptions;\n loader = true;\n commands: Command[] = [];\n\n constructor(private stash: StashMain) {}\n\n async report([unrecognizedSubcommand]: [string]) {\n return `${errorSymbol} \"${unrecognizedSubcommand}\" is not a subcommand of \"stash\", please run \"bit stash --help\" to list the subcommands`;\n }\n}\n"],"mappings":"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","ignoreList":[]}
|
package/package.json
CHANGED
|
@@ -1,32 +1,31 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@teambit/stash",
|
|
3
|
-
"version": "1.0.
|
|
3
|
+
"version": "1.0.940",
|
|
4
4
|
"homepage": "https://bit.cloud/teambit/component/stash",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"componentId": {
|
|
7
7
|
"scope": "teambit.component",
|
|
8
8
|
"name": "stash",
|
|
9
|
-
"version": "1.0.
|
|
9
|
+
"version": "1.0.940"
|
|
10
10
|
},
|
|
11
11
|
"dependencies": {
|
|
12
12
|
"fs-extra": "10.0.0",
|
|
13
13
|
"globby": "11.0.1",
|
|
14
|
-
"chalk": "4.1.2",
|
|
15
14
|
"lodash": "4.17.21",
|
|
16
15
|
"@teambit/component-id": "1.2.4",
|
|
17
16
|
"@teambit/harmony": "0.4.7",
|
|
18
17
|
"@teambit/bit-error": "0.0.404",
|
|
19
|
-
"@teambit/workspace": "1.0.938",
|
|
20
|
-
"@teambit/checkout": "1.0.938",
|
|
21
|
-
"@teambit/cli": "0.0.1314",
|
|
22
18
|
"@teambit/component.modules.merge-helper": "0.0.50",
|
|
23
19
|
"@teambit/legacy.constants": "0.0.26",
|
|
24
|
-
"@teambit/component": "1.0.938",
|
|
25
20
|
"@teambit/harmony.modules.get-basic-log": "0.0.108",
|
|
26
21
|
"@teambit/legacy.consumer-component": "0.0.108",
|
|
27
|
-
"@teambit/
|
|
28
|
-
"@teambit/
|
|
29
|
-
"@teambit/
|
|
22
|
+
"@teambit/workspace": "1.0.940",
|
|
23
|
+
"@teambit/checkout": "1.0.940",
|
|
24
|
+
"@teambit/cli": "0.0.1315",
|
|
25
|
+
"@teambit/component": "1.0.940",
|
|
26
|
+
"@teambit/objects": "0.0.447",
|
|
27
|
+
"@teambit/remove": "1.0.940",
|
|
28
|
+
"@teambit/snapping": "1.0.940"
|
|
30
29
|
},
|
|
31
30
|
"devDependencies": {
|
|
32
31
|
"@types/fs-extra": "9.0.7",
|
|
File without changes
|