[added] a json-loader to JSCompiler#fe

thealjey · Jan 14, 2016 · 11ff8f4 · 11ff8f4
1 parent d7be232
commit 11ff8f4
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 1 deletion.
diff --git a/docs/JSCompiler.js.html b/docs/JSCompiler.js.html
@@ -318,6 +318,9 @@ <h1 class="page-title">Source: JSCompiler.js</h1>
           exclude: /node_modules/,
           loader: 'babel-loader',
           query: {cacheDirectory: true, ...this.options}
+        }, {
+          test: /\.json$/,
+          loader: 'json'
         }, {
           test: /\.scss$/,
           loaders: ['style?singleton', 'css?modules&amp;minimize&amp;importLoaders=1&amp;sourceMap', 'postcss', 'sass?sourceMap']

diff --git a/docs/quicksearch.html b/docs/quicksearch.html
diff --git a/lib/JSCompiler.js b/lib/JSCompiler.js
@@ -340,6 +340,9 @@ var JSCompiler = exports.JSCompiler = function (_Compiler) {
             exclude: /node_modules/,
             loader: 'babel-loader',
             query: (0, _extends3.default)({ cacheDirectory: true }, this.options)
+          }, {
+            test: /\.json$/,
+            loader: 'json'
           }, {
             test: /\.scss$/,
             loaders: ['style?singleton', 'css?modules&minimize&importLoaders=1&sourceMap', 'postcss', 'sass?sourceMap']

diff --git a/package.json b/package.json
@@ -82,6 +82,7 @@
     "ink-docstrap": "^1.1.0",
     "js-yaml": "^3.5.2",
     "jsdoc": "^3.4.0",
+    "json-loader": "^0.5.4",
     "memory-fs": "^0.3.0",
     "mkdirp": "^0.5.1",
     "node-sass": "^3.4.2",

diff --git a/src/JSCompiler.js b/src/JSCompiler.js
@@ -242,6 +242,9 @@ export class JSCompiler extends Compiler {
           exclude: /node_modules/,
           loader: 'babel-loader',
           query: {cacheDirectory: true, ...this.options}
+        }, {
+          test: /\.json$/,
+          loader: 'json'
         }, {
           test: /\.scss$/,
           loaders: ['style?singleton', 'css?modules&minimize&importLoaders=1&sourceMap', 'postcss', 'sass?sourceMap']

diff --git a/test/JSCompiler.spec.js b/test/JSCompiler.spec.js
@@ -83,6 +83,9 @@ describe('JSCompiler', () => {
                 exclude: /node_modules/,
                 loader: 'babel-loader',
                 query: {cacheDirectory: true, some: 'options'}
+              }, {
+                test: /\.json$/,
+                loader: 'json'
               }, {
                 test: /\.scss$/,
                 loaders: ['style?singleton', 'css?modules&minimize&importLoaders=1&sourceMap', 'postcss',