Steven Silvester 4 years ago
parent
commit
7537c8323e
4 changed files with 17 additions and 1 deletions
  1. 3 0
      buildutils/package.json
  2. 10 0
      buildutils/src/webpack.config.base.ts
  3. 1 1
      jupyterlab/manager.py
  4. 3 0
      scripts/ci_script.sh

+ 3 - 0
buildutils/package.json

@@ -41,9 +41,12 @@
     "watch": "tsc -w --listEmittedFiles"
   },
   "dependencies": {
+    "@babel/core": "^7.10.2",
+    "@babel/preset-env": "^7.10.2",
     "@lumino/coreutils": "^1.4.3",
     "@yarnpkg/lockfile": "^1.1.0",
     "ajv": "^6.12.3",
+    "babel-loader": "^8.0.6",
     "child_process": "~1.0.2",
     "commander": "~4.0.1",
     "crypto": "~1.0.1",

+ 10 - 0
buildutils/src/webpack.config.base.ts

@@ -40,6 +40,16 @@ const rules = [
     use: {
       loader: 'raw-loader'
     }
+  },
+  // Workaround for https://github.com/jupyterlab/jupyterlab/issues/8655
+  {
+    test: /vega-statistics\/src\/.*.js$/,
+    use: {
+      loader: 'babel-loader',
+      options: {
+        presets: ['@babel/preset-env']
+      }
+    }
   }
 ];
 

+ 1 - 1
jupyterlab/manager.py

@@ -5,7 +5,7 @@
 
 import os.path
 
-from notebook.config_manager import BaseJSONConfigManager, recursive_update
+from jupyter_server.config_manager import BaseJSONConfigManager, recursive_update
 from jupyter_core.paths import jupyter_config_dir, jupyter_config_path
 from traitlets import Unicode, Instance, List, observe, default
 from traitlets.config import LoggingConfigurable

+ 3 - 0
scripts/ci_script.sh

@@ -148,6 +148,9 @@ fi
 
 
 if [[ $GROUP == usage ]]; then
+    # Run the integrity script to link binary files
+    jlpm integrity
+
     # Test the cli apps.
     jupyter lab clean --debug
     jupyter lab build --debug