From a65de59f761f7ba2aad3f51581793b4a6a35fe36 Mon Sep 17 00:00:00 2001
From: xiaohuoni <448627663@qq.com>
Date: Thu, 10 Jun 2021 09:17:31 +0800
Subject: [PATCH 1/2] fix: hd error in iphone 8p

---
 packages/hd/src/template.tsx | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/packages/hd/src/template.tsx b/packages/hd/src/template.tsx
index 739257a3..8f880efe 100644
--- a/packages/hd/src/template.tsx
+++ b/packages/hd/src/template.tsx
@@ -15,24 +15,25 @@ if (typeof document !== 'undefined') {
   }
 
   // 自动处理页面使用 iframe 嵌套缩放问题
-  if (window != top && !window.alitaFontScale) {
+  if (window != top && !(window as any).alitaFontScale) {
     // window.alitaFontScale = 0.5;
     const meta = document.querySelector('meta[name="viewport"]');
-    const metaStr = meta.getAttribute('content') || '';
+    const metaStr = meta?.getAttribute('content') || '';
     const viewport = getViewPort(metaStr);
     if (viewport['initial-scale']) {
       const dpr = window.devicePixelRatio || 1;
       const baseScale = 10 / dpr;
-      window.alitaFontScale = baseScale / parseInt(`${parseFloat(viewport['initial-scale']) * 10}`, 10);
+      (window as any).alitaFontScale = baseScale / parseInt(`${parseFloat(viewport['initial-scale']) * 10}`, 10);
     }
   }
-  // if (document.documentElement.clientWidth >= 750) {
-  //   vw(100, 750);
-  // } else {
-  //   flex(100, window.alitaFontScale || 1);
-  // }
+  if (document.documentElement.clientWidth >= 750) {
+    vw(100, 750);
+  } else {
+    flex(100, window.alitaFontScale || 1);
+  }
   // 感觉全部用 flex 就很棒，嵌套页面缩放问题，直接设置 alitaFontScale
-  flex(100, window.alitaFontScale || 1);
+  // 大屏手机适配疑似存在问题。
+  // flex(100, window.alitaFontScale || 1);
   // hd solution for antd-mobile@2
   // ref: https://mobile.ant.design/docs/react/upgrade-notes-cn#%E9%AB%98%E6%B8%85%E6%96%B9%E6%A1%88
   document.documentElement.setAttribute('data-scale', true);

From bfa5de8c621538f4c12e86594859111cbffd9d58 Mon Sep 17 00:00:00 2001
From: xiaohuoni <448627663@qq.com>
Date: Thu, 10 Jun 2021 09:18:15 +0800
Subject: [PATCH 2/2] release: v2.8.4

---
 lerna.json                                 |  2 +-
 packages/aconsole/package.json             |  2 +-
 packages/alita/package.json                |  4 ++--
 packages/cordova-native/package.json       |  2 +-
 packages/cordova/package.json              |  2 +-
 packages/create-alita/package.json         |  4 ++--
 packages/generate/package.json             |  2 +-
 packages/hd/package.json                   |  2 +-
 packages/keep-alive/package.json           |  2 +-
 packages/layout/package.json               |  2 +-
 packages/main-path/package.json            |  4 ++--
 packages/micro/package.json                |  2 +-
 packages/native/package.json               |  2 +-
 packages/plugin-layout/package.json        |  2 +-
 packages/retain-log/package.json           |  2 +-
 packages/router/package.json               |  2 +-
 packages/routes/package.json               |  2 +-
 packages/tabs-layout/package.json          |  2 +-
 packages/umi-plugin-authorize/package.json |  2 +-
 packages/umi-presets-alita/package.json    | 24 +++++++++++-----------
 packages/umi-presets-micro/package.json    |  6 +++---
 packages/utils/package.json                |  2 +-
 22 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/lerna.json b/lerna.json
index c94d41b7..5fb50744 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.8.3",
+  "version": "2.8.4",
   "npmClient": "yarn",
   "useWorkspaces": true,
   "changelog": {
diff --git a/packages/aconsole/package.json b/packages/aconsole/package.json
index 149d5d8d..274211e4 100644
--- a/packages/aconsole/package.json
+++ b/packages/aconsole/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@alitajs/aconsole",
-  "version": "2.8.3",
+  "version": "2.8.4",
   "description": "@alitajs/aconsole",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
diff --git a/packages/alita/package.json b/packages/alita/package.json
index 69ad25cb..a294109a 100644
--- a/packages/alita/package.json
+++ b/packages/alita/package.json
@@ -1,6 +1,6 @@
 {
   "name": "alita",
-  "version": "2.8.3",
+  "version": "2.8.4",
   "description": "alita",
   "main": "index.js",
   "module": "index.esm.js",
@@ -34,7 +34,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@alitajs/umi-presets-alita": "2.8.3",
+    "@alitajs/umi-presets-alita": "2.8.4",
     "umi": "3.4.15"
   }
 }
diff --git a/packages/cordova-native/package.json b/packages/cordova-native/package.json
index 0fd3d612..f44ece33 100644
--- a/packages/cordova-native/package.json
+++ b/packages/cordova-native/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@alitajs/cordova-native",
-  "version": "2.8.3",
+  "version": "2.8.4",
   "description": "@alitajs/cordova-native",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
diff --git a/packages/cordova/package.json b/packages/cordova/package.json
index 3cae1d63..c4a39d05 100644
--- a/packages/cordova/package.json
+++ b/packages/cordova/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@alitajs/cordova",
-  "version": "2.8.3",
+  "version": "2.8.4",
   "description": "umi support cordova",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
diff --git a/packages/create-alita/package.json b/packages/create-alita/package.json
index 8209f03c..b7e5ee7d 100644
--- a/packages/create-alita/package.json
+++ b/packages/create-alita/package.json
@@ -1,6 +1,6 @@
 {
   "name": "create-alita",
-  "version": "2.8.3",
+  "version": "2.8.4",
   "description": "create-alita",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -29,7 +29,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@alitajs/generate": "2.8.3",
+    "@alitajs/generate": "2.8.4",
     "@umijs/utils": "^3.4.0"
   }
 }
diff --git a/packages/generate/package.json b/packages/generate/package.json
index ae6b61d8..8889b86a 100644
--- a/packages/generate/package.json
+++ b/packages/generate/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@alitajs/generate",
-  "version": "2.8.3",
+  "version": "2.8.4",
   "description": "@alitajs/generate",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
diff --git a/packages/hd/package.json b/packages/hd/package.json
index 376ebdbf..a9644524 100644
--- a/packages/hd/package.json
+++ b/packages/hd/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@alitajs/hd",
-  "version": "2.8.3",
+  "version": "2.8.4",
   "description": "@umijs/plugin-hd 先移到本地测试使用",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
diff --git a/packages/keep-alive/package.json b/packages/keep-alive/package.json
index 92d5a579..f289087c 100644
--- a/packages/keep-alive/package.json
+++ b/packages/keep-alive/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@alitajs/keep-alive",
-  "version": "2.8.3",
+  "version": "2.8.4",
   "description": "@alitajs/keep-alive",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
diff --git a/packages/layout/package.json b/packages/layout/package.json
index 5b6d91c7..ed0834be 100644
--- a/packages/layout/package.json
+++ b/packages/layout/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@alitajs/layout",
-  "version": "2.8.3",
+  "version": "2.8.4",
   "description": "@alitajs/layout",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
diff --git a/packages/main-path/package.json b/packages/main-path/package.json
index f897fdf8..49cce3aa 100644
--- a/packages/main-path/package.json
+++ b/packages/main-path/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@alitajs/main-path",
-  "version": "2.8.3",
+  "version": "2.8.4",
   "description": "@alitajs/main-path",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -25,6 +25,6 @@
     "access": "public"
   },
   "dependencies": {
-    "@alitajs/utils": "2.8.3"
+    "@alitajs/utils": "2.8.4"
   }
 }
diff --git a/packages/micro/package.json b/packages/micro/package.json
index 619968bb..b268d143 100644
--- a/packages/micro/package.json
+++ b/packages/micro/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@alitajs/micro",
-  "version": "2.8.3",
+  "version": "2.8.4",
   "description": "@alitajs/micro",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
diff --git a/packages/native/package.json b/packages/native/package.json
index 73c11994..16c3f90c 100644
--- a/packages/native/package.json
+++ b/packages/native/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@alitajs/native",
-  "version": "2.8.3",
+  "version": "2.8.4",
   "description": "@alitajs/native",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
diff --git a/packages/plugin-layout/package.json b/packages/plugin-layout/package.json
index 6be2584b..324e4aa2 100644
--- a/packages/plugin-layout/package.json
+++ b/packages/plugin-layout/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@alitajs/plugin-layout",
-  "version": "2.8.3",
+  "version": "2.8.4",
   "description": "@alitajs/plugin-layout",
   "keywords": [
     "umi"
diff --git a/packages/retain-log/package.json b/packages/retain-log/package.json
index 751976d3..1557d98f 100644
--- a/packages/retain-log/package.json
+++ b/packages/retain-log/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@alitajs/retain-log",
-  "version": "2.8.3",
+  "version": "2.8.4",
   "description": "@alitajs/retain-log",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
diff --git a/packages/router/package.json b/packages/router/package.json
index 4ece0035..ded9c510 100644
--- a/packages/router/package.json
+++ b/packages/router/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@alitajs/router",
-  "version": "2.8.3",
+  "version": "2.8.4",
   "description": "@alitajs/router",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
diff --git a/packages/routes/package.json b/packages/routes/package.json
index c49f0f9d..9c76ffa7 100644
--- a/packages/routes/package.json
+++ b/packages/routes/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@alitajs/routes",
-  "version": "2.8.3",
+  "version": "2.8.4",
   "description": "@alitajs/routes",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
diff --git a/packages/tabs-layout/package.json b/packages/tabs-layout/package.json
index df870ff1..f4042be7 100644
--- a/packages/tabs-layout/package.json
+++ b/packages/tabs-layout/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@alitajs/tabs-layout",
-  "version": "2.8.3",
+  "version": "2.8.4",
   "description": "@alitajs/tabs-layout",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
diff --git a/packages/umi-plugin-authorize/package.json b/packages/umi-plugin-authorize/package.json
index 221205b5..cbc8533c 100644
--- a/packages/umi-plugin-authorize/package.json
+++ b/packages/umi-plugin-authorize/package.json
@@ -1,6 +1,6 @@
 {
   "name": "umi-plugin-authorize",
-  "version": "2.8.3",
+  "version": "2.8.4",
   "description": "configure authorize",
   "license": "MIT",
   "repository": {
diff --git a/packages/umi-presets-alita/package.json b/packages/umi-presets-alita/package.json
index d3029fa9..ee1c147f 100644
--- a/packages/umi-presets-alita/package.json
+++ b/packages/umi-presets-alita/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@alitajs/umi-presets-alita",
-  "version": "2.8.3",
+  "version": "2.8.4",
   "description": "@alitajs/umi-presets-alita",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -25,17 +25,17 @@
     "access": "public"
   },
   "dependencies": {
-    "@alitajs/aconsole": "2.8.3",
-    "@alitajs/cordova": "2.8.3",
-    "@alitajs/generate": "2.8.3",
-    "@alitajs/hd": "2.8.3",
-    "@alitajs/keep-alive": "2.8.3",
-    "@alitajs/layout": "2.8.3",
-    "@alitajs/main-path": "2.8.3",
-    "@alitajs/plugin-layout": "2.8.3",
-    "@alitajs/retain-log": "2.8.3",
-    "@alitajs/router": "2.8.3",
-    "@alitajs/routes": "2.8.3",
+    "@alitajs/aconsole": "2.8.4",
+    "@alitajs/cordova": "2.8.4",
+    "@alitajs/generate": "2.8.4",
+    "@alitajs/hd": "2.8.4",
+    "@alitajs/keep-alive": "2.8.4",
+    "@alitajs/layout": "2.8.4",
+    "@alitajs/main-path": "2.8.4",
+    "@alitajs/plugin-layout": "2.8.4",
+    "@alitajs/retain-log": "2.8.4",
+    "@alitajs/router": "2.8.4",
+    "@alitajs/routes": "2.8.4",
     "@umijs/plugin-antd": "0.9.1",
     "@umijs/plugin-dva": "0.12.1",
     "@umijs/plugin-esbuild": "1.3.1",
diff --git a/packages/umi-presets-micro/package.json b/packages/umi-presets-micro/package.json
index 867393e4..356e18b7 100644
--- a/packages/umi-presets-micro/package.json
+++ b/packages/umi-presets-micro/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@alitajs/umi-presets-micro",
-  "version": "2.8.3",
+  "version": "2.8.4",
   "description": "@alitajs/umi-presets-micro",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -25,7 +25,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@alitajs/micro": "2.8.3",
-    "@alitajs/native": "2.8.3"
+    "@alitajs/micro": "2.8.4",
+    "@alitajs/native": "2.8.4"
   }
 }
diff --git a/packages/utils/package.json b/packages/utils/package.json
index 9b2112fb..b5210fc5 100644
--- a/packages/utils/package.json
+++ b/packages/utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@alitajs/utils",
-  "version": "2.8.3",
+  "version": "2.8.4",
   "description": "@alitajs/utils",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",