zeppelin-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ahyoung...@apache.org
Subject zeppelin git commit: [ZEPPELIN-2231] Helium bundle should be able to import JSON
Date Mon, 13 Mar 2017 11:09:11 GMT
Repository: zeppelin
Updated Branches:
  refs/heads/master 152147122 -> 2a3cfafee


[ZEPPELIN-2231] Helium bundle should be able to import JSON

### What is this PR for?

Helium bundle should be able to import JSON to use some libraries which require JSON. For
example, [markdown-it](https://github.com/markdown-it/markdown-it)

### What type of PR is it?
[Improvement]

### Todos

NONE

### What is the Jira issue?

[ZEPPELIN-2231](https://issues.apache.org/jira/browse/ZEPPELIN-2231)

### How should this be tested?

1. Clone https://github.com/1ambda/zeppelin-markdown-spell
2. Copy `zeppelin-markdown-spell.json` into `$ZEPPELIN_HOME/helium`
3. Modify artifact (= file path) in `zeppelin-markdown-spell.json` properly
4. Install it in `localhost:9000/#helium`
5. Test `%markdown` spell with

```
%markdown

# h1 Heading 8-)

## Horizontal Rules

___

## Tables

Right aligned columns

| Option | Description |
| ------:| -----------:|
| data   | path to data files to supply the data that will be passed into templates. |
| engine | engine to be used for processing templates. Handlebars is the default. |
| ext    | extension to be used for dest files. |
```

### Screenshots (if appropriate)

<img width="829" alt="usage1" src="https://cloud.githubusercontent.com/assets/4968473/23673868/30cf6ef2-03b7-11e7-923a-bf4ea05df186.png">

<img width="831" alt="usage2" src="https://cloud.githubusercontent.com/assets/4968473/23673869/3296d04a-03b7-11e7-9a8b-64ba3fcae5b4.png">

### Questions:
* Does the licenses files need update? - NO
* Is there breaking changes for older versions? - NO
* Does this needs documentation? - NO

Author: 1ambda <1amb4a@gmail.com>

Closes #2109 from 1ambda/ZEPPELIN-2231/import-json-in-helium-bundle and squashes the following
commits:

2156275 [1ambda] feat: Import JSON in helium bundle


Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/2a3cfafe
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/2a3cfafe
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/2a3cfafe

Branch: refs/heads/master
Commit: 2a3cfafee40dbb373d5ed98867df5fa0515867bc
Parents: 1521471
Author: 1ambda <1amb4a@gmail.com>
Authored: Wed Mar 8 04:20:48 2017 +0900
Committer: ahyoungryu <ahyoungryu@apache.org>
Committed: Mon Mar 13 20:09:05 2017 +0900

----------------------------------------------------------------------
 zeppelin-zengine/src/main/resources/helium/package.json      | 3 ++-
 zeppelin-zengine/src/main/resources/helium/webpack.config.js | 4 ++++
 2 files changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/zeppelin/blob/2a3cfafe/zeppelin-zengine/src/main/resources/helium/package.json
----------------------------------------------------------------------
diff --git a/zeppelin-zengine/src/main/resources/helium/package.json b/zeppelin-zengine/src/main/resources/helium/package.json
index b0a8bbb..197ef65 100644
--- a/zeppelin-zengine/src/main/resources/helium/package.json
+++ b/zeppelin-zengine/src/main/resources/helium/package.json
@@ -16,6 +16,7 @@
     "css-loader": "^0.26.2",
     "style-loader": "^0.13.2",
     "url-loader": "^0.5.8",
-    "file-loader": "^0.10.1"
+    "file-loader": "^0.10.1",
+    "json-loader": "^0.5.4"
   }
 }

http://git-wip-us.apache.org/repos/asf/zeppelin/blob/2a3cfafe/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 e9e0539..0163ca1 100644
--- a/zeppelin-zengine/src/main/resources/helium/webpack.config.js
+++ b/zeppelin-zengine/src/main/resources/helium/webpack.config.js
@@ -49,6 +49,10 @@ module.exports = {
             test: /\.svg(\?\S*)?$/,
             loader: 'url-loader',
           },
+          {
+            test: /\.json$/,
+            loader: 'json-loader'
+          },
         ],
     }
 }


Mime
View raw message