Skip to content

Commit 4924c35

Browse files
mater1996mater1996
authored
Merge pull request #109 from mpx-ecology/feat-rn-77
feat: rn support 0.77.x
2 parents cb1d91a + 9cd7c8f commit 4924c35

File tree

5 files changed

+137
-69
lines changed

5 files changed

+137
-69
lines changed

‎package.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@
4848
"minimist": "^1.2.8",
4949
"release-it": "^14.13.1",
5050
"release-it-yarn-workspaces": "^2.0.1",
51-
"semver": "^7.3.4"
51+
"semver": "^7.3.4",
52+
"@react-native-async-storage/async-storage": "2.2.0"
5253
}
5354
}

‎packages/mpx-cli/lib/createRn.js‎

Lines changed: 18 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -5,37 +5,29 @@ const { loadOptions } = require('@vue/cli/lib/options')
55
const PackageManager = require('@vue/cli/lib/util/ProjectPackageManager')
66

77
const RN_DEP = {
8-
'@ant-design/icons-react-native': '^2.3.2',
9-
'@ant-design/react-native': '^5.2.2',
108
'@d11/react-native-fast-image': '^8.6.12',
11-
'@react-native-async-storage/async-storage': '^1.24.0',
12-
'@react-native-clipboard/clipboard': '^1.14.2',
9+
'@react-native-async-storage/async-storage': '^2.2.0',
1310
'@react-native-community/netinfo': '^11.3.2',
1411
'@react-native-masked-view/masked-view': '^0.3.1',
15-
'@react-native/assets-registry': '^0.75.2',
16-
'@react-native/gradle-plugin': '^0.75.2',
17-
'@react-navigation/elements': '^1.3.31',
18-
'@react-navigation/native': '^6.1.18',
19-
'@react-navigation/native-stack': '^6.11.0',
20-
'@react-navigation/stack': '^6.0.0',
21-
expo: '^51.0.32',
22-
'expo-brightness': '~12.0.1',
23-
'expo-clipboard': '~6.0.3',
24-
react: '18.2.0',
25-
'react-native': '0.74.3',
26-
'react-native-collapsible': '^1.6.1',
27-
'react-native-device-info': '^11.1.0',
28-
'react-native-gesture-handler': '^2.18.1',
12+
'@react-native/assets-registry': '^0.77.2',
13+
'@react-native/gradle-plugin': '^0.77.2',
14+
'@react-navigation/elements': '^2.5.1',
15+
'@react-navigation/native': '^7.1.13',
16+
'@react-navigation/native-stack': '^7.2.1',
17+
'react-native-device-info': '^13.2.0',
18+
'react-native-gesture-handler': '^2.23.0',
2919
'react-native-get-location': '^5.0.0',
3020
'react-native-haptic-feedback': '^2.3.3',
3121
'react-native-linear-gradient': '^2.8.3',
32-
'react-native-maps': '^1.18.0',
33-
'react-native-modal-popover': '^2.1.3',
34-
'react-native-reanimated': '3.15.0',
35-
'react-native-root-siblings': '^5.0.1',
22+
'react-native-reanimated': '3.16.7',
23+
'react-native-screens': '^4.8.0',
24+
'react-native-webview': '^13.13.2',
3625
'react-native-safe-area-context': '^4.10.9',
37-
'react-native-screens': '^3.34.0',
38-
'react-native-webview': '^13.12.1'
26+
expo: '^51.0.32',
27+
'expo-brightness': '~12.0.1',
28+
'expo-clipboard': '~6.0.3',
29+
react: '18.3.1',
30+
'react-native': '0.77.2'
3931
}
4032

4133
async function createRnProject (targetDir, options) {
@@ -53,11 +45,11 @@ async function createRnProject (targetDir, options) {
5345
await execa(
5446
'npx',
5547
[
56-
'@react-native-community/cli@^13.0.0',
48+
'@react-native-community/cli@^19.0.0',
5749
'init',
5850
'ReactNativeProject',
5951
'--version',
60-
'0.74.3',
52+
'0.77.2',
6153
'--pm',
6254
pm.bin,
6355
'--skip-install',

‎packages/vue-cli-plugin-mpx/generator/index.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@ module.exports = function (api, options) {
5252
api.extendPackage({
5353
dependencies: {
5454
react: '18.3.1',
55-
'react-native': '0.75.2',
56-
'react-native-reanimated': '3.15.0'
55+
'react-native': '0.77.2',
56+
'react-native-reanimated': '3.16.7'
5757
}
5858
})
5959
}

‎packages/vue-cli-plugin-mpx/package.json‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -37,16 +37,16 @@
3737
"@babel/preset-env": "^7.10.4",
3838
"@babel/preset-react": "^7.24.7",
3939
"@babel/runtime-corejs3": "^7.10.4",
40-
"@mpxjs/api-proxy": "^2.9.69",
40+
"@mpxjs/api-proxy": "^2.10.7",
4141
"@mpxjs/babel-plugin-inject-page-events": "^2.8.0",
42-
"@mpxjs/core": "^2.9.69",
43-
"@mpxjs/fetch": "^2.9.69",
42+
"@mpxjs/core": "^2.10.7",
43+
"@mpxjs/fetch": "^2.10.7",
4444
"@mpxjs/mpx-cli-service": "^2.1.34",
45-
"@mpxjs/pinia": "^2.9.69",
46-
"@mpxjs/size-report": "^2.8.0",
47-
"@mpxjs/store": "^2.9.69",
48-
"@mpxjs/utils": "^2.9.69",
49-
"@mpxjs/webpack-plugin": "^2.9.69",
45+
"@mpxjs/pinia": "^2.10.6",
46+
"@mpxjs/size-report": "^2.10.6",
47+
"@mpxjs/store": "^2.10.6",
48+
"@mpxjs/utils": "^2.10.6",
49+
"@mpxjs/webpack-plugin": "^2.10.7",
5050
"pinia": "^2.0.14",
5151
"stylus": "^0.55.0",
5252
"stylus-loader": "^6.1.0",

‎yarn.lock‎

Lines changed: 107 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -2844,25 +2844,25 @@
28442844
npmlog "^4.1.2"
28452845
write-file-atomic "^2.3.0"
28462846

2847-
"@mpxjs/api-proxy@^2.10.4", "@mpxjs/api-proxy@^2.9.69":
2848-
version "2.10.4"
2849-
resolved "https://registry.yarnpkg.com/@mpxjs/api-proxy/-/api-proxy-2.10.4.tgz#28bbd6372d1dbdcbdc74d0929cab082611873c6f"
2850-
integrity sha512-uKsZl1Jz3C98ROle8dOjCqShmuXEzCXXewXMvXR6+GJze+//jF7SRO0lDEbYAbk1pRk/io+VQu3JPOvWFOaH1Q==
2847+
"@mpxjs/api-proxy@^2.10.7":
2848+
version "2.10.7"
2849+
resolved "https://registry.yarnpkg.com/@mpxjs/api-proxy/-/api-proxy-2.10.7.tgz#8287080a88d07bbbd0c2ca1723167cce8eede222"
2850+
integrity sha512-7dK1kziKLf0MD9NxZwDlHskqVEejUh37pPyogZEYTLiNyL05xu/adR526hfcQIXrk9eFoStHWnNrEWiUT2Jvbg==
28512851
dependencies:
2852-
"@mpxjs/utils" "^2.10.4"
2852+
"@mpxjs/utils" "^2.10.6"
28532853
axios "^1.7.3"
28542854

28552855
"@mpxjs/babel-plugin-inject-page-events@^2.8.0":
28562856
version "2.9.5"
28572857
resolved "https://registry.yarnpkg.com/@mpxjs/babel-plugin-inject-page-events/-/babel-plugin-inject-page-events-2.9.5.tgz#3a9dcd89fdf2905f605dba55cd22fbd889d712a3"
28582858
integrity sha512-+ENc4p2+4f4AUTMF0AVqXEKear4y5oyt+945s1uPvywDXCkcVPR6y01kBCprGM6gvB55TWHAjCeD+kmFDRzFkw==
28592859

2860-
"@mpxjs/core@^2.9.69":
2861-
version "2.10.4"
2862-
resolved "https://registry.yarnpkg.com/@mpxjs/core/-/core-2.10.4.tgz#5881a0023cb6e6ac380dd3c4d18bfcd942eb2905"
2863-
integrity sha512-YuXGzW/U7s+8nV+uIQCMe9GGYKMis/Skc5AY9OAzKbxceb94ecWn2KY0AahwFseqWlLWGl9k3D/j/Fxv5yvTjA==
2860+
"@mpxjs/core@^2.10.7":
2861+
version "2.10.7"
2862+
resolved "https://registry.yarnpkg.com/@mpxjs/core/-/core-2.10.7.tgz#ae406ef87af274eae3a4a2fffd33c05285ded07f"
2863+
integrity sha512-26xTxOPGO5MimX631AyXdtKsw1lv6cnwqqOWgtXlGv44ji/rKoXOS6R8PVZpB9/2C6ADji2DuFVqoXqPuP/ryw==
28642864
dependencies:
2865-
"@mpxjs/utils" "^2.10.4"
2865+
"@mpxjs/utils" "^2.10.6"
28662866
lodash "^4.1.1"
28672867
miniprogram-api-typings "^3.10.0"
28682868

@@ -2900,13 +2900,13 @@
29002900
mpx-eslint-parser "^0.0.14"
29012901
vue-eslint-parser "^10.1.3"
29022902

2903-
"@mpxjs/fetch@^2.9.69":
2904-
version "2.10.4"
2905-
resolved "https://registry.yarnpkg.com/@mpxjs/fetch/-/fetch-2.10.4.tgz#e815775a466b9e1a68e0ea9a6c2bd1d799496496"
2906-
integrity sha512-1wF0tdTx4uDbV8pfrPLCmmUXRYAcaQa2OaexG7x6a+tbrGKJkyFv++Fku8bIO58HyYk0VX486JaMyPgAzpcxiw==
2903+
"@mpxjs/fetch@^2.10.7":
2904+
version "2.10.7"
2905+
resolved "https://registry.yarnpkg.com/@mpxjs/fetch/-/fetch-2.10.7.tgz#f4d0555d6b7cd02b44bdfa19d7b53b9a05e16c1d"
2906+
integrity sha512-xXYt98EHgEo7c9uvpMPjNAaiRfYWD3pk9+49FAU2zoBNyr7U+i10ih3kCf8EoLvQNrhg+7gYK/A/6WdfgZb7Fg==
29072907
dependencies:
2908-
"@mpxjs/api-proxy" "^2.10.4"
2909-
"@mpxjs/utils" "^2.10.4"
2908+
"@mpxjs/api-proxy" "^2.10.7"
2909+
"@mpxjs/utils" "^2.10.6"
29102910
path-to-regexp "^6.2.0"
29112911

29122912
"@mpxjs/miniprogram-simulate@^1.4.8":
@@ -2934,17 +2934,17 @@
29342934
json5 "^2.2.1"
29352935
magic-string "^0.26.2"
29362936

2937-
"@mpxjs/pinia@^2.9.69":
2938-
version "2.10.4"
2939-
resolved "https://registry.yarnpkg.com/@mpxjs/pinia/-/pinia-2.10.4.tgz#f8464f0c861c533b26f3a54aa25d4593b5024195"
2940-
integrity sha512-7i/yBVMaHXq0cOwDGsHDYmYaHLNKMNh4qKFSeN+UOUYQwkkmdgy2vMwxoOJxukaJVMyqy/fPa2M0NPukLSvLaQ==
2937+
"@mpxjs/pinia@^2.10.6":
2938+
version "2.10.6"
2939+
resolved "https://registry.yarnpkg.com/@mpxjs/pinia/-/pinia-2.10.6.tgz#11125294aff8d19d34d44a7b3aff91813fae3367"
2940+
integrity sha512-swIuYtnEeBeRnWJMDOZk3ljQeNJNNl3uLY5ObYwfrL/o9jB4nuVUmMpEJELt9h/x9rK+c/sH8tMhPkwNgJ+fMA==
29412941
dependencies:
2942-
"@mpxjs/utils" "^2.10.4"
2942+
"@mpxjs/utils" "^2.10.6"
29432943

2944-
"@mpxjs/size-report@^2.8.0":
2945-
version "2.10.3"
2946-
resolved "https://registry.yarnpkg.com/@mpxjs/size-report/-/size-report-2.10.3.tgz#794d1120edcbaaa3f5c00a4e5ea44de231aa05a2"
2947-
integrity sha512-MXKyi7BIAdySD576EiLvdDtGhBszbaAfkLGWX/49OokgHfL6OxwkuTs4Xru02ykCF3M8P1XM2cC8gLdKbLAg8A==
2944+
"@mpxjs/size-report@^2.10.6":
2945+
version "2.10.6"
2946+
resolved "https://registry.yarnpkg.com/@mpxjs/size-report/-/size-report-2.10.6.tgz#3956a90f55fd6c8e28a8af3dd2c60cd71cf0bc3e"
2947+
integrity sha512-KvP2+JqBVzArS0wL15k2AaJg3c6PxIUGpipC3xVP7zZ5xWLU4qDdD+ydGPiyptq5HJfy2dCB44PXE20agSJ42Q==
29482948
dependencies:
29492949
acorn "^8.11.3"
29502950
acorn-walk "^7.2.0"
@@ -2954,12 +2954,12 @@
29542954
opener "^1.5.2"
29552955
ws "^7.4.3"
29562956

2957-
"@mpxjs/store@^2.9.69":
2958-
version "2.10.4"
2959-
resolved "https://registry.yarnpkg.com/@mpxjs/store/-/store-2.10.4.tgz#b54587c39785005c73c70244b375915d35c3ab5d"
2960-
integrity sha512-45fesfCUxVoPQ7zLIWv5VHFA4PI7YzXKBhVKS5jbfOjMZ7NfP6HMEc6W0zgK43BpOnABLULf/irPU7oYYTrlKw==
2957+
"@mpxjs/store@^2.10.6":
2958+
version "2.10.6"
2959+
resolved "https://registry.yarnpkg.com/@mpxjs/store/-/store-2.10.6.tgz#96fb26f2678529aa9b3d1938265e6bc24ce8bab6"
2960+
integrity sha512-V8LxHpjn7jgDjvWDvTKWLBjBK75swuus6g4aYDF7q7nr7OJOa17k85ujrovvuxZdqXbFMEL6NgGyiY9FRMcmTg==
29612961
dependencies:
2962-
"@mpxjs/utils" "^2.10.4"
2962+
"@mpxjs/utils" "^2.10.6"
29632963

29642964
"@mpxjs/template-engine@^2.8.7":
29652965
version "2.8.7"
@@ -2968,12 +2968,68 @@
29682968
dependencies:
29692969
"@mpxjs/webpack-plugin" "^2.9.30"
29702970

2971-
"@mpxjs/utils@^2.10.4", "@mpxjs/utils@^2.8.15", "@mpxjs/utils@^2.9.69":
2971+
"@mpxjs/utils@^2.10.4", "@mpxjs/utils@^2.8.15":
29722972
version "2.10.4"
29732973
resolved "https://registry.yarnpkg.com/@mpxjs/utils/-/utils-2.10.4.tgz#c5fb32636e19f3e4b274b92c50e948bf13e1326e"
29742974
integrity sha512-PeQAJ3ZnRPUP/tpBlr21bvxaZdSDWmoahRdmFx3xW5Qjts7dqaeCV6308JsrmAn6134l9kDIiDEWZC88QS+jAw==
29752975

2976-
"@mpxjs/webpack-plugin@^2.7.47", "@mpxjs/webpack-plugin@^2.9.30", "@mpxjs/webpack-plugin@^2.9.69":
2976+
"@mpxjs/utils@^2.10.6":
2977+
version "2.10.6"
2978+
resolved "https://registry.yarnpkg.com/@mpxjs/utils/-/utils-2.10.6.tgz#cebed0474c93255ef3d7b69899f9972919e60ba7"
2979+
integrity sha512-OmHbzUbWjXzo7FJF15+EXRXJdD3ssvEEa7DVo2qaRXeGveju2TTbv5JOXENh7GApcSUptwyAFnnCdQ1SNu+Ohw==
2980+
2981+
"@mpxjs/webpack-plugin@^2.10.7":
2982+
version "2.10.7"
2983+
resolved "https://registry.yarnpkg.com/@mpxjs/webpack-plugin/-/webpack-plugin-2.10.7.tgz#55c96791f9c26834746d3f2eab2d2479b12a861d"
2984+
integrity sha512-0raSCdCIJ6RQIgsJsJKumwDkkkXEN23we1EdXwPfSx7bXMXrV/+3hBCX8B56jiHP36sFfxYxRruwhYqxryq0NA==
2985+
dependencies:
2986+
"@babel/code-frame" "^7.16.0"
2987+
"@babel/generator" "^7.16.0"
2988+
"@babel/parser" "^7.16.2"
2989+
"@babel/traverse" "^7.16.0"
2990+
"@babel/types" "^7.16.0"
2991+
"@better-scroll/core" "^2.5.1"
2992+
"@better-scroll/movable" "^2.5.1"
2993+
"@better-scroll/observe-dom" "^2.5.1"
2994+
"@better-scroll/pull-down" "^2.5.1"
2995+
"@better-scroll/slide" "^2.5.1"
2996+
"@better-scroll/wheel" "^2.5.1"
2997+
"@better-scroll/zoom" "^2.5.1"
2998+
"@mpxjs/template-engine" "^2.8.7"
2999+
"@mpxjs/utils" "^2.10.6"
3000+
acorn "^8.11.3"
3001+
acorn-walk "^7.2.0"
3002+
async "^2.6.0"
3003+
css "^2.2.1"
3004+
css-selector-tokenizer "^0.7.0"
3005+
cssnano "^5.0.16"
3006+
de-indent "^1.0.2"
3007+
fastparse "^1.1.1"
3008+
hash-sum "^1.0.2"
3009+
he "^1.1.1"
3010+
html-minifier "^3.5.8"
3011+
icss-utils "^2.1.0"
3012+
json5 "^2.1.3"
3013+
loader-utils "^2.0.0"
3014+
lodash "^4.17.15"
3015+
lodash.camelcase "^4.3.0"
3016+
lru-cache "^4.1.2"
3017+
magic-string "^0.26.2"
3018+
mime "^2.2.2"
3019+
object-assign "^4.1.1"
3020+
postcss "^8.4.5"
3021+
postcss-load-config "^3.1.1"
3022+
postcss-modules-extract-imports "^3.0.0"
3023+
postcss-modules-local-by-default "^4.0.0"
3024+
postcss-modules-scope "^3.0.0"
3025+
postcss-modules-values "^4.0.0"
3026+
postcss-selector-parser "^6.0.8"
3027+
postcss-value-parser "^4.0.2"
3028+
semver "^7.5.4"
3029+
source-list-map "^2.0.0"
3030+
webpack-virtual-modules "^0.6.0"
3031+
3032+
"@mpxjs/webpack-plugin@^2.7.47", "@mpxjs/webpack-plugin@^2.9.30":
29773033
version "2.10.4"
29783034
resolved "https://registry.yarnpkg.com/@mpxjs/webpack-plugin/-/webpack-plugin-2.10.4.tgz#0272566a7d54cbd1fcf2fb570361d7527deb6e64"
29793035
integrity sha512-P3HAhNFi1MR5M1VVM50VV8vAYmgNJjZIHrVghkItaG7r5aanDlG9VJW2CIfZZBq9KH9Ve+csVf2WecTbjaaPFg==
@@ -3298,6 +3354,13 @@
32983354
resolved "https://registry.yarnpkg.com/@protobufjs/utf8/-/utf8-1.1.0.tgz#a777360b5b39a1a2e5106f8e858f2fd2d060c570"
32993355
integrity sha512-Vvn3zZrhQZkkBE8LSuW3em98c0FwgO4nxzv6OdSxPKJIEKY2bGbHn+mhGIPerzI4twdxaP8/0+06HBpwf345Lw==
33003356

3357+
"@react-native-async-storage/[email protected]":
3358+
version "2.2.0"
3359+
resolved "https://registry.yarnpkg.com/@react-native-async-storage/async-storage/-/async-storage-2.2.0.tgz#a3aa565253e46286655560172f4e366e8969f5ad"
3360+
integrity sha512-gvRvjR5JAaUZF8tv2Kcq/Gbt3JHwbKFYfmb445rhOj6NUMx3qPLixmDx5pZAyb9at1bYvJ4/eTUipU5aki45xw==
3361+
dependencies:
3362+
merge-options "^3.0.4"
3363+
33013364
"@rtsao/scc@^1.1.0":
33023365
version "1.1.0"
33033366
resolved "https://registry.yarnpkg.com/@rtsao/scc/-/scc-1.1.0.tgz#927dd2fae9bc3361403ac2c7a00c32ddce9ad7e8"
@@ -10213,6 +10276,11 @@ is-plain-obj@^1.0.0, is-plain-obj@^1.1.0:
1021310276
resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e"
1021410277
integrity sha512-yvkRyxmFKEOQ4pNXCmJG5AEQNlXJS5LaONXo5/cLdTZdWvsZ1ioJEonLGAosKlMWE8lwUy/bJzMjcw8az73+Fg==
1021510278

10279+
is-plain-obj@^2.1.0:
10280+
version "2.1.0"
10281+
resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-2.1.0.tgz#45e42e37fccf1f40da8e5f76ee21515840c09287"
10282+
integrity sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==
10283+
1021610284
is-plain-obj@^3.0.0:
1021710285
version "3.0.0"
1021810286
resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-3.0.0.tgz#af6f2ea14ac5a646183a5bbdb5baabbc156ad9d7"
@@ -12066,6 +12134,13 @@ [email protected]:
1206612134
resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.3.tgz#d80319a65f3c7935351e5cfdac8f9318504dbed5"
1206712135
integrity sha512-gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ==
1206812136

12137+
merge-options@^3.0.4:
12138+
version "3.0.4"
12139+
resolved "https://registry.yarnpkg.com/merge-options/-/merge-options-3.0.4.tgz#84709c2aa2a4b24c1981f66c179fe5565cc6dbb7"
12140+
integrity sha512-2Sug1+knBjkaMsMgf1ctR1Ujx+Ayku4EdJN4Z+C2+JzoeF7A3OZ9KM2GY0CpQS51NR61LTurMJrRKPhSs3ZRTQ==
12141+
dependencies:
12142+
is-plain-obj "^2.1.0"
12143+
1206912144
merge-source-map@^1.1.0:
1207012145
version "1.1.0"
1207112146
resolved "https://registry.yarnpkg.com/merge-source-map/-/merge-source-map-1.1.0.tgz#2fdde7e6020939f70906a68f2d7ae685e4c8c646"

0 commit comments

Comments
 (0)