Skip to content

Commit 6753551

Browse files
5ZYSZ3K5ZYSZ3K
authored
Merge pull request #15 from wjkg/chore/upgrade-rn-packages
Upgrade RN, fix tests for render-html
2 parents bbe4cb1 + f6575ce commit 6753551

33 files changed

Lines changed: 21434 additions & 10622 deletions

‎.yarn/patches/react-native-accessibility-engine-npm-3.2.0-5709303461.patch‎

Lines changed: 156 additions & 0 deletions
Large diffs are not rendered by default.

‎apps/website/package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@
1818
"dependencies": {
1919
"@doc/constants": "workspace:*",
2020
"@doc/svg-component": "workspace:*",
21-
"@docusaurus/core": "2.0.0-beta.759298296",
22-
"@docusaurus/preset-classic": "2.0.0-beta.759298296",
21+
"@docusaurus/core": "2.0.1",
22+
"@docusaurus/preset-classic": "2.0.1",
2323
"@mdx-js/react": "^1.6.22",
2424
"clsx": "^1.1.1",
25-
"docusaurus-plugin-sass": "frilox042/docusaurus-plugin-sass#fix-css-module-identName-dev",
25+
"docusaurus-plugin-sass": "0.2.6",
2626
"react": "^17.0.2",
2727
"react-dom": "^17.0.2",
2828
"react-modal": "^3.13.1"

‎doc-tools/doc-docsusaurus-rfg-plugin/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"rfg-api": "^0.5.2"
1111
},
1212
"devDependencies": {
13-
"@docusaurus/core": "2.0.0-beta.759298296",
13+
"@docusaurus/core": "2.0.1",
1414
"@docusaurus/plugin-content-docs": "2.0.0-beta.759298296",
1515
"@docusaurus/types": "2.0.0-beta.759298296",
1616
"typescript": "4.2.2"

‎doc-tools/doc-docusaurus-typedoc-plugin/package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
"typedoc": "^0.20.36"
77
},
88
"devDependencies": {
9-
"@docusaurus/core": "2.0.0-beta.759298296",
10-
"@docusaurus/plugin-content-docs": "2.0.0-beta.759298296",
11-
"@docusaurus/types": "2.0.0-beta.759298296",
9+
"@docusaurus/core": "2.0.1",
10+
"@docusaurus/plugin-content-docs": "2.0.1",
11+
"@docusaurus/types": "2.0.1",
1212
"typescript": "4.2.2"
1313
}
1414
}

‎doc-tools/doc-pages/package.json‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,19 +18,19 @@
1818
"prepack": "yarn build"
1919
},
2020
"devDependencies": {
21-
"@babel/cli": "^7.13.16",
22-
"@babel/core": "^7.13.16",
23-
"@babel/plugin-transform-react-jsx": "^7.13.12",
24-
"@babel/preset-typescript": "^7.13.0",
25-
"@babel/runtime": "^7.13.17",
26-
"@testing-library/react-native": "^7.2.0",
21+
"@babel/cli": "^7.25.0",
22+
"@babel/core": "^7.25.0",
23+
"@babel/plugin-transform-react-jsx": "^7.25.0",
24+
"@babel/preset-typescript": "^7.25.0",
25+
"@babel/runtime": "^7.25.0",
26+
"@testing-library/react-native": "^13.3.3",
2727
"@tsconfig/react-native": "^1.0.3",
28-
"@types/jest": "^26.0.23",
28+
"@types/jest": "^29.5.13",
2929
"@types/react": "^17.0.4",
3030
"@types/react-test-renderer": "^17.0.1",
3131
"babel-jest": "^27.0.2",
3232
"eslint": "^7.29.0",
33-
"jest": "^27.0.4",
33+
"jest": "^29.6.3",
3434
"metro-react-native-babel-preset": "^0.66.0",
3535
"metro-react-native-babel-transformer": "^0.66.0",
3636
"react": "17.0.2",

‎package.json‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@
2727
"postinstall": "husky install"
2828
},
2929
"devDependencies": {
30-
"@babel/core": "^7.14.0",
31-
"@babel/plugin-transform-react-jsx": "^7.13.12",
32-
"@babel/preset-env": "^7.14.2",
33-
"@babel/preset-typescript": "^7.13.0",
34-
"@babel/runtime": "^7.14.0",
30+
"@babel/core": "^7.25.0",
31+
"@babel/plugin-transform-react-jsx": "^7.25.0",
32+
"@babel/preset-env": "^7.25.0",
33+
"@babel/preset-typescript": "^7.25.0",
34+
"@babel/runtime": "^7.25.0",
3535
"@commitlint/cli": "^12.1.2",
3636
"@commitlint/config-conventional": "^12.1.2",
3737
"@react-native-community/eslint-config": "^2.0.0",
@@ -50,7 +50,7 @@
5050
"eslint-plugin-react-hooks": "^4.2.0",
5151
"eslint-plugin-react-native": "^3.10.0",
5252
"husky": "^6.0.0",
53-
"jest": "^26.6.3",
53+
"jest": "^29.6.3",
5454
"prettier": "^2.2.1",
5555
"typescript": "~4.2.4"
5656
},
@@ -65,7 +65,9 @@
6565
},
6666
"workspaces": [
6767
"packages/*",
68-
"acceptance/*"
68+
"acceptance/*",
69+
"apps/*",
70+
"doc-tools/*"
6971
],
7072
"packageManager": "yarn@4.5.0"
7173
}

‎packages/css-processor/package.json‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -34,24 +34,23 @@
3434
"prepack": "yarn run build"
3535
},
3636
"devDependencies": {
37-
"@babel/cli": "^7.13.16",
38-
"@babel/core": "^7.14.0",
39-
"@babel/plugin-transform-react-jsx": "^7.13.12",
40-
"@babel/preset-env": "^7.14.2",
41-
"@babel/preset-typescript": "^7.13.0",
42-
"@babel/runtime": "^7.14.0",
37+
"@babel/cli": "^7.25.0",
38+
"@babel/core": "^7.25.0",
39+
"@babel/plugin-transform-react-jsx": "^7.25.0",
40+
"@babel/preset-env": "^7.25.0",
41+
"@babel/preset-typescript": "^7.25.0",
42+
"@babel/runtime": "^7.25.0",
4343
"@react-native-community/bob": "^0.17.1",
4444
"@release-it/conventional-changelog": "^2.0.1",
45-
"@types/jest": "^26.0.23",
46-
"@types/react": "^17.0.5",
47-
"@types/react-native": "^0.64.4",
45+
"@types/jest": "^29.5.13",
46+
"@types/react": "19.1.1",
4847
"babel-jest": "^26.6.3",
4948
"eslint": "^7.25.0",
50-
"jest": "^26.6.3",
49+
"jest": "^29.6.3",
5150
"metro-react-native-babel-preset": "^0.66.0",
5251
"param-case": "^3.0.4",
5352
"prettier": "^2.2.1",
54-
"react": "17.0.2",
53+
"react": "19.1.1",
5554
"release-config": "workspace:*",
5655
"release-it": "^14.6.1",
5756
"typescript": "~4.2.4"

‎packages/css-processor/src/CSSNativeParseRun.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ const extraLongViewStyles: Record<ExtraNativeLongViewStyleKeys, 'block'> = {
4040
shadowOffset: 'block',
4141
shadowOpacity: 'block',
4242
shadowRadius: 'block',
43-
testID: 'block',
4443
tintColor: 'block',
4544
transformMatrix: 'block',
4645
translateX: 'block',

‎packages/css-processor/src/__tests__/CSSProcessor.test.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -216,13 +216,13 @@ describe('CSSProcessor', () => {
216216
it('should pack known extra longhand properties', () => {
217217
expect(
218218
processor.compileStyleDeclaration({
219-
testID: 'test'
219+
tintColor: 'blue'
220220
})
221221
).toMatchObject({
222222
native: {
223223
block: {
224224
retain: {
225-
testID: 'test'
225+
tintColor: 'blue'
226226
}
227227
}
228228
}

‎packages/css-processor/src/native-types.ts‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ import {
44
CSSLongNativeTextPropKey,
55
NativeTextStyleKey,
66
CSSShortPropsKey,
7-
CSSLongNativeUntranslatableBlockPropKey
7+
CSSLongNativeUntranslatableBlockPropKey,
8+
CSSUnimplementedNativePropKey
89
} from './property-types';
910

1011
export type ExtendedNativeViewStyleKeys = keyof ViewStyle | keyof ImageStyle;
@@ -35,6 +36,11 @@ export type ExtraNativeShortViewStyleKeys = Extract<
3536
| 'paddingVertical'
3637
>;
3738

39+
export type NativeUnimplementedStyleKeys = Extract<
40+
ExtendedNativeViewStyleKeys,
41+
'borderCurve' | 'experimental_backgroundImage' | 'objectFit'
42+
>;
43+
3844
export type ExtraNativeShortStyle = Pick<
3945
TextStyle & ViewStyle,
4046
ExtraNativeShortViewStyleKeys | NativeShortKeys
@@ -51,8 +57,10 @@ export type ExtraNativeUntranslatedLongStyles = Pick<
5157
export type ExtraNativeLongViewStyleKeys = Exclude<
5258
Exclude<ExtendedNativeViewStyleKeys, CSSShortPropsKey>,
5359
| CSSLongNativeBlockPropKey
60+
| CSSUnimplementedNativePropKey
5461
| NativeDirectionalStyleKeys
5562
| ExtraNativeShortViewStyleKeys
63+
| NativeUnimplementedStyleKeys
5664
>;
5765

5866
/**
@@ -68,7 +76,9 @@ export type NativeShortKeys = Extract<
6876
*/
6977
export type ExtraNativeTextStyleKeys = Exclude<
7078
Exclude<NativeTextStyleKey, CSSShortPropsKey>,
71-
CSSLongNativeTextPropKey
79+
| CSSLongNativeTextPropKey
80+
| CSSUnimplementedNativePropKey
81+
| NativeUnimplementedStyleKeys
7282
>;
7383

7484
export type ExtraNativeTextStyle = Partial<

0 commit comments

Comments
 (0)