Remove all unused mainmenu

packages/apputils-extension/src/workspacesplugin.ts

@@ -18,8 +18,6 @@ import {
 
 import { FileBrowser, IFileBrowserFactory } from '@jupyterlab/filebrowser';
 
-import { IMainMenu } from '@jupyterlab/mainmenu';
-
 import {
   ContentsManager,
   Workspace,
@@ -49,17 +47,10 @@ const ICON_NAME = 'jp-JupyterIcon';
 export const workspacesPlugin: JupyterFrontEndPlugin<void> = {
   id: '@jupyterlab/apputils-extension:workspaces',
   autoStart: true,
-  requires: [
-    IMainMenu,
-    IFileBrowserFactory,
-    IWindowResolver,
-    IStateDB,
-    ITranslator
-  ],
+  requires: [IFileBrowserFactory, IWindowResolver, IStateDB, ITranslator],
   optional: [IRouter],
   activate: (
     app: JupyterFrontEnd,
-    menu: IMainMenu,
     fbf: IFileBrowserFactory,
     resolver: IWindowResolver,
     state: IStateDB,

packages/documentsearch-extension/package.json

@@ -37,7 +37,6 @@
     "@jupyterlab/application": "^3.1.0-alpha.11",
     "@jupyterlab/apputils": "^3.1.0-alpha.11",
     "@jupyterlab/documentsearch": "^3.1.0-alpha.11",
-    "@jupyterlab/mainmenu": "^3.1.0-alpha.11",
     "@jupyterlab/translation": "^3.1.0-alpha.11",
     "@lumino/widgets": "^1.19.0"
   },

packages/documentsearch-extension/src/index.ts

@@ -21,7 +21,6 @@ import {
   NotebookSearchProvider
 } from '@jupyterlab/documentsearch';
 
-import { IMainMenu } from '@jupyterlab/mainmenu';
 import { ITranslator } from '@jupyterlab/translation';
 import { Widget } from '@lumino/widgets';
 
@@ -78,13 +77,12 @@ const extension: JupyterFrontEndPlugin<ISearchProviderRegistry> = {
   id: '@jupyterlab/documentsearch:plugin',
   provides: ISearchProviderRegistry,
   requires: [ITranslator],
-  optional: [ICommandPalette, IMainMenu],
+  optional: [ICommandPalette],
   autoStart: true,
   activate: (
     app: JupyterFrontEnd,
     translator: ITranslator,
-    palette: ICommandPalette,
-    mainMenu: IMainMenu | null
+    palette: ICommandPalette
   ) => {
     const trans = translator.load('jupyterlab');
 

packages/documentsearch-extension/style/index.css

@@ -8,4 +8,3 @@
 @import url('~@jupyterlab/apputils/style/index.css');
 @import url('~@jupyterlab/application/style/index.css');
 @import url('~@jupyterlab/documentsearch/style/index.css');
-@import url('~@jupyterlab/mainmenu/style/index.css');

packages/documentsearch-extension/style/index.js

@@ -8,4 +8,3 @@ import '@lumino/widgets/style/index.js';
 import '@jupyterlab/apputils/style/index.js';
 import '@jupyterlab/application/style/index.js';
 import '@jupyterlab/documentsearch/style/index.js';
-import '@jupyterlab/mainmenu/style/index.js';

packages/documentsearch-extension/tsconfig.json

@@ -15,9 +15,6 @@
     {
       "path": "../documentsearch"
     },
-    {
-      "path": "../mainmenu"
-    },
     {
       "path": "../translation"
     }

packages/extensionmanager-extension/package.json

@@ -42,7 +42,6 @@
     "@jupyterlab/application": "^3.1.0-alpha.11",
     "@jupyterlab/apputils": "^3.1.0-alpha.11",
     "@jupyterlab/extensionmanager": "^3.1.0-alpha.11",
-    "@jupyterlab/mainmenu": "^3.1.0-alpha.11",
     "@jupyterlab/settingregistry": "^3.1.0-alpha.11",
     "@jupyterlab/translation": "^3.1.0-alpha.11",
     "@jupyterlab/ui-components": "^3.1.0-alpha.11"

packages/extensionmanager-extension/src/index.ts

@@ -13,7 +13,6 @@ import {
 } from '@jupyterlab/application';
 import { Dialog, showDialog, ICommandPalette } from '@jupyterlab/apputils';
 import { ExtensionView } from '@jupyterlab/extensionmanager';
-import { IMainMenu } from '@jupyterlab/mainmenu';
 import { ISettingRegistry } from '@jupyterlab/settingregistry';
 import { ITranslator, TranslationBundle } from '@jupyterlab/translation';
 import { extensionIcon } from '@jupyterlab/ui-components';
@@ -34,14 +33,13 @@ const plugin: JupyterFrontEndPlugin<void> = {
   id: PLUGIN_ID,
   autoStart: true,
   requires: [ISettingRegistry, ITranslator],
-  optional: [ILabShell, ILayoutRestorer, IMainMenu, ICommandPalette],
+  optional: [ILabShell, ILayoutRestorer, ICommandPalette],
   activate: async (
     app: JupyterFrontEnd,
     registry: ISettingRegistry,
     translator: ITranslator,
     labShell: ILabShell | null,
     restorer: ILayoutRestorer | null,
-    mainMenu: IMainMenu | null,
     palette: ICommandPalette | null
   ) => {
     const trans = translator.load('jupyterlab');

packages/extensionmanager-extension/style/index.css

@@ -8,4 +8,3 @@
 @import url('~@jupyterlab/apputils/style/index.css');
 @import url('~@jupyterlab/application/style/index.css');
 @import url('~@jupyterlab/extensionmanager/style/index.css');
-@import url('~@jupyterlab/mainmenu/style/index.css');

packages/extensionmanager-extension/style/index.js

@@ -8,4 +8,3 @@ import '@jupyterlab/ui-components/style/index.js';
 import '@jupyterlab/apputils/style/index.js';
 import '@jupyterlab/application/style/index.js';
 import '@jupyterlab/extensionmanager/style/index.js';
-import '@jupyterlab/mainmenu/style/index.js';

packages/extensionmanager-extension/tsconfig.json

@@ -15,9 +15,6 @@
     {
       "path": "../extensionmanager"
     },
-    {
-      "path": "../mainmenu"
-    },
     {
       "path": "../settingregistry"
     },

packages/filebrowser-extension/package.json

@@ -44,7 +44,6 @@
     "@jupyterlab/docmanager": "^3.1.0-alpha.11",
     "@jupyterlab/filebrowser": "^3.1.0-alpha.11",
     "@jupyterlab/launcher": "^3.1.0-alpha.11",
-    "@jupyterlab/mainmenu": "^3.1.0-alpha.11",
     "@jupyterlab/services": "^6.1.0-alpha.11",
     "@jupyterlab/settingregistry": "^3.1.0-alpha.11",
     "@jupyterlab/statedb": "^3.1.0-alpha.11",

packages/filebrowser-extension/src/index.ts

@@ -37,8 +37,6 @@ import {
 
 import { Launcher } from '@jupyterlab/launcher';
 
-import { IMainMenu } from '@jupyterlab/mainmenu';
-
 import { Contents } from '@jupyterlab/services';
 
 import { ISettingRegistry } from '@jupyterlab/settingregistry';
@@ -167,8 +165,7 @@ const browser: JupyterFrontEndPlugin<void> = {
     ILayoutRestorer,
     ISettingRegistry,
     ITreePathUpdater,
-    ICommandPalette,
-    IMainMenu
+    ICommandPalette
   ],
   autoStart: true,
   activate: (
@@ -178,8 +175,7 @@ const browser: JupyterFrontEndPlugin<void> = {
     restorer: ILayoutRestorer | null,
     settingRegistry: ISettingRegistry | null,
     treePathUpdater: ITreePathUpdater | null,
-    commandPalette: ICommandPalette | null,
-    mainMenu: IMainMenu | null
+    commandPalette: ICommandPalette | null
   ): void => {
     const trans = translator.load('jupyterlab');
     const browser = factory.defaultBrowser;
@@ -196,14 +192,7 @@ const browser: JupyterFrontEndPlugin<void> = {
       restorer.add(browser, namespace);
     }
 
-    addCommands(
-      app,
-      factory,
-      translator,
-      settingRegistry,
-      commandPalette,
-      mainMenu
-    );
+    addCommands(app, factory, translator, settingRegistry, commandPalette);
 
     browser.title.icon = folderIcon;
     // Show the current file browser shortcut in its title.
@@ -776,8 +765,7 @@ function addCommands(
   factory: IFileBrowserFactory,
   translator: ITranslator,
   settingRegistry: ISettingRegistry | null,
-  commandPalette: ICommandPalette | null,
-  mainMenu: IMainMenu | null
+  commandPalette: ICommandPalette | null
 ): void {
   const trans = translator.load('jupyterlab');
   const { docRegistry: registry, commands } = app;

packages/filebrowser-extension/style/index.css

@@ -12,6 +12,5 @@
 @import url('~@jupyterlab/application/style/index.css');
 @import url('~@jupyterlab/filebrowser/style/index.css');
 @import url('~@jupyterlab/launcher/style/index.css');
-@import url('~@jupyterlab/mainmenu/style/index.css');
 
 @import url('./base.css');

packages/filebrowser-extension/style/index.js

@@ -12,6 +12,5 @@ import '@jupyterlab/docmanager/style/index.js';
 import '@jupyterlab/application/style/index.js';
 import '@jupyterlab/filebrowser/style/index.js';
 import '@jupyterlab/launcher/style/index.js';
-import '@jupyterlab/mainmenu/style/index.js';
 
 import './base.css';

packages/filebrowser-extension/tsconfig.json

@@ -24,9 +24,6 @@
     {
       "path": "../launcher"
     },
-    {
-      "path": "../mainmenu"
-    },
     {
       "path": "../services"
     },

packages/fileeditor-extension/src/commands.ts

@@ -1131,7 +1131,7 @@ export namespace Commands {
     addUndoRedoToEditMenu(menu, tracker);
 
     // Add editor view options.
-    addEditorViewerToViewMenu(menu, tracker, trans);
+    addEditorViewerToViewMenu(menu, tracker);
 
     // Add a console creator the the file menu.
     addConsoleCreatorToFileMenu(menu, commands, tracker, trans);
@@ -1188,8 +1188,7 @@ export namespace Commands {
    */
   export function addEditorViewerToViewMenu(
     menu: IMainMenu,
-    tracker: WidgetTracker<IDocumentWidget<FileEditor>>,
-    trans: TranslationBundle
+    tracker: WidgetTracker<IDocumentWidget<FileEditor>>
   ): void {
     menu.viewMenu.editorViewers.add({
       tracker,

packages/help-extension/src/index.tsx

@@ -86,11 +86,10 @@ const about: JupyterFrontEndPlugin<void> = {
   id: '@jupyterlab/help-extension:about',
   autoStart: true,
   requires: [ITranslator],
-  optional: [IMainMenu, ICommandPalette],
+  optional: [ICommandPalette],
   activate: (
     app: JupyterFrontEnd,
     translator: ITranslator,
-    menu: IMainMenu | null,
     palette: ICommandPalette | null
   ): void => {
     const { commands } = app;
@@ -179,11 +178,10 @@ const launchClassic: JupyterFrontEndPlugin<void> = {
   id: '@jupyterlab/help-extension:launch-classic',
   autoStart: true,
   requires: [ITranslator],
-  optional: [IMainMenu, ICommandPalette],
+  optional: [ICommandPalette],
   activate: (
     app: JupyterFrontEnd,
     translator: ITranslator,
-    menu: IMainMenu | null,
     palette: ICommandPalette | null
   ): void => {
     const { commands } = app;

packages/hub-extension/package.json

@@ -37,7 +37,6 @@
     "@jupyterlab/application": "^3.1.0-alpha.11",
     "@jupyterlab/apputils": "^3.1.0-alpha.11",
     "@jupyterlab/coreutils": "^5.1.0-alpha.11",
-    "@jupyterlab/mainmenu": "^3.1.0-alpha.11",
     "@jupyterlab/services": "^6.1.0-alpha.11",
     "@jupyterlab/translation": "^3.1.0-alpha.11"
   },

packages/hub-extension/src/index.ts

@@ -18,8 +18,6 @@ import {
 
 import { URLExt } from '@jupyterlab/coreutils';
 
-import { IMainMenu } from '@jupyterlab/mainmenu';
-
 import { ServerConnection, ServiceManager } from '@jupyterlab/services';
 import { ITranslator } from '@jupyterlab/translation';
 
@@ -41,8 +39,7 @@ function activateHubExtension(
   app: JupyterFrontEnd,
   paths: JupyterFrontEnd.IPaths,
   translator: ITranslator,
-  palette: ICommandPalette | null,
-  mainMenu: IMainMenu | null
+  palette: ICommandPalette | null
 ): void {
   const trans = translator.load('jupyterlab');
   const hubHost = paths.urls.hubHost || '';
@@ -107,7 +104,7 @@ const hubExtension: JupyterFrontEndPlugin<void> = {
   activate: activateHubExtension,
   id: 'jupyter.extensions.hub-extension',
   requires: [JupyterFrontEnd.IPaths, ITranslator],
-  optional: [ICommandPalette, IMainMenu],
+  optional: [ICommandPalette],
   autoStart: true
 };
 

packages/hub-extension/style/index.css

@@ -6,4 +6,3 @@
 /* This file was auto-generated by ensurePackage() in @jupyterlab/buildutils */
 @import url('~@jupyterlab/apputils/style/index.css');
 @import url('~@jupyterlab/application/style/index.css');
-@import url('~@jupyterlab/mainmenu/style/index.css');

packages/hub-extension/style/index.js

@@ -6,4 +6,3 @@
 /* This file was auto-generated by ensurePackage() in @jupyterlab/buildutils */
 import '@jupyterlab/apputils/style/index.js';
 import '@jupyterlab/application/style/index.js';
-import '@jupyterlab/mainmenu/style/index.js';

packages/hub-extension/tsconfig.json

@@ -15,9 +15,6 @@
     {
       "path": "../coreutils"
     },
-    {
-      "path": "../mainmenu"
-    },
     {
       "path": "../services"
     },

packages/logconsole-extension/package.json

@@ -38,7 +38,6 @@
     "@jupyterlab/apputils": "^3.1.0-alpha.11",
     "@jupyterlab/coreutils": "^5.1.0-alpha.11",
     "@jupyterlab/logconsole": "^3.1.0-alpha.11",
-    "@jupyterlab/mainmenu": "^3.1.0-alpha.11",
     "@jupyterlab/notebook": "^3.1.0-alpha.11",
     "@jupyterlab/rendermime": "^3.1.0-alpha.11",
     "@jupyterlab/settingregistry": "^3.1.0-alpha.11",

packages/logconsole-extension/src/index.tsx

@@ -29,8 +29,6 @@ import {
   LogLevel
 } from '@jupyterlab/logconsole';
 
-import { IMainMenu } from '@jupyterlab/mainmenu';
-
 import { INotebookTracker, NotebookPanel } from '@jupyterlab/notebook';
 
 import { IRenderMimeRegistry } from '@jupyterlab/rendermime';
@@ -80,13 +78,7 @@ const logConsolePlugin: JupyterFrontEndPlugin<ILoggerRegistry> = {
   id: LOG_CONSOLE_PLUGIN_ID,
   provides: ILoggerRegistry,
   requires: [ILabShell, IRenderMimeRegistry, INotebookTracker, ITranslator],
-  optional: [
-    ICommandPalette,
-    ILayoutRestorer,
-    IMainMenu,
-    ISettingRegistry,
-    IStatusBar
-  ],
+  optional: [ICommandPalette, ILayoutRestorer, ISettingRegistry, IStatusBar],
   autoStart: true
 };
 
@@ -101,7 +93,6 @@ function activateLogConsole(
   translator: ITranslator,
   palette: ICommandPalette | null,
   restorer: ILayoutRestorer | null,
-  mainMenu: IMainMenu | null,
   settingRegistry: ISettingRegistry | null,
   statusBar: IStatusBar | null
 ): ILoggerRegistry {

packages/logconsole-extension/style/index.css

@@ -11,7 +11,6 @@
 @import url('~@jupyterlab/rendermime/style/index.css');
 @import url('~@jupyterlab/application/style/index.css');
 @import url('~@jupyterlab/logconsole/style/index.css');
-@import url('~@jupyterlab/mainmenu/style/index.css');
 @import url('~@jupyterlab/notebook/style/index.css');
 
 @import url('./base.css');

packages/logconsole-extension/style/index.js

@@ -11,7 +11,6 @@ import '@jupyterlab/statusbar/style/index.js';
 import '@jupyterlab/rendermime/style/index.js';
 import '@jupyterlab/application/style/index.js';
 import '@jupyterlab/logconsole/style/index.js';
-import '@jupyterlab/mainmenu/style/index.js';
 import '@jupyterlab/notebook/style/index.js';
 
 import './base.css';

packages/logconsole-extension/tsconfig.json

@@ -18,9 +18,6 @@
     {
       "path": "../logconsole"
     },
-    {
-      "path": "../mainmenu"
-    },
     {
       "path": "../notebook"
     },

packages/statusbar-extension/src/index.ts

@@ -30,8 +30,6 @@ import { IDocumentWidget } from '@jupyterlab/docregistry';
 
 import { FileEditor, IEditorTracker } from '@jupyterlab/fileeditor';
 
-import { IMainMenu } from '@jupyterlab/mainmenu';
-
 import {
   INotebookTracker,
   Notebook,
@@ -71,7 +69,6 @@ const statusBar: JupyterFrontEndPlugin<IStatusBar> = {
     translator: ITranslator,
     labShell: ILabShell | null,
     settingRegistry: ISettingRegistry | null,
-    mainMenu: IMainMenu | null,
     palette: ICommandPalette | null
   ) => {
     const trans = translator.load('jupyterlab');
@@ -129,7 +126,7 @@ const statusBar: JupyterFrontEndPlugin<IStatusBar> = {
 
     return statusBar;
   },
-  optional: [ILabShell, ISettingRegistry, IMainMenu, ICommandPalette]
+  optional: [ILabShell, ISettingRegistry, ICommandPalette]
 };
 
 /**