Skip to content

Upgrade RN, fix tests for render-html #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Oct 20, 2025
Merged

Upgrade RN, fix tests for render-html #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1d829f6
chore: fix peer dependency warning
wjkg Oct 15, 2025
5f27620
chore: fix package install error
wjkg Oct 15, 2025
d708c0b
chore: upgrade React Native and related packages
wjkg Oct 15, 2025
08ae41d
chore: handle typing for newer style properties
wjkg Oct 15, 2025
ee345b0
chore: upgrade testing library and migrate render-html tests
wjkg Oct 15, 2025
f6575ce
chore: align doc-tools versions with the rest
5ZYSZ3K Oct 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
156 changes: 156 additions & 0 deletions .yarn/patches/react-native-accessibility-engine-npm-3.2.0-5709303461.patch
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions apps/website/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@
"dependencies": {
"@doc/constants": "workspace:*",
"@doc/svg-component": "workspace:*",
"@docusaurus/core": "2.0.0-beta.759298296",
"@docusaurus/preset-classic": "2.0.0-beta.759298296",
"@docusaurus/core": "2.0.1",
"@docusaurus/preset-classic": "2.0.1",
"@mdx-js/react": "^1.6.22",
"clsx": "^1.1.1",
"docusaurus-plugin-sass": "frilox042/docusaurus-plugin-sass#fix-css-module-identName-dev",
"docusaurus-plugin-sass": "0.2.6",
"react": "^17.0.2",
"react-dom": "^17.0.2",
"react-modal": "^3.13.1"
Expand Down
2 changes: 1 addition & 1 deletion doc-tools/doc-docsusaurus-rfg-plugin/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"rfg-api": "^0.5.2"
},
"devDependencies": {
"@docusaurus/core": "2.0.0-beta.759298296",
"@docusaurus/core": "2.0.1",
"@docusaurus/plugin-content-docs": "2.0.0-beta.759298296",
"@docusaurus/types": "2.0.0-beta.759298296",
"typescript": "4.2.2"
Expand Down
6 changes: 3 additions & 3 deletions doc-tools/doc-docusaurus-typedoc-plugin/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
"typedoc": "^0.20.36"
},
"devDependencies": {
"@docusaurus/core": "2.0.0-beta.759298296",
"@docusaurus/plugin-content-docs": "2.0.0-beta.759298296",
"@docusaurus/types": "2.0.0-beta.759298296",
"@docusaurus/core": "2.0.1",
"@docusaurus/plugin-content-docs": "2.0.1",
"@docusaurus/types": "2.0.1",
"typescript": "4.2.2"
}
}
16 changes: 8 additions & 8 deletions doc-tools/doc-pages/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,19 +18,19 @@
"prepack": "yarn build"
},
"devDependencies": {
"@babel/cli": "^7.13.16",
"@babel/core": "^7.13.16",
"@babel/plugin-transform-react-jsx": "^7.13.12",
"@babel/preset-typescript": "^7.13.0",
"@babel/runtime": "^7.13.17",
"@testing-library/react-native": "^7.2.0",
"@babel/cli": "^7.25.0",
"@babel/core": "^7.25.0",
"@babel/plugin-transform-react-jsx": "^7.25.0",
"@babel/preset-typescript": "^7.25.0",
"@babel/runtime": "^7.25.0",
"@testing-library/react-native": "^13.3.3",
"@tsconfig/react-native": "^1.0.3",
"@types/jest": "^26.0.23",
"@types/jest": "^29.5.13",
"@types/react": "^17.0.4",
"@types/react-test-renderer": "^17.0.1",
"babel-jest": "^27.0.2",
"eslint": "^7.29.0",
"jest": "^27.0.4",
"jest": "^29.6.3",
"metro-react-native-babel-preset": "^0.66.0",
"metro-react-native-babel-transformer": "^0.66.0",
"react": "17.0.2",
Expand Down
16 changes: 9 additions & 7 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@
"postinstall": "husky install"
},
"devDependencies": {
"@babel/core": "^7.14.0",
"@babel/plugin-transform-react-jsx": "^7.13.12",
"@babel/preset-env": "^7.14.2",
"@babel/preset-typescript": "^7.13.0",
"@babel/runtime": "^7.14.0",
"@babel/core": "^7.25.0",
"@babel/plugin-transform-react-jsx": "^7.25.0",
"@babel/preset-env": "^7.25.0",
"@babel/preset-typescript": "^7.25.0",
"@babel/runtime": "^7.25.0",
"@commitlint/cli": "^12.1.2",
"@commitlint/config-conventional": "^12.1.2",
"@react-native-community/eslint-config": "^2.0.0",
Expand All @@ -50,7 +50,7 @@
"eslint-plugin-react-hooks": "^4.2.0",
"eslint-plugin-react-native": "^3.10.0",
"husky": "^6.0.0",
"jest": "^26.6.3",
"jest": "^29.6.3",
"prettier": "^2.2.1",
"typescript": "~4.2.4"
},
Expand All @@ -65,7 +65,9 @@
},
"workspaces": [
"packages/*",
"acceptance/*"
"acceptance/*",
"apps/*",
"doc-tools/*"
],
"packageManager": "yarn@4.5.0"
}
21 changes: 10 additions & 11 deletions packages/css-processor/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,24 +34,23 @@
"prepack": "yarn run build"
},
"devDependencies": {
"@babel/cli": "^7.13.16",
"@babel/core": "^7.14.0",
"@babel/plugin-transform-react-jsx": "^7.13.12",
"@babel/preset-env": "^7.14.2",
"@babel/preset-typescript": "^7.13.0",
"@babel/runtime": "^7.14.0",
"@babel/cli": "^7.25.0",
"@babel/core": "^7.25.0",
"@babel/plugin-transform-react-jsx": "^7.25.0",
"@babel/preset-env": "^7.25.0",
"@babel/preset-typescript": "^7.25.0",
"@babel/runtime": "^7.25.0",
"@react-native-community/bob": "^0.17.1",
"@release-it/conventional-changelog": "^2.0.1",
"@types/jest": "^26.0.23",
"@types/react": "^17.0.5",
"@types/react-native": "^0.64.4",
"@types/jest": "^29.5.13",
"@types/react": "19.1.1",
"babel-jest": "^26.6.3",
"eslint": "^7.25.0",
"jest": "^26.6.3",
"jest": "^29.6.3",
"metro-react-native-babel-preset": "^0.66.0",
"param-case": "^3.0.4",
"prettier": "^2.2.1",
"react": "17.0.2",
"react": "19.1.1",
"release-config": "workspace:*",
"release-it": "^14.6.1",
"typescript": "~4.2.4"
Expand Down
1 change: 0 additions & 1 deletion packages/css-processor/src/CSSNativeParseRun.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ const extraLongViewStyles: Record<ExtraNativeLongViewStyleKeys, 'block'> = {
shadowOffset: 'block',
shadowOpacity: 'block',
shadowRadius: 'block',
testID: 'block',
tintColor: 'block',
transformMatrix: 'block',
translateX: 'block',
Expand Down
4 changes: 2 additions & 2 deletions packages/css-processor/src/__tests__/CSSProcessor.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,13 +216,13 @@ describe('CSSProcessor', () => {
it('should pack known extra longhand properties', () => {
expect(
processor.compileStyleDeclaration({
testID: 'test'
tintColor: 'blue'
})
).toMatchObject({
native: {
block: {
retain: {
testID: 'test'
tintColor: 'blue'
}
}
}
Expand Down
14 changes: 12 additions & 2 deletions packages/css-processor/src/native-types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ import {
CSSLongNativeTextPropKey,
NativeTextStyleKey,
CSSShortPropsKey,
CSSLongNativeUntranslatableBlockPropKey
CSSLongNativeUntranslatableBlockPropKey,
CSSUnimplementedNativePropKey
} from './property-types';

export type ExtendedNativeViewStyleKeys = keyof ViewStyle | keyof ImageStyle;
Expand Down Expand Up @@ -35,6 +36,11 @@ export type ExtraNativeShortViewStyleKeys = Extract<
| 'paddingVertical'
>;

export type NativeUnimplementedStyleKeys = Extract<
ExtendedNativeViewStyleKeys,
'borderCurve' | 'experimental_backgroundImage' | 'objectFit'
>;

export type ExtraNativeShortStyle = Pick<
TextStyle & ViewStyle,
ExtraNativeShortViewStyleKeys | NativeShortKeys
Expand All @@ -51,8 +57,10 @@ export type ExtraNativeUntranslatedLongStyles = Pick<
export type ExtraNativeLongViewStyleKeys = Exclude<
Exclude<ExtendedNativeViewStyleKeys, CSSShortPropsKey>,
| CSSLongNativeBlockPropKey
| CSSUnimplementedNativePropKey
| NativeDirectionalStyleKeys
| ExtraNativeShortViewStyleKeys
| NativeUnimplementedStyleKeys
>;

/**
Expand All @@ -68,7 +76,9 @@ export type NativeShortKeys = Extract<
*/
export type ExtraNativeTextStyleKeys = Exclude<
Exclude<NativeTextStyleKey, CSSShortPropsKey>,
CSSLongNativeTextPropKey
| CSSLongNativeTextPropKey
| CSSUnimplementedNativePropKey
| NativeUnimplementedStyleKeys
>;

export type ExtraNativeTextStyle = Partial<
Expand Down
53 changes: 51 additions & 2 deletions packages/css-processor/src/property-types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,12 +72,61 @@ export type CSSFlowedPropKey = Extract<
| 'wordSpacing'
>;

/**
* CSS properties supported by React Native, but not yet by the processor
*/
export type CSSUnimplementedNativePropKey = Extract<
keyof TextStyle | keyof ViewStyle,
| 'boxSizing'
| 'boxShadow'
| 'marginBlock'
| 'marginBlockEnd'
| 'marginBlockStart'
| 'marginInline'
| 'marginInlineEnd'
| 'marginInlineStart'
| 'paddingBlock'
| 'paddingBlockEnd'
| 'paddingBlockStart'
| 'paddingInline'
| 'paddingInlineEnd'
| 'paddingInlineStart'
| 'gap'
| 'columnGap'
| 'rowGap'
| 'borderBlockColor'
| 'borderBlockEndColor'
| 'borderBlockStartColor'
| 'borderEndEndRadius'
| 'borderEndStartRadius'
| 'borderStartEndRadius'
| 'borderStartStartRadius'
| 'filter'
| 'inset'
| 'insetBlock'
| 'insetBlockEnd'
| 'insetBlockStart'
| 'insetInline'
| 'insetInlineEnd'
| 'insetInlineStart'
| 'isolation'
| 'mixBlendMode'
| 'outlineColor'
| 'outlineOffset'
| 'outlineStyle'
| 'outlineWidth'
| 'pointerEvents'
| 'transformOrigin'
| 'cursor'
| 'verticalAlign'
>;

/**
* Long, Native Text properties
*/
export type CSSLongNativeTextPropKey = Extract<
keyof StandardLonghandProperties,
NativeTextStyleKey
Exclude<NativeTextStyleKey, CSSUnimplementedNativePropKey>
>;

/**
Expand Down Expand Up @@ -169,7 +218,7 @@ export type CSSShortNativeTranslatableBlockPropKey = Exclude<
*/
export type CSSLongNativeBlockPropKey = Extract<
keyof StandardLonghandProperties | 'borderStyle',
keyof ViewStyle
Exclude<keyof ViewStyle, CSSUnimplementedNativePropKey>
>;

/**
Expand Down
5 changes: 3 additions & 2 deletions packages/performance-testing/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,10 @@
"@native-html/transient-render-engine": "workspace:*",
"benchmark": "^2.1.4",
"lodash": "^4.17.21",
"microtime": "^3.0.0"
"microtime": "^3.1.1"
},
"devDependencies": {
"react-native": "^0.74"
"react": "19.1.1",
"react-native": "^0.82.0"
}
}
2 changes: 1 addition & 1 deletion packages/render-html/babel.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module.exports = {
presets: ['module:metro-react-native-babel-preset']
presets: ['module:@react-native/babel-preset']
};
8 changes: 7 additions & 1 deletion packages/render-html/jest.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
module.exports = {
...require('../../jest-config-base'),
preset: 'react-native',
moduleFileExtensions: ['ts', 'tsx', 'js', 'json', 'node'],
testRegex: 'src/.*\\.test\\.tsx?$',
coveragePathIgnorePatterns: ['/node_modules/', '__tests__'],
transformIgnorePatterns: [
'node_modules/(?!(react-native|react-native-webview|ramda|react-native-render-html|@react-native)/)'
],
setupFiles: ['<rootDir>/jest/setup.ts'],
setupFilesAfterEnv: ['<rootDir>/jest/setupAfterEnv.ts']
};
4 changes: 2 additions & 2 deletions packages/render-html/jest/setupAfterEnv.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
import '@testing-library/jest-native';
import '@testing-library/jest-native/extend-expect';
import '@testing-library/jest-native/legacy-extend-expect';
import 'react-native-accessibility-engine';
33 changes: 16 additions & 17 deletions packages/render-html/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,32 +39,31 @@
"prepack:readme": "./scripts/prepack.sh"
},
"devDependencies": {
"@babel/cli": "^7.13.16",
"@babel/core": "^7.13.16",
"@babel/plugin-transform-react-jsx": "^7.13.12",
"@babel/preset-react": "^7.13.13",
"@babel/preset-typescript": "^7.13.0",
"@babel/runtime": "^7.13.17",
"@babel/cli": "^7.25.0",
"@babel/core": "^7.25.0",
"@babel/plugin-transform-react-jsx": "^7.25.0",
"@babel/preset-react": "^7.25.0",
"@babel/preset-typescript": "^7.25.0",
"@babel/runtime": "^7.25.0",
"@microsoft/api-extractor": "^7.14.0",
"@react-native/babel-preset": "^0.82.0",
"@release-it/conventional-changelog": "^2.0.1",
"@testing-library/jest-native": "^4.0.2",
"@testing-library/jest-native": "^5.4.3",
"@testing-library/react-hooks": "^7.0.0",
"@testing-library/react-native": "^7.2.0",
"@types/jest": "^26.0.23",
"@types/react-native": "^0.64.4",
"@types/react-test-renderer": "^17.0.1",
"@testing-library/react-native": "^13.3.3",
"@types/jest": "^29.5.13",
"@types/react-test-renderer": "^19.1.0",
"babel-jest": "^27.0.2",
"eslint": "^7.29.0",
"htmlparser2": "^7.1.2",
"jest": "^27.0.4",
"metro-react-native-babel-preset": "^0.66.0",
"jest": "^29.6.3",
"prettier": "^2.3.1",
"react": "17.0.2",
"react-native": "^0.64.0",
"react-native-accessibility-engine": "^0.4.1",
"react": "19.1.1",
"react-native": "^0.82.0",
"react-native-accessibility-engine": "patch:react-native-accessibility-engine@npm%3A3.2.0#~/.yarn/patches/react-native-accessibility-engine-npm-3.2.0-5709303461.patch",
"react-native-builder-bob": "^0.18.1",
"react-performance-testing": "^1.2.3",
"react-test-renderer": "^17.0.2",
"react-test-renderer": "19.1.1",
"release-it": "14.11.0-next.1",
"typescript": "4.2.2"
},
Expand Down
10 changes: 5 additions & 5 deletions packages/render-html/src/__tests__/__snapshots__/component.render-html.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP

exports[`RenderHTML regarding customHTMLElementsModels prop should support changing block content model to mixed 1`] = `
"<TDocument tagName=\\"html\\">
<TBlock tagName=\\"body\\">
"<TDocument tagName="html">
<TBlock tagName="body">
<TPhrasing anonymous>
<TPhrasing tagName=\\"span\\">
<TText tagName=\\"article\\" data=\\"\\" />
<TText anonymous data=\\"Text\\" />
<TPhrasing tagName="span">
<TText tagName="article" data="" />
<TText anonymous data="Text" />
</TPhrasing>
</TPhrasing>
</TBlock>
Expand Down
Loading
Loading