@teambit/component-issues 0.0.87 → 0.0.89
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-config-has-conflict.js +1 -1
- package/dist/merge-config-has-conflict.js.map +1 -1
- package/merge-config-has-conflict.ts +1 -1
- package/package-tar/teambit-component-issues-0.0.89.tgz +0 -0
- package/package.json +3 -3
- package/package-tar/teambit-component-issues-0.0.87.tgz +0 -0
- /package/dist/{preview-1675925853102.js → preview-1679607263760.js} +0 -0
|
@@ -6,7 +6,7 @@ class MergeConfigHasConflict extends component_issue_1.ComponentIssue {
|
|
|
6
6
|
constructor() {
|
|
7
7
|
super(...arguments);
|
|
8
8
|
this.description = 'merge-conflict file has unresolved conflicts';
|
|
9
|
-
this.solution = `edit the file and resolve the conflicts`;
|
|
9
|
+
this.solution = `edit the merge-conflict file in the workspace root and resolve the conflicts`;
|
|
10
10
|
this.isTagBlocker = true;
|
|
11
11
|
}
|
|
12
12
|
outputForCLI() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"merge-config-has-conflict.js","sourceRoot":"","sources":["../merge-config-has-conflict.ts"],"names":[],"mappings":";;;AAAA,uDAAgE;AAEhE,MAAa,sBAAuB,SAAQ,gCAAc;IAA1D;;QACE,gBAAW,GAAG,8CAA8C,CAAC;QAC7D,aAAQ,GAAG,
|
|
1
|
+
{"version":3,"file":"merge-config-has-conflict.js","sourceRoot":"","sources":["../merge-config-has-conflict.ts"],"names":[],"mappings":";;;AAAA,uDAAgE;AAEhE,MAAa,sBAAuB,SAAQ,gCAAc;IAA1D;;QACE,gBAAW,GAAG,8CAA8C,CAAC;QAC7D,aAAQ,GAAG,8EAA8E,CAAC;QAE1F,iBAAY,GAAG,IAAI,CAAC;IAItB,CAAC;IAHC,YAAY;QACV,OAAO,IAAA,6BAAW,EAAC,IAAI,CAAC,uBAAuB,EAAE,KAAK,CAAC,CAAC;IAC1D,CAAC;CACF;AARD,wDAQC"}
|
|
@@ -2,7 +2,7 @@ import { ComponentIssue, formatTitle } from './component-issue';
|
|
|
2
2
|
|
|
3
3
|
export class MergeConfigHasConflict extends ComponentIssue {
|
|
4
4
|
description = 'merge-conflict file has unresolved conflicts';
|
|
5
|
-
solution = `edit the file and resolve the conflicts`;
|
|
5
|
+
solution = `edit the merge-conflict file in the workspace root and resolve the conflicts`;
|
|
6
6
|
data: boolean;
|
|
7
7
|
isTagBlocker = true;
|
|
8
8
|
outputForCLI() {
|
|
Binary file
|
package/package.json
CHANGED
|
@@ -1,16 +1,16 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@teambit/component-issues",
|
|
3
|
-
"version": "0.0.
|
|
3
|
+
"version": "0.0.89",
|
|
4
4
|
"homepage": "https://bit.dev/teambit/component/component-issues",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"componentId": {
|
|
7
7
|
"scope": "teambit.component",
|
|
8
8
|
"name": "component-issues",
|
|
9
|
-
"version": "0.0.
|
|
9
|
+
"version": "0.0.89"
|
|
10
10
|
},
|
|
11
11
|
"dependencies": {
|
|
12
12
|
"chalk": "2.4.2",
|
|
13
|
-
"@teambit/legacy-bit-id": "0.0.
|
|
13
|
+
"@teambit/legacy-bit-id": "0.0.423"
|
|
14
14
|
},
|
|
15
15
|
"devDependencies": {
|
|
16
16
|
"@types/jest": "26.0.20",
|
|
Binary file
|
|
File without changes
|