You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zeppelin.apache.org by mo...@apache.org on 2017/05/06 19:03:07 UTC
zeppelin git commit: ZEPPELIN-2268. Adding png and jpg support for
helium module imports.
Repository: zeppelin
Updated Branches:
refs/heads/master 15ecbb49d -> 246c3d026
ZEPPELIN-2268. Adding png and jpg support for helium module imports.
### What is this PR for?
To allow helium modules to import CSS that contains references to png or jpg images.
### What type of PR is it?
Improvement
### Todos
* [ ] - Task
### What is the Jira issue?
* [ZEPPELIN-2268]
### How should this be tested?
The volume-leaflet helium module [https://github.com/volumeint/helium-volume-leaflet] imports the Leaflet css file. That css file references a couple of png files. Before this change, the helium module would fail to enable, after the change it succeeds.
### Screenshots (if appropriate)
### Questions:
* Does the licenses files need update? No.
* Is there breaking changes for older versions? No.
* Does this needs documentation? No.
Author: Thomas Grant <tg...@volumeintegration.com>
Closes #2313 from volumeint/master and squashes the following commits:
672b789 [Thomas Grant] Merge branch 'master' of https://github.com/apache/zeppelin
c736dbe [Thomas Grant] Merge branch 'master' of https://github.com/apache/zeppelin
19500d5 [Thomas Grant] ZEPPELIN-2268. Adding png and jpg support for helium module imports.
Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/246c3d02
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/246c3d02
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/246c3d02
Branch: refs/heads/master
Commit: 246c3d0264c9ed8b10ce47f4ea3599d2aebbdc47
Parents: 15ecbb4
Author: Thomas Grant <tg...@volumeintegration.com>
Authored: Thu May 4 09:47:15 2017 -0400
Committer: Lee moon soo <mo...@apache.org>
Committed: Sat May 6 15:02:59 2017 -0400
----------------------------------------------------------------------
zeppelin-zengine/src/main/resources/helium/webpack.config.js | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/246c3d02/zeppelin-zengine/src/main/resources/helium/webpack.config.js
----------------------------------------------------------------------
diff --git a/zeppelin-zengine/src/main/resources/helium/webpack.config.js b/zeppelin-zengine/src/main/resources/helium/webpack.config.js
index 91d9261..e897a16 100644
--- a/zeppelin-zengine/src/main/resources/helium/webpack.config.js
+++ b/zeppelin-zengine/src/main/resources/helium/webpack.config.js
@@ -43,6 +43,8 @@ module.exports = {
{ test: /\.eot(\?\S*)?$/, loader: 'url-loader', }, {
test: /\.ttf(\?\S*)?$/, loader: 'url-loader', }, {
test: /\.svg(\?\S*)?$/, loader: 'url-loader', }, {
+ test: /\.png(\?\S*)?$/, loader: 'url-loader', }, {
+ test: /\.jpg(\?\S*)?$/, loader: 'url-loader', }, {
test: /\.json$/, loader: 'json-loader' }, ],
}
}