Merge pull request #581 from vidartf/clenaup

cleanup labext dist
jupyter · Apr 14, 2021 · ab8e60d · ab8e60d
2 parents f1e18ff + 23e0cc9
commit ab8e60d
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/nbdime/__init__.py b/nbdime/__init__.py
@@ -32,7 +32,7 @@ def _jupyter_server_extension_paths():
 
 def _jupyter_labextension_paths():
     return [{
-        "src": "labextension/federated",
+        "src": "labextension",
         "dest": "nbdime-jupyterlab"
     }]
 

diff --git a/packages/labextension/package.json b/packages/labextension/package.json
@@ -30,7 +30,9 @@
   "scripts": {
     "build": "npm run build:lib && npm run build:labextension",
     "build:dev": "npm run build:lib && jupyter labextension build --development True .",
-    "build:labextension": "rimraf ../../nbdime/labextension && mkdirp ../../nbdime/labextension/federated && jupyter labextension build . && cd ../../nbdime/labextension && npm pack ../../packages/labextension",
+    "build:labextension": "npm run build:labextension:source && npm run build:labextension:prebuilt",
+    "build:labextension:source": "rimraf dist && mkdirp dist && cd dist && npm pack ..",
+    "build:labextension:prebuilt": "rimraf ../../nbdime/labextension && mkdirp ../../nbdime/labextension && jupyter labextension build .",
     "build:lib": "tsc --build",
     "clean": "npm run clean:lib && npm run clean:labextension",
     "clean:lib": "rimraf tsconfig.tsbuildinfo lib",
@@ -76,7 +78,7 @@
         ]
       }
     },
-    "outputDir": "../../nbdime/labextension/federated",
+    "outputDir": "../../nbdime/labextension",
     "sharedPackages": {
       "codemirror": {
         "bundled": false,

diff --git a/setup.py b/setup.py
@@ -50,9 +50,8 @@
         'webapp/templates/*.*',
         'webapp/testnotebooks/*.*',
         'labextension/*.*',
-        'labextension/federated/*.*',
-        'labextension/federated/schemas/nbdime-jupyterlab/*.*',
-        'labextension/federated/static/*.*',
+        'labextension/schemas/nbdime-jupyterlab/*.*',
+        'labextension/static/*.*',
         'notebook_ext/*.*',
     ]
 }
@@ -63,10 +62,10 @@
      name + '/notebook_ext',
      '*.js'),
     ('share/jupyter/lab/extensions',
-     name + '/labextension',
+     'packages/labextension/dist',
      'nbdime-jupyterlab-*.tgz'),
     ('share/jupyter/labextensions/nbdime-jupyterlab',
-     name + '/labextension/federated',
+     name + '/labextension',
      '**/*'),
     ('etc/jupyter',
      'jupyter-config',