diff --git a/e2e/commands/cat.e2e.ts b/e2e/commands/cat.e2e.ts index 2627d9c1da1e..523cf319c36c 100644 --- a/e2e/commands/cat.e2e.ts +++ b/e2e/commands/cat.e2e.ts @@ -17,7 +17,7 @@ describe('bit cat command', function () { helper.scopeHelper.reInitWorkspace(); helper.fixtures.createComponentBarFoo("module.exports = function foo() { return 'v1'; };\n"); helper.fixtures.addComponentBarFoo(); - helper.command.tagAllComponents(); + helper.command.tagAllWithoutBuild(); }); it('should show all source files with headers', () => { @@ -64,9 +64,9 @@ describe('bit cat command', function () { helper.scopeHelper.reInitWorkspace(); helper.fixtures.createComponentBarFoo("module.exports = function foo() { return 'v1'; };\n"); helper.fixtures.addComponentBarFoo(); - helper.command.tagAllComponents('', '0.0.1'); + helper.command.tagAllWithoutBuild('--ver 0.0.1'); helper.fixtures.createComponentBarFoo("module.exports = function foo() { return 'v2'; };\n"); - helper.command.tagAllComponents('', '0.0.2'); + helper.command.tagAllWithoutBuild('--ver 0.0.2'); }); it('should show files at a specific historical version', () => { diff --git a/e2e/commands/diff.e2e.ts b/e2e/commands/diff.e2e.ts index ef2780b5441e..fde4cd947f0e 100644 --- a/e2e/commands/diff.e2e.ts +++ b/e2e/commands/diff.e2e.ts @@ -51,7 +51,7 @@ describe('bit diff command', function () { }); describe('after the component was tagged', () => { before(() => { - helper.command.tagAllComponents('', '0.0.5'); + helper.command.tagAllWithoutBuild('--ver 0.0.5'); }); it('should still indicate that there is no diff for that component', () => { const output = helper.command.diff('bar/foo'); @@ -107,7 +107,7 @@ describe('bit diff command', function () { helper.fixtures.addComponentUtilsIsType(); helper.fixtures.createComponentIsString(''); helper.fixtures.addComponentUtilsIsString(); - helper.command.tagAllComponents(); + helper.command.tagAllWithoutBuild(); // modify only bar/foo and utils/is-type, not utils/is-string helper.fixtures.createComponentBarFoo(barFooV2); @@ -148,7 +148,7 @@ describe('bit diff command', function () { helper.scopeHelper.reInitWorkspace(); helper.fixtures.createComponentBarFoo(barFooV1); helper.fixtures.addComponentBarFoo(); - helper.command.tagAllComponents(); + helper.command.tagAllWithoutBuild(); helper.fs.createFile('bar', 'foo2.js', barFooV2); fs.removeSync(path.join(helper.scopes.localPath, 'bar/foo.js')); helper.command.addComponent('bar', { i: 'bar/foo', m: 'bar/foo2.js' }); @@ -184,7 +184,7 @@ describe('bit diff command', function () { }); describe('running bit diff between the previous version and the last version', () => { before(() => { - helper.command.tagAllComponents(); + helper.command.tagAllWithoutBuild(); output = helper.command.diff('bar/foo 0.0.1 0.0.2'); }); it('should indicate the deleted files as deleted', () => { @@ -272,7 +272,7 @@ describe('bit diff command', function () { helper.fixtures.addComponentBarFoo(); helper.fixtures.createComponentIsType(); helper.fixtures.addComponentUtilsIsType(); - helper.command.tagAllComponents(); + helper.command.tagAllWithoutBuild(); // modify source in bar/foo, and add a file in utils/is-type so both filesDiff and fieldsDiff appear helper.fixtures.createComponentBarFoo(barFooV2); helper.fs.createFile('is-type', 'extra.js', "module.exports = 'extra';\n"); diff --git a/e2e/commands/export.e2e.ts b/e2e/commands/export.e2e.ts index dce702aa106e..1f0667fb8b1d 100644 --- a/e2e/commands/export.e2e.ts +++ b/e2e/commands/export.e2e.ts @@ -36,7 +36,7 @@ describe('bit export command', function () { helper.fixtures.addComponentBarFoo(); helper.fixtures.tagComponentBarFoo(); helper.command.exportIds('bar/foo'); - helper.command.tagComponent('bar/foo --unmodified'); + helper.command.tagWithoutBuild('bar/foo', '--unmodified'); helper.command.exportIds('bar/foo'); }); it('should export it with no errors', () => { @@ -84,7 +84,7 @@ describe('bit export command', function () { const stats = fs.statSync(destPngFile); pngSize = stats.size; helper.command.addComponent('bar', { m: 'foo.js', i: 'bar/foo' }); - helper.command.tagAllComponents(); + helper.command.tagAllWithoutBuild(); helper.command.export(); }); it('should export it with no errors', () => { @@ -123,10 +123,10 @@ describe('bit export command', function () { helper.scopeHelper.setWorkspaceWithRemoteScope(); helper.fixtures.createComponentBarFoo('// v2'); helper.fixtures.addComponentBarFoo(); - helper.command.tagIncludeUnmodified('2.0.0'); + helper.command.tagIncludeUnmodifiedWithoutBuild('2.0.0'); helper.command.export(); helper.fixtures.createComponentBarFoo('// v1'); - helper.command.tagIncludeUnmodified('1.0.0'); + helper.command.tagIncludeUnmodifiedWithoutBuild('1.0.0'); helper.command.export(); }); it('.bitmap should keep the current version and do not update to the latest version', () => { @@ -154,7 +154,7 @@ describe('bit export command', function () { helper.fixtures.createComponentBarFoo(); helper.fixtures.addComponentBarFoo(); helper.workspaceJsonc.setupDefault(); - helper.command.tagAllComponents(); + helper.command.tagAllWithoutBuild(); scopeBeforeExport = helper.scopeHelper.cloneWorkspace(); }); describe('when the group name does not exist', () => { @@ -195,7 +195,7 @@ describe('bit export command', function () { before(() => { helper.scopeHelper.setWorkspaceWithRemoteScope(); helper.fixtures.populateComponents(1); - helper.command.tagAllComponents(); + helper.command.tagAllWithoutBuild(); helper.command.export(); helper.scopeHelper.reInitRemoteScope(); }); @@ -232,11 +232,11 @@ describe('bit export command', function () { helper.scopeHelper.setWorkspaceWithRemoteScope(); helper.fixtures.createComponentBarFoo(); helper.fixtures.addComponentBarFoo(); - helper.command.tagAllComponents(); + helper.command.tagAllWithoutBuild(); helper.command.export(); - helper.command.tagComponent('bar/foo --unmodified'); + helper.command.tagWithoutBuild('bar/foo', '--unmodified'); helper.command.export(); - helper.command.tagComponent('bar/foo --unmodified'); + helper.command.tagWithoutBuild('bar/foo', '--unmodified'); output = helper.command.exportIds('bar/foo'); }); // this was a bug where on the third export, it parses the id "bar/foo" as: { scope: bar, name: foo } diff --git a/e2e/commands/import-all.e2e.ts b/e2e/commands/import-all.e2e.ts index ad0839b8b000..e16a148c45b8 100644 --- a/e2e/commands/import-all.e2e.ts +++ b/e2e/commands/import-all.e2e.ts @@ -83,7 +83,7 @@ describe('bit import command with no ids', function () { let output; before(() => { helper.scopeHelper.getClonedWorkspace(localScope); - helper.command.tagAllComponents(); + helper.command.tagAllWithoutBuild(); output = helper.command.runCmd(`bit import ${helper.scopes.remote}/bar/foo --merge=manual`); }); it('should display a successful message', () => { diff --git a/e2e/commands/import.e2e.ts b/e2e/commands/import.e2e.ts index 929cefef95bb..85de953bf8fe 100644 --- a/e2e/commands/import.e2e.ts +++ b/e2e/commands/import.e2e.ts @@ -220,7 +220,7 @@ describe('bit import', function () { helper.scopeHelper.setWorkspaceWithRemoteScope(); helper.fixtures.createComponentBarFoo(); helper.fixtures.addComponentBarFoo(); - helper.command.tagAllComponents(); + helper.command.tagAllWithoutBuild(); helper.command.exportIds('bar/foo'); const bitMap = helper.bitMap.read(); helper.scopeHelper.reInitWorkspace(); diff --git a/e2e/commands/list.e2e.ts b/e2e/commands/list.e2e.ts index 66343ad0f26e..e1a530e44d0c 100644 --- a/e2e/commands/list.e2e.ts +++ b/e2e/commands/list.e2e.ts @@ -51,7 +51,7 @@ describe('bit list command', function () { helper.scopeHelper.reInitWorkspace(); helper.scopeHelper.addRemoteScope(); helper.command.importComponent('bar/foo@0.0.1'); - helper.command.tagComponent('bar/foo', 'msg', '--unmodified'); + helper.command.tagWithoutBuild('bar/foo', '--unmodified'); helper.command.export(); helper.scopeHelper.getClonedWorkspace(clonedScopePath); diff --git a/e2e/commands/remove.e2e.ts b/e2e/commands/remove.e2e.ts index c7c1282b3486..d7b515515556 100644 --- a/e2e/commands/remove.e2e.ts +++ b/e2e/commands/remove.e2e.ts @@ -186,7 +186,7 @@ describe('bit remove command', function () { // this additional is to prevent another bug, where nested are imported only with their // latest version and then when 'bit remove' tries to remove all versions array of // ModelComponent, it doesn't find some of them and throws ENOENT error - helper.command.tagIncludeUnmodified('1.0.0'); + helper.command.tagIncludeUnmodifiedWithoutBuild('1.0.0'); helper.command.export(); helper.scopeHelper.reInitWorkspace(); @@ -426,7 +426,7 @@ describe('bit remove command', function () { before(() => { helper.scopeHelper.setWorkspaceWithRemoteScope(); helper.fixtures.populateComponents(2); - helper.command.tagAllComponents(); + helper.command.tagAllWithoutBuild(); helper.command.export(); helper.command.deleteComponent('comp2'); @@ -440,7 +440,7 @@ describe('bit remove command', function () { before(() => { helper.scopeHelper.setWorkspaceWithRemoteScope(); helper.fixtures.populateComponents(2); - helper.command.tagAllComponents(); + helper.command.tagAllWithoutBuild(); helper.command.export(); helper.scopeHelper.reInitWorkspace(); diff --git a/e2e/commands/reset.e2e.ts b/e2e/commands/reset.e2e.ts index e3a08b15bc54..c08d4e52fc1b 100644 --- a/e2e/commands/reset.e2e.ts +++ b/e2e/commands/reset.e2e.ts @@ -147,7 +147,7 @@ describe('bit reset command', function () { let untagOutput; before(() => { helper.scopeHelper.getClonedWorkspace(localScope); - helper.command.tagIncludeUnmodified('0.0.5'); + helper.command.tagIncludeUnmodifiedWithoutBuild('0.0.5'); untagOutput = helper.command.resetAll('--head'); }); it('should display a descriptive successful message', () => { @@ -205,7 +205,7 @@ describe('bit reset command', function () { helper.scopeHelper.reInitRemoteScope(); helper.scopeHelper.addRemoteScope(); helper.command.export(); - helper.command.tagIncludeUnmodified('1.0.5'); + helper.command.tagIncludeUnmodifiedWithoutBuild('1.0.5'); try { output = helper.command.reset('utils/is-type'); } catch (err: any) { diff --git a/e2e/commands/tag.e2e.ts b/e2e/commands/tag.e2e.ts index 11880ebf1821..413cd2e19e9d 100644 --- a/e2e/commands/tag.e2e.ts +++ b/e2e/commands/tag.e2e.ts @@ -53,7 +53,7 @@ describe('bit tag command', function () { helper.fs.createFile('components/default', 'default.js'); helper.command.addComponent('components/default', { i: 'components/default' }); const version = 'invalidVersion'; - const tag = () => helper.command.tagWithoutMessage('components/default', version); + const tag = () => helper.command.tagWithoutBuild('components/default', `--ver ${version}`); expect(tag).to.throw( `error: version ${version} is not a valid semantic version. learn more: https://semver.org` ); diff --git a/e2e/flows/id-with-wildcard.e2e.ts b/e2e/flows/id-with-wildcard.e2e.ts index 87edbb11665d..723ec4c77320 100644 --- a/e2e/flows/id-with-wildcard.e2e.ts +++ b/e2e/flows/id-with-wildcard.e2e.ts @@ -218,7 +218,7 @@ describe('component id with wildcard', function () { before(() => { helper.scopeHelper.getClonedWorkspace(scopeAfterAdd); helper.command.tagAllWithoutBuild(); - helper.command.tagIncludeUnmodified('0.0.5'); + helper.command.tagIncludeUnmodifiedWithoutBuild('0.0.5'); // as an intermediate step, make sure all components are staged const status = helper.command.statusJson(); diff --git a/e2e/flows/out-of-sync-componets.e2e.ts b/e2e/flows/out-of-sync-componets.e2e.ts index 9a606cd56a0a..5b90106d1361 100644 --- a/e2e/flows/out-of-sync-componets.e2e.ts +++ b/e2e/flows/out-of-sync-componets.e2e.ts @@ -202,7 +202,7 @@ describe('components that are not synced between the scope and the consumer', fu helper.fixtures.createComponentBarFoo(); helper.fixtures.addComponentBarFoo(); helper.fixtures.tagComponentBarFoo(); - helper.command.tagIncludeUnmodified('2.0.0'); + helper.command.tagIncludeUnmodifiedWithoutBuild('2.0.0'); const bitMap = helper.bitMap.read(); helper.command.reset('bar/foo', true); helper.bitMap.write(bitMap); @@ -237,7 +237,7 @@ describe('components that are not synced between the scope and the consumer', fu helper.fixtures.tagComponentBarFoo(); helper.command.export(); scopeAfterV1 = helper.scopeHelper.cloneWorkspace(); - helper.command.tagIncludeUnmodified('2.0.0'); + helper.command.tagIncludeUnmodifiedWithoutBuild('2.0.0'); helper.command.export(); const bitMap = helper.bitMap.read(); helper.scopeHelper.getClonedWorkspace(scopeAfterV1); @@ -272,7 +272,7 @@ describe('components that are not synced between the scope and the consumer', fu helper.fixtures.tagComponentBarFoo(); helper.command.export(); scopeAfterV1 = helper.scopeHelper.cloneWorkspace(); - helper.command.tagIncludeUnmodified('2.0.0'); + helper.command.tagIncludeUnmodifiedWithoutBuild('2.0.0'); helper.command.export(); const bitMap = helper.bitMap.read(); helper.scopeHelper.getClonedWorkspace(scopeAfterV1); diff --git a/e2e/flows/same-name-different-scopes.e2e.ts b/e2e/flows/same-name-different-scopes.e2e.ts index 61ad699e995e..a5ff8dc72522 100644 --- a/e2e/flows/same-name-different-scopes.e2e.ts +++ b/e2e/flows/same-name-different-scopes.e2e.ts @@ -20,7 +20,7 @@ describe('two components with the same name but different scope-name', function helper.fixtures.addComponentBarFoo(); helper.command.setScope(scopeName, 'bar/foo'); helper.command.tagAllWithoutBuild(); - helper.command.tagIncludeUnmodified('0.0.2'); + helper.command.tagIncludeUnmodifiedWithoutBuild('0.0.2'); helper.command.exportIds('bar/foo'); helper.scopeHelper.setWorkspaceWithRemoteScope(); diff --git a/e2e/functionalities/peer-dependency-component.e2e.ts b/e2e/functionalities/peer-dependency-component.e2e.ts index 8b2e201402ab..abf4a64ac61e 100644 --- a/e2e/functionalities/peer-dependency-component.e2e.ts +++ b/e2e/functionalities/peer-dependency-component.e2e.ts @@ -104,7 +104,7 @@ describe('set-peer', function () { describe('unset-peer', () => { before(() => { helper.command.unsetPeer('comp2'); - helper.command.snapAllComponents(); + helper.command.snapAllComponentsWithoutBuild(); helper.command.build(); }); it('should remove the always peer fields from the scope data', () => { @@ -219,7 +219,7 @@ describe('set-peer for existing component', function () { helper.scopeHelper.reInitWorkspace(); helper.fixtures.populateComponents(2); helper.command.install(); - helper.command.snapAllComponents(); + helper.command.snapAllComponentsWithoutBuild(); helper.command.setPeer('comp2', '0'); helper.command.install(); helper.command.build(); @@ -268,7 +268,7 @@ describe('unset-peer for existing component', function () { helper.fixtures.populateComponents(2); helper.command.setPeer('comp2', '0'); helper.command.install(); - helper.command.snapAllComponents(); // caches comp2 as peer dep of comp1 + helper.command.snapAllComponentsWithoutBuild(); // caches comp2 as peer dep of comp1 helper.command.unsetPeer('comp2'); helper.command.install(); }); diff --git a/e2e/harmony/aspect.e2e.ts b/e2e/harmony/aspect.e2e.ts index a6ac4a223bf4..0e3a8db4f8e5 100644 --- a/e2e/harmony/aspect.e2e.ts +++ b/e2e/harmony/aspect.e2e.ts @@ -105,7 +105,7 @@ describe('aspect', function () { }); it('bit tag should save only the updated aspect and not the old one', () => { helper.command.importComponent('my-aspect'); // otherwise, the tag will try to get it as a package - helper.command.tagAllComponents(); + helper.command.tagAllWithoutBuild(); const cmp = helper.command.catComponent(`${helper.scopes.remote}/comp1@latest`, undefined, false); expect(cmp).to.have.string(`${helper.scopes.remote}/my-aspect@0.0.2`); expect(cmp).not.to.have.string(`${helper.scopes.remote}/my-aspect@0.0.1`); diff --git a/e2e/harmony/build-cmd.e2e.ts b/e2e/harmony/build-cmd.e2e.ts index a3146abf80a2..cbaed55beaf1 100644 --- a/e2e/harmony/build-cmd.e2e.ts +++ b/e2e/harmony/build-cmd.e2e.ts @@ -275,7 +275,7 @@ describe('package and capsule generation identity', () => { helper = new Helper(); helper.scopeHelper.setWorkspaceWithRemoteScope(); helper.fixtures.populateComponents(3); - helper.command.tagAllComponents(); + helper.command.tagAllWithoutBuild(); helper.command.export(); // Only modify comp2 to trigger rebuild diff --git a/e2e/harmony/checkout-harmony.e2e.ts b/e2e/harmony/checkout-harmony.e2e.ts index cd89583be4cc..2541487a1d46 100644 --- a/e2e/harmony/checkout-harmony.e2e.ts +++ b/e2e/harmony/checkout-harmony.e2e.ts @@ -96,14 +96,14 @@ describe('bit checkout command', function () { helper.fixtures.createComponentBarFoo('console.log("modified components");'); }); it('should throw an error NewerVersionFound', () => { - const tagFunc = () => helper.command.tagComponent('bar/foo'); + const tagFunc = () => helper.command.tagWithoutBuild('bar/foo'); const error = new NewerVersionFound([ { componentId: `${helper.scopes.remote}/bar/foo`, currentVersion: '0.0.5', latestVersion: '0.0.10' }, ]); helper.general.expectToThrow(tagFunc, error); }); it('should allow tagging when --ignore-newest-version flag is used', () => { - const tagOutput = helper.command.tagComponent('bar/foo', 'msg', '--ignore-newest-version'); + const tagOutput = helper.command.tagWithoutBuild('bar/foo', '--ignore-newest-version'); expect(tagOutput).to.have.string('1 component(s) tagged'); }); }); diff --git a/e2e/harmony/component-config.e2e.ts b/e2e/harmony/component-config.e2e.ts index be8c1c41b7c7..700948e14ff6 100644 --- a/e2e/harmony/component-config.e2e.ts +++ b/e2e/harmony/component-config.e2e.ts @@ -106,7 +106,7 @@ describe('component config', function () { helper.extensions.addExtensionToVariant(EXTENSION_FOLDER, 'teambit.harmony/aspect'); helper.command.install(); helper.command.compile(); - helper.command.tagAllComponents(); + helper.command.tagAllWithoutBuild(); helper.command.ejectConf('bar/foo'); componentJson = helper.componentJson.read('bar'); }); diff --git a/e2e/harmony/custom-env.e2e.ts b/e2e/harmony/custom-env.e2e.ts index 15c035f9823e..4b0e84c9e885 100644 --- a/e2e/harmony/custom-env.e2e.ts +++ b/e2e/harmony/custom-env.e2e.ts @@ -84,7 +84,7 @@ describe('custom env', function () { describe('tag again', () => { before(() => { // helper.command.tagWithoutBuild(envName, '-f'); - helper.command.tagComponent(envName, 'message', '--unmodified'); + helper.command.tagWithoutBuild(envName, '--unmodified'); }); it('should have the correct env in the envs aspect data after additional tag', () => { const comp1 = helper.command.catComponent('comp1@latest'); diff --git a/e2e/harmony/delete.e2e.ts b/e2e/harmony/delete.e2e.ts index d012322460b7..ddc0f5224008 100644 --- a/e2e/harmony/delete.e2e.ts +++ b/e2e/harmony/delete.e2e.ts @@ -115,7 +115,7 @@ describe('bit delete command', function () { npmCiRegistry = new NpmCiRegistry(helper); npmCiRegistry.configureCiInPackageJsonHarmony(); await npmCiRegistry.init(); - helper.command.tagAllComponents(); + helper.command.tagAllWithoutBuild(); helper.command.export(); helper.command.createLane(); helper.command.snapAllComponentsWithoutBuild('--unmodified'); @@ -420,13 +420,13 @@ describe('bit delete command', function () { helper.scopeHelper.setWorkspaceWithRemoteScope(); helper.fixtures.populateComponents(2); helper.command.createLane(); - helper.command.snapAllComponents(); + helper.command.snapAllComponentsWithoutBuild(); helper.command.export(); helper.command.softRemoveOnLane('comp1'); const bitmap = helper.bitMap.read(); bitmapEntryBefore = bitmap.comp1; - helper.command.snapAllComponents('--unmodified'); + helper.command.snapAllComponentsWithoutBuild('--unmodified'); output = helper.command.resetAll(); }); it('should reset the deleted component', () => { diff --git a/e2e/harmony/dependency-resolver.e2e.ts b/e2e/harmony/dependency-resolver.e2e.ts index c96ebf4f1d75..9994b14ef5a5 100644 --- a/e2e/harmony/dependency-resolver.e2e.ts +++ b/e2e/harmony/dependency-resolver.e2e.ts @@ -167,7 +167,7 @@ describe('dependency-resolver extension', function () { await npmCiRegistry.init(); - helper.command.tagAllComponents(); + helper.command.tagAllWithoutBuild(); }); after(() => { npmCiRegistry.destroy(); diff --git a/e2e/harmony/deps-in-capsules.e2e.ts b/e2e/harmony/deps-in-capsules.e2e.ts index fd612a787c90..c99a2a79dcc8 100644 --- a/e2e/harmony/deps-in-capsules.e2e.ts +++ b/e2e/harmony/deps-in-capsules.e2e.ts @@ -30,7 +30,7 @@ chai.use(chaiString); envId2 = `${helper.scopes.remote}/${envName2}`; helper.command.install('lodash.get lodash.flatten'); helper.command.compile(); - helper.command.tagAllComponents(); + helper.command.tagAllWithoutBuild(); helper.command.export(); helper.scopeHelper.reInitWorkspace(); diff --git a/e2e/harmony/deps-write.e2e.ts b/e2e/harmony/deps-write.e2e.ts index 0ff9c1b3035b..12a5363a875c 100644 --- a/e2e/harmony/deps-write.e2e.ts +++ b/e2e/harmony/deps-write.e2e.ts @@ -17,7 +17,7 @@ describe('dependencies write', function () { }, }); helper.command.install('--add-missing-deps'); - helper.command.tagAllComponents('--skip-tests'); + helper.command.tagAllWithoutBuild('--skip-tests'); helper.command.export(); }); after(() => { diff --git a/e2e/harmony/export-harmony.e2e.ts b/e2e/harmony/export-harmony.e2e.ts index 8e0c4482cc1b..eb88fe622bb7 100644 --- a/e2e/harmony/export-harmony.e2e.ts +++ b/e2e/harmony/export-harmony.e2e.ts @@ -72,7 +72,7 @@ describe('export functionality on Harmony', function () { helper.command.snapAllComponentsWithoutBuild('--unmodified'); helper.command.export(); helper.command.switchLocalLane('lane-a', '-x'); - helper.command.mergeLane('lane-b', '-x'); + helper.command.mergeLaneWithoutBuild('lane-b', '-x'); helper.command.snapAllComponentsWithoutBuild('--unmodified'); }); // previously, it was throwing: diff --git a/e2e/harmony/extensions-config-diff.e2e.ts b/e2e/harmony/extensions-config-diff.e2e.ts index 74d5c7df1d7a..4845fd451cd5 100644 --- a/e2e/harmony/extensions-config-diff.e2e.ts +++ b/e2e/harmony/extensions-config-diff.e2e.ts @@ -24,7 +24,7 @@ describe('extensions config diff', function () { helper.extensions.addExtensionToVariant('extensions', 'teambit.harmony/aspect'); helper.command.install(); helper.command.compile(); - helper.command.tagAllComponents(); + helper.command.tagAllWithoutBuild(); beforeEject = helper.scopeHelper.cloneWorkspace(); }); after(() => { diff --git a/e2e/harmony/extensions-config.e2e.ts b/e2e/harmony/extensions-config.e2e.ts index 3d5cc082ad16..5144c37fef2b 100644 --- a/e2e/harmony/extensions-config.e2e.ts +++ b/e2e/harmony/extensions-config.e2e.ts @@ -29,7 +29,7 @@ describe('harmony extension config', function () { helper.fixtures.createComponentBarFoo(); helper.fixtures.addComponentBarFoo(); helper.extensions.addExtensionToVariant('*', 'teambit.scope/scope', config); - helper.command.tagAllComponents(); + helper.command.tagAllWithoutBuild(); componentVersionModel = helper.command.catComponent('bar/foo@0.0.1'); extensionData = componentVersionModel.extensions; devDeps = componentVersionModel.devDependencies; @@ -99,7 +99,7 @@ describe('harmony extension config', function () { before(() => { helper.scopeHelper.getClonedWorkspace(localBeforeTag); helper.workspaceJsonc.disablePreview(); - helper.command.tagAllComponents(); + helper.command.tagAllWithoutBuild(); const componentModelStr = helper.command.catComponent('bar/foo@0.0.1', undefined, false); const componentModelStrWithoutExtString = componentModelStr.substring(componentModelStr.indexOf('{')); componentModel = JSON.parse(componentModelStrWithoutExtString); @@ -118,7 +118,7 @@ describe('harmony extension config', function () { expect(componentModel.flattenedDependencies[0].name).to.equal('dummy-extension-without-logs'); }); it('should auto tag the component when tagging the extension again', () => { - output = helper.command.tagComponent('dummy-extension-without-logs', 'message', '--unmodified'); + output = helper.command.tagWithoutBuild('dummy-extension-without-logs', '--unmodified'); expect(output).to.have.string('2 component(s) tagged'); expect(output).to.have.string('auto-tagged dependents'); const details = helper.command.runCmd('bit details'); @@ -129,8 +129,8 @@ describe('harmony extension config', function () { let componentModel; before(() => { helper.scopeHelper.getClonedWorkspace(localBeforeTag); - helper.command.tagComponent('dummy-extension-without-logs'); - helper.command.tagComponent('bar/foo'); + helper.command.tagWithoutBuild('dummy-extension-without-logs'); + helper.command.tagWithoutBuild('bar/foo'); const componentModelStr = helper.command.catComponent('bar/foo@0.0.1', undefined, false); const componentModelStrWithoutExtString = componentModelStr.substring(componentModelStr.indexOf('{')); componentModel = JSON.parse(componentModelStrWithoutExtString); @@ -148,7 +148,7 @@ describe('harmony extension config', function () { let componentModel; before(() => { helper.scopeHelper.getClonedWorkspace(localBeforeTag); - helper.command.tagAllComponents(); + helper.command.tagAllWithoutBuild(); helper.scopeHelper.reInitRemoteScope(); helper.scopeHelper.addRemoteScope(); localBeforeExport = helper.scopeHelper.cloneWorkspace(); @@ -195,11 +195,11 @@ describe('harmony extension config', function () { helper.scopeHelper.getClonedWorkspace(localBeforeTag); helper.scopeHelper.reInitRemoteScope(); helper.scopeHelper.addRemoteScope(); - helper.command.tagComponent('dummy-extension-without-logs'); + helper.command.tagWithoutBuild('dummy-extension-without-logs'); helper.command.export('dummy-extension-without-logs'); helper.extensions.addExtensionToVariant('*', `${helper.scopes.remote}/dummy-extension-without-logs`, config); helper.workspaceJsonc.disablePreview(); - helper.command.tagAllComponents(); + helper.command.tagAllWithoutBuild(); helper.command.export(); helper.scopeHelper.reInitWorkspace(); helper.scopeHelper.addRemoteScope(); diff --git a/e2e/harmony/http.e2e.ts b/e2e/harmony/http.e2e.ts index 260a4cc8d153..c1f760f8ea05 100644 --- a/e2e/harmony/http.e2e.ts +++ b/e2e/harmony/http.e2e.ts @@ -106,7 +106,7 @@ import { HttpHelper } from '../http-helper'; await httpHelper.start(); helper.scopeHelper.addRemoteHttpScope(); helper.fixtures.populateComponents(); - helper.command.tagAllComponents(); + helper.command.tagAllWithoutBuild(); exportOutput = helper.command.export(); scopeAfterExport = helper.scopeHelper.cloneWorkspace(); }); diff --git a/e2e/harmony/import-harmony.e2e.ts b/e2e/harmony/import-harmony.e2e.ts index 4297a8709b4e..58db960b097b 100644 --- a/e2e/harmony/import-harmony.e2e.ts +++ b/e2e/harmony/import-harmony.e2e.ts @@ -113,7 +113,7 @@ describe('import functionality on Harmony', function () { helper.scopeHelper.addRemoteScope(); helper.command.importAllComponents(); helper.fixtures.populateComponents(1, undefined, ' v2'); - helper.command.tagAllComponents(); + helper.command.tagAllWithoutBuild(); }); it('should export with no errors about missing artifacts (pkg file) from the first tag', () => { expect(() => helper.command.export()).to.not.throw(); diff --git a/e2e/harmony/imported-component-deps.e2e.ts b/e2e/harmony/imported-component-deps.e2e.ts index 249b61035a2f..508464a73c8b 100644 --- a/e2e/harmony/imported-component-deps.e2e.ts +++ b/e2e/harmony/imported-component-deps.e2e.ts @@ -94,7 +94,7 @@ const isPositive = require('is-positive'); helper.fs.outputFile(`comp1/index.js`, `const isPositive = require('is-positive');`); helper.command.install(); helper.command.compile(); - helper.command.tagAllComponents(); + helper.command.tagAllWithoutBuild(); helper.command.export(); helper.scopeHelper.reInitWorkspace(); diff --git a/e2e/harmony/lanes/abort-merge-lane.e2e.ts b/e2e/harmony/lanes/abort-merge-lane.e2e.ts index 67823a645058..7758f8911c84 100644 --- a/e2e/harmony/lanes/abort-merge-lane.e2e.ts +++ b/e2e/harmony/lanes/abort-merge-lane.e2e.ts @@ -27,7 +27,7 @@ describe('bit lane merge-abort command', function () { helper.command.export(); helper.command.switchLocalLane('lane-a', '-x'); bitMapBeforeMerge = helper.bitMap.read(); - helper.command.mergeLane('lane-b', '-x'); + helper.command.mergeLaneWithoutBuild('lane-b', '-x'); bitMapAfterMerge = helper.bitMap.read(); helper.command.mergeAbortLane('-x'); }); @@ -62,7 +62,7 @@ describe('bit lane merge-abort command', function () { helper.scopeHelper.reInitWorkspace(); helper.scopeHelper.addRemoteScope(); helper.command.importLane('lane-a', '-x'); - helper.command.mergeLane(`${helper.scopes.remote}/lane-b`, '-x'); + helper.command.mergeLaneWithoutBuild(`${helper.scopes.remote}/lane-b`, '-x'); helper.fs.expectDirToExist(`${helper.scopes.remote}/comp2`); helper.command.mergeAbortLane('-x'); }); diff --git a/e2e/harmony/lanes/bit-checkout-on-lanes.e2e.ts b/e2e/harmony/lanes/bit-checkout-on-lanes.e2e.ts index 709a7f8b75be..8db587e59538 100644 --- a/e2e/harmony/lanes/bit-checkout-on-lanes.e2e.ts +++ b/e2e/harmony/lanes/bit-checkout-on-lanes.e2e.ts @@ -69,7 +69,7 @@ describe('bit checkout command when on a lane', function () { const workspaceBeforeMerge = helper.scopeHelper.cloneWorkspace(); helper.scopeHelper.reInitWorkspace(); helper.scopeHelper.addRemoteScope(); - helper.command.mergeLane('dev', '-x'); + helper.command.mergeLaneWithoutBuild('dev', '-x'); helper.command.export(); helper.scopeHelper.getClonedWorkspace(workspaceBeforeMerge); diff --git a/e2e/harmony/lanes/bit-import-on-lanes.e2e.ts b/e2e/harmony/lanes/bit-import-on-lanes.e2e.ts index 5eb9d3a479e3..131810fa8c1a 100644 --- a/e2e/harmony/lanes/bit-import-on-lanes.e2e.ts +++ b/e2e/harmony/lanes/bit-import-on-lanes.e2e.ts @@ -18,7 +18,7 @@ describe('bit lane command', function () { helper.scopeHelper.setWorkspaceWithRemoteScope(); helper.fixtures.createComponentBarFoo(); helper.fixtures.addComponentBarFoo(); - helper.command.tagAllComponents(); + helper.command.tagAllWithoutBuild(); helper.command.export(); helper.scopeHelper.reInitWorkspace(); helper.scopeHelper.addRemoteScope(); @@ -79,7 +79,7 @@ describe('bit lane command', function () { helper.fs.outputFile('bar1/foo1.js', 'console.log("v1");'); helper.command.addComponent('bar1'); helper.command.compile(); - helper.command.tagAllComponents(); + helper.command.tagAllWithoutBuild(); helper.command.export(); helper.fs.outputFile('bar2/foo2.js', 'console.log("v1");'); @@ -140,7 +140,7 @@ describe('bit lane command', function () { helper.scopeHelper.setWorkspaceWithRemoteScope(); helper.command.createLane('dev'); helper.fixtures.populateComponents(); - helper.command.snapAllComponents(); + helper.command.snapAllComponentsWithoutBuild(); helper.command.exportLane(); helper.scopeHelper.reInitWorkspace(); diff --git a/e2e/harmony/lanes/bit-reset-after-merge-main.e2e.ts b/e2e/harmony/lanes/bit-reset-after-merge-main.e2e.ts index 2156959b74e2..7cdc5819a882 100644 --- a/e2e/harmony/lanes/bit-reset-after-merge-main.e2e.ts +++ b/e2e/harmony/lanes/bit-reset-after-merge-main.e2e.ts @@ -49,7 +49,7 @@ describe('bit reset after merging main into a lane', function () { helper.command.export(); helper.command.switchLocalLane('dev', '-x'); - helper.command.mergeLane('main', '--auto-merge-resolve theirs -x'); + helper.command.mergeLaneWithoutBuild('main', '--auto-merge-resolve theirs -x'); headOnLaneAfterMerge = helper.command.getHeadOfLane('dev', 'comp1'); afterMerge = helper.scopeHelper.cloneWorkspace(); }); @@ -105,7 +105,7 @@ describe('bit reset after merging main into a lane', function () { // merge lane into main so main has the same snap helper.command.switchLocalLane('main', '-x'); - helper.command.mergeLane(`${helper.scopes.remote}/dev`, '-x'); + helper.command.mergeLaneWithoutBuild(`${helper.scopes.remote}/dev`, '-x'); helper.command.tagAllWithoutBuild(); helper.command.export(); @@ -116,7 +116,7 @@ describe('bit reset after merging main into a lane', function () { // switch back to lane and merge main helper.command.switchLocalLane('dev', '-x'); - helper.command.mergeLane('main', '-x'); + helper.command.mergeLaneWithoutBuild('main', '-x'); headOnLaneAfterMerge = helper.command.getHeadOfLane('dev', 'comp1'); afterMerge = helper.scopeHelper.cloneWorkspace(); }); @@ -177,7 +177,7 @@ describe('bit reset after merging main into a lane', function () { helper.command.export(); helper.command.switchLocalLane('dev', '-x'); - helper.command.mergeLane('main', '--auto-merge-resolve theirs --no-snap -x'); + helper.command.mergeLaneWithoutBuild('main', '--auto-merge-resolve theirs --no-snap -x'); }); it('lane head should not have changed', () => { diff --git a/e2e/harmony/lanes/bit-reset-on-lanes.e2e.ts b/e2e/harmony/lanes/bit-reset-on-lanes.e2e.ts index 30afdb02837f..897cc6847898 100644 --- a/e2e/harmony/lanes/bit-reset-on-lanes.e2e.ts +++ b/e2e/harmony/lanes/bit-reset-on-lanes.e2e.ts @@ -26,7 +26,7 @@ describe('bit reset when on lane', function () { helper.command.snapAllComponentsWithoutBuild(); headOnLane = helper.command.getHeadOfLane('dev', 'comp1'); helper.command.switchLocalLane('main'); - helper.command.mergeLane('dev'); + helper.command.mergeLaneWithoutBuild('dev'); helper.command.resetAll(); }); it('should not delete the head of the lane', () => { @@ -78,7 +78,7 @@ describe('bit reset when on lane', function () { helper.scopeHelper.reInitWorkspace(); helper.scopeHelper.addRemoteScope(); helper.command.createLane('dev2'); - helper.command.mergeLane(`${helper.scopes.remote}/dev`); + helper.command.mergeLaneWithoutBuild(`${helper.scopes.remote}/dev`); helper.command.snapAllComponentsWithoutBuild('--unmodified'); }); it('bit status should show not only one version as staged, but two', () => { @@ -111,7 +111,7 @@ describe('bit reset when on lane', function () { helper.scopeHelper.reInitWorkspace(); helper.scopeHelper.addRemoteScope(); helper.command.importLane('dev2', '-x'); - helper.command.mergeLane(`${helper.scopes.remote}/dev`, '-x'); + helper.command.mergeLaneWithoutBuild(`${helper.scopes.remote}/dev`, '-x'); }); // previously, it was throwing VersionNotFound error as it doesn't have the version objects snapped on the other lane it('bit reset should not throw', () => { diff --git a/e2e/harmony/lanes/diverged-from-forked.e2e.ts b/e2e/harmony/lanes/diverged-from-forked.e2e.ts index 1b2c0d8dd130..0c6b7bffb158 100644 --- a/e2e/harmony/lanes/diverged-from-forked.e2e.ts +++ b/e2e/harmony/lanes/diverged-from-forked.e2e.ts @@ -44,7 +44,7 @@ describe('lane-b was forked from lane-a and they are now diverged', function () }); describe('merging lane-a into lane-b', () => { before(() => { - helper.command.mergeLane('lane-a'); + helper.command.mergeLaneWithoutBuild('lane-a'); }); // similar to git, if you merge A into B, the first parent is B and the second is A. // the absence of squash metadata is asserted here too - it is what makes this the control for diff --git a/e2e/harmony/lanes/diverged-from-remote-lane.e2e.ts b/e2e/harmony/lanes/diverged-from-remote-lane.e2e.ts index b2146f8b3ee9..749e09697ac1 100644 --- a/e2e/harmony/lanes/diverged-from-remote-lane.e2e.ts +++ b/e2e/harmony/lanes/diverged-from-remote-lane.e2e.ts @@ -85,7 +85,7 @@ describe('local is diverged from the remote and another lane has a more recent s // locally helper.scopeHelper.getClonedWorkspace(laneAFirstSnap); - helper.command.mergeLane('lane-a'); // now lane-b has snapA + snapB + snapX1 (from lane-a) + snapX2 (the snap-merge) + helper.command.mergeLaneWithoutBuild('lane-a'); // now lane-b has snapA + snapB + snapX1 (from lane-a) + snapX2 (the snap-merge) helper.command.import(); // keep this to fetch from all lanes, because in the future, by default, only the current lane is fetched helper.command.fetchAllLanes(); diff --git a/e2e/harmony/lanes/import-lanes.e2e.ts b/e2e/harmony/lanes/import-lanes.e2e.ts index deb90081b18c..db7f5ec3f77f 100644 --- a/e2e/harmony/lanes/import-lanes.e2e.ts +++ b/e2e/harmony/lanes/import-lanes.e2e.ts @@ -23,7 +23,7 @@ describe('import lanes', function () { helper.scopeHelper.setWorkspaceWithRemoteScope(); appOutput = helper.fixtures.populateComponents(); helper.command.createLane('dev'); - helper.command.snapAllComponents(); + helper.command.snapAllComponentsWithoutBuild(); helper.command.exportLane(); const laneObj = helper.command.catLane('dev'); diff --git a/e2e/harmony/lanes/lane-export-skip-main-history-http.e2e.ts b/e2e/harmony/lanes/lane-export-skip-main-history-http.e2e.ts index 1200608d78cc..ee7458906154 100644 --- a/e2e/harmony/lanes/lane-export-skip-main-history-http.e2e.ts +++ b/e2e/harmony/lanes/lane-export-skip-main-history-http.e2e.ts @@ -110,7 +110,7 @@ function killProc(proc: ChildProcess) { helper.command.export(); helper.scopeHelper.getClonedWorkspace(laneWs); helper.command.import(); - helper.command.mergeLane('main', '--auto-merge-resolve theirs'); + helper.command.mergeLaneWithoutBuild('main', '--auto-merge-resolve theirs'); mergeSnap = helper.command.getHeadOfLane('dev', 'comp1'); // start HTTP server on the lane scope, swap workspace's lane remote to HTTP, then export diff --git a/e2e/harmony/lanes/lane-export-skip-main-history.e2e.ts b/e2e/harmony/lanes/lane-export-skip-main-history.e2e.ts index 3cceb8804318..7df3254d2531 100644 --- a/e2e/harmony/lanes/lane-export-skip-main-history.e2e.ts +++ b/e2e/harmony/lanes/lane-export-skip-main-history.e2e.ts @@ -73,7 +73,7 @@ describe('lane export skips main history objects', function () { // back to lane, pick up new main, merge main in (no squash; that's the default for lane->merge) helper.scopeHelper.getClonedWorkspace(laneWorkspace); helper.command.import(); - helper.command.mergeLane('main', '--auto-merge-resolve theirs'); + helper.command.mergeLaneWithoutBuild('main', '--auto-merge-resolve theirs'); mergeSnap = helper.command.getHeadOfLane('dev', 'comp1'); helper.command.export(); }); @@ -254,7 +254,7 @@ describe('lane export skips main history objects', function () { helper.command.export(); helper.scopeHelper.getClonedWorkspace(laneWs); helper.command.import(); - helper.command.mergeLane('main', '--auto-merge-resolve theirs'); + helper.command.mergeLaneWithoutBuild('main', '--auto-merge-resolve theirs'); helper.command.export(); }); @@ -443,7 +443,7 @@ describe('lane export skips main history objects', function () { helper.command.export(); helper.scopeHelper.getClonedWorkspace(laneWs); helper.command.import(); - helper.command.mergeLane('main', '--auto-merge-resolve theirs'); + helper.command.mergeLaneWithoutBuild('main', '--auto-merge-resolve theirs'); firstMergeSnap = helper.command.getHeadOfLane('dev', 'comp1'); helper.command.export(); @@ -456,7 +456,7 @@ describe('lane export skips main history objects', function () { helper.command.export(); helper.scopeHelper.getClonedWorkspace(laneWs2); helper.command.import(); - helper.command.mergeLane('main', '--auto-merge-resolve theirs'); + helper.command.mergeLaneWithoutBuild('main', '--auto-merge-resolve theirs'); secondMergeSnap = helper.command.getHeadOfLane('dev', 'comp1'); helper.command.export(); }); @@ -562,7 +562,7 @@ describe('lane export skips main history objects', function () { helper.scopeHelper.getClonedWorkspace(laneWorkspace); helper.command.import(); - helper.command.mergeLane('main', '--auto-merge-resolve theirs'); + helper.command.mergeLaneWithoutBuild('main', '--auto-merge-resolve theirs'); mergeSnap = helper.command.getHeadOfLane('dev', 'comp1'); helper.command.export(); }); @@ -689,7 +689,7 @@ describe('lane export skips main history objects', function () { // observe bit status BEFORE the push. helper.scopeHelper.getClonedWorkspace(laneWs); helper.command.import(); - helper.command.mergeLane('main', '--auto-merge-resolve theirs'); + helper.command.mergeLaneWithoutBuild('main', '--auto-merge-resolve theirs'); mergeSnap = helper.command.getHeadOfLane('dev', 'comp1'); }); diff --git a/e2e/harmony/lanes/lane-forking.e2e.ts b/e2e/harmony/lanes/lane-forking.e2e.ts index de60a32be23c..176e6a247949 100644 --- a/e2e/harmony/lanes/lane-forking.e2e.ts +++ b/e2e/harmony/lanes/lane-forking.e2e.ts @@ -70,7 +70,7 @@ describe('bit lane forking', function () { helper.command.snapAllComponentsWithoutBuild('--unmodified'); helper.command.export(); helper.command.switchLocalLane('main', '-x'); - helper.command.mergeLane('lane-a', '-x'); + helper.command.mergeLaneWithoutBuild('lane-a', '-x'); helper.command.export(); helper.scopeHelper.getClonedWorkspace(laneB); helper.command.import(); @@ -101,7 +101,7 @@ describe('bit lane forking', function () { // locally helper.scopeHelper.getClonedWorkspace(laneAFirstSnap); - helper.command.mergeLane('lane-a'); // now lane-b has snapA + snapB + snapX1 (from lane-a) + snapX2 (the from lane-a) + helper.command.mergeLaneWithoutBuild('lane-a'); // now lane-b has snapA + snapB + snapX1 (from lane-a) + snapX2 (the from lane-a) helper.command.import(); // keep this to fetch from all lanes, because in the future, by default, only the current lane is fetched helper.command.fetchAllLanes(); diff --git a/e2e/harmony/lanes/lane-history-merge.e2e.ts b/e2e/harmony/lanes/lane-history-merge.e2e.ts index 44c87a6c93d9..b9423e812815 100644 --- a/e2e/harmony/lanes/lane-history-merge.e2e.ts +++ b/e2e/harmony/lanes/lane-history-merge.e2e.ts @@ -36,7 +36,7 @@ describe('lane history with merge operations', function () { helper.command.switchLocalLane('lane-a', '-x'); // Merge lane-b into lane-a (fast-forward since lane-a hasn't changed) - helper.command.mergeLane('lane-b', '-x'); + helper.command.mergeLaneWithoutBuild('lane-b', '-x'); // Get history after merge historyAfterMerge = helper.command.laneHistoryParsed(); diff --git a/e2e/harmony/lanes/lane-import.e2e.ts b/e2e/harmony/lanes/lane-import.e2e.ts index 7dec922182e5..636a494e529c 100644 --- a/e2e/harmony/lanes/lane-import.e2e.ts +++ b/e2e/harmony/lanes/lane-import.e2e.ts @@ -239,7 +239,7 @@ describe('bit lane import operations', function () { helper.scopeHelper.reInitWorkspace(); helper.scopeHelper.addRemoteScope(); helper.command.createLane('lane-b'); - helper.command.mergeLane(`${helper.scopes.remote}/lane-a`, '-x'); + helper.command.mergeLaneWithoutBuild(`${helper.scopes.remote}/lane-a`, '-x'); helper.command.export(); headOnLaneB = helper.command.getHeadOfLane('lane-b', 'comp1'); const laneBWs = helper.scopeHelper.cloneWorkspace(); diff --git a/e2e/harmony/lanes/lane-merge.e2e.ts b/e2e/harmony/lanes/lane-merge.e2e.ts index 5b69d0c54b4d..db35e1dc232f 100644 --- a/e2e/harmony/lanes/lane-merge.e2e.ts +++ b/e2e/harmony/lanes/lane-merge.e2e.ts @@ -57,7 +57,7 @@ describe('bit lane merge operations', function () { describe('merging the dev lane when the lane is ahead (no diverge)', () => { before(() => { helper.scopeHelper.getClonedWorkspace(afterSwitchingLocal); - helper.command.mergeLane('dev'); + helper.command.mergeLaneWithoutBuild('dev'); }); it('should merge the lane', () => { const mergedLanes = helper.command.listLanes('--merged'); @@ -75,7 +75,7 @@ describe('bit lane merge operations', function () { }); describe('tagging the components', () => { before(() => { - helper.command.tagIncludeUnmodified(); + helper.command.tagIncludeUnmodifiedWithoutBuild(); }); it('should be able to export with no errors', () => { expect(() => helper.command.export()).not.to.throw(); @@ -88,7 +88,7 @@ describe('bit lane merge operations', function () { helper.scopeHelper.getClonedRemoteScope(afterSwitchingRemote); helper.fixtures.populateComponents(2, undefined, 'v3'); helper.command.snapAllComponentsWithoutBuild(); - helper.command.mergeLane('dev', '--auto-merge-resolve ours --no-squash'); + helper.command.mergeLaneWithoutBuild('dev', '--auto-merge-resolve ours --no-squash'); }); it('should merge the lane', () => { const mergedLanes = helper.command.listLanes('--merged'); @@ -100,7 +100,7 @@ describe('bit lane merge operations', function () { }); describe('tagging the components', () => { before(() => { - helper.command.tagIncludeUnmodified(); + helper.command.tagIncludeUnmodifiedWithoutBuild(); }); it('should be able to export with no errors', () => { expect(() => helper.command.export()).not.to.throw(); diff --git a/e2e/harmony/lanes/merge-lanes-diverge.e2e.ts b/e2e/harmony/lanes/merge-lanes-diverge.e2e.ts index 17c4cca678cc..b5a975c5f247 100644 --- a/e2e/harmony/lanes/merge-lanes-diverge.e2e.ts +++ b/e2e/harmony/lanes/merge-lanes-diverge.e2e.ts @@ -46,7 +46,7 @@ describe('merge lanes - diverge functionality', function () { describe('merging the lane', () => { let status; before(() => { - helper.command.mergeLane('main', '--auto-merge-resolve theirs'); + helper.command.mergeLaneWithoutBuild('main', '--auto-merge-resolve theirs'); status = helper.command.statusJson(); afterMergeToMain = helper.scopeHelper.cloneWorkspace(); }); @@ -61,7 +61,7 @@ describe('merge lanes - diverge functionality', function () { describe('switching to main and merging the lane to main without squash', () => { before(() => { helper.command.switchLocalLane('main'); - helper.command.mergeLane('dev', '--no-squash'); + helper.command.mergeLaneWithoutBuild('dev', '--no-squash'); }); it('head should have two parents', () => { const cat = helper.command.catComponent('comp1@latest'); @@ -79,7 +79,7 @@ describe('merge lanes - diverge functionality', function () { helper.scopeHelper.getClonedWorkspace(afterMergeToMain); helper.command.switchLocalLane('main'); beforeMergeHead = helper.command.getHead('comp1'); - helper.command.mergeLane('dev'); + helper.command.mergeLaneWithoutBuild('dev'); }); it('head should have one parents, which is the previous main head', () => { const cat = helper.command.catComponent('comp1@latest'); @@ -91,7 +91,7 @@ describe('merge lanes - diverge functionality', function () { describe('merge the lane without snapping', () => { before(() => { helper.scopeHelper.getClonedWorkspace(beforeMerge); - helper.command.mergeLane('main', '--auto-merge-resolve theirs --no-auto-snap -x'); + helper.command.mergeLaneWithoutBuild('main', '--auto-merge-resolve theirs --no-auto-snap -x'); }); it('should show the during-merge as modified', () => { const status = helper.command.statusJson(); @@ -123,7 +123,7 @@ describe('merge lanes - diverge functionality', function () { helper.command.export(); helper.scopeHelper.getClonedWorkspace(authorScope); - helper.command.mergeLane(`${helper.scopes.remote}/dev2`); + helper.command.mergeLaneWithoutBuild(`${helper.scopes.remote}/dev2`); helper.command.compile(); }); it('should save the latest versions from that lane into the local lane', () => { diff --git a/e2e/harmony/lanes/merge-lanes-edge-cases-2.e2e.ts b/e2e/harmony/lanes/merge-lanes-edge-cases-2.e2e.ts index 42688f2e754d..492b9406e210 100644 --- a/e2e/harmony/lanes/merge-lanes-edge-cases-2.e2e.ts +++ b/e2e/harmony/lanes/merge-lanes-edge-cases-2.e2e.ts @@ -57,7 +57,7 @@ describe('merge lanes - edge cases and special scenarios (part 2)', function () helper.command.snapAllComponentsWithoutBuild('--unmodified'); helper.command.export(); helper.command.switchLocalLane('main', '-x'); - helper.command.mergeLane('lane-a', '-x'); + helper.command.mergeLaneWithoutBuild('lane-a', '-x'); helper.command.tagAllWithoutBuild(); helper.command.export(); helper.command.switchLocalLane('lane-b', '-x'); @@ -90,7 +90,7 @@ describe('merge lanes - edge cases and special scenarios (part 2)', function () helper.scopeHelper.reInitWorkspace(); helper.scopeHelper.addRemoteScope(); helper.command.importLane('lane-a', '-x'); - helper.command.mergeLane('lane-b', '-x'); + helper.command.mergeLaneWithoutBuild('lane-b', '-x'); }); it('should get the rename from the other lane', () => { const file = path.join(helper.scopes.remote, 'comp1/foo.js'); @@ -129,7 +129,7 @@ describe('merge lanes - edge cases and special scenarios (part 2)', function () describe('merge the lane', () => { let mergeOutput: string; before(() => { - mergeOutput = helper.command.mergeLane('lane-b', '-x'); + mergeOutput = helper.command.mergeLaneWithoutBuild('lane-b', '-x'); }); it('expect to have all files as unchanged, not updated', () => { expect(mergeOutput).to.not.have.string('updated'); @@ -147,11 +147,11 @@ describe('merge lanes - edge cases and special scenarios (part 2)', function () helper.command.snapAllComponentsWithoutBuild('--unmodified'); helper.command.export(); helper.command.switchLocalLane('main', '-x'); - helper.command.mergeLane('lane-a', '-x'); + helper.command.mergeLaneWithoutBuild('lane-a', '-x'); helper.command.tagAllWithoutBuild('--unmodified'); helper.command.export(); helper.command.switchLocalLane('lane-a', '-x'); - helper.command.mergeLane('main', '-x'); + helper.command.mergeLaneWithoutBuild('main', '-x'); }); it('bit status should not show the component as modified', () => { const status = helper.command.statusJson(); @@ -196,7 +196,7 @@ describe('merge lanes - edge cases and special scenarios (part 2)', function () helper.command.tagAllWithoutBuild(); helper.command.export(); - mergeOutput = helper.command.mergeLane('dev', '-x --no-squash --auto-merge-resolve=manual'); + mergeOutput = helper.command.mergeLaneWithoutBuild('dev', '-x --no-squash --auto-merge-resolve=manual'); }); // previously in this case, it was marking it as "overridden" and was leaving the content as it was in the filesystem. it('should write the file with the conflicts', () => { @@ -217,7 +217,7 @@ describe('merge lanes - edge cases and special scenarios (part 2)', function () helper.command.export(); laneAWs = helper.scopeHelper.cloneWorkspace(); helper.command.switchLocalLane('main'); - helper.command.mergeLane('lane-a', '-x'); + helper.command.mergeLaneWithoutBuild('lane-a', '-x'); helper.command.export(); helper.fixtures.populateComponents(2); helper.command.tagAllWithoutBuild(); @@ -231,7 +231,7 @@ describe('merge lanes - edge cases and special scenarios (part 2)', function () helper.workspaceJsonc.addPolicyToDependencyResolver({ dependencies: { [comp2PkgName]: '0.0.1' } }); }); it('should remove the package from workspace.jsonc', () => { - helper.command.mergeLane('lane-b', '-x'); + helper.command.mergeLaneWithoutBuild('lane-b', '-x'); const policy = helper.workspaceJsonc.getPolicyFromDependencyResolver(); expect(policy.dependencies).to.not.have.property(comp2PkgName); }); @@ -255,7 +255,7 @@ describe('merge lanes - edge cases and special scenarios (part 2)', function () helper.command.tagAllWithoutBuild(); helper.command.export(); helper.command.switchLocalLane('dev', '-x'); - helper.command.mergeLane('main', '-x --manual'); + helper.command.mergeLaneWithoutBuild('main', '-x --manual'); helper.fixtures.populateComponents(3, true, 'fixed-conflicts'); oldSnapComp1 = helper.command.getHeadOfLane('dev', 'comp1'); snapComp2 = helper.command.getHeadOfLane('dev', 'comp2'); @@ -312,7 +312,7 @@ describe('merge lanes - edge cases and special scenarios (part 2)', function () }); describe('with --no-auto-snap', () => { before(() => { - helper.command.mergeLane('lane-b', '--no-auto-snap -x'); + helper.command.mergeLaneWithoutBuild('lane-b', '--no-auto-snap -x'); }); it('should update current lane according to the merged one', () => { const snap = helper.command.getHeadOfLane('lane-a', 'comp1'); @@ -326,7 +326,7 @@ describe('merge lanes - edge cases and special scenarios (part 2)', function () describe('with --no-snap', () => { before(() => { helper.scopeHelper.getClonedWorkspace(beforeMerge); - helper.command.mergeLane('lane-b', '--no-snap -x'); + helper.command.mergeLaneWithoutBuild('lane-b', '--no-snap -x'); }); it('should not update current lane according to the merged one', () => { const snap = helper.command.getHeadOfLane('lane-a', 'comp1'); @@ -385,7 +385,7 @@ describe('merge lanes - edge cases and special scenarios (part 2)', function () headOnLane = helper.command.getHeadOfLane('dev', 'comp1'); helper.command.export(); helper.command.switchLocalLane('main', '-x'); - helper.command.mergeLane('dev', '--detach-head -x'); + helper.command.mergeLaneWithoutBuild('dev', '--detach-head -x'); }); after(() => { helper.command.resetFeatures(); diff --git a/e2e/harmony/lanes/merge-lanes-edge-cases.e2e.ts b/e2e/harmony/lanes/merge-lanes-edge-cases.e2e.ts index ebe253e9ec92..2bbef3aea2ce 100644 --- a/e2e/harmony/lanes/merge-lanes-edge-cases.e2e.ts +++ b/e2e/harmony/lanes/merge-lanes-edge-cases.e2e.ts @@ -24,7 +24,7 @@ describe('merge lanes - edge cases and special scenarios', function () { helper.command.snapAllComponentsWithoutBuild('--unmodified'); helper.command.switchLocalLane('main'); helper.command.tagAllWithoutBuild('--unmodified'); - helper.command.mergeLane('dev', '--no-squash --tag'); + helper.command.mergeLaneWithoutBuild('dev', '--no-squash --tag'); }); it('should merge-tag instead of merge-snap', () => { const cmp = helper.command.catComponent('comp1'); @@ -67,7 +67,7 @@ describe('merge lanes - edge cases and special scenarios', function () { helper.command.export(); helper.command.switchLocalLane('main'); helper.command.createLane('dev2'); - helper.command.mergeLane('dev'); + helper.command.mergeLaneWithoutBuild('dev'); }); it('should merge', () => { const list = helper.command.listParsed(); @@ -83,11 +83,11 @@ describe('merge lanes - edge cases and special scenarios', function () { helper.command.snapAllComponentsWithoutBuild(); helper.command.export(); helper.command.switchLocalLane('main', '-x'); - helper.command.mergeLane('dev', '-x'); + helper.command.mergeLaneWithoutBuild('dev', '-x'); helper.command.tagAllWithoutBuild(); helper.command.export(); helper.command.switchLocalLane('dev', '-x'); - helper.command.mergeLane('main', '-x'); + helper.command.mergeLaneWithoutBuild('main', '-x'); }); // previously, it was throwing an error // id o5kaxkjd-remote/comp1@0.0.1 exists in flattenedEdges but not in flattened of o5kaxkjd-remote/comp1@6f820556b472253cd08331b20e704fe74217fd31 @@ -121,7 +121,7 @@ describe('merge lanes - edge cases and special scenarios', function () { }); describe('when the lane is merged to main, so currently on the FS the file exits', () => { before(() => { - helper.command.mergeLane('dev', '--no-squash --no-auto-snap -x'); + helper.command.mergeLaneWithoutBuild('dev', '--no-squash --no-auto-snap -x'); }); // previously the file was removed it('should not remove the file', () => { @@ -132,7 +132,7 @@ describe('merge lanes - edge cases and special scenarios', function () { before(() => { helper.scopeHelper.getClonedWorkspace(beforeMerge); helper.command.switchLocalLane('dev', '-x'); - helper.command.mergeLane('main', '--no-auto-snap -x'); + helper.command.mergeLaneWithoutBuild('main', '--no-auto-snap -x'); }); // previously it was in "remain-deleted" state and the file was not created it('should add the file', () => { @@ -164,7 +164,7 @@ describe('merge lanes - edge cases and special scenarios', function () { helper.scopeHelper.reInitWorkspace(); helper.scopeHelper.addRemoteScope(); - helper.command.mergeLane(`${helper.scopes.remote}/dev`, `-x`); + helper.command.mergeLaneWithoutBuild(`${helper.scopes.remote}/dev`, '-x'); const head = helper.command.getHead(`${helper.scopes.remote}/comp1`); // because comp3 is missing, this will re-fetch comp1 with all its dependencies, which could potentially override the version objects helper.command.import(`${helper.scopes.remote}/comp1@${head} --objects --fetch-deps`); @@ -208,7 +208,7 @@ describe('merge lanes - edge cases and special scenarios', function () { describe('merging the entire lane', () => { before(() => { helper.scopeHelper.getClonedWorkspace(beforeMerge); - helper.command.mergeLane(`${helper.scopes.remote}/dev`, `--no-squash -x`); + helper.command.mergeLaneWithoutBuild(`${helper.scopes.remote}/dev`, '--no-squash -x'); }); // previously it was throwing VersionNotFound it('bit export should not throw', () => { @@ -229,7 +229,7 @@ describe('merge lanes - edge cases and special scenarios', function () { helper.command.snapAllComponentsWithoutBuild(); helper.command.export(); helper.command.switchLocalLane('lane-a', '-x'); - helper.command.mergeLane('lane-b', '-x'); + helper.command.mergeLaneWithoutBuild('lane-b', '-x'); helper.command.export(); }); // previous bug was ignoring the new component on the remote during export because the snap was already on the remote. @@ -262,7 +262,7 @@ describe('merge lanes - edge cases and special scenarios', function () { const laneBWs = helper.scopeHelper.cloneWorkspace(); helper.scopeHelper.getClonedWorkspace(mainWs); - helper.command.mergeLane(`${anotherRemote}/lane-a`, '-x'); + helper.command.mergeLaneWithoutBuild(`${anotherRemote}/lane-a`, '-x'); helper.command.snapAllComponentsWithoutBuild('--unmodified'); helper.command.snapAllComponentsWithoutBuild('--unmodified'); helper.command.tagAllWithoutBuild('--unmodified'); @@ -270,7 +270,7 @@ describe('merge lanes - edge cases and special scenarios', function () { helper.scopeHelper.getClonedWorkspace(laneBWs); helper.command.snapAllComponentsWithoutBuild('--unmodified'); - helper.command.mergeLane(`main ${helper.scopes.remote}/comp1`, '-x'); + helper.command.mergeLaneWithoutBuild(`main ${helper.scopes.remote}/comp1`, '-x'); }); it('should not throw ComponentNotFound on export', () => { expect(() => helper.command.export()).to.not.throw(); @@ -294,7 +294,7 @@ describe('merge lanes - edge cases and special scenarios', function () { helper.scopeHelper.reInitWorkspace(); helper.scopeHelper.addRemoteScope(); helper.command.createLane('lane-b'); - helper.command.mergeLane(`${helper.scopes.remote}/lane-a`, '-x'); + helper.command.mergeLaneWithoutBuild(`${helper.scopes.remote}/lane-a`, '-x'); // @todo: fix. currently, it throws an error about missing version helper.command.importComponent('comp1', '--all-history --objects'); @@ -322,7 +322,7 @@ describe('merge lanes - edge cases and special scenarios', function () { headLaneB = helper.command.getHeadOfLane('lane-b', 'comp1'); helper.command.export(); helper.command.switchLocalLane('lane-a', '-x'); - helper.command.mergeLane('lane-b', '--squash -x'); + helper.command.mergeLaneWithoutBuild('lane-b', '--squash -x'); }); it('bit log should not include previous versions from lane-b', () => { const log = helper.command.log('comp1'); @@ -357,7 +357,7 @@ describe('merge lanes - edge cases and special scenarios', function () { helper.scopeHelper.reInitWorkspace(); helper.scopeHelper.addRemoteScope(); helper.command.createLane('lane-b'); - helper.command.mergeLane(`${helper.scopes.remote}/lane-a`, '--squash -x'); + helper.command.mergeLaneWithoutBuild(`${helper.scopes.remote}/lane-a`, '--squash -x'); headLaneB = helper.command.getHeadOfLane('lane-b', 'comp1'); }); // previously it was throwing NoCommonSnap error @@ -396,7 +396,7 @@ describe('merge lanes - edge cases and special scenarios', function () { describe('when main is still at the base (fast-forward)', () => { let mergeOutput: string; before(() => { - mergeOutput = helper.command.mergeLane('lane-a', '-x --no-auto-snap'); + mergeOutput = helper.command.mergeLaneWithoutBuild('lane-a', '-x --no-auto-snap'); }); it('should indicate that this file was removed in the output', () => { expect(mergeOutput).to.have.string('removed foo.js'); @@ -411,7 +411,7 @@ describe('merge lanes - edge cases and special scenarios', function () { helper.scopeHelper.getClonedWorkspace(beforeMerge); helper.command.tagAllWithoutBuild('--unmodified'); helper.command.export(); - mergeOutput = helper.command.mergeLane('lane-a', '-x --no-auto-snap --no-squash'); + mergeOutput = helper.command.mergeLaneWithoutBuild('lane-a', '-x --no-auto-snap --no-squash'); }); it('should indicate that this file was removed in the output', () => { expect(mergeOutput).to.have.string('removed foo.js'); diff --git a/e2e/harmony/lanes/merge-lanes-main.e2e.ts b/e2e/harmony/lanes/merge-lanes-main.e2e.ts index 00965b125f0d..4903ed5fa643 100644 --- a/e2e/harmony/lanes/merge-lanes-main.e2e.ts +++ b/e2e/harmony/lanes/merge-lanes-main.e2e.ts @@ -21,7 +21,7 @@ describe('merge lanes - main lane operations', function () { helper.command.createLane('dev'); helper.fixtures.populateComponents(1); helper.command.snapAllComponentsWithoutBuild(); - mergeOutput = helper.command.mergeLane('main'); + mergeOutput = helper.command.mergeLaneWithoutBuild('main'); }); it("should not throw an error that main lane doesn't exist", () => { expect(mergeOutput).to.not.have.string('unable to switch to "main", the lane was not found'); @@ -36,14 +36,14 @@ describe('merge lanes - main lane operations', function () { helper.command.snapAllComponentsWithoutBuild(); helper.command.export(); helper.command.switchLocalLane('main', '-x'); - helper.command.mergeLane('dev'); + helper.command.mergeLaneWithoutBuild('dev'); helper.command.tagAllWithoutBuild(); helper.command.export(); helper.command.switchLocalLane('dev'); helper.command.softRemoveOnLane('comp1'); }); it('should show a descriptive error explaining why it cannot be merged', () => { - const cmd = () => helper.command.mergeLane('main', '-x'); + const cmd = () => helper.command.mergeLaneWithoutBuild('main', '-x'); expect(cmd).to.throw('component is locally deleted'); }); }); @@ -58,7 +58,7 @@ describe('merge lanes - main lane operations', function () { helper.command.createLane('dev'); helper.fixtures.populateComponents(1, undefined, 'version2'); helper.command.snapAllComponentsWithoutBuild(); - mergeOutput = helper.command.mergeLane('main'); + mergeOutput = helper.command.mergeLaneWithoutBuild('main'); }); it("should not throw an error that main lane doesn't exist", () => { expect(mergeOutput).to.not.have.string('getDivergeData: unable to find Version 0.0.1 of comp1'); @@ -103,7 +103,7 @@ describe('merge lanes - main lane operations', function () { describe('with --exclude-non-lane-comps flag', () => { before(() => { helper.scopeHelper.getClonedWorkspace(laneWs); - helper.command.mergeLane('main', '--exclude-non-lane-comps -x'); + helper.command.mergeLaneWithoutBuild('main', '--exclude-non-lane-comps -x'); }); it('should not add non-lane components into the lane', () => { const lane = helper.command.showOneLaneParsed('dev'); @@ -127,7 +127,7 @@ describe('merge lanes - main lane operations', function () { describe('without --exclude-non-lane-comps flag', () => { before(() => { helper.scopeHelper.getClonedWorkspace(laneWs); - helper.command.mergeLane('main', '-x'); + helper.command.mergeLaneWithoutBuild('main', '-x'); }); it('should not add non-lane components into the lane', () => { const lane = helper.command.showOneLaneParsed('dev'); @@ -174,7 +174,7 @@ describe('merge lanes - main lane operations', function () { helper.scopeHelper.setWorkspaceWithRemoteScope(); helper.fixtures.populateComponents(1); helper.command.createLane('dev'); - mergeOutput = helper.command.mergeLane('main'); + mergeOutput = helper.command.mergeLaneWithoutBuild('main'); }); it('should not throw an error about missing objects', () => { expect(mergeOutput).to.not.have.string( @@ -191,7 +191,7 @@ describe('merge lanes - main lane operations', function () { helper.command.createLane('dev'); helper.command.snapAllComponentsWithoutBuild(); helper.command.switchLocalLane('main'); - mergeOutput = helper.command.mergeLane('dev'); + mergeOutput = helper.command.mergeLaneWithoutBuild('dev'); }); it('should not throw an error that head is empty', () => { expect(mergeOutput).to.have.string('successfully merged'); diff --git a/e2e/harmony/lanes/merge-lanes-partial.e2e.ts b/e2e/harmony/lanes/merge-lanes-partial.e2e.ts index e55b141476cd..53d0db6218b0 100644 --- a/e2e/harmony/lanes/merge-lanes-partial.e2e.ts +++ b/e2e/harmony/lanes/merge-lanes-partial.e2e.ts @@ -32,13 +32,13 @@ describe('merge lanes - partial merge functionality', function () { }); describe('without --include-deps', () => { it('should throw an error asking to enter --include-deps flag', () => { - const mergeFn = () => helper.command.mergeLane('dev', `--pattern ${helper.scopes.remote}/comp2`); + const mergeFn = () => helper.command.mergeLaneWithoutBuild('dev', `--pattern ${helper.scopes.remote}/comp2`); expect(mergeFn).to.throw('consider adding "--include-deps" flag'); }); }); describe('with --include-deps', () => { before(() => { - helper.command.mergeLane('dev', `--pattern ${helper.scopes.remote}/comp2 --include-deps`); + helper.command.mergeLaneWithoutBuild('dev', `--pattern ${helper.scopes.remote}/comp2 --include-deps`); }); it('should not merge components that were not part of the patterns nor part of the pattern dependencies', () => { const comp1Head = helper.command.getHead(`${helper.scopes.remote}/comp1`); diff --git a/e2e/harmony/lanes/merge-lanes-remote.e2e.ts b/e2e/harmony/lanes/merge-lanes-remote.e2e.ts index b5944556cb0e..6a57b972868d 100644 --- a/e2e/harmony/lanes/merge-lanes-remote.e2e.ts +++ b/e2e/harmony/lanes/merge-lanes-remote.e2e.ts @@ -30,7 +30,7 @@ describe('merge lanes - remote lane operations', function () { before(() => { helper.scopeHelper.reInitWorkspace(); helper.scopeHelper.addRemoteScope(); - helper.command.mergeLane(`${helper.scopes.remote}/dev`); + helper.command.mergeLaneWithoutBuild(`${helper.scopes.remote}/dev`); }); it('should save the files to the filesystem', () => { helper.fs.outputFile('app.js', fixtures.appPrintComp1(helper.scopes.remote)); @@ -69,7 +69,7 @@ describe('merge lanes - remote lane operations', function () { before(() => { helper.scopeHelper.reInitWorkspace(); helper.scopeHelper.addRemoteScope(); - mergeOutput = helper.command.mergeLane(`${helper.scopes.remote}/dev`, `--workspace --verbose`); + mergeOutput = helper.command.mergeLaneWithoutBuild(`${helper.scopes.remote}/dev`, '--workspace --verbose'); }); it('should indicate that the components were not merge because they are not in the workspace', () => { expect(mergeOutput).to.have.string('merge skipped'); @@ -104,7 +104,7 @@ describe('merge lanes - remote lane operations', function () { importedScope = helper.scopeHelper.cloneWorkspace(); helper.scopeHelper.getClonedWorkspace(authorScope); helper.fixtures.populateComponents(undefined, undefined, ' v2'); - helper.command.snapAllComponents(); + helper.command.snapAllComponentsWithoutBuild(); helper.command.exportLane(); helper.scopeHelper.getClonedWorkspace(importedScope); diff --git a/e2e/harmony/lanes/merge-lanes-squash-diverge.e2e.ts b/e2e/harmony/lanes/merge-lanes-squash-diverge.e2e.ts index 9a2de869095d..93bcaa31a79a 100644 --- a/e2e/harmony/lanes/merge-lanes-squash-diverge.e2e.ts +++ b/e2e/harmony/lanes/merge-lanes-squash-diverge.e2e.ts @@ -44,7 +44,7 @@ describe('merge lanes - squash on diverged', function () { helper.scopeHelper.getClonedWorkspace(laneAWorkspace); helper.command.import(); - helper.command.mergeLane('lane-b', '--squash --auto-merge-resolve theirs'); + helper.command.mergeLaneWithoutBuild('lane-b', '--squash --auto-merge-resolve theirs'); mergeSnap = helper.command.getHeadOfLane('lane-a', 'comp1'); }); @@ -110,7 +110,7 @@ describe('merge lanes - squash on diverged', function () { helper.scopeHelper.getClonedWorkspace(laneAWorkspace); helper.command.import(); - helper.command.mergeLane(`${scopeB}/lane-b`, '--squash --auto-merge-resolve theirs'); + helper.command.mergeLaneWithoutBuild(`${scopeB}/lane-b`, '--squash --auto-merge-resolve theirs'); mergeSnap = helper.command.getHeadOfLane('lane-a', 'comp1'); helper.command.export(); scopeAAfterExport = helper.scopeHelper.cloneWorkspace(); @@ -181,7 +181,7 @@ describe('merge lanes - squash on diverged', function () { // return to the lane-a workspace and re-merge lane-b helper.scopeHelper.getClonedWorkspace(scopeAAfterExport); helper.command.import(); - helper.command.mergeLane(`${scopeB}/lane-b`, '--squash --auto-merge-resolve theirs'); + helper.command.mergeLaneWithoutBuild(`${scopeB}/lane-b`, '--squash --auto-merge-resolve theirs'); secondMergeSnap = helper.command.getHeadOfLane('lane-a', 'comp1'); }); @@ -247,7 +247,7 @@ describe('merge lanes - squash on diverged', function () { helper.command.export(); // merge dev into main with --squash on a diverged history (pre-PR this threw) - helper.command.mergeLane('dev', '--squash --auto-merge-resolve theirs'); + helper.command.mergeLaneWithoutBuild('dev', '--squash --auto-merge-resolve theirs'); mergeSnap = helper.command.getHead('comp1'); }); @@ -323,7 +323,7 @@ describe('merge lanes - squash on diverged', function () { helper.command.export(); // diverged squash from main side: dev lives on scope-b, main on scope-a - helper.command.mergeLane(`${scopeB}/dev`, '--squash --auto-merge-resolve theirs'); + helper.command.mergeLaneWithoutBuild(`${scopeB}/dev`, '--squash --auto-merge-resolve theirs'); mergeSnap = helper.command.getHead('comp1'); helper.command.export(); // merge snap → scope-a (main's home) }); @@ -394,7 +394,7 @@ describe('merge lanes - squash on diverged', function () { helper.command.export(); helper.command.switchLocalLane('lane-a'); - helper.command.mergeLane('lane-b', '--squash --auto-merge-resolve theirs'); + helper.command.mergeLaneWithoutBuild('lane-b', '--squash --auto-merge-resolve theirs'); mergeSnap = helper.command.getHeadOfLane('lane-a', 'comp1'); }); diff --git a/e2e/harmony/lanes/merge-lanes-squash.e2e.ts b/e2e/harmony/lanes/merge-lanes-squash.e2e.ts index 26fa7686ed6f..3672340d74bb 100644 --- a/e2e/harmony/lanes/merge-lanes-squash.e2e.ts +++ b/e2e/harmony/lanes/merge-lanes-squash.e2e.ts @@ -34,7 +34,7 @@ describe('merge lanes - squash functionality', function () { before(() => { headOnLane = helper.command.getHeadOfLane('dev', 'comp1'); helper.command.switchLocalLane('main'); - helper.command.mergeLane('dev'); + helper.command.mergeLaneWithoutBuild('dev'); }); it('should not add the squashed prop into the version object', () => { const head = helper.command.catComponent(`comp1@${headOnLane}`); @@ -50,7 +50,7 @@ describe('merge lanes - squash functionality', function () { helper.command.snapAllComponentsWithoutBuild('--unmodified'); headOnLane = helper.command.getHeadOfLane('dev', 'comp1'); helper.command.switchLocalLane('main'); - helper.command.mergeLane('dev'); + helper.command.mergeLaneWithoutBuild('dev'); }); // the history before the merge is the tag + 3 snaps it('should squash the snaps and leave only the last one', () => { @@ -77,7 +77,7 @@ describe('merge lanes - squash functionality', function () { helper.scopeHelper.reInitWorkspace(); helper.scopeHelper.addRemoteScope(); - helper.command.mergeLane(`${helper.scopes.remote}/dev`, '--skip-dependency-installation'); + helper.command.mergeLaneWithoutBuild(`${helper.scopes.remote}/dev`, '--skip-dependency-installation'); }); // previously it was throwing "the component X has no versions and the head is empty" it('should be able to run bit-import', () => { diff --git a/e2e/harmony/lanes/merge-lanes-unrelated.e2e.ts b/e2e/harmony/lanes/merge-lanes-unrelated.e2e.ts index a6052034d772..a0c474110b04 100644 --- a/e2e/harmony/lanes/merge-lanes-unrelated.e2e.ts +++ b/e2e/harmony/lanes/merge-lanes-unrelated.e2e.ts @@ -54,13 +54,13 @@ describe('merge lanes - unrelated components', function () { }); describe('bit lane merge without --resolve-unrelated flag', () => { it('should throw', () => { - expect(() => helper.command.mergeLane('main')).to.throw("don't have any snap in common"); + expect(() => helper.command.mergeLaneWithoutBuild('main')).to.throw("don't have any snap in common"); }); }); describe('bit lane merge with --resolve-unrelated', () => { let mergeOutput: string; before(() => { - mergeOutput = helper.command.mergeLane('main', '--resolve-unrelated'); + mergeOutput = helper.command.mergeLaneWithoutBuild('main', '--resolve-unrelated'); }); it('should merge successfully', () => { expect(mergeOutput).to.have.string('successfully merged'); @@ -92,7 +92,7 @@ describe('merge lanes - unrelated components', function () { helper.scopeHelper.getClonedRemoteScope(remoteScopeAfterExport); helper.scopeHelper.getClonedWorkspace(afterLaneExport); helper.command.import(); - helper.command.mergeLane('main', '--resolve-unrelated --no-auto-snap'); + helper.command.mergeLaneWithoutBuild('main', '--resolve-unrelated --no-auto-snap'); }); it('bit status should show the component as during-merge and staged and not everywhere else', () => { helper.command.expectStatusToBeClean(['componentsDuringMergeState', 'stagedComponents']); @@ -126,7 +126,7 @@ describe('merge lanes - unrelated components', function () { helper.scopeHelper.getClonedRemoteScope(remoteScopeAfterExport); helper.scopeHelper.getClonedWorkspace(afterLaneExport); helper.command.import(); - helper.command.mergeLane('main', '--resolve-unrelated theirs --no-auto-snap'); + helper.command.mergeLaneWithoutBuild('main', '--resolve-unrelated theirs --no-auto-snap'); }); it('should take the file content from the other side, as asked by the "theirs" strategy', () => { const file = helper.fs.readFile('comp1/index.js'); @@ -145,11 +145,11 @@ describe('merge lanes - unrelated components', function () { helper.command.export(); helper.command.switchLocalLane('dev'); helper.command.import(); - helper.command.mergeLane('main', '--resolve-unrelated'); + helper.command.mergeLaneWithoutBuild('main', '--resolve-unrelated'); laneHeadAfterMerge = helper.command.getHeadOfLane('dev', 'comp1'); helper.command.export(); beforeMergingSecondLane = helper.scopeHelper.cloneWorkspace(); - helper.command.mergeLane('dev2', '--resolve-unrelated'); + helper.command.mergeLaneWithoutBuild('dev2', '--resolve-unrelated'); }); it('should keep the local history and not the dev2 history because the current history has been already resolved', () => { const log = helper.command.logParsed('comp1'); @@ -177,7 +177,7 @@ describe('merge lanes - unrelated components', function () { helper.command.import(); }); it('should be able to merge with no errors', () => { - expect(() => helper.command.mergeLane('dev2', '--resolve-unrelated')).to.not.throw(); + expect(() => helper.command.mergeLaneWithoutBuild('dev2', '--resolve-unrelated')).to.not.throw(); }); }); }); @@ -207,7 +207,7 @@ describe('merge lanes - unrelated components', function () { helper.command.export(); }); it('should not throw', () => { - expect(() => helper.command.mergeLane('main')).to.not.throw(); + expect(() => helper.command.mergeLaneWithoutBuild('main')).to.not.throw(); }); }); // dev: snapA -> export -> snapB -> snapC -> merge-snap. @@ -219,7 +219,7 @@ describe('merge lanes - unrelated components', function () { helper.command.import(); helper.command.snapAllComponentsWithoutBuild('--unmodified'); helper.command.snapAllComponentsWithoutBuild('--unmodified'); - helper.command.mergeLane('main', '--resolve-unrelated -x'); + helper.command.mergeLaneWithoutBuild('main', '--resolve-unrelated -x'); }); // previously, this was throwing NoCommonSnap error, because getDivergeData was comparing the remote-lane-head // (snapA) with the current merge-snap. The current merge-snap has one parent - head of main. The remote-lane-head has @@ -257,7 +257,7 @@ describe('merge lanes - unrelated components', function () { helper.command.snapAllComponentsWithoutBuild(); helper.command.export(); - helper.command.mergeLane('lane-a', '-x'); + helper.command.mergeLaneWithoutBuild('lane-a', '-x'); }); it('should not throw during bit-import because it tries to import comp1 from the original scope instead of the lane scope', () => { expect(() => helper.command.import()).to.not.throw(); @@ -287,7 +287,7 @@ describe('merge lanes - unrelated components', function () { }); describe('without specifying strategy, which defaults to "ours"', () => { before(() => { - helper.command.mergeLane('lane-a', '--resolve-unrelated -x'); + helper.command.mergeLaneWithoutBuild('lane-a', '--resolve-unrelated -x'); }); it('should resolve by default by ours', () => { const fileContent = helper.fs.readFile('comp1/index.js'); @@ -307,7 +307,7 @@ describe('merge lanes - unrelated components', function () { describe('with strategy theirs', () => { before(() => { helper.scopeHelper.getClonedWorkspace(beforeMerge); - helper.command.mergeLane('lane-a', '--resolve-unrelated=theirs -x'); + helper.command.mergeLaneWithoutBuild('lane-a', '--resolve-unrelated=theirs -x'); }); it('should get the file content according to their', () => { const fileContent = helper.fs.readFile('comp1/index.js'); @@ -341,7 +341,7 @@ describe('merge lanes - unrelated components', function () { helper.fs.outputFile('comp1/index.js', ''); helper.command.snapAllComponentsWithoutBuild(); helper.command.export(); - helper.command.mergeLane('dev2'); + helper.command.mergeLaneWithoutBuild('dev2'); }); it('should not bring the removed components', () => { const bitMap = helper.bitMap.read(); @@ -364,7 +364,7 @@ describe('merge lanes - unrelated components', function () { helper.fs.outputFile('comp1/index.js', ''); helper.command.snapAllComponentsWithoutBuild(); helper.command.export(); - helper.command.mergeLane('dev2'); + helper.command.mergeLaneWithoutBuild('dev2'); }); // by design, a component the local lane soft-removed is not brought back by the merge even when // the other lane diverged - so there is deliberately no assertion here that comp2 returns or is diff --git a/e2e/harmony/lanes/remove-lanes.e2e.ts b/e2e/harmony/lanes/remove-lanes.e2e.ts index bf1f1f79bfa2..6db5bd632bea 100644 --- a/e2e/harmony/lanes/remove-lanes.e2e.ts +++ b/e2e/harmony/lanes/remove-lanes.e2e.ts @@ -78,7 +78,7 @@ describe('remove lanes', function () { let output; before(() => { helper.scopeHelper.getClonedWorkspace(beforeRemove); - helper.command.mergeLane('dev'); + helper.command.mergeLaneWithoutBuild('dev'); output = helper.command.removeLane('dev'); }); it('should remove the lane successfully', () => { diff --git a/e2e/harmony/lanes/unrelated-and-removed.e2e.ts b/e2e/harmony/lanes/unrelated-and-removed.e2e.ts index b39b2f140e6d..313db3d39730 100644 --- a/e2e/harmony/lanes/unrelated-and-removed.e2e.ts +++ b/e2e/harmony/lanes/unrelated-and-removed.e2e.ts @@ -31,7 +31,7 @@ describe('current lane a comp is removed, merging a lane that has this comp with helper.command.export(); headOnLaneB = helper.command.getHeadOfLane('lane-b', 'comp1'); - helper.command.mergeLane('lane-a', '--resolve-unrelated -x'); + helper.command.mergeLaneWithoutBuild('lane-a', '--resolve-unrelated -x'); }); after(() => { helper.scopeHelper.destroy(); diff --git a/e2e/harmony/merge-config.e2e.ts b/e2e/harmony/merge-config.e2e.ts index ee2ada438f59..97f79e852041 100644 --- a/e2e/harmony/merge-config.e2e.ts +++ b/e2e/harmony/merge-config.e2e.ts @@ -107,7 +107,7 @@ describe('merge config scenarios', function () { helper.scopeHelper.getClonedWorkspace(mainBeforeDiverge); helper.command.snapAllComponentsWithoutBuild('--unmodified'); helper.command.export(); - helper.command.mergeLane( + helper.command.mergeLaneWithoutBuild( `${helper.scopes.remote}/dev`, '--no-auto-snap --skip-dependency-installation --no-squash' ); @@ -150,7 +150,7 @@ describe('merge config scenarios', function () { helper.scopeHelper.reInitWorkspace(); helper.scopeHelper.addRemoteScope(); helper.command.importLane('dev'); - helper.command.mergeLane('main', '--no-auto-snap --skip-dependency-installation'); + helper.command.mergeLaneWithoutBuild('main', '--no-auto-snap --skip-dependency-installation'); beforeConfigResolved = helper.scopeHelper.cloneWorkspace(); }); it('bit status should show the component with an issue of MergeConfigHasConflict', () => { @@ -214,7 +214,7 @@ describe('merge config scenarios', function () { helper.scopeHelper.addRemoteScope(); helper.command.importLane('dev', '--skip-dependency-installation'); beforeMerge = helper.scopeHelper.cloneWorkspace(); - helper.command.mergeLane('main', '--no-auto-snap --skip-dependency-installation'); + helper.command.mergeLaneWithoutBuild('main', '--no-auto-snap --skip-dependency-installation'); beforeConfigResolved = helper.scopeHelper.cloneWorkspace(); }); it('bit status should show the component with an issue of MergeConfigHasConflict', () => { @@ -251,7 +251,10 @@ describe('merge config scenarios', function () { describe('merging with --auto-merge-resolve ours', () => { before(() => { helper.scopeHelper.getClonedWorkspace(beforeMerge); - helper.command.mergeLane('main', '--no-auto-snap --skip-dependency-installation --auto-merge-resolve=ours'); + helper.command.mergeLaneWithoutBuild( + 'main', + '--no-auto-snap --skip-dependency-installation --auto-merge-resolve=ours' + ); }); it('should not generate the config-merge file', () => { const configMerge = helper.general.getConfigMergePath(); @@ -267,7 +270,10 @@ describe('merge config scenarios', function () { describe('merging with --auto-merge-resolve theirs', () => { before(() => { helper.scopeHelper.getClonedWorkspace(beforeMerge); - helper.command.mergeLane('main', '--no-auto-snap --skip-dependency-installation --auto-merge-resolve=theirs'); + helper.command.mergeLaneWithoutBuild( + 'main', + '--no-auto-snap --skip-dependency-installation --auto-merge-resolve=theirs' + ); }); it('should not generate the config-merge file', () => { const configMerge = helper.general.getConfigMergePath(); @@ -299,7 +305,7 @@ describe('merge config scenarios', function () { helper.command.snapAllComponentsWithoutBuild('--unmodified'); helper.command.export(); - helper.command.mergeLane('dev', '--no-auto-snap -x --no-squash'); + helper.command.mergeLaneWithoutBuild('dev', '--no-auto-snap -x --no-squash'); }); // previously, it was ignoring the previous config and only adding "ramda". it('should not remove the packages it had previously via deps set', () => { @@ -334,7 +340,10 @@ describe('merge config scenarios', function () { helper.scopeHelper.reInitWorkspace(); helper.scopeHelper.addRemoteScope(); helper.command.importLane('dev', '--skip-dependency-installation'); - helper.command.mergeLane('main', '--no-auto-snap --skip-dependency-installation --ignore-config-changes'); + helper.command.mergeLaneWithoutBuild( + 'main', + '--no-auto-snap --skip-dependency-installation --ignore-config-changes' + ); beforeConfigResolved = helper.scopeHelper.cloneWorkspace(); }); it('bit status should show the component with an issue of MergeConfigHasConflict', () => { @@ -397,7 +406,7 @@ describe('merge config scenarios', function () { helper.scopeHelper.reInitWorkspace(); helper.scopeHelper.addRemoteScope(); helper.command.importLane('dev', '--skip-dependency-installation'); - helper.command.mergeLane('main', '--no-auto-snap --skip-dependency-installation'); + helper.command.mergeLaneWithoutBuild('main', '--no-auto-snap --skip-dependency-installation'); beforeConfigResolved = helper.scopeHelper.cloneWorkspace(); }); it('bit status should show the component with an issue of MergeConfigHasConflict', () => { @@ -750,7 +759,10 @@ describe('merge config scenarios', function () { helper.scopeHelper.reInitWorkspace(); helper.scopeHelper.addRemoteScope(); helper.command.importLane('dev', '--skip-dependency-installation'); - helper.command.mergeLane('main', '--no-auto-snap --skip-dependency-installation --ignore-config-changes'); + helper.command.mergeLaneWithoutBuild( + 'main', + '--no-auto-snap --skip-dependency-installation --ignore-config-changes' + ); }); it('should not delete the previously deps set', () => { const deps = helper.command.getCompDepsIdsFromData('comp1'); @@ -792,7 +804,7 @@ describe('merge config scenarios', function () { helper.scopeHelper.addRemoteScope(); helper.command.importLane('dev', '--skip-dependency-installation'); helper.npm.addFakeNpmPackage('ramda', '0.31.0'); - helper.command.mergeLane('main', '--no-auto-snap --skip-dependency-installation'); + helper.command.mergeLaneWithoutBuild('main', '--no-auto-snap --skip-dependency-installation'); }); // This is the bug fix: when config is unchanged between current/other/base, // but auto deps are being merged, the unchanged force:true deps should be preserved diff --git a/e2e/harmony/new.e2e.ts b/e2e/harmony/new.e2e.ts index 0b779d512b84..f2d026be8e48 100644 --- a/e2e/harmony/new.e2e.ts +++ b/e2e/harmony/new.e2e.ts @@ -39,7 +39,7 @@ describe('new command', function () { ); helper.fs.outputFile(starterPath, updatedIndex); - helper.command.tagAllComponents(); + helper.command.tagAllWithoutBuild(); helper.command.export(); helper.scopeHelper.cleanWorkspace(); // it deletes all content without bit-init diff --git a/e2e/harmony/pkg-manager-config.e2e.ts b/e2e/harmony/pkg-manager-config.e2e.ts index 058250f246c5..17d4006ecdb1 100644 --- a/e2e/harmony/pkg-manager-config.e2e.ts +++ b/e2e/harmony/pkg-manager-config.e2e.ts @@ -23,7 +23,7 @@ import { readModulesManifest } from '../modules-manifest'; envId1 = `${helper.scopes.remote}/${envName1}`; helper.command.install('lodash.get lodash.flatten'); helper.command.compile(); - helper.command.tagAllComponents(); + helper.command.tagAllWithoutBuild(); helper.command.export(); helper.scopeHelper.reInitWorkspace(); diff --git a/e2e/harmony/recover.e2e.ts b/e2e/harmony/recover.e2e.ts index d42964e44454..888e532b755b 100644 --- a/e2e/harmony/recover.e2e.ts +++ b/e2e/harmony/recover.e2e.ts @@ -255,12 +255,12 @@ describe('bit recover command', function () { helper.command.export(); helper.command.switchLocalLane('lane-b', '-x'); - helper.command.mergeLane('lane-a', '-x'); + helper.command.mergeLaneWithoutBuild('lane-a', '-x'); helper.command.recover(`${helper.scopes.remote}/comp1`); helper.command.snapAllComponentsWithoutBuild(); helper.command.export(); helper.command.switchLocalLane('lane-a', '-x'); - helper.command.mergeLane('lane-b'); + helper.command.mergeLaneWithoutBuild('lane-b'); }); it('should bring back the previously removed component', () => { const list = helper.command.listParsed(); diff --git a/e2e/harmony/relative-paths.e2e.ts b/e2e/harmony/relative-paths.e2e.ts index 4e3fbdd7033f..8a2464c5cd0e 100644 --- a/e2e/harmony/relative-paths.e2e.ts +++ b/e2e/harmony/relative-paths.e2e.ts @@ -47,7 +47,7 @@ describe('relative paths flow (components requiring each other by relative paths let tagOutput; before(() => { helper.command.compile(); - tagOutput = helper.command.tagAllComponents(); + tagOutput = helper.command.tagAllWithoutBuild(); }); it('should allow tagging the component', () => { expect(tagOutput).to.have.string('2 component(s) tagged'); diff --git a/e2e/harmony/set-default-owner-and-scope.e2e.ts b/e2e/harmony/set-default-owner-and-scope.e2e.ts index 0f4ee899ebcc..1b744a8eebf5 100644 --- a/e2e/harmony/set-default-owner-and-scope.e2e.ts +++ b/e2e/harmony/set-default-owner-and-scope.e2e.ts @@ -35,7 +35,7 @@ describe('set default owner and scope', function () { helper.command.addComponent('utils', { i: 'utils/is-type' }); const rawLinkOutput = helper.command.link('-j'); parsedLinkOutput = JSON.parse(rawLinkOutput); - helper.command.tagAllComponents(); + helper.command.tagAllWithoutBuild(); }); it('should create link with default owner as prefix', () => { const linkFolderPath = path.normalize(`node_modules/${componentPackageName}`); diff --git a/e2e/harmony/snap.e2e.ts b/e2e/harmony/snap.e2e.ts index 8206553abc38..87bb3abce8ec 100644 --- a/e2e/harmony/snap.e2e.ts +++ b/e2e/harmony/snap.e2e.ts @@ -23,7 +23,7 @@ describe('bit snap command', function () { helper.scopeHelper.reInitWorkspace(); helper.fixtures.createComponentBarFoo(); helper.fixtures.addComponentBarFoo(); - output = helper.command.snapComponent('bar/foo'); + output = helper.command.snapComponentWithoutBuild('bar/foo'); }); it('should snap successfully', () => { expect(output).to.have.string('1 component(s) snapped'); @@ -47,7 +47,7 @@ describe('bit snap command', function () { let tagOutput: string; before(() => { helper.fixtures.createComponentBarFoo(fixtures.fooFixtureV2); - tagOutput = helper.command.tagAllComponents(); + tagOutput = helper.command.tagAllWithoutBuild(); }); it('should tag successfully', () => { expect(tagOutput).to.have.string('1 component(s) tagged'); @@ -60,8 +60,8 @@ describe('bit snap command', function () { describe('then snap and tag again', () => { let secondTagOutput; before(() => { - helper.command.snapComponent('bar/foo', undefined, '--unmodified'); - secondTagOutput = helper.command.tagComponent('bar/foo', undefined, '--unmodified'); + helper.command.snapComponentWithoutBuild('bar/foo', '--unmodified'); + secondTagOutput = helper.command.tagWithoutBuild('bar/foo', '--unmodified'); }); it('should tag the next version', () => { expect(secondTagOutput).to.have.string('0.0.2'); @@ -78,7 +78,7 @@ describe('bit snap command', function () { before(() => { helper.scopeHelper.setWorkspaceWithRemoteScope(); helper.fixtures.populateComponents(); - helper.command.snapAllComponents(); + helper.command.snapAllComponentsWithoutBuild(); }); it('should save the dependencies successfully with their snaps as versions', () => { const barFoo = helper.command.catComponent('comp1@latest'); @@ -111,10 +111,10 @@ describe('bit snap command', function () { helper.scopeHelper.reInitWorkspace(); helper.fixtures.createComponentBarFoo(); helper.fixtures.addComponentBarFoo(); - helper.command.snapComponent('bar/foo', undefined, '--unmodified'); + helper.command.snapComponentWithoutBuild('bar/foo', '--unmodified'); const compAfterSnap1 = helper.command.catComponent('bar/foo'); firstSnap = compAfterSnap1.head; - helper.command.snapComponent('bar/foo', undefined, '--unmodified'); + helper.command.snapComponentWithoutBuild('bar/foo', '--unmodified'); }); describe('untag the head snap', () => { before(() => { @@ -138,12 +138,12 @@ describe('bit snap command', function () { helper.scopeHelper.setWorkspaceWithRemoteScope(); helper.fixtures.createComponentBarFoo(); helper.fixtures.addComponentBarFoo(); - helper.command.snapComponent('bar/foo'); + helper.command.snapComponentWithoutBuild('bar/foo'); firstSnap = helper.command.getHead('bar/foo'); helper.command.export(); scopeAfterFirstSnap = helper.scopeHelper.cloneWorkspace(); helper.fixtures.createComponentBarFoo(fixtures.fooFixtureV2); - helper.command.snapComponent('bar/foo'); + helper.command.snapComponentWithoutBuild('bar/foo'); secondSnap = helper.command.getHead('bar/foo'); helper.command.export(); }); @@ -538,10 +538,10 @@ describe('bit snap command', function () { helper.scopeHelper.reInitWorkspace(); helper.fixtures.createComponentBarFoo(); helper.fixtures.addComponentBarFoo(); - helper.command.snapAllComponents(); + helper.command.snapAllComponentsWithoutBuild(); firstSnap = helper.command.getHead('bar/foo'); helper.fixtures.createComponentBarFoo(fixtures.fooFixtureV2); - helper.command.snapAllComponents(); + helper.command.snapAllComponentsWithoutBuild(); secondSnap = helper.command.getHead('bar/foo'); }); it('bit diff should show the differences', () => { @@ -582,14 +582,14 @@ describe('bit snap command', function () { before(() => { helper.scopeHelper.setWorkspaceWithRemoteScope(); helper.fixtures.populateComponents(); - helper.command.snapAllComponents(); + helper.command.snapAllComponentsWithoutBuild(); helper.fs.outputFile('comp3/index.js', fixtures.comp3V2); const statusOutput = helper.command.runCmd('bit status'); expect(statusOutput).to.have.string('components pending auto-tag'); - snapOutput = helper.command.snapComponent('comp3'); + snapOutput = helper.command.snapComponentWithoutBuild('comp3'); isTypeHead = helper.command.getHead('comp3'); }); it('should auto snap the dependencies and the nested dependencies', () => { diff --git a/e2e/harmony/tag-harmony.e2e.ts b/e2e/harmony/tag-harmony.e2e.ts index b3c4632d5f56..b3e08685746a 100644 --- a/e2e/harmony/tag-harmony.e2e.ts +++ b/e2e/harmony/tag-harmony.e2e.ts @@ -114,7 +114,7 @@ describe('tag components on Harmony', function () { }); describe('tagging with --persist flag', () => { before(() => { - helper.command.persistTag(); + helper.command.persistTagWithoutBuild(); }); it('should tag and remove the nextVersion property in .bitmap file', () => { const bitMap = helper.bitMap.readComponentsMapOnly(); @@ -770,7 +770,7 @@ ${helper.scopes.remote}/comp3: 1.5.0`; headOnMain = helper.command.getHead('comp1'); // Step 4: Merge the lane with --detach-head - helper.command.mergeLane('dev', '--detach-head -x'); + helper.command.mergeLaneWithoutBuild('dev', '--detach-head -x'); // Step 5: Export - should export 2.0.0 (unexported main head) helper.command.export(); }); diff --git a/e2e/harmony/track-directories-harmony.e2e.ts b/e2e/harmony/track-directories-harmony.e2e.ts index 5b74035697b7..d34ca6cc8e76 100644 --- a/e2e/harmony/track-directories-harmony.e2e.ts +++ b/e2e/harmony/track-directories-harmony.e2e.ts @@ -91,7 +91,7 @@ describe('track directories functionality', function () { describe('tagging the component', () => { before(() => { helper.scopeHelper.getClonedWorkspace(localScope); - helper.command.tagAllComponents(); + helper.command.tagAllWithoutBuild(); }); it('should save the files with relativePaths relative to the rootDir', () => { const output = helper.command.catComponent('utils/bar@latest'); @@ -154,7 +154,7 @@ describe('track directories functionality', function () { helper.scopeHelper.getClonedWorkspace(localScope); helper.scopeHelper.addRemoteScope(); helper.workspaceJsonc.setupDefault(); - helper.command.tagAllComponents(); + helper.command.tagAllWithoutBuild(); helper.command.export(); helper.command.importComponent('utils/bar'); }); diff --git a/e2e/harmony/updates-from-main-and-lane.e2e.ts b/e2e/harmony/updates-from-main-and-lane.e2e.ts index 5bcc94c8dd20..7ba7c120150d 100644 --- a/e2e/harmony/updates-from-main-and-lane.e2e.ts +++ b/e2e/harmony/updates-from-main-and-lane.e2e.ts @@ -63,7 +63,7 @@ describe('updates from main and lane', function () { describe('bit lane merge main', () => { let mergeOutput: string; before(() => { - mergeOutput = helper.command.mergeLane( + mergeOutput = helper.command.mergeLaneWithoutBuild( 'main', '--skip-dependency-installation --no-auto-snap --include-non-lane-comps' );