ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From anovi...@apache.org
Subject [09/51] [abbrv] ignite git commit: IGNITE-3319 Fixed extract css.
Date Fri, 01 Jul 2016 07:17:56 GMT
IGNITE-3319 Fixed extract css.


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/1675edde
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/1675edde
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/1675edde

Branch: refs/heads/ignite-3262
Commit: 1675edde2b9379ed77927c76705123af261e20cc
Parents: f900b7e
Author: Andrey Novikov <anovikov@apache.org>
Authored: Mon Jun 27 16:44:56 2016 +0700
Committer: Andrey Novikov <anovikov@apache.org>
Committed: Mon Jun 27 16:44:56 2016 +0700

----------------------------------------------------------------------
 .../src/main/js/gulpfile.babel.js/webpack/common.js         | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/1675edde/modules/web-console/src/main/js/gulpfile.babel.js/webpack/common.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/gulpfile.babel.js/webpack/common.js b/modules/web-console/src/main/js/gulpfile.babel.js/webpack/common.js
index 80f740c..6c4499b 100644
--- a/modules/web-console/src/main/js/gulpfile.babel.js/webpack/common.js
+++ b/modules/web-console/src/main/js/gulpfile.babel.js/webpack/common.js
@@ -29,7 +29,8 @@ import {srcDir, destDir, rootDir} from '../paths';
 const NODE_ENV = process.env.NODE_ENV || 'production';
 const development = NODE_ENV === 'development';
 const node_modules_path = path.resolve('node_modules');
-const stylesLoader = 'css-loader?sourceMap!postcss-loader!sass-loader?outputStyle=expanded&sourceMap=true&sourceMapContents=true';
+const cssLoader = 'css-loader?sourceMap!postcss-loader';
+const stylesLoader = cssLoader + '!sass-loader?outputStyle=expanded&sourceMap=true&sourceMapContents=true';
 
 export default () => {
     return {
@@ -106,9 +107,7 @@ export default () => {
                 },
                 {
                     test: /\.css$/,
-                    loaders: ['style-loader',
-                        'css-loader?sourceMap',
-                        'postcss-loader']
+                    loader: development ? `style-loader!${cssLoader}` : ExtractTextPlugin.extract('style-loader',
cssLoader)
                 },
                 {
                     test: /\.(scss|sass)$/,
@@ -146,7 +145,7 @@ export default () => {
         // ESLint loader configuration.
         eslint: {
             failOnWarning: false,
-            failOnError: !development
+            failOnError: false
         },
 
         // Load plugins.


Mime
View raw message