Skip to content

Commit 01fc2dc

Browse files
andrii-iandrii-i
authored
Fix translator usage, remove @jupyterlab/rendermime-interfaces dependency (#483)
1 parent 33a74e1 commit 01fc2dc

File tree

3 files changed

+4
-142
lines changed

3 files changed

+4
-142
lines changed

‎package.json‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@
6262
"@jupyterlab/coreutils": "^6",
6363
"@jupyterlab/filebrowser": "^4",
6464
"@jupyterlab/launcher": "^4",
65-
"@jupyterlab/rendermime-interfaces": "^3.8.0",
6665
"@jupyterlab/services": "^7",
6766
"@jupyterlab/translation": "^4",
6867
"@jupyterlab/ui-components": "^4",

‎src/index.tsx‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import {
1212
import { FileBrowser, IFileBrowserFactory } from '@jupyterlab/filebrowser';
1313
import { ILauncher } from '@jupyterlab/launcher';
1414
import { INotebookTracker } from '@jupyterlab/notebook';
15-
import { IRenderMime } from '@jupyterlab/rendermime-interfaces';
1615
import { Contents, ServerConnection } from '@jupyterlab/services';
1716
import { ITranslator } from '@jupyterlab/translation';
1817

@@ -52,8 +51,9 @@ type EventLog = {
5251
*/
5352
async function verifyServerExtension(props: {
5453
api: SchedulerService;
55-
trans: IRenderMime.TranslationBundle;
54+
translator: ITranslator;
5655
}) {
56+
const trans = props.translator.load('jupyterlab');
5757
try {
5858
await props.api.getJobs({ max_items: 0 });
5959
} catch (e: unknown) {
@@ -63,7 +63,7 @@ async function verifyServerExtension(props: {
6363
e.response.status === 404
6464
) {
6565
showDialog({
66-
title: props.trans.__('Jupyter Scheduler server extension not found'),
66+
title: trans.__('Jupyter Scheduler server extension not found'),
6767
body: SERVER_EXTENSION_404_JSX,
6868
buttons: [Dialog.okButton()]
6969
}).catch(console.warn);
@@ -176,7 +176,7 @@ function activatePlugin(
176176
): void {
177177
const trans = translator.load('jupyterlab');
178178
const api = new SchedulerService({});
179-
verifyServerExtension({ api, trans });
179+
verifyServerExtension({ api, translator });
180180

181181
const { commands } = app;
182182
const fileBrowserTracker = browserFactory.tracker;

‎yarn.lock‎

Lines changed: 0 additions & 137 deletions
Original file line numberDiff line numberDiff line change
@@ -3775,16 +3775,6 @@ __metadata:
37753775
languageName: node
37763776
linkType: hard
37773777

3778-
"@jupyterlab/rendermime-interfaces@npm:^3.8.0":
3779-
version: 3.9.0
3780-
resolution: "@jupyterlab/rendermime-interfaces@npm:3.9.0"
3781-
dependencies:
3782-
"@lumino/coreutils": ^1.11.0 || ^2.1.2
3783-
"@lumino/widgets": ^1.37.2 || ^2.3.1
3784-
checksum: 462f5d034cd636caf9322245a50045ddaac55e05e056e7c6579e2db55088e724c8054a51a959aa284c44b108a9e0f0053707b50d6d8a9caed5825eeaf715b245
3785-
languageName: node
3786-
linkType: hard
3787-
37883778
"@jupyterlab/rendermime-interfaces@npm:^3.8.3":
37893779
version: 3.8.3
37903780
resolution: "@jupyterlab/rendermime-interfaces@npm:3.8.3"
@@ -3829,7 +3819,6 @@ __metadata:
38293819
"@jupyterlab/coreutils": ^6
38303820
"@jupyterlab/filebrowser": ^4
38313821
"@jupyterlab/launcher": ^4
3832-
"@jupyterlab/rendermime-interfaces": ^3.8.0
38333822
"@jupyterlab/services": ^7
38343823
"@jupyterlab/testutils": ^4
38353824
"@jupyterlab/translation": ^4
@@ -4190,13 +4179,6 @@ __metadata:
41904179
languageName: node
41914180
linkType: hard
41924181

4193-
"@lumino/algorithm@npm:^2.0.1":
4194-
version: 2.0.1
4195-
resolution: "@lumino/algorithm@npm:2.0.1"
4196-
checksum: cbf7fcf6ee6b785ea502cdfddc53d61f9d353dcb9659343511d5cd4b4030be2ff2ca4c08daec42f84417ab0318a3d9972a17319fa5231693e109ab112dcf8000
4197-
languageName: node
4198-
linkType: hard
4199-
42004182
"@lumino/application@npm:^2.1.1":
42014183
version: 2.2.0
42024184
resolution: "@lumino/application@npm:2.2.0"
@@ -4217,15 +4199,6 @@ __metadata:
42174199
languageName: node
42184200
linkType: hard
42194201

4220-
"@lumino/collections@npm:^2.0.1":
4221-
version: 2.0.1
4222-
resolution: "@lumino/collections@npm:2.0.1"
4223-
dependencies:
4224-
"@lumino/algorithm": ^2.0.1
4225-
checksum: 8a29b7973a388a33c5beda0819dcd2dc2aad51a8406dcfd4581b055a9f77a39dc5800f7a8b4ae3c0bb97ae7b56a7a869e2560ffb7a920a28e93b477ba05907d6
4226-
languageName: node
4227-
linkType: hard
4228-
42294202
"@lumino/commands@npm:^2.1.1, @lumino/commands@npm:^2.1.2":
42304203
version: 2.1.2
42314204
resolution: "@lumino/commands@npm:2.1.2"
@@ -4241,35 +4214,13 @@ __metadata:
42414214
languageName: node
42424215
linkType: hard
42434216

4244-
"@lumino/commands@npm:^2.2.0":
4245-
version: 2.2.0
4246-
resolution: "@lumino/commands@npm:2.2.0"
4247-
dependencies:
4248-
"@lumino/algorithm": ^2.0.1
4249-
"@lumino/coreutils": ^2.1.2
4250-
"@lumino/disposable": ^2.1.2
4251-
"@lumino/domutils": ^2.0.1
4252-
"@lumino/keyboard": ^2.0.1
4253-
"@lumino/signaling": ^2.1.2
4254-
"@lumino/virtualdom": ^2.0.1
4255-
checksum: 093e9715491e5cef24bc80665d64841417b400f2fa595f9b60832a3b6340c405c94a6aa276911944a2c46d79a6229f3cc087b73f50852bba25ece805abd0fae9
4256-
languageName: node
4257-
linkType: hard
4258-
42594217
"@lumino/coreutils@npm:^1.11.0 || ^2.0.0, @lumino/coreutils@npm:^1.11.0 || ^2.1.1, @lumino/coreutils@npm:^2, @lumino/coreutils@npm:^2.1.1":
42604218
version: 2.1.1
42614219
resolution: "@lumino/coreutils@npm:2.1.1"
42624220
checksum: dfdeb2b0282caae17b6c3edfebadf4ce7c75fc879fa60cacfef9b154412f4b35e4ffd95b1833b99d8dacb99aaaa04513570129ae2024c3f33e2677a01f0576ce
42634221
languageName: node
42644222
linkType: hard
42654223

4266-
"@lumino/coreutils@npm:^1.11.0 || ^2.1.2, @lumino/coreutils@npm:^2.1.2":
4267-
version: 2.1.2
4268-
resolution: "@lumino/coreutils@npm:2.1.2"
4269-
checksum: 7865317ac0676b448d108eb57ab5d8b2a17c101995c0f7a7106662d9fe6c859570104525f83ee3cda12ae2e326803372206d6f4c1f415a5b59e4158a7b81066f
4270-
languageName: node
4271-
linkType: hard
4272-
42734224
"@lumino/disposable@npm:^1.10.0 || ^2.0.0, @lumino/disposable@npm:^2.1.1":
42744225
version: 2.1.1
42754226
resolution: "@lumino/disposable@npm:2.1.1"
@@ -4279,29 +4230,13 @@ __metadata:
42794230
languageName: node
42804231
linkType: hard
42814232

4282-
"@lumino/disposable@npm:^2.1.2":
4283-
version: 2.1.2
4284-
resolution: "@lumino/disposable@npm:2.1.2"
4285-
dependencies:
4286-
"@lumino/signaling": ^2.1.2
4287-
checksum: ac2fb2bf18d0b2939fda454f3db248a0ff6e8a77b401e586d1caa9293b3318f808b93a117c9c3ac27cd17aab545aea83b49108d099b9b2f5503ae2a012fbc6e2
4288-
languageName: node
4289-
linkType: hard
4290-
42914233
"@lumino/domutils@npm:^2.0.0":
42924234
version: 2.0.0
42934235
resolution: "@lumino/domutils@npm:2.0.0"
42944236
checksum: 4a146bfc1006d5fd00ccecc61d9803965d269c15c48c892fd87216336ce967f0db91f31203c5616c83d260224cddf25af4abb6704a6770757d19e44068f690bf
42954237
languageName: node
42964238
linkType: hard
42974239

4298-
"@lumino/domutils@npm:^2.0.1":
4299-
version: 2.0.1
4300-
resolution: "@lumino/domutils@npm:2.0.1"
4301-
checksum: 61fa0ab226869dfbb763fc426790cf5a43b7d6f4cea1364c6dd56d61c44bff05eea188d33ff847449608ef58ed343161bee15c19b96f35410e4ee35815dc611a
4302-
languageName: node
4303-
linkType: hard
4304-
43054240
"@lumino/dragdrop@npm:^2.1.1, @lumino/dragdrop@npm:^2.1.2":
43064241
version: 2.1.2
43074242
resolution: "@lumino/dragdrop@npm:2.1.2"
@@ -4312,30 +4247,13 @@ __metadata:
43124247
languageName: node
43134248
linkType: hard
43144249

4315-
"@lumino/dragdrop@npm:^2.1.4":
4316-
version: 2.1.4
4317-
resolution: "@lumino/dragdrop@npm:2.1.4"
4318-
dependencies:
4319-
"@lumino/coreutils": ^2.1.2
4320-
"@lumino/disposable": ^2.1.2
4321-
checksum: 43d82484b13b38b612e7dfb424a840ed6a38d0db778af10655c4ba235c67b5b12db1683929b35a36ab2845f77466066dfd1ee25c1c273e8e175677eba9dc560d
4322-
languageName: node
4323-
linkType: hard
4324-
43254250
"@lumino/keyboard@npm:^2.0.0":
43264251
version: 2.0.0
43274252
resolution: "@lumino/keyboard@npm:2.0.0"
43284253
checksum: 3852ba51f437b1c1d7e552a0f844592a05e04dd5012070dc6e4384c58965d1ebf536c6875c1b7bae03cde3c715ddc36cd290992fcefc1a8c39094194f4689fdd
43294254
languageName: node
43304255
linkType: hard
43314256

4332-
"@lumino/keyboard@npm:^2.0.1":
4333-
version: 2.0.1
4334-
resolution: "@lumino/keyboard@npm:2.0.1"
4335-
checksum: cf33f13427a418efd7cc91061233321e860d5404f3d86397781028309bef86c8ad2d88276ffe335c1db0fe619bd9d1e60641c81f881696957a58703ee4652c3e
4336-
languageName: node
4337-
linkType: hard
4338-
43394257
"@lumino/messaging@npm:^2.0.0":
43404258
version: 2.0.0
43414259
resolution: "@lumino/messaging@npm:2.0.0"
@@ -4346,16 +4264,6 @@ __metadata:
43464264
languageName: node
43474265
linkType: hard
43484266

4349-
"@lumino/messaging@npm:^2.0.1":
4350-
version: 2.0.1
4351-
resolution: "@lumino/messaging@npm:2.0.1"
4352-
dependencies:
4353-
"@lumino/algorithm": ^2.0.1
4354-
"@lumino/collections": ^2.0.1
4355-
checksum: 964c4651c374b17452b4252b7d71500b32d2ecd87c192fc5bcf5d3bd1070661d78d07edcac8eca7d1d6fd50aa25992505485e1296d6dd995691b8e349b652045
4356-
languageName: node
4357-
linkType: hard
4358-
43594267
"@lumino/polling@npm:^2, @lumino/polling@npm:^2.1.1":
43604268
version: 2.1.1
43614269
resolution: "@lumino/polling@npm:2.1.1"
@@ -4374,13 +4282,6 @@ __metadata:
43744282
languageName: node
43754283
linkType: hard
43764284

4377-
"@lumino/properties@npm:^2.0.1":
4378-
version: 2.0.1
4379-
resolution: "@lumino/properties@npm:2.0.1"
4380-
checksum: c50173a935148cc4148fdaea119df1d323ee004ae16ab666800388d27e9730345629662d85f25591683329b39f0cdae60ee8c94e8943b4d0ef7d7370a38128d6
4381-
languageName: node
4382-
linkType: hard
4383-
43844285
"@lumino/signaling@npm:^1.10.0 || ^2.0.0, @lumino/signaling@npm:^2, @lumino/signaling@npm:^2.1.1":
43854286
version: 2.1.1
43864287
resolution: "@lumino/signaling@npm:2.1.1"
@@ -4391,16 +4292,6 @@ __metadata:
43914292
languageName: node
43924293
linkType: hard
43934294

4394-
"@lumino/signaling@npm:^2.1.2":
4395-
version: 2.1.2
4396-
resolution: "@lumino/signaling@npm:2.1.2"
4397-
dependencies:
4398-
"@lumino/algorithm": ^2.0.1
4399-
"@lumino/coreutils": ^2.1.2
4400-
checksum: ad7d7153db57980da899c43e412e6130316ef30b231a70250e7af49058db16cadb018c1417a2ea8083d83c48623cfe6b705fa82bf10216b1a8949aed9f4aca4e
4401-
languageName: node
4402-
linkType: hard
4403-
44044295
"@lumino/virtualdom@npm:^2.0.0":
44054296
version: 2.0.0
44064297
resolution: "@lumino/virtualdom@npm:2.0.0"
@@ -4410,15 +4301,6 @@ __metadata:
44104301
languageName: node
44114302
linkType: hard
44124303

4413-
"@lumino/virtualdom@npm:^2.0.1":
4414-
version: 2.0.1
4415-
resolution: "@lumino/virtualdom@npm:2.0.1"
4416-
dependencies:
4417-
"@lumino/algorithm": ^2.0.1
4418-
checksum: cf59b6f15b430e13e9e657b7a0619b9056cd9ea7b2a87f407391d071c501b77403c302b6a66dca510382045e75b2e3fe551630bb391f1c6b33678057d4bec164
4419-
languageName: node
4420-
linkType: hard
4421-
44224304
"@lumino/widgets@npm:^1.37.2 || ^2.1.1, @lumino/widgets@npm:^2, @lumino/widgets@npm:^2.1.1, @lumino/widgets@npm:^2.2.0":
44234305
version: 2.2.0
44244306
resolution: "@lumino/widgets@npm:2.2.0"
@@ -4438,25 +4320,6 @@ __metadata:
44384320
languageName: node
44394321
linkType: hard
44404322

4441-
"@lumino/widgets@npm:^1.37.2 || ^2.3.1":
4442-
version: 2.3.1
4443-
resolution: "@lumino/widgets@npm:2.3.1"
4444-
dependencies:
4445-
"@lumino/algorithm": ^2.0.1
4446-
"@lumino/commands": ^2.2.0
4447-
"@lumino/coreutils": ^2.1.2
4448-
"@lumino/disposable": ^2.1.2
4449-
"@lumino/domutils": ^2.0.1
4450-
"@lumino/dragdrop": ^2.1.4
4451-
"@lumino/keyboard": ^2.0.1
4452-
"@lumino/messaging": ^2.0.1
4453-
"@lumino/properties": ^2.0.1
4454-
"@lumino/signaling": ^2.1.2
4455-
"@lumino/virtualdom": ^2.0.1
4456-
checksum: ba7b8f8839c1cd2a41dbda13281094eb6981a270cccf4f25a0cf83686dcc526a2d8044a20204317630bb7dd4a04d65361408c7623a921549c781afca84b91c67
4457-
languageName: node
4458-
linkType: hard
4459-
44604323
"@mui/base@npm:5.0.0-alpha.98":
44614324
version: 5.0.0-alpha.98
44624325
resolution: "@mui/base@npm:5.0.0-alpha.98"

0 commit comments

Comments
 (0)