@teambit/merge-lanes 1.0.273 → 1.0.274
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.
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
<?xml version="1.0" encoding="UTF-8"?>
|
|
2
2
|
<testsuites tests="1" failures="0" errors="0" skipped="0">
|
|
3
|
-
<testsuite name="teambit.lanes/merge-lanes@1.0.
|
|
4
|
-
<testcase classname="dist/merge-lane.spec.js" name="should merge successfully the specified pattern only"/>
|
|
3
|
+
<testsuite name="teambit.lanes/merge-lanes@1.0.274" tests="1" failures="0" errors="0" skipped="0">
|
|
4
|
+
<testcase classname="dist/merge-lane.spec.js" name="should merge successfully the specified pattern only" time="0.001"/>
|
|
5
5
|
</testsuite>
|
|
6
6
|
</testsuites>
|
package/artifacts/schema.json
CHANGED
package/dist/merge-lane.spec.js
CHANGED
|
@@ -50,20 +50,19 @@ function _mergeLanes() {
|
|
|
50
50
|
return data;
|
|
51
51
|
}
|
|
52
52
|
function _lanes() {
|
|
53
|
-
const data =
|
|
53
|
+
const data = require("@teambit/lanes");
|
|
54
54
|
_lanes = function () {
|
|
55
55
|
return data;
|
|
56
56
|
};
|
|
57
57
|
return data;
|
|
58
58
|
}
|
|
59
59
|
function _snapping() {
|
|
60
|
-
const data =
|
|
60
|
+
const data = require("@teambit/snapping");
|
|
61
61
|
_snapping = function () {
|
|
62
62
|
return data;
|
|
63
63
|
};
|
|
64
64
|
return data;
|
|
65
65
|
}
|
|
66
|
-
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
|
67
66
|
describe('MergeLane aspect', function () {
|
|
68
67
|
this.timeout(0);
|
|
69
68
|
describe('snap from scope an existing component with newDependencies prop populated', () => {
|
|
@@ -78,10 +77,10 @@ describe('MergeLane aspect', function () {
|
|
|
78
77
|
await (0, _componentTesting().mockComponents)(workspacePath, {
|
|
79
78
|
numOfComponents: 2
|
|
80
79
|
});
|
|
81
|
-
const harmony = await (0, _harmonyTesting().loadManyAspects)([_snapping().
|
|
82
|
-
const lane = harmony.get(_lanes().
|
|
80
|
+
const harmony = await (0, _harmonyTesting().loadManyAspects)([_snapping().SnappingAspect, _export().ExportAspect, _lanes().LanesAspect], workspacePath);
|
|
81
|
+
const lane = harmony.get(_lanes().LanesAspect.id);
|
|
83
82
|
await lane.createLane('dev');
|
|
84
|
-
const snapping = harmony.get(_snapping().
|
|
83
|
+
const snapping = harmony.get(_snapping().SnappingAspect.id);
|
|
85
84
|
await snapping.snap({
|
|
86
85
|
build: false,
|
|
87
86
|
message: 'first snap'
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_chai","data","require","_harmonyTesting","_workspaceTesting","_scope","_export","_componentTesting","_mergeLanes","_lanes","
|
|
1
|
+
{"version":3,"names":["_chai","data","require","_harmonyTesting","_workspaceTesting","_scope","_export","_componentTesting","_mergeLanes","_lanes","_snapping","describe","timeout","workspaceData","harmonyBareScope","results","before","mockWorkspace","workspacePath","mockComponents","numOfComponents","harmony","loadManyAspects","SnappingAspect","ExportAspect","LanesAspect","lane","get","id","createLane","snapping","snap","build","message","exportMain","export","bareScope","mockBareScope","remoteScopePath","MergeLanesAspect","ScopeAspect","scopePath","mergeLaneMain","remoteScopeName","mergeFromScope","pattern","it","expect","mergedNow","to","have","lengthOf","fullName","equal","unmerged","name","after","destroyWorkspace"],"sources":["merge-lane.spec.ts"],"sourcesContent":["import { expect } from 'chai';\nimport { Harmony } from '@teambit/harmony';\nimport { loadManyAspects } from '@teambit/harmony.testing.load-aspect';\nimport {\n mockWorkspace,\n mockBareScope,\n destroyWorkspace,\n WorkspaceData,\n} from '@teambit/workspace.testing.mock-workspace';\nimport { ScopeAspect } from '@teambit/scope';\nimport { ExportAspect, ExportMain } from '@teambit/export';\nimport { mockComponents } from '@teambit/component.testing.mock-components';\nimport { MergeLanesAspect } from './merge-lanes.aspect';\nimport { MergeFromScopeResult, MergeLanesMain } from './merge-lanes.main.runtime';\nimport { LanesAspect, LanesMain } from '@teambit/lanes';\nimport { SnappingAspect, SnappingMain } from '@teambit/snapping';\n\ndescribe('MergeLane aspect', function () {\n this.timeout(0);\n\n describe('snap from scope an existing component with newDependencies prop populated', () => {\n let workspaceData: WorkspaceData;\n let harmonyBareScope: Harmony;\n let results: MergeFromScopeResult;\n before(async () => {\n workspaceData = mockWorkspace();\n const { workspacePath } = workspaceData;\n await mockComponents(workspacePath, { numOfComponents: 2 });\n const harmony = await loadManyAspects([SnappingAspect, ExportAspect, LanesAspect], workspacePath);\n const lane = harmony.get<LanesMain>(LanesAspect.id);\n await lane.createLane('dev');\n const snapping = harmony.get<SnappingMain>(SnappingAspect.id);\n await snapping.snap({ build: false, message: 'first snap' });\n const exportMain = harmony.get<ExportMain>(ExportAspect.id);\n await exportMain.export();\n\n const bareScope = mockBareScope(workspaceData.remoteScopePath, '-bare');\n harmonyBareScope = await loadManyAspects([MergeLanesAspect, ScopeAspect], bareScope.scopePath);\n const mergeLaneMain = harmonyBareScope.get<MergeLanesMain>(MergeLanesAspect.id);\n const remoteScopeName = workspaceData.remoteScopeName;\n results = await mergeLaneMain.mergeFromScope(`${remoteScopeName}/dev`, 'main', {\n pattern: `${remoteScopeName}/comp2`,\n });\n });\n it('should merge successfully the specified pattern only', async () => {\n expect(results.mergedNow).to.have.lengthOf(1);\n expect(results.mergedNow[0].fullName).to.equal('comp2');\n expect(results.unmerged).to.have.lengthOf(1);\n expect(results.unmerged[0].id.name).to.equal('comp1');\n });\n after(async () => {\n await destroyWorkspace(workspaceData);\n });\n });\n});\n"],"mappings":"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","ignoreList":[]}
|
package/package.json
CHANGED
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@teambit/merge-lanes",
|
|
3
|
-
"version": "1.0.
|
|
3
|
+
"version": "1.0.274",
|
|
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.
|
|
9
|
+
"version": "1.0.274"
|
|
10
10
|
},
|
|
11
11
|
"dependencies": {
|
|
12
12
|
"chalk": "2.4.2",
|
|
@@ -20,17 +20,17 @@
|
|
|
20
20
|
"@teambit/harmony": "0.4.6",
|
|
21
21
|
"@teambit/component-id": "1.2.0",
|
|
22
22
|
"@teambit/logger": "0.0.958",
|
|
23
|
-
"@teambit/scope": "1.0.
|
|
24
|
-
"@teambit/checkout": "1.0.
|
|
23
|
+
"@teambit/scope": "1.0.274",
|
|
24
|
+
"@teambit/checkout": "1.0.274",
|
|
25
25
|
"@teambit/cli": "0.0.865",
|
|
26
26
|
"@teambit/global-config": "0.0.868",
|
|
27
|
-
"@teambit/merging": "1.0.
|
|
28
|
-
"@teambit/remove": "1.0.
|
|
29
|
-
"@teambit/config-merger": "0.0.
|
|
30
|
-
"@teambit/export": "1.0.
|
|
31
|
-
"@teambit/importer": "1.0.
|
|
32
|
-
"@teambit/lanes": "1.0.
|
|
33
|
-
"@teambit/workspace": "1.0.
|
|
27
|
+
"@teambit/merging": "1.0.274",
|
|
28
|
+
"@teambit/remove": "1.0.274",
|
|
29
|
+
"@teambit/config-merger": "0.0.141",
|
|
30
|
+
"@teambit/export": "1.0.274",
|
|
31
|
+
"@teambit/importer": "1.0.274",
|
|
32
|
+
"@teambit/lanes": "1.0.274",
|
|
33
|
+
"@teambit/workspace": "1.0.274"
|
|
34
34
|
},
|
|
35
35
|
"devDependencies": {
|
|
36
36
|
"@types/fs-extra": "9.0.7",
|
|
@@ -39,9 +39,9 @@
|
|
|
39
39
|
"chai": "4.3.0",
|
|
40
40
|
"@types/mocha": "9.1.0",
|
|
41
41
|
"@teambit/harmony.envs.core-aspect-env": "0.0.33",
|
|
42
|
-
"@teambit/component.testing.mock-components": "0.0.
|
|
43
|
-
"@teambit/harmony.testing.load-aspect": "0.0.
|
|
44
|
-
"@teambit/snapping": "1.0.
|
|
42
|
+
"@teambit/component.testing.mock-components": "0.0.203",
|
|
43
|
+
"@teambit/harmony.testing.load-aspect": "0.0.198",
|
|
44
|
+
"@teambit/snapping": "1.0.274",
|
|
45
45
|
"@teambit/workspace.testing.mock-workspace": "0.0.27"
|
|
46
46
|
},
|
|
47
47
|
"peerDependencies": {
|
|
File without changes
|