Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix '@theia' implicit dependencies #5791

Merged
merged 1 commit into from
Jul 25, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion dev-packages/cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
"test": "echo 'skip'"
},
"dependencies": {
"@theia/application-manager": "^0.8.0"
"@theia/application-manager": "^0.8.0",
"@theia/application-package": "^0.8.0"
}
}
1 change: 1 addition & 0 deletions packages/debug/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
"@theia/editor": "^0.8.0",
"@theia/filesystem": "^0.8.0",
"@theia/json": "^0.8.0",
"@theia/languages": "^0.8.0",
"@theia/markers": "^0.8.0",
"@theia/monaco": "^0.8.0",
"@theia/output": "^0.8.0",
Expand Down
1 change: 1 addition & 0 deletions packages/filesystem/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"description": "Theia - FileSystem Extension",
"dependencies": {
"@theia/core": "^0.8.0",
"@theia/application-package": "^0.8.0",
"@types/body-parser": "^1.17.0",
"@types/fs-extra": "^4.0.2",
"@types/rimraf": "^2.0.2",
Expand Down
1 change: 1 addition & 0 deletions packages/json/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"version": "0.8.0",
"description": "Theia - JSON Extension",
"dependencies": {
"@theia/application-package": "^0.8.0",
"@theia/core": "^0.8.0",
"@theia/languages": "^0.8.0",
"@theia/monaco": "^0.8.0",
Expand Down
1 change: 1 addition & 0 deletions packages/plugin-dev/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
"@theia/filesystem": "^0.8.0",
"@theia/plugin-ext": "^0.8.0",
"@theia/debug": "^0.8.0",
"@theia/output": "^0.8.0",
"@theia/preferences": "^0.8.0",
"ps-tree": "1.1.0"
},
Expand Down
4 changes: 3 additions & 1 deletion packages/plugin-ext-vscode/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,10 @@
"description": "Theia - Plugin Extension for VsCode",
"dependencies": {
"@theia/core": "^0.8.0",
"@theia/editor": "^0.8.0",
"@theia/plugin": "^0.8.0",
"@theia/plugin-ext": "^0.8.0"
"@theia/plugin-ext": "^0.8.0",
"@theia/workspace": "^0.8.0"
},
"publishConfig": {
"access": "public"
Expand Down
4 changes: 4 additions & 0 deletions packages/plugin-ext/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,19 @@
"@theia/editor": "^0.8.0",
"@theia/file-search": "^0.8.0",
"@theia/filesystem": "^0.8.0",
"@theia/languages": "^0.8.0",
"@theia/markers": "^0.8.0",
"@theia/messages": "^0.8.0",
"@theia/mini-browser": "^0.8.0",
"@theia/monaco": "^0.8.0",
"@theia/navigator": "^0.8.0",
"@theia/output": "^0.8.0",
"@theia/plugin": "^0.8.0",
"@theia/preferences": "^0.8.0",
"@theia/scm": "^0.8.0",
"@theia/search-in-workspace": "^0.8.0",
"@theia/task": "^0.8.0",
"@theia/terminal": "^0.8.0",
"@theia/workspace": "^0.8.0",
"decompress": "^4.2.0",
"getmac": "^1.4.6",
Expand Down
4 changes: 2 additions & 2 deletions packages/plugin-ext/src/plugin/languages/color.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@

import * as theia from '@theia/plugin';
import URI from 'vscode-uri/lib/umd';
import { DocumentsExtImpl } from '@theia/plugin-ext/src/plugin/documents';
import { DocumentsExtImpl } from '../documents';
import * as Converter from '../type-converters';
import { RawColorInfo } from '@theia/plugin-ext/src/api/plugin-api';
import { RawColorInfo } from '../../api/plugin-api';
import { ColorPresentation } from '../../api/model';

export class ColorProviderAdapter {
Expand Down
2 changes: 1 addition & 1 deletion packages/plugin-ext/src/plugin/languages/folding.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
********************************************************************************/

import * as theia from '@theia/plugin';
import { DocumentsExtImpl } from '@theia/plugin-ext/src/plugin/documents';
import { DocumentsExtImpl } from '../documents';
import URI from 'vscode-uri/lib/umd';
import * as Converter from '../type-converters';
import * as model from '../../api/model';
Expand Down
5 changes: 2 additions & 3 deletions packages/plugin-ext/src/plugin/languages/rename.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,8 @@ import URI from 'vscode-uri/lib/umd';
import * as theia from '@theia/plugin';
import * as Converter from '../type-converters';
import * as model from '../../api/model';
import { DocumentsExtImpl } from '@theia/plugin-ext/src/plugin/documents';
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

that's a good catch, how did you find it?

Copy link
Member Author

@vince-fugnitto vince-fugnitto Jul 25, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

tslint was complaining that @theia/plugin-ext was implicitly depending on itself so I
checked as to how / why 🙈

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Was it a warning as well, it would be good to have it as error.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It was a warning, I guess we need a custom rule to find out if an extension is trying to import istelf this way.

import { WorkspaceEditDto } from '@theia/plugin-ext/src/common';
import { Position } from '../../api/plugin-api';
import { DocumentsExtImpl } from '../documents';
import { Position, WorkspaceEditDto } from '../../api/plugin-api';
import { Range } from '../types-impl';
import { isObject } from '../../common/types';

Expand Down
1 change: 1 addition & 0 deletions packages/task/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"description": "Theia - Task extension. This extension adds support for executing raw or terminal processes in the backend.",
"dependencies": {
"@theia/core": "^0.8.0",
"@theia/editor": "^0.8.0",
"@theia/filesystem": "^0.8.0",
"@theia/markers": "^0.8.0",
"@theia/monaco": "^0.8.0",
Expand Down