mirror/notebook
2
0
Fork 0
mirror of https://github.com/jupyter/notebook.git synced 2025-01-18 11:55:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fetch resolutions and singletons from upstream JupyterLab

Browse Source
This commit is contained in:
Jeremy Tuloup 2020-12-19 10:58:59 +01:00
parent 294d497aea
commit 865ad59e72
2 changed files with 18 additions and 158 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

157
builder/package.json
View File

@ -37,6 +37,7 @@
},
"devDependencies": {
"@jupyterlab/builder": "^3.0.0-rc.14",
"@jupyterlab/buildutils": "^3.0.0-rc.14",
"css-loader": "~5.0.1",
"file-loader": "~5.0.2",
"fs-extra": "^8.1.0",
@ -54,161 +55,5 @@
"webpack-cli": "^4.2.0",
"webpack-merge": "^5.1.2",
"whatwg-fetch": "^3.0.0"
},
"resolutions": {
"@jupyterlab/application": "~3.0.0-rc.14",
"@jupyterlab/application-extension": "~3.0.0-rc.14",
"@jupyterlab/apputils": "~3.0.0-rc.14",
"@jupyterlab/apputils-extension": "~3.0.0-rc.14",
"@jupyterlab/attachments": "~3.0.0-rc.14",
"@jupyterlab/cells": "~3.0.0-rc.14",
"@jupyterlab/celltags": "~3.0.0-rc.14",
"@jupyterlab/celltags-extension": "~3.0.0-rc.14",
"@jupyterlab/codeeditor": "~3.0.0-rc.14",
"@jupyterlab/codemirror": "~3.0.0-rc.14",
"@jupyterlab/codemirror-extension": "~3.0.0-rc.14",
"@jupyterlab/completer": "~3.0.0-rc.14",
"@jupyterlab/completer-extension": "~3.0.0-rc.14",
"@jupyterlab/console": "~3.0.0-rc.14",
"@jupyterlab/console-extension": "~3.0.0-rc.14",
"@jupyterlab/coreutils": "~5.0.0-rc.14",
"@jupyterlab/csvviewer": "~3.0.0-rc.14",
"@jupyterlab/csvviewer-extension": "~3.0.0-rc.14",
"@jupyterlab/debugger": "~3.0.0-rc.14",
"@jupyterlab/debugger-extension": "~3.0.0-rc.14",
"@jupyterlab/docmanager": "~3.0.0-rc.14",
"@jupyterlab/docmanager-extension": "~3.0.0-rc.14",
"@jupyterlab/docregistry": "~3.0.0-rc.14",
"@jupyterlab/documentsearch": "~3.0.0-rc.14",
"@jupyterlab/documentsearch-extension": "~3.0.0-rc.14",
"@jupyterlab/extensionmanager": "^3.0.0-rc.14",
"@jupyterlab/extensionmanager-extension": "~3.0.0-rc.14",
"@jupyterlab/filebrowser": "~3.0.0-rc.14",
"@jupyterlab/filebrowser-extension": "~3.0.0-rc.14",
"@jupyterlab/fileeditor": "~3.0.0-rc.14",
"@jupyterlab/fileeditor-extension": "~3.0.0-rc.14",
"@jupyterlab/help-extension": "~3.0.0-rc.14",
"@jupyterlab/htmlviewer": "~3.0.0-rc.14",
"@jupyterlab/htmlviewer-extension": "~3.0.0-rc.14",
"@jupyterlab/hub-extension": "~3.0.0-rc.14",
"@jupyterlab/imageviewer": "~3.0.0-rc.14",
"@jupyterlab/imageviewer-extension": "~3.0.0-rc.14",
"@jupyterlab/inspector": "~3.0.0-rc.14",
"@jupyterlab/inspector-extension": "~3.0.0-rc.14",
"@jupyterlab/javascript-extension": "~3.0.0-rc.14",
"@jupyterlab/json-extension": "~3.0.0-rc.14",
"@jupyterlab/launcher": "~3.0.0-rc.14",
"@jupyterlab/launcher-extension": "~3.0.0-rc.14",
"@jupyterlab/logconsole": "~3.0.0-rc.14",
"@jupyterlab/logconsole-extension": "~3.0.0-rc.14",
"@jupyterlab/mainmenu": "~3.0.0-rc.14",
"@jupyterlab/mainmenu-extension": "~3.0.0-rc.14",
"@jupyterlab/markdownviewer-extension": "~3.0.0-rc.14",
"@jupyterlab/mathjax2": "~3.0.0-rc.14",
"@jupyterlab/mathjax2-extension": "~3.0.0-rc.14",
"@jupyterlab/metapackage": "~3.0.0-rc.14",
"@jupyterlab/nbconvert-css": "~3.0.0-rc.14",
"@jupyterlab/nbformat": "~3.0.0-rc.14",
"@jupyterlab/notebook": "~3.0.0-rc.14",
"@jupyterlab/notebook-extension": "~3.0.0-rc.14",
"@jupyterlab/observables": "~4.0.0-rc.14",
"@jupyterlab/outputarea": "~3.0.0-rc.14",
"@jupyterlab/pdf-extension": "~3.0.0-rc.14",
"@jupyterlab/property-inspector": "~3.0.0-rc.14",
"@jupyterlab/rendermime": "~3.0.0-rc.14",
"@jupyterlab/rendermime-extension": "~3.0.0-rc.14",
"@jupyterlab/rendermime-interfaces": "~3.0.0-rc.14",
"@jupyterlab/running": "~3.0.0-rc.14",
"@jupyterlab/running-extension": "~3.0.0-rc.14",
"@jupyterlab/services": "~6.0.0-rc.14",
"@jupyterlab/settingeditor": "~3.0.0-rc.14",
"@jupyterlab/settingeditor-extension": "~3.0.0-rc.14",
"@jupyterlab/settingregistry": "~3.0.0-rc.14",
"@jupyterlab/shortcuts-extension": "~3.0.0-rc.14",
"@jupyterlab/statedb": "~3.0.0-rc.14",
"@jupyterlab/statusbar": "~3.0.0-rc.14",
"@jupyterlab/statusbar-extension": "~3.0.0-rc.14",
"@jupyterlab/terminal": "~3.0.0-rc.14",
"@jupyterlab/terminal-extension": "~3.0.0-rc.14",
"@jupyterlab/theme-dark-extension": "~3.0.0-rc.14",
"@jupyterlab/theme-light-extension": "~3.0.0-rc.14",
"@jupyterlab/toc": "~5.0.0-rc.14",
"@jupyterlab/toc-extension": "~5.0.0-rc.14",
"@jupyterlab/tooltip": "~3.0.0-rc.14",
"@jupyterlab/tooltip-extension": "~3.0.0-rc.14",
"@jupyterlab/translation": "~3.0.0-rc.14",
"@jupyterlab/translation-extension": "~3.0.0-rc.14",
"@jupyterlab/ui-components": "~3.0.0-rc.14",
"@jupyterlab/ui-components-extension": "~3.0.0-rc.14",
"@jupyterlab/vdom": "~3.0.0-rc.14",
"@jupyterlab/vdom-extension": "~3.0.0-rc.14",
"@jupyterlab/vega5-extension": "~3.0.0-rc.14",
"@lumino/algorithm": "^1.2.3",
"@lumino/application": "^1.8.4",
"@lumino/commands": "^1.10.1",
"@lumino/coreutils": "^1.4.3",
"@lumino/disposable": "^1.3.5",
"@lumino/domutils": "^1.1.7",
"@lumino/dragdrop": "^1.5.1",
"@lumino/messaging": "^1.3.3",
"@lumino/properties": "^1.1.6",
"@lumino/signaling": "^1.3.5",
"@lumino/virtualdom": "^1.6.1",
"@lumino/widgets": "^1.14.0",
"react": "^17.0.1",
"react-dom": "^17.0.1"
},
"jupyterlab": {
"name": "JupyterLab Classic",
"version": "0.1.0-rc.0",
"buildDir": "./static",
"outputDir": ".",
"singletonPackages": [
"@jupyterlab/application",
"@jupyterlab/apputils",
"@jupyterlab/codeeditor",
"@jupyterlab/codemirror",
"@jupyterlab/completer",
"@jupyterlab/console",
"@jupyterlab/coreutils",
"@jupyterlab/debugger",
"@jupyterlab/docmanager",
"@jupyterlab/documentsearch",
"@jupyterlab/extensionmanager",
"@jupyterlab/filebrowser",
"@jupyterlab/fileeditor",
"@jupyterlab/imageviewer",
"@jupyterlab/inspector",
"@jupyterlab/launcher",
"@jupyterlab/logconsole",
"@jupyterlab/mainmenu",
"@jupyterlab/markdownviewer",
"@jupyterlab/notebook",
"@jupyterlab/rendermime",
"@jupyterlab/rendermime-interfaces",
"@jupyterlab/services",
"@jupyterlab/settingeditor",
"@jupyterlab/settingregistry",
"@jupyterlab/statedb",
"@jupyterlab/statusbar",
"@jupyterlab/terminal",
"@jupyterlab/tooltip",
"@jupyterlab/translation",
"@jupyterlab/ui-components",
"@lumino/algorithm",
"@lumino/application",
"@lumino/commands",
"@lumino/coreutils",
"@lumino/disposable",
"@lumino/domutils",
"@lumino/dragdrop",
"@lumino/messaging",
"@lumino/properties",
"@lumino/signaling",
"@lumino/virtualdom",
"@lumino/widgets",
"react",
"react-dom"
]
}
}

19
builder/webpack.config.js
View File

@ -14,9 +14,24 @@ const BundleAnalyzerPlugin = require('webpack-bundle-analyzer')
const Build = require('@jupyterlab/builder').Build;
const baseConfig = require('@jupyterlab/builder/lib/webpack.config.base');
const buildutils = require('@jupyterlab/buildutils');
const data = require('./package.json');
// get resolutions and singletons from upstream JupyterLab
function getJupyterLabPackageJsonPath() {
const script = [
'python',
'-c',
"\"import pkg_resources; print(pkg_resources.resource_filename('jupyterlab', 'staging/package.json'))\""
];
const cmd = script.join(' ');
return buildutils.run(cmd, { stdio: 'pipe' }, true);
}
const labPackagePath = getJupyterLabPackageJsonPath();
const labJson = buildutils.readJSONFile(labPackagePath);
const names = Object.keys(data.dependencies).filter(name => {
const packageData = require(path.join(name, 'package.json'));
return packageData.jupyterlab !== undefined;
@ -42,7 +57,7 @@ const extras = Build.ensureAssets({
const singletons = {};
data.jupyterlab.singletonPackages.forEach(element => {
labJson.jupyterlab.singletonPackages.forEach(element => {
singletons[element] = { singleton: true };
});
@ -79,7 +94,7 @@ module.exports = [
},
name: 'CORE_FEDERATION',
shared: {
...data.resolutions,
...labJson.resolutions,
...singletons
}
})