diff --git a/buildutils/src/ensure-repo.ts b/buildutils/src/ensure-repo.ts index f62bbe83991d..78e430336fe1 100644 --- a/buildutils/src/ensure-repo.ts +++ b/buildutils/src/ensure-repo.ts @@ -52,7 +52,6 @@ let SKIP_CSS: Dict = { ], '@jupyterlab/filebrowser': ['@jupyterlab/statusbar'], '@jupyterlab/fileeditor': ['@jupyterlab/statusbar'], - '@jupyterlab/faq-extension': ['@jupyterlab/application'], '@jupyterlab/help-extension': ['@jupyterlab/application'], '@jupyterlab/shortcuts-extension': ['@jupyterlab/application'], '@jupyterlab/tabmanager-extension': ['@jupyterlab/application'], diff --git a/dev_mode/imports.css b/dev_mode/imports.css index 62622d0b0fe1..36ad7a4e6520 100644 --- a/dev_mode/imports.css +++ b/dev_mode/imports.css @@ -9,7 +9,6 @@ @import url('~@jupyterlab/docmanager-extension/style/index.css'); @import url('~@jupyterlab/documentsearch-extension/style/index.css'); @import url('~@jupyterlab/extensionmanager-extension/style/index.css'); -@import url('~@jupyterlab/faq-extension/style/index.css'); @import url('~@jupyterlab/filebrowser-extension/style/index.css'); @import url('~@jupyterlab/fileeditor-extension/style/index.css'); @import url('~@jupyterlab/help-extension/style/index.css'); diff --git a/dev_mode/package.json b/dev_mode/package.json index 9ef8b875a2eb..c02c0b1e7785 100644 --- a/dev_mode/package.json +++ b/dev_mode/package.json @@ -27,7 +27,6 @@ "@jupyterlab/documentsearch-extension": "^1.0.0-alpha.13", "@jupyterlab/extensionmanager": "^1.0.0-alpha.11", "@jupyterlab/extensionmanager-extension": "^1.0.0-alpha.11", - "@jupyterlab/faq-extension": "^1.0.0-alpha.11", "@jupyterlab/filebrowser": "^1.0.0-alpha.11", "@jupyterlab/filebrowser-extension": "^1.0.0-alpha.11", "@jupyterlab/fileeditor": "^1.0.0-alpha.11", @@ -126,7 +125,6 @@ "@jupyterlab/docmanager-extension": "", "@jupyterlab/documentsearch-extension": "", "@jupyterlab/extensionmanager-extension": "", - "@jupyterlab/faq-extension": "", "@jupyterlab/filebrowser-extension": "", "@jupyterlab/fileeditor-extension": "", "@jupyterlab/help-extension": "", @@ -222,7 +220,6 @@ "@jupyterlab/docmanager-extension": "../packages/docmanager-extension", "@jupyterlab/documentsearch-extension": "../packages/documentsearch-extension", "@jupyterlab/extensionmanager-extension": "../packages/extensionmanager-extension", - "@jupyterlab/faq-extension": "../packages/faq-extension", "@jupyterlab/filebrowser-extension": "../packages/filebrowser-extension", "@jupyterlab/fileeditor-extension": "../packages/fileeditor-extension", "@jupyterlab/help-extension": "../packages/help-extension", diff --git a/examples/app/package.json b/examples/app/package.json index 97e29e1aa784..e1e22119adaa 100644 --- a/examples/app/package.json +++ b/examples/app/package.json @@ -17,7 +17,6 @@ "@jupyterlab/console-extension": "^1.0.0-alpha.11", "@jupyterlab/csvviewer-extension": "^1.0.0-alpha.12", "@jupyterlab/docmanager-extension": "^1.0.0-alpha.11", - "@jupyterlab/faq-extension": "^1.0.0-alpha.11", "@jupyterlab/filebrowser-extension": "^1.0.0-alpha.11", "@jupyterlab/fileeditor-extension": "^1.0.0-alpha.11", "@jupyterlab/help-extension": "^1.0.0-alpha.11", diff --git a/packages/faq-extension/README.md b/packages/faq-extension/README.md deleted file mode 100644 index 3b18f1e38f26..000000000000 --- a/packages/faq-extension/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# @jupyterlab/faq-extension - -A JupyterLab extension which provides a frequently-asked-questions window for the application. diff --git a/packages/faq-extension/faq.md b/packages/faq-extension/faq.md deleted file mode 100644 index 2ad2c2810028..000000000000 --- a/packages/faq-extension/faq.md +++ /dev/null @@ -1,17 +0,0 @@ -# Frequently Asked Questions (FAQ) - -Below are some frequently asked questions. -Click on a question to be directed to relevant information in our documentation or our GitHub repo. - -## General - -- [What is JupyterLab?](https://jupyterlab.readthedocs.io/en/stable/getting_started/overview.html) -- [How stable is JupyterLab?](https://jupyterlab.readthedocs.io/en/stable/getting_started/overview.html) -- [What will happen to the classic Jupyter Notebook?](https://jupyterlab.readthedocs.io/en/stable/getting_started/overview.html#releases) -- [Where is the documentation for JupyterLab?](https://jupyterlab.readthedocs.io/en/stable/) - -## Development - -- [How can you report a bug or provide feedback?](https://github.com/jupyterlab/jupyterlab/issues) -- [How can you contribute?](https://github.com/jupyterlab/jupyterlab/blob/master/CONTRIBUTING.md) -- [How can you extend or customize JupyterLab?](https://jupyterlab.readthedocs.io/en/stable/user/extensions.html) diff --git a/packages/faq-extension/package.json b/packages/faq-extension/package.json deleted file mode 100644 index ec616f69d55c..000000000000 --- a/packages/faq-extension/package.json +++ /dev/null @@ -1,56 +0,0 @@ -{ - "name": "@jupyterlab/faq-extension", - "version": "1.0.0-alpha.11", - "description": "JupyterLab - FAQ Extension", - "homepage": "https://github.com/jupyterlab/jupyterlab", - "bugs": { - "url": "https://github.com/jupyterlab/jupyterlab/issues" - }, - "repository": { - "type": "git", - "url": "https://github.com/jupyterlab/jupyterlab.git" - }, - "license": "BSD-3-Clause", - "author": "Project Jupyter", - "files": [ - "lib/*.d.ts", - "lib/*.js.map", - "lib/*.js", - "style/*.css", - "faq.md" - ], - "sideEffects": [ - "style/*.css" - ], - "main": "lib/index.js", - "types": "lib/index.d.ts", - "style": "style/index.css", - "directories": { - "lib": "lib/" - }, - "scripts": { - "build": "tsc -b", - "clean": "rimraf lib", - "docs": "typedoc --options tdoptions.json --theme ../../typedoc-theme src", - "prepublishOnly": "npm run build", - "watch": "tsc -b --watch" - }, - "dependencies": { - "@jupyterlab/application": "^1.0.0-alpha.11", - "@jupyterlab/apputils": "^1.0.0-alpha.11", - "@jupyterlab/rendermime": "^1.0.0-alpha.11", - "@phosphor/coreutils": "^1.3.0" - }, - "devDependencies": { - "@types/node": "^12.0.2", - "rimraf": "~2.6.2", - "typedoc": "^0.14.2", - "typescript": "~3.5.1" - }, - "publishConfig": { - "access": "public" - }, - "jupyterlab": { - "extension": true - } -} diff --git a/packages/faq-extension/src/index.ts b/packages/faq-extension/src/index.ts deleted file mode 100644 index 3e769a3602fc..000000000000 --- a/packages/faq-extension/src/index.ts +++ /dev/null @@ -1,105 +0,0 @@ -// Copyright (c) Jupyter Development Team. -// Distributed under the terms of the Modified BSD License. - -import { - ILayoutRestorer, - JupyterFrontEnd, - JupyterFrontEndPlugin -} from '@jupyterlab/application'; - -import { - ICommandPalette, - InstanceTracker, - MainAreaWidget -} from '@jupyterlab/apputils'; - -import { IRenderMimeRegistry } from '@jupyterlab/rendermime'; - -import { JSONExt } from '@phosphor/coreutils'; - -/** - * The command IDs used by the FAQ plugin. - */ -namespace CommandIDs { - export const open: string = 'faq-jupyterlab:open'; -} - -/** - * The FAQ page extension. - */ -const plugin: JupyterFrontEndPlugin = { - activate, - id: '@jupyterlab/faq-extension:plugin', - requires: [IRenderMimeRegistry], - optional: [ICommandPalette, ILayoutRestorer], - autoStart: true -}; - -/** - * Export the plugin as default. - */ -export default plugin; - -/* tslint:disable */ -/** - * The faq page source. - */ -const SOURCE = require('../faq.md'); -/* tslint:enable */ - -/** - * Activate the FAQ plugin. - */ -function activate( - app: JupyterFrontEnd, - rendermime: IRenderMimeRegistry, - palette: ICommandPalette | null, - restorer: ILayoutRestorer | null -): void { - const category = 'Help'; - const command = CommandIDs.open; - const { commands, shell } = app; - const tracker = new InstanceTracker({ namespace: 'faq' }); - - // Handle state restoration. - if (restorer) { - restorer.restore(tracker, { - command, - args: () => JSONExt.emptyObject, - name: () => 'faq' - }); - } - - let createWidget = () => { - let content = rendermime.createRenderer('text/markdown'); - const model = rendermime.createModel({ - data: { 'text/markdown': SOURCE } - }); - void content.renderModel(model); - content.addClass('jp-FAQ-content'); - let widget = new MainAreaWidget({ content }); - widget.addClass('jp-FAQ'); - widget.title.label = 'FAQ'; - return widget; - }; - - let widget: MainAreaWidget; - - commands.addCommand(command, { - label: 'Open FAQ', - execute: () => { - if (!widget || widget.isDisposed) { - widget = createWidget(); - } - if (!tracker.has(widget)) { - void tracker.add(widget); - shell.add(widget, 'main', { activate: false }); - } - shell.activateById(widget.id); - } - }); - - if (palette) { - palette.addItem({ command, category }); - } -} diff --git a/packages/faq-extension/style/base.css b/packages/faq-extension/style/base.css deleted file mode 100644 index 1d33d69ab71d..000000000000 --- a/packages/faq-extension/style/base.css +++ /dev/null @@ -1,21 +0,0 @@ -/*----------------------------------------------------------------------------- -| Copyright (c) Jupyter Development Team. -| Distributed under the terms of the Modified BSD License. -|----------------------------------------------------------------------------*/ - -.jp-FAQ { - font-family: var(--jp-content-font-family); - line-height: var(--jp-content-line-height); - font-size: var(--jp-content-font-size1); - color: var(--jp-content-font-color1); - outline: none; - display: flex; - flex-direction: column; - min-width: 240px; - min-height: 120px; -} - -.jp-FAQ-content { - overflow-y: auto; - padding: 32px; -} diff --git a/packages/faq-extension/style/index.css b/packages/faq-extension/style/index.css deleted file mode 100644 index 645da08b9f35..000000000000 --- a/packages/faq-extension/style/index.css +++ /dev/null @@ -1,10 +0,0 @@ -/*----------------------------------------------------------------------------- -| Copyright (c) Jupyter Development Team. -| Distributed under the terms of the Modified BSD License. -|----------------------------------------------------------------------------*/ - -/* This file was auto-generated by ensurePackage() in @jupyterlab/buildutils */ -@import url('~@jupyterlab/apputils/style/index.css'); -@import url('~@jupyterlab/rendermime/style/index.css'); - -@import url('./base.css'); diff --git a/packages/faq-extension/tdoptions.json b/packages/faq-extension/tdoptions.json deleted file mode 100644 index 31e3d340426b..000000000000 --- a/packages/faq-extension/tdoptions.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "excludeNotExported": true, - "mode": "file", - "target": "es5", - "module": "es5", - "lib": [ - "lib.es2015.d.ts", - "lib.es2015.collection.d.ts", - "lib.es2015.promise.d.ts", - "lib.dom.d.ts" - ], - "out": "../../docs/api/faq-extension", - "baseUrl": ".", - "paths": { - "@jupyterlab/*": ["../packages/*"] - }, - "esModuleInterop": true, - "jsx": "react", - "types": ["node"] -} diff --git a/packages/faq-extension/tsconfig.json b/packages/faq-extension/tsconfig.json deleted file mode 100644 index c719edf81668..000000000000 --- a/packages/faq-extension/tsconfig.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "extends": "../../tsconfigbase", - "compilerOptions": { - "outDir": "lib", - "types": ["node"], - "rootDir": "src" - }, - "include": ["src/*"], - "references": [ - { - "path": "../application" - }, - { - "path": "../apputils" - }, - { - "path": "../rendermime" - } - ] -} diff --git a/packages/help-extension/src/index.tsx b/packages/help-extension/src/index.tsx index cbf1bb1dc19c..aaf039e1858d 100644 --- a/packages/help-extension/src/index.tsx +++ b/packages/help-extension/src/index.tsx @@ -149,11 +149,9 @@ function activate( // Populate the Help menu. const helpMenu = mainMenu.helpMenu; - const labGroup = [ - CommandIDs.about, - 'faq-jupyterlab:open', - CommandIDs.launchClassic - ].map(command => ({ command })); + const labGroup = [CommandIDs.about, CommandIDs.launchClassic].map( + command => ({ command }) + ); helpMenu.addGroup(labGroup, 0); const resourcesGroup = RESOURCES.map(args => ({ args, diff --git a/packages/inspector/src/handler.ts b/packages/inspector/src/handler.ts index 010590cd8cff..e3c91aecd77b 100644 --- a/packages/inspector/src/handler.ts +++ b/packages/inspector/src/handler.ts @@ -167,7 +167,7 @@ export class InspectionHandler implements IDisposable, IInspector.IInspectable { * Handle changes to the editor state, debouncing. */ private _onChange(): void { - this._debouncer.invoke(); + void this._debouncer.invoke(); } private _cleared = new Signal(this); diff --git a/packages/metapackage/package.json b/packages/metapackage/package.json index b60db8bfb3a8..9f88ccf2c7ad 100644 --- a/packages/metapackage/package.json +++ b/packages/metapackage/package.json @@ -54,7 +54,6 @@ "@jupyterlab/documentsearch-extension": "^1.0.0-alpha.13", "@jupyterlab/extensionmanager": "^1.0.0-alpha.11", "@jupyterlab/extensionmanager-extension": "^1.0.0-alpha.11", - "@jupyterlab/faq-extension": "^1.0.0-alpha.11", "@jupyterlab/filebrowser": "^1.0.0-alpha.11", "@jupyterlab/filebrowser-extension": "^1.0.0-alpha.11", "@jupyterlab/fileeditor": "^1.0.0-alpha.11", diff --git a/packages/metapackage/src/index.ts b/packages/metapackage/src/index.ts index 46a1ba060d3f..506eb5c68d12 100644 --- a/packages/metapackage/src/index.ts +++ b/packages/metapackage/src/index.ts @@ -22,7 +22,6 @@ import '@jupyterlab/docmanager-extension'; import '@jupyterlab/docregistry'; import '@jupyterlab/extensionmanager'; import '@jupyterlab/extensionmanager-extension'; -import '@jupyterlab/faq-extension'; import '@jupyterlab/filebrowser'; import '@jupyterlab/filebrowser-extension'; import '@jupyterlab/fileeditor'; diff --git a/packages/metapackage/tsconfig.json b/packages/metapackage/tsconfig.json index 99edf66ab220..7080fa4c962d 100644 --- a/packages/metapackage/tsconfig.json +++ b/packages/metapackage/tsconfig.json @@ -75,9 +75,6 @@ { "path": "../extensionmanager-extension" }, - { - "path": "../faq-extension" - }, { "path": "../filebrowser" },