@teambit/merging 1.0.66 → 1.0.68

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 (4) hide show
  1. package/package.json +17 -17
  2. package/tsconfig.json +1 -0
  3. package/dist/esm.d.mts +0 -11
  4. /package/dist/{preview-1701141530916.js → preview-1701259005504.js} +0 -0
package/package.json CHANGED
@@ -1,12 +1,12 @@
1
1
  {
2
2
  "name": "@teambit/merging",
3
- "version": "1.0.66",
3
+ "version": "1.0.68",
4
4
  "homepage": "https://bit.cloud/teambit/component/merging",
5
5
  "main": "dist/index.js",
6
6
  "componentId": {
7
7
  "scope": "teambit.component",
8
8
  "name": "merging",
9
- "version": "1.0.66"
9
+ "version": "1.0.68"
10
10
  },
11
11
  "dependencies": {
12
12
  "lodash": "4.17.21",
@@ -20,20 +20,20 @@
20
20
  "@teambit/bit-error": "0.0.404",
21
21
  "@teambit/lane-id": "0.0.311",
22
22
  "@teambit/harmony": "0.4.6",
23
- "@teambit/dependency-resolver": "1.0.66",
24
- "@teambit/builder": "1.0.66",
25
- "@teambit/envs": "1.0.66",
26
- "@teambit/logger": "0.0.916",
27
- "@teambit/cli": "0.0.823",
28
- "@teambit/global-config": "0.0.825",
29
- "@teambit/importer": "1.0.66",
30
- "@teambit/workspace": "1.0.66",
31
- "@teambit/checkout": "1.0.66",
32
- "@teambit/component-writer": "1.0.66",
33
- "@teambit/config": "0.0.839",
34
- "@teambit/install": "1.0.66",
35
- "@teambit/remove": "1.0.66",
36
- "@teambit/snapping": "1.0.66"
23
+ "@teambit/dependency-resolver": "1.0.68",
24
+ "@teambit/builder": "1.0.68",
25
+ "@teambit/envs": "1.0.68",
26
+ "@teambit/logger": "0.0.917",
27
+ "@teambit/cli": "0.0.824",
28
+ "@teambit/global-config": "0.0.826",
29
+ "@teambit/importer": "1.0.68",
30
+ "@teambit/workspace": "1.0.68",
31
+ "@teambit/checkout": "1.0.68",
32
+ "@teambit/component-writer": "1.0.68",
33
+ "@teambit/config": "0.0.840",
34
+ "@teambit/install": "1.0.68",
35
+ "@teambit/remove": "1.0.68",
36
+ "@teambit/snapping": "1.0.68"
37
37
  },
38
38
  "devDependencies": {
39
39
  "@types/lodash": "4.14.165",
@@ -47,7 +47,7 @@
47
47
  "@types/testing-library__jest-dom": "5.9.5"
48
48
  },
49
49
  "peerDependencies": {
50
- "@teambit/legacy": "1.0.606",
50
+ "@teambit/legacy": "1.0.607",
51
51
  "react": "^16.8.0 || ^17.0.0",
52
52
  "react-dom": "^16.8.0 || ^17.0.0"
53
53
  },
package/tsconfig.json CHANGED
@@ -31,6 +31,7 @@
31
31
  },
32
32
  "exclude": [
33
33
  "dist",
34
+ "esm.mjs",
34
35
  "package.json"
35
36
  ],
36
37
  "include": [
package/dist/esm.d.mts DELETED
@@ -1,11 +0,0 @@
1
- export const mergeReport: any;
2
- export const applyVersionReport: any;
3
- export const conflictSummaryReport: any;
4
- export const installationErrorOutput: any;
5
- export const compilationErrorOutput: any;
6
- export const getRemovedOutput: any;
7
- export const getAddedOutput: any;
8
- export const ConfigMergeResult: any;
9
- export const MergingAspect: any;
10
- export default cjsModule;
11
- import cjsModule from "./index.js";