@umijs/plugins 4.0.28 → 4.0.29

package/dist/analytics.d.ts

@@ -1,3 +1,3 @@
-import { IApi } from 'umi';
+import type { IApi } from 'umi';
 declare const _default: (api: IApi) => void;
 export default _default;

package/dist/analytics.js

@@ -24,6 +24,7 @@ __export(analytics_exports, {
 module.exports = __toCommonJS(analytics_exports);
 var analytics_default = (api) => {
   const GA_KEY = process.env.GA_KEY;
+  const GA_V2_KEY = process.env.GA_V2_KEY;
   const enableBy = (opts) => {
     return opts.config.analytics || GA_KEY;
   };
@@ -31,7 +32,11 @@ var analytics_default = (api) => {
     key: "analytics",
     config: {
       schema(Joi) {
-        return Joi.alternatives().try(Joi.object(), Joi.boolean().invalid(true));
+        return Joi.alternatives().try(Joi.object({
+          baidu: Joi.string(),
+          ga: Joi.string(),
+          ga_v2: Joi.string()
+        }), Joi.boolean().invalid(true));
       },
       onChange: api.ConfigChangeType.reload
     },
@@ -68,20 +73,44 @@ var analytics_default = (api) => {
     })();
   `;
   };
+  const gaV2Tpl = (code) => {
+    return `
+      window.dataLayer = window.dataLayer || [];
+      function gtag(){dataLayer.push(arguments);}
+      gtag('js', new Date());
+      gtag('config', '${code}');
+    `.trim();
+  };
   api.addHTMLHeadScripts(() => {
-    const { analytics = {} } = api.config;
-    const { ga = GA_KEY, baidu } = analytics;
-    return [
-      baidu && {
+    const analytics = api.config.analytics || {};
+    const { baidu, ga = GA_KEY, ga_v2 = GA_V2_KEY } = analytics;
+    const scripts = [];
+    if (baidu) {
+      scripts.push({
         content: "var _hmt = _hmt || [];"
-      },
-      api.env !== "development" && baidu && {
-        content: baiduTpl(baidu)
-      },
-      api.env !== "development" && ga && {
-        content: gaTpl(ga)
+      });
+    }
+    if (api.env !== "development") {
+      if (baidu) {
+        scripts.push({
+          content: baiduTpl(baidu)
+        });
+      }
+      if (ga) {
+        scripts.push({
+          content: gaTpl(ga)
+        });
+      }
+      if (ga_v2) {
+        scripts.push({
+          async: true,
+          src: `//www.googletagmanager.com/gtag/js?id=${ga_v2}`
+        }, {
+          content: gaV2Tpl(ga_v2)
+        });
       }
-    ].filter(Boolean);
+    }
+    return scripts.filter(Boolean);
   });
 };
 // Annotate the CommonJS export names for ESM import in node:

package/dist/antd.js

@@ -74,6 +74,7 @@ var antd_default = (api) => {
     return memo;
   });
   api.modifyConfig((memo) => {
+    var _a;
     checkPkgPath();
     let antd = memo.antd || {};
     if (process.env.UMI_PLUGIN_ANTD_ENABLE) {
@@ -90,6 +91,11 @@ var antd_default = (api) => {
         ...theme,
         ...memo.theme
       };
+      if ((_a = memo.antd) == null ? void 0 : _a.import) {
+        const errorMessage = `Can't set antd.import=true while using antd5 (${antdVersion})`;
+        api.logger.fatal("please change config antd.import to false, then start server again");
+        throw Error(errorMessage);
+      }
     }
     if (antd.dark || antd.compact) {
       const { getThemeVariables } = require("antd/dist/theme");

package/libs/locale/localeExports.tpl

@@ -116,6 +116,8 @@ export const getIntl = (locale?: string, changeIntl?: boolean) => {
   if (g_intl && !changeIntl && !locale) {
     return g_intl;
   }
+  // 获取当前 locale
+  if (!locale) locale = getLocale();
   // 如果存在于 localeInfo 中
   if (locale&&localeInfo[locale]) {
     return createIntl(localeInfo[locale]);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/plugins",
-  "version": "4.0.28",
+  "version": "4.0.29",
   "description": "@umijs/plugins",
   "homepage": "https://github.com/umijs/umi/tree/master/packages/plugins#readme",
   "bugs": "https://github.com/umijs/umi/issues",
@@ -27,7 +27,7 @@
     "@ant-design/antd-theme-variable": "^1.0.0",
     "@ant-design/icons": "^4.7.0",
     "@ant-design/pro-components": "^2.0.1",
-    "@umijs/bundler-utils": "4.0.28",
+    "@umijs/bundler-utils": "4.0.29",
     "@umijs/valtio": "^1.0.0",
     "antd-dayjs-webpack-plugin": "^1.0.6",
     "axios": "^0.27.2",
@@ -48,7 +48,7 @@
     "warning": "^4.0.3"
   },
   "devDependencies": {
-    "umi": "4.0.28"
+    "umi": "4.0.29"
   },
   "publishConfig": {
     "access": "public"