Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit f882d9c

Browse files
committed
merge version conflict with tag a29
1 parent 004e9b5 commit f882d9c

File tree

4 files changed

+108
-4
lines changed

4 files changed

+108
-4
lines changed

‎jupyterlab/_version.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
VersionInfo = namedtuple("VersionInfo", ["major", "minor", "micro", "releaselevel", "serial"])
77

88
# DO NOT EDIT THIS DIRECTLY! It is managed by bumpversion
9-
version_info = VersionInfo(4, 0, 0, "alpha", 29)
9+
version_info = VersionInfo(4, 0, 0, "alpha", 30)
1010

1111
_specifier_ = {"alpha": "a", "beta": "b", "candidate": "rc", "final": ""}
1212

‎jupyterlab/staging/package.json‎

Lines changed: 105 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -319,7 +319,111 @@
319319
"react-dom",
320320
"yjs"
321321
],
322-
"linkedPackages": {},
322+
"linkedPackages": {
323+
"@jupyterlab/application": "../../packages/application",
324+
"@jupyterlab/application-extension": "../../packages/application-extension",
325+
"@jupyterlab/apputils": "../../packages/apputils",
326+
"@jupyterlab/apputils-extension": "../../packages/apputils-extension",
327+
"@jupyterlab/attachments": "../../packages/attachments",
328+
"@jupyterlab/cell-toolbar": "../../packages/cell-toolbar",
329+
"@jupyterlab/cell-toolbar-extension": "../../packages/cell-toolbar-extension",
330+
"@jupyterlab/cells": "../../packages/cells",
331+
"@jupyterlab/celltags": "../../packages/celltags",
332+
"@jupyterlab/celltags-extension": "../../packages/celltags-extension",
333+
"@jupyterlab/codeeditor": "../../packages/codeeditor",
334+
"@jupyterlab/codemirror": "../../packages/codemirror",
335+
"@jupyterlab/codemirror-extension": "../../packages/codemirror-extension",
336+
"@jupyterlab/collaboration": "../../packages/collaboration",
337+
"@jupyterlab/collaboration-extension": "../../packages/collaboration-extension",
338+
"@jupyterlab/completer": "../../packages/completer",
339+
"@jupyterlab/completer-extension": "../../packages/completer-extension",
340+
"@jupyterlab/console": "../../packages/console",
341+
"@jupyterlab/console-extension": "../../packages/console-extension",
342+
"@jupyterlab/coreutils": "../../packages/coreutils",
343+
"@jupyterlab/csvviewer": "../../packages/csvviewer",
344+
"@jupyterlab/csvviewer-extension": "../../packages/csvviewer-extension",
345+
"@jupyterlab/debugger": "../../packages/debugger",
346+
"@jupyterlab/debugger-extension": "../../packages/debugger-extension",
347+
"@jupyterlab/docmanager": "../../packages/docmanager",
348+
"@jupyterlab/docmanager-extension": "../../packages/docmanager-extension",
349+
"@jupyterlab/docprovider": "../../packages/docprovider",
350+
"@jupyterlab/docprovider-extension": "../../packages/docprovider-extension",
351+
"@jupyterlab/docregistry": "../../packages/docregistry",
352+
"@jupyterlab/documentsearch": "../../packages/documentsearch",
353+
"@jupyterlab/documentsearch-extension": "../../packages/documentsearch-extension",
354+
"@jupyterlab/extensionmanager": "../../packages/extensionmanager",
355+
"@jupyterlab/extensionmanager-extension": "../../packages/extensionmanager-extension",
356+
"@jupyterlab/filebrowser": "../../packages/filebrowser",
357+
"@jupyterlab/filebrowser-extension": "../../packages/filebrowser-extension",
358+
"@jupyterlab/fileeditor": "../../packages/fileeditor",
359+
"@jupyterlab/fileeditor-extension": "../../packages/fileeditor-extension",
360+
"@jupyterlab/help-extension": "../../packages/help-extension",
361+
"@jupyterlab/htmlviewer": "../../packages/htmlviewer",
362+
"@jupyterlab/htmlviewer-extension": "../../packages/htmlviewer-extension",
363+
"@jupyterlab/hub-extension": "../../packages/hub-extension",
364+
"@jupyterlab/imageviewer": "../../packages/imageviewer",
365+
"@jupyterlab/imageviewer-extension": "../../packages/imageviewer-extension",
366+
"@jupyterlab/inspector": "../../packages/inspector",
367+
"@jupyterlab/inspector-extension": "../../packages/inspector-extension",
368+
"@jupyterlab/javascript-extension": "../../packages/javascript-extension",
369+
"@jupyterlab/json-extension": "../../packages/json-extension",
370+
"@jupyterlab/launcher": "../../packages/launcher",
371+
"@jupyterlab/launcher-extension": "../../packages/launcher-extension",
372+
"@jupyterlab/logconsole": "../../packages/logconsole",
373+
"@jupyterlab/logconsole-extension": "../../packages/logconsole-extension",
374+
"@jupyterlab/lsp": "../../packages/lsp",
375+
"@jupyterlab/lsp-extension": "../../packages/lsp-extension",
376+
"@jupyterlab/mainmenu": "../../packages/mainmenu",
377+
"@jupyterlab/mainmenu-extension": "../../packages/mainmenu-extension",
378+
"@jupyterlab/markdownviewer": "../../packages/markdownviewer",
379+
"@jupyterlab/markdownviewer-extension": "../../packages/markdownviewer-extension",
380+
"@jupyterlab/markedparser-extension": "../../packages/markedparser-extension",
381+
"@jupyterlab/mathjax2": "../../packages/mathjax2",
382+
"@jupyterlab/mathjax2-extension": "../../packages/mathjax2-extension",
383+
"@jupyterlab/metapackage": "../../packages/metapackage",
384+
"@jupyterlab/nbconvert-css": "../../packages/nbconvert-css",
385+
"@jupyterlab/nbformat": "../../packages/nbformat",
386+
"@jupyterlab/notebook": "../../packages/notebook",
387+
"@jupyterlab/notebook-extension": "../../packages/notebook-extension",
388+
"@jupyterlab/observables": "../../packages/observables",
389+
"@jupyterlab/outputarea": "../../packages/outputarea",
390+
"@jupyterlab/pdf-extension": "../../packages/pdf-extension",
391+
"@jupyterlab/property-inspector": "../../packages/property-inspector",
392+
"@jupyterlab/rendermime": "../../packages/rendermime",
393+
"@jupyterlab/rendermime-extension": "../../packages/rendermime-extension",
394+
"@jupyterlab/rendermime-interfaces": "../../packages/rendermime-interfaces",
395+
"@jupyterlab/running": "../../packages/running",
396+
"@jupyterlab/running-extension": "../../packages/running-extension",
397+
"@jupyterlab/services": "../../packages/services",
398+
"@jupyterlab/settingeditor": "../../packages/settingeditor",
399+
"@jupyterlab/settingeditor-extension": "../../packages/settingeditor-extension",
400+
"@jupyterlab/settingregistry": "../../packages/settingregistry",
401+
"@jupyterlab/shared-models": "../../packages/shared-models",
402+
"@jupyterlab/shortcuts-extension": "../../packages/shortcuts-extension",
403+
"@jupyterlab/statedb": "../../packages/statedb",
404+
"@jupyterlab/statusbar": "../../packages/statusbar",
405+
"@jupyterlab/statusbar-extension": "../../packages/statusbar-extension",
406+
"@jupyterlab/terminal": "../../packages/terminal",
407+
"@jupyterlab/terminal-extension": "../../packages/terminal-extension",
408+
"@jupyterlab/theme-dark-extension": "../../packages/theme-dark-extension",
409+
"@jupyterlab/theme-light-extension": "../../packages/theme-light-extension",
410+
"@jupyterlab/toc": "../../packages/toc",
411+
"@jupyterlab/toc-extension": "../../packages/toc-extension",
412+
"@jupyterlab/tooltip": "../../packages/tooltip",
413+
"@jupyterlab/tooltip-extension": "../../packages/tooltip-extension",
414+
"@jupyterlab/translation": "../../packages/translation",
415+
"@jupyterlab/translation-extension": "../../packages/translation-extension",
416+
"@jupyterlab/ui-components": "../../packages/ui-components",
417+
"@jupyterlab/ui-components-extension": "../../packages/ui-components-extension",
418+
"@jupyterlab/vdom": "../../packages/vdom",
419+
"@jupyterlab/vdom-extension": "../../packages/vdom-extension",
420+
"@jupyterlab/vega5-extension": "../../packages/vega5-extension",
421+
"@jupyterlab/builder": "../../builder",
422+
"@jupyterlab/buildutils": "../../buildutils",
423+
"@jupyterlab/template": "../../buildutils/template",
424+
"@jupyterlab/galata": "../../galata",
425+
"@jupyterlab/testutils": "../../testutils"
426+
},
323427
"staticDir": "../static"
324428
}
325429
}

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
"build": "npm run build:dev",
3434
"build:all": "lerna run build:all",
3535
"build:builder": "cd builder && npm run build",
36-
"build:core": "cd jupyterlab/staging && jlpm && (jlpm deduplicate || jlpm) && npm run build",
36+
"build:core": "npm run integrity && cd jupyterlab/staging && npm run build",
3737
"build:dev": "npm run integrity && npm run build:all && cd dev_mode && npm run build",
3838
"build:dev:prod": "npm run integrity && npm run build:all && cd dev_mode && npm run build:prod",
3939
"build:dev:prod:release": "npm run integrity && npm run build:all && cd dev_mode && npm run build:prod:release",

‎pyproject.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ npm = ["node", "jupyterlab/staging/yarn.js"]
179179
[tool.hatch.build.hooks.jupyter-builder.build-kwargs]
180180
build_cmd = "build:prod:minimize"
181181
path = "jupyterlab/staging"
182-
source_dir = "jupyterlab/staging"
182+
source_dir = "packages"
183183
build_dir = "jupyterlab/static"
184184
npm = ["node", "yarn.js"]
185185

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /