Revert to simple 'dev mode'

jupyterlab/extension.py

@@ -51,12 +51,12 @@ def load_jupyter_server_extension(nbapp):
     config.page_url = '/lab'
     config.version = __version__
 
-    # Check for dev dir.
-    dev_dir = ''
-    if hasattr(nbapp, 'dev_dir'):
-        dev_dir = nbapp.dev_dir
+    # Check for dev mode.
+    dev_mode = ''
+    if hasattr(nbapp, 'dev_mode'):
+        dev_mode = nbapp.dev_mode
 
-    if dev_dir:
+    if dev_mode:
         nbapp.log.info(DEV_NOTE_NPM)
         config.assets_dir = os.path.join(here, 'build')
         config.settings_dir = ''

jupyterlab/labapp.py

@@ -31,6 +31,10 @@ class LabCleanApp(JupyterApp):
 
 
 lab_flags = dict(flags)
+lab_flags['dev-mode'] = (
+    {'LabApp': {'dev_mode': True}},
+    "Start the app in dev mode."
+)
 lab_flags['core-mode'] = (
     {'LabApp': {'core_mode': True}},
     "Start the app in core mode."
@@ -38,7 +42,6 @@ lab_flags['core-mode'] = (
 
 
 lab_aliases = dict(aliases)
-lab_aliases['dev-dir'] = 'LabApp.dev_dir'
 lab_aliases['app-dir'] = 'LabApp.app_dir'
 
 
@@ -68,8 +71,8 @@ class LabApp(NotebookApp):
     default_url = Unicode('/lab', config=True,
         help="The default URL to redirect to from `/`")
 
-    dev_dir = Unicode('', config=True,
-        help="The dev directory to launch")
+    dev_mode = Bool(False, config=True,
+        help="Launch JupyterLab in dev mode")
 
     app_dir = Unicode('', config=True,
         help="The app directory to launch")

packages/application/src/index.ts

@@ -67,7 +67,7 @@ class JupyterLab extends Application<ApplicationShell> {
   registerPluginModule(mod: JupyterLab.IPluginModule): void {
     let data = mod.default;
     // Handle commonjs exports.
-    if (!Object.hasOwnProperty('__esModule')) {
+    if (!mod.hasOwnProperty('__esModule')) {
       data = mod as any;
     }
     if (!Array.isArray(data)) {