Skip to content

Commit 8a23b85

Browse files
authored
fix, skip linking @teambit/legacy, update some deps to remove @teambit/legacy dep (#9459)
1 parent bb39562 commit 8a23b85

File tree

3 files changed

+11
-11
lines changed

3 files changed

+11
-11
lines changed

e2e/harmony/mocha-tester.e2e.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ describe('Mocha Tester', function () {
1616
before(() => {
1717
helper.scopeHelper.setNewLocalAndRemoteScopes();
1818
helper.fixtures.populateComponents(1);
19-
helper.command.setEnv('comp1', 'teambit.harmony/envs/core-aspect-env@0.0.42');
19+
helper.command.setEnv('comp1', 'teambit.harmony/envs/core-aspect-env');
2020
helper.command.install();
2121
});
2222
describe('component without any test file', () => {
@@ -97,7 +97,7 @@ describe('Mocha Tester', function () {
9797
before(() => {
9898
helper.scopeHelper.reInitLocalScope();
9999
helper.fixtures.populateComponentsTS(1);
100-
helper.command.setEnv('comp1', 'teambit.harmony/envs/core-aspect-env@0.0.42');
100+
helper.command.setEnv('comp1', 'teambit.harmony/envs/core-aspect-env');
101101
helper.command.install();
102102
helper.fs.outputFile(
103103
'comp1/foo.ts',

scopes/dependencies/dependency-resolver/dependency-linker.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,9 @@ export class DependencyLinker {
307307
}
308308

309309
if (mainAspectPath) {
310-
result.teambitLegacyLink = this.linkNonAspectCorePackages(rootDir, 'legacy', mainAspectPath);
310+
// the following line links @teambit/legacy to the workspace node_modules. at this point, we removed all
311+
// @teambit/legacy occurrences, so it should be okay to skip this link.
312+
// result.teambitLegacyLink = this.linkNonAspectCorePackages(rootDir, 'legacy', mainAspectPath);
311313
result.harmonyLink = this.linkNonAspectCorePackages(rootDir, 'harmony', mainAspectPath);
312314
}
313315
return result;

workspace.jsonc

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@
126126
"@teambit/component.ui.component-compare.layouts.compare-split-layout-preset": "^0.0.10",
127127
"@teambit/component.ui.component-compare.models.component-compare-change-type": "^0.0.7",
128128
"@teambit/component.ui.component-compare.models.component-compare-hooks": "^0.0.10",
129-
"@teambit/component.ui.component-compare.models.component-compare-model": "^0.0.111",
129+
"@teambit/component.ui.component-compare.models.component-compare-model": "^0.0.112",
130130
"@teambit/component.ui.component-compare.models.component-compare-state": "^0.0.7",
131131
"@teambit/component.ui.component-compare.status-resolver": "^0.0.9",
132132
"@teambit/component.ui.component-compare.utils.group-by-version": "^0.0.8",
@@ -213,7 +213,7 @@
213213
"@teambit/evangelist.input.checkbox.label": "^1.1.0",
214214
"@teambit/evangelist.surfaces.dropdown": "1.0.2",
215215
"@teambit/explorer.ui.command-bar": "2.0.16",
216-
"@teambit/explorer.ui.component-card": "^0.0.30",
216+
"@teambit/explorer.ui.component-card": "^0.0.43",
217217
"@teambit/explorer.ui.gallery.component-grid": "0.0.496",
218218
"@teambit/git.modules.git-ignore": "^1.0.2",
219219
"@teambit/graph.cleargraph": "0.0.11",
@@ -223,9 +223,9 @@
223223
"@teambit/lanes.ui.compare.lane-compare": "^0.0.193",
224224
"@teambit/lanes.ui.compare.lane-compare-page": "^0.0.162",
225225
"@teambit/lanes.ui.icons.lane-icon": "^0.0.9",
226-
"@teambit/lanes.ui.lane-details": "^0.0.204",
226+
"@teambit/lanes.ui.lane-details": "^0.0.205",
227227
"@teambit/lanes.ui.menus.lanes-overview-menu": "^0.0.10",
228-
"@teambit/lanes.ui.models.lanes-model": "^0.0.221",
228+
"@teambit/lanes.ui.models.lanes-model": "^0.0.222",
229229
"@teambit/lanes.ui.navigation.lane-switcher": "^0.0.225",
230230
"@teambit/legacy-bit-id": "^1.1.1",
231231
"@teambit/legacy-component-log": "~0.0.402",
@@ -242,15 +242,15 @@
242242
"@teambit/preview.cli.dev-server-events-listener": "^0.0.1",
243243
"@teambit/preview.modules.preview-modules": "^1.0.3",
244244
"@teambit/react.content.react-overview": "1.95.0",
245-
"@teambit/react.instructions.react.adding-compositions": "0.0.6",
245+
"@teambit/react.instructions.react.adding-compositions": "0.0.7",
246246
"@teambit/react.instructions.react.adding-tests": "0.0.6",
247247
"@teambit/react.jest.react-jest": "^1.0.33",
248248
"@teambit/react.rendering.ssr": "0.0.3",
249249
"@teambit/react.ui.component-highlighter": "0.2.4",
250250
"@teambit/react.webpack.react-webpack": "^1.0.37",
251251
"@teambit/scope.content.scope-overview": "1.95.0",
252252
"@teambit/scope.ui.empty-scope": "^0.0.509",
253-
"@teambit/scope.ui.hooks.use-scope": "^0.0.453",
253+
"@teambit/scope.ui.hooks.use-scope": "^0.0.454",
254254
"@teambit/scope.ui.scope-details": "^0.0.526",
255255
"@teambit/scope.ui.scope-icon": "0.0.91",
256256
"@teambit/scopes.scope-descriptor": "^0.0.24",
@@ -733,8 +733,6 @@
733733
"@teambit/base-react.navigation.link": "2.0.31",
734734
"@teambit/ui-foundation.ui.navigation.react-router-adapter": "6.1.1",
735735
"@apollo/client": "3.6.9",
736-
// for backward compatibility only
737-
"@teambit/legacy": "2.0.1",
738736
// These are the peer dependencies of Yarn
739737
"@yarnpkg/cli": "3.6.1",
740738
"@yarnpkg/core": "3.5.2",

0 commit comments

Comments
 (0)