Merge pull request #7681 from vidartf/coreutils-split

Coreutils split
jupyterlab · Dec 23, 2019 · 7fb0185 · 7fb0185
2 parents f4995f9 + a2c3089
commit 7fb0185
Show file tree

Hide file tree

Showing 192 changed files with 1,621 additions and 1,057 deletions.
diff --git a/dev_mode/package.json b/dev_mode/package.json
@@ -138,6 +138,7 @@
     "@jupyterlab/mathjax2-extension": "~2.0.0-alpha.4",
     "@jupyterlab/metapackage": "~2.0.0-alpha.4",
     "@jupyterlab/nbconvert-css": "~2.0.0-alpha.4",
+    "@jupyterlab/nbformat": "~2.0.0-alpha.4",
     "@jupyterlab/notebook": "~2.0.0-alpha.4",
     "@jupyterlab/notebook-extension": "~2.0.0-alpha.4",
     "@jupyterlab/observables": "~3.0.0-alpha.4",
@@ -152,7 +153,9 @@
     "@jupyterlab/services": "~5.0.0-alpha.4",
     "@jupyterlab/settingeditor": "~2.0.0-alpha.4",
     "@jupyterlab/settingeditor-extension": "~2.0.0-alpha.4",
+    "@jupyterlab/settingregistry": "~2.0.0-alpha.4",
     "@jupyterlab/shortcuts-extension": "~2.0.0-alpha.4",
+    "@jupyterlab/statedb": "~2.0.0-alpha.4",
     "@jupyterlab/statusbar": "~2.0.0-alpha.4",
     "@jupyterlab/statusbar-extension": "~2.0.0-alpha.4",
     "@jupyterlab/tabmanager-extension": "~2.0.0-alpha.4",
@@ -324,6 +327,7 @@
       "@jupyterlab/mathjax2-extension": "../packages/mathjax2-extension",
       "@jupyterlab/metapackage": "../packages/metapackage",
       "@jupyterlab/nbconvert-css": "../packages/nbconvert-css",
+      "@jupyterlab/nbformat": "../packages/nbformat",
       "@jupyterlab/notebook": "../packages/notebook",
       "@jupyterlab/notebook-extension": "../packages/notebook-extension",
       "@jupyterlab/observables": "../packages/observables",
@@ -338,7 +342,9 @@
       "@jupyterlab/services": "../packages/services",
       "@jupyterlab/settingeditor": "../packages/settingeditor",
       "@jupyterlab/settingeditor-extension": "../packages/settingeditor-extension",
+      "@jupyterlab/settingregistry": "../packages/settingregistry",
       "@jupyterlab/shortcuts-extension": "../packages/shortcuts-extension",
+      "@jupyterlab/statedb": "../packages/statedb",
       "@jupyterlab/statusbar": "../packages/statusbar",
       "@jupyterlab/statusbar-extension": "../packages/statusbar-extension",
       "@jupyterlab/tabmanager-extension": "../packages/tabmanager-extension",
@@ -377,11 +383,14 @@
       "@jupyterlab/test-inspector": "../tests/test-inspector",
       "@jupyterlab/test-logconsole": "../tests/test-logconsole",
       "@jupyterlab/test-mainmenu": "../tests/test-mainmenu",
+      "@jupyterlab/test-nbformat": "../tests/test-nbformat",
       "@jupyterlab/test-notebook": "../tests/test-notebook",
       "@jupyterlab/test-observables": "../tests/test-observables",
       "@jupyterlab/test-outputarea": "../tests/test-outputarea",
       "@jupyterlab/test-rendermime": "../tests/test-rendermime",
       "@jupyterlab/test-services": "../tests/test-services",
+      "@jupyterlab/test-settingregistry": "../tests/test-settingregistry",
+      "@jupyterlab/test-statedb": "../tests/test-statedb",
       "@jupyterlab/test-statusbar": "../tests/test-statusbar",
       "@jupyterlab/test-terminal": "../tests/test-terminal",
       "@jupyterlab/testutils": "../testutils",

diff --git a/package.json b/package.json
@@ -48,7 +48,7 @@
     "create:test": "node buildutils/lib/create-test-package.js",
     "create:theme": "node buildutils/lib/create-theme.js",
     "deduplicate": "jlpm yarn-deduplicate -s fewer",
-    "docs": "lerna run docs --ignore \"@jupyterlab/coreutils\" ",
+    "docs": "lerna run docs --ignore \"@jupyterlab/settingregistry\" ",
     "eslint": "eslint --fix .",
     "eslint:check": "eslint .",
     "get:dependency": "node buildutils/lib/get-dependency.js",

diff --git a/packages/application-extension/package.json b/packages/application-extension/package.json
@@ -40,6 +40,8 @@
     "@jupyterlab/apputils": "^2.0.0-alpha.4",
     "@jupyterlab/coreutils": "^4.0.0-alpha.4",
     "@jupyterlab/property-inspector": "^2.0.0-alpha.4",
+    "@jupyterlab/settingregistry": "^2.0.0-alpha.4",
+    "@jupyterlab/statedb": "^2.0.0-alpha.4",
     "@lumino/algorithm": "^1.2.1",
     "@lumino/coreutils": "^1.4.0",
     "@lumino/disposable": "^1.3.2",

diff --git a/packages/application-extension/src/index.tsx b/packages/application-extension/src/index.tsx
@@ -24,12 +24,11 @@ import {
   showErrorMessage
 } from '@jupyterlab/apputils';
 
-import {
-  PathExt,
-  IStateDB,
-  ISettingRegistry,
-  URLExt
-} from '@jupyterlab/coreutils';
+import { PathExt, URLExt } from '@jupyterlab/coreutils';
+
+import { IStateDB } from '@jupyterlab/statedb';
+
+import { ISettingRegistry } from '@jupyterlab/settingregistry';
 
 import {
   IPropertyInspectorProvider,

diff --git a/packages/application-extension/tsconfig.json b/packages/application-extension/tsconfig.json
@@ -17,6 +17,12 @@
     },
     {
       "path": "../property-inspector"
+    },
+    {
+      "path": "../settingregistry"
+    },
+    {
+      "path": "../statedb"
     }
   ]
 }
diff --git a/packages/application/package.json b/packages/application/package.json
@@ -41,6 +41,7 @@
     "@jupyterlab/rendermime": "^2.0.0-alpha.4",
     "@jupyterlab/rendermime-interfaces": "^2.0.0-alpha.4",
     "@jupyterlab/services": "^5.0.0-alpha.4",
+    "@jupyterlab/statedb": "^2.0.0-alpha.4",
     "@jupyterlab/ui-components": "^2.0.0-alpha.4",
     "@lumino/algorithm": "^1.2.1",
     "@lumino/application": "^1.7.4",

diff --git a/packages/application/src/layoutrestorer.ts b/packages/application/src/layoutrestorer.ts
@@ -5,7 +5,7 @@
 
 import { WidgetTracker } from '@jupyterlab/apputils';
 
-import { IDataConnector, IRestorer } from '@jupyterlab/coreutils';
+import { IDataConnector, IRestorer } from '@jupyterlab/statedb';
 
 import { CommandRegistry } from '@lumino/commands';
 

diff --git a/packages/application/tsconfig.json b/packages/application/tsconfig.json
@@ -24,6 +24,9 @@
     {
       "path": "../services"
     },
+    {
+      "path": "../statedb"
+    },
     {
       "path": "../ui-components"
     }

diff --git a/packages/apputils-extension/package.json b/packages/apputils-extension/package.json
@@ -41,6 +41,8 @@
     "@jupyterlab/apputils": "^2.0.0-alpha.4",
     "@jupyterlab/coreutils": "^4.0.0-alpha.4",
     "@jupyterlab/mainmenu": "^2.0.0-alpha.4",
+    "@jupyterlab/settingregistry": "^2.0.0-alpha.4",
+    "@jupyterlab/statedb": "^2.0.0-alpha.4",
     "@jupyterlab/ui-components": "^2.0.0-alpha.4",
     "@lumino/algorithm": "^1.2.1",
     "@lumino/commands": "^1.9.0",

diff --git a/packages/apputils-extension/src/index.ts b/packages/apputils-extension/src/index.ts
@@ -19,7 +19,9 @@ import {
   Printing
 } from '@jupyterlab/apputils';
 
-import { IStateDB, StateDB, URLExt } from '@jupyterlab/coreutils';
+import { URLExt } from '@jupyterlab/coreutils';
+
+import { IStateDB, StateDB } from '@jupyterlab/statedb';
 
 import { defaultIconRegistry } from '@jupyterlab/ui-components';
 

diff --git a/packages/apputils-extension/src/settingconnector.ts b/packages/apputils-extension/src/settingconnector.ts
@@ -1,9 +1,8 @@
-import {
-  DataConnector,
-  IDataConnector,
-  ISettingRegistry,
-  PageConfig
-} from '@jupyterlab/coreutils';
+import { PageConfig } from '@jupyterlab/coreutils';
+
+import { DataConnector, IDataConnector } from '@jupyterlab/statedb';
+
+import { ISettingRegistry } from '@jupyterlab/settingregistry';
 
 /**
  * A data connector for fetching settings.

diff --git a/packages/apputils-extension/src/settingsplugin.ts b/packages/apputils-extension/src/settingsplugin.ts
@@ -7,11 +7,10 @@ import {
   JupyterFrontEnd,
   JupyterFrontEndPlugin
 } from '@jupyterlab/application';
-import {
-  ISettingRegistry,
-  PageConfig,
-  SettingRegistry
-} from '@jupyterlab/coreutils';
+
+import { PageConfig } from '@jupyterlab/coreutils';
+
+import { SettingRegistry, ISettingRegistry } from '@jupyterlab/settingregistry';
 
 import { SettingConnector } from './settingconnector';
 

diff --git a/packages/apputils-extension/src/themeplugins.ts b/packages/apputils-extension/src/themeplugins.ts
@@ -15,10 +15,12 @@ import {
   ThemeManager
 } from '@jupyterlab/apputils';
 
-import { ISettingRegistry, URLExt } from '@jupyterlab/coreutils';
+import { URLExt } from '@jupyterlab/coreutils';
 
 import { IMainMenu } from '@jupyterlab/mainmenu';
 
+import { ISettingRegistry } from '@jupyterlab/settingregistry';
+
 import { Menu } from '@lumino/widgets';
 
 namespace CommandIDs {

diff --git a/packages/apputils-extension/tsconfig.json b/packages/apputils-extension/tsconfig.json
@@ -18,6 +18,12 @@
     {
       "path": "../mainmenu"
     },
+    {
+      "path": "../settingregistry"
+    },
+    {
+      "path": "../statedb"
+    },
     {
       "path": "../ui-components"
     }

diff --git a/packages/apputils/package.json b/packages/apputils/package.json
@@ -37,6 +37,8 @@
   "dependencies": {
     "@jupyterlab/coreutils": "^4.0.0-alpha.4",
     "@jupyterlab/services": "^5.0.0-alpha.4",
+    "@jupyterlab/settingregistry": "^2.0.0-alpha.4",
+    "@jupyterlab/statedb": "^2.0.0-alpha.4",
     "@jupyterlab/ui-components": "^2.0.0-alpha.4",
     "@lumino/algorithm": "^1.2.1",
     "@lumino/commands": "^1.9.0",

diff --git a/packages/apputils/src/thememanager.ts b/packages/apputils/src/thememanager.ts
@@ -1,7 +1,9 @@
 // Copyright (c) Jupyter Development Team.
 // Distributed under the terms of the Modified BSD License.
 
-import { IChangedArgs, ISettingRegistry, URLExt } from '@jupyterlab/coreutils';
+import { IChangedArgs, URLExt } from '@jupyterlab/coreutils';
+
+import { ISettingRegistry } from '@jupyterlab/settingregistry';
 
 import { each } from '@lumino/algorithm';
 

diff --git a/packages/apputils/src/widgettracker.ts b/packages/apputils/src/widgettracker.ts
@@ -1,7 +1,7 @@
 // Copyright (c) Jupyter Development Team.
 // Distributed under the terms of the Modified BSD License.
 
-import { IRestorable, RestorablePool } from '@jupyterlab/coreutils';
+import { IRestorable, RestorablePool } from '@jupyterlab/statedb';
 
 import { IDisposable } from '@lumino/disposable';
 

diff --git a/packages/apputils/src/windowresolver.ts b/packages/apputils/src/windowresolver.ts
@@ -64,7 +64,7 @@ namespace Private {
   /**
    * The internal prefix for private local storage keys.
    */
-  const PREFIX = '@jupyterlab/coreutils:StateDB';
+  const PREFIX = '@jupyterlab/statedb:StateDB';
 
   /**
    * The local storage beacon key.

diff --git a/packages/apputils/tsconfig.json b/packages/apputils/tsconfig.json
@@ -12,6 +12,12 @@
     {
       "path": "../services"
     },
+    {
+      "path": "../settingregistry"
+    },
+    {
+      "path": "../statedb"
+    },
     {
       "path": "../ui-components"
     }

diff --git a/packages/attachments/package.json b/packages/attachments/package.json
@@ -35,7 +35,7 @@
     "watch": "tsc -b --watch"
   },
   "dependencies": {
-    "@jupyterlab/coreutils": "^4.0.0-alpha.4",
+    "@jupyterlab/nbformat": "^2.0.0-alpha.4",
     "@jupyterlab/observables": "^3.0.0-alpha.4",
     "@jupyterlab/rendermime": "^2.0.0-alpha.4",
     "@jupyterlab/rendermime-interfaces": "^2.0.0-alpha.4",

diff --git a/packages/attachments/src/model.ts b/packages/attachments/src/model.ts
@@ -1,7 +1,7 @@
 // Copyright (c) Jupyter Development Team.
 // Distributed under the terms of the Modified BSD License.
 
-import { nbformat } from '@jupyterlab/coreutils';
+import * as nbformat from '@jupyterlab/nbformat';
 
 import {
   IObservableMap,

diff --git a/packages/attachments/tsconfig.json b/packages/attachments/tsconfig.json
@@ -7,7 +7,7 @@
   "include": ["src/*"],
   "references": [
     {
-      "path": "../coreutils"
+      "path": "../nbformat"
     },
     {
       "path": "../observables"

diff --git a/packages/cells/package.json b/packages/cells/package.json
@@ -41,6 +41,7 @@
     "@jupyterlab/codemirror": "^2.0.0-alpha.4",
     "@jupyterlab/coreutils": "^4.0.0-alpha.4",
     "@jupyterlab/filebrowser": "^2.0.0-alpha.4",
+    "@jupyterlab/nbformat": "^2.0.0-alpha.4",
     "@jupyterlab/observables": "^3.0.0-alpha.4",
     "@jupyterlab/outputarea": "^2.0.0-alpha.4",
     "@jupyterlab/rendermime": "^2.0.0-alpha.4",

diff --git a/packages/cells/src/celldragutils.ts b/packages/cells/src/celldragutils.ts
@@ -13,7 +13,7 @@ import { each, IterableOrArrayLike } from '@lumino/algorithm';
 import { ICodeCellModel } from './model';
 import { Cell } from './widget';
 import { h, VirtualDOM } from '@lumino/virtualdom';
-import { nbformat } from '@jupyterlab/coreutils';
+import * as nbformat from '@jupyterlab/nbformat';
 
 /**
  * Constants for drag

diff --git a/packages/cells/src/model.ts b/packages/cells/src/model.ts
@@ -11,7 +11,9 @@ import { IAttachmentsModel, AttachmentsModel } from '@jupyterlab/attachments';
 
 import { CodeEditor } from '@jupyterlab/codeeditor';
 
-import { IChangedArgs, nbformat } from '@jupyterlab/coreutils';
+import { IChangedArgs } from '@jupyterlab/coreutils';
+
+import * as nbformat from '@jupyterlab/nbformat';
 
 import { UUID } from '@lumino/coreutils';
 

diff --git a/packages/cells/src/widget.ts b/packages/cells/src/widget.ts
@@ -7,17 +7,14 @@ import { AttachmentsResolver } from '@jupyterlab/attachments';
 
 import { ISessionContext } from '@jupyterlab/apputils';
 
-import {
-  IChangedArgs,
-  ActivityMonitor,
-  nbformat,
-  URLExt
-} from '@jupyterlab/coreutils';
+import { IChangedArgs, ActivityMonitor, URLExt } from '@jupyterlab/coreutils';
 
 import { CodeEditor, CodeEditorWrapper } from '@jupyterlab/codeeditor';
 
 import { DirListing } from '@jupyterlab/filebrowser';
 
+import * as nbformat from '@jupyterlab/nbformat';
+
 import { IObservableMap, IObservableJSON } from '@jupyterlab/observables';
 
 import {

diff --git a/packages/cells/tsconfig.json b/packages/cells/tsconfig.json
@@ -24,6 +24,9 @@
     {
       "path": "../filebrowser"
     },
+    {
+      "path": "../nbformat"
+    },
     {
       "path": "../observables"
     },

diff --git a/packages/codeeditor/package.json b/packages/codeeditor/package.json
@@ -36,6 +36,7 @@
   },
   "dependencies": {
     "@jupyterlab/coreutils": "^4.0.0-alpha.4",
+    "@jupyterlab/nbformat": "^2.0.0-alpha.4",
     "@jupyterlab/observables": "^3.0.0-alpha.4",
     "@lumino/coreutils": "^1.4.0",
     "@lumino/disposable": "^1.3.2",

diff --git a/packages/codeeditor/src/mimetype.ts b/packages/codeeditor/src/mimetype.ts
@@ -1,7 +1,7 @@
 // Copyright (c) Jupyter Development Team.
 // Distributed under the terms of the Modified BSD License.
 
-import { nbformat } from '@jupyterlab/coreutils';
+import * as nbformat from '@jupyterlab/nbformat';
 
 /**
  * The mime type service of a code editor.

diff --git a/packages/codeeditor/tsconfig.json b/packages/codeeditor/tsconfig.json
@@ -9,6 +9,9 @@
     {
       "path": "../coreutils"
     },
+    {
+      "path": "../nbformat"
+    },
     {
       "path": "../observables"
     }

diff --git a/packages/codemirror-extension/package.json b/packages/codemirror-extension/package.json
@@ -39,10 +39,10 @@
     "@jupyterlab/application": "^2.0.0-alpha.4",
     "@jupyterlab/codeeditor": "^2.0.0-alpha.4",
     "@jupyterlab/codemirror": "^2.0.0-alpha.4",
-    "@jupyterlab/coreutils": "^4.0.0-alpha.4",
     "@jupyterlab/docregistry": "^2.0.0-alpha.4",
     "@jupyterlab/fileeditor": "^2.0.0-alpha.4",
     "@jupyterlab/mainmenu": "^2.0.0-alpha.4",
+    "@jupyterlab/settingregistry": "^2.0.0-alpha.4",
     "@jupyterlab/statusbar": "^2.0.0-alpha.4",
     "@lumino/widgets": "^1.9.4",
     "codemirror": "~5.49.2"

diff --git a/packages/codemirror-extension/src/index.ts b/packages/codemirror-extension/src/index.ts
@@ -22,12 +22,12 @@ import {
   Mode
 } from '@jupyterlab/codemirror';
 
-import { ISettingRegistry } from '@jupyterlab/coreutils';
-
 import { IDocumentWidget } from '@jupyterlab/docregistry';
 
 import { IEditorTracker, FileEditor } from '@jupyterlab/fileeditor';
 
+import { ISettingRegistry } from '@jupyterlab/settingregistry';
+
 import { IStatusBar } from '@jupyterlab/statusbar';
 
 /**