Skip to content

Commit 8d43191

Browse files
authored
Merge pull request #141 from silx-kit/up-h5web
Upgrade H5Web to v14 and other deps
2 parents 5a64565 + f952068 commit 8d43191

File tree

8 files changed

+806
-779
lines changed

8 files changed

+806
-779
lines changed

.prettierrc

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,3 @@
11
{
2-
"semi": true,
3-
"singleQuote": true,
4-
"overrides": [
5-
{
6-
"files": "*.md",
7-
"options": {
8-
"proseWrap": "always"
9-
}
10-
}
11-
]
2+
"singleQuote": true
123
}

.yarnrc.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,7 @@
1+
compressionLevel: mixed
2+
3+
enableGlobalCache: false
4+
15
enableImmutableInstalls: false
6+
27
nodeLinker: node-modules

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
```bash
66
# Prepare environment with pip, conda, micromamba ...
7-
conda install -c conda-forge nodejs=20 jupyterlab==4 jupyter-packaging jupyterlab-h5web
7+
conda install -c conda-forge nodejs=22 jupyterlab==4 jupyter-packaging jupyterlab-h5web
88

99
# Install front-end dependencies (`jlpm` is JupyterLab's pinned version of yarn)
1010
jlpm install

package.json

Lines changed: 25 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"url": "https://github.com/silx-kit/jupyterlab-h5web/issues"
2626
},
2727
"engines": {
28-
"node": "20.x",
28+
"node": "22.x",
2929
"jlpm": "*"
3030
},
3131
"main": "lib/index.js",
@@ -48,7 +48,6 @@
4848
"clean:lib": "rimraf lib tsconfig.tsbuildinfo",
4949
"clean:labextension": "rimraf jupyterlab_h5web/labextension",
5050
"clean:all": "jlpm run clean:lib && jlpm run clean:labextension",
51-
"deduplicate": "jlpm run yarn-deduplicate",
5251
"lint": "run-p 'lint:*'",
5352
"lint:eslint": "eslint \"**/*.{ts,tsx,js,jsx}\" --max-warnings=0",
5453
"lint:tsc": "tsc --noEmit",
@@ -59,39 +58,38 @@
5958
"postversion": "git push && git push --tags"
6059
},
6160
"dependencies": {
62-
"@h5web/app": "13.0.0",
63-
"@jupyterlab/application": "^4.0.0",
64-
"@jupyterlab/apputils": "^4.0.0",
65-
"@jupyterlab/coreutils": "^6.0.0",
66-
"@jupyterlab/docmanager": "^4.0.0",
67-
"@jupyterlab/docregistry": "^4.0.0",
68-
"@jupyterlab/filebrowser": "^4.0.0",
69-
"@jupyterlab/launcher": "^4.0.0",
70-
"@jupyterlab/rendermime": "^4.0.0",
71-
"@jupyterlab/rendermime-interfaces": "^3.8.2",
72-
"@jupyterlab/services": "^7.0.0",
73-
"@jupyterlab/ui-components": "^4.0.0",
74-
"@lumino/widgets": "^2.0.0",
75-
"@react-hookz/web": "^24.0.4",
76-
"react": "^18.0.0",
77-
"react-dom": "^18.0.0"
61+
"@h5web/app": "14.0.0",
62+
"@jupyterlab/application": "4.3.6",
63+
"@jupyterlab/apputils": "4.4.6",
64+
"@jupyterlab/coreutils": "6.3.6",
65+
"@jupyterlab/docmanager": "4.3.6",
66+
"@jupyterlab/docregistry": "4.3.6",
67+
"@jupyterlab/filebrowser": "4.3.6",
68+
"@jupyterlab/launcher": "4.3.6",
69+
"@jupyterlab/rendermime": "4.3.6",
70+
"@jupyterlab/rendermime-interfaces": "3.11.6",
71+
"@jupyterlab/services": "7.3.6",
72+
"@jupyterlab/ui-components": "4.3.6",
73+
"@lumino/widgets": "2.6.0",
74+
"@react-hookz/web": "25.1.0",
75+
"react": "18.3.1",
76+
"react-dom": "18.3.1"
7877
},
7978
"devDependencies": {
80-
"@jupyterlab/builder": "^4.0.0",
81-
"@types/node": "^20.14.9",
82-
"@types/react": "^18.0.0",
83-
"@types/react-dom": "^18.0.0",
79+
"@jupyterlab/builder": "4.3.6",
80+
"@types/node": "^22.13.11",
81+
"@types/react": "^18.3.19",
82+
"@types/react-dom": "^18.3.5",
8483
"@typescript-eslint/eslint-plugin": "^5.55.0",
8584
"@typescript-eslint/parser": "^5.55.0",
8685
"eslint": "8.26.0",
8786
"eslint-config-galex": "4.3.1",
8887
"eslint-plugin-import": "^2.27.5",
89-
"mkdirp": "^1.0.3",
88+
"mkdirp": "3.0.1",
9089
"npm-run-all": "4.1.5",
91-
"prettier": "2.8.8",
92-
"rimraf": "^5.0.0",
93-
"typescript": "~5.1.3",
94-
"yarn-deduplicate": "^6.0.0"
90+
"prettier": "3.5.3",
91+
"rimraf": "6.0.1",
92+
"typescript": "~5.1.3"
9593
},
9694
"jupyterlab": {
9795
"discovery": {

src/H5webApp.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ function H5webApp(props: { filePath: string }) {
1313
params: { file: filePath },
1414
headers: token ? { Authorization: `token ${token}` } : {},
1515
}),
16-
[filePath, token]
16+
[filePath, token],
1717
);
1818

1919
return (

src/browser.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ const PATCH_OPENING = true;
1818
// Add special handling for HDF files to the function handling file openings (docManager.open)
1919
export function patchOpeningOfHdf5File(
2020
app: JupyterFrontEnd,
21-
docManager: IDocumentManager
21+
docManager: IDocumentManager,
2222
): void {
2323
const { commands } = app;
2424

@@ -27,7 +27,7 @@ export function patchOpeningOfHdf5File(
2727
path: string,
2828
widgetName = 'default',
2929
kernel?: Partial<Kernel.IModel>,
30-
options?: DocumentRegistry.IOpenOptions
30+
options?: DocumentRegistry.IOpenOptions,
3131
) => {
3232
if (HDF5_FILE_TYPE.extensions.includes(PathExt.extname(path))) {
3333
commands.execute(OPEN_H5WEB_COMMAND);
@@ -41,7 +41,7 @@ export function patchOpeningOfHdf5File(
4141
export function activateOpenInBrowser(
4242
app: JupyterFrontEnd,
4343
browser: IDefaultFileBrowser,
44-
docManager: IDocumentManager
44+
docManager: IDocumentManager,
4545
): void {
4646
const { commands } = app;
4747
commands.addCommand(OPEN_H5WEB_COMMAND, {
@@ -81,7 +81,7 @@ export function activateOpenInBrowser(
8181
name: 'jupyterlab-h5web:main',
8282
readOnly: true,
8383
modelName: HDF5_FILE_TYPE.fileFormat,
84-
})
84+
}),
8585
);
8686
}
8787
}

src/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ const extension: JupyterFrontEndPlugin<void> = {
2020
app: JupyterFrontEnd,
2121
defaultFileBrowser: IDefaultFileBrowser,
2222
rendermime: IRenderMimeRegistry,
23-
docManager: IDocumentManager
23+
docManager: IDocumentManager,
2424
): void => {
2525
// eslint-disable-next-line no-console
2626
console.log('JupyterLab extension jupyterlab-h5web is activated!');

0 commit comments

Comments
 (0)