fix custom @icon-url variable in less way

package.json

@@ -36,6 +36,5 @@
     "start": "dora --plugins \"proxy,webpack,webpack-hmr,browser-history?index=/src/index.html\"",
     "lint": "eslint --fix --ext .js,.jsx .",
     "build": "atool-build"
-  },
-  "theme": "./theme.js"
+  }
 }

src/custom.less

@@ -1,2 +1,4 @@
-
+@primary-color: #1DA57A;
+@link-color: #1DA57A;
+@border-radius-base: 2px;
 @icon-url: "/assets/fonts/iconfont/iconfont";

src/global.less

@@ -0,0 +1,6 @@
+@import '~antd/dist/antd.less';
+@import 'custom.less';
+
+html, body, #root {
+  height: 100%;
+}

src/index.js

@@ -1,5 +1,5 @@
 import './index.html';
-import './index.less';
+import './global.less';
 import dva from 'dva';
 import createLoading from 'dva-loading';
 import {browserHistory} from 'dva/router';

theme.js

@@ -1,11 +1,8 @@
-
 module.exports = () => {
-
   return {
     '@primary-color': '#1DA57A',
     '@link-color': '#1DA57A',
     '@border-radius-base': '2px',
     '@icon-url': '/assets/fonts/iconfont/iconfont'
   };
-
 };

webpack.config.js

@@ -7,22 +7,32 @@ module.exports = function (webpackConfig, env) {
   webpackConfig.babel.plugins.push('transform-runtime');
   webpackConfig.babel.plugins.push(['import', {
     libraryName: 'antd',
-    style: 'css'  // if true, use less
   }]);
 
   // Enable hmr for development.
   if (env === 'development') {
     webpackConfig.babel.plugins.push('dva-hmr');
   }
 
+  // CSS Modules Support.
   // Parse all less files as css module.
-  webpackConfig.module.loaders.forEach(function (loader, index) {
+  webpackConfig.module.loaders.forEach(function(loader, index) {
     if (typeof loader.test === 'function' && loader.test.toString().indexOf('\\.less$') > -1) {
-      loader.test = /\.dont\.exist\.file/;
+      loader.include = [/node_modules/, /global\.less/]; // treat global.less as non-css-modules less file
+      loader.test = /\.less$/;
     }
     if (loader.test.toString() === '/\\.module\\.less$/') {
+      loader.exclude = [/node_modules/, /global\.less/]; // treat global.less as non-css-modules less file
       loader.test = /\.less$/;
     }
+    if (typeof loader.test === 'function' && loader.test.toString().indexOf('\\.css$') > -1) {
+      loader.include = /node_modules/;
+      loader.test = /\.css$/;
+    }
+    if (loader.test.toString() === '/\\.module\\.css$/') {
+      loader.exclude = /node_modules/;
+      loader.test = /\.css$/;
+    }
   });
 
   return webpackConfig;