Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/jupyterlab/jupyterlab
Browse files Browse the repository at this point in the history
  • Loading branch information
Max Ehrlich committed Aug 2, 2019
2 parents ed8bea1 + bdf6136 commit f3ffee1
Show file tree
Hide file tree
Showing 128 changed files with 1,740 additions and 1,381 deletions.
38 changes: 19 additions & 19 deletions .bumpversion.cfg
@@ -1,19 +1,19 @@
[bumpversion]
current_version = 1, 0, 2, 'final', 0
commit = False
tag = False
parse = (?P<major>\d+)\,\ (?P<minor>\d+)\,\ (?P<patch>\d+)\,\ \'(?P<release>\S+)\'\,\ (?P<build>\d+)
serialize =
{major}, {minor}, {patch}, '{release}', {build}
[bumpversion:part:release]
optional_value = final
values =
alpha
candidate
final
[bumpversion:part:build]
[bumpversion:file:jupyterlab/_version.py]
[bumpversion]
current_version = 1, 0, 4, 'final', 0
commit = False
tag = False
parse = (?P<major>\d+)\,\ (?P<minor>\d+)\,\ (?P<patch>\d+)\,\ \'(?P<release>\S+)\'\,\ (?P<build>\d+)
serialize =
{major}, {minor}, {patch}, '{release}', {build}
[bumpversion:part:release]
optional_value = final
values =
alpha
candidate
final
[bumpversion:part:build]
[bumpversion:file:jupyterlab/_version.py]
2 changes: 1 addition & 1 deletion CORPORATE.md
Expand Up @@ -92,7 +92,7 @@ them, bug reports, ideas, discussions, questions, refactoring, etc. If your
company wants to contribute new features, we ask that you commit to maintaining
those features for a period of at least 2-3 years. This isn't a legal contract,
but we do want you to carefully consider the maintenance of your contributions.
If a new feature is abandonded and we are unable to maintain it, it may be
If a new feature is abandoned and we are unable to maintain it, it may be
deprecated or removed.

**Don't surprise us.** _Don't build us a new dog park, when what we really need
Expand Down
2 changes: 1 addition & 1 deletion buildutils/package.json
@@ -1,6 +1,6 @@
{
"name": "@jupyterlab/buildutils",
"version": "1.0.1",
"version": "1.0.2",
"description": "JupyterLab - Build Utilities",
"homepage": "https://github.com/jupyterlab/jupyterlab",
"bugs": {
Expand Down
111 changes: 57 additions & 54 deletions dev_mode/package.json
@@ -1,70 +1,73 @@
{
"name": "@jupyterlab/application-top",
"version": "1.0.2",
"version": "1.0.4",
"private": true,
"scripts": {
"build": "webpack",
"build:dev": "jlpm run build",
"build:dev:minimize": "jlpm run build:dev",
"build:prod": "cross-env NODE_OPTIONS=--max_old_space_size=4096 webpack --config webpack.prod.config.js",
"build:prod:stats": "cross-env NODE_OPTIONS=--max_old_space_size=4096 webpack --profile --config webpack.prod.config.js --json > stats.json",
"build:prod:minimize": "cross-env NODE_OPTIONS=--max_old_space_size=4096 webpack --config webpack.prod.minimize.config.js",
"build:prod:stats": "cross-env NODE_OPTIONS=--max_old_space_size=4096 webpack --profile --config webpack.prod.minimize.config.js --json > stats.json",
"build:stats": "webpack --profile --json > stats.json",
"clean": "rimraf build",
"prepublishOnly": "npm run build",
"watch": "webpack --watch"
},
"dependencies": {
"@jupyterlab/application": "^1.0.1",
"@jupyterlab/application-extension": "^1.0.1",
"@jupyterlab/apputils": "^1.0.1",
"@jupyterlab/apputils-extension": "^1.0.1",
"@jupyterlab/codemirror-extension": "^1.0.1",
"@jupyterlab/completer-extension": "^1.0.1",
"@jupyterlab/console": "^1.0.1",
"@jupyterlab/console-extension": "^1.0.1",
"@jupyterlab/application": "^1.0.2",
"@jupyterlab/application-extension": "^1.0.2",
"@jupyterlab/apputils": "^1.0.2",
"@jupyterlab/apputils-extension": "^1.0.2",
"@jupyterlab/codemirror-extension": "^1.0.2",
"@jupyterlab/completer-extension": "^1.0.2",
"@jupyterlab/console": "^1.0.2",
"@jupyterlab/console-extension": "^1.0.3",
"@jupyterlab/coreutils": "^3.0.0",
"@jupyterlab/csvviewer-extension": "^1.0.1",
"@jupyterlab/docmanager": "^1.0.1",
"@jupyterlab/docmanager-extension": "^1.0.1",
"@jupyterlab/documentsearch-extension": "^1.0.1",
"@jupyterlab/extensionmanager": "^1.0.1",
"@jupyterlab/extensionmanager-extension": "^1.0.1",
"@jupyterlab/filebrowser": "^1.0.1",
"@jupyterlab/filebrowser-extension": "^1.0.2",
"@jupyterlab/fileeditor": "^1.0.1",
"@jupyterlab/fileeditor-extension": "^1.0.1",
"@jupyterlab/help-extension": "^1.0.1",
"@jupyterlab/htmlviewer-extension": "^1.0.1",
"@jupyterlab/hub-extension": "^1.0.1",
"@jupyterlab/imageviewer": "^1.0.1",
"@jupyterlab/imageviewer-extension": "^1.0.1",
"@jupyterlab/inspector-extension": "^1.0.1",
"@jupyterlab/javascript-extension": "^1.0.1",
"@jupyterlab/json-extension": "^1.0.1",
"@jupyterlab/launcher": "^1.0.1",
"@jupyterlab/launcher-extension": "^1.0.1",
"@jupyterlab/mainmenu-extension": "^1.0.1",
"@jupyterlab/markdownviewer-extension": "^1.0.1",
"@jupyterlab/mathjax2-extension": "^1.0.1",
"@jupyterlab/notebook": "^1.0.1",
"@jupyterlab/notebook-extension": "^1.0.1",
"@jupyterlab/csvviewer-extension": "^1.0.2",
"@jupyterlab/docmanager": "^1.0.2",
"@jupyterlab/docmanager-extension": "^1.0.2",
"@jupyterlab/documentsearch-extension": "^1.0.2",
"@jupyterlab/extensionmanager": "^1.0.2",
"@jupyterlab/extensionmanager-extension": "^1.0.2",
"@jupyterlab/filebrowser": "^1.0.3",
"@jupyterlab/filebrowser-extension": "^1.0.4",
"@jupyterlab/fileeditor": "^1.0.2",
"@jupyterlab/fileeditor-extension": "^1.0.3",
"@jupyterlab/help-extension": "^1.0.2",
"@jupyterlab/htmlviewer-extension": "^1.0.2",
"@jupyterlab/hub-extension": "^1.0.2",
"@jupyterlab/imageviewer": "^1.0.2",
"@jupyterlab/imageviewer-extension": "^1.0.2",
"@jupyterlab/inspector-extension": "^1.0.2",
"@jupyterlab/javascript-extension": "^1.0.2",
"@jupyterlab/json-extension": "^1.0.2",
"@jupyterlab/launcher": "^1.0.2",
"@jupyterlab/launcher-extension": "^1.0.2",
"@jupyterlab/mainmenu-extension": "^1.0.2",
"@jupyterlab/markdownviewer-extension": "^1.0.2",
"@jupyterlab/mathjax2-extension": "^1.0.2",
"@jupyterlab/notebook": "^1.0.2",
"@jupyterlab/notebook-extension": "^1.0.3",
"@jupyterlab/pdf-extension": "^1.0.0",
"@jupyterlab/rendermime": "^1.0.1",
"@jupyterlab/rendermime-extension": "^1.0.1",
"@jupyterlab/rendermime": "^1.0.2",
"@jupyterlab/rendermime-extension": "^1.0.2",
"@jupyterlab/rendermime-interfaces": "^1.3.0",
"@jupyterlab/running-extension": "^1.0.1",
"@jupyterlab/services": "^4.0.1",
"@jupyterlab/settingeditor-extension": "^1.0.1",
"@jupyterlab/shortcuts-extension": "^1.0.1",
"@jupyterlab/statusbar-extension": "^1.0.1",
"@jupyterlab/tabmanager-extension": "^1.0.1",
"@jupyterlab/terminal": "^1.0.1",
"@jupyterlab/terminal-extension": "^1.0.1",
"@jupyterlab/theme-dark-extension": "^1.0.1",
"@jupyterlab/theme-light-extension": "^1.0.1",
"@jupyterlab/tooltip": "^1.0.1",
"@jupyterlab/tooltip-extension": "^1.0.1",
"@jupyterlab/vdom-extension": "^1.0.1",
"@jupyterlab/vega4-extension": "^1.0.0",
"@jupyterlab/vega5-extension": "^1.0.0",
"@jupyterlab/running-extension": "^1.0.2",
"@jupyterlab/services": "^4.0.2",
"@jupyterlab/settingeditor-extension": "^1.0.2",
"@jupyterlab/shortcuts-extension": "^1.0.2",
"@jupyterlab/statusbar-extension": "^1.0.2",
"@jupyterlab/tabmanager-extension": "^1.0.2",
"@jupyterlab/terminal": "^1.0.2",
"@jupyterlab/terminal-extension": "^1.0.2",
"@jupyterlab/theme-dark-extension": "^1.0.2",
"@jupyterlab/theme-light-extension": "^1.0.2",
"@jupyterlab/tooltip": "^1.0.2",
"@jupyterlab/tooltip-extension": "^1.0.2",
"@jupyterlab/vdom-extension": "^1.0.2",
"@jupyterlab/vega4-extension": "^1.0.1",
"@jupyterlab/vega5-extension": "^1.0.1",
"@phosphor/algorithm": "^1.1.3",
"@phosphor/application": "^1.6.3",
"@phosphor/commands": "^1.6.3",
Expand All @@ -86,7 +89,7 @@
"url-parse": "~1.4.3"
},
"devDependencies": {
"@jupyterlab/buildutils": "^1.0.1",
"@jupyterlab/buildutils": "^1.0.2",
"cross-env": "^5.2.0",
"css-loader": "~2.1.1",
"duplicate-package-checker-webpack-plugin": "^3.0.0",
Expand Down Expand Up @@ -118,7 +121,7 @@
},
"jupyterlab": {
"name": "JupyterLab",
"version": "1.0.2",
"version": "1.0.4",
"extensions": {
"@jupyterlab/application-extension": "",
"@jupyterlab/apputils-extension": "",
Expand Down
19 changes: 1 addition & 18 deletions dev_mode/webpack.prod.config.js
@@ -1,28 +1,11 @@
const TerserPlugin = require('terser-webpack-plugin');
var merge = require('webpack-merge');
var config = require('./webpack.config');

config[0] = merge(config[0], {
mode: 'production',
devtool: 'source-map',
optimization: {
minimizer: [
new TerserPlugin({
parallel: true,
sourceMap: true,
terserOptions: {
compress: false,
ecma: 6,
mangle: true,
output: {
beautify: false,
comments: false
},
safari10: true
},
cache: process.platform !== 'win32'
})
]
minimize: false
}
});

Expand Down
29 changes: 29 additions & 0 deletions dev_mode/webpack.prod.minimize.config.js
@@ -0,0 +1,29 @@
const TerserPlugin = require('terser-webpack-plugin');
var merge = require('webpack-merge');
var config = require('./webpack.config');

config[0] = merge(config[0], {
mode: 'production',
devtool: 'source-map',
optimization: {
minimizer: [
new TerserPlugin({
parallel: true,
sourceMap: true,
terserOptions: {
compress: false,
ecma: 6,
mangle: true,
output: {
beautify: false,
comments: false
},
safari10: true
},
cache: process.platform !== 'win32'
})
]
}
});

module.exports = config;
58 changes: 58 additions & 0 deletions docs/source/developer/extension_points.rst
Expand Up @@ -356,3 +356,61 @@ Widget tracker tokens are provided for many activities in JupyterLab, including
notebooks, consoles, text files, mime documents, and terminals.
If you are adding your own activities to JupyterLab, you might consider providing
a ``WidgetTracker`` token of your own, so that other extensions can make use of it.
.. _copy_shareable_link:
Copy Shareable Link
~~~~~~~~~~~~~~~~~~~
The file browser provides a context menu item "Copy Shareable Link". The
desired behavior will vary by deployment and the users it serves. The file
browser supports overriding the behavior of this item.
.. code:: typescript
import {
IFileBrowserFactory
} from '@jupyterlab/filebrowser';
import {
JupyterFrontEnd, JupyterFrontEndPlugin
} from '@jupyterlab/application';
const shareFile: JupyterFrontEndPlugin<void> = {
activate: activateShareFile,
id: commandID,
requires: [IFileBrowserFactory],
autoStart: true
};
function activateShareFile(
app: JupyterFrontEnd,
factory: IFileBrowserFactory
): void {
const { commands } = app;
const { tracker } = factory;
commands.addCommand('filebrowser:share-main', {
execute: () => {
const widget = tracker.currentWidget;
if (!widget) {
return;
}
const path = encodeURI(widget.selectedItems().next().path);
// Do something with path.
},
isVisible: () =>
tracker.currentWidget &&
toArray(tracker.currentWidget.selectedItems()).length === 1,
iconClass: 'jp-MaterialIcon jp-LinkIcon',
label: 'Copy Shareable Link'
});
}
Note that before enabling this plugin in the usual way, you must *disable* the
default plugin provided by the built-in file browser.
.. code:: bash
jupyter labextension disable @jupyterlab/filebrowser-extension:share-file
20 changes: 10 additions & 10 deletions docs/source/developer/extension_tutorial.rst
Expand Up @@ -229,15 +229,6 @@ a reference to the command palette interface and the Jupyter front end.
ICommandPalette
} from '@jupyterlab/apputils';
You will also need to install these dependencies. Run the following commands in the
repository root folder install the dependency and save it to your
`package.json`:

.. code:: bash
jlpm add @jupyterlab/apputils
jlpm add @jupyterlab/application
Locate the ``extension`` object of type ``JupyterFrontEndPlugin``. Change the
definition so that it reads like so:

Expand All @@ -264,7 +255,16 @@ will pass an instance of ``ICommandPalette`` as the second parameter of
in that function. The second ``console.log`` line exists only so that
you can immediately check that your changes work.

Run the following to rebuild your extension.
Now you will need to install these dependencies. Run the following commands in the
repository root folder to install the dependencies and save them to your
`package.json`:

.. code:: bash
jlpm add @jupyterlab/apputils
jlpm add @jupyterlab/application
Finally, run the following to rebuild your extension.

.. code:: bash
Expand Down
6 changes: 6 additions & 0 deletions docs/source/developer/xkcd_extension_tutorial.rst
@@ -0,0 +1,6 @@
:orphan:

The extension tutorial has moved!
----------------------------------

With the release of JupyterLab 1.0, we've also created a brand-new extension tutorial! This old tutorial is now out-of-date and has been retired, but `you can find the new tutorial here <https://jupyterlab.readthedocs.io/en/stable/developer/extension_tutorial.html>`__.
1 change: 1 addition & 0 deletions docs/source/getting_started/changelog.rst
Expand Up @@ -130,6 +130,7 @@ Extension Development Changes
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
* We have rewritten how extensions provide keyboard shortcuts and interact with the settings system. If you previously defined keyboard shortcuts or used the settings mechanism, you will need to update your extension (`#5470 <https://github.com/jupyterlab/jupyterlab/pull/5470>`__, `#5298 <https://github.com/jupyterlab/jupyterlab/issues/5298>`__)
* We have renamed the plugin type from ``JupyterLabPlugin`` to ``JupyterFrontEndPlugin``. The application arg is also renamed from ``JupyterLab`` to ``JupyterFrontEnd`` and some its functionality has been moved to a separate ``ILabShell`` plugin (`#5845 <https://github.com/jupyterlab/jupyterlab/pull/5845>`__, `#5919 <https://github.com/jupyterlab/jupyterlab/pull/5919>`__)
* The lab shell ``addToMainArea``, ``addToLeftArea``, ``addToTopArea``, ``addToRightArea``, and ``addToBottomArea`` functions have been replaced with a single ``add()`` function that takes the area as an argument. Replace ``addToMainArea(widget, options)`` with ``add(widget, 'main', options)``, etc. (`#5845 <https://github.com/jupyterlab/jupyterlab/pull/5845>`__)
* Rename ``pageUrl`` to ``appUrl`` in the server connection (`#6509 <https://github.com/jupyterlab/jupyterlab/pull/6509>`__, `#6508 <https://github.com/jupyterlab/jupyterlab/issues/6508>`__, `#6585 <https://github.com/jupyterlab/jupyterlab/pull/6585>`__, `#6584 <https://github.com/jupyterlab/jupyterlab/issues/6584>`__)
* ``MainAreaWidget`` instances now forward update requests to their ``content`` (`#6586 <https://github.com/jupyterlab/jupyterlab/pull/6586>`__, `#6571 <https://github.com/jupyterlab/jupyterlab/issues/6571>`__)
* The theme data attributes are renamed and moved to the document body element. If you are relying on these attributes in CSS to conditionally style based on the theme, you should update their names. For example ``data-theme-light`` is now ``data-jp-theme-light``. (`#6566 <https://github.com/jupyterlab/jupyterlab/pull/6566>`__, `#6554 <https://github.com/jupyterlab/jupyterlab/issues/6554>`__)
Expand Down

0 comments on commit f3ffee1

Please sign in to comment.