Skip to content

Commit 7fb08da

Browse files
authored
Merge pull request #5499 from GeekyAnts/release/3.4.19
release 3.4.19
2 parents 691806c + 0db11d0 commit 7fb08da

37 files changed

+17600
-15394
lines changed

example/metro.config.js

+27-27
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,39 @@
11
const path = require('path');
2-
const blacklist = require('metro-config/src/defaults/blacklist');
2+
const blacklist = require('metro-config/src/defaults/exclusionList');
33
const escape = require('escape-string-regexp');
44
const pak = require('../package.json');
55

66
const root = path.resolve(__dirname, '..');
77

88
const modules = Object.keys({
9-
...pak.peerDependencies,
9+
...pak.peerDependencies,
1010
});
1111

1212
module.exports = {
13-
projectRoot: __dirname,
14-
watchFolders: [root],
13+
projectRoot: __dirname,
14+
watchFolders: [root],
1515

16-
// We need to make sure that only one version is loaded for peerDependencies
17-
// So we blacklist them at the root, and alias them to the versions in example's node_modules
18-
resolver: {
19-
blacklistRE: blacklist(
20-
modules.map(
21-
(m) =>
22-
new RegExp(`^${escape(path.join(root, 'node_modules', m))}\\/.*$`)
23-
)
24-
),
25-
extraNodeModules: modules.reduce((acc, name) => {
26-
acc[name] = path.join(__dirname, 'node_modules', name);
27-
return acc;
28-
}, {}),
29-
},
16+
// We need to make sure that only one version is loaded for peerDependencies
17+
// So we blacklist them at the root, and alias them to the versions in example's node_modules
18+
resolver: {
19+
blacklistRE: blacklist(
20+
modules.map(
21+
(m) =>
22+
new RegExp(`^${escape(path.join(root, 'node_modules', m))}\\/.*$`)
23+
)
24+
),
25+
extraNodeModules: modules.reduce((acc, name) => {
26+
acc[name] = path.join(__dirname, 'node_modules', name);
27+
return acc;
28+
}, {}),
29+
},
3030

31-
transformer: {
32-
getTransformOptions: async() => ({
33-
transform: {
34-
experimentalImportSupport: false,
35-
inlineRequires: false,
36-
},
37-
}),
38-
},
39-
};
31+
transformer: {
32+
getTransformOptions: async () => ({
33+
transform: {
34+
experimentalImportSupport: false,
35+
inlineRequires: false,
36+
},
37+
}),
38+
},
39+
};

example/package.json

+21-20
Original file line numberDiff line numberDiff line change
@@ -16,27 +16,28 @@
1616
"update-test": "yarn test -u"
1717
},
1818
"dependencies": {
19-
"@expo/vector-icons": "^12.0.0",
19+
"@expo/vector-icons": "^13.0.0",
2020
"@react-native-aria/overlays": "^0.2.9",
21-
"@react-native-async-storage/async-storage": "^1.17.3",
22-
"expo": "^44.0.0",
23-
"expo-font": "~10.0.4",
24-
"expo-linear-gradient": "~11.0.3",
25-
"expo-splash-screen": "~0.14.1",
26-
"expo-status-bar": "~1.2.0",
21+
"@react-native-async-storage/async-storage": "~1.17.3",
22+
"expo": "^46.0.0",
23+
"expo-font": "~10.2.0",
24+
"expo-linear-gradient": "~11.4.0",
25+
"expo-splash-screen": "~0.16.2",
26+
"expo-status-bar": "~1.4.0",
2727
"formik": "^2.2.6",
28-
"react": "17.0.1",
28+
"react": "18.0.0",
2929
"react-hook-form": "^6.14.0",
30-
"react-native": "https://github.com/expo/react-native/archive/sdk-44.0.0.tar.gz",
30+
"react-native": "0.69.6",
3131
"react-native-keyboard-aware-scroll-view": "^0.9.4",
32-
"react-native-safe-area-context": "3.3.2",
33-
"react-native-svg": "12.1.1",
34-
"react-native-web": "0.17.1"
32+
"react-native-safe-area-context": "4.3.1",
33+
"react-native-svg": "12.3.0",
34+
"react-native-web": "~0.18.7",
35+
"webpack-dev-server": "3"
3536
},
3637
"devDependencies": {
37-
"@babel/core": "^7.12.9",
38+
"@babel/core": "^7.18.6",
3839
"@babel/runtime": "^7.12.5",
39-
"@expo/webpack-config": "~0.16.2",
40+
"@expo/webpack-config": "^0.17.0",
4041
"@storybook/addon-actions": "^5.3",
4142
"@storybook/addon-knobs": "^5.3",
4243
"@storybook/addon-links": "^5.3",
@@ -45,20 +46,20 @@
4546
"@storybook/addon-storyshots": "6.3",
4647
"@storybook/react-native": "^5.3.23",
4748
"@storybook/react-native-server": "^5.3.23",
48-
"@types/react": "~17.0.21",
49-
"@types/react-dom": "~17.0.9",
50-
"@types/react-native": "~0.64.12",
49+
"@types/react": "~18.0.0",
50+
"@types/react-dom": "~18.0.0",
51+
"@types/react-native": "~0.69.1",
5152
"babel-loader": "^8.2.2",
5253
"babel-plugin-module-resolver": "^4.0.0",
5354
"core-js": "3.6.5",
5455
"jest": "^26.6.3",
55-
"jest-expo": "^44.0.0",
56+
"jest-expo": "^46.0.0",
5657
"metro-react-native-babel-preset": "^0.64.0",
5758
"patch-package": "^6.2.2",
5859
"postinstall-postinstall": "^2.1.0",
59-
"react-dom": "17.0.1",
60+
"react-dom": "18.0.0",
6061
"react-test-renderer": "17.0.1",
61-
"typescript": "~4.3.5"
62+
"typescript": "^4.6.3"
6263
},
6364
"private": false
6465
}

example/patches/@storybook+react-native+5.3.23.patch

-13
This file was deleted.

example/patches/react-native-modal-selector+2.0.3.patch

-230
This file was deleted.

0 commit comments

Comments
 (0)