[fixed] the .scss loader for webpack

thealjey · Jan 11, 2016 · 10f9884 · 10f9884
1 parent 0a1dd87
commit 10f9884
Show file tree

Hide file tree

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

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

diff --git a/package.json b/package.json
@@ -79,7 +79,7 @@
     "eslint-plugin-react": "^3.14.0",
     "fb-watchman": "^1.7.0",
     "ink-docstrap": "^1.1.0",
-    "js-yaml": "^3.4.6",
+    "js-yaml": "^3.5.2",
     "jsdoc": "^3.4.0",
     "memory-fs": "^0.3.0",
     "mkdirp": "^0.5.1",

diff --git a/src/JSCompiler.js b/src/JSCompiler.js
@@ -233,7 +233,7 @@ export class JSCompiler extends Compiler {
           query: {cacheDirectory: true, ...this.options}
         }, {
           test: /\.scss$/,
-          loaders: ['style?singleton', 'css?modules&minimize&importLoaders=1&sourceMap', 'postcss', 'sass&sourceMap']
+          loaders: ['style?singleton', 'css?modules&minimize&importLoaders=1&sourceMap', 'postcss', 'sass?sourceMap']
         }]
       },
       postcss: () => [autoprefixer],

diff --git a/test/JSCompiler.spec.js b/test/JSCompiler.spec.js
@@ -86,7 +86,7 @@ describe('JSCompiler', () => {
               }, {
                 test: /\.scss$/,
                 loaders: ['style?singleton', 'css?modules&minimize&importLoaders=1&sourceMap', 'postcss',
-                  'sass&sourceMap']
+                  'sass?sourceMap']
               }]
             },
             postcss: match(value => value()[0] === autoprefixer),