@teambit/stash 1.0.677 → 1.0.679
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.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { MergeStrategy } from '@teambit/
|
|
1
|
+
import type { MergeStrategy } from '@teambit/component.modules.merge-helper';
|
|
2
2
|
import type { Command, CommandOptions } from '@teambit/cli';
|
|
3
3
|
import type { StashMain } from './stash.main.runtime';
|
|
4
4
|
export declare class StashSaveCmd implements Command {
|
package/dist/stash.cmd.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_chalk","data","_interopRequireDefault","require","_legacy","_bitError","e","__esModule","default","_defineProperty","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","chalk","green","length","exports","StashListCmd","list","map","listItem","id","components","join","StashLoadCmd","stashId","autoMergeResolve","forceOurs","forceTheirs","manual","BitError","checkoutProps","mergeStrategy","loadLatest","StashCmd","unrecognizedSubcommand","red"],"sources":["stash.cmd.ts"],"sourcesContent":["// eslint-disable-next-line max-classes-per-file\nimport chalk from 'chalk';\nimport type { MergeStrategy } from '@teambit/
|
|
1
|
+
{"version":3,"names":["_chalk","data","_interopRequireDefault","require","_legacy","_bitError","e","__esModule","default","_defineProperty","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","chalk","green","length","exports","StashListCmd","list","map","listItem","id","components","join","StashLoadCmd","stashId","autoMergeResolve","forceOurs","forceTheirs","manual","BitError","checkoutProps","mergeStrategy","loadLatest","StashCmd","unrecognizedSubcommand","red"],"sources":["stash.cmd.ts"],"sourcesContent":["// eslint-disable-next-line max-classes-per-file\nimport chalk from 'chalk';\nimport type { MergeStrategy } from '@teambit/component.modules.merge-helper';\nimport type { Command, CommandOptions } 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 chalk.green(`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 chalk.green(`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 = 'stash modified components';\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 chalk.red(\n `\"${unrecognizedSubcommand}\" is not a subcommand of \"stash\", please run \"bit stash --help\" to list the subcommands`\n );\n }\n}\n"],"mappings":";;;;;;AACA,SAAAA,OAAA;EAAA,MAAAC,IAAA,GAAAC,sBAAA,CAAAC,OAAA;EAAAH,MAAA,YAAAA,CAAA;IAAA,OAAAC,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAIA,SAAAG,QAAA;EAAA,MAAAH,IAAA,GAAAE,OAAA;EAAAC,OAAA,YAAAA,CAAA;IAAA,OAAAH,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAI,UAAA;EAAA,MAAAJ,IAAA,GAAAE,OAAA;EAAAE,SAAA,YAAAA,CAAA;IAAA,OAAAJ,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAA8C,SAAAC,uBAAAI,CAAA,WAAAA,CAAA,IAAAA,CAAA,CAAAC,UAAA,GAAAD,CAAA,KAAAE,OAAA,EAAAF,CAAA;AAAA,SAAAG,gBAAAH,CAAA,EAAAI,CAAA,EAAAC,CAAA,YAAAD,CAAA,GAAAE,cAAA,CAAAF,CAAA,MAAAJ,CAAA,GAAAO,MAAA,CAAAC,cAAA,CAAAR,CAAA,EAAAI,CAAA,IAAAK,KAAA,EAAAJ,CAAA,EAAAK,UAAA,MAAAC,YAAA,MAAAC,QAAA,UAAAZ,CAAA,CAAAI,CAAA,IAAAC,CAAA,EAAAL,CAAA;AAAA,SAAAM,eAAAD,CAAA,QAAAQ,CAAA,GAAAC,YAAA,CAAAT,CAAA,uCAAAQ,CAAA,GAAAA,CAAA,GAAAA,CAAA;AAAA,SAAAC,aAAAT,CAAA,EAAAD,CAAA,2BAAAC,CAAA,KAAAA,CAAA,SAAAA,CAAA,MAAAL,CAAA,GAAAK,CAAA,CAAAU,MAAA,CAAAC,WAAA,kBAAAhB,CAAA,QAAAa,CAAA,GAAAb,CAAA,CAAAiB,IAAA,CAAAZ,CAAA,EAAAD,CAAA,uCAAAS,CAAA,SAAAA,CAAA,YAAAK,SAAA,yEAAAd,CAAA,GAAAe,MAAA,GAAAC,MAAA,EAAAf,CAAA,KAN9C;AASO,MAAMgB,YAAY,CAAoB;EAgB3CC,WAAWA,CAASC,KAAgB,EAAE;IAAA,KAAlBA,KAAgB,GAAhBA,KAAgB;IAAApB,eAAA,eAf7B,MAAM;IAAAA,eAAA,gBACL,GAAG;IAAAA,eAAA,sBACG,2BAA2B;IAAAA,eAAA,gBACjC,iBAAiB;IAAAA,eAAA,kBACf,CACR,CAAC,GAAG,EAAE,SAAS,EAAEqB,gCAAsB,CAAC,EACxC,CACE,EAAE,EACF,aAAa,EACb,yGAAyG,CAC1G,EACD,CAAC,GAAG,EAAE,kBAAkB,EAAE,kDAAkD,CAAC,CAC9E;IAAArB,eAAA,iBACQ,IAAI;EAE0B;EAEvC,MAAMsB,MAAMA,CACVC,IAAS,EACT;IACEC,OAAO;IACPC,OAAO;IACPC;EAKF,CAAC,EACD;IACA,MAAMC,OAAO,GAAG,MAAM,IAAI,CAACP,KAAK,CAACQ,IAAI,CAAC;MAAEJ,OAAO;MAAEC,OAAO;MAAEC;IAAW,CAAC,CAAC;IACvE,OAAOG,gBAAK,CAACC,KAAK,CAAC,WAAWH,OAAO,CAACI,MAAM,aAAa,CAAC;EAC5D;AACF;AAACC,OAAA,CAAAd,YAAA,GAAAA,YAAA;AAEM,MAAMe,YAAY,CAAoB;EAO3Cd,WAAWA,CAASC,KAAgB,EAAE;IAAA,KAAlBA,KAAgB,GAAhBA,KAAgB;IAAApB,eAAA,eAN7B,MAAM;IAAAA,eAAA,sBACC,YAAY;IAAAA,eAAA,gBAClB,iBAAiB;IAAAA,eAAA,kBACf,EAAE;IAAAA,eAAA,iBACH,IAAI;EAE0B;EAEvC,MAAMsB,MAAMA,CAAA,EAAG;IACb,MAAMY,IAAI,GAAG,MAAM,IAAI,CAACd,KAAK,CAACc,IAAI,CAAC,CAAC;IACpC,OAAOA,IAAI,CACRC,GAAG,CAAEC,QAAQ,IAAK,GAAGA,QAAQ,CAACC,EAAE,KAAKD,QAAQ,CAACE,UAAU,CAACP,MAAM,gBAAgBK,QAAQ,CAACX,OAAO,IAAI,EAAE,EAAE,CAAC,CACxGc,IAAI,CAAC,IAAI,CAAC;EACf;AACF;AAACP,OAAA,CAAAC,YAAA,GAAAA,YAAA;AASM,MAAMO,YAAY,CAAoB;EAqB3CrB,WAAWA,CAASC,KAAgB,EAAE;IAAA,KAAlBA,KAAgB,GAAhBA,KAAgB;IAAApB,eAAA,eApB7B,iBAAiB;IAAAA,eAAA,gBAChB,KAAK;IAAAA,eAAA,sBACC,8FAA8F;IAAAA,eAAA,gBACpG,iBAAiB;IAAAA,eAAA,kBACf,CACR,CACE,GAAG,EACH,qCAAqC,EACrC,+FAA+F,CAChG,EACD,CACE,EAAE,EACF,QAAQ,EACR,6GAA6G,CAC9G,EACD,CAAC,EAAE,EAAE,YAAY,EAAE,0CAA0C,CAAC,EAC9D,CAAC,EAAE,EAAE,cAAc,EAAE,kDAAkD,CAAC,CACzE;IAAAA,eAAA,iBACQ,IAAI;EAE0B;EAEvC,MAAMsB,MAAMA,CAAC,CAACmB,OAAO,CAAW,EAAE;IAAEC,gBAAgB;IAAEC,SAAS;IAAEC,WAAW;IAAEC;EAAsB,CAAC,EAAE;IACrG,IAAIF,SAAS,IAAIC,WAAW,EAAE;MAC5B,MAAM,KAAIE,oBAAQ,EAAC,4DAA4D,CAAC;IAClF;IACA,IACEJ,gBAAgB,IAChBA,gBAAgB,KAAK,MAAM,IAC3BA,gBAAgB,KAAK,QAAQ,IAC7BA,gBAAgB,KAAK,QAAQ,EAC7B;MACA,MAAM,KAAII,oBAAQ,EAAC,2EAA2E,CAAC;IACjG;IACA,IAAID,MAAM,EAAEH,gBAAgB,GAAG,QAAQ;IAEvC,MAAMK,aAA4B,GAAG;MACnCC,aAAa,EAAEN,gBAAgB;MAC/BC,SAAS;MACTC;IACF,CAAC;IACD,MAAMjB,OAAO,GAAG,MAAM,IAAI,CAACP,KAAK,CAAC6B,UAAU,CAACF,aAAa,EAAEN,OAAO,CAAC;IACnE,OAAOZ,gBAAK,CAACC,KAAK,CAAC,eAAeH,OAAO,CAACI,MAAM,2CAA2C,CAAC;EAC9F;AACF;AAACC,OAAA,CAAAQ,YAAA,GAAAA,YAAA;AAEM,MAAMU,QAAQ,CAAoB;EAWvC/B,WAAWA,CAASC,KAAgB,EAAE;IAAA,KAAlBA,KAAgB,GAAhBA,KAAgB;IAAApB,eAAA,eAV7B,qBAAqB;IAAAA,eAAA,sBACd,2BAA2B;IAAAA,eAAA,gBACjC,iBAAiB;IAAAA,eAAA,kBACf,CACR,CAAC,GAAG,EAAE,SAAS,EAAEqB,gCAAsB,CAAC,EACxC,CAAC,GAAG,EAAE,kBAAkB,EAAE,kDAAkD,CAAC,CAC9E;IAAArB,eAAA,iBACQ,IAAI;IAAAA,eAAA,mBACS,EAAE;EAEe;EAEvC,MAAMsB,MAAMA,CAAC,CAAC6B,sBAAsB,CAAW,EAAE;IAC/C,OAAOtB,gBAAK,CAACuB,GAAG,CACd,IAAID,sBAAsB,yFAC5B,CAAC;EACH;AACF;AAACnB,OAAA,CAAAkB,QAAA,GAAAA,QAAA","ignoreList":[]}
|
package/package.json
CHANGED
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@teambit/stash",
|
|
3
|
-
"version": "1.0.
|
|
3
|
+
"version": "1.0.679",
|
|
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.679"
|
|
10
10
|
},
|
|
11
11
|
"dependencies": {
|
|
12
12
|
"fs-extra": "10.0.0",
|
|
@@ -17,16 +17,16 @@
|
|
|
17
17
|
"@teambit/harmony": "0.4.7",
|
|
18
18
|
"@teambit/bit-error": "0.0.404",
|
|
19
19
|
"@teambit/legacy.constants": "0.0.14",
|
|
20
|
-
"@teambit/workspace": "1.0.
|
|
21
|
-
"@teambit/checkout": "1.0.
|
|
22
|
-
"@teambit/cli": "0.0.
|
|
23
|
-
"@teambit/
|
|
24
|
-
"@teambit/component": "1.0.
|
|
25
|
-
"@teambit/harmony.modules.get-basic-log": "0.0.
|
|
26
|
-
"@teambit/legacy.consumer-component": "0.0.
|
|
27
|
-
"@teambit/objects": "0.0.
|
|
28
|
-
"@teambit/remove": "1.0.
|
|
29
|
-
"@teambit/snapping": "1.0.
|
|
20
|
+
"@teambit/workspace": "1.0.679",
|
|
21
|
+
"@teambit/checkout": "1.0.679",
|
|
22
|
+
"@teambit/cli": "0.0.1252",
|
|
23
|
+
"@teambit/component.modules.merge-helper": "0.0.2",
|
|
24
|
+
"@teambit/component": "1.0.679",
|
|
25
|
+
"@teambit/harmony.modules.get-basic-log": "0.0.63",
|
|
26
|
+
"@teambit/legacy.consumer-component": "0.0.63",
|
|
27
|
+
"@teambit/objects": "0.0.186",
|
|
28
|
+
"@teambit/remove": "1.0.679",
|
|
29
|
+
"@teambit/snapping": "1.0.679"
|
|
30
30
|
},
|
|
31
31
|
"devDependencies": {
|
|
32
32
|
"@types/fs-extra": "9.0.7",
|
|
File without changes
|