Moved loaders a little

OmicronProject · Mar 6, 2016 · 24ebece · 24ebece
1 parent 6281272
commit 24ebece
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 99 deletions.
diff --git a/karma.conf.js b/karma.conf.js
@@ -35,7 +35,7 @@ module.exports = function (config) {
             devtool: 'inline-source-map',
             module: {
                 loaders: [
-                    { test: /\.js$/, loader: 'babel-loader' },
+                    { test: /\.jsx?$/, loader: 'babel-loader' },
                     { test: /\.css$/, loader: "style-loader!css-loader" },
                     {
                         test: /\.eot(\?v=\d+\.\d+\.\d+)?$/, loader: "file"

diff --git a/master_config.js b/master_config.js
@@ -4,14 +4,44 @@
  * Sets configuration parameters and exports them where required
  *
  */
+'use strict';
+
 let api_url = process.env.API_URL || 'https://omicronserver.herokuapp.com';
 let github_repo_url = 'https://github.com/MichalKononenko/OmicronClient';
 let waffle_url = "https://waffle.io/MichalKononenko/OmicronClient";
 let esdoc_url = "https://doc.esdoc.org/github.com/MichalKononenko/OmicronClient/";
 
+let loaders = [
+    {
+        test: /\.jsx?$/,
+        loader: 'babel-loader',
+        exclude: /node_modules/,
+        query: {
+            presets: ['es2015', 'react']
+        }
+    },
+    { test: /\.css$/, loader: "style-loader!css-loader" },
+    { test: /\.eot(\?v=\d+\.\d+\.\d+)?$/, loader: "file" },
+    { test: /\.(woff|woff2)$/, loader:"url?prefix=font/&limit=5000" },
+    {
+        test: /\.ttf(\?v=\d+\.\d+\.\d+)?$/,
+        loader: "url?limit=10000&mimetype=application/octet-stream"
+    },
+    {
+        test: /\.svg(\?v=\d+\.\d+\.\d+)?$/,
+        loader: "url?limit=10000&mimetype=image/svg+xml"
+    },
+    { test: /\.jpe?g$/, loader: "file" },
+    { test: /\.gif$/, loader: "file" },
+    { test: /\.png$/, loader: "url-loader?limit=10000" },
+    { test: /index\.html$/, loader: "file-loader?name=index.html" },
+    { test: /favicon\.ico$/, loader: "file-loader?name=favicon.ico" }
+];
+
 module.exports = {
     api_url: api_url,
     github_repo_url: github_repo_url,
     waffle_url: waffle_url,
-    esdoc_url: esdoc_url
+    esdoc_url: esdoc_url,
+    loaders: loaders
 };
diff --git a/src/auth/actions.js b/src/auth/actions.js
@@ -136,5 +136,7 @@ reducer.register(login_failure_reducer);
 export const LOGOUT_STARTED = "LOGOUT_STARTED";
 
 export function logout_started(){
-
+    return {
+        type: LOGOUT_STARTED
+    };
 }
diff --git a/webpack.config.js b/webpack.config.js
@@ -8,6 +8,7 @@
 
 var path = require('path');
 var webpack = require('webpack');
+var master_config = require('./master_config');
 
 var build_directory = path.join(__dirname, 'dist');
 
@@ -18,54 +19,7 @@ module.exports = {
         publicPath: "/dist/"
     },
     module: {
-        loaders: [
-            {
-                test: /.jsx?$/,
-                loader: 'babel-loader',
-                exclude: /node_modules/,
-                query: {
-                    presets: ['es2015', 'react']
-                }
-            },
-            {
-                test: /\.css$/, loader: "style-loader!css-loader"
-            },
-            {
-                test: /\.eot(\?v=\d+\.\d+\.\d+)?$/, loader: "file"
-            },
-            {
-                test: /\.(woff|woff2)$/,
-                loader: "url?prefix=font/&limit=5000"
-            },
-            {
-                test: /\.ttf(\?v=\d+\.\d+\.\d+)?$/,
-                loader: "url?limit=10000&mimetype=application/octet-stream"
-            },
-            {
-                test: /\.svg(\?v=\d+\.\d+\.\d+)?$/,
-                loader: "url?limit=10000&mimetype=image/svg+xml"
-            },
-            {
-                test: /\.jpe?g$/,
-                loader: "url-loader?limit=8192"
-            },
-            {
-                test: /\.gif$/,
-                loader: "url-loader?limit=8192"
-            },
-            {
-                test: /\.png$/,
-                loader: "url-loader?limit=10000"
-            },
-            {
-                test: /index\.html$/,
-                loader: "file-loader?name=index.html"
-            },
-            {
-                test: /favicon\.ico$/,
-                loader: "file-loader?name=favicon.ico"
-            }
-        ]
+        loaders: master_config.loaders
     },
     plugins: [
         new webpack.DefinePlugin({'process.env.NODE_ENV': '"development"'})

diff --git a/webpack.config.production.js b/webpack.config.production.js
@@ -5,6 +5,7 @@
 
 var path = require('path');
 var webpack = require('webpack');
+var master_config = require('./master_config');
 
 var build_directory = path.join(__dirname, 'dist');
 
@@ -14,54 +15,7 @@ module.exports = {
               publicPath: "/dist/"
             },
     module: {
-        loaders: [
-            {
-                test: /.jsx?$/,
-                loader: 'babel-loader',
-                exclude: /node_modules/,
-                query: {
-                    presets: ['es2015', 'react']
-                }
-            },
-            {
-                test: /\.css$/, loader: "style-loader!css-loader"
-            },
-            {
-                test: /\.eot(\?v=\d+\.\d+\.\d+)?$/, loader: "file"
-            },
-            {
-                test: /\.(woff|woff2)$/,
-                loader:"url?prefix=font/&limit=5000"
-            },
-            {
-                test: /\.ttf(\?v=\d+\.\d+\.\d+)?$/,
-                loader: "url?limit=10000&mimetype=application/octet-stream"
-            },
-            {
-                test: /\.svg(\?v=\d+\.\d+\.\d+)?$/,
-                loader: "url?limit=10000&mimetype=image/svg+xml"
-            },
-            {
-                test: /\.jpe?g$/,
-                loader: "url-loader?limit=8192"
-            },
-            {
-                test: /\.gif$/,
-                loader: "url-loader?limit=8192"
-            },
-            {
-                test: /\.png$/,
-                loader: "url-loader?limit=10000"
-            },
-            {
-                test: /index\.html$/,
-                loader: "file-loader?name=index.html"
-            },
-            {
-                test: /favicon\.ico$/,
-                loader: "file-loader?name=favicon.ico"
-            }
-        ]
+        loaders: master_config.loaders
     },
     plugins: [
         new webpack.DefinePlugin({'process.env.NODE_ENV': '"production"'}),