diff --git a/.gitignore b/.gitignore index baf70e9a..f76df95f 100644 --- a/.gitignore +++ b/.gitignore @@ -132,3 +132,11 @@ docs/source/changelog.md !.yarn/versions packages/docprovider/junit.xml .jupyter_ystore.db + +# Jupyter +Untitled* + +# To easily link against unreleased JupyterLab packages +# TODO: remove? +.yalc +yalc.lock diff --git a/packages/docprovider-extension/package.json b/packages/docprovider-extension/package.json index bc561077..f7bf581a 100644 --- a/packages/docprovider-extension/package.json +++ b/packages/docprovider-extension/package.json @@ -62,6 +62,7 @@ "@jupyterlab/fileeditor": "^4.2.0", "@jupyterlab/logconsole": "^4.2.0", "@jupyterlab/notebook": "^4.2.0", + "@jupyterlab/services": "file:.yalc/@jupyterlab/services", "@jupyterlab/settingregistry": "^4.2.0", "@jupyterlab/translation": "^4.2.0", "@lumino/commands": "^2.1.0", @@ -89,6 +90,7 @@ "extension": true, "outputDir": "../../projects/jupyter-docprovider/jupyter_docprovider/labextension", "disabledExtensions": [ + "@jupyterlab/application-extension:default-drive", "@jupyterlab/filebrowser-extension:defaultFileBrowser", "@jupyterlab/notebook-extension:cell-executor" ], diff --git a/packages/docprovider-extension/src/filebrowser.ts b/packages/docprovider-extension/src/filebrowser.ts index e6549daf..fe11ffa3 100644 --- a/packages/docprovider-extension/src/filebrowser.ts +++ b/packages/docprovider-extension/src/filebrowser.ts @@ -38,6 +38,12 @@ import { } from '@jupyter/docprovider'; import { Awareness } from 'y-protocols/awareness'; import { URLExt } from '@jupyterlab/coreutils'; +import { + IDefaultDrive, + IUserManager, + ServiceManagerPlugin, + User +} from '@jupyterlab/services'; /** * The command IDs used by the file browser plugin. @@ -50,21 +56,33 @@ const DOCUMENT_TIMELINE_URL = 'api/collaboration/timeline'; /** * The default collaborative drive provider. */ -export const drive: JupyterFrontEndPlugin = { +export const drive: ServiceManagerPlugin = { id: '@jupyter/docprovider-extension:drive', + autoStart: true, description: 'The default collaborative drive provider', - provides: ICollaborativeDrive, - requires: [ITranslator], - optional: [IGlobalAwareness], + provides: IDefaultDrive, + requires: [IUserManager], + activate: (_: null, user: User.IManager): YDrive => { + const drive = new YDrive(user); + return drive; + } +}; + +export const defaults: JupyterFrontEndPlugin = { + id: '@jupyter/docprovider-extension:defaults', + autoStart: true, + requires: [IDefaultDrive], + optional: [IGlobalAwareness, ITranslator], activate: ( app: JupyterFrontEnd, - translator: ITranslator, - globalAwareness: Awareness | null - ): ICollaborativeDrive => { - const trans = translator.load('jupyter_collaboration'); - const drive = new YDrive(app.serviceManager.user, trans, globalAwareness); - app.serviceManager.contents.addDrive(drive); - return drive; + ydrive: YDrive, + globalAwareness: Awareness | null, + translator: ITranslator | null + ): void => { + ydrive.translator = (translator ?? nullTranslator).load('jupyterlab'); + if (globalAwareness) { + ydrive.globalAwareness = globalAwareness; + } } }; @@ -76,7 +94,7 @@ export const yfile: JupyterFrontEndPlugin = { description: "Plugin to register the shared model factory for the content type 'file'", autoStart: true, - requires: [ICollaborativeDrive], + requires: [IDefaultDrive], optional: [], activate: (app: JupyterFrontEnd, drive: ICollaborativeDrive): void => { const yFileFactory = () => { @@ -94,7 +112,7 @@ export const ynotebook: JupyterFrontEndPlugin = { description: "Plugin to register the shared model factory for the content type 'notebook'", autoStart: true, - requires: [ICollaborativeDrive], + requires: [IDefaultDrive], optional: [ISettingRegistry], activate: ( app: JupyterFrontEnd, @@ -141,7 +159,7 @@ export const statusBarTimeline: JupyterFrontEndPlugin = { id: '@jupyter/docprovider-extension:statusBarTimeline', description: 'Plugin to add a timeline slider to the status bar', autoStart: true, - requires: [IStatusBar, ICollaborativeDrive], + requires: [IStatusBar, IDefaultDrive], activate: async ( app: JupyterFrontEnd, statusBar: IStatusBar, @@ -238,7 +256,7 @@ export const defaultFileBrowser: JupyterFrontEndPlugin = { id: '@jupyter/docprovider-extension:defaultFileBrowser', description: 'The default file browser factory provider', provides: IDefaultFileBrowser, - requires: [ICollaborativeDrive, IFileBrowserFactory], + requires: [IDefaultDrive, IFileBrowserFactory], optional: [IRouter, JupyterFrontEnd.ITreeResolver, ILabShell, ITranslator], activate: async ( app: JupyterFrontEnd, diff --git a/packages/docprovider-extension/src/index.ts b/packages/docprovider-extension/src/index.ts index 1869c5b7..d3b65db3 100644 --- a/packages/docprovider-extension/src/index.ts +++ b/packages/docprovider-extension/src/index.ts @@ -5,8 +5,6 @@ * @module collaboration-extension */ -import { JupyterFrontEndPlugin } from '@jupyterlab/application'; - import { drive, yfile, @@ -20,7 +18,7 @@ import { notebookCellExecutor } from './executor'; /** * Export the plugins as default. */ -const plugins: JupyterFrontEndPlugin[] = [ +export default [ drive, yfile, ynotebook, @@ -29,5 +27,3 @@ const plugins: JupyterFrontEndPlugin[] = [ notebookCellExecutor, statusBarTimeline ]; - -export default plugins; diff --git a/packages/docprovider-extension/tsconfig.json b/packages/docprovider-extension/tsconfig.json index 5535d8c5..ce0c1b71 100644 --- a/packages/docprovider-extension/tsconfig.json +++ b/packages/docprovider-extension/tsconfig.json @@ -2,7 +2,9 @@ "extends": "../../tsconfig.json", "compilerOptions": { "outDir": "lib", - "rootDir": "src" + "rootDir": "src", + // TODO: remove, needed because of the local linking of packages + "skipLibCheck": true }, "include": ["src/*"] } diff --git a/packages/docprovider/src/ydrive.ts b/packages/docprovider/src/ydrive.ts index a501d9fa..571d38b7 100644 --- a/packages/docprovider/src/ydrive.ts +++ b/packages/docprovider/src/ydrive.ts @@ -43,10 +43,10 @@ export class YDrive extends Drive implements ICollaborativeDrive { */ constructor( user: User.IManager, - translator: TranslationBundle, - globalAwareness: Awareness | null + translator?: TranslationBundle, + globalAwareness?: Awareness ) { - super({ name: 'RTC' }); + super(); this._user = user; this._trans = translator; this._globalAwareness = globalAwareness; @@ -68,6 +68,14 @@ export class YDrive extends Drive implements ICollaborativeDrive { return this._providers; } + set translator(translator: TranslationBundle) { + this._trans = translator; + } + + set globalAwareness(awareness: Awareness) { + this._globalAwareness = awareness; + } + /** * Dispose of the resources held by the manager. */ @@ -241,9 +249,9 @@ export class YDrive extends Drive implements ICollaborativeDrive { }; private _user: User.IManager; - private _trans: TranslationBundle; + private _trans: TranslationBundle | undefined; private _providers: Map; - private _globalAwareness: Awareness | null; + private _globalAwareness: Awareness | undefined; private _ydriveFileChanged = new Signal(this); } diff --git a/packages/docprovider/src/yprovider.ts b/packages/docprovider/src/yprovider.ts index 341187dc..f34b4a64 100644 --- a/packages/docprovider/src/yprovider.ts +++ b/packages/docprovider/src/yprovider.ts @@ -5,7 +5,7 @@ import { showErrorMessage, Dialog } from '@jupyterlab/apputils'; import { User } from '@jupyterlab/services'; -import { TranslationBundle } from '@jupyterlab/translation'; +import { nullTranslator, TranslationBundle } from '@jupyterlab/translation'; import { PromiseDelegate } from '@lumino/coreutils'; import { IDisposable } from '@lumino/disposable'; @@ -51,7 +51,7 @@ export class WebSocketProvider implements IDocumentProvider, IForkProvider { this._sharedModel = options.model; this._awareness = options.model.awareness; this._yWebsocketProvider = null; - this._trans = options.translator; + this._trans = options.translator ?? nullTranslator.load('jupyterlab'); const user = options.user; @@ -234,6 +234,6 @@ export namespace WebSocketProvider { /** * The jupyterlab translator */ - translator: TranslationBundle; + translator?: TranslationBundle; } } diff --git a/yarn.lock b/yarn.lock index fcbee350..e14aaf61 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2136,6 +2136,7 @@ __metadata: "@jupyterlab/fileeditor": ^4.2.0 "@jupyterlab/logconsole": ^4.2.0 "@jupyterlab/notebook": ^4.2.0 + "@jupyterlab/services": "file:.yalc/@jupyterlab/services" "@jupyterlab/settingregistry": ^4.2.0 "@jupyterlab/translation": ^4.2.0 "@lumino/commands": ^2.1.0 @@ -2221,9 +2222,9 @@ __metadata: languageName: node linkType: hard -"@jupyter/ydoc@npm:^2.0.0 || ^3.0.0-a3": - version: 3.0.0-a4 - resolution: "@jupyter/ydoc@npm:3.0.0-a4" +"@jupyter/ydoc@npm:^2.0.0 || ^3.0.0-a3, @jupyter/ydoc@npm:^3.0.0-a5": + version: 3.0.0-a7 + resolution: "@jupyter/ydoc@npm:3.0.0-a7" dependencies: "@jupyterlab/nbformat": ^3.0.0 || ^4.0.0-alpha.21 || ^4.0.0 "@lumino/coreutils": ^1.11.0 || ^2.0.0 @@ -2231,7 +2232,7 @@ __metadata: "@lumino/signaling": ^1.10.0 || ^2.0.0 y-protocols: ^1.0.5 yjs: ^13.5.40 - checksum: ccd4d8b3c46346e14e4e20f093c0147349c403f1a61d624bc01a95fb805f41c8c5c4db54c5c43c59dc2ef7aeebb53a451a7fc75875c144578bf180c0d20c1878 + checksum: c3899f463b7c4e52747a97c2b4d9daf764f9e11e452f689b14e5133b797a0bed346f2e84a0bef981002e9afed7034f812d733c325e83a56af69218b260396dff languageName: node linkType: hard @@ -2477,6 +2478,20 @@ __metadata: languageName: node linkType: hard +"@jupyterlab/coreutils@npm:^6.3.0-beta.1": + version: 6.3.0-beta.1 + resolution: "@jupyterlab/coreutils@npm:6.3.0-beta.1" + dependencies: + "@lumino/coreutils": ^2.1.2 + "@lumino/disposable": ^2.1.2 + "@lumino/signaling": ^2.1.2 + minimist: ~1.2.0 + path-browserify: ^1.0.0 + url-parse: ~1.5.4 + checksum: 00a34b3b84143cda634bd69df4dfccea77ae166128ad81e00550d206a2a10babea7532407aa388b8610fe61bee53cbbaff6db16d8d801482f0113591ba2e0f8e + languageName: node + linkType: hard + "@jupyterlab/docmanager@npm:^4.2.4": version: 4.2.4 resolution: "@jupyterlab/docmanager@npm:4.2.4" @@ -2652,6 +2667,15 @@ __metadata: languageName: node linkType: hard +"@jupyterlab/nbformat@npm:^4.3.0-beta.1": + version: 4.3.0-beta.1 + resolution: "@jupyterlab/nbformat@npm:4.3.0-beta.1" + dependencies: + "@lumino/coreutils": ^2.1.2 + checksum: 9cb960a3625e1c2662e763d1768e8cfc620c200a253002292c84aaaa637c747f9ec1c1b953b89a91a9ee03ed8b5b2959066e66037299e2937c07a57aec1e6a77 + languageName: node + linkType: hard + "@jupyterlab/notebook@npm:^4.2.0": version: 4.2.4 resolution: "@jupyterlab/notebook@npm:4.2.4" @@ -2755,6 +2779,25 @@ __metadata: languageName: node linkType: hard +"@jupyterlab/services@file:.yalc/@jupyterlab/services::locator=%40jupyter%2Fdocprovider-extension%40workspace%3Apackages%2Fdocprovider-extension": + version: 7.3.0-beta.1 + resolution: "@jupyterlab/services@file:.yalc/@jupyterlab/services#.yalc/@jupyterlab/services::hash=30b1ac&locator=%40jupyter%2Fdocprovider-extension%40workspace%3Apackages%2Fdocprovider-extension" + dependencies: + "@jupyter/ydoc": ^3.0.0-a5 + "@jupyterlab/coreutils": ^6.3.0-beta.1 + "@jupyterlab/nbformat": ^4.3.0-beta.1 + "@jupyterlab/settingregistry": ^4.3.0-beta.1 + "@jupyterlab/statedb": ^4.3.0-beta.1 + "@lumino/coreutils": ^2.2.0 + "@lumino/disposable": ^2.1.3 + "@lumino/polling": ^2.1.3 + "@lumino/properties": ^2.0.2 + "@lumino/signaling": ^2.1.3 + ws: ^8.11.0 + checksum: 4254a194e1d3a971f509c4a47e14875982077a431ffe5eb9e83781931f59c51037b4baad2ac176143a83417f8da00c4971386df56343b75b5b87b5278d2b38c0 + languageName: node + linkType: hard + "@jupyterlab/services@npm:^7.0.5, @jupyterlab/services@npm:^7.2.0, @jupyterlab/services@npm:^7.2.4": version: 7.2.4 resolution: "@jupyterlab/services@npm:7.2.4" @@ -2793,6 +2836,25 @@ __metadata: languageName: node linkType: hard +"@jupyterlab/settingregistry@npm:^4.3.0-beta.1": + version: 4.3.0-beta.1 + resolution: "@jupyterlab/settingregistry@npm:4.3.0-beta.1" + dependencies: + "@jupyterlab/nbformat": ^4.3.0-beta.1 + "@jupyterlab/statedb": ^4.3.0-beta.1 + "@lumino/commands": ^2.3.0 + "@lumino/coreutils": ^2.1.2 + "@lumino/disposable": ^2.1.2 + "@lumino/signaling": ^2.1.2 + "@rjsf/utils": ^5.13.4 + ajv: ^8.12.0 + json5: ^2.2.3 + peerDependencies: + react: ">=16" + checksum: a7ca15f047f6eaef5525c3e0f293e12c5618390a06b2e6010d00cb39c9b1b547189f0cc24e05fb6b3a0c8835f88c115fdbc735543a8253f6177cae6fd2280eb8 + languageName: node + linkType: hard + "@jupyterlab/statedb@npm:^4.2.0, @jupyterlab/statedb@npm:^4.2.4": version: 4.2.4 resolution: "@jupyterlab/statedb@npm:4.2.4" @@ -2806,6 +2868,19 @@ __metadata: languageName: node linkType: hard +"@jupyterlab/statedb@npm:^4.3.0-beta.1": + version: 4.3.0-beta.1 + resolution: "@jupyterlab/statedb@npm:4.3.0-beta.1" + dependencies: + "@lumino/commands": ^2.3.0 + "@lumino/coreutils": ^2.1.2 + "@lumino/disposable": ^2.1.2 + "@lumino/properties": ^2.0.1 + "@lumino/signaling": ^2.1.2 + checksum: 992e137cded3b5e68e93c99e4d73226e7b0d4fa590894a52f9157b41c10d641bf7371b550d695a317dcc6054ab257801223f4bcf05b1589ea097d261dfdb90eb + languageName: node + linkType: hard + "@jupyterlab/statusbar@npm:^4.2.4": version: 4.2.4 resolution: "@jupyterlab/statusbar@npm:4.2.4" @@ -3264,7 +3339,7 @@ __metadata: languageName: node linkType: hard -"@lumino/polling@npm:^2.1.2": +"@lumino/polling@npm:^2.1.2, @lumino/polling@npm:^2.1.3": version: 2.1.3 resolution: "@lumino/polling@npm:2.1.3" dependencies: @@ -4310,16 +4385,6 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/scope-manager@npm:5.62.0": - version: 5.62.0 - resolution: "@typescript-eslint/scope-manager@npm:5.62.0" - dependencies: - "@typescript-eslint/types": 5.62.0 - "@typescript-eslint/visitor-keys": 5.62.0 - checksum: 6062d6b797fe1ce4d275bb0d17204c827494af59b5eaf09d8a78cdd39dadddb31074dded4297aaf5d0f839016d601032857698b0e4516c86a41207de606e9573 - languageName: node - linkType: hard - "@typescript-eslint/type-utils@npm:5.55.0": version: 5.55.0 resolution: "@typescript-eslint/type-utils@npm:5.55.0" @@ -4344,13 +4409,6 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/types@npm:5.62.0": - version: 5.62.0 - resolution: "@typescript-eslint/types@npm:5.62.0" - checksum: 48c87117383d1864766486f24de34086155532b070f6264e09d0e6139449270f8a9559cfef3c56d16e3bcfb52d83d42105d61b36743626399c7c2b5e0ac3b670 - languageName: node - linkType: hard - "@typescript-eslint/typescript-estree@npm:5.55.0": version: 5.55.0 resolution: "@typescript-eslint/typescript-estree@npm:5.55.0" @@ -4369,25 +4427,7 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/typescript-estree@npm:5.62.0": - version: 5.62.0 - resolution: "@typescript-eslint/typescript-estree@npm:5.62.0" - dependencies: - "@typescript-eslint/types": 5.62.0 - "@typescript-eslint/visitor-keys": 5.62.0 - debug: ^4.3.4 - globby: ^11.1.0 - is-glob: ^4.0.3 - semver: ^7.3.7 - tsutils: ^3.21.0 - peerDependenciesMeta: - typescript: - optional: true - checksum: 3624520abb5807ed8f57b1197e61c7b1ed770c56dfcaca66372d584ff50175225798bccb701f7ef129d62c5989070e1ee3a0aa2d84e56d9524dcf011a2bb1a52 - languageName: node - linkType: hard - -"@typescript-eslint/utils@npm:5.55.0": +"@typescript-eslint/utils@npm:5.55.0, @typescript-eslint/utils@npm:^5.10.0": version: 5.55.0 resolution: "@typescript-eslint/utils@npm:5.55.0" dependencies: @@ -4405,24 +4445,6 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/utils@npm:^5.10.0": - version: 5.62.0 - resolution: "@typescript-eslint/utils@npm:5.62.0" - dependencies: - "@eslint-community/eslint-utils": ^4.2.0 - "@types/json-schema": ^7.0.9 - "@types/semver": ^7.3.12 - "@typescript-eslint/scope-manager": 5.62.0 - "@typescript-eslint/types": 5.62.0 - "@typescript-eslint/typescript-estree": 5.62.0 - eslint-scope: ^5.1.1 - semver: ^7.3.7 - peerDependencies: - eslint: ^6.0.0 || ^7.0.0 || ^8.0.0 - checksum: ee9398c8c5db6d1da09463ca7bf36ed134361e20131ea354b2da16a5fdb6df9ba70c62a388d19f6eebb421af1786dbbd79ba95ddd6ab287324fc171c3e28d931 - languageName: node - linkType: hard - "@typescript-eslint/visitor-keys@npm:5.55.0": version: 5.55.0 resolution: "@typescript-eslint/visitor-keys@npm:5.55.0" @@ -4433,16 +4455,6 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/visitor-keys@npm:5.62.0": - version: 5.62.0 - resolution: "@typescript-eslint/visitor-keys@npm:5.62.0" - dependencies: - "@typescript-eslint/types": 5.62.0 - eslint-visitor-keys: ^3.3.0 - checksum: 976b05d103fe8335bef5c93ad3f76d781e3ce50329c0243ee0f00c0fcfb186c81df50e64bfdd34970148113f8ade90887f53e3c4938183afba830b4ba8e30a35 - languageName: node - linkType: hard - "@webassemblyjs/ast@npm:1.12.1, @webassemblyjs/ast@npm:^1.12.1": version: 1.12.1 resolution: "@webassemblyjs/ast@npm:1.12.1" @@ -4702,20 +4714,7 @@ __metadata: languageName: node linkType: hard -"abstract-leveldown@npm:^6.2.1": - version: 6.3.0 - resolution: "abstract-leveldown@npm:6.3.0" - dependencies: - buffer: ^5.5.0 - immediate: ^3.2.3 - level-concat-iterator: ~2.0.0 - level-supports: ~1.0.0 - xtend: ~4.0.0 - checksum: 121a8509d8c6a540e656c2a69e5b8d853d4df71072011afefc868b98076991bb00120550e90643de9dc18889c675f62413409eeb4c8c204663124c7d215e4ec3 - languageName: node - linkType: hard - -"abstract-leveldown@npm:~6.2.1, abstract-leveldown@npm:~6.2.3": +"abstract-leveldown@npm:^6.2.1, abstract-leveldown@npm:~6.2.1, abstract-leveldown@npm:~6.2.3": version: 6.2.3 resolution: "abstract-leveldown@npm:6.2.3" dependencies: @@ -5661,20 +5660,13 @@ __metadata: languageName: node linkType: hard -"cli-spinners@npm:2.6.1": +"cli-spinners@npm:2.6.1, cli-spinners@npm:^2.5.0": version: 2.6.1 resolution: "cli-spinners@npm:2.6.1" checksum: 423409baaa7a58e5104b46ca1745fbfc5888bbd0b0c5a626e052ae1387060839c8efd512fb127e25769b3dc9562db1dc1b5add6e0b93b7ef64f477feb6416a45 languageName: node linkType: hard -"cli-spinners@npm:^2.5.0": - version: 2.9.2 - resolution: "cli-spinners@npm:2.9.2" - checksum: 1bd588289b28432e4676cb5d40505cfe3e53f2e4e10fbe05c8a710a154d6fe0ce7836844b00d6858f740f2ffe67cdc36e0fce9c7b6a8430e80e6388d5aa4956c - languageName: node - linkType: hard - "cli-width@npm:^3.0.0": version: 3.0.0 resolution: "cli-width@npm:3.0.0" @@ -6206,20 +6198,13 @@ __metadata: languageName: node linkType: hard -"csstype@npm:3.0.10": +"csstype@npm:3.0.10, csstype@npm:^3.0.2": version: 3.0.10 resolution: "csstype@npm:3.0.10" checksum: 20a8fa324f2b33ddf94aa7507d1b6ab3daa6f3cc308888dc50126585d7952f2471de69b2dbe0635d1fdc31223fef8e070842691877e725caf456e2378685a631 languageName: node linkType: hard -"csstype@npm:^3.0.2": - version: 3.1.3 - resolution: "csstype@npm:3.1.3" - checksum: 8db785cc92d259102725b3c694ec0c823f5619a84741b5c7991b8ad135dfaa66093038a1cc63e03361a6cd28d122be48f2106ae72334e067dd619a51f49eddf7 - languageName: node - linkType: hard - "dargs@npm:^7.0.0": version: 7.0.0 resolution: "dargs@npm:7.0.0" @@ -7124,7 +7109,7 @@ __metadata: languageName: node linkType: hard -"execa@npm:5.0.0": +"execa@npm:5.0.0, execa@npm:^5.0.0": version: 5.0.0 resolution: "execa@npm:5.0.0" dependencies: @@ -7141,23 +7126,6 @@ __metadata: languageName: node linkType: hard -"execa@npm:^5.0.0": - version: 5.1.1 - resolution: "execa@npm:5.1.1" - dependencies: - cross-spawn: ^7.0.3 - get-stream: ^6.0.0 - human-signals: ^2.1.0 - is-stream: ^2.0.0 - merge-stream: ^2.0.0 - npm-run-path: ^4.0.1 - onetime: ^5.1.2 - signal-exit: ^3.0.3 - strip-final-newline: ^2.0.0 - checksum: fba9022c8c8c15ed862847e94c252b3d946036d7547af310e344a527e59021fd8b6bb0723883ea87044dc4f0201f949046993124a42ccb0855cae5bf8c786343 - languageName: node - linkType: hard - "exenv-es6@npm:^1.1.1": version: 1.1.1 resolution: "exenv-es6@npm:1.1.1" @@ -7649,20 +7617,13 @@ __metadata: languageName: node linkType: hard -"get-stream@npm:6.0.0": +"get-stream@npm:6.0.0, get-stream@npm:^6.0.0": version: 6.0.0 resolution: "get-stream@npm:6.0.0" checksum: 587e6a93127f9991b494a566f4971cf7a2645dfa78034818143480a80587027bdd8826cdcf80d0eff4a4a19de0d231d157280f24789fc9cc31492e1dcc1290cf languageName: node linkType: hard -"get-stream@npm:^6.0.0": - version: 6.0.1 - resolution: "get-stream@npm:6.0.1" - checksum: e04ecece32c92eebf5b8c940f51468cd53554dcbb0ea725b2748be583c9523d00128137966afce410b9b051eb2ef16d657cd2b120ca8edafcf5a65e81af63cad - languageName: node - linkType: hard - "get-symbol-description@npm:^1.0.2": version: 1.0.2 resolution: "get-symbol-description@npm:1.0.2" @@ -7794,17 +7755,17 @@ __metadata: languageName: node linkType: hard -"glob@npm:^7.1.3, glob@npm:^7.1.4": - version: 7.2.3 - resolution: "glob@npm:7.2.3" +"glob@npm:^7.1.3, glob@npm:^7.1.4, glob@npm:~7.1.6": + version: 7.1.7 + resolution: "glob@npm:7.1.7" dependencies: fs.realpath: ^1.0.0 inflight: ^1.0.4 inherits: 2 - minimatch: ^3.1.1 + minimatch: ^3.0.4 once: ^1.3.0 path-is-absolute: ^1.0.0 - checksum: 29452e97b38fa704dabb1d1045350fb2467cf0277e155aa9ff7077e90ad81d1ea9d53d3ee63bd37c05b09a065e90f16aec4a65f5b8de401d1dac40bc5605d133 + checksum: b61f48973bbdcf5159997b0874a2165db572b368b931135832599875919c237fc05c12984e38fe828e69aa8a921eb0e8a4997266211c517c9cfaae8a93988bb8 languageName: node linkType: hard @@ -7833,20 +7794,6 @@ __metadata: languageName: node linkType: hard -"glob@npm:~7.1.6": - version: 7.1.7 - resolution: "glob@npm:7.1.7" - dependencies: - fs.realpath: ^1.0.0 - inflight: ^1.0.4 - inherits: 2 - minimatch: ^3.0.4 - once: ^1.3.0 - path-is-absolute: ^1.0.0 - checksum: b61f48973bbdcf5159997b0874a2165db572b368b931135832599875919c237fc05c12984e38fe828e69aa8a921eb0e8a4997266211c517c9cfaae8a93988bb8 - languageName: node - linkType: hard - "global-modules@npm:^2.0.0": version: 2.0.0 resolution: "global-modules@npm:2.0.0" @@ -8358,7 +8305,7 @@ __metadata: languageName: node linkType: hard -"inquirer@npm:8.2.4": +"inquirer@npm:8.2.4, inquirer@npm:^8.2.4": version: 8.2.4 resolution: "inquirer@npm:8.2.4" dependencies: @@ -8381,29 +8328,6 @@ __metadata: languageName: node linkType: hard -"inquirer@npm:^8.2.4": - version: 8.2.6 - resolution: "inquirer@npm:8.2.6" - dependencies: - ansi-escapes: ^4.2.1 - chalk: ^4.1.1 - cli-cursor: ^3.1.0 - cli-width: ^3.0.0 - external-editor: ^3.0.3 - figures: ^3.0.0 - lodash: ^4.17.21 - mute-stream: 0.0.8 - ora: ^5.4.1 - run-async: ^2.4.0 - rxjs: ^7.5.5 - string-width: ^4.1.0 - strip-ansi: ^6.0.0 - through: ^2.3.6 - wrap-ansi: ^6.0.1 - checksum: 387ffb0a513559cc7414eb42c57556a60e302f820d6960e89d376d092e257a919961cd485a1b4de693dbb5c0de8bc58320bfd6247dfd827a873aa82a4215a240 - languageName: node - linkType: hard - "internal-slot@npm:^1.0.7": version: 1.0.7 resolution: "internal-slot@npm:1.0.7" @@ -8668,20 +8592,13 @@ __metadata: languageName: node linkType: hard -"is-stream@npm:2.0.0": +"is-stream@npm:2.0.0, is-stream@npm:^2.0.0": version: 2.0.0 resolution: "is-stream@npm:2.0.0" checksum: 4dc47738e26bc4f1b3be9070b6b9e39631144f204fc6f87db56961220add87c10a999ba26cf81699f9ef9610426f69cb08a4713feff8deb7d8cadac907826935 languageName: node linkType: hard -"is-stream@npm:^2.0.0": - version: 2.0.1 - resolution: "is-stream@npm:2.0.1" - checksum: b8e05ccdf96ac330ea83c12450304d4a591f9958c11fd17bed240af8d5ffe08aedafa4c0f4cfccd4d28dc9d4d129daca1023633d5c11601a6cbc77521f6fae66 - languageName: node - linkType: hard - "is-string@npm:^1.0.5, is-string@npm:^1.0.7": version: 1.0.7 resolution: "is-string@npm:1.0.7" @@ -9553,20 +9470,13 @@ __metadata: languageName: node linkType: hard -"jsonc-parser@npm:3.2.0": +"jsonc-parser@npm:3.2.0, jsonc-parser@npm:^3.2.0": version: 3.2.0 resolution: "jsonc-parser@npm:3.2.0" checksum: 946dd9a5f326b745aa326d48a7257e3f4a4b62c5e98ec8e49fa2bdd8d96cef7e6febf1399f5c7016114fd1f68a1c62c6138826d5d90bc650448e3cf0951c53c7 languageName: node linkType: hard -"jsonc-parser@npm:^3.2.0": - version: 3.3.1 - resolution: "jsonc-parser@npm:3.3.1" - checksum: 81ef19d98d9c6bd6e4a37a95e2753c51c21705cbeffd895e177f4b542cca9cda5fda12fb942a71a2e824a9132cf119dc2e642e9286386055e1365b5478f49a47 - languageName: node - linkType: hard - "jsonfile@npm:^6.0.1": version: 6.1.0 resolution: "jsonfile@npm:6.1.0" @@ -10411,7 +10321,7 @@ __metadata: languageName: node linkType: hard -"minimatch@npm:^3.0.4, minimatch@npm:^3.0.5, minimatch@npm:^3.1.1, minimatch@npm:^3.1.2": +"minimatch@npm:^3.0.4, minimatch@npm:^3.0.5, minimatch@npm:^3.1.2": version: 3.1.2 resolution: "minimatch@npm:3.1.2" dependencies: @@ -10635,20 +10545,13 @@ __metadata: languageName: node linkType: hard -"ms@npm:2.1.2": +"ms@npm:2.1.2, ms@npm:^2.0.0": version: 2.1.2 resolution: "ms@npm:2.1.2" checksum: 673cdb2c3133eb050c745908d8ce632ed2c02d85640e2edb3ace856a2266a813b30c613569bf3354fdf4ea7d1a1494add3bfa95e2713baa27d0c2c71fc44f58f languageName: node linkType: hard -"ms@npm:^2.0.0": - version: 2.1.3 - resolution: "ms@npm:2.1.3" - checksum: aa92de608021b242401676e35cfa5aa42dd70cbdc082b916da7fb925c542173e36bce97ea3e804923fe92c0ad991434e4a38327e15a1b5b5f945d66df615ae6d - languageName: node - linkType: hard - "multimatch@npm:5.0.0": version: 5.0.0 resolution: "multimatch@npm:5.0.0" @@ -10729,7 +10632,7 @@ __metadata: languageName: node linkType: hard -"node-fetch@npm:2.6.7": +"node-fetch@npm:2.6.7, node-fetch@npm:^2.6.7": version: 2.6.7 resolution: "node-fetch@npm:2.6.7" dependencies: @@ -10743,20 +10646,6 @@ __metadata: languageName: node linkType: hard -"node-fetch@npm:^2.6.7": - version: 2.7.0 - resolution: "node-fetch@npm:2.7.0" - dependencies: - whatwg-url: ^5.0.0 - peerDependencies: - encoding: ^0.1.0 - peerDependenciesMeta: - encoding: - optional: true - checksum: d76d2f5edb451a3f05b15115ec89fc6be39de37c6089f1b6368df03b91e1633fd379a7e01b7ab05089a25034b2023d959b47e59759cb38d88341b2459e89d6e5 - languageName: node - linkType: hard - "node-gyp-build@npm:^4.3.0": version: 4.8.1 resolution: "node-gyp-build@npm:4.8.1" @@ -10945,13 +10834,6 @@ __metadata: languageName: node linkType: hard -"npm-normalize-package-bin@npm:^2.0.0": - version: 2.0.0 - resolution: "npm-normalize-package-bin@npm:2.0.0" - checksum: 7c5379f9b188b564c4332c97bdd9a5d6b7b15f02b5823b00989d6a0e6fb31eb0280f02b0a924f930e1fcaf00e60fae333aec8923d2a4c7747613c7d629d8aa25 - languageName: node - linkType: hard - "npm-normalize-package-bin@npm:^3.0.0, npm-normalize-package-bin@npm:^3.0.1": version: 3.0.1 resolution: "npm-normalize-package-bin@npm:3.0.1" @@ -11029,7 +10911,7 @@ __metadata: languageName: node linkType: hard -"npm-registry-fetch@npm:14.0.3": +"npm-registry-fetch@npm:14.0.3, npm-registry-fetch@npm:^14.0.0, npm-registry-fetch@npm:^14.0.3": version: 14.0.3 resolution: "npm-registry-fetch@npm:14.0.3" dependencies: @@ -11059,21 +10941,6 @@ __metadata: languageName: node linkType: hard -"npm-registry-fetch@npm:^14.0.0, npm-registry-fetch@npm:^14.0.3": - version: 14.0.5 - resolution: "npm-registry-fetch@npm:14.0.5" - dependencies: - make-fetch-happen: ^11.0.0 - minipass: ^5.0.0 - minipass-fetch: ^3.0.0 - minipass-json-stream: ^1.0.1 - minizlib: ^2.1.2 - npm-package-arg: ^10.0.0 - proc-log: ^3.0.0 - checksum: c63649642955b424bc1baaff5955027144af312ae117ba8c24829e74484f859482591fe89687c6597d83e930c8054463eef23020ac69146097a72cc62ff10986 - languageName: node - linkType: hard - "npm-run-all@npm:^4.1.5": version: 4.1.5 resolution: "npm-run-all@npm:4.1.5" @@ -11501,7 +11368,7 @@ __metadata: languageName: node linkType: hard -"pacote@npm:15.1.1": +"pacote@npm:15.1.1, pacote@npm:^15.0.0, pacote@npm:^15.0.8": version: 15.1.1 resolution: "pacote@npm:15.1.1" dependencies: @@ -11529,34 +11396,6 @@ __metadata: languageName: node linkType: hard -"pacote@npm:^15.0.0, pacote@npm:^15.0.8": - version: 15.2.0 - resolution: "pacote@npm:15.2.0" - dependencies: - "@npmcli/git": ^4.0.0 - "@npmcli/installed-package-contents": ^2.0.1 - "@npmcli/promise-spawn": ^6.0.1 - "@npmcli/run-script": ^6.0.0 - cacache: ^17.0.0 - fs-minipass: ^3.0.0 - minipass: ^5.0.0 - npm-package-arg: ^10.0.0 - npm-packlist: ^7.0.0 - npm-pick-manifest: ^8.0.0 - npm-registry-fetch: ^14.0.0 - proc-log: ^3.0.0 - promise-retry: ^2.0.1 - read-package-json: ^6.0.0 - read-package-json-fast: ^3.0.0 - sigstore: ^1.3.0 - ssri: ^10.0.0 - tar: ^6.1.11 - bin: - pacote: lib/bin.js - checksum: c731572be2bf226b117eba076d242bd4cd8be7aa01e004af3374a304ad7ab330539e22644bc33de12d2a7d45228ccbcbf4d710f59c84414f3d09a1a95ee6f0bf - languageName: node - linkType: hard - "parent-module@npm:^1.0.0": version: 1.0.1 resolution: "parent-module@npm:1.0.1" @@ -12175,7 +12014,7 @@ __metadata: languageName: node linkType: hard -"read-package-json@npm:5.0.1": +"read-package-json@npm:5.0.1, read-package-json@npm:^5.0.0": version: 5.0.1 resolution: "read-package-json@npm:5.0.1" dependencies: @@ -12187,18 +12026,6 @@ __metadata: languageName: node linkType: hard -"read-package-json@npm:^5.0.0": - version: 5.0.2 - resolution: "read-package-json@npm:5.0.2" - dependencies: - glob: ^8.0.1 - json-parse-even-better-errors: ^2.3.1 - normalize-package-data: ^4.0.0 - npm-normalize-package-bin: ^2.0.0 - checksum: 0882ac9cec1bc92fb5515e9727611fb2909351e1e5c840dce3503cbb25b4cd48eb44b61071986e0fc51043208161f07d364a7336206c8609770186818753b51a - languageName: node - linkType: hard - "read-package-json@npm:^6.0.0": version: 6.0.4 resolution: "read-package-json@npm:6.0.4" @@ -12615,7 +12442,7 @@ __metadata: languageName: node linkType: hard -"safe-buffer@npm:^5.1.0, safe-buffer@npm:~5.2.0": +"safe-buffer@npm:^5.1.0": version: 5.2.1 resolution: "safe-buffer@npm:5.2.1" checksum: b99c4b41fdd67a6aaf280fcd05e9ffb0813654894223afb78a31f14a19ad220bba8aba1cb14eddce1fcfb037155fe6de4e861784eb434f7d11ed58d1e70dd491 @@ -12733,7 +12560,7 @@ __metadata: languageName: node linkType: hard -"semver@npm:7.5.4": +"semver@npm:7.5.4, semver@npm:^7.0.0, semver@npm:^7.1.1, semver@npm:^7.3.4, semver@npm:^7.3.5, semver@npm:^7.3.7, semver@npm:^7.3.8, semver@npm:^7.5.3, semver@npm:^7.5.4": version: 7.5.4 resolution: "semver@npm:7.5.4" dependencies: @@ -12753,15 +12580,6 @@ __metadata: languageName: node linkType: hard -"semver@npm:^7.0.0, semver@npm:^7.1.1, semver@npm:^7.3.4, semver@npm:^7.3.5, semver@npm:^7.3.7, semver@npm:^7.3.8, semver@npm:^7.5.3, semver@npm:^7.5.4": - version: 7.6.3 - resolution: "semver@npm:7.6.3" - bin: - semver: bin/semver.js - checksum: 4110ec5d015c9438f322257b1c51fe30276e5f766a3f64c09edd1d7ea7118ecbc3f379f3b69032bacf13116dc7abc4ad8ce0d7e2bd642e26b0d271b56b61a7d8 - languageName: node - linkType: hard - "serialize-javascript@npm:^6.0.1": version: 6.0.2 resolution: "serialize-javascript@npm:6.0.2" @@ -12890,7 +12708,7 @@ __metadata: languageName: node linkType: hard -"sigstore@npm:^1.0.0, sigstore@npm:^1.3.0, sigstore@npm:^1.4.0": +"sigstore@npm:^1.0.0, sigstore@npm:^1.4.0": version: 1.9.0 resolution: "sigstore@npm:1.9.0" dependencies: @@ -13234,16 +13052,7 @@ __metadata: languageName: node linkType: hard -"string_decoder@npm:^1.1.1": - version: 1.3.0 - resolution: "string_decoder@npm:1.3.0" - dependencies: - safe-buffer: ~5.2.0 - checksum: 8417646695a66e73aefc4420eb3b84cc9ffd89572861fe004e6aeb13c7bc00e2f616247505d2dbbef24247c372f70268f594af7126f43548565c68c117bdeb56 - languageName: node - linkType: hard - -"string_decoder@npm:~1.1.1": +"string_decoder@npm:^1.1.1, string_decoder@npm:~1.1.1": version: 1.1.1 resolution: "string_decoder@npm:1.1.1" dependencies: @@ -14326,7 +14135,7 @@ __metadata: languageName: node linkType: hard -"vscode-jsonrpc@npm:8.2.0": +"vscode-jsonrpc@npm:8.2.0, vscode-jsonrpc@npm:^8.0.2": version: 8.2.0 resolution: "vscode-jsonrpc@npm:8.2.0" checksum: f302a01e59272adc1ae6494581fa31c15499f9278df76366e3b97b2236c7c53ebfc71efbace9041cfd2caa7f91675b9e56f2407871a1b3c7f760a2e2ee61484a @@ -14340,13 +14149,6 @@ __metadata: languageName: node linkType: hard -"vscode-jsonrpc@npm:^8.0.2": - version: 8.2.1 - resolution: "vscode-jsonrpc@npm:8.2.1" - checksum: 2af2c333d73f6587896a7077978b8d4b430e55c674d5dbb90597a84a6647057c1655a3bff398a9b08f1f8ba57dbd2deabf05164315829c297b0debba3b8bc19e - languageName: node - linkType: hard - "vscode-languageserver-protocol@npm:^3.17.0": version: 3.17.5 resolution: "vscode-languageserver-protocol@npm:3.17.5" @@ -14733,17 +14535,6 @@ __metadata: languageName: node linkType: hard -"wrap-ansi@npm:^6.0.1": - version: 6.2.0 - resolution: "wrap-ansi@npm:6.2.0" - dependencies: - ansi-styles: ^4.0.0 - string-width: ^4.1.0 - strip-ansi: ^6.0.0 - checksum: 6cd96a410161ff617b63581a08376f0cb9162375adeb7956e10c8cd397821f7eb2a6de24eb22a0b28401300bf228c86e50617cd568209b5f6775b93c97d2fe3a - languageName: node - linkType: hard - "wrap-ansi@npm:^8.1.0": version: 8.1.0 resolution: "wrap-ansi@npm:8.1.0"