fix(umi-buil-dev): global.scss don't work (#319)

umijs · Apr 12, 2018 · a73589a · a73589a
1 parent f49093d
commit a73589a
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/packages/umi-build-dev/src/getWebpackConfig.js b/packages/umi-build-dev/src/getWebpackConfig.js
@@ -141,11 +141,7 @@ export default function(service = {}) {
       ...(webpackRCConfig.extraResolveModules || []),
       ...(extraResolveModules || []),
     ],
-    cssModulesExcludes: [
-      ...(webpackRCConfig.cssModulesExcludes || []),
-      join(paths.absSrcPath, 'global.css'),
-      join(paths.absSrcPath, 'global.less'),
-    ],
+    cssModulesExcludes: [...(webpackRCConfig.cssModulesExcludes || [])],
     define: {
       // 禁用 antd-mobile 升级提醒
       'process.env.DISABLE_ANTD_MOBILE_UPGRADE': true,

diff --git a/packages/umi-build-dev/src/plugins/global-css.js b/packages/umi-build-dev/src/plugins/global-css.js
@@ -34,4 +34,17 @@ ${cssImports.join('\\r\\n')}
       join(paths.absSrcPath, 'global.scss'),
     ];
   });
+
+  api.register('modifyAFWebpackOpts', ({ memo }) => {
+    return {
+      ...memo,
+      cssModulesExcludes: [
+        ...(memo.cssModulesExcludes || []),
+        join(paths.absSrcPath, 'global.css'),
+        join(paths.absSrcPath, 'global.less'),
+        join(paths.absSrcPath, 'global.scss'),
+        join(paths.absSrcPath, 'global.sass'),
+      ],
+    };
+  });
 }