@teambit/merging 1.0.142 → 1.0.144

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 (8) hide show
  1. package/artifacts/__bit_junit.xml +4 -0
  2. package/dist/esm.mjs +1 -0
  3. package/dist/merge-status-provider.d.ts +2 -2
  4. package/dist/merging.main.runtime.d.ts +1 -1
  5. package/esm.mjs +1 -0
  6. package/package.json +18 -18
  7. package/tsconfig.json +4 -1
  8. /package/dist/{preview-1705806923881.js → preview-1706239131657.js} +0 -0
package/artifacts/__bit_junit.xml ADDED
@@ -0,0 +1,4 @@
1
+ <?xml version="1.0" encoding="UTF-8"?>
2
+ <testsuites>
3
+ <testsuite name="teambit.component/merging@1.0.144" tests="0" failures="0" errors="0" skipped="0"/>
4
+ </testsuites>
package/dist/esm.mjs CHANGED
@@ -10,5 +10,6 @@ export const getRemovedOutput = cjsModule.getRemovedOutput;
10
10
  export const getAddedOutput = cjsModule.getAddedOutput;
11
11
  export const ConfigMergeResult = cjsModule.ConfigMergeResult;
12
12
  export const MergingAspect = cjsModule.MergingAspect;
13
+ export const getWorkspaceConfigUpdateOutput = cjsModule.getWorkspaceConfigUpdateOutput;
13
14
 
14
15
  export default cjsModule;
package/dist/merge-status-provider.d.ts CHANGED
@@ -18,8 +18,8 @@ export declare class MergeStatusProvider {
18
18
  private options;
19
19
  private currentLane?;
20
20
  private otherLane?;
21
- constructor(workspace: Workspace, logger: Logger, importer: ImporterMain, options: MergeStatusProviderOptions, currentLane?: Lane, // currently checked out lane. if on main, then it's undefined.
22
- otherLane?: Lane);
21
+ constructor(workspace: Workspace, logger: Logger, importer: ImporterMain, options: MergeStatusProviderOptions, currentLane?: Lane | undefined, // currently checked out lane. if on main, then it's undefined.
22
+ otherLane?: Lane | undefined);
23
23
  getStatus(bitIds: ComponentID[]): Promise<ComponentMergeStatus[]>;
24
24
  private getComponentMergeStatus;
25
25
  private returnUnmerged;
package/dist/merging.main.runtime.d.ts CHANGED
@@ -126,7 +126,7 @@ export declare class MergingMain {
126
126
  private tagAllLaneComponent;
127
127
  private getIdsForUnmerged;
128
128
  private getComponentsToMerge;
129
- static slots: any[];
129
+ static slots: never[];
130
130
  static dependencies: import("@teambit/harmony").Aspect[];
131
131
  static runtime: import("@teambit/harmony").RuntimeDefinition;
132
132
  static provider([cli, workspace, snapping, checkout, install, loggerMain, compWriter, importer, config, remove, globalConfig, configMerger,]: [
package/esm.mjs CHANGED
@@ -10,5 +10,6 @@ export const getRemovedOutput = cjsModule.getRemovedOutput;
10
10
  export const getAddedOutput = cjsModule.getAddedOutput;
11
11
  export const ConfigMergeResult = cjsModule.ConfigMergeResult;
12
12
  export const MergingAspect = cjsModule.MergingAspect;
13
+ export const getWorkspaceConfigUpdateOutput = cjsModule.getWorkspaceConfigUpdateOutput;
13
14
 
14
15
  export default cjsModule;
package/package.json CHANGED
@@ -1,12 +1,12 @@
1
1
  {
2
2
  "name": "@teambit/merging",
3
- "version": "1.0.142",
3
+ "version": "1.0.144",
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.142"
9
+ "version": "1.0.144"
10
10
  },
11
11
  "dependencies": {
12
12
  "chalk": "2.4.2",
@@ -16,25 +16,24 @@
16
16
  "@teambit/component-id": "1.2.0",
17
17
  "@teambit/lane-id": "0.0.311",
18
18
  "@teambit/harmony": "0.4.6",
19
- "@teambit/cli": "0.0.848",
20
- "@teambit/config-merger": "0.0.9",
21
- "@teambit/global-config": "0.0.851",
22
- "@teambit/importer": "1.0.142",
23
- "@teambit/logger": "0.0.941",
24
- "@teambit/workspace": "1.0.142",
25
- "@teambit/checkout": "1.0.142",
26
- "@teambit/component-writer": "1.0.142",
27
- "@teambit/config": "0.0.893",
28
- "@teambit/install": "1.0.142",
29
- "@teambit/remove": "1.0.142",
30
- "@teambit/snapping": "1.0.142"
19
+ "@teambit/cli": "0.0.849",
20
+ "@teambit/config-merger": "0.0.11",
21
+ "@teambit/global-config": "0.0.852",
22
+ "@teambit/importer": "1.0.144",
23
+ "@teambit/logger": "0.0.942",
24
+ "@teambit/workspace": "1.0.144",
25
+ "@teambit/checkout": "1.0.144",
26
+ "@teambit/component-writer": "1.0.144",
27
+ "@teambit/config": "0.0.895",
28
+ "@teambit/install": "1.0.144",
29
+ "@teambit/remove": "1.0.144",
30
+ "@teambit/snapping": "1.0.144"
31
31
  },
32
32
  "devDependencies": {
33
33
  "@types/lodash": "4.14.165",
34
34
  "@types/mocha": "9.1.0",
35
- "@types/jest": "^29.2.2",
36
- "@types/testing-library__jest-dom": "^5.9.5",
37
- "@teambit/harmony.envs.core-aspect-env": "0.0.19"
35
+ "chai": "4.3.0",
36
+ "@teambit/harmony.envs.core-aspect-env": "0.0.24"
38
37
  },
39
38
  "peerDependencies": {
40
39
  "@teambit/legacy": "1.0.624"
@@ -51,7 +50,8 @@
51
50
  "default": "./dist/index.js"
52
51
  },
53
52
  "./dist/*": "./dist/*",
54
- "./artifacts/*": "./artifacts/*"
53
+ "./artifacts/*": "./artifacts/*",
54
+ "./*": "./*.ts"
55
55
  },
56
56
  "private": false,
57
57
  "engines": {
package/tsconfig.json CHANGED
@@ -17,7 +17,10 @@
17
17
  "resolveJsonModule": true,
18
18
  "allowJs": true,
19
19
  "outDir": "dist",
20
- "emitDeclarationOnly": true
20
+ "emitDeclarationOnly": true,
21
+ "strict": true,
22
+ "strictPropertyInitialization": false,
23
+ "noImplicitAny": false
21
24
  },
22
25
  "exclude": [
23
26
  "artifacts",