Merge remote-tracking branch 'upstream/main' into 3.0_doc

OpenHippy · Apr 22, 2024 · 998a8d1 · 998a8d1
2 parents 108795d + 8f72368
commit 998a8d1
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 11 deletions.
diff --git a/docs/development/react-vue-3.0-upgrade-guidelines.md b/docs/development/react-vue-3.0-upgrade-guidelines.md
@@ -59,7 +59,7 @@ Hippy-Vue 在升级3.0可以完全兼容之前的版本，除了升级如上依
 需要升级如下版本依赖：
 
 ``` javascript
-（1）@hippy/vue-next 升级到 3.2.0-beta 及以上
+（1）@hippy/vue-next 升级到 3.2.0-beta.1 及以上
 （2）@hippy/vue-css-loader 升级到 3.2.0-beta 及以上
 （3）@hippy/vue-router-next-history 升级到 0.0.1
 （4）vue 和 vue-router 等vue相关依赖无需升级

diff --git a/driver/js/examples/hippy-vue-next-demo/package.json b/driver/js/examples/hippy-vue-next-demo/package.json
@@ -19,8 +19,9 @@
     "@hippy/vue-next": "latest",
     "@hippy/vue-router-next-history": "latest",
     "@hippy/web-renderer": "latest",
-    "@vue/runtime-core": "^3.2.21",
-    "vue": "^3.2.21",
+    "@vue/runtime-core": "^3.2.46",
+    "@vue/shared": "^3.2.46",
+    "vue": "^3.2.46",
     "vue-router": "^4.0.12"
   },
   "devDependencies": {
@@ -42,7 +43,7 @@
     "@hippy/vue-css-loader": "^2.0.1",
     "@vitejs/plugin-vue": "^1.9.4",
     "@vue/cli-service": "^4.5.19",
-    "@vue/compiler-sfc": "^3.2.21",
+    "@vue/compiler-sfc": "^3.2.46",
     "babel-loader": "^8.1.0",
     "case-sensitive-paths-webpack-plugin": "^2.2.0",
     "clean-webpack-plugin": "^4.0.0",
@@ -58,6 +59,7 @@
     "url-loader": "^4.0.0",
     "vue-loader": "^17.0.0",
     "webpack": "^4.46.0",
-    "webpack-cli": "^4.7.2"
+    "webpack-cli": "^4.7.2",
+    "webpack-bundle-analyzer": "^4.10.2"
   }
 }
diff --git a/driver/js/packages/hippy-vue-next-compiler-ssr/package.json b/driver/js/packages/hippy-vue-next-compiler-ssr/package.json
@@ -23,7 +23,12 @@
     "dist/index.d.ts",
     "README.md"
   ],
-  "dependencies": {
+  "peerDependencies": {
+    "@vue/compiler-core": "^3.2.46",
+    "@vue/compiler-dom": "^3.2.46",
+    "@vue/shared": "^3.2.46"
+  },
+  "devDependencies": {
     "@vue/compiler-core": "^3.2.46",
     "@vue/compiler-dom": "^3.2.46",
     "@vue/shared": "^3.2.46"

diff --git a/driver/js/packages/hippy-vue-next-server-renderer/package.json b/driver/js/packages/hippy-vue-next-server-renderer/package.json
@@ -25,12 +25,15 @@
     "dist/index.d.ts",
     "README.md"
   ],
-  "dependencies": {
+  "peerDependencies": {
     "@vue/server-renderer": "^3.2.46",
     "@vue/runtime-core": "^3.2.46",
     "@vue/shared": "^3.2.46"
   },
   "devDependencies": {
+    "@vue/server-renderer": "^3.2.46",
+    "@vue/runtime-core": "^3.2.46",
+    "@vue/shared": "^3.2.46",
     "vue": "^3.2.46"
   },
   "jest": {

diff --git a/driver/js/packages/hippy-vue-next-style-parser/package.json b/driver/js/packages/hippy-vue-next-style-parser/package.json
@@ -23,7 +23,10 @@
   "bugs": {
     "url": "https://github.com/Tencent/Hippy/issues"
   },
-  "dependencies": {
+  "peerDependencies": {
+    "@vue/shared": "^3.2.46"
+  },
+  "devDependencies": {
     "@vue/shared": "^3.2.46"
   },
   "entry": "./src/index.ts",

diff --git a/driver/js/packages/hippy-vue-next/package.json b/driver/js/packages/hippy-vue-next/package.json
@@ -27,7 +27,11 @@
     "dist/index.d.ts",
     "README.md"
   ],
-  "dependencies": {
+  "peerDependencies": {
+    "@vue/runtime-core": "^3.2.46",
+    "@vue/shared": "^3.2.46"
+  },
+  "devDependencies": {
     "@vue/runtime-core": "^3.2.46",
     "@vue/shared": "^3.2.46"
   },

diff --git a/driver/js/packages/hippy-vue/src/util/index.ts b/driver/js/packages/hippy-vue/src/util/index.ts
@@ -243,9 +243,9 @@ function whitespaceFilter(str: string) {
   // "trimWhitespace": default behavior is true.
   // It will trim leading / ending whitespace including all special unicode such as \xA0(&nbsp;).
   if (!_Vue || typeof _Vue.config.trimWhitespace === 'undefined' || _Vue.config.trimWhitespace) {
-    return str.trim().replace(/Â/g, ' ');
+    return str.trim().replace(/(&nbsp;|Â)/g, ' ');
   }
-  return str.replace(/Â/g, ' ');
+  return str.replace(/(&nbsp;|Â)/g, ' ');
 }
 
 export {