Skip to content

Commit 2e4c0f4

Browse files
tido64tido64
committed
chore: migrate to oxfmt 
1 parent 505fdee commit 2e4c0f4

9 files changed

Lines changed: 248 additions & 55 deletions

File tree

‎.github/prettierrc.json‎

Lines changed: 0 additions & 14 deletions
This file was deleted.

‎.oxfmtrc.json‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
{
2+
"$schema": "./node_modules/oxfmt/configuration_schema.json",
3+
"printWidth": 80,
4+
"trailingComma": "es5",
5+
"ignorePatterns": [],
6+
"sortImports": {
7+
"groups": [
8+
["builtin", "external"],
9+
["internal", "subpath"]
10+
],
11+
"newlinesBetween": false
12+
},
13+
"sortPackageJson": true
14+
}

‎CONTRIBUTING.md‎

Lines changed: 13 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -365,33 +365,20 @@ entries.
365365

366366
<!-- References -->
367367

368-
[Dependency Dashboard]:
369-
https://github.com/microsoft/react-native-test-app/issues/492
368+
[Dependency Dashboard]: https://github.com/microsoft/react-native-test-app/issues/492
370369
[Patches page]: https://github.com/microsoft/react-native-test-app/wiki/Patches
371370
[Renovate]: https://docs.renovatebot.com
372-
[`@rnx-kit/align-deps`]:
373-
https://github.com/microsoft/rnx-kit/tree/main/packages/align-deps#contribution
374-
[`@rnx-kit/react-native-host`]:
375-
https://github.com/microsoft/rnx-kit/tree/main/packages/react-native-host#readme
376-
[`dependencies.gradle`]:
377-
https://github.com/microsoft/react-native-test-app/blob/trunk/android/dependencies.gradle
378-
[`generate-schema.mjs`]:
379-
https://github.com/microsoft/react-native-test-app/blob/trunk/scripts/internal/generate-schema.mjs
380-
[`package.json`]:
381-
https://github.com/microsoft/react-native-test-app/blob/trunk/package.json
382-
[`react-native-releases`]:
383-
https://github.com/reactwg/react-native-releases/discussions
384-
[`scripts/docs/`]:
385-
https://github.com/microsoft/react-native-test-app/tree/trunk/scripts/docs
386-
[`test:matrix`]:
387-
https://github.com/microsoft/react-native-test-app/blob/trunk/scripts/testing/test-matrix.mjs
371+
[`@rnx-kit/align-deps`]: https://github.com/microsoft/rnx-kit/tree/main/packages/align-deps#contribution
372+
[`@rnx-kit/react-native-host`]: https://github.com/microsoft/rnx-kit/tree/main/packages/react-native-host#readme
373+
[`dependencies.gradle`]: https://github.com/microsoft/react-native-test-app/blob/trunk/android/dependencies.gradle
374+
[`generate-schema.mjs`]: https://github.com/microsoft/react-native-test-app/blob/trunk/scripts/internal/generate-schema.mjs
375+
[`package.json`]: https://github.com/microsoft/react-native-test-app/blob/trunk/package.json
376+
[`react-native-releases`]: https://github.com/reactwg/react-native-releases/discussions
377+
[`scripts/docs/`]: https://github.com/microsoft/react-native-test-app/tree/trunk/scripts/docs
378+
[`test:matrix`]: https://github.com/microsoft/react-native-test-app/blob/trunk/scripts/testing/test-matrix.mjs
388379
[`uuid`]: https://github.com/uuidjs/uuid
389-
[commitlint-lite]:
390-
https://github.com/microsoft/rnx-kit/tree/main/incubator/commitlint-lite#readme
380+
[commitlint-lite]: https://github.com/microsoft/rnx-kit/tree/main/incubator/commitlint-lite#readme
391381
[conventional commit format]: https://conventionalcommits.org
392-
[every Monday morning]:
393-
https://github.com/microsoft/react-native-test-app/blob/trunk/.github/renovate.json
394-
[link to the issue]:
395-
https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue
396-
[supported versions table]:
397-
https://github.com/microsoft/react-native-test-app/wiki#react-native-versions
382+
[every Monday morning]: https://github.com/microsoft/react-native-test-app/blob/trunk/.github/renovate.json
383+
[link to the issue]: https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue
384+
[supported versions table]: https://github.com/microsoft/react-native-test-app/wiki#react-native-versions

‎package.json‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"scripts": {
1616
"format": "nx run-many --target format:c,format:js,format:swift",
1717
"lint": "nx run-many --target lint:js,lint:kt,lint:rb,lint:swift",
18-
"format:js": "prettier --write --log-level error $(git ls-files '.github/*.json' '.github/*.yml' '.yarn/plugins/*' '.yarnrc.yml' 'CONTRIBUTING.md' 'README.md' 'nx.json')",
18+
"format:js": "oxfmt $(git ls-files '.github/*.json' '.github/*.yml' '.yarn/plugins/*' '.yarnrc.yml' 'CONTRIBUTING.md' 'README.md' 'nx.json')",
1919
"lint:commit": "git log --format='%s' origin/trunk..HEAD | tail -1 | npx @rnx-kit/commitlint-lite@2.0.0",
2020
"release-notes": "node scripts/release-notes.mts",
2121
"show-affected": "node scripts/affected.mts"
@@ -28,8 +28,7 @@
2828
"js-yaml": "^4.1.0",
2929
"minimatch": "^10.0.0",
3030
"nx": "^21.0.0",
31-
"prettier": "^3.0.0",
32-
"prettier-plugin-organize-imports": "^4.1.0",
31+
"oxfmt": "^0.35.0",
3332
"typescript": "^5.0.0"
3433
},
3534
"engines": {
@@ -93,7 +92,6 @@
9392
"packages/app",
9493
"packages/app/example"
9594
],
96-
"prettier": "./.github/prettierrc.json",
9795
"rnx-kit": {
9896
"lint": {
9997
"lockfile": {

‎packages/app/example/src/App.tsx‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,17 @@ import {
77
useColorScheme,
88
View,
99
} from "react-native";
10-
import { Feature } from "./Feature";
11-
import { LocalStorageStatus } from "./LocalStorage";
12-
import { RemoteDebugging } from "./RemoteDebugging";
13-
import { SafeAreaView } from "./SafeAreaView";
14-
import { Separator } from "./Separator";
1510
import {
1611
getHermesVersion,
1712
isBridgeless,
1813
isFabricInstance,
1914
ReactNativeVersion,
2015
} from "./core";
16+
import { Feature } from "./Feature";
17+
import { LocalStorageStatus } from "./LocalStorage";
18+
import { RemoteDebugging } from "./RemoteDebugging";
19+
import { SafeAreaView } from "./SafeAreaView";
20+
import { Separator } from "./Separator";
2121
import { useStyles } from "./styles";
2222

2323
declare global {

‎packages/app/example/src/RemoteDebugging.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import React from "react";
22
import { NativeModules, View } from "react-native";
3-
import { Feature } from "./Feature";
43
import { getHermesVersion, isBridgeless } from "./core";
4+
import { Feature } from "./Feature";
55
import { useStyles } from "./styles";
66

77
function isRemoteDebuggingAvailable(): boolean {

‎packages/app/example/src/core.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@ export function isFabricInstance<T>(
5959
return Boolean(
6060
// @ts-expect-error — https://github.com/facebook/react-native/blob/0.76-stable/packages/react-native/Libraries/ReactNative/ReactFabricPublicInstance/ReactFabricPublicInstanceUtils.js
6161
ref["__nativeTag"] ||
62-
// @ts-expect-error — https://github.com/facebook/react-native/blob/0.76-stable/packages/react-native/Libraries/ReactNative/ReactFabricPublicInstance/ReactFabricPublicInstanceUtils.js
63-
ref["_internalInstanceHandle"]?.stateNode?.canonical
62+
// @ts-expect-error — https://github.com/facebook/react-native/blob/0.76-stable/packages/react-native/Libraries/ReactNative/ReactFabricPublicInstance/ReactFabricPublicInstanceUtils.js
63+
ref["_internalInstanceHandle"]?.stateNode?.canonical
6464
);
6565
}
6666

‎packages/app/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868
},
6969
"scripts": {
7070
"format:c": "clang-format -i $(git ls-files '*.cpp' '*.h' '*.m' '*.mm')",
71-
"format:js": "prettier --write --log-level error $(git ls-files '*.[cm][jt]s' '*.[jt]s' '*.tsx' '*.yml' 'README.md' 'test/**/*.json')",
71+
"format:js": "oxfmt $(git ls-files '*.[cm][jt]s' '*.[jt]s' '*.tsx' '*.yml' 'README.md' 'test/**/*.json')",
7272
"format:swift": "swiftformat $(git ls-files '*.swift')",
7373
"generate:code": "node scripts/internal/generate-manifest.mts",
7474
"generate:docs": "node scripts/internal/generate-manifest-docs.mts",

‎yarn.lock‎

Lines changed: 210 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2657,8 +2657,7 @@ __metadata:
26572657
js-yaml: "npm:^4.1.0"
26582658
minimatch: "npm:^10.0.0"
26592659
nx: "npm:^21.0.0"
2660-
prettier: "npm:^3.0.0"
2661-
prettier-plugin-organize-imports: "npm:^4.1.0"
2660+
oxfmt: "npm:^0.35.0"
26622661
typescript: "npm:^5.0.0"
26632662
languageName: unknown
26642663
linkType: soft
@@ -3082,6 +3081,139 @@ __metadata:
30823081
languageName: node
30833082
linkType: hard
30843083

3084+
"@oxfmt/binding-android-arm-eabi@npm:0.35.0":
3085+
version: 0.35.0
3086+
resolution: "@oxfmt/binding-android-arm-eabi@npm:0.35.0"
3087+
conditions: os=android & cpu=arm
3088+
languageName: node
3089+
linkType: hard
3090+
3091+
"@oxfmt/binding-android-arm64@npm:0.35.0":
3092+
version: 0.35.0
3093+
resolution: "@oxfmt/binding-android-arm64@npm:0.35.0"
3094+
conditions: os=android & cpu=arm64
3095+
languageName: node
3096+
linkType: hard
3097+
3098+
"@oxfmt/binding-darwin-arm64@npm:0.35.0":
3099+
version: 0.35.0
3100+
resolution: "@oxfmt/binding-darwin-arm64@npm:0.35.0"
3101+
conditions: os=darwin & cpu=arm64
3102+
languageName: node
3103+
linkType: hard
3104+
3105+
"@oxfmt/binding-darwin-x64@npm:0.35.0":
3106+
version: 0.35.0
3107+
resolution: "@oxfmt/binding-darwin-x64@npm:0.35.0"
3108+
conditions: os=darwin & cpu=x64
3109+
languageName: node
3110+
linkType: hard
3111+
3112+
"@oxfmt/binding-freebsd-x64@npm:0.35.0":
3113+
version: 0.35.0
3114+
resolution: "@oxfmt/binding-freebsd-x64@npm:0.35.0"
3115+
conditions: os=freebsd & cpu=x64
3116+
languageName: node
3117+
linkType: hard
3118+
3119+
"@oxfmt/binding-linux-arm-gnueabihf@npm:0.35.0":
3120+
version: 0.35.0
3121+
resolution: "@oxfmt/binding-linux-arm-gnueabihf@npm:0.35.0"
3122+
conditions: os=linux & cpu=arm
3123+
languageName: node
3124+
linkType: hard
3125+
3126+
"@oxfmt/binding-linux-arm-musleabihf@npm:0.35.0":
3127+
version: 0.35.0
3128+
resolution: "@oxfmt/binding-linux-arm-musleabihf@npm:0.35.0"
3129+
conditions: os=linux & cpu=arm
3130+
languageName: node
3131+
linkType: hard
3132+
3133+
"@oxfmt/binding-linux-arm64-gnu@npm:0.35.0":
3134+
version: 0.35.0
3135+
resolution: "@oxfmt/binding-linux-arm64-gnu@npm:0.35.0"
3136+
conditions: os=linux & cpu=arm64 & libc=glibc
3137+
languageName: node
3138+
linkType: hard
3139+
3140+
"@oxfmt/binding-linux-arm64-musl@npm:0.35.0":
3141+
version: 0.35.0
3142+
resolution: "@oxfmt/binding-linux-arm64-musl@npm:0.35.0"
3143+
conditions: os=linux & cpu=arm64 & libc=musl
3144+
languageName: node
3145+
linkType: hard
3146+
3147+
"@oxfmt/binding-linux-ppc64-gnu@npm:0.35.0":
3148+
version: 0.35.0
3149+
resolution: "@oxfmt/binding-linux-ppc64-gnu@npm:0.35.0"
3150+
conditions: os=linux & cpu=ppc64 & libc=glibc
3151+
languageName: node
3152+
linkType: hard
3153+
3154+
"@oxfmt/binding-linux-riscv64-gnu@npm:0.35.0":
3155+
version: 0.35.0
3156+
resolution: "@oxfmt/binding-linux-riscv64-gnu@npm:0.35.0"
3157+
conditions: os=linux & cpu=riscv64 & libc=glibc
3158+
languageName: node
3159+
linkType: hard
3160+
3161+
"@oxfmt/binding-linux-riscv64-musl@npm:0.35.0":
3162+
version: 0.35.0
3163+
resolution: "@oxfmt/binding-linux-riscv64-musl@npm:0.35.0"
3164+
conditions: os=linux & cpu=riscv64 & libc=musl
3165+
languageName: node
3166+
linkType: hard
3167+
3168+
"@oxfmt/binding-linux-s390x-gnu@npm:0.35.0":
3169+
version: 0.35.0
3170+
resolution: "@oxfmt/binding-linux-s390x-gnu@npm:0.35.0"
3171+
conditions: os=linux & cpu=s390x & libc=glibc
3172+
languageName: node
3173+
linkType: hard
3174+
3175+
"@oxfmt/binding-linux-x64-gnu@npm:0.35.0":
3176+
version: 0.35.0
3177+
resolution: "@oxfmt/binding-linux-x64-gnu@npm:0.35.0"
3178+
conditions: os=linux & cpu=x64 & libc=glibc
3179+
languageName: node
3180+
linkType: hard
3181+
3182+
"@oxfmt/binding-linux-x64-musl@npm:0.35.0":
3183+
version: 0.35.0
3184+
resolution: "@oxfmt/binding-linux-x64-musl@npm:0.35.0"
3185+
conditions: os=linux & cpu=x64 & libc=musl
3186+
languageName: node
3187+
linkType: hard
3188+
3189+
"@oxfmt/binding-openharmony-arm64@npm:0.35.0":
3190+
version: 0.35.0
3191+
resolution: "@oxfmt/binding-openharmony-arm64@npm:0.35.0"
3192+
conditions: os=openharmony & cpu=arm64
3193+
languageName: node
3194+
linkType: hard
3195+
3196+
"@oxfmt/binding-win32-arm64-msvc@npm:0.35.0":
3197+
version: 0.35.0
3198+
resolution: "@oxfmt/binding-win32-arm64-msvc@npm:0.35.0"
3199+
conditions: os=win32 & cpu=arm64
3200+
languageName: node
3201+
linkType: hard
3202+
3203+
"@oxfmt/binding-win32-ia32-msvc@npm:0.35.0":
3204+
version: 0.35.0
3205+
resolution: "@oxfmt/binding-win32-ia32-msvc@npm:0.35.0"
3206+
conditions: os=win32 & cpu=ia32
3207+
languageName: node
3208+
linkType: hard
3209+
3210+
"@oxfmt/binding-win32-x64-msvc@npm:0.35.0":
3211+
version: 0.35.0
3212+
resolution: "@oxfmt/binding-win32-x64-msvc@npm:0.35.0"
3213+
conditions: os=win32 & cpu=x64
3214+
languageName: node
3215+
linkType: hard
3216+
30853217
"@pkgjs/parseargs@npm:^0.11.0":
30863218
version: 0.11.0
30873219
resolution: "@pkgjs/parseargs@npm:0.11.0"
@@ -11617,6 +11749,75 @@ __metadata:
1161711749
languageName: node
1161811750
linkType: hard
1161911751

11752+
"oxfmt@npm:^0.35.0":
11753+
version: 0.35.0
11754+
resolution: "oxfmt@npm:0.35.0"
11755+
dependencies:
11756+
"@oxfmt/binding-android-arm-eabi": "npm:0.35.0"
11757+
"@oxfmt/binding-android-arm64": "npm:0.35.0"
11758+
"@oxfmt/binding-darwin-arm64": "npm:0.35.0"
11759+
"@oxfmt/binding-darwin-x64": "npm:0.35.0"
11760+
"@oxfmt/binding-freebsd-x64": "npm:0.35.0"
11761+
"@oxfmt/binding-linux-arm-gnueabihf": "npm:0.35.0"
11762+
"@oxfmt/binding-linux-arm-musleabihf": "npm:0.35.0"
11763+
"@oxfmt/binding-linux-arm64-gnu": "npm:0.35.0"
11764+
"@oxfmt/binding-linux-arm64-musl": "npm:0.35.0"
11765+
"@oxfmt/binding-linux-ppc64-gnu": "npm:0.35.0"
11766+
"@oxfmt/binding-linux-riscv64-gnu": "npm:0.35.0"
11767+
"@oxfmt/binding-linux-riscv64-musl": "npm:0.35.0"
11768+
"@oxfmt/binding-linux-s390x-gnu": "npm:0.35.0"
11769+
"@oxfmt/binding-linux-x64-gnu": "npm:0.35.0"
11770+
"@oxfmt/binding-linux-x64-musl": "npm:0.35.0"
11771+
"@oxfmt/binding-openharmony-arm64": "npm:0.35.0"
11772+
"@oxfmt/binding-win32-arm64-msvc": "npm:0.35.0"
11773+
"@oxfmt/binding-win32-ia32-msvc": "npm:0.35.0"
11774+
"@oxfmt/binding-win32-x64-msvc": "npm:0.35.0"
11775+
tinypool: "npm:2.1.0"
11776+
dependenciesMeta:
11777+
"@oxfmt/binding-android-arm-eabi":
11778+
optional: true
11779+
"@oxfmt/binding-android-arm64":
11780+
optional: true
11781+
"@oxfmt/binding-darwin-arm64":
11782+
optional: true
11783+
"@oxfmt/binding-darwin-x64":
11784+
optional: true
11785+
"@oxfmt/binding-freebsd-x64":
11786+
optional: true
11787+
"@oxfmt/binding-linux-arm-gnueabihf":
11788+
optional: true
11789+
"@oxfmt/binding-linux-arm-musleabihf":
11790+
optional: true
11791+
"@oxfmt/binding-linux-arm64-gnu":
11792+
optional: true
11793+
"@oxfmt/binding-linux-arm64-musl":
11794+
optional: true
11795+
"@oxfmt/binding-linux-ppc64-gnu":
11796+
optional: true
11797+
"@oxfmt/binding-linux-riscv64-gnu":
11798+
optional: true
11799+
"@oxfmt/binding-linux-riscv64-musl":
11800+
optional: true
11801+
"@oxfmt/binding-linux-s390x-gnu":
11802+
optional: true
11803+
"@oxfmt/binding-linux-x64-gnu":
11804+
optional: true
11805+
"@oxfmt/binding-linux-x64-musl":
11806+
optional: true
11807+
"@oxfmt/binding-openharmony-arm64":
11808+
optional: true
11809+
"@oxfmt/binding-win32-arm64-msvc":
11810+
optional: true
11811+
"@oxfmt/binding-win32-ia32-msvc":
11812+
optional: true
11813+
"@oxfmt/binding-win32-x64-msvc":
11814+
optional: true
11815+
bin:
11816+
oxfmt: bin/oxfmt
11817+
checksum: 10c0/9be372a992e064df7be40dc22b0f7c794a11a580caeab77670fde0337a1f5483c58dfaaf7ab19d4fe9808a67375fc1db29ab19ad4652e9571df150ca33c0e495
11818+
languageName: node
11819+
linkType: hard
11820+
1162011821
"p-defer@npm:^1.0.0":
1162111822
version: 1.0.0
1162211823
resolution: "p-defer@npm:1.0.0"
@@ -14073,6 +14274,13 @@ __metadata:
1407314274
languageName: node
1407414275
linkType: hard
1407514276

14277+
"tinypool@npm:2.1.0":
14278+
version: 2.1.0
14279+
resolution: "tinypool@npm:2.1.0"
14280+
checksum: 10c0/9fb1c760558c6264e0f4cfde96a63b12450b43f1730fbe6274aa24ddbdf488745c08924d0dea7a1303b47d555416a6415f2113898c69b6ecf731e75ac95238a5
14281+
languageName: node
14282+
linkType: hard
14283+
1407614284
"tmp@npm:~0.2.1":
1407714285
version: 0.2.4
1407814286
resolution: "tmp@npm:0.2.4"

0 commit comments

Comments
 (0)