From c382e3beb8c6db7616e57c3803726937731463d9 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Tue, 24 Feb 2026 08:14:27 -0800 Subject: [PATCH 1/5] initial changes --- .github/workflows/pr.yml | 4 +- .oxfmtrc.json | 15 ++ .prettierignore | 2 - CLAUDE.md | 6 +- README.md | 9 +- lage.config.js | 6 +- package.json | 6 +- .../foundation-composable/package.json | 2 +- .../foundation-compose/package.json | 2 +- .../foundation-settings/package.json | 2 +- .../deprecated/foundation-tokens/package.json | 2 +- .../deprecated/theme-registry/package.json | 2 +- .../deprecated/themed-settings/package.json | 2 +- packages/deprecated/theming-ramp/package.json | 2 +- .../theming-react-native/package.json | 2 +- prettier.config.js | 7 - scripts/dynamic.extensions.mjs | 8 +- scripts/package.json | 2 +- scripts/src/cli.mjs | 4 +- scripts/src/tasks/format.js | 26 +++ scripts/src/tasks/lintPackage.ts | 5 +- scripts/src/tasks/prettier.js | 33 --- yarn.lock | 213 +++++++++++++++++- 23 files changed, 284 insertions(+), 78 deletions(-) create mode 100644 .oxfmtrc.json delete mode 100644 .prettierignore delete mode 100644 prettier.config.js create mode 100644 scripts/src/tasks/format.js delete mode 100644 scripts/src/tasks/prettier.js diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 778ebdedeee..76f4bb53a32 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -27,8 +27,8 @@ jobs: - name: Install dependencies run: yarn - - name: Check prettier - run: yarn prettier + - name: Check formatting + run: yarn format - name: Run lint-lockfile run: yarn lint-lockfile diff --git a/.oxfmtrc.json b/.oxfmtrc.json new file mode 100644 index 00000000000..c2ba866f481 --- /dev/null +++ b/.oxfmtrc.json @@ -0,0 +1,15 @@ +{ + "$schema": "./node_modules/oxfmt/configuration_schema.json", + "printWidth": 140, + "singleQuote": true, + "trailingComma": "all", + "ignorePatterns": [ + "**/__fixtures__/**", + "**/__testfixtures__/**", + "**/lib-commonjs/**", + "**/dist/**", + "**/CHANGELOG.*", + "**/CODE_OF_CONDUCT.md", + "**/SECURITY.md" + ] +} diff --git a/.prettierignore b/.prettierignore deleted file mode 100644 index 614670f16c2..00000000000 --- a/.prettierignore +++ /dev/null @@ -1,2 +0,0 @@ -#Ignore transforms test output files -**/__testfixtures__/*.output.tsx \ No newline at end of file diff --git a/CLAUDE.md b/CLAUDE.md index cf82e188c5f..176ffb774c8 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -62,7 +62,7 @@ yarn clean # Clean build artifacts ### Development Commands ```bash -yarn prettier-fix # Format code with Prettier +yarn format:fix # Format code with oxfmt yarn depcheck # Check for unused dependencies across packages yarn depcheck-fix # Fix depcheck issues automatically yarn align-deps # Align React Native dependencies using @rnx-kit/align-deps @@ -88,8 +88,8 @@ Individual packages use `fluentui-scripts` (in `/scripts/`) which provides: - Validates dependencies, scripts, entry points, and build configuration - `yarn test` - Jest tests (where applicable) - `yarn depcheck` - Check for unused dependencies -- `yarn prettier` - Check code formatting -- `yarn prettier-fix` - Fix code formatting +- `yarn format` - Check code formatting +- `yarn format:fix` - Fix code formatting ## TypeScript Configuration diff --git a/README.md b/README.md index 045d9f23e38..f41521adcef 100644 --- a/README.md +++ b/README.md @@ -120,14 +120,9 @@ After a successful yarn build, you can explore FluentUI Tester, our demo applica Note: If your repo is located on either your Desktop or Documents folder, you may encounter the error: "Watchman error... Operation not permitted". Clone it in a different directory to avoid Watchman permission issues. -### Prettier +### Formatting -This repo is set up to run [Prettier](https://prettier.io/). To run Prettier in fix mode on the repo, run `yarn prettier-fix` at the root of the Repo. - -If you are using [Visual Studio Code as your editor, you can configure it to run Prettier on save. Prettier is a recommended extension for the repo. You can configure it to run by: - -1. Installing the Prettier extension for VSCode -2. Going to Settings > Text Editor > Formatting > Check Format On Save +This repo is set up to run [oxfmt](https://oxc.rs/docs/guide/usage/formatter.html). To run oxfmt in fix mode on the repo, run `yarn prettier-fix` at the root of the Repo. ## Contributing diff --git a/lage.config.js b/lage.config.js index b7ad2e7f54e..867aedd811b 100644 --- a/lage.config.js +++ b/lage.config.js @@ -32,12 +32,12 @@ module.exports = { inputs: ['**/*', '!node_modules/**/*', '!dist/**/*', '!lib/**/*', '!lib-commonjs/**/*'], outputs: [], }, - prettier: { + format: { inputs: ['*', 'src/**/*'], outputs: [], }, - ['pr-check']: ['build-dual', 'test', 'lint', 'check-publishing', 'align-deps', 'lint-package', 'lint-lockfile', 'prettier'], - ['prettier-fix']: [], + ['pr-check']: ['build-dual', 'test', 'lint', 'check-publishing', 'align-deps', 'lint-package', 'lint-lockfile', 'format'], + ['format:fix']: [], test: { dependsOn: ['build-dual'], inputs: [], diff --git a/package.json b/package.json index 751ed486d4e..6b8795930b3 100644 --- a/package.json +++ b/package.json @@ -28,8 +28,8 @@ "lint-package-fix": "cross-env FURN_FIX_MODE=true lage lint-package", "pr-check": "lage pr-check", "preinstall": "node ./scripts/src/preinstall/use-yarn-please.js", - "prettier": "lage prettier", - "prettier-fix": "cross-env FURN_FIX_MODE=true lage prettier", + "format": "lage format", + "format:fix": "cross-env FURN_FIX_MODE=true lage format", "test": "lage test", "test-links": "markdown-link-check" }, @@ -50,7 +50,7 @@ "eslint-plugin-import": "^2.32.0", "lage": "^2.0.0", "markdown-link-check": "^3.8.7", - "prettier": "^2.4.1", + "oxfmt": "^0.35.0", "typescript": "^5.8.0", "zx": "^8.2.4" }, diff --git a/packages/deprecated/foundation-composable/package.json b/packages/deprecated/foundation-composable/package.json index 256c6b031a4..cbfde2a072f 100644 --- a/packages/deprecated/foundation-composable/package.json +++ b/packages/deprecated/foundation-composable/package.json @@ -28,7 +28,7 @@ "depcheck": "fluentui-scripts depcheck", "lint": "fluentui-scripts eslint", "lint-package": "fluentui-scripts lint-package", - "prettier": "fluentui-scripts prettier", + "format": "fluentui-scripts format", "start": "fluentui-scripts dev", "start-test": "fluentui-scripts jest-watch", "test": "fluentui-scripts jest", diff --git a/packages/deprecated/foundation-compose/package.json b/packages/deprecated/foundation-compose/package.json index ab17f14c807..9b53e27ad08 100644 --- a/packages/deprecated/foundation-compose/package.json +++ b/packages/deprecated/foundation-compose/package.json @@ -28,7 +28,7 @@ "depcheck": "fluentui-scripts depcheck", "lint": "fluentui-scripts eslint", "lint-package": "fluentui-scripts lint-package", - "prettier": "fluentui-scripts prettier", + "format": "fluentui-scripts format", "start": "fluentui-scripts dev", "start-test": "fluentui-scripts jest-watch", "test": "fluentui-scripts jest", diff --git a/packages/deprecated/foundation-settings/package.json b/packages/deprecated/foundation-settings/package.json index e9bcf3c272c..7348e6e26e6 100644 --- a/packages/deprecated/foundation-settings/package.json +++ b/packages/deprecated/foundation-settings/package.json @@ -28,7 +28,7 @@ "depcheck": "fluentui-scripts depcheck", "lint": "fluentui-scripts eslint", "lint-package": "fluentui-scripts lint-package", - "prettier": "fluentui-scripts prettier", + "format": "fluentui-scripts format", "start": "fluentui-scripts dev", "start-test": "fluentui-scripts jest-watch", "test": "fluentui-scripts jest", diff --git a/packages/deprecated/foundation-tokens/package.json b/packages/deprecated/foundation-tokens/package.json index 8cf92fa4c65..6e16b5335b1 100644 --- a/packages/deprecated/foundation-tokens/package.json +++ b/packages/deprecated/foundation-tokens/package.json @@ -28,7 +28,7 @@ "depcheck": "fluentui-scripts depcheck", "lint": "fluentui-scripts eslint", "lint-package": "fluentui-scripts lint-package", - "prettier": "fluentui-scripts prettier", + "format": "fluentui-scripts format", "start": "fluentui-scripts dev", "start-test": "fluentui-scripts jest-watch", "test": "fluentui-scripts jest", diff --git a/packages/deprecated/theme-registry/package.json b/packages/deprecated/theme-registry/package.json index a074f3b3ff2..d6fce3030b8 100644 --- a/packages/deprecated/theme-registry/package.json +++ b/packages/deprecated/theme-registry/package.json @@ -28,7 +28,7 @@ "depcheck": "fluentui-scripts depcheck", "lint": "fluentui-scripts eslint", "lint-package": "fluentui-scripts lint-package", - "prettier": "fluentui-scripts prettier", + "format": "fluentui-scripts format", "start": "fluentui-scripts dev", "start-test": "fluentui-scripts jest-watch", "test": "fluentui-scripts jest", diff --git a/packages/deprecated/themed-settings/package.json b/packages/deprecated/themed-settings/package.json index fa25168fcc8..63278c023e4 100644 --- a/packages/deprecated/themed-settings/package.json +++ b/packages/deprecated/themed-settings/package.json @@ -28,7 +28,7 @@ "depcheck": "fluentui-scripts depcheck", "lint": "fluentui-scripts eslint", "lint-package": "fluentui-scripts lint-package", - "prettier": "fluentui-scripts prettier", + "format": "fluentui-scripts format", "start": "fluentui-scripts dev", "start-test": "fluentui-scripts jest-watch", "test": "fluentui-scripts jest", diff --git a/packages/deprecated/theming-ramp/package.json b/packages/deprecated/theming-ramp/package.json index 6c230787c74..d4f1d04ab8c 100644 --- a/packages/deprecated/theming-ramp/package.json +++ b/packages/deprecated/theming-ramp/package.json @@ -28,7 +28,7 @@ "depcheck": "fluentui-scripts depcheck", "lint": "fluentui-scripts eslint", "lint-package": "fluentui-scripts lint-package", - "prettier": "fluentui-scripts prettier", + "format": "fluentui-scripts format", "start": "fluentui-scripts dev", "start-test": "fluentui-scripts jest-watch", "test": "fluentui-scripts jest", diff --git a/packages/deprecated/theming-react-native/package.json b/packages/deprecated/theming-react-native/package.json index 3aa5dbc26f7..b52eb04629a 100644 --- a/packages/deprecated/theming-react-native/package.json +++ b/packages/deprecated/theming-react-native/package.json @@ -28,7 +28,7 @@ "depcheck": "fluentui-scripts depcheck", "lint": "fluentui-scripts eslint", "lint-package": "fluentui-scripts lint-package", - "prettier": "fluentui-scripts prettier", + "format": "fluentui-scripts format", "start": "fluentui-scripts dev", "start-test": "fluentui-scripts jest-watch", "test": "fluentui-scripts jest", diff --git a/prettier.config.js b/prettier.config.js deleted file mode 100644 index 3771d704569..00000000000 --- a/prettier.config.js +++ /dev/null @@ -1,7 +0,0 @@ -// https://prettier.io/docs/en/configuration.html -module.exports = { - printWidth: 140, - tabWidth: 2, - singleQuote: true, - trailingComma: 'all', -}; diff --git a/scripts/dynamic.extensions.mjs b/scripts/dynamic.extensions.mjs index b68dc85cab0..939c0f47447 100644 --- a/scripts/dynamic.extensions.mjs +++ b/scripts/dynamic.extensions.mjs @@ -37,10 +37,10 @@ function conditionallyAdd(depsToAdd, manifest, condition) { /** * @param {import('./src/utils/projectRoot.ts').PackageManifest} manifest - The package manifest. - * @returns {boolean} true if prettier is already in the manifest or if a prettier script is defined + * @returns {boolean} true if oxfmt should be added based on the manifest's prettier scripts */ -function addPrettier(manifest) { - return Boolean(manifest && manifest.scripts && (manifest.scripts.prettier || manifest.scripts['prettier-fix'])); +function addOxfmt(manifest) { + return Boolean(manifest && manifest.scripts && (manifest.scripts.format || manifest.scripts['format:fix'])); } /** @@ -67,7 +67,7 @@ export default function ({ cwd, manifest }) { fs.existsSync(path.join(cwd, 'tsconfig.json')), ), ...conditionallyAdd(['eslint'], manifest, enableLinting), - ...conditionallyAdd(['prettier'], manifest, () => addPrettier(manifest)), + ...conditionallyAdd(['oxfmt'], manifest, () => addOxfmt(manifest)), ...conditionallyAdd(['jest', '@types/jest'], manifest, () => addJest(cwd, manifest)), }, }; diff --git a/scripts/package.json b/scripts/package.json index 3c79ee63ef9..df24435e96b 100644 --- a/scripts/package.json +++ b/scripts/package.json @@ -21,7 +21,7 @@ "depcheck": "node ./src/cli.mjs depcheck", "lint": "node ./src/cli.mjs lint", "lint-package": "node ./src/cli.mjs lint-package", - "prettier": "node ./src/cli.mjs prettier" + "format": "node ./src/cli.mjs format" }, "devDependencies": { "@eslint/js": "^9.0.0", diff --git a/scripts/src/cli.mjs b/scripts/src/cli.mjs index 502fad29dc1..79203e1b3f6 100755 --- a/scripts/src/cli.mjs +++ b/scripts/src/cli.mjs @@ -4,7 +4,7 @@ import { Builtins, Cli } from 'clipanion'; import { BuildCommand } from './tasks/build.ts'; import { CleanCommand } from './tasks/clean.js'; -import { PrettierCommand } from './tasks/prettier.js'; +import { FormatCommand } from './tasks/format.js'; import { LintCommand } from './tasks/eslint.js'; import { LintPackageCommand } from './tasks/lintPackage.ts'; import { JestCommand } from './tasks/jest.js'; @@ -19,7 +19,7 @@ const cli = new Cli({ cli.register(BuildCommand); cli.register(CleanCommand); -cli.register(PrettierCommand); +cli.register(FormatCommand); cli.register(LintCommand); cli.register(LintPackageCommand); cli.register(JestCommand); diff --git a/scripts/src/tasks/format.js b/scripts/src/tasks/format.js new file mode 100644 index 00000000000..f7f6d173493 --- /dev/null +++ b/scripts/src/tasks/format.js @@ -0,0 +1,26 @@ +// @ts-check + +import { Command, Option } from 'clipanion'; +import { runScript } from '../utils/runScript.js'; +import { isFixMode } from '../utils/env.ts'; + +export class FormatCommand extends Command { + /** @override */ + static paths = [['format']]; + + /** @override */ + static usage = Command.Usage({ + description: 'Formats the current package', + details: 'This command formats the current package using oxfmt.', + examples: [['Format the current package', '$0 format']], + }); + + fix = Option.Boolean('--fix', false, { + description: 'Automatically fix issues where possible', + }); + + async execute() { + const args = isFixMode(this.fix) ? [] : ['--check']; + return await runScript('oxfmt', ...args, 'src/**/*.{js,json,jsx,md,mjs,ts,tsx,yml}'); + } +} diff --git a/scripts/src/tasks/lintPackage.ts b/scripts/src/tasks/lintPackage.ts index 8fe1ba77ec8..2ea4c957328 100644 --- a/scripts/src/tasks/lintPackage.ts +++ b/scripts/src/tasks/lintPackage.ts @@ -289,9 +289,12 @@ export class LintPackageCommand extends Command { this.warnIf(scripts['just'] !== undefined, 'just script is deprecated, can invoke by calling yarn fluentui-scripts instead', () => { this.projRoot.updateRecordEntry('scripts', 'just', undefined); }); - this.warnIf(scripts['prettier-fix'] !== undefined, 'prettier-fix script is deprecated, use prettier --fix instead', () => { + this.warnIf(scripts['prettier-fix'] !== undefined, 'prettier-fix script is deprecated, rename to format:fix', () => { this.projRoot.updateRecordEntry('scripts', 'prettier-fix', undefined); }); + this.warnIf(scripts['prettier'] !== undefined, 'prettier script is deprecated, rename to format', () => { + this.projRoot.updateRecordEntry('scripts', 'prettier', undefined); + }); } private validateEntryPoint(collection: T, key: K, expectedOutDir: string, otherOutDir: string) { diff --git a/scripts/src/tasks/prettier.js b/scripts/src/tasks/prettier.js deleted file mode 100644 index 1192256e217..00000000000 --- a/scripts/src/tasks/prettier.js +++ /dev/null @@ -1,33 +0,0 @@ -// @ts-check - -import { Command, Option } from 'clipanion'; -import { runScript } from '../utils/runScript.js'; -import { isFixMode } from '../utils/env.ts'; - -export class PrettierCommand extends Command { - /** @override */ - static paths = [['prettier']]; - - /** @override */ - static usage = Command.Usage({ - description: 'Formats the current package', - details: 'This command formats the current package using prettier.', - examples: [['Format the current package', '$0 prettier']], - }); - - fix = Option.Boolean('--fix', false, { - description: 'Automatically fix issues where possible', - }); - - async execute() { - const fixOrCheck = isFixMode(this.fix) ? '--write' : '--check'; - return await runScript( - 'prettier', - fixOrCheck, - 'src/**/*.{js,json,jsx,md,mjs,ts,tsx,yml}', - '!{CODE_OF_CONDUCT,SECURITY}.md', - '!**/{__fixtures__,__testfixtures__,lib-commonjs,dist}/**', - '!**/CHANGELOG.*', - ); - } -} diff --git a/yarn.lock b/yarn.lock index 2be1b1ed24d..707f29849c1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5039,7 +5039,7 @@ __metadata: eslint-plugin-import: "npm:^2.32.0" lage: "npm:^2.0.0" markdown-link-check: "npm:^3.8.7" - prettier: "npm:^2.4.1" + oxfmt: "npm:^0.35.0" typescript: "npm:^5.8.0" zx: "npm:^8.2.4" languageName: unknown @@ -7787,6 +7787,139 @@ __metadata: languageName: node linkType: hard +"@oxfmt/binding-android-arm-eabi@npm:0.35.0": + version: 0.35.0 + resolution: "@oxfmt/binding-android-arm-eabi@npm:0.35.0" + conditions: os=android & cpu=arm + languageName: node + linkType: hard + +"@oxfmt/binding-android-arm64@npm:0.35.0": + version: 0.35.0 + resolution: "@oxfmt/binding-android-arm64@npm:0.35.0" + conditions: os=android & cpu=arm64 + languageName: node + linkType: hard + +"@oxfmt/binding-darwin-arm64@npm:0.35.0": + version: 0.35.0 + resolution: "@oxfmt/binding-darwin-arm64@npm:0.35.0" + conditions: os=darwin & cpu=arm64 + languageName: node + linkType: hard + +"@oxfmt/binding-darwin-x64@npm:0.35.0": + version: 0.35.0 + resolution: "@oxfmt/binding-darwin-x64@npm:0.35.0" + conditions: os=darwin & cpu=x64 + languageName: node + linkType: hard + +"@oxfmt/binding-freebsd-x64@npm:0.35.0": + version: 0.35.0 + resolution: "@oxfmt/binding-freebsd-x64@npm:0.35.0" + conditions: os=freebsd & cpu=x64 + languageName: node + linkType: hard + +"@oxfmt/binding-linux-arm-gnueabihf@npm:0.35.0": + version: 0.35.0 + resolution: "@oxfmt/binding-linux-arm-gnueabihf@npm:0.35.0" + conditions: os=linux & cpu=arm + languageName: node + linkType: hard + +"@oxfmt/binding-linux-arm-musleabihf@npm:0.35.0": + version: 0.35.0 + resolution: "@oxfmt/binding-linux-arm-musleabihf@npm:0.35.0" + conditions: os=linux & cpu=arm + languageName: node + linkType: hard + +"@oxfmt/binding-linux-arm64-gnu@npm:0.35.0": + version: 0.35.0 + resolution: "@oxfmt/binding-linux-arm64-gnu@npm:0.35.0" + conditions: os=linux & cpu=arm64 & libc=glibc + languageName: node + linkType: hard + +"@oxfmt/binding-linux-arm64-musl@npm:0.35.0": + version: 0.35.0 + resolution: "@oxfmt/binding-linux-arm64-musl@npm:0.35.0" + conditions: os=linux & cpu=arm64 & libc=musl + languageName: node + linkType: hard + +"@oxfmt/binding-linux-ppc64-gnu@npm:0.35.0": + version: 0.35.0 + resolution: "@oxfmt/binding-linux-ppc64-gnu@npm:0.35.0" + conditions: os=linux & cpu=ppc64 & libc=glibc + languageName: node + linkType: hard + +"@oxfmt/binding-linux-riscv64-gnu@npm:0.35.0": + version: 0.35.0 + resolution: "@oxfmt/binding-linux-riscv64-gnu@npm:0.35.0" + conditions: os=linux & cpu=riscv64 & libc=glibc + languageName: node + linkType: hard + +"@oxfmt/binding-linux-riscv64-musl@npm:0.35.0": + version: 0.35.0 + resolution: "@oxfmt/binding-linux-riscv64-musl@npm:0.35.0" + conditions: os=linux & cpu=riscv64 & libc=musl + languageName: node + linkType: hard + +"@oxfmt/binding-linux-s390x-gnu@npm:0.35.0": + version: 0.35.0 + resolution: "@oxfmt/binding-linux-s390x-gnu@npm:0.35.0" + conditions: os=linux & cpu=s390x & libc=glibc + languageName: node + linkType: hard + +"@oxfmt/binding-linux-x64-gnu@npm:0.35.0": + version: 0.35.0 + resolution: "@oxfmt/binding-linux-x64-gnu@npm:0.35.0" + conditions: os=linux & cpu=x64 & libc=glibc + languageName: node + linkType: hard + +"@oxfmt/binding-linux-x64-musl@npm:0.35.0": + version: 0.35.0 + resolution: "@oxfmt/binding-linux-x64-musl@npm:0.35.0" + conditions: os=linux & cpu=x64 & libc=musl + languageName: node + linkType: hard + +"@oxfmt/binding-openharmony-arm64@npm:0.35.0": + version: 0.35.0 + resolution: "@oxfmt/binding-openharmony-arm64@npm:0.35.0" + conditions: os=openharmony & cpu=arm64 + languageName: node + linkType: hard + +"@oxfmt/binding-win32-arm64-msvc@npm:0.35.0": + version: 0.35.0 + resolution: "@oxfmt/binding-win32-arm64-msvc@npm:0.35.0" + conditions: os=win32 & cpu=arm64 + languageName: node + linkType: hard + +"@oxfmt/binding-win32-ia32-msvc@npm:0.35.0": + version: 0.35.0 + resolution: "@oxfmt/binding-win32-ia32-msvc@npm:0.35.0" + conditions: os=win32 & cpu=ia32 + languageName: node + linkType: hard + +"@oxfmt/binding-win32-x64-msvc@npm:0.35.0": + version: 0.35.0 + resolution: "@oxfmt/binding-win32-x64-msvc@npm:0.35.0" + conditions: os=win32 & cpu=x64 + languageName: node + linkType: hard + "@pkgjs/parseargs@npm:^0.11.0": version: 0.11.0 resolution: "@pkgjs/parseargs@npm:0.11.0" @@ -20595,6 +20728,75 @@ __metadata: languageName: node linkType: hard +"oxfmt@npm:^0.35.0": + version: 0.35.0 + resolution: "oxfmt@npm:0.35.0" + dependencies: + "@oxfmt/binding-android-arm-eabi": "npm:0.35.0" + "@oxfmt/binding-android-arm64": "npm:0.35.0" + "@oxfmt/binding-darwin-arm64": "npm:0.35.0" + "@oxfmt/binding-darwin-x64": "npm:0.35.0" + "@oxfmt/binding-freebsd-x64": "npm:0.35.0" + "@oxfmt/binding-linux-arm-gnueabihf": "npm:0.35.0" + "@oxfmt/binding-linux-arm-musleabihf": "npm:0.35.0" + "@oxfmt/binding-linux-arm64-gnu": "npm:0.35.0" + "@oxfmt/binding-linux-arm64-musl": "npm:0.35.0" + "@oxfmt/binding-linux-ppc64-gnu": "npm:0.35.0" + "@oxfmt/binding-linux-riscv64-gnu": "npm:0.35.0" + "@oxfmt/binding-linux-riscv64-musl": "npm:0.35.0" + "@oxfmt/binding-linux-s390x-gnu": "npm:0.35.0" + "@oxfmt/binding-linux-x64-gnu": "npm:0.35.0" + "@oxfmt/binding-linux-x64-musl": "npm:0.35.0" + "@oxfmt/binding-openharmony-arm64": "npm:0.35.0" + "@oxfmt/binding-win32-arm64-msvc": "npm:0.35.0" + "@oxfmt/binding-win32-ia32-msvc": "npm:0.35.0" + "@oxfmt/binding-win32-x64-msvc": "npm:0.35.0" + tinypool: "npm:2.1.0" + dependenciesMeta: + "@oxfmt/binding-android-arm-eabi": + optional: true + "@oxfmt/binding-android-arm64": + optional: true + "@oxfmt/binding-darwin-arm64": + optional: true + "@oxfmt/binding-darwin-x64": + optional: true + "@oxfmt/binding-freebsd-x64": + optional: true + "@oxfmt/binding-linux-arm-gnueabihf": + optional: true + "@oxfmt/binding-linux-arm-musleabihf": + optional: true + "@oxfmt/binding-linux-arm64-gnu": + optional: true + "@oxfmt/binding-linux-arm64-musl": + optional: true + "@oxfmt/binding-linux-ppc64-gnu": + optional: true + "@oxfmt/binding-linux-riscv64-gnu": + optional: true + "@oxfmt/binding-linux-riscv64-musl": + optional: true + "@oxfmt/binding-linux-s390x-gnu": + optional: true + "@oxfmt/binding-linux-x64-gnu": + optional: true + "@oxfmt/binding-linux-x64-musl": + optional: true + "@oxfmt/binding-openharmony-arm64": + optional: true + "@oxfmt/binding-win32-arm64-msvc": + optional: true + "@oxfmt/binding-win32-ia32-msvc": + optional: true + "@oxfmt/binding-win32-x64-msvc": + optional: true + bin: + oxfmt: bin/oxfmt + checksum: 10c0/9be372a992e064df7be40dc22b0f7c794a11a580caeab77670fde0337a1f5483c58dfaaf7ab19d4fe9808a67375fc1db29ab19ad4652e9571df150ca33c0e495 + languageName: node + linkType: hard + "p-defer@npm:^1.0.0": version: 1.0.0 resolution: "p-defer@npm:1.0.0" @@ -21163,7 +21365,7 @@ __metadata: languageName: node linkType: hard -"prettier@npm:^2.4.1, prettier@npm:^2.7.1": +"prettier@npm:^2.7.1": version: 2.8.8 resolution: "prettier@npm:2.8.8" bin: @@ -23973,6 +24175,13 @@ __metadata: languageName: node linkType: hard +"tinypool@npm:2.1.0": + version: 2.1.0 + resolution: "tinypool@npm:2.1.0" + checksum: 10c0/9fb1c760558c6264e0f4cfde96a63b12450b43f1730fbe6274aa24ddbdf488745c08924d0dea7a1303b47d555416a6415f2113898c69b6ecf731e75ac95238a5 + languageName: node + linkType: hard + "tinyrainbow@npm:^1.2.0": version: 1.2.0 resolution: "tinyrainbow@npm:1.2.0" From dd6320a68652f49e1de7e916244563abb2843d02 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Tue, 24 Feb 2026 08:20:21 -0800 Subject: [PATCH 2/5] replace commands --- .../component-templates/ComponentTemplate/package.json | 2 +- apps/fluent-tester/package.json | 2 +- apps/tester-core/package.json | 2 +- apps/win32-81/package.json | 2 +- apps/win32/package.json | 2 +- lage.config.js | 2 +- packages/codemods/package.json | 2 +- packages/components/Avatar/package.json | 2 +- packages/components/Badge/package.json | 2 +- packages/components/Button/package.json | 2 +- packages/components/Callout/package.json | 2 +- packages/components/Checkbox/package.json | 2 +- packages/components/Chip/package.json | 2 +- packages/components/ContextualMenu/package.json | 2 +- packages/components/Divider/package.json | 2 +- packages/components/FocusTrapZone/package.json | 2 +- packages/components/FocusZone/package.json | 2 +- packages/components/Icon/package.json | 2 +- packages/components/Input/package.json | 2 +- packages/components/Link/package.json | 2 +- packages/components/Menu/package.json | 2 +- packages/components/MenuButton/package.json | 2 +- packages/components/Notification/package.json | 2 +- packages/components/Persona/package.json | 2 +- packages/components/PersonaCoin/package.json | 2 +- packages/components/Pressable/package.json | 2 +- packages/components/RadioGroup/package.json | 2 +- packages/components/Separator/package.json | 2 +- packages/components/Stack/package.json | 2 +- packages/components/Switch/package.json | 2 +- packages/components/TabList/package.json | 2 +- packages/components/Text/package.json | 2 +- packages/experimental/ActivityIndicator/package.json | 2 +- packages/experimental/AppearanceAdditions/package.json | 2 +- packages/experimental/Avatar/package.json | 2 +- packages/experimental/Checkbox/package.json | 2 +- packages/experimental/Drawer/package.json | 2 +- packages/experimental/Dropdown/package.json | 2 +- packages/experimental/MenuButton/package.json | 2 +- packages/experimental/NativeDatePicker/package.json | 2 +- packages/experimental/NativeFontMetrics/package.json | 2 +- packages/experimental/Overflow/package.json | 2 +- packages/experimental/Popover/package.json | 2 +- packages/experimental/Shadow/package.json | 2 +- packages/experimental/Shimmer/package.json | 2 +- packages/experimental/Spinner/package.json | 2 +- packages/experimental/Stack/package.json | 2 +- packages/experimental/Tooltip/package.json | 2 +- packages/experimental/VibrancyView/package.json | 2 +- packages/framework-base/package.json | 2 +- packages/framework/composition/package.json | 2 +- packages/framework/framework/package.json | 2 +- packages/framework/immutable-merge/package.json | 2 +- packages/framework/memo-cache/package.json | 2 +- packages/framework/merge-props/package.json | 2 +- packages/framework/theme/package.json | 2 +- packages/framework/themed-stylesheet/package.json | 2 +- packages/framework/use-slot/package.json | 2 +- packages/framework/use-slots/package.json | 2 +- packages/framework/use-styling/package.json | 2 +- packages/framework/use-tokens/package.json | 2 +- packages/libraries/core/package.json | 2 +- packages/theming/android-theme/package.json | 2 +- packages/theming/apple-theme/package.json | 2 +- packages/theming/default-theme/package.json | 2 +- packages/theming/theme-tokens/package.json | 2 +- packages/theming/theme-types/package.json | 2 +- packages/theming/theming-utils/package.json | 2 +- packages/theming/win32-theme/package.json | 2 +- packages/utils/adapters/package.json | 2 +- packages/utils/interactive-hooks/package.json | 2 +- packages/utils/styling/package.json | 2 +- packages/utils/test-tools/package.json | 2 +- packages/utils/tokens/package.json | 2 +- 74 files changed, 74 insertions(+), 74 deletions(-) diff --git a/apps/component-generator/component-templates/ComponentTemplate/package.json b/apps/component-generator/component-templates/ComponentTemplate/package.json index ef976b40381..a00a8858aea 100644 --- a/apps/component-generator/component-templates/ComponentTemplate/package.json +++ b/apps/component-generator/component-templates/ComponentTemplate/package.json @@ -15,7 +15,7 @@ "lint-package": "fluentui-scripts lint-package", "test": "fluentui-scripts jest", "update-snapshots": "fluentui-scripts jest -u", - "prettier": "fluentui-scripts prettier", + "format": "fluentui-scripts format", "prettier-fix": "fluentui-scripts prettier --fix true" }, "repository": { diff --git a/apps/fluent-tester/package.json b/apps/fluent-tester/package.json index 14c9992b5a0..9e3067a5328 100644 --- a/apps/fluent-tester/package.json +++ b/apps/fluent-tester/package.json @@ -36,7 +36,7 @@ "lint": "fluentui-scripts eslint", "lint-package": "fluentui-scripts lint-package", "macos": "rnx-cli run --platform macos", - "prettier": "fluentui-scripts prettier", + "format": "fluentui-scripts format", "start": "rnx-cli start", "windows": "react-native run-windows --arch x64 --sln windows/FluentTester.sln" }, diff --git a/apps/tester-core/package.json b/apps/tester-core/package.json index 42b4ada358a..8f60d0c3b55 100644 --- a/apps/tester-core/package.json +++ b/apps/tester-core/package.json @@ -28,7 +28,7 @@ "depcheck": "fluentui-scripts depcheck", "lint": "fluentui-scripts eslint", "lint-package": "fluentui-scripts lint-package", - "prettier": "fluentui-scripts prettier" + "format": "fluentui-scripts format" }, "jest": { "preset": "react-native" diff --git a/apps/win32-81/package.json b/apps/win32-81/package.json index d5f97ba36fd..7b4e663a51f 100644 --- a/apps/win32-81/package.json +++ b/apps/win32-81/package.json @@ -27,7 +27,7 @@ "depcheck": "fluentui-scripts depcheck", "lint": "fluentui-scripts eslint", "lint-package": "fluentui-scripts lint-package", - "prettier": "fluentui-scripts prettier", + "format": "fluentui-scripts format", "run-win32": "rex-win32 --bundle index.win32 --component FluentTester --basePath ./dist --useDirectDebugger --windowTitle \"FluentUI Tester\" --pluginProps --debugBundlePath index --jsEngine v8", "run-win32-dev": "rex-win32 --bundle index --component FluentTester --basePath ./dist --useDirectDebugger --windowTitle \"FluentUI Tester\" --pluginProps --debugBundlePath index --jsEngine v8 --useFastRefresh", "run-win32-devmain": "rex-win32 --bundle index.win32 --component FluentTester --basePath ./dist --useDirectDebugger --windowTitle \"FluentUI Tester\" --pluginProps --debugBundlePath index --jsEngine v8 --useDevMain ", diff --git a/apps/win32/package.json b/apps/win32/package.json index 3ef851f3d91..8a9137adac5 100644 --- a/apps/win32/package.json +++ b/apps/win32/package.json @@ -27,7 +27,7 @@ "depcheck": "fluentui-scripts depcheck", "lint": "fluentui-scripts eslint", "lint-package": "fluentui-scripts lint-package", - "prettier": "fluentui-scripts prettier", + "format": "fluentui-scripts format", "run-win32": "rex-win32 --bundle index.win32 --component FluentTester --basePath ./dist --useDirectDebugger --windowTitle \"FluentUI Tester\" --pluginProps --debugBundlePath index --jsEngine v8", "run-win32-dev": "rex-win32 --bundle index --component FluentTester --basePath ./dist --useDirectDebugger --windowTitle \"FluentUI Tester\" --pluginProps --debugBundlePath index --jsEngine v8 --useFastRefresh", "run-win32-devmain": "rex-win32 --bundle index.win32 --component FluentTester --basePath ./dist --useDirectDebugger --windowTitle \"FluentUI Tester\" --pluginProps --debugBundlePath index --jsEngine v8 --useDevMain ", diff --git a/lage.config.js b/lage.config.js index 867aedd811b..ba020337f02 100644 --- a/lage.config.js +++ b/lage.config.js @@ -16,7 +16,7 @@ module.exports = { inputs: ['*', 'src/**/*', 'assets/**/*'], outputs: ['lib/**/*', 'lib-commonjs/**/*'], }, - buildci: ['build-dual', 'test', 'lint', 'lint-package', 'check-publishing'], + buildci: ['build-dual', 'test', 'lint', 'lint-package', 'check-publishing', 'format'], bundle: { inputs: ['**/*', '!node_modules/**/*', '!dist/**/*', '!lib/**/*', '!lib-commonjs/**/*'], outputs: ['dist/**/*'], diff --git a/packages/codemods/package.json b/packages/codemods/package.json index 3d208177509..7d2c20cfd4f 100644 --- a/packages/codemods/package.json +++ b/packages/codemods/package.json @@ -31,7 +31,7 @@ "depcheck": "fluentui-scripts depcheck", "lint": "fluentui-scripts eslint", "lint-package": "fluentui-scripts lint-package", - "prettier": "fluentui-scripts prettier", + "format": "fluentui-scripts format", "test": "fluentui-scripts jest" }, "dependencies": { diff --git a/packages/components/Avatar/package.json b/packages/components/Avatar/package.json index 2029b8cf01b..6fd3d82c7d3 100644 --- a/packages/components/Avatar/package.json +++ b/packages/components/Avatar/package.json @@ -28,7 +28,7 @@ "depcheck": "fluentui-scripts depcheck", "lint": "fluentui-scripts eslint", "lint-package": "fluentui-scripts lint-package", - "prettier": "fluentui-scripts prettier", + "format": "fluentui-scripts format", "test": "fluentui-scripts jest", "update-snapshots": "fluentui-scripts jest -u" }, diff --git a/packages/components/Badge/package.json b/packages/components/Badge/package.json index dc21107e902..31e0efd5946 100644 --- a/packages/components/Badge/package.json +++ b/packages/components/Badge/package.json @@ -24,7 +24,7 @@ "depcheck": "fluentui-scripts depcheck", "lint": "fluentui-scripts eslint", "lint-package": "fluentui-scripts lint-package", - "prettier": "fluentui-scripts prettier", + "format": "fluentui-scripts format", "test": "fluentui-scripts jest", "update-snapshots": "fluentui-scripts jest -u" }, diff --git a/packages/components/Button/package.json b/packages/components/Button/package.json index 568656ce896..c24a1647ddf 100644 --- a/packages/components/Button/package.json +++ b/packages/components/Button/package.json @@ -28,7 +28,7 @@ "depcheck": "fluentui-scripts depcheck", "lint": "fluentui-scripts eslint", "lint-package": "fluentui-scripts lint-package", - "prettier": "fluentui-scripts prettier", + "format": "fluentui-scripts format", "test": "fluentui-scripts jest", "update-snapshots": "fluentui-scripts jest -u" }, diff --git a/packages/components/Callout/package.json b/packages/components/Callout/package.json index 4fd7df6b1c8..c747ea8f172 100644 --- a/packages/components/Callout/package.json +++ b/packages/components/Callout/package.json @@ -28,7 +28,7 @@ "depcheck": "fluentui-scripts depcheck", "lint": "fluentui-scripts eslint", "lint-package": "fluentui-scripts lint-package", - "prettier": "fluentui-scripts prettier", + "format": "fluentui-scripts format", "test": "fluentui-scripts jest", "update-snapshots": "fluentui-scripts jest -u" }, diff --git a/packages/components/Checkbox/package.json b/packages/components/Checkbox/package.json index 78894d3b2c3..07d6d6b46b5 100644 --- a/packages/components/Checkbox/package.json +++ b/packages/components/Checkbox/package.json @@ -28,7 +28,7 @@ "depcheck": "fluentui-scripts depcheck", "lint": "fluentui-scripts eslint", "lint-package": "fluentui-scripts lint-package", - "prettier": "fluentui-scripts prettier", + "format": "fluentui-scripts format", "test": "fluentui-scripts jest", "update-snapshots": "fluentui-scripts jest -u" }, diff --git a/packages/components/Chip/package.json b/packages/components/Chip/package.json index 270772b2ed0..769a72642e4 100644 --- a/packages/components/Chip/package.json +++ b/packages/components/Chip/package.json @@ -23,7 +23,7 @@ "depcheck": "fluentui-scripts depcheck", "lint": "fluentui-scripts eslint", "lint-package": "fluentui-scripts lint-package", - "prettier": "fluentui-scripts prettier", + "format": "fluentui-scripts format", "test": "fluentui-scripts jest", "update-snapshots": "fluentui-scripts jest -u" }, diff --git a/packages/components/ContextualMenu/package.json b/packages/components/ContextualMenu/package.json index 9011c40251a..8b28f44c459 100644 --- a/packages/components/ContextualMenu/package.json +++ b/packages/components/ContextualMenu/package.json @@ -28,7 +28,7 @@ "depcheck": "fluentui-scripts depcheck", "lint": "fluentui-scripts eslint", "lint-package": "fluentui-scripts lint-package", - "prettier": "fluentui-scripts prettier", + "format": "fluentui-scripts format", "test": "fluentui-scripts jest", "update-snapshots": "fluentui-scripts jest -u" }, diff --git a/packages/components/Divider/package.json b/packages/components/Divider/package.json index b9f015fdf3d..c26460fcd87 100644 --- a/packages/components/Divider/package.json +++ b/packages/components/Divider/package.json @@ -27,7 +27,7 @@ "depcheck": "fluentui-scripts depcheck", "lint": "fluentui-scripts eslint", "lint-package": "fluentui-scripts lint-package", - "prettier": "fluentui-scripts prettier", + "format": "fluentui-scripts format", "test": "fluentui-scripts jest", "update-snapshots": "fluentui-scripts jest -u" }, diff --git a/packages/components/FocusTrapZone/package.json b/packages/components/FocusTrapZone/package.json index d363ca42618..4ec85a0bdb0 100644 --- a/packages/components/FocusTrapZone/package.json +++ b/packages/components/FocusTrapZone/package.json @@ -27,7 +27,7 @@ "depcheck": "fluentui-scripts depcheck", "lint": "fluentui-scripts eslint", "lint-package": "fluentui-scripts lint-package", - "prettier": "fluentui-scripts prettier", + "format": "fluentui-scripts format", "test": "fluentui-scripts jest", "update-snapshots": "fluentui-scripts jest -u" }, diff --git a/packages/components/FocusZone/package.json b/packages/components/FocusZone/package.json index 91cc37348d4..283d6658313 100644 --- a/packages/components/FocusZone/package.json +++ b/packages/components/FocusZone/package.json @@ -27,7 +27,7 @@ "depcheck": "fluentui-scripts depcheck", "lint": "fluentui-scripts eslint", "lint-package": "fluentui-scripts lint-package", - "prettier": "fluentui-scripts prettier", + "format": "fluentui-scripts format", "test": "fluentui-scripts jest", "update-snapshots": "fluentui-scripts jest -u" }, diff --git a/packages/components/Icon/package.json b/packages/components/Icon/package.json index 9b3225bfa4b..c11302e3bf4 100644 --- a/packages/components/Icon/package.json +++ b/packages/components/Icon/package.json @@ -27,7 +27,7 @@ "depcheck": "fluentui-scripts depcheck", "lint": "fluentui-scripts eslint", "lint-package": "fluentui-scripts lint-package", - "prettier": "fluentui-scripts prettier", + "format": "fluentui-scripts format", "test": "fluentui-scripts jest", "update-snapshots": "fluentui-scripts jest -u" }, diff --git a/packages/components/Input/package.json b/packages/components/Input/package.json index 2c057395628..9129e4774c6 100644 --- a/packages/components/Input/package.json +++ b/packages/components/Input/package.json @@ -27,7 +27,7 @@ "depcheck": "fluentui-scripts depcheck", "lint": "fluentui-scripts eslint", "lint-package": "fluentui-scripts lint-package", - "prettier": "fluentui-scripts prettier", + "format": "fluentui-scripts format", "test": "fluentui-scripts jest", "update-snapshots": "fluentui-scripts jest -u" }, diff --git a/packages/components/Link/package.json b/packages/components/Link/package.json index dacecaa8a21..d4b9cb5cb62 100644 --- a/packages/components/Link/package.json +++ b/packages/components/Link/package.json @@ -27,7 +27,7 @@ "depcheck": "fluentui-scripts depcheck", "lint": "fluentui-scripts eslint", "lint-package": "fluentui-scripts lint-package", - "prettier": "fluentui-scripts prettier", + "format": "fluentui-scripts format", "test": "fluentui-scripts jest", "update-snapshots": "fluentui-scripts jest -u" }, diff --git a/packages/components/Menu/package.json b/packages/components/Menu/package.json index 0973c3fd1ba..4b5fb8cf84f 100644 --- a/packages/components/Menu/package.json +++ b/packages/components/Menu/package.json @@ -28,7 +28,7 @@ "depcheck": "fluentui-scripts depcheck", "lint": "fluentui-scripts eslint", "lint-package": "fluentui-scripts lint-package", - "prettier": "fluentui-scripts prettier", + "format": "fluentui-scripts format", "test": "fluentui-scripts jest", "update-snapshots": "fluentui-scripts jest -u" }, diff --git a/packages/components/MenuButton/package.json b/packages/components/MenuButton/package.json index a844ecc1112..8adfb0b2879 100644 --- a/packages/components/MenuButton/package.json +++ b/packages/components/MenuButton/package.json @@ -28,7 +28,7 @@ "depcheck": "fluentui-scripts depcheck", "lint": "fluentui-scripts eslint", "lint-package": "fluentui-scripts lint-package", - "prettier": "fluentui-scripts prettier", + "format": "fluentui-scripts format", "test": "fluentui-scripts jest", "update-snapshots": "fluentui-scripts jest -u" }, diff --git a/packages/components/Notification/package.json b/packages/components/Notification/package.json index ec7e8704f1d..08a01b534b6 100644 --- a/packages/components/Notification/package.json +++ b/packages/components/Notification/package.json @@ -27,7 +27,7 @@ "depcheck": "fluentui-scripts depcheck", "lint": "fluentui-scripts eslint", "lint-package": "fluentui-scripts lint-package", - "prettier": "fluentui-scripts prettier", + "format": "fluentui-scripts format", "test": "fluentui-scripts jest", "update-snapshots": "fluentui-scripts jest -u" }, diff --git a/packages/components/Persona/package.json b/packages/components/Persona/package.json index ba5000eafa1..c5fa29f332c 100644 --- a/packages/components/Persona/package.json +++ b/packages/components/Persona/package.json @@ -27,7 +27,7 @@ "depcheck": "fluentui-scripts depcheck", "lint": "fluentui-scripts eslint", "lint-package": "fluentui-scripts lint-package", - "prettier": "fluentui-scripts prettier", + "format": "fluentui-scripts format", "test": "fluentui-scripts jest", "update-snapshots": "fluentui-scripts jest -u" }, diff --git a/packages/components/PersonaCoin/package.json b/packages/components/PersonaCoin/package.json index 2df541a760c..16d4c3414b2 100644 --- a/packages/components/PersonaCoin/package.json +++ b/packages/components/PersonaCoin/package.json @@ -27,7 +27,7 @@ "depcheck": "fluentui-scripts depcheck", "lint": "fluentui-scripts eslint", "lint-package": "fluentui-scripts lint-package", - "prettier": "fluentui-scripts prettier", + "format": "fluentui-scripts format", "test": "fluentui-scripts jest", "update-snapshots": "fluentui-scripts jest -u" }, diff --git a/packages/components/Pressable/package.json b/packages/components/Pressable/package.json index 77c737387fc..a2cc2f6edb1 100644 --- a/packages/components/Pressable/package.json +++ b/packages/components/Pressable/package.json @@ -27,7 +27,7 @@ "depcheck": "fluentui-scripts depcheck", "lint": "fluentui-scripts eslint", "lint-package": "fluentui-scripts lint-package", - "prettier": "fluentui-scripts prettier", + "format": "fluentui-scripts format", "test": "fluentui-scripts jest", "update-snapshots": "fluentui-scripts jest -u" }, diff --git a/packages/components/RadioGroup/package.json b/packages/components/RadioGroup/package.json index df3fae94ead..78af196841c 100644 --- a/packages/components/RadioGroup/package.json +++ b/packages/components/RadioGroup/package.json @@ -28,7 +28,7 @@ "depcheck": "fluentui-scripts depcheck", "lint": "fluentui-scripts eslint", "lint-package": "fluentui-scripts lint-package", - "prettier": "fluentui-scripts prettier", + "format": "fluentui-scripts format", "test": "fluentui-scripts jest", "update-snapshots": "fluentui-scripts jest -u" }, diff --git a/packages/components/Separator/package.json b/packages/components/Separator/package.json index 59bc5a9da4c..8b87e56ac5c 100644 --- a/packages/components/Separator/package.json +++ b/packages/components/Separator/package.json @@ -27,7 +27,7 @@ "depcheck": "fluentui-scripts depcheck", "lint": "fluentui-scripts eslint", "lint-package": "fluentui-scripts lint-package", - "prettier": "fluentui-scripts prettier", + "format": "fluentui-scripts format", "test": "fluentui-scripts jest", "update-snapshots": "fluentui-scripts jest -u" }, diff --git a/packages/components/Stack/package.json b/packages/components/Stack/package.json index 0cb5ab41892..568d0fd4e6f 100644 --- a/packages/components/Stack/package.json +++ b/packages/components/Stack/package.json @@ -27,7 +27,7 @@ "depcheck": "fluentui-scripts depcheck", "lint": "fluentui-scripts eslint", "lint-package": "fluentui-scripts lint-package", - "prettier": "fluentui-scripts prettier", + "format": "fluentui-scripts format", "test": "fluentui-scripts jest", "update-snapshots": "fluentui-scripts jest -u" }, diff --git a/packages/components/Switch/package.json b/packages/components/Switch/package.json index 779a6f7723d..3e8f06342ad 100644 --- a/packages/components/Switch/package.json +++ b/packages/components/Switch/package.json @@ -27,7 +27,7 @@ "depcheck": "fluentui-scripts depcheck", "lint": "fluentui-scripts eslint", "lint-package": "fluentui-scripts lint-package", - "prettier": "fluentui-scripts prettier", + "format": "fluentui-scripts format", "test": "fluentui-scripts jest", "update-snapshots": "fluentui-scripts jest -u" }, diff --git a/packages/components/TabList/package.json b/packages/components/TabList/package.json index 362541273f3..294f278e1a7 100644 --- a/packages/components/TabList/package.json +++ b/packages/components/TabList/package.json @@ -27,7 +27,7 @@ "depcheck": "fluentui-scripts depcheck", "lint": "fluentui-scripts eslint", "lint-package": "fluentui-scripts lint-package", - "prettier": "fluentui-scripts prettier", + "format": "fluentui-scripts format", "test": "fluentui-scripts jest", "update-snapshots": "fluentui-scripts jest -u" }, diff --git a/packages/components/Text/package.json b/packages/components/Text/package.json index 17b2c0c7357..06bd4f245d6 100644 --- a/packages/components/Text/package.json +++ b/packages/components/Text/package.json @@ -27,7 +27,7 @@ "depcheck": "fluentui-scripts depcheck", "lint": "fluentui-scripts eslint", "lint-package": "fluentui-scripts lint-package", - "prettier": "fluentui-scripts prettier", + "format": "fluentui-scripts format", "test": "fluentui-scripts jest", "update-snapshots": "fluentui-scripts jest -u" }, diff --git a/packages/experimental/ActivityIndicator/package.json b/packages/experimental/ActivityIndicator/package.json index 3eba5e21e60..09958aeaedf 100644 --- a/packages/experimental/ActivityIndicator/package.json +++ b/packages/experimental/ActivityIndicator/package.json @@ -27,7 +27,7 @@ "depcheck": "fluentui-scripts depcheck", "lint": "fluentui-scripts eslint", "lint-package": "fluentui-scripts lint-package", - "prettier": "fluentui-scripts prettier", + "format": "fluentui-scripts format", "test": "fluentui-scripts jest", "update-snapshots": "fluentui-scripts jest -u" }, diff --git a/packages/experimental/AppearanceAdditions/package.json b/packages/experimental/AppearanceAdditions/package.json index cf893fe248d..7dadebf71ef 100644 --- a/packages/experimental/AppearanceAdditions/package.json +++ b/packages/experimental/AppearanceAdditions/package.json @@ -28,7 +28,7 @@ "depcheck": "fluentui-scripts depcheck", "lint": "fluentui-scripts eslint", "lint-package": "fluentui-scripts lint-package", - "prettier": "fluentui-scripts prettier", + "format": "fluentui-scripts format", "test": "fluentui-scripts jest", "update-snapshots": "fluentui-scripts jest -u" }, diff --git a/packages/experimental/Avatar/package.json b/packages/experimental/Avatar/package.json index f36a18bf27e..705d35b56c1 100644 --- a/packages/experimental/Avatar/package.json +++ b/packages/experimental/Avatar/package.json @@ -28,7 +28,7 @@ "depcheck": "fluentui-scripts depcheck", "lint": "fluentui-scripts eslint", "lint-package": "fluentui-scripts lint-package", - "prettier": "fluentui-scripts prettier", + "format": "fluentui-scripts format", "test": "fluentui-scripts jest", "update-snapshots": "fluentui-scripts jest -u" }, diff --git a/packages/experimental/Checkbox/package.json b/packages/experimental/Checkbox/package.json index 77cca033076..61e37450274 100644 --- a/packages/experimental/Checkbox/package.json +++ b/packages/experimental/Checkbox/package.json @@ -27,7 +27,7 @@ "depcheck": "fluentui-scripts depcheck", "lint": "fluentui-scripts eslint", "lint-package": "fluentui-scripts lint-package", - "prettier": "fluentui-scripts prettier", + "format": "fluentui-scripts format", "test": "fluentui-scripts jest", "update-snapshots": "fluentui-scripts jest -u" }, diff --git a/packages/experimental/Drawer/package.json b/packages/experimental/Drawer/package.json index 286186b7ca7..a9fc307b7bd 100644 --- a/packages/experimental/Drawer/package.json +++ b/packages/experimental/Drawer/package.json @@ -27,7 +27,7 @@ "depcheck": "fluentui-scripts depcheck", "lint": "fluentui-scripts eslint", "lint-package": "fluentui-scripts lint-package", - "prettier": "fluentui-scripts prettier", + "format": "fluentui-scripts format", "test": "fluentui-scripts jest", "update-snapshots": "fluentui-scripts jest -u" }, diff --git a/packages/experimental/Dropdown/package.json b/packages/experimental/Dropdown/package.json index bfbbf49d933..e12d08666e8 100644 --- a/packages/experimental/Dropdown/package.json +++ b/packages/experimental/Dropdown/package.json @@ -27,7 +27,7 @@ "depcheck": "fluentui-scripts depcheck", "lint": "fluentui-scripts eslint", "lint-package": "fluentui-scripts lint-package", - "prettier": "fluentui-scripts prettier", + "format": "fluentui-scripts format", "test": "fluentui-scripts jest", "update-snapshots": "fluentui-scripts jest -u" }, diff --git a/packages/experimental/MenuButton/package.json b/packages/experimental/MenuButton/package.json index 3adbe2430c1..e31f75445e1 100644 --- a/packages/experimental/MenuButton/package.json +++ b/packages/experimental/MenuButton/package.json @@ -27,7 +27,7 @@ "depcheck": "fluentui-scripts depcheck", "lint": "fluentui-scripts eslint", "lint-package": "fluentui-scripts lint-package", - "prettier": "fluentui-scripts prettier", + "format": "fluentui-scripts format", "test": "fluentui-scripts jest", "update-snapshots": "fluentui-scripts jest -u" }, diff --git a/packages/experimental/NativeDatePicker/package.json b/packages/experimental/NativeDatePicker/package.json index f244d42f869..f348c9a253b 100644 --- a/packages/experimental/NativeDatePicker/package.json +++ b/packages/experimental/NativeDatePicker/package.json @@ -28,7 +28,7 @@ "depcheck": "fluentui-scripts depcheck", "lint": "fluentui-scripts eslint", "lint-package": "fluentui-scripts lint-package", - "prettier": "fluentui-scripts prettier", + "format": "fluentui-scripts format", "test": "fluentui-scripts jest", "update-snapshots": "fluentui-scripts jest -u" }, diff --git a/packages/experimental/NativeFontMetrics/package.json b/packages/experimental/NativeFontMetrics/package.json index 1fc0f8b7253..738461b5f76 100644 --- a/packages/experimental/NativeFontMetrics/package.json +++ b/packages/experimental/NativeFontMetrics/package.json @@ -28,7 +28,7 @@ "depcheck": "fluentui-scripts depcheck", "lint": "fluentui-scripts eslint", "lint-package": "fluentui-scripts lint-package", - "prettier": "fluentui-scripts prettier", + "format": "fluentui-scripts format", "test": "fluentui-scripts jest", "update-snapshots": "fluentui-scripts jest -u" }, diff --git a/packages/experimental/Overflow/package.json b/packages/experimental/Overflow/package.json index e991fa051a2..f4a07613055 100644 --- a/packages/experimental/Overflow/package.json +++ b/packages/experimental/Overflow/package.json @@ -27,7 +27,7 @@ "depcheck": "fluentui-scripts depcheck", "lint": "fluentui-scripts eslint", "lint-package": "fluentui-scripts lint-package", - "prettier": "fluentui-scripts prettier", + "format": "fluentui-scripts format", "test": "fluentui-scripts jest", "update-snapshots": "fluentui-scripts jest -u" }, diff --git a/packages/experimental/Popover/package.json b/packages/experimental/Popover/package.json index 3f812ede7e6..17c290d0125 100644 --- a/packages/experimental/Popover/package.json +++ b/packages/experimental/Popover/package.json @@ -27,7 +27,7 @@ "depcheck": "fluentui-scripts depcheck", "lint": "fluentui-scripts eslint", "lint-package": "fluentui-scripts lint-package", - "prettier": "fluentui-scripts prettier", + "format": "fluentui-scripts format", "test": "fluentui-scripts jest", "update-snapshots": "fluentui-scripts jest -u" }, diff --git a/packages/experimental/Shadow/package.json b/packages/experimental/Shadow/package.json index 7d279e9e54e..71b8035623d 100644 --- a/packages/experimental/Shadow/package.json +++ b/packages/experimental/Shadow/package.json @@ -27,7 +27,7 @@ "depcheck": "fluentui-scripts depcheck", "lint": "fluentui-scripts eslint", "lint-package": "fluentui-scripts lint-package", - "prettier": "fluentui-scripts prettier", + "format": "fluentui-scripts format", "test": "fluentui-scripts jest", "update-snapshots": "fluentui-scripts jest -u" }, diff --git a/packages/experimental/Shimmer/package.json b/packages/experimental/Shimmer/package.json index 8eddd419718..6147c9ebcd3 100644 --- a/packages/experimental/Shimmer/package.json +++ b/packages/experimental/Shimmer/package.json @@ -27,7 +27,7 @@ "depcheck": "fluentui-scripts depcheck", "lint": "fluentui-scripts eslint", "lint-package": "fluentui-scripts lint-package", - "prettier": "fluentui-scripts prettier", + "format": "fluentui-scripts format", "test": "fluentui-scripts jest", "update-snapshots": "fluentui-scripts jest -u" }, diff --git a/packages/experimental/Spinner/package.json b/packages/experimental/Spinner/package.json index 81ecd548b93..9fae1898267 100644 --- a/packages/experimental/Spinner/package.json +++ b/packages/experimental/Spinner/package.json @@ -27,7 +27,7 @@ "depcheck": "fluentui-scripts depcheck", "lint": "fluentui-scripts eslint", "lint-package": "fluentui-scripts lint-package", - "prettier": "fluentui-scripts prettier", + "format": "fluentui-scripts format", "test": "fluentui-scripts jest", "update-snapshots": "fluentui-scripts jest -u" }, diff --git a/packages/experimental/Stack/package.json b/packages/experimental/Stack/package.json index e965d443574..365677871a3 100644 --- a/packages/experimental/Stack/package.json +++ b/packages/experimental/Stack/package.json @@ -28,7 +28,7 @@ "depcheck": "fluentui-scripts depcheck", "lint": "fluentui-scripts eslint", "lint-package": "fluentui-scripts lint-package", - "prettier": "fluentui-scripts prettier", + "format": "fluentui-scripts format", "test": "fluentui-scripts jest", "update-snapshots": "fluentui-scripts jest -u" }, diff --git a/packages/experimental/Tooltip/package.json b/packages/experimental/Tooltip/package.json index 258d97cf47f..d47b6317f30 100644 --- a/packages/experimental/Tooltip/package.json +++ b/packages/experimental/Tooltip/package.json @@ -27,7 +27,7 @@ "depcheck": "fluentui-scripts depcheck", "lint": "fluentui-scripts eslint", "lint-package": "fluentui-scripts lint-package", - "prettier": "fluentui-scripts prettier", + "format": "fluentui-scripts format", "test": "fluentui-scripts jest", "update-snapshots": "fluentui-scripts jest -u" }, diff --git a/packages/experimental/VibrancyView/package.json b/packages/experimental/VibrancyView/package.json index 31e191aba76..63694ca651c 100644 --- a/packages/experimental/VibrancyView/package.json +++ b/packages/experimental/VibrancyView/package.json @@ -28,7 +28,7 @@ "depcheck": "fluentui-scripts depcheck", "lint": "fluentui-scripts eslint", "lint-package": "fluentui-scripts lint-package", - "prettier": "fluentui-scripts prettier", + "format": "fluentui-scripts format", "test": "fluentui-scripts jest", "update-snapshots": "fluentui-scripts jest -u" }, diff --git a/packages/framework-base/package.json b/packages/framework-base/package.json index 176e5c34a1d..238998e0e4e 100644 --- a/packages/framework-base/package.json +++ b/packages/framework-base/package.json @@ -33,7 +33,7 @@ "depcheck": "fluentui-scripts depcheck", "lint": "fluentui-scripts eslint", "lint-package": "fluentui-scripts lint-package", - "prettier": "fluentui-scripts prettier", + "format": "fluentui-scripts format", "start": "fluentui-scripts dev", "start-test": "fluentui-scripts jest-watch", "test": "fluentui-scripts jest", diff --git a/packages/framework/composition/package.json b/packages/framework/composition/package.json index a64d59c0402..70552dd7268 100644 --- a/packages/framework/composition/package.json +++ b/packages/framework/composition/package.json @@ -28,7 +28,7 @@ "depcheck": "fluentui-scripts depcheck", "lint": "fluentui-scripts eslint", "lint-package": "fluentui-scripts lint-package", - "prettier": "fluentui-scripts prettier", + "format": "fluentui-scripts format", "start": "fluentui-scripts dev", "start-test": "fluentui-scripts jest-watch", "test": "fluentui-scripts jest", diff --git a/packages/framework/framework/package.json b/packages/framework/framework/package.json index 2aa40a54451..93e73ecf4bc 100644 --- a/packages/framework/framework/package.json +++ b/packages/framework/framework/package.json @@ -27,7 +27,7 @@ "depcheck": "fluentui-scripts depcheck", "lint": "fluentui-scripts eslint", "lint-package": "fluentui-scripts lint-package", - "prettier": "fluentui-scripts prettier", + "format": "fluentui-scripts format", "start-test": "fluentui-scripts jest-watch", "start:tester": "rnx-cli start", "test": "fluentui-scripts jest", diff --git a/packages/framework/immutable-merge/package.json b/packages/framework/immutable-merge/package.json index 9be1ae12677..0e698af33fb 100644 --- a/packages/framework/immutable-merge/package.json +++ b/packages/framework/immutable-merge/package.json @@ -28,7 +28,7 @@ "depcheck": "fluentui-scripts depcheck", "lint": "fluentui-scripts eslint", "lint-package": "fluentui-scripts lint-package", - "prettier": "fluentui-scripts prettier" + "format": "fluentui-scripts format" }, "dependencies": { "@fluentui-react-native/framework-base": "workspace:*" diff --git a/packages/framework/memo-cache/package.json b/packages/framework/memo-cache/package.json index 2c8e0a785c5..56e8067a76d 100644 --- a/packages/framework/memo-cache/package.json +++ b/packages/framework/memo-cache/package.json @@ -28,7 +28,7 @@ "depcheck": "fluentui-scripts depcheck", "lint": "fluentui-scripts eslint", "lint-package": "fluentui-scripts lint-package", - "prettier": "fluentui-scripts prettier" + "format": "fluentui-scripts format" }, "dependencies": { "@fluentui-react-native/framework-base": "workspace:*" diff --git a/packages/framework/merge-props/package.json b/packages/framework/merge-props/package.json index 0ce78402257..041f3bc5735 100644 --- a/packages/framework/merge-props/package.json +++ b/packages/framework/merge-props/package.json @@ -28,7 +28,7 @@ "depcheck": "fluentui-scripts depcheck", "lint": "fluentui-scripts eslint", "lint-package": "fluentui-scripts lint-package", - "prettier": "fluentui-scripts prettier" + "format": "fluentui-scripts format" }, "dependencies": { "@fluentui-react-native/framework-base": "workspace:*" diff --git a/packages/framework/theme/package.json b/packages/framework/theme/package.json index 2ce459c6ff7..2927e9ed26b 100644 --- a/packages/framework/theme/package.json +++ b/packages/framework/theme/package.json @@ -28,7 +28,7 @@ "depcheck": "fluentui-scripts depcheck", "lint": "fluentui-scripts eslint", "lint-package": "fluentui-scripts lint-package", - "prettier": "fluentui-scripts prettier", + "format": "fluentui-scripts format", "start": "fluentui-scripts dev", "start-test": "fluentui-scripts jest-watch", "test": "fluentui-scripts jest", diff --git a/packages/framework/themed-stylesheet/package.json b/packages/framework/themed-stylesheet/package.json index cd5d2fdc823..20a11cf45c8 100644 --- a/packages/framework/themed-stylesheet/package.json +++ b/packages/framework/themed-stylesheet/package.json @@ -28,7 +28,7 @@ "depcheck": "fluentui-scripts depcheck", "lint": "fluentui-scripts eslint", "lint-package": "fluentui-scripts lint-package", - "prettier": "fluentui-scripts prettier", + "format": "fluentui-scripts format", "start": "fluentui-scripts dev", "start-test": "fluentui-scripts jest-watch", "test": "fluentui-scripts jest", diff --git a/packages/framework/use-slot/package.json b/packages/framework/use-slot/package.json index 36f8e638fa9..600403382c7 100644 --- a/packages/framework/use-slot/package.json +++ b/packages/framework/use-slot/package.json @@ -28,7 +28,7 @@ "depcheck": "fluentui-scripts depcheck", "lint": "fluentui-scripts eslint", "lint-package": "fluentui-scripts lint-package", - "prettier": "fluentui-scripts prettier", + "format": "fluentui-scripts format", "start": "fluentui-scripts dev", "start-test": "fluentui-scripts jest-watch", "test": "fluentui-scripts jest", diff --git a/packages/framework/use-slots/package.json b/packages/framework/use-slots/package.json index 1eede162b52..98488b1a5c9 100644 --- a/packages/framework/use-slots/package.json +++ b/packages/framework/use-slots/package.json @@ -28,7 +28,7 @@ "depcheck": "fluentui-scripts depcheck", "lint": "fluentui-scripts eslint", "lint-package": "fluentui-scripts lint-package", - "prettier": "fluentui-scripts prettier", + "format": "fluentui-scripts format", "start": "fluentui-scripts dev", "start-test": "fluentui-scripts jest-watch", "test": "fluentui-scripts jest", diff --git a/packages/framework/use-styling/package.json b/packages/framework/use-styling/package.json index 0015e262727..c88e190319c 100644 --- a/packages/framework/use-styling/package.json +++ b/packages/framework/use-styling/package.json @@ -28,7 +28,7 @@ "depcheck": "fluentui-scripts depcheck", "lint": "fluentui-scripts eslint", "lint-package": "fluentui-scripts lint-package", - "prettier": "fluentui-scripts prettier", + "format": "fluentui-scripts format", "start": "fluentui-scripts dev", "start-test": "fluentui-scripts jest-watch", "test": "fluentui-scripts jest", diff --git a/packages/framework/use-tokens/package.json b/packages/framework/use-tokens/package.json index 28477c75d2b..c244dc59704 100644 --- a/packages/framework/use-tokens/package.json +++ b/packages/framework/use-tokens/package.json @@ -28,7 +28,7 @@ "depcheck": "fluentui-scripts depcheck", "lint": "fluentui-scripts eslint", "lint-package": "fluentui-scripts lint-package", - "prettier": "fluentui-scripts prettier", + "format": "fluentui-scripts format", "start": "fluentui-scripts dev", "start-test": "fluentui-scripts jest-watch", "test": "fluentui-scripts jest", diff --git a/packages/libraries/core/package.json b/packages/libraries/core/package.json index f13db99754a..03a443617ea 100644 --- a/packages/libraries/core/package.json +++ b/packages/libraries/core/package.json @@ -27,7 +27,7 @@ "depcheck": "fluentui-scripts depcheck", "lint": "fluentui-scripts eslint", "lint-package": "fluentui-scripts lint-package", - "prettier": "fluentui-scripts prettier", + "format": "fluentui-scripts format", "start-test": "fluentui-scripts jest-watch", "start:tester": "rnx-cli start", "test": "fluentui-scripts jest", diff --git a/packages/theming/android-theme/package.json b/packages/theming/android-theme/package.json index 8538dc2373c..be329fd1eba 100644 --- a/packages/theming/android-theme/package.json +++ b/packages/theming/android-theme/package.json @@ -28,7 +28,7 @@ "depcheck": "fluentui-scripts depcheck", "lint": "fluentui-scripts eslint", "lint-package": "fluentui-scripts lint-package", - "prettier": "fluentui-scripts prettier", + "format": "fluentui-scripts format", "start": "fluentui-scripts dev", "start-test": "fluentui-scripts jest-watch", "test": "fluentui-scripts jest", diff --git a/packages/theming/apple-theme/package.json b/packages/theming/apple-theme/package.json index a58b53d115c..4e23035d19e 100644 --- a/packages/theming/apple-theme/package.json +++ b/packages/theming/apple-theme/package.json @@ -28,7 +28,7 @@ "depcheck": "fluentui-scripts depcheck", "lint": "fluentui-scripts eslint", "lint-package": "fluentui-scripts lint-package", - "prettier": "fluentui-scripts prettier", + "format": "fluentui-scripts format", "start": "fluentui-scripts dev", "start-test": "fluentui-scripts jest-watch", "test": "fluentui-scripts jest", diff --git a/packages/theming/default-theme/package.json b/packages/theming/default-theme/package.json index a0cb372d85d..6ae431cb746 100644 --- a/packages/theming/default-theme/package.json +++ b/packages/theming/default-theme/package.json @@ -28,7 +28,7 @@ "depcheck": "fluentui-scripts depcheck", "lint": "fluentui-scripts eslint", "lint-package": "fluentui-scripts lint-package", - "prettier": "fluentui-scripts prettier", + "format": "fluentui-scripts format", "start": "fluentui-scripts dev", "start-test": "fluentui-scripts jest-watch", "test": "fluentui-scripts jest", diff --git a/packages/theming/theme-tokens/package.json b/packages/theming/theme-tokens/package.json index bc2cd1270e2..84c2b9924fd 100644 --- a/packages/theming/theme-tokens/package.json +++ b/packages/theming/theme-tokens/package.json @@ -28,7 +28,7 @@ "depcheck": "fluentui-scripts depcheck", "lint": "fluentui-scripts eslint", "lint-package": "fluentui-scripts lint-package", - "prettier": "fluentui-scripts prettier", + "format": "fluentui-scripts format", "start": "fluentui-scripts dev", "start-test": "fluentui-scripts jest-watch", "test": "fluentui-scripts jest", diff --git a/packages/theming/theme-types/package.json b/packages/theming/theme-types/package.json index f75e53ca939..61891203b10 100644 --- a/packages/theming/theme-types/package.json +++ b/packages/theming/theme-types/package.json @@ -28,7 +28,7 @@ "depcheck": "fluentui-scripts depcheck", "lint": "fluentui-scripts eslint", "lint-package": "fluentui-scripts lint-package", - "prettier": "fluentui-scripts prettier", + "format": "fluentui-scripts format", "start": "fluentui-scripts dev", "start-test": "fluentui-scripts jest-watch", "test": "fluentui-scripts jest", diff --git a/packages/theming/theming-utils/package.json b/packages/theming/theming-utils/package.json index ea029d62784..2e570e0d7a1 100644 --- a/packages/theming/theming-utils/package.json +++ b/packages/theming/theming-utils/package.json @@ -27,7 +27,7 @@ "depcheck": "fluentui-scripts depcheck", "lint": "fluentui-scripts eslint", "lint-package": "fluentui-scripts lint-package", - "prettier": "fluentui-scripts prettier", + "format": "fluentui-scripts format", "test": "fluentui-scripts jest", "update-snapshots": "fluentui-scripts jest -u" }, diff --git a/packages/theming/win32-theme/package.json b/packages/theming/win32-theme/package.json index 5dfb7aa2c90..60606aadf22 100644 --- a/packages/theming/win32-theme/package.json +++ b/packages/theming/win32-theme/package.json @@ -28,7 +28,7 @@ "depcheck": "fluentui-scripts depcheck", "lint": "fluentui-scripts eslint", "lint-package": "fluentui-scripts lint-package", - "prettier": "fluentui-scripts prettier", + "format": "fluentui-scripts format", "start": "fluentui-scripts dev", "start-test": "fluentui-scripts jest-watch", "test": "fluentui-scripts jest", diff --git a/packages/utils/adapters/package.json b/packages/utils/adapters/package.json index 5d458d73c5c..3f09d952d3b 100644 --- a/packages/utils/adapters/package.json +++ b/packages/utils/adapters/package.json @@ -27,7 +27,7 @@ "depcheck": "fluentui-scripts depcheck", "lint": "fluentui-scripts eslint", "lint-package": "fluentui-scripts lint-package", - "prettier": "fluentui-scripts prettier", + "format": "fluentui-scripts format", "test": "fluentui-scripts jest", "update-snapshots": "fluentui-scripts jest -u" }, diff --git a/packages/utils/interactive-hooks/package.json b/packages/utils/interactive-hooks/package.json index 16f5d405a58..3fe8d8f56e9 100644 --- a/packages/utils/interactive-hooks/package.json +++ b/packages/utils/interactive-hooks/package.json @@ -27,7 +27,7 @@ "depcheck": "fluentui-scripts depcheck", "lint": "fluentui-scripts eslint", "lint-package": "fluentui-scripts lint-package", - "prettier": "fluentui-scripts prettier", + "format": "fluentui-scripts format", "test": "fluentui-scripts jest", "update-snapshots": "fluentui-scripts jest -u" }, diff --git a/packages/utils/styling/package.json b/packages/utils/styling/package.json index e4895603fe9..df0d4e04d68 100644 --- a/packages/utils/styling/package.json +++ b/packages/utils/styling/package.json @@ -27,7 +27,7 @@ "depcheck": "fluentui-scripts depcheck", "lint": "fluentui-scripts eslint", "lint-package": "fluentui-scripts lint-package", - "prettier": "fluentui-scripts prettier", + "format": "fluentui-scripts format", "test": "fluentui-scripts jest", "update-snapshots": "fluentui-scripts jest -u" }, diff --git a/packages/utils/test-tools/package.json b/packages/utils/test-tools/package.json index d07e435844c..3bd6bc851a3 100644 --- a/packages/utils/test-tools/package.json +++ b/packages/utils/test-tools/package.json @@ -28,7 +28,7 @@ "depcheck": "fluentui-scripts depcheck", "lint": "fluentui-scripts eslint", "lint-package": "fluentui-scripts lint-package", - "prettier": "fluentui-scripts prettier", + "format": "fluentui-scripts format", "update-snapshots": "fluentui-scripts jest -u" }, "dependencies": { diff --git a/packages/utils/tokens/package.json b/packages/utils/tokens/package.json index b6746d5e6d7..2307852f2bd 100644 --- a/packages/utils/tokens/package.json +++ b/packages/utils/tokens/package.json @@ -27,7 +27,7 @@ "depcheck": "fluentui-scripts depcheck", "lint": "fluentui-scripts eslint", "lint-package": "fluentui-scripts lint-package", - "prettier": "fluentui-scripts prettier", + "format": "fluentui-scripts format", "test": "fluentui-scripts jest", "update-snapshots": "fluentui-scripts jest -u" }, From a9505bb1260b52b733d4a0b64c83558cac3f3c43 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Tue, 24 Feb 2026 08:20:39 -0800 Subject: [PATCH 3/5] `yarn format:fix` --- .../Avatar/src/AvatarTokens.mobile.ts | 2 +- .../components/Avatar/src/AvatarTokens.ts | 2 +- .../Avatar/src/AvatarTokens.win32.ts | 2 +- .../components/Badge/src/Badge.styling.ts | 16 ++++++------ .../components/Badge/src/BadgeColorTokens.ts | 2 +- .../Badge/src/BadgeColorTokens.win32.ts | 2 +- .../components/Badge/src/BadgeFontTokens.ts | 2 +- .../Badge/src/BadgeFontTokens.win32.ts | 2 +- packages/components/Badge/src/BadgeTokens.ts | 2 +- .../CounterBadgeColorTokens.android.ts | 2 +- .../CounterBadge/CounterBadgeColorTokens.ts | 2 +- .../src/CounterBadge/CounterBadgeTokens.ts | 2 +- .../PresenceBadgeTokens.macos.ts | 2 +- .../PresenceBadgeTokens.mobile.ts | 2 +- .../src/PresenceBadge/PresenceBadgeTokens.ts | 2 +- .../PresenceBadgeTokens.win32.ts | 2 +- .../Button/src/ButtonColorTokens.android.ts | 2 +- .../Button/src/ButtonColorTokens.macos.ts | 2 +- .../Button/src/ButtonColorTokens.ts | 2 +- .../Button/src/ButtonFontTokens.android.ts | 2 +- .../Button/src/ButtonFontTokens.ios.ts | 2 +- .../Button/src/ButtonFontTokens.macos.ts | 2 +- .../components/Button/src/ButtonFontTokens.ts | 2 +- .../Button/src/ButtonFontTokens.win32.ts | 2 +- .../Button/src/ButtonTokens.android.ts | 2 +- .../components/Button/src/ButtonTokens.ios.ts | 2 +- .../components/Button/src/ButtonTokens.ts | 2 +- .../Button/src/ButtonTokens.win32.ts | 2 +- .../Button/src/FAB/FABTokens.ios.ts | 2 +- .../components/Button/src/FAB/FABTokens.ts | 2 +- .../Checkbox/src/CheckboxTokens.android.ts | 2 +- .../Checkbox/src/CheckboxTokens.ios.ts | 2 +- .../components/Checkbox/src/CheckboxTokens.ts | 2 +- .../Checkbox/src/CheckboxTokens.win32.ts | 2 +- .../Checkbox/src/CheckboxTokens.windows.ts | 2 +- packages/components/Chip/src/Chip.styling.ts | 8 +++--- .../components/Chip/src/ChipColorTokens.ts | 2 +- .../components/Chip/src/ChipFontTokens.ts | 2 +- packages/components/Chip/src/ChipTokens.ts | 2 +- .../components/Input/src/InputTokens.ios.ts | 2 +- packages/components/Input/src/InputTokens.ts | 2 +- .../components/Link/src/LinkTokens.android.ts | 2 +- .../components/Link/src/LinkTokens.ios.ts | 2 +- packages/components/Link/src/LinkTokens.ts | 2 +- .../Menu/src/MenuCallout/MenuCallout.types.ts | 25 +++++++++---------- .../MenuItemCheckbox.types.ts | 6 +++-- .../src/MenuItemRadio/MenuItemRadio.types.ts | 6 +++-- .../Menu/src/MenuPopover/MenuPopover.types.ts | 25 +++++++++---------- .../MenuPopover/MenuPopoverTokens.macos.ts | 4 +-- .../Menu/src/MenuPopover/useMenuPopover.ts | 2 +- .../src/NotificationTokens.ios.ts | 2 +- .../Notification/src/NotificationTokens.ts | 2 +- .../src/Radio/RadioTokens.android.ts | 2 +- .../RadioGroup/src/Radio/RadioTokens.ios.ts | 2 +- .../RadioGroup/src/Radio/RadioTokens.ts | 2 +- .../RadioGroup/src/Radio/RadioTokens.win32.ts | 2 +- .../src/RadioGroup/RadioGroupTokens.mobile.ts | 2 +- .../src/RadioGroup/RadioGroupTokens.ts | 2 +- .../Separator/src/SeparatorTokens.android.tsx | 2 +- .../Separator/src/SeparatorTokens.tsx | 2 +- .../TabList/src/Tab/TabColorTokens.ts | 2 +- .../TabList/src/Tab/TabColorTokens.win32.ts | 2 +- .../TabList/src/TabList/TabListTokens.ts | 2 +- packages/components/Text/src/Text.tsx | 12 ++++----- .../experimental/Drawer/src/DrawerTokens.ts | 2 +- packages/experimental/Shimmer/src/Shimmer.tsx | 2 +- .../Shimmer/src/ShimmerTokens.android.ts | 2 +- .../Shimmer/src/ShimmerTokens.ios.ts | 2 +- .../experimental/Shimmer/src/ShimmerTokens.ts | 2 +- .../Shimmer/src/ShimmerTokens.win32.ts | 2 +- .../Spinner/src/SpinnerTokens.android.ts | 2 +- .../experimental/Spinner/src/SpinnerTokens.ts | 2 +- .../Spinner/src/SpinnerTokens.win32.ts | 2 +- .../src/immutable-merge/Merge.ts | 4 +-- .../composition/src/composeFactory.ts | 2 +- .../framework/use-styling/src/buildProps.ts | 4 +-- 76 files changed, 122 insertions(+), 120 deletions(-) diff --git a/packages/components/Avatar/src/AvatarTokens.mobile.ts b/packages/components/Avatar/src/AvatarTokens.mobile.ts index de208618ca8..bfe98ada7f6 100644 --- a/packages/components/Avatar/src/AvatarTokens.mobile.ts +++ b/packages/components/Avatar/src/AvatarTokens.mobile.ts @@ -160,7 +160,7 @@ export const defaultAvatarTokens: TokenSettings = (t: Theme mink: getColorProps('mink', t), platinum: getColorProps('platinum', t), anchor: getColorProps('anchor', t), - } as AvatarTokens); + }) as AvatarTokens; /** * A function which returns object of props depending on color and theme. diff --git a/packages/components/Avatar/src/AvatarTokens.ts b/packages/components/Avatar/src/AvatarTokens.ts index f304c4d386c..84cf0844ad1 100644 --- a/packages/components/Avatar/src/AvatarTokens.ts +++ b/packages/components/Avatar/src/AvatarTokens.ts @@ -167,7 +167,7 @@ export const defaultAvatarTokens: TokenSettings = (t: Theme burgundy: getColorProps('burgundy', t), hotPink: getColorProps('hotPink', t), orchid: getColorProps('orchid', t), - } as AvatarTokens); + }) as AvatarTokens; /** * A function which returns object of props depending on color and theme. diff --git a/packages/components/Avatar/src/AvatarTokens.win32.ts b/packages/components/Avatar/src/AvatarTokens.win32.ts index a507b9486a6..a8fabe96ab1 100644 --- a/packages/components/Avatar/src/AvatarTokens.win32.ts +++ b/packages/components/Avatar/src/AvatarTokens.win32.ts @@ -167,7 +167,7 @@ export const defaultAvatarTokens: TokenSettings = (t: Theme burgundy: getColorProps('burgundy', t), hotPink: getColorProps('hotPink', t), orchid: getColorProps('orchid', t), - } as AvatarTokens); + }) as AvatarTokens; /** * A function which returns object of props depending on color and theme. diff --git a/packages/components/Badge/src/Badge.styling.ts b/packages/components/Badge/src/Badge.styling.ts index 8e17bffa51a..02bccaa6da3 100644 --- a/packages/components/Badge/src/Badge.styling.ts +++ b/packages/components/Badge/src/Badge.styling.ts @@ -87,20 +87,20 @@ export function getBadgePosition(tokens: BadgeCoreTokens) { top: tokens.top, } : tokens.bottom !== undefined - ? { - bottom: tokens.bottom, - } - : {}; + ? { + bottom: tokens.bottom, + } + : {}; const horizontalPosition = tokens.left !== undefined ? { left: tokens.left, } : tokens.right !== undefined - ? { - right: tokens.right, - } - : {}; + ? { + right: tokens.right, + } + : {}; return { ...verticalPosition, diff --git a/packages/components/Badge/src/BadgeColorTokens.ts b/packages/components/Badge/src/BadgeColorTokens.ts index 0001d39a8de..a04147d89c9 100644 --- a/packages/components/Badge/src/BadgeColorTokens.ts +++ b/packages/components/Badge/src/BadgeColorTokens.ts @@ -294,4 +294,4 @@ export const defaultBadgeColorTokens: TokenSettings = (t: Theme) => ), }, }, - } as BadgeTokens); + }) as BadgeTokens; diff --git a/packages/components/Badge/src/BadgeColorTokens.win32.ts b/packages/components/Badge/src/BadgeColorTokens.win32.ts index a0e9805dfa2..109c5619174 100644 --- a/packages/components/Badge/src/BadgeColorTokens.win32.ts +++ b/packages/components/Badge/src/BadgeColorTokens.win32.ts @@ -326,4 +326,4 @@ export const defaultBadgeColorTokens: TokenSettings = (t: Theme) => ), }, }, - } as BadgeTokens); + }) as BadgeTokens; diff --git a/packages/components/Badge/src/BadgeFontTokens.ts b/packages/components/Badge/src/BadgeFontTokens.ts index 7a302ee16e5..dd6f2c95d96 100644 --- a/packages/components/Badge/src/BadgeFontTokens.ts +++ b/packages/components/Badge/src/BadgeFontTokens.ts @@ -12,4 +12,4 @@ export const badgeFontTokens: TokenSettings = () => extraLarge: { variant: 'secondaryStandard', }, - } as BadgeTokens); + }) as BadgeTokens; diff --git a/packages/components/Badge/src/BadgeFontTokens.win32.ts b/packages/components/Badge/src/BadgeFontTokens.win32.ts index 867d285b923..c51a6bcffbd 100644 --- a/packages/components/Badge/src/BadgeFontTokens.win32.ts +++ b/packages/components/Badge/src/BadgeFontTokens.win32.ts @@ -15,4 +15,4 @@ export const badgeFontTokens: TokenSettings = (t: Theme) => extraLarge: { fontSize: globalTokens.font.size200, }, - } as BadgeTokens); + }) as BadgeTokens; diff --git a/packages/components/Badge/src/BadgeTokens.ts b/packages/components/Badge/src/BadgeTokens.ts index 43ca03c0785..4feb959b01c 100644 --- a/packages/components/Badge/src/BadgeTokens.ts +++ b/packages/components/Badge/src/BadgeTokens.ts @@ -72,4 +72,4 @@ export const defaultBadgeTokens: TokenSettings = () => left: globalTokens.sizeNone, right: undefined, }, - } as BadgeTokens); + }) as BadgeTokens; diff --git a/packages/components/Badge/src/CounterBadge/CounterBadgeColorTokens.android.ts b/packages/components/Badge/src/CounterBadge/CounterBadgeColorTokens.android.ts index 7f6836927bc..ab84d64249d 100644 --- a/packages/components/Badge/src/CounterBadge/CounterBadgeColorTokens.android.ts +++ b/packages/components/Badge/src/CounterBadge/CounterBadgeColorTokens.android.ts @@ -17,4 +17,4 @@ export const defaultCounterBadgeColorTokens: TokenSettings = color: t.colors.neutralForegroundLightStatic, borderColor: t.colors.strokeFocus1, }, - } as CounterBadgeTokens); + }) as CounterBadgeTokens; diff --git a/packages/components/Badge/src/CounterBadge/CounterBadgeColorTokens.ts b/packages/components/Badge/src/CounterBadge/CounterBadgeColorTokens.ts index a12bd9a7602..7c1b7d4f23d 100644 --- a/packages/components/Badge/src/CounterBadge/CounterBadgeColorTokens.ts +++ b/packages/components/Badge/src/CounterBadge/CounterBadgeColorTokens.ts @@ -5,4 +5,4 @@ import type { CounterBadgeTokens } from './CounterBadge.types'; export const defaultCounterBadgeColorTokens: TokenSettings = () => ({ // Android has separate tokens for CounterBadge, other platforms use Badge tokens. - } as CounterBadgeTokens); + }) as CounterBadgeTokens; diff --git a/packages/components/Badge/src/CounterBadge/CounterBadgeTokens.ts b/packages/components/Badge/src/CounterBadge/CounterBadgeTokens.ts index 61df849acc2..699f55f2934 100644 --- a/packages/components/Badge/src/CounterBadge/CounterBadgeTokens.ts +++ b/packages/components/Badge/src/CounterBadge/CounterBadgeTokens.ts @@ -13,4 +13,4 @@ export const counterBadgeTokens: TokenSettings = () => borderWidth: 0, borderRadius: globalTokens.corner.radiusCircular, }, - } as CounterBadgeTokens); + }) as CounterBadgeTokens; diff --git a/packages/components/Badge/src/PresenceBadge/PresenceBadgeTokens.macos.ts b/packages/components/Badge/src/PresenceBadge/PresenceBadgeTokens.macos.ts index 951aad60e09..808be585acc 100644 --- a/packages/components/Badge/src/PresenceBadge/PresenceBadgeTokens.macos.ts +++ b/packages/components/Badge/src/PresenceBadge/PresenceBadgeTokens.macos.ts @@ -51,7 +51,7 @@ export const defaultPresenceBadgeTokens: TokenSettings = () iconColor: globalTokens.color.grey38, }, outOfOffice: getBadgeColor('berry'), - } as PresenceBadgeTokens); + }) as PresenceBadgeTokens; function getBadgeColor(color: string) { return { diff --git a/packages/components/Badge/src/PresenceBadge/PresenceBadgeTokens.mobile.ts b/packages/components/Badge/src/PresenceBadge/PresenceBadgeTokens.mobile.ts index e22891eb5f3..0d3f7c7ad24 100644 --- a/packages/components/Badge/src/PresenceBadge/PresenceBadgeTokens.mobile.ts +++ b/packages/components/Badge/src/PresenceBadge/PresenceBadgeTokens.mobile.ts @@ -77,4 +77,4 @@ export const defaultPresenceBadgeTokens: TokenSettings = (t iconColor: t.colors.neutralForeground3, }, }, - } as PresenceBadgeTokens); + }) as PresenceBadgeTokens; diff --git a/packages/components/Badge/src/PresenceBadge/PresenceBadgeTokens.ts b/packages/components/Badge/src/PresenceBadge/PresenceBadgeTokens.ts index fae8332d612..3feff506380 100644 --- a/packages/components/Badge/src/PresenceBadge/PresenceBadgeTokens.ts +++ b/packages/components/Badge/src/PresenceBadge/PresenceBadgeTokens.ts @@ -58,7 +58,7 @@ export const defaultPresenceBadgeTokens: TokenSettings = (t iconColor: isHighContrast(t) ? t.colors.neutralForeground3 : globalTokens.color.grey38, }, outOfOffice: getBadgeColor('berry', t), - } as PresenceBadgeTokens); + }) as PresenceBadgeTokens; function getBadgeColor(color: string, t: Theme) { return { diff --git a/packages/components/Badge/src/PresenceBadge/PresenceBadgeTokens.win32.ts b/packages/components/Badge/src/PresenceBadge/PresenceBadgeTokens.win32.ts index 7044e4dae86..c4fdc4d2402 100644 --- a/packages/components/Badge/src/PresenceBadge/PresenceBadgeTokens.win32.ts +++ b/packages/components/Badge/src/PresenceBadge/PresenceBadgeTokens.win32.ts @@ -59,7 +59,7 @@ export const defaultPresenceBadgeTokens: TokenSettings = (t iconColor: isHighContrast(t) ? t.colors.neutralForeground3 : globalTokens.color.grey38, }, outOfOffice: getBadgeColor('berry', t), - } as PresenceBadgeTokens); + }) as PresenceBadgeTokens; function getBadgeColor(color: string, t: Theme) { return { diff --git a/packages/components/Button/src/ButtonColorTokens.android.ts b/packages/components/Button/src/ButtonColorTokens.android.ts index 077f8f97bbb..29b6c31073b 100644 --- a/packages/components/Button/src/ButtonColorTokens.android.ts +++ b/packages/components/Button/src/ButtonColorTokens.android.ts @@ -78,4 +78,4 @@ export const defaultButtonColorTokens: TokenSettings = (t: iconColor: t.colors.brandForeground1, }, }, - } as ButtonTokens); + }) as ButtonTokens; diff --git a/packages/components/Button/src/ButtonColorTokens.macos.ts b/packages/components/Button/src/ButtonColorTokens.macos.ts index 9e5d3e069f3..40d78251379 100644 --- a/packages/components/Button/src/ButtonColorTokens.macos.ts +++ b/packages/components/Button/src/ButtonColorTokens.macos.ts @@ -107,4 +107,4 @@ export const defaultButtonColorTokens: TokenSettings = (t: iconColor: t.colors.brandForeground1, }, }, - } as ButtonTokens); + }) as ButtonTokens; diff --git a/packages/components/Button/src/ButtonColorTokens.ts b/packages/components/Button/src/ButtonColorTokens.ts index b2a6f4461ad..76a767f07eb 100644 --- a/packages/components/Button/src/ButtonColorTokens.ts +++ b/packages/components/Button/src/ButtonColorTokens.ts @@ -85,4 +85,4 @@ export const defaultButtonColorTokens: TokenSettings = (t: icon: t.colors.ghostFocusedIcon, }, }, - } as ButtonTokens); + }) as ButtonTokens; diff --git a/packages/components/Button/src/ButtonFontTokens.android.ts b/packages/components/Button/src/ButtonFontTokens.android.ts index fa93871e5fd..90372d999f2 100644 --- a/packages/components/Button/src/ButtonFontTokens.android.ts +++ b/packages/components/Button/src/ButtonFontTokens.android.ts @@ -20,4 +20,4 @@ export const defaultButtonFontTokens: TokenSettings = (t: T fontFamily: t.typography.variants.body1Strong.face, fontWeight: t.typography.variants.body1Strong.weight, }, - } as ButtonTokens); + }) as ButtonTokens; diff --git a/packages/components/Button/src/ButtonFontTokens.ios.ts b/packages/components/Button/src/ButtonFontTokens.ios.ts index 664da18b12b..5999d4a6b8f 100644 --- a/packages/components/Button/src/ButtonFontTokens.ios.ts +++ b/packages/components/Button/src/ButtonFontTokens.ios.ts @@ -20,4 +20,4 @@ export const defaultButtonFontTokens: TokenSettings = (t: T fontFamily: t.typography.variants.body1Strong.face, fontWeight: t.typography.variants.body1Strong.weight, }, - } as ButtonTokens); + }) as ButtonTokens; diff --git a/packages/components/Button/src/ButtonFontTokens.macos.ts b/packages/components/Button/src/ButtonFontTokens.macos.ts index 47bcb998597..0fc77642bc1 100644 --- a/packages/components/Button/src/ButtonFontTokens.macos.ts +++ b/packages/components/Button/src/ButtonFontTokens.macos.ts @@ -18,4 +18,4 @@ export const defaultButtonFontTokens: TokenSettings = (_t: large: { variant: 'subheaderSemibold', }, - } as ButtonTokens); + }) as ButtonTokens; diff --git a/packages/components/Button/src/ButtonFontTokens.ts b/packages/components/Button/src/ButtonFontTokens.ts index 2208b003ce8..2a3bf9fafa0 100644 --- a/packages/components/Button/src/ButtonFontTokens.ts +++ b/packages/components/Button/src/ButtonFontTokens.ts @@ -18,4 +18,4 @@ export const defaultButtonFontTokens: TokenSettings = (_t: large: { variant: 'subheaderSemibold', }, - } as ButtonTokens); + }) as ButtonTokens; diff --git a/packages/components/Button/src/ButtonFontTokens.win32.ts b/packages/components/Button/src/ButtonFontTokens.win32.ts index 0d89579b409..ec52cc7d26f 100644 --- a/packages/components/Button/src/ButtonFontTokens.win32.ts +++ b/packages/components/Button/src/ButtonFontTokens.win32.ts @@ -27,4 +27,4 @@ export const defaultButtonFontTokens: TokenSettings = (t: T fontWeight: globalTokens.font.weight.semibold, }, }, - } as ButtonTokens); + }) as ButtonTokens; diff --git a/packages/components/Button/src/ButtonTokens.android.ts b/packages/components/Button/src/ButtonTokens.android.ts index d8cc0666049..10173fee336 100644 --- a/packages/components/Button/src/ButtonTokens.android.ts +++ b/packages/components/Button/src/ButtonTokens.android.ts @@ -80,4 +80,4 @@ export const defaultButtonTokens: TokenSettings = () => square: { borderRadius: globalTokens.corner.radiusNone, }, - } as ButtonTokens); + }) as ButtonTokens; diff --git a/packages/components/Button/src/ButtonTokens.ios.ts b/packages/components/Button/src/ButtonTokens.ios.ts index 60f50babd9d..552c14cc40a 100644 --- a/packages/components/Button/src/ButtonTokens.ios.ts +++ b/packages/components/Button/src/ButtonTokens.ios.ts @@ -73,4 +73,4 @@ export const defaultButtonTokens: TokenSettings = () => square: { borderRadius: globalTokens.corner.radiusNone, }, - } as ButtonTokens); + }) as ButtonTokens; diff --git a/packages/components/Button/src/ButtonTokens.ts b/packages/components/Button/src/ButtonTokens.ts index fe6b6e7d35f..cd195537855 100644 --- a/packages/components/Button/src/ButtonTokens.ts +++ b/packages/components/Button/src/ButtonTokens.ts @@ -85,4 +85,4 @@ export const defaultButtonTokens: TokenSettings = () => square: { borderRadius: globalTokens.corner.radiusNone, }, - } as ButtonTokens); + }) as ButtonTokens; diff --git a/packages/components/Button/src/ButtonTokens.win32.ts b/packages/components/Button/src/ButtonTokens.win32.ts index fcb96da30b7..546bbe3c1a6 100644 --- a/packages/components/Button/src/ButtonTokens.win32.ts +++ b/packages/components/Button/src/ButtonTokens.win32.ts @@ -163,4 +163,4 @@ export const defaultButtonTokens: TokenSettings = (theme: T borderRadius: globalTokens.corner.radiusNone, borderInnerRadius: globalTokens.corner.radiusNone, }, - } as ButtonTokens); + }) as ButtonTokens; diff --git a/packages/components/Button/src/FAB/FABTokens.ios.ts b/packages/components/Button/src/FAB/FABTokens.ios.ts index 20862dbcbe9..9d58d58e9fa 100644 --- a/packages/components/Button/src/FAB/FABTokens.ios.ts +++ b/packages/components/Button/src/FAB/FABTokens.ios.ts @@ -76,4 +76,4 @@ export const defaultFABTokens: TokenSettings = (t: Theme) => spacingIconContentBefore: globalTokens.size80, }, }, - } as FABTokens); + }) as FABTokens; diff --git a/packages/components/Button/src/FAB/FABTokens.ts b/packages/components/Button/src/FAB/FABTokens.ts index 3a00dbd75ca..828dd861ec4 100644 --- a/packages/components/Button/src/FAB/FABTokens.ts +++ b/packages/components/Button/src/FAB/FABTokens.ts @@ -76,4 +76,4 @@ export const defaultFABTokens: TokenSettings = (t: Theme) => spacingIconContentBefore: globalTokens.size80, }, }, - } as FABTokens); + }) as FABTokens; diff --git a/packages/components/Checkbox/src/CheckboxTokens.android.ts b/packages/components/Checkbox/src/CheckboxTokens.android.ts index c163a4d3a7f..bf43b768de6 100644 --- a/packages/components/Checkbox/src/CheckboxTokens.android.ts +++ b/packages/components/Checkbox/src/CheckboxTokens.android.ts @@ -45,4 +45,4 @@ export const defaultCheckboxTokens: TokenSettings = (t: T checkboxBackgroundColor: t.colors.brandBackgroundDisabled, }, }, - } as CheckboxTokens); + }) as CheckboxTokens; diff --git a/packages/components/Checkbox/src/CheckboxTokens.ios.ts b/packages/components/Checkbox/src/CheckboxTokens.ios.ts index deaa5d2b2f2..34b80cad8ad 100644 --- a/packages/components/Checkbox/src/CheckboxTokens.ios.ts +++ b/packages/components/Checkbox/src/CheckboxTokens.ios.ts @@ -42,4 +42,4 @@ export const defaultCheckboxTokens: TokenSettings = (t: T checkboxBackgroundColor: t.colors.brandBackgroundDisabled, }, }, - } as CheckboxTokens); + }) as CheckboxTokens; diff --git a/packages/components/Checkbox/src/CheckboxTokens.ts b/packages/components/Checkbox/src/CheckboxTokens.ts index bf5d3b96028..8567b178bc1 100644 --- a/packages/components/Checkbox/src/CheckboxTokens.ts +++ b/packages/components/Checkbox/src/CheckboxTokens.ts @@ -72,4 +72,4 @@ export const defaultCheckboxTokens: TokenSettings = (t: T borderRadius: globalTokens.corner.radiusCircular, checkboxBorderRadius: globalTokens.corner.radiusCircular, }, - } as CheckboxTokens); + }) as CheckboxTokens; diff --git a/packages/components/Checkbox/src/CheckboxTokens.win32.ts b/packages/components/Checkbox/src/CheckboxTokens.win32.ts index eef0d578712..6f31f426f28 100644 --- a/packages/components/Checkbox/src/CheckboxTokens.win32.ts +++ b/packages/components/Checkbox/src/CheckboxTokens.win32.ts @@ -95,4 +95,4 @@ export const defaultCheckboxTokens: TokenSettings = (t: T borderRadius: globalTokens.corner.radiusCircular, checkboxBorderRadius: globalTokens.corner.radiusCircular, }, - } as CheckboxTokens); + }) as CheckboxTokens; diff --git a/packages/components/Checkbox/src/CheckboxTokens.windows.ts b/packages/components/Checkbox/src/CheckboxTokens.windows.ts index 18ddf95d03a..93e72d3641b 100644 --- a/packages/components/Checkbox/src/CheckboxTokens.windows.ts +++ b/packages/components/Checkbox/src/CheckboxTokens.windows.ts @@ -90,4 +90,4 @@ export const defaultCheckboxTokens: TokenSettings = (t: T borderRadius: globalTokens.corner.radiusCircular, checkboxBorderRadius: globalTokens.corner.radiusCircular, }, - } as CheckboxTokens); + }) as CheckboxTokens; diff --git a/packages/components/Chip/src/Chip.styling.ts b/packages/components/Chip/src/Chip.styling.ts index 20c302bffcd..a8341244bfe 100644 --- a/packages/components/Chip/src/Chip.styling.ts +++ b/packages/components/Chip/src/Chip.styling.ts @@ -70,10 +70,10 @@ export function getChipPosition(tokens: ChipTokens) { left: tokens.left, } : tokens.right !== undefined - ? { - right: tokens.right, - } - : {}; + ? { + right: tokens.right, + } + : {}; return { ...verticalPosition, diff --git a/packages/components/Chip/src/ChipColorTokens.ts b/packages/components/Chip/src/ChipColorTokens.ts index 286bd1e73e1..9ec8afe7ff5 100644 --- a/packages/components/Chip/src/ChipColorTokens.ts +++ b/packages/components/Chip/src/ChipColorTokens.ts @@ -79,4 +79,4 @@ export const defaultChipColorTokens: TokenSettings = (t: Theme) => }, }, }, - } as ChipTokens); + }) as ChipTokens; diff --git a/packages/components/Chip/src/ChipFontTokens.ts b/packages/components/Chip/src/ChipFontTokens.ts index 1a2677dbc03..39ffe1b6284 100644 --- a/packages/components/Chip/src/ChipFontTokens.ts +++ b/packages/components/Chip/src/ChipFontTokens.ts @@ -12,4 +12,4 @@ export const chipFontTokens: TokenSettings = () => extraLarge: { variant: 'secondaryStandard', }, - } as ChipTokens); + }) as ChipTokens; diff --git a/packages/components/Chip/src/ChipTokens.ts b/packages/components/Chip/src/ChipTokens.ts index e40a0161f8a..52b14d9f83d 100644 --- a/packages/components/Chip/src/ChipTokens.ts +++ b/packages/components/Chip/src/ChipTokens.ts @@ -42,4 +42,4 @@ export const defaultChipTokens: TokenSettings = () => left: globalTokens.sizeNone, right: undefined, }, - } as ChipTokens); + }) as ChipTokens; diff --git a/packages/components/Input/src/InputTokens.ios.ts b/packages/components/Input/src/InputTokens.ios.ts index 4dfc1106a38..6c1369f5515 100644 --- a/packages/components/Input/src/InputTokens.ios.ts +++ b/packages/components/Input/src/InputTokens.ios.ts @@ -83,4 +83,4 @@ export const defaultInputTokens: TokenSettings = (t: Theme) accessoryTextColor: t.colors.neutralForeground2, cursorColor: t.colors.neutralForeground3, }, - } as InputTokens); + }) as InputTokens; diff --git a/packages/components/Input/src/InputTokens.ts b/packages/components/Input/src/InputTokens.ts index 64e320c00a4..315acc60d48 100644 --- a/packages/components/Input/src/InputTokens.ts +++ b/packages/components/Input/src/InputTokens.ts @@ -83,4 +83,4 @@ export const defaultInputTokens: TokenSettings = (t: Theme) accessoryTextColor: t.colors.neutralForeground2, cursorColor: t.colors.neutralForeground3, }, - } as InputTokens); + }) as InputTokens; diff --git a/packages/components/Link/src/LinkTokens.android.ts b/packages/components/Link/src/LinkTokens.android.ts index fd70f0b67d0..b0d892239a9 100644 --- a/packages/components/Link/src/LinkTokens.android.ts +++ b/packages/components/Link/src/LinkTokens.android.ts @@ -17,4 +17,4 @@ export const defaultLinkTokens: TokenSettings = (t: Theme) => pressed: { color: t.colors.brandForeground1Pressed, }, - } as LinkTokens); + }) as LinkTokens; diff --git a/packages/components/Link/src/LinkTokens.ios.ts b/packages/components/Link/src/LinkTokens.ios.ts index fd70f0b67d0..b0d892239a9 100644 --- a/packages/components/Link/src/LinkTokens.ios.ts +++ b/packages/components/Link/src/LinkTokens.ios.ts @@ -17,4 +17,4 @@ export const defaultLinkTokens: TokenSettings = (t: Theme) => pressed: { color: t.colors.brandForeground1Pressed, }, - } as LinkTokens); + }) as LinkTokens; diff --git a/packages/components/Link/src/LinkTokens.ts b/packages/components/Link/src/LinkTokens.ts index 6f5ff3c1567..1a070fb64c6 100644 --- a/packages/components/Link/src/LinkTokens.ts +++ b/packages/components/Link/src/LinkTokens.ts @@ -61,4 +61,4 @@ export const defaultLinkTokens: TokenSettings = (t: Theme) => borderColor: t.colors.strokeFocus2, }, }, - } as LinkTokens); + }) as LinkTokens; diff --git a/packages/components/Menu/src/MenuCallout/MenuCallout.types.ts b/packages/components/Menu/src/MenuCallout/MenuCallout.types.ts index 7bf31cf49a7..b195d19edfd 100644 --- a/packages/components/Menu/src/MenuCallout/MenuCallout.types.ts +++ b/packages/components/Menu/src/MenuCallout/MenuCallout.types.ts @@ -6,19 +6,18 @@ export const menuCalloutName = 'MenuCallout'; // Support for anchorRect and beakWidth will come at a later time. // Omitting dismissBehaviors as it doesn't seem to make sense as a token -export type MenuCalloutTokens = - | Omit & { - /** - * The token for the corner radius for the Modal MenuPopover - * @platform android macos - */ - borderRadius?: AnimatableNumericValue | string; +export type MenuCalloutTokens = Omit & { + /** + * The token for the corner radius for the Modal MenuPopover + * @platform android macos + */ + borderRadius?: AnimatableNumericValue | string; - /** - * Shadown elevation token for the Modal MenuPopover - * @platform android - */ - elevation?: number; - }; + /** + * Shadown elevation token for the Modal MenuPopover + * @platform android + */ + elevation?: number; +}; export type MenuCalloutProps = ICalloutProps & { tokens: MenuCalloutTokens }; diff --git a/packages/components/Menu/src/MenuItemCheckbox/MenuItemCheckbox.types.ts b/packages/components/Menu/src/MenuItemCheckbox/MenuItemCheckbox.types.ts index 91b5b5ff082..5b92777cde2 100644 --- a/packages/components/Menu/src/MenuItemCheckbox/MenuItemCheckbox.types.ts +++ b/packages/components/Menu/src/MenuItemCheckbox/MenuItemCheckbox.types.ts @@ -11,8 +11,10 @@ import type { MenuItemProps, MenuItemTokens } from '../MenuItem/MenuItem.types'; export const menuItemCheckboxName = 'MenuItemCheckbox'; -export interface MenuItemCheckboxTokens - extends Omit { +export interface MenuItemCheckboxTokens extends Omit< + MenuItemTokens, + 'submenuIndicatorPadding' | 'submenuIndicatorSize' | 'disabled' | 'focused' | 'hovered' | 'pressed' +> { /** * Color of the checkmark icon */ diff --git a/packages/components/Menu/src/MenuItemRadio/MenuItemRadio.types.ts b/packages/components/Menu/src/MenuItemRadio/MenuItemRadio.types.ts index 316fe78acf6..26a9137fbe7 100644 --- a/packages/components/Menu/src/MenuItemRadio/MenuItemRadio.types.ts +++ b/packages/components/Menu/src/MenuItemRadio/MenuItemRadio.types.ts @@ -11,8 +11,10 @@ import type { MenuItemProps, MenuItemTokens } from '../MenuItem/MenuItem.types'; export const menuItemRadioName = 'MenuItemRadio'; -export interface MenuItemRadioTokens - extends Omit { +export interface MenuItemRadioTokens extends Omit< + MenuItemTokens, + 'submenuIndicatorPadding' | 'submenuIndicatorSize' | 'disabled' | 'focused' | 'hovered' | 'pressed' +> { /** * Color of the checkmark icon */ diff --git a/packages/components/Menu/src/MenuPopover/MenuPopover.types.ts b/packages/components/Menu/src/MenuPopover/MenuPopover.types.ts index 72c726a6acc..2081f13d8a0 100644 --- a/packages/components/Menu/src/MenuPopover/MenuPopover.types.ts +++ b/packages/components/Menu/src/MenuPopover/MenuPopover.types.ts @@ -7,20 +7,19 @@ export const menuPopoverName = 'MenuPopover'; // Support for anchorRect and beakWidth will come at a later time. // Omitting dismissBehaviors as it doesn't seem to make sense as a token -export type MenuPopoverTokens = - | Omit & { - /** - * The props for the corner radius for the Modal MenuPopover - * @platform android macos - */ - borderRadius?: AnimatableNumericValue | string; +export type MenuPopoverTokens = Omit & { + /** + * The props for the corner radius for the Modal MenuPopover + * @platform android macos + */ + borderRadius?: AnimatableNumericValue | string; - /** - * Shadown elevation for the Modal MenuPopover - * @platform android - */ - elevation?: number; - }; + /** + * Shadown elevation for the Modal MenuPopover + * @platform android + */ + elevation?: number; +}; export type MenuPopoverProps = ICalloutProps; diff --git a/packages/components/Menu/src/MenuPopover/MenuPopoverTokens.macos.ts b/packages/components/Menu/src/MenuPopover/MenuPopoverTokens.macos.ts index 6c58c781c43..4154e88b258 100644 --- a/packages/components/Menu/src/MenuPopover/MenuPopoverTokens.macos.ts +++ b/packages/components/Menu/src/MenuPopover/MenuPopoverTokens.macos.ts @@ -12,8 +12,8 @@ export const useMenuPopoverTokens = buildUseTokens( borderColor: isHighContrast() ? t.colors.neutralStroke1 : getCurrentAppearance(t.host.appearance, 'light') === 'dark' - ? t.colors.neutralStroke3 - : t.colors.transparentStroke, + ? t.colors.neutralStroke3 + : t.colors.transparentStroke, }), menuPopoverName, ); diff --git a/packages/components/Menu/src/MenuPopover/useMenuPopover.ts b/packages/components/Menu/src/MenuPopover/useMenuPopover.ts index c3a48c1ef45..3b53d04a6b6 100644 --- a/packages/components/Menu/src/MenuPopover/useMenuPopover.ts +++ b/packages/components/Menu/src/MenuPopover/useMenuPopover.ts @@ -28,7 +28,7 @@ export const useMenuPopover = (props: MenuPopoverProps): MenuPopoverState => { const onDismiss = React.useCallback(() => { props.onDismiss?.(); - setOpen(undefined, false /* isOpen */), [setOpen]; + (setOpen(undefined, false /* isOpen */), [setOpen]); }, [props.onDismiss, setOpen]); const dismissBehaviors = isControlled ? controlledDismissBehaviors : undefined; const directionalHint = props.directionalHint ?? getDirectionalHint(isSubmenu, I18nManager.isRTL); diff --git a/packages/components/Notification/src/NotificationTokens.ios.ts b/packages/components/Notification/src/NotificationTokens.ios.ts index c774988b6ae..fb80511070d 100644 --- a/packages/components/Notification/src/NotificationTokens.ios.ts +++ b/packages/components/Notification/src/NotificationTokens.ios.ts @@ -88,4 +88,4 @@ export const defaultNotificationTokens: TokenSettings color: t.colors.warningForeground1, pressedColor: notificationColors.warningPressed, }, - } as NotificationTokens); + }) as NotificationTokens; diff --git a/packages/components/Notification/src/NotificationTokens.ts b/packages/components/Notification/src/NotificationTokens.ts index 452702d054f..d8d94c93fdb 100644 --- a/packages/components/Notification/src/NotificationTokens.ts +++ b/packages/components/Notification/src/NotificationTokens.ts @@ -70,4 +70,4 @@ export const defaultNotificationTokens: TokenSettings color: '#4C4400', // PaletteYellowForeground1 pressedColor: '#4C440033', // opacity: 0.2 }, - } as NotificationTokens); + }) as NotificationTokens; diff --git a/packages/components/RadioGroup/src/Radio/RadioTokens.android.ts b/packages/components/RadioGroup/src/Radio/RadioTokens.android.ts index bdd722d4999..7ac1f622688 100644 --- a/packages/components/RadioGroup/src/Radio/RadioTokens.android.ts +++ b/packages/components/RadioGroup/src/Radio/RadioTokens.android.ts @@ -56,4 +56,4 @@ export const defaultRadioTokens: TokenSettings = (t: Theme) color: t.colors.neutralForegroundDisabled1, }, }, - } as RadioTokens); + }) as RadioTokens; diff --git a/packages/components/RadioGroup/src/Radio/RadioTokens.ios.ts b/packages/components/RadioGroup/src/Radio/RadioTokens.ios.ts index a4b03bfba20..ec9044cdf39 100644 --- a/packages/components/RadioGroup/src/Radio/RadioTokens.ios.ts +++ b/packages/components/RadioGroup/src/Radio/RadioTokens.ios.ts @@ -55,4 +55,4 @@ export const defaultRadioTokens: TokenSettings = (t: Theme) color: t.colors.neutralForegroundDisabled1, }, }, - } as RadioTokens); + }) as RadioTokens; diff --git a/packages/components/RadioGroup/src/Radio/RadioTokens.ts b/packages/components/RadioGroup/src/Radio/RadioTokens.ts index 7775be09fae..47ac45d837e 100644 --- a/packages/components/RadioGroup/src/Radio/RadioTokens.ts +++ b/packages/components/RadioGroup/src/Radio/RadioTokens.ts @@ -95,4 +95,4 @@ export const defaultRadioTokens: TokenSettings = (t: Theme) radioFill: t.colors.neutralForegroundDisabled, }, }, - } as RadioTokens); + }) as RadioTokens; diff --git a/packages/components/RadioGroup/src/Radio/RadioTokens.win32.ts b/packages/components/RadioGroup/src/Radio/RadioTokens.win32.ts index 8a2ad65e488..56c037c2828 100644 --- a/packages/components/RadioGroup/src/Radio/RadioTokens.win32.ts +++ b/packages/components/RadioGroup/src/Radio/RadioTokens.win32.ts @@ -109,4 +109,4 @@ export const defaultRadioTokens: TokenSettings = (t: Theme) radioFill: t.colors.neutralForegroundDisabled, }, }, - } as RadioTokens); + }) as RadioTokens; diff --git a/packages/components/RadioGroup/src/RadioGroup/RadioGroupTokens.mobile.ts b/packages/components/RadioGroup/src/RadioGroup/RadioGroupTokens.mobile.ts index 368f5beec86..71d139ef554 100644 --- a/packages/components/RadioGroup/src/RadioGroup/RadioGroupTokens.mobile.ts +++ b/packages/components/RadioGroup/src/RadioGroup/RadioGroupTokens.mobile.ts @@ -18,4 +18,4 @@ export const defaultRadioGroupTokens: TokenSettings = ( isHorizontal: { flexDirection: 'row', }, - } as RadioGroupTokens); + }) as RadioGroupTokens; diff --git a/packages/components/RadioGroup/src/RadioGroup/RadioGroupTokens.ts b/packages/components/RadioGroup/src/RadioGroup/RadioGroupTokens.ts index bfb078441ab..2a7625844b2 100644 --- a/packages/components/RadioGroup/src/RadioGroup/RadioGroupTokens.ts +++ b/packages/components/RadioGroup/src/RadioGroup/RadioGroupTokens.ts @@ -17,4 +17,4 @@ export const defaultRadioGroupTokens: TokenSettings = ( isHorizontal: { flexDirection: 'row', }, - } as RadioGroupTokens); + }) as RadioGroupTokens; diff --git a/packages/components/Separator/src/SeparatorTokens.android.tsx b/packages/components/Separator/src/SeparatorTokens.android.tsx index b0424466cef..05644bbeb18 100644 --- a/packages/components/Separator/src/SeparatorTokens.android.tsx +++ b/packages/components/Separator/src/SeparatorTokens.android.tsx @@ -9,4 +9,4 @@ export const defaultSeparatorTokens: TokenSettings = (t: color: t.colors.neutralStroke2, separatorWidth: globalTokens.stroke.width10, insetSpacing: 0, - } as SeparatorTokens); + }) as SeparatorTokens; diff --git a/packages/components/Separator/src/SeparatorTokens.tsx b/packages/components/Separator/src/SeparatorTokens.tsx index 28d909bbecb..573a7972201 100644 --- a/packages/components/Separator/src/SeparatorTokens.tsx +++ b/packages/components/Separator/src/SeparatorTokens.tsx @@ -7,4 +7,4 @@ import type { SeparatorTokens } from './Separator.types'; export const defaultSeparatorTokens: TokenSettings = () => ({ separatorWidth: globalTokens.stroke.width10, - } as SeparatorTokens); + }) as SeparatorTokens; diff --git a/packages/components/TabList/src/Tab/TabColorTokens.ts b/packages/components/TabList/src/Tab/TabColorTokens.ts index 523aa606663..bf5438c47dc 100644 --- a/packages/components/TabList/src/Tab/TabColorTokens.ts +++ b/packages/components/TabList/src/Tab/TabColorTokens.ts @@ -86,4 +86,4 @@ export const defaultTabColorTokens: TokenSettings = (t: Theme) focused: { borderColor: t.colors.neutralForeground1, }, - } as TabTokens); + }) as TabTokens; diff --git a/packages/components/TabList/src/Tab/TabColorTokens.win32.ts b/packages/components/TabList/src/Tab/TabColorTokens.win32.ts index d68d6cd9b3d..6eee30d094b 100644 --- a/packages/components/TabList/src/Tab/TabColorTokens.win32.ts +++ b/packages/components/TabList/src/Tab/TabColorTokens.win32.ts @@ -87,4 +87,4 @@ export const defaultTabColorTokens: TokenSettings = (t: Theme) focused: { borderColor: isHighContrast(t) ? t.colors.compoundBrandStroke1 : t.colors.neutralForeground1, }, - } as TabTokens); + }) as TabTokens; diff --git a/packages/components/TabList/src/TabList/TabListTokens.ts b/packages/components/TabList/src/TabList/TabListTokens.ts index a394a500684..8d9995f7fca 100644 --- a/packages/components/TabList/src/TabList/TabListTokens.ts +++ b/packages/components/TabList/src/TabList/TabListTokens.ts @@ -9,4 +9,4 @@ export const defaultTabListTokens: TokenSettings = () => vertical: { direction: 'column', }, - } as TabListTokens); + }) as TabListTokens; diff --git a/packages/components/Text/src/Text.tsx b/packages/components/Text/src/Text.tsx index fa9070b98c8..63c3c098ac7 100644 --- a/packages/components/Text/src/Text.tsx +++ b/packages/components/Text/src/Text.tsx @@ -50,13 +50,13 @@ export const Text = compressible((props: TextProps, useTo ? align === 'start' ? 'right' : align === 'end' - ? 'left' - : align + ? 'left' + : align : align === 'start' - ? 'left' - : align === 'end' - ? 'right' - : align; + ? 'left' + : align === 'end' + ? 'right' + : align; const textOnPress = React.useCallback( (e) => { diff --git a/packages/experimental/Drawer/src/DrawerTokens.ts b/packages/experimental/Drawer/src/DrawerTokens.ts index b65dfb40581..30d04b27e22 100644 --- a/packages/experimental/Drawer/src/DrawerTokens.ts +++ b/packages/experimental/Drawer/src/DrawerTokens.ts @@ -37,4 +37,4 @@ export const defaultDrawerTokens: TokenSettings = (t: Theme drawerCornerRadius: globalTokens.corner.radius120, height: '50%', }, - } as DrawerTokens); + }) as DrawerTokens; diff --git a/packages/experimental/Shimmer/src/Shimmer.tsx b/packages/experimental/Shimmer/src/Shimmer.tsx index 2fb7441c098..1c5e9af0d65 100644 --- a/packages/experimental/Shimmer/src/Shimmer.tsx +++ b/packages/experimental/Shimmer/src/Shimmer.tsx @@ -27,7 +27,7 @@ export const Shimmer = compose({ const memoizedShimmerData = useMemo( () => ({ angle: props.angle ? props.angle : tokens['angle'], - backgroundColor: props?.style?.['backgroundColor'] ? props?.style['backgroundColor'] : tokens['backgroundColor'] ?? 'transparent', + backgroundColor: props?.style?.['backgroundColor'] ? props?.style['backgroundColor'] : (tokens['backgroundColor'] ?? 'transparent'), containerBorderRadius: props?.style?.['borderRadius'] ? props?.style['borderRadius'] : 0, containerWidth: props?.style?.['width'] ? props?.style['width'] : '100%', containerHeight: props?.style?.['height'] ? props?.style['height'] : '100%', diff --git a/packages/experimental/Shimmer/src/ShimmerTokens.android.ts b/packages/experimental/Shimmer/src/ShimmerTokens.android.ts index 443d652d4e8..e41a352e27f 100644 --- a/packages/experimental/Shimmer/src/ShimmerTokens.android.ts +++ b/packages/experimental/Shimmer/src/ShimmerTokens.android.ts @@ -13,4 +13,4 @@ export const defaultShimmerTokens: TokenSettings = (theme: shimmerColorOpacity: 1, shimmerWaveColor: theme.colors.neutralStencil2, shimmerWaveColorOpacity: 1, - } as ShimmerTokens); + }) as ShimmerTokens; diff --git a/packages/experimental/Shimmer/src/ShimmerTokens.ios.ts b/packages/experimental/Shimmer/src/ShimmerTokens.ios.ts index 443d652d4e8..e41a352e27f 100644 --- a/packages/experimental/Shimmer/src/ShimmerTokens.ios.ts +++ b/packages/experimental/Shimmer/src/ShimmerTokens.ios.ts @@ -13,4 +13,4 @@ export const defaultShimmerTokens: TokenSettings = (theme: shimmerColorOpacity: 1, shimmerWaveColor: theme.colors.neutralStencil2, shimmerWaveColorOpacity: 1, - } as ShimmerTokens); + }) as ShimmerTokens; diff --git a/packages/experimental/Shimmer/src/ShimmerTokens.ts b/packages/experimental/Shimmer/src/ShimmerTokens.ts index 6919961dc30..f3a0706b5bb 100644 --- a/packages/experimental/Shimmer/src/ShimmerTokens.ts +++ b/packages/experimental/Shimmer/src/ShimmerTokens.ts @@ -15,4 +15,4 @@ export const defaultShimmerTokens: TokenSettings = (theme: shimmerColorOpacity: 1, shimmerWaveColor: getCurrentAppearance(theme.host.appearance, 'light') === 'light' ? 'white' : 'black', shimmerWaveColorOpacity: 1, - } as ShimmerTokens); + }) as ShimmerTokens; diff --git a/packages/experimental/Shimmer/src/ShimmerTokens.win32.ts b/packages/experimental/Shimmer/src/ShimmerTokens.win32.ts index 0ef43eb129e..04b5c250e23 100644 --- a/packages/experimental/Shimmer/src/ShimmerTokens.win32.ts +++ b/packages/experimental/Shimmer/src/ShimmerTokens.win32.ts @@ -15,4 +15,4 @@ export const defaultShimmerTokens: TokenSettings = (theme: shimmerWaveColor: '#E1E1E1', shimmerWaveColorOpacity: 1, shimmerWaveWidth: '100%', - } as ShimmerTokens); + }) as ShimmerTokens; diff --git a/packages/experimental/Spinner/src/SpinnerTokens.android.ts b/packages/experimental/Spinner/src/SpinnerTokens.android.ts index 91d3cae049f..97542ae197e 100644 --- a/packages/experimental/Spinner/src/SpinnerTokens.android.ts +++ b/packages/experimental/Spinner/src/SpinnerTokens.android.ts @@ -8,4 +8,4 @@ import type { SpinnerTokens } from './Spinner.types'; export const defaultSpinnerTokens: TokenSettings = () => ({ trackColor: Appearance.getColorScheme() === 'light' ? globalTokens.color.grey56 : globalTokens.color.grey72, - } as SpinnerTokens); + }) as SpinnerTokens; diff --git a/packages/experimental/Spinner/src/SpinnerTokens.ts b/packages/experimental/Spinner/src/SpinnerTokens.ts index 8ccf320962b..24a8334aa47 100644 --- a/packages/experimental/Spinner/src/SpinnerTokens.ts +++ b/packages/experimental/Spinner/src/SpinnerTokens.ts @@ -47,4 +47,4 @@ export const defaultSpinnerTokens: TokenSettings = (t: The height: diameterSizeMap['x-large'], }, trackColor: t.colors.brandStroke2, - } as SpinnerTokens); + }) as SpinnerTokens; diff --git a/packages/experimental/Spinner/src/SpinnerTokens.win32.ts b/packages/experimental/Spinner/src/SpinnerTokens.win32.ts index d167f787546..154e5fb0bf1 100644 --- a/packages/experimental/Spinner/src/SpinnerTokens.win32.ts +++ b/packages/experimental/Spinner/src/SpinnerTokens.win32.ts @@ -79,4 +79,4 @@ export const defaultSpinnerTokens: TokenSettings = (t: The tailColor: t.colors.neutralStroke2, trackColor: t.colors.neutralBackgroundInverted, }, - } as SpinnerTokens); + }) as SpinnerTokens; diff --git a/packages/framework-base/src/immutable-merge/Merge.ts b/packages/framework-base/src/immutable-merge/Merge.ts index a889e0c27e6..b77d9577d0a 100644 --- a/packages/framework-base/src/immutable-merge/Merge.ts +++ b/packages/framework-base/src/immutable-merge/Merge.ts @@ -68,8 +68,8 @@ function normalizeOptions(options: RecursionOption | MergeOptions): [MergeOption return typeof options === 'boolean' ? [{ object: options }, options] : typeof options === 'number' - ? [{ object: options >= 0 ? options : true }, options !== 0] - : [options, true]; + ? [{ object: options >= 0 ? options : true }, options !== 0] + : [options, true]; } /** diff --git a/packages/framework/composition/src/composeFactory.ts b/packages/framework/composition/src/composeFactory.ts index f550b7243db..e9b0639e0f1 100644 --- a/packages/framework/composition/src/composeFactory.ts +++ b/packages/framework/composition/src/composeFactory.ts @@ -62,7 +62,7 @@ export function composeFactory(mergeOptions, baseOptions, options) : { ...options }; // build styling if styling options are specified - options.useStyling = options.slotProps || options.tokens ? buildUseStyling(options, themeHelper) : () => ({} as TSlotProps); + options.useStyling = options.slotProps || options.tokens ? buildUseStyling(options, themeHelper) : () => ({}) as TSlotProps; // build the slots hook, which will use the styling hook if it has been built const useSlots = buildUseSlots(options) as UseStyledSlots; diff --git a/packages/framework/use-styling/src/buildProps.ts b/packages/framework/use-styling/src/buildProps.ts index 7686421e2ff..1e1b23ecf80 100644 --- a/packages/framework/use-styling/src/buildProps.ts +++ b/packages/framework/use-styling/src/buildProps.ts @@ -57,8 +57,8 @@ function refineKeys(keys: (keyof TTokens)[], mask?: TokensThatAreAlsoPr return typeof mask === 'object' && Array.isArray(mask) ? keys.filter((key) => mask.findIndex((val) => val === key) !== -1) : mask - ? keys - : []; + ? keys + : []; } /** From ee0d3eb885a22052ef692e69277b322f2f4ff46c Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Tue, 24 Feb 2026 08:25:50 -0800 Subject: [PATCH 4/5] docs(changeset): chore: migrate to `oxfmt` --- .changeset/heavy-regions-shake.md | 86 +++++++++++++++++++++++++++++++ 1 file changed, 86 insertions(+) create mode 100644 .changeset/heavy-regions-shake.md diff --git a/.changeset/heavy-regions-shake.md b/.changeset/heavy-regions-shake.md new file mode 100644 index 00000000000..f8053326508 --- /dev/null +++ b/.changeset/heavy-regions-shake.md @@ -0,0 +1,86 @@ +--- +"@uifabricshared/foundation-composable": patch +"@fluentui-react-native/experimental-appearance-additions": patch +"@uifabricshared/theming-react-native": patch +"@uifabricshared/foundation-settings": patch +"@fluentui-react-native/experimental-activity-indicator": patch +"@fluentui-react-native/experimental-native-font-metrics": patch +"@uifabricshared/foundation-compose": patch +"@fluentui-react-native/experimental-native-date-picker": patch +"@uifabricshared/foundation-tokens": patch +"@fluentui-react-native/eslint-config-rules": patch +"@fluentui-react-native/themed-stylesheet": patch +"@uifabricshared/themed-settings": patch +"@fluentui-react-native/contextual-menu": patch +"@uifabricshared/theme-registry": patch +"@fluentui-react-native/vibrancy-view": patch +"@fluentui-react-native/immutable-merge": patch +"@fluentui-react-native/focus-trap-zone": patch +"@fluentui-react-native/notification": patch +"@uifabricshared/theming-ramp": patch +"@fluentui-react-native/experimental-menu-button": patch +"@fluentui-react-native/interactive-hooks": patch +"@fluentui-react-native/persona-coin": patch +"@fluentui-react-native/menu-button": patch +"@fluentui-react-native/radio-group": patch +"@fluentui-react-native/react-configs": patch +"@fluentui-react-native/experimental-checkbox": patch +"@fluentui-react-native/dropdown": patch +"@fluentui-react-native/experimental-expander": patch +"@fluentui-react-native/overflow": patch +"@fluentui-react-native/composition": patch +"@fluentui-react-native/merge-props": patch +"@fluentui-react-native/use-styling": patch +"@fluentui-react-native/android-theme": patch +"@fluentui-react-native/default-theme": patch +"@fluentui-react-native/theming-utils": patch +"@fluentui-react-native/focus-zone": patch +"@fluentui-react-native/pressable": patch +"@fluentui-react-native/separator": patch +"@fluentui-react-native/babel-config": patch +"@fluentui-react-native/popover": patch +"@fluentui-react-native/experimental-shimmer": patch +"@fluentui-react-native/spinner": patch +"@fluentui-react-native/tooltip": patch +"@fluentui-react-native/memo-cache": patch +"@fluentui-react-native/use-tokens": patch +"@fluentui-react-native/theme-tokens": patch +"@fluentui-react-native/checkbox": patch +"@fluentui-react-native/jest-config": patch +"@fluentui-react-native/experimental-avatar": patch +"@fluentui-react-native/drawer": patch +"@fluentui-react-native/experimental-shadow": patch +"@fluentui-react-native/framework": patch +"@fluentui-react-native/use-slots": patch +"@fluentui-react-native/apple-theme": patch +"@fluentui-react-native/theme-types": patch +"@fluentui-react-native/win32-theme": patch +"@fluentui-react-native/callout": patch +"@fluentui-react-native/divider": patch +"@fluentui-react-native/persona": patch +"@fluentui-react-native/tablist": patch +"@fluentui-react-native/kit-config": patch +"@fluentui-react-native/experimental-stack": patch +"@fluentui-react-native/use-slot": patch +"@fluentui-react-native/avatar": patch +"@fluentui-react-native/button": patch +"@fluentui-react-native/switch": patch +"@fluentui-react-native/badge": patch +"@fluentui-react-native/input": patch +"@fluentui-react-native/stack": patch +"@fluentui-react-native/chip": patch +"@fluentui-react-native/icon": patch +"@fluentui-react-native/link": patch +"@fluentui-react-native/menu": patch +"@fluentui-react-native/text": patch +"@fluentui-react-native/theme": patch +"@fluentui-react-native/framework-base": patch +"@fluentui/react-native": patch +"@fluentui-react-native/adapters": patch +"@fluentui-react-native/styling-utils": patch +"@fluentui-react-native/tokens": patch +"@fluentui-react-native/codemods": patch +"@fluentui-react-native/scripts": patch +--- + +chore: migrate to `oxfmt` From fd42c519ee726aef69c05cb37a1cb054db780bc0 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Tue, 24 Feb 2026 08:41:39 -0800 Subject: [PATCH 5/5] missed a file --- packages/deprecated/foundation-compose/src/compose.types.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/deprecated/foundation-compose/src/compose.types.ts b/packages/deprecated/foundation-compose/src/compose.types.ts index 754c2e3646c..a7a19ae1626 100644 --- a/packages/deprecated/foundation-compose/src/compose.types.ts +++ b/packages/deprecated/foundation-compose/src/compose.types.ts @@ -97,8 +97,8 @@ export interface IComposeOptions< TTokens extends object = object, TState extends object = object, TStatics extends object = object, -> extends IComposableDefinition, - IStylingSettings { +> + extends IComposableDefinition, IStylingSettings { /** * Add an additional option to use styling to allow for injecting override lookup functions */