Skip to content

Fix dependency issues (and other fixes) #564

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.

Sign up for GitHub

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

Merged
CGNonofr merged 10 commits into from
Jan 27, 2025
Merged

Fix dependency issues (and other fixes) #564

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
4d820ca
feat: add telemetry service override
Jan 27, 2025
573f9e5
chore: format file
Jan 27, 2025
523d986
fix: failing manual resolution
Jan 27, 2025
c44147a
fix: stop downgrading typescript, workaround bug with it
Jan 27, 2025
56c4d81
fix: include vscode types instead of depending on it
Jan 27, 2025
48b8870
fix: break cyclic dependency
Jan 27, 2025
e2a1ce6
fix: simplify code, always use dependencies
Jan 27, 2025
f5ed733
feat: prevent multiple version of the from being installed
Jan 27, 2025
c946a01
feat(demo): add telemetry service override
Jan 27, 2025
52f9d64
fix(demo): go back to openvsx as the officla registry is blocked on t…
Jan 27, 2025
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
1 change: 0 additions & 1 deletion .ncurc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
"@microsoft/1ds-post-js",
"@parcel/watcher",
"@types/node",
"@types/vscode",
"@types/vscode-semver",
"@vscode/iconv-lite-umd",
"@vscode/proxy-agent",
Expand Down
1 change: 0 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ For more information, please checkout the project's [wiki](https://github.com/Co
```bash
npm install vscode@npm:@codingame/monaco-vscode-api
npm install monaco-editor@npm:@codingame/monaco-vscode-editor-api
npm install -D @types/vscode
```

`@codingame/monaco-vscode-api` is installed as an alias to `vscode` to be able to run `import * as vscode from 'vscode'`, similar to what is done inside a VSCode extension
Expand Down
2,071 changes: 399 additions & 1,672 deletions demo/package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

9 changes: 5 additions & 4 deletions demo/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,7 @@
"@codingame/monaco-vscode-1ae7d696-d960-5ac6-97a3-9fe7c8c3a793-common": "file:../dist/packages/monaco-vscode-1ae7d696-d960-5ac6-97a3-9fe7c8c3a793-common",
"@codingame/monaco-vscode-1b4486de-4fe4-59c4-9e6d-34f265ff6625-common": "file:../dist/packages/monaco-vscode-1b4486de-4fe4-59c4-9e6d-34f265ff6625-common",
"@codingame/monaco-vscode-1cc4ea0a-c5b6-54ed-bb60-078a99119b55-common": "file:../dist/packages/monaco-vscode-1cc4ea0a-c5b6-54ed-bb60-078a99119b55-common",
"@codingame/monaco-vscode-1d9dbcb3-6f53-58ad-b0a4-92b1ef1fd6a8-common": "file:../dist/packages/monaco-vscode-1d9dbcb3-6f53-58ad-b0a4-92b1ef1fd6a8-common",
"@codingame/monaco-vscode-219d9a5f-b446-507b-a188-1178a0867c75-common": "file:../dist/packages/monaco-vscode-219d9a5f-b446-507b-a188-1178a0867c75-common",
"@codingame/monaco-vscode-22790577-4553-50b6-978d-0acc75c394cc-common": "file:../dist/packages/monaco-vscode-22790577-4553-50b6-978d-0acc75c394cc-common",
"@codingame/monaco-vscode-2448342b-297f-5823-9f41-f18eef0f6ee8-common": "file:../dist/packages/monaco-vscode-2448342b-297f-5823-9f41-f18eef0f6ee8-common",
"@codingame/monaco-vscode-256d5b78-0649-50e9-8354-2807f95f68f4-common": "file:../dist/packages/monaco-vscode-256d5b78-0649-50e9-8354-2807f95f68f4-common",
"@codingame/monaco-vscode-271a23cd-c7d7-5761-ae35-a923a42987b8-common": "file:../dist/packages/monaco-vscode-271a23cd-c7d7-5761-ae35-a923a42987b8-common",
Expand All @@ -61,8 +59,8 @@
"@codingame/monaco-vscode-37e80bf5-92f5-5e4c-8b6d-98e0bb89dbef-common": "file:../dist/packages/monaco-vscode-37e80bf5-92f5-5e4c-8b6d-98e0bb89dbef-common",
"@codingame/monaco-vscode-3a00040f-b81b-50bc-88da-35f611c0bd1e-common": "file:../dist/packages/monaco-vscode-3a00040f-b81b-50bc-88da-35f611c0bd1e-common",
"@codingame/monaco-vscode-3cf6a388-482f-5484-a806-0525ad9ad8af-common": "file:../dist/packages/monaco-vscode-3cf6a388-482f-5484-a806-0525ad9ad8af-common",
"@codingame/monaco-vscode-3dd5b442-bfbc-5b1d-8f4a-7567530c75f5-common": "file:../dist/packages/monaco-vscode-3dd5b442-bfbc-5b1d-8f4a-7567530c75f5-common",
"@codingame/monaco-vscode-40cada32-7e9c-528a-81fc-766e4da54147-common": "file:../dist/packages/monaco-vscode-40cada32-7e9c-528a-81fc-766e4da54147-common",
"@codingame/monaco-vscode-411e0589-fa79-504b-b32c-80a88847b23a-common": "file:../dist/packages/monaco-vscode-411e0589-fa79-504b-b32c-80a88847b23a-common",
"@codingame/monaco-vscode-422642f2-7e3a-5c1c-9e1e-1d3ef1817346-common": "file:../dist/packages/monaco-vscode-422642f2-7e3a-5c1c-9e1e-1d3ef1817346-common",
"@codingame/monaco-vscode-42931eb9-e564-530c-bafc-fa23ab43a070-common": "file:../dist/packages/monaco-vscode-42931eb9-e564-530c-bafc-fa23ab43a070-common",
"@codingame/monaco-vscode-44b92f80-48ea-5562-a8d0-18a015f8d845-common": "file:../dist/packages/monaco-vscode-44b92f80-48ea-5562-a8d0-18a015f8d845-common",
Expand All @@ -87,6 +85,7 @@
"@codingame/monaco-vscode-695440c8-a687-5594-b476-bbc7b36bafe9-common": "file:../dist/packages/monaco-vscode-695440c8-a687-5594-b476-bbc7b36bafe9-common",
"@codingame/monaco-vscode-6980eeab-47bb-5a48-8e15-32caf0785565-common": "file:../dist/packages/monaco-vscode-6980eeab-47bb-5a48-8e15-32caf0785565-common",
"@codingame/monaco-vscode-6f9bc782-77e0-5716-93bd-b05210c768c5-common": "file:../dist/packages/monaco-vscode-6f9bc782-77e0-5716-93bd-b05210c768c5-common",
"@codingame/monaco-vscode-7443a901-21f6-577a-9674-42893b997ee0-common": "file:../dist/packages/monaco-vscode-7443a901-21f6-577a-9674-42893b997ee0-common",
"@codingame/monaco-vscode-7b77bc98-d4d5-5442-b972-c926eb6db528-common": "file:../dist/packages/monaco-vscode-7b77bc98-d4d5-5442-b972-c926eb6db528-common",
"@codingame/monaco-vscode-7bbc9e7d-eeae-55fc-8bf9-dc2f66e0dc73-common": "file:../dist/packages/monaco-vscode-7bbc9e7d-eeae-55fc-8bf9-dc2f66e0dc73-common",
"@codingame/monaco-vscode-7f39b6f1-3542-5430-8760-0f404d7a7cee-common": "file:../dist/packages/monaco-vscode-7f39b6f1-3542-5430-8760-0f404d7a7cee-common",
Expand All @@ -95,6 +94,7 @@
"@codingame/monaco-vscode-897bebad-39df-57cb-8a57-36a271d038be-common": "file:../dist/packages/monaco-vscode-897bebad-39df-57cb-8a57-36a271d038be-common",
"@codingame/monaco-vscode-89a82baf-8ded-5b2f-b8af-e5fbd72dc5ad-common": "file:../dist/packages/monaco-vscode-89a82baf-8ded-5b2f-b8af-e5fbd72dc5ad-common",
"@codingame/monaco-vscode-8ccb7637-50ea-5359-97bf-00015d7fe567-common": "file:../dist/packages/monaco-vscode-8ccb7637-50ea-5359-97bf-00015d7fe567-common",
"@codingame/monaco-vscode-972e8507-3a64-566d-8bc0-b78993998562-common": "file:../dist/packages/monaco-vscode-972e8507-3a64-566d-8bc0-b78993998562-common",
"@codingame/monaco-vscode-99f24462-c56d-5407-83fb-2ea9dd33cc8c-common": "file:../dist/packages/monaco-vscode-99f24462-c56d-5407-83fb-2ea9dd33cc8c-common",
"@codingame/monaco-vscode-9a1a5840-af83-5d07-a156-ba32a36c5c4b-common": "file:../dist/packages/monaco-vscode-9a1a5840-af83-5d07-a156-ba32a36c5c4b-common",
"@codingame/monaco-vscode-9c84f943-bcb5-5bcf-92a6-91f66a732f26-common": "file:../dist/packages/monaco-vscode-9c84f943-bcb5-5bcf-92a6-91f66a732f26-common",
Expand Down Expand Up @@ -154,8 +154,8 @@
"@codingame/monaco-vscode-docker-default-extension": "file:../dist/packages/monaco-vscode-docker-default-extension",
"@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common": "file:../dist/packages/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common",
"@codingame/monaco-vscode-e4d0fd26-1b26-5583-b3f7-582e08d7b389-common": "file:../dist/packages/monaco-vscode-e4d0fd26-1b26-5583-b3f7-582e08d7b389-common",
"@codingame/monaco-vscode-e571cbbb-526b-5d8b-92c5-a0437d2dabb3-common": "file:../dist/packages/monaco-vscode-e571cbbb-526b-5d8b-92c5-a0437d2dabb3-common",
"@codingame/monaco-vscode-e59ecb8c-db32-5324-8fe4-cf9921fd92b8-common": "file:../dist/packages/monaco-vscode-e59ecb8c-db32-5324-8fe4-cf9921fd92b8-common",
"@codingame/monaco-vscode-e7080bda-ce3e-5243-9a35-98cd9634dbda-common": "file:../dist/packages/monaco-vscode-e7080bda-ce3e-5243-9a35-98cd9634dbda-common",
"@codingame/monaco-vscode-e72c94ca-257a-5b75-8b68-5a5fa3c18255-common": "file:../dist/packages/monaco-vscode-e72c94ca-257a-5b75-8b68-5a5fa3c18255-common",
"@codingame/monaco-vscode-e97d19fd-ad95-5915-8104-6f1a86c7b652-common": "file:../dist/packages/monaco-vscode-e97d19fd-ad95-5915-8104-6f1a86c7b652-common",
"@codingame/monaco-vscode-ea14e352-8f1c-5569-b79a-8a96a53e8abe-common": "file:../dist/packages/monaco-vscode-ea14e352-8f1c-5569-b79a-8a96a53e8abe-common",
Expand Down Expand Up @@ -280,6 +280,7 @@
"@codingame/monaco-vscode-survey-service-override": "file:../dist/packages/monaco-vscode-survey-service-override",
"@codingame/monaco-vscode-swift-default-extension": "file:../dist/packages/monaco-vscode-swift-default-extension",
"@codingame/monaco-vscode-task-service-override": "file:../dist/packages/monaco-vscode-task-service-override",
"@codingame/monaco-vscode-telemetry-service-override": "file:../dist/packages/monaco-vscode-telemetry-service-override",
"@codingame/monaco-vscode-terminal-service-override": "file:../dist/packages/monaco-vscode-terminal-service-override",
"@codingame/monaco-vscode-testing-service-override": "file:../dist/packages/monaco-vscode-testing-service-override",
"@codingame/monaco-vscode-textmate-service-override": "file:../dist/packages/monaco-vscode-textmate-service-override",
Expand Down
19 changes: 10 additions & 9 deletions demo/src/setup.common.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ import getUpdateServiceOverride from '@codingame/monaco-vscode-update-service-ov
import getExplorerServiceOverride from '@codingame/monaco-vscode-explorer-service-override'
import getLocalizationServiceOverride from '@codingame/monaco-vscode-localization-service-override'
import getTreeSitterServiceOverride from '@codingame/monaco-vscode-treesitter-service-override'
import getTelemetryServiceOverride from '@codingame/monaco-vscode-telemetry-service-override'
import { EnvironmentOverride } from '@codingame/monaco-vscode-api/workbench'
import { Worker } from './tools/crossOriginWorker'
import defaultKeybindings from './user/keybindings.json?raw'
Expand Down Expand Up @@ -383,14 +384,13 @@ export const constructOptions: IWorkbenchConstructionOptions = {
nameShort: 'monaco-vscode-api',
nameLong: 'monaco-vscode-api',
extensionsGallery: {
nlsBaseUrl: 'https://www.vscode-unpkg.net/_lp/',
serviceUrl: 'https://marketplace.visualstudio.com/_apis/public/gallery',
itemUrl: 'https://marketplace.visualstudio.com/items',
publisherUrl: 'https://marketplace.visualstudio.com/publishers',
resourceUrlTemplate:
'https://{publisher}.vscode-unpkg.net/{publisher}/{name}/{version}/{path}',
extensionUrlTemplate: 'https://www.vscode-unpkg.net/_gallery/{publisher}/{name}/latest',
controlUrl: 'https://main.vscode-cdn.net/extensions/marketplace.json'
serviceUrl: 'https://open-vsx.org/vscode/gallery',
itemUrl: 'https://open-vsx.org/vscode/item',
resourceUrlTemplate: 'https://open-vsx.org/vscode/unpkg/{publisher}/{name}/{version}/{path}',
extensionUrlTemplate: 'https://open-vsx.org/vscode/gallery/{namespace}/{extension}/latest', // https://github.com/eclipse/openvsx/issues/1036#issuecomment-2476449435
controlUrl: '',
nlsBaseUrl: '',
publisherUrl: ''
}
}
}
Expand Down Expand Up @@ -540,5 +540,6 @@ export const commonServices: IEditorOverrideServices = {
}
]
}),
...getSecretStorageServiceOverride()
...getSecretStorageServiceOverride(),
...getTelemetryServiceOverride()
}
Loading
Loading