@teambit/workspace 0.0.957 → 0.0.959

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.
Files changed (16) hide show
  1. package/dist/aspects-merger.d.ts +2 -1
  2. package/dist/aspects-merger.js +16 -30
  3. package/dist/aspects-merger.js.map +1 -1
  4. package/dist/exceptions/merge-config-conflict.js +1 -1
  5. package/dist/exceptions/merge-config-conflict.js.map +1 -1
  6. package/dist/merge-conflict-file.d.ts +22 -0
  7. package/dist/merge-conflict-file.js +150 -0
  8. package/dist/merge-conflict-file.js.map +1 -0
  9. package/dist/{preview-1673494106850.js → preview-1673666932263.js} +2 -2
  10. package/dist/workspace.d.ts +3 -1
  11. package/dist/workspace.js +5 -5
  12. package/dist/workspace.js.map +1 -1
  13. package/exceptions/merge-config-conflict.ts +1 -1
  14. package/package-tar/teambit-workspace-0.0.959.tgz +0 -0
  15. package/package.json +40 -40
  16. package/package-tar/teambit-workspace-0.0.957.tgz +0 -0
package/exceptions/merge-config-conflict.ts CHANGED
@@ -2,6 +2,6 @@ import { BitError } from '@teambit/bit-error';
2
2
 
3
3
  export class MergeConfigConflict extends BitError {
4
4
  constructor(filePath: string) {
5
- super(`unable to parse the merge-config file ${filePath} as it has unresolved conflicts`);
5
+ super(`unable to parse the merge-conflict file ${filePath} as it has unresolved conflicts`);
6
6
  }
7
7
  }
package/package.json CHANGED
@@ -1,20 +1,20 @@
1
1
  {
2
2
  "name": "@teambit/workspace",
3
- "version": "0.0.957",
3
+ "version": "0.0.959",
4
4
  "homepage": "https://bit.dev/teambit/workspace/workspace",
5
5
  "main": "dist/index.js",
6
6
  "componentId": {
7
7
  "scope": "teambit.workspace",
8
8
  "name": "workspace",
9
- "version": "0.0.957"
9
+ "version": "0.0.959"
10
10
  },
11
11
  "dependencies": {
12
- "fs-extra": "10.0.0",
13
12
  "lodash": "4.17.21",
14
13
  "lodash.compact": "3.0.1",
15
14
  "p-map-series": "2.1.0",
16
15
  "chalk": "2.4.2",
17
16
  "ink": "3.2.0",
17
+ "fs-extra": "10.0.0",
18
18
  "graphql-tag": "2.12.1",
19
19
  "memoizee": "0.4.15",
20
20
  "detect-indent": "5.0.0",
@@ -33,50 +33,50 @@
33
33
  "@teambit/design.ui.surfaces.menu.link-item": "1.0.0",
34
34
  "@teambit/base-ui.surfaces.split-pane.hover-splitter": "1.0.0",
35
35
  "@teambit/base-ui.surfaces.split-pane.split-pane": "1.0.0",
36
- "@teambit/component": "0.0.957",
37
- "@teambit/envs": "0.0.957",
36
+ "@teambit/component": "0.0.959",
37
+ "@teambit/envs": "0.0.959",
38
38
  "@teambit/bit-error": "0.0.402",
39
39
  "@teambit/component-id": "0.0.425",
40
- "@teambit/lane-id": "0.0.159",
41
- "@teambit/dependency-resolver": "0.0.957",
42
- "@teambit/logger": "0.0.734",
43
- "@teambit/scope": "0.0.957",
44
- "@teambit/graph": "0.0.957",
45
- "@teambit/cli": "0.0.641",
46
- "@teambit/isolator": "0.0.957",
47
- "@teambit/component-tree": "0.0.745",
48
- "@teambit/component.ui.component-status-resolver": "0.0.503",
49
- "@teambit/lanes.hooks.use-lanes": "0.0.105",
40
+ "@teambit/lane-id": "0.0.160",
41
+ "@teambit/dependency-resolver": "0.0.959",
42
+ "@teambit/logger": "0.0.736",
43
+ "@teambit/scope": "0.0.959",
44
+ "@teambit/graph": "0.0.959",
45
+ "@teambit/cli": "0.0.643",
46
+ "@teambit/isolator": "0.0.959",
47
+ "@teambit/component-tree": "0.0.747",
48
+ "@teambit/component.ui.component-status-resolver": "0.0.504",
49
+ "@teambit/lanes.hooks.use-lanes": "0.0.106",
50
50
  "@teambit/harmony.modules.resolved-component": "0.0.491",
51
- "@teambit/compiler": "0.0.957",
52
- "@teambit/graphql": "0.0.957",
53
- "@teambit/aspect-loader": "0.0.957",
54
- "@teambit/bundler": "0.0.957",
55
- "@teambit/pubsub": "0.0.957",
56
- "@teambit/ui": "0.0.957",
57
- "@teambit/variants": "0.0.746",
58
- "@teambit/component-issues": "0.0.84",
59
- "@teambit/config": "0.0.654",
51
+ "@teambit/compiler": "0.0.959",
52
+ "@teambit/graphql": "0.0.959",
53
+ "@teambit/aspect-loader": "0.0.959",
54
+ "@teambit/bundler": "0.0.959",
55
+ "@teambit/pubsub": "0.0.959",
56
+ "@teambit/ui": "0.0.959",
57
+ "@teambit/variants": "0.0.748",
58
+ "@teambit/component-issues": "0.0.85",
59
+ "@teambit/config": "0.0.656",
60
60
  "@teambit/harmony.modules.requireable-component": "0.0.491",
61
61
  "@teambit/legacy-bit-id": "0.0.421",
62
62
  "@teambit/workspace.modules.match-pattern": "0.0.498",
63
- "@teambit/component.ui.component-drawer": "0.0.199",
64
- "@teambit/design.ui.tree": "0.0.15",
65
- "@teambit/lanes.hooks.use-lane-components": "0.0.104",
66
- "@teambit/ui-foundation.ui.side-bar": "0.0.716",
67
- "@teambit/command-bar": "0.0.957",
68
- "@teambit/component.ui.component-filters.component-filter-context": "0.0.74",
69
- "@teambit/component.ui.component-filters.deprecate-filter": "0.0.74",
70
- "@teambit/component.ui.component-filters.env-filter": "0.0.80",
71
- "@teambit/component.ui.component-filters.show-main-filter": "0.0.67",
72
- "@teambit/sidebar": "0.0.957",
63
+ "@teambit/component.ui.component-drawer": "0.0.201",
64
+ "@teambit/design.ui.tree": "0.0.16",
65
+ "@teambit/lanes.hooks.use-lane-components": "0.0.105",
66
+ "@teambit/ui-foundation.ui.side-bar": "0.0.718",
67
+ "@teambit/command-bar": "0.0.959",
68
+ "@teambit/component.ui.component-filters.component-filter-context": "0.0.75",
69
+ "@teambit/component.ui.component-filters.deprecate-filter": "0.0.75",
70
+ "@teambit/component.ui.component-filters.env-filter": "0.0.81",
71
+ "@teambit/component.ui.component-filters.show-main-filter": "0.0.68",
72
+ "@teambit/sidebar": "0.0.959",
73
73
  "@teambit/ui-foundation.ui.main-dropdown": "0.0.497",
74
74
  "@teambit/ui-foundation.ui.menu": "0.0.497",
75
75
  "@teambit/ui-foundation.ui.react-router.slot-router": "0.0.501",
76
- "@teambit/ui-foundation.ui.tree.drawer": "0.0.510",
76
+ "@teambit/ui-foundation.ui.tree.drawer": "0.0.511",
77
77
  "@teambit/ui-foundation.ui.hooks.use-data-query": "0.0.500",
78
- "@teambit/component-descriptor": "0.0.211",
79
- "@teambit/deprecation": "0.0.957",
78
+ "@teambit/component-descriptor": "0.0.212",
79
+ "@teambit/deprecation": "0.0.959",
80
80
  "@teambit/ui-foundation.ui.constants.z-indexes": "0.0.498",
81
81
  "@teambit/ui-foundation.ui.buttons.collapser": "0.0.206",
82
82
  "@teambit/ui-foundation.ui.corner": "0.0.507",
@@ -84,13 +84,13 @@
84
84
  "@teambit/ui-foundation.ui.top-bar": "0.0.505",
85
85
  "@teambit/explorer.ui.gallery.component-grid": "0.0.496",
86
86
  "@teambit/workspace.ui.empty-workspace": "0.0.502",
87
- "@teambit/workspace.ui.workspace-component-card": "0.0.509"
87
+ "@teambit/workspace.ui.workspace-component-card": "0.0.510"
88
88
  },
89
89
  "devDependencies": {
90
- "@types/fs-extra": "9.0.7",
91
90
  "@types/lodash": "4.14.165",
92
91
  "@types/lodash.compact": "3.0.6",
93
92
  "@types/react": "^17.0.8",
93
+ "@types/fs-extra": "9.0.7",
94
94
  "@types/memoizee": "0.4.5",
95
95
  "@types/pluralize": "0.0.29",
96
96
  "@types/mocha": "9.1.0",
@@ -103,7 +103,7 @@
103
103
  "peerDependencies": {
104
104
  "react-router-dom": "^6.0.0",
105
105
  "@apollo/client": "^3.6.0",
106
- "@teambit/legacy": "1.0.423",
106
+ "@teambit/legacy": "1.0.424",
107
107
  "react": "^16.8.0 || ^17.0.0",
108
108
  "react-dom": "^16.8.0 || ^17.0.0"
109
109
  },