Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Require jinja2 2.10+ to fix extra escaping #7055

Merged
merged 8 commits into from Aug 21, 2019
Merged

Require jinja2 2.10+ to fix extra escaping #7055

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
73af5df
require jinja2 to pick up pallets/jinja#718
blink1073 Aug 20, 2019
25dfadc
Add missing whatwg-fetch dependency
blink1073 Aug 20, 2019
605b92d
siwtch to webpack-bundle-analyzer
blink1073 Aug 20, 2019
f6d604e
remove use of open-cli
blink1073 Aug 20, 2019
730ed9b
move the polyfill to the index
blink1073 Aug 20, 2019
14e3184
move whatwg-fetch to deps
blink1073 Aug 20, 2019
063ba61
add whatwg-fetch as dev dep
blink1073 Aug 20, 2019
50bc3ad
update staging package.json instead
blink1073 Aug 20, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion dev_mode/package.json
View file
Open in desktop
Expand Up @@ -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": {
Expand Down
5 changes: 3 additions & 2 deletions dev_mode/webpack.config.js
View file
Open in desktop
Expand Up @@ -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;
Expand Down Expand Up @@ -138,7 +139,7 @@ const plugins = [
];

if (process.argv.includes('--analyze')) {
plugins.push(new Visualizer());
plugins.push(new BundleAnalyzerPlugin());
}

module.exports = [
Expand Down
1 change: 1 addition & 0 deletions jupyterlab/staging/package.json
View file
Open in desktop
Expand Up @@ -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": {
Expand Down
5 changes: 2 additions & 3 deletions package.json
View file
Open in desktop
Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down
3 changes: 2 additions & 1 deletion setup.py
View file
Open in desktop
Expand Up @@ -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'] = {
Expand Down