mirror/notebook
2
0
Fork 0
mirror of https://github.com/jupyter/notebook.git synced 2025-02-23 12:49:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1783 from gnestor/remove-duplicate-dependencies

Browse Source 
Remove duplicate dependencies in bower
This commit is contained in:
Min RK 2016-09-29 10:09:09 +02:00 committed by GitHub
commit 3617c5d9b8
5 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bower.json
View File

@ -6,17 +6,15 @@
"bootstrap": "components/bootstrap#~3.3",
"bootstrap-tour": "0.9.0",
"codemirror": "~5.18",
"es6-promise": "~1.0",
"font-awesome": "components/font-awesome#~4.2.0",
"google-caja": "5669",
"jquery": "components/jquery#~2.0",
"jquery-typeahead": "~2.0.0",
"jquery-ui": "components/jqueryui#~1.10",
"marked": "~0.3",
"MathJax": "components/MathJax#~2.6",
"moment": "~2.8.4",
"requirejs": "~2.1",
"text-encoding": "~0.1",
"underscore": "components/underscore#~1.5",
"jquery-typeahead": "~2.0.0"
"underscore": "components/underscore#~1.5"
}
}

2
notebook/templates/page.html
View File

@ -15,7 +15,6 @@
<link rel="stylesheet" href="{{ static_url("style/style.min.css") }}" type="text/css"/>
{% endblock %}
<link rel="stylesheet" href="{{ base_url }}custom/custom.css" type="text/css" />
<script src="{{static_url("components/es6-promise/promise.min.js")}}" type="text/javascript" charset="utf-8"></script>
<script src="{{static_url("components/jquery/jquery.min.js") }}" type="text/javascript" charset="utf-8"></script> <!-- window.$ -->
<script src="{{static_url("components/jquery-ui/ui/minified/jquery-ui.min.js") }}" type="text/javascript" charset="utf-8"></script> <!-- extends window.$ -->
<script src="{{static_url("components/bootstrap/js/bootstrap.min.js") }}" type="text/javascript" charset="utf-8"></script> <!-- extends window.$ -->
@ -38,7 +37,6 @@
kernelspecs : '{{ base_url }}kernelspecs',
underscore : 'components/underscore/underscore-min',
backbone : 'components/backbone/backbone-min',
moment: 'components/moment/moment',
codemirror: 'components/codemirror',
// Define aliases for requirejs webpack imports

2
package.json
View File

@ -37,7 +37,7 @@
"webpack": "^1.12.13"
},
"dependencies": {
"es6-promise": "^3.3.0",
"es6-promise": "^3.3.1",
"moment": "^2.8.4",
"preact": "^4.5.1",
"preact-compat": "^1.7.0",

3
setupbase.py
View File

@ -135,7 +135,6 @@ def find_package_data():
pjoin(components, "bootstrap", "js", "bootstrap.min.js"),
pjoin(components, "bootstrap-tour", "build", "css", "bootstrap-tour.min.css"),
pjoin(components, "bootstrap-tour", "build", "js", "bootstrap-tour.min.js"),
pjoin(components, "es6-promise", "*.js"),
pjoin(components, "font-awesome", "css", "*.css"),
pjoin(components, "font-awesome", "fonts", "*.*"),
pjoin(components, "google-caja", "html-css-sanitizer-minified.js"),
@ -148,8 +147,6 @@ def find_package_data():
pjoin(components, "marked", "lib", "marked.js"),
pjoin(components, "requirejs", "require.js"),
pjoin(components, "underscore", "underscore-min.js"),
pjoin(components, "moment", "moment.js"),
pjoin(components, "moment", "min", "moment.min.js"),
pjoin(components, "text-encoding", "lib", "encoding.js"),
])

8
webpack.config.js
View File

@ -1,6 +1,7 @@
// Support for Node 0.10
// See https://github.com/webpack/css-loader/issues/144
require('es6-promise').polyfill();
var webpack = require('webpack');
var _ = require('underscore');
var path = require('path');
var sourcemaps = 'inline-source-map';
@ -49,7 +50,12 @@ var commonConfig = {
// Account for relative paths from other CodeMirror files
'../../lib/codemirror': 'CodeMirror',
'../lib/codemirror': 'CodeMirror'
}
},
plugins: [
new webpack.ProvidePlugin({
'Promise': 'es6-promise',
})
]
};
function buildConfig(appName) {