@teambit/merge-lanes 1.0.106 → 1.0.108

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 (17) hide show
  1. package/dist/last-merged.d.ts +1 -1
  2. package/dist/merge-abort.cmd.d.ts +1 -1
  3. package/dist/merge-lane-from-scope.cmd.d.ts +1 -1
  4. package/dist/merge-lanes.main.runtime.d.ts +4 -4
  5. package/dist/merge-lanes.main.runtime.js +9 -14
  6. package/dist/merge-lanes.main.runtime.js.map +1 -1
  7. package/index.ts +5 -0
  8. package/last-merged.ts +179 -0
  9. package/merge-abort.cmd.ts +66 -0
  10. package/merge-lane-from-scope.cmd.ts +124 -0
  11. package/merge-lane.cmd.ts +202 -0
  12. package/merge-lanes.aspect.ts +5 -0
  13. package/merge-lanes.main.runtime.ts +749 -0
  14. package/package.json +21 -30
  15. package/tsconfig.json +16 -21
  16. package/types/asset.d.ts +15 -3
  17. /package/dist/{preview-1703505948637.js → preview-1703647408454.js} +0 -0
package/package.json CHANGED
@@ -1,12 +1,12 @@
1
1
  {
2
2
  "name": "@teambit/merge-lanes",
3
- "version": "1.0.106",
3
+ "version": "1.0.108",
4
4
  "homepage": "https://bit.cloud/teambit/lanes/merge-lanes",
5
5
  "main": "dist/index.js",
6
6
  "componentId": {
7
7
  "scope": "teambit.lanes",
8
8
  "name": "merge-lanes",
9
- "version": "1.0.106"
9
+ "version": "1.0.108"
10
10
  },
11
11
  "dependencies": {
12
12
  "chalk": "2.4.2",
@@ -15,39 +15,33 @@
15
15
  "yesno": "0.4.0",
16
16
  "lodash": "4.17.21",
17
17
  "p-map-series": "2.1.0",
18
- "core-js": "^3.0.0",
19
- "@babel/runtime": "7.20.0",
20
18
  "@teambit/bit-error": "0.0.404",
21
19
  "@teambit/lane-id": "0.0.311",
22
20
  "@teambit/harmony": "0.4.6",
23
21
  "@teambit/component-id": "1.2.0",
24
- "@teambit/logger": "0.0.932",
25
- "@teambit/scope": "1.0.106",
26
- "@teambit/checkout": "1.0.106",
27
- "@teambit/cli": "0.0.839",
28
- "@teambit/global-config": "0.0.841",
29
- "@teambit/merging": "1.0.106",
30
- "@teambit/remove": "1.0.106",
31
- "@teambit/export": "1.0.106",
32
- "@teambit/importer": "1.0.106",
33
- "@teambit/lanes": "1.0.106",
34
- "@teambit/snapping": "1.0.106",
35
- "@teambit/workspace": "1.0.106"
22
+ "@teambit/logger": "0.0.933",
23
+ "@teambit/scope": "1.0.108",
24
+ "@teambit/checkout": "1.0.108",
25
+ "@teambit/cli": "0.0.840",
26
+ "@teambit/global-config": "0.0.842",
27
+ "@teambit/merging": "1.0.108",
28
+ "@teambit/remove": "1.0.108",
29
+ "@teambit/export": "1.0.108",
30
+ "@teambit/importer": "1.0.108",
31
+ "@teambit/lanes": "1.0.108",
32
+ "@teambit/snapping": "1.0.108",
33
+ "@teambit/workspace": "1.0.108"
36
34
  },
37
35
  "devDependencies": {
38
36
  "@types/fs-extra": "9.0.7",
39
37
  "@types/lodash": "4.14.165",
40
38
  "@types/mocha": "9.1.0",
41
- "@types/node": "12.20.4",
42
- "@types/react": "^17.0.8",
43
- "@types/react-dom": "^17.0.5",
44
- "@types/jest": "^26.0.0",
45
- "@types/testing-library__jest-dom": "5.9.5"
39
+ "@types/jest": "^29.2.2",
40
+ "@types/testing-library__jest-dom": "^5.9.5",
41
+ "@teambit/harmony.envs.core-aspect-env": "0.0.13"
46
42
  },
47
43
  "peerDependencies": {
48
- "@teambit/legacy": "1.0.624",
49
- "react": "^16.8.0 || ^17.0.0",
50
- "react-dom": "^16.8.0 || ^17.0.0"
44
+ "@teambit/legacy": "1.0.624"
51
45
  },
52
46
  "license": "Apache-2.0",
53
47
  "optionalDependencies": {},
@@ -61,7 +55,7 @@
61
55
  },
62
56
  "private": false,
63
57
  "engines": {
64
- "node": ">=12.22.0"
58
+ "node": ">=16.0.0"
65
59
  },
66
60
  "repository": {
67
61
  "type": "git",
@@ -70,12 +64,9 @@
70
64
  "keywords": [
71
65
  "bit",
72
66
  "bit-aspect",
67
+ "bit-core-aspect",
73
68
  "components",
74
69
  "collaboration",
75
- "web",
76
- "react",
77
- "react-components",
78
- "angular",
79
- "angular-components"
70
+ "web"
80
71
  ]
81
72
  }
package/tsconfig.json CHANGED
@@ -1,38 +1,33 @@
1
1
  {
2
2
  "compilerOptions": {
3
3
  "lib": [
4
- "es2019",
5
- "DOM",
6
- "ES6",
7
- "DOM.Iterable",
8
- "ScriptHost"
4
+ "esnext",
5
+ "dom",
6
+ "dom.Iterable"
9
7
  ],
10
- "target": "es2015",
11
- "module": "CommonJS",
12
- "jsx": "react",
13
- "allowJs": true,
14
- "composite": true,
8
+ "target": "es2020",
9
+ "module": "es2020",
10
+ "jsx": "react-jsx",
15
11
  "declaration": true,
16
12
  "sourceMap": true,
17
- "skipLibCheck": true,
18
13
  "experimentalDecorators": true,
19
- "outDir": "dist",
14
+ "skipLibCheck": true,
20
15
  "moduleResolution": "node",
21
16
  "esModuleInterop": true,
22
- "rootDir": ".",
23
17
  "resolveJsonModule": true,
24
- "emitDeclarationOnly": true,
25
- "emitDecoratorMetadata": true,
26
- "allowSyntheticDefaultImports": true,
27
- "strictPropertyInitialization": false,
28
- "strict": true,
29
- "noImplicitAny": false,
30
- "preserveConstEnums": true
18
+ "allowJs": true,
19
+ "outDir": "dist",
20
+ "emitDeclarationOnly": true
31
21
  },
32
22
  "exclude": [
23
+ "artifacts",
24
+ "public",
33
25
  "dist",
26
+ "node_modules",
27
+ "package.json",
34
28
  "esm.mjs",
35
- "package.json"
29
+ "**/*.cjs",
30
+ "./dist"
36
31
  ],
37
32
  "include": [
38
33
  "**/*",
package/types/asset.d.ts CHANGED
@@ -5,12 +5,12 @@ declare module '*.png' {
5
5
  declare module '*.svg' {
6
6
  import type { FunctionComponent, SVGProps } from 'react';
7
7
 
8
- export const ReactComponent: FunctionComponent<SVGProps<SVGSVGElement> & { title?: string }>;
8
+ export const ReactComponent: FunctionComponent<
9
+ SVGProps<SVGSVGElement> & { title?: string }
10
+ >;
9
11
  const src: string;
10
12
  export default src;
11
13
  }
12
-
13
- // @TODO Gilad
14
14
  declare module '*.jpg' {
15
15
  const value: any;
16
16
  export = value;
@@ -27,3 +27,15 @@ declare module '*.bmp' {
27
27
  const value: any;
28
28
  export = value;
29
29
  }
30
+ declare module '*.otf' {
31
+ const value: any;
32
+ export = value;
33
+ }
34
+ declare module '*.woff' {
35
+ const value: any;
36
+ export = value;
37
+ }
38
+ declare module '*.woff2' {
39
+ const value: any;
40
+ export = value;
41
+ }