Merge pull request #7055 from blink1073/require-jinja2

Require jinja2 2.10+ to fix extra escaping

dev_mode/package.json

@@ -79,9 +79,10 @@
     "terser-webpack-plugin": "^1.3.0",
     "url-loader": "~1.1.2",
     "webpack": "^4.32.2",
+    "webpack-bundle-analyzer": "^3.4.1",
     "webpack-cli": "^3.3.0",
     "webpack-merge": "^4.2.1",
-    "webpack-visualizer-plugin": "^0.1.11",
+    "whatwg-fetch": "^3.0.0",
     "yarn-deduplicate": "^1.1.1"
   },
   "resolutions": {

dev_mode/webpack.config.js

@@ -9,7 +9,8 @@ var Handlebars = require('handlebars');
 var HtmlWebpackPlugin = require('html-webpack-plugin');
 var webpack = require('webpack');
 var DuplicatePackageCheckerPlugin = require('duplicate-package-checker-webpack-plugin');
-var Visualizer = require('webpack-visualizer-plugin');
+var BundleAnalyzerPlugin = require('webpack-bundle-analyzer')
+  .BundleAnalyzerPlugin;
 
 var Build = require('@jupyterlab/buildutils').Build;
 var WPPlugin = require('@jupyterlab/buildutils').WPPlugin;
@@ -138,7 +139,7 @@ const plugins = [
 ];
 
 if (process.argv.includes('--analyze')) {
-  plugins.push(new Visualizer());
+  plugins.push(new BundleAnalyzerPlugin());
 }
 
 module.exports = [

jupyterlab/staging/package.json

@@ -82,6 +82,7 @@
     "webpack-cli": "^3.3.0",
     "webpack-merge": "^4.2.1",
     "webpack-visualizer-plugin": "^0.1.11",
+    "whatwg-fetch": "^3.0.0",
     "yarn-deduplicate": "^1.1.1"
   },
   "resolutions": {

package.json

@@ -20,8 +20,8 @@
   "scripts": {
     "add:sibling": "node buildutils/lib/add-sibling.js",
     "analyze": "jlpm run analyze:dev",
-    "analyze:dev": "cd dev_mode && jlpm run build --analyze && open-cli static/stats.html",
-    "analyze:prod": "cd dev_mode && jlpm run build:prod --analyze && open-cli static/stats.html",
+    "analyze:dev": "cd dev_mode && jlpm run build --analyze",
+    "analyze:prod": "cd dev_mode && jlpm run build:prod --analyze",
     "build": "jlpm run build:dev",
     "build:core": "cd jupyterlab/staging && jlpm && (jlpm deduplicate || jlpm) && jlpm run build",
     "build:dev": "jlpm run integrity && jlpm run build:vega && jlpm run build:packages && cd dev_mode && jlpm run build",
@@ -99,7 +99,6 @@
     "husky": "^2.3.0",
     "lerna": "^3.13.2",
     "lint-staged": "^8.1.5",
-    "open-cli": "^5.0.0",
     "prettier": "^1.18.2",
     "tslint": "^5.15.0",
     "tslint-config-prettier": "^1.18.0",

setup.py

@@ -133,7 +133,8 @@ def run(self):
 setup_args['install_requires'] = [
     'notebook>=4.3.1',
     'tornado!=6.0.0, !=6.0.1, !=6.0.2',
-    'jupyterlab_server~=1.0.0'
+    'jupyterlab_server~=1.0.0',
+    'jinja2>=2.10'
 ]
 
 setup_args['extras_require'] = {