fix(bundler-okam): prefer use lessLoader.modifyVars than theme (#874)

e2e/fixtures.umi/config.less.modifyVars/.umirc.ts

@@ -0,0 +1,11 @@
+export default {
+  mfsu: false,
+  theme: {
+    '@primary-color': 'red',
+  },
+  lessLoader: {
+    modifyVars: {
+      '@primary-color': 'blue',
+    },
+  },
+};

e2e/fixtures.umi/config.less.modifyVars/expect.js

@@ -0,0 +1,8 @@
+const assert = require("assert");
+const { parseBuildResult, moduleReg } = require("../../../scripts/test-utils");
+const { files } = parseBuildResult(__dirname);
+
+let content = files["umi.css"];
+content = content.replace(/\s/g, "");
+
+assert(content.includes(`color:blue;`), "should prefer less.modifyVars than config.theme");

e2e/fixtures.umi/config.less.modifyVars/pages/index.less

@@ -0,0 +1,3 @@
+.a {
+  color: @primary-color;
+}

e2e/fixtures.umi/config.less.modifyVars/pages/index.tsx

@@ -0,0 +1,3 @@
+import React from 'react';
+import './index.less';
+export default () => <div>1</div>;

packages/bundler-okam/index.js

@@ -67,7 +67,7 @@ exports.build = async function (opts) {
           config: opts.config,
           // NOTICE: 有个缺点是 如果 alias 配置是 mako 插件修改的 less 这边就感知到不了
           alias: okamConfig.resolve.alias,
-          modifyVars: opts.config.theme,
+          modifyVars: opts.config.lessLoader?.modifyVars || opts.config.theme,
           sourceMap: getLessSourceMapConfig(okamConfig.devtool),
         }),
       },