Skip to content

Commit 8d8361f

Browse files
JasonVMoJasonVMo
committed
Merge branch 'main' of https://github.com/microsoft/fluentui-react-native into user/jasonvmo/macos-desktop-app
2 parents f1368c8 + c9ea2d9 commit 8d8361f

678 files changed

Lines changed: 3729 additions & 3734 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.ado/azure-pipelines.publish.yml‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -79,18 +79,12 @@ extends:
7979
8080
- script: |
8181
ls -la $(System.DefaultWorkingDirectory)/_packed/
82-
if ls $(System.DefaultWorkingDirectory)/_packed/*.tgz > /dev/null 2>&1; then
83-
echo "##vso[task.setvariable variable=hasTarballs;isOutput=true]true"
84-
else
85-
echo "##vso[task.setvariable variable=hasTarballs;isOutput=true]false"
86-
fi
87-
name: check
8882
displayName: 'List packed tarballs'
8983
9084
- stage: Publish
9185
displayName: Publish to NPM
9286
dependsOn: Build
93-
condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'), not(${{ parameters.skipNpmPublish }}), eq(stageDependencies.Build.BuildAndPack.outputs['check.hasTarballs'], 'true'))
87+
condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'), ne('${{ parameters.skipNpmPublish }}', 'true'))
9488
jobs:
9589
- job: PublishPackages
9690
displayName: Publish NPM Packages
@@ -113,24 +107,33 @@ extends:
113107
- script: |
114108
echo "Downloaded tarballs:"
115109
ls -la $(System.DefaultWorkingDirectory)/_packed/
116-
displayName: 'List downloaded tarballs'
110+
if ls $(System.DefaultWorkingDirectory)/_packed/*.tgz > /dev/null 2>&1; then
111+
echo "##vso[task.setvariable variable=hasTarballs]true"
112+
else
113+
echo "No tarballs found — nothing to publish."
114+
echo "##vso[task.setvariable variable=hasTarballs]false"
115+
fi
116+
displayName: 'Check downloaded tarballs'
117117
118118
- script: |
119119
yarn
120120
displayName: 'yarn install'
121+
condition: eq(variables['hasTarballs'], 'true')
121122
122123
- script: |
123124
yarn config set npmPublishAccess public
124125
yarn config set npmPublishRegistry "https://registry.npmjs.org"
125126
yarn config set npmAuthToken $(npmAuth)
126127
npm config set //registry.npmjs.org/:_authToken $(npmAuth)
127128
displayName: 'Configure npm publishing auth'
129+
condition: eq(variables['hasTarballs'], 'true')
128130
129131
- script: |
130132
# https://github.com/changesets/changesets/issues/432
131133
# We can't use `changeset publish` because it doesn't support workspaces, so we have to publish each package individually
132134
yarn lage publish --verbose --grouped --reporter azureDevops
133135
displayName: 'Publish NPM Packages'
136+
condition: eq(variables['hasTarballs'], 'true')
134137
135138
- script: |
136139
yarn config unset npmPublishAccess

‎.changeset/beige-brooms-joke.md‎

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

‎.changeset/late-rules-think.md‎

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

‎.changeset/lovely-beans-warn.md‎

Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
1+
---
2+
"@uifabricshared/foundation-composable": patch
3+
"@fluentui-react-native/experimental-appearance-additions": patch
4+
"@uifabricshared/theming-react-native": patch
5+
"@uifabricshared/foundation-settings": patch
6+
"@fluentui-react-native/experimental-activity-indicator": patch
7+
"@fluentui-react-native/experimental-native-font-metrics": patch
8+
"@uifabricshared/foundation-compose": patch
9+
"@fluentui-react-native/experimental-native-date-picker": patch
10+
"@uifabricshared/foundation-tokens": patch
11+
"@fluentui-react-native/themed-stylesheet": patch
12+
"@uifabricshared/themed-settings": patch
13+
"@fluentui-react-native/contextual-menu": patch
14+
"@uifabricshared/theme-registry": patch
15+
"@fluentui-react-native/vibrancy-view": patch
16+
"@fluentui-react-native/focus-trap-zone": patch
17+
"@fluentui-react-native/notification": patch
18+
"@uifabricshared/theming-ramp": patch
19+
"@fluentui-react-native/experimental-menu-button": patch
20+
"@fluentui-react-native/interactive-hooks": patch
21+
"@fluentui-react-native/persona-coin": patch
22+
"@fluentui-react-native/menu-button": patch
23+
"@fluentui-react-native/radio-group": patch
24+
"@fluentui-react-native/experimental-checkbox": patch
25+
"@fluentui-react-native/dropdown": patch
26+
"@fluentui-react-native/experimental-expander": patch
27+
"@fluentui-react-native/overflow": patch
28+
"@fluentui-react-native/composition": patch
29+
"@fluentui-react-native/use-styling": patch
30+
"@fluentui-react-native/android-theme": patch
31+
"@fluentui-react-native/default-theme": patch
32+
"@fluentui-react-native/theming-utils": patch
33+
"@fluentui-react-native/focus-zone": patch
34+
"@fluentui-react-native/pressable": patch
35+
"@fluentui-react-native/separator": patch
36+
"@fluentui-react-native/popover": patch
37+
"@fluentui-react-native/experimental-shimmer": patch
38+
"@fluentui-react-native/spinner": patch
39+
"@fluentui-react-native/tooltip": patch
40+
"@fluentui-react-native/use-tokens": patch
41+
"@fluentui-react-native/theme-tokens": patch
42+
"@fluentui-react-native/checkbox": patch
43+
"@fluentui-react-native/experimental-avatar": patch
44+
"@fluentui-react-native/drawer": patch
45+
"@fluentui-react-native/experimental-shadow": patch
46+
"@fluentui-react-native/framework": patch
47+
"@fluentui-react-native/use-slots": patch
48+
"@fluentui-react-native/apple-theme": patch
49+
"@fluentui-react-native/theme-types": patch
50+
"@fluentui-react-native/win32-theme": patch
51+
"@fluentui-react-native/callout": patch
52+
"@fluentui-react-native/divider": patch
53+
"@fluentui-react-native/persona": patch
54+
"@fluentui-react-native/tablist": patch
55+
"@fluentui-react-native/use-slot": patch
56+
"@fluentui-react-native/avatar": patch
57+
"@fluentui-react-native/button": patch
58+
"@fluentui-react-native/switch": patch
59+
"@fluentui-react-native/badge": patch
60+
"@fluentui-react-native/input": patch
61+
"@fluentui-react-native/stack": patch
62+
"@fluentui-react-native/chip": patch
63+
"@fluentui-react-native/icon": patch
64+
"@fluentui-react-native/link": patch
65+
"@fluentui-react-native/menu": patch
66+
"@fluentui-react-native/text": patch
67+
"@fluentui-react-native/theme": patch
68+
"@fluentui-react-native/framework-base": patch
69+
"@fluentui/react-native": patch
70+
"@fluentui-react-native/adapters": patch
71+
"@fluentui-react-native/styling-utils": patch
72+
"@fluentui-react-native/tokens": patch
73+
"@fluentui-react-native/tester": patch
74+
"@fluentui-react-native/codemods": patch
75+
---
76+
77+
Configuration and dependency changes

‎.changeset/small-spiders-pull.md‎

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

‎.changeset/upset-shirts-carry.md‎

Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
1+
---
2+
"@uifabricshared/foundation-composable": patch
3+
"@fluentui-react-native/experimental-appearance-additions": patch
4+
"@uifabricshared/theming-react-native": patch
5+
"@uifabricshared/foundation-settings": patch
6+
"@fluentui-react-native/experimental-activity-indicator": patch
7+
"@fluentui-react-native/experimental-native-font-metrics": patch
8+
"@uifabricshared/foundation-compose": patch
9+
"@fluentui-react-native/experimental-native-date-picker": patch
10+
"@uifabricshared/foundation-tokens": patch
11+
"@fluentui-react-native/themed-stylesheet": patch
12+
"@uifabricshared/themed-settings": patch
13+
"@fluentui-react-native/contextual-menu": patch
14+
"@uifabricshared/theme-registry": patch
15+
"@fluentui-react-native/vibrancy-view": patch
16+
"@fluentui-react-native/focus-trap-zone": patch
17+
"@fluentui-react-native/notification": patch
18+
"@uifabricshared/theming-ramp": patch
19+
"@fluentui-react-native/experimental-menu-button": patch
20+
"@fluentui-react-native/interactive-hooks": patch
21+
"@fluentui-react-native/persona-coin": patch
22+
"@fluentui-react-native/menu-button": patch
23+
"@fluentui-react-native/radio-group": patch
24+
"@fluentui-react-native/experimental-checkbox": patch
25+
"@fluentui-react-native/dropdown": patch
26+
"@fluentui-react-native/experimental-expander": patch
27+
"@fluentui-react-native/overflow": patch
28+
"@fluentui-react-native/composition": patch
29+
"@fluentui-react-native/use-styling": patch
30+
"@fluentui-react-native/android-theme": patch
31+
"@fluentui-react-native/default-theme": patch
32+
"@fluentui-react-native/theming-utils": patch
33+
"@fluentui-react-native/focus-zone": patch
34+
"@fluentui-react-native/pressable": patch
35+
"@fluentui-react-native/separator": patch
36+
"@fluentui-react-native/popover": patch
37+
"@fluentui-react-native/experimental-shimmer": patch
38+
"@fluentui-react-native/spinner": patch
39+
"@fluentui-react-native/tooltip": patch
40+
"@fluentui-react-native/use-tokens": patch
41+
"@fluentui-react-native/theme-tokens": patch
42+
"@fluentui-react-native/checkbox": patch
43+
"@fluentui-react-native/experimental-avatar": patch
44+
"@fluentui-react-native/drawer": patch
45+
"@fluentui-react-native/experimental-shadow": patch
46+
"@fluentui-react-native/framework": patch
47+
"@fluentui-react-native/use-slots": patch
48+
"@fluentui-react-native/apple-theme": patch
49+
"@fluentui-react-native/theme-types": patch
50+
"@fluentui-react-native/win32-theme": patch
51+
"@fluentui-react-native/callout": patch
52+
"@fluentui-react-native/divider": patch
53+
"@fluentui-react-native/persona": patch
54+
"@fluentui-react-native/tablist": patch
55+
"@fluentui-react-native/use-slot": patch
56+
"@fluentui-react-native/avatar": patch
57+
"@fluentui-react-native/button": patch
58+
"@fluentui-react-native/switch": patch
59+
"@fluentui-react-native/badge": patch
60+
"@fluentui-react-native/input": patch
61+
"@fluentui-react-native/stack": patch
62+
"@fluentui-react-native/chip": patch
63+
"@fluentui-react-native/icon": patch
64+
"@fluentui-react-native/link": patch
65+
"@fluentui-react-native/menu": patch
66+
"@fluentui-react-native/text": patch
67+
"@fluentui-react-native/theme": patch
68+
"@fluentui-react-native/framework-base": patch
69+
"@fluentui/react-native": patch
70+
"@fluentui-react-native/adapters": patch
71+
"@fluentui-react-native/styling-utils": patch
72+
"@fluentui-react-native/tokens": patch
73+
"@fluentui-react-native/tester": patch
74+
"@fluentui-react-native/codemods": patch
75+
---
76+
77+
remove oxlint config package and move it into scripts

‎.changeset/wacky-rabbits-retire.md‎

Lines changed: 78 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
1+
---
2+
"@uifabricshared/foundation-composable": patch
3+
"@fluentui-react-native/experimental-appearance-additions": patch
4+
"@uifabricshared/theming-react-native": patch
5+
"@uifabricshared/foundation-settings": patch
6+
"@fluentui-react-native/experimental-activity-indicator": patch
7+
"@fluentui-react-native/experimental-native-font-metrics": patch
8+
"@uifabricshared/foundation-compose": patch
9+
"@fluentui-react-native/experimental-native-date-picker": patch
10+
"@uifabricshared/foundation-tokens": patch
11+
"@fluentui-react-native/themed-stylesheet": patch
12+
"@uifabricshared/themed-settings": patch
13+
"@fluentui-react-native/contextual-menu": patch
14+
"@fluentui-react-native/lint-config-rules": patch
15+
"@uifabricshared/theme-registry": patch
16+
"@fluentui-react-native/vibrancy-view": patch
17+
"@fluentui-react-native/focus-trap-zone": patch
18+
"@fluentui-react-native/notification": patch
19+
"@uifabricshared/theming-ramp": patch
20+
"@fluentui-react-native/experimental-menu-button": patch
21+
"@fluentui-react-native/interactive-hooks": patch
22+
"@fluentui-react-native/persona-coin": patch
23+
"@fluentui-react-native/menu-button": patch
24+
"@fluentui-react-native/radio-group": patch
25+
"@fluentui-react-native/experimental-checkbox": patch
26+
"@fluentui-react-native/dropdown": patch
27+
"@fluentui-react-native/experimental-expander": patch
28+
"@fluentui-react-native/overflow": patch
29+
"@fluentui-react-native/composition": patch
30+
"@fluentui-react-native/use-styling": patch
31+
"@fluentui-react-native/android-theme": patch
32+
"@fluentui-react-native/default-theme": patch
33+
"@fluentui-react-native/theming-utils": patch
34+
"@fluentui-react-native/focus-zone": patch
35+
"@fluentui-react-native/pressable": patch
36+
"@fluentui-react-native/separator": patch
37+
"@fluentui-react-native/popover": patch
38+
"@fluentui-react-native/experimental-shimmer": patch
39+
"@fluentui-react-native/spinner": patch
40+
"@fluentui-react-native/tooltip": patch
41+
"@fluentui-react-native/use-tokens": patch
42+
"@fluentui-react-native/theme-tokens": patch
43+
"@fluentui-react-native/checkbox": patch
44+
"@fluentui-react-native/experimental-avatar": patch
45+
"@fluentui-react-native/drawer": patch
46+
"@fluentui-react-native/experimental-shadow": patch
47+
"@fluentui-react-native/framework": patch
48+
"@fluentui-react-native/use-slots": patch
49+
"@fluentui-react-native/apple-theme": patch
50+
"@fluentui-react-native/theme-types": patch
51+
"@fluentui-react-native/win32-theme": patch
52+
"@fluentui-react-native/callout": patch
53+
"@fluentui-react-native/divider": patch
54+
"@fluentui-react-native/persona": patch
55+
"@fluentui-react-native/tablist": patch
56+
"@fluentui-react-native/use-slot": patch
57+
"@fluentui-react-native/avatar": patch
58+
"@fluentui-react-native/button": patch
59+
"@fluentui-react-native/switch": patch
60+
"@fluentui-react-native/badge": patch
61+
"@fluentui-react-native/input": patch
62+
"@fluentui-react-native/stack": patch
63+
"@fluentui-react-native/chip": patch
64+
"@fluentui-react-native/icon": patch
65+
"@fluentui-react-native/link": patch
66+
"@fluentui-react-native/menu": patch
67+
"@fluentui-react-native/text": patch
68+
"@fluentui-react-native/theme": patch
69+
"@fluentui-react-native/framework-base": patch
70+
"@fluentui/react-native": patch
71+
"@fluentui-react-native/adapters": patch
72+
"@fluentui-react-native/styling-utils": patch
73+
"@fluentui-react-native/tokens": patch
74+
"@fluentui-react-native/tester": patch
75+
"@fluentui-react-native/codemods": patch
76+
---
77+
78+
Switch tsconfig settings to more modern settings

‎.github/workflows/pr.yml‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -385,6 +385,7 @@ jobs:
385385
386386
pr:
387387
name: PR
388+
if: always()
388389
runs-on: ubuntu-latest
389390
needs:
390391
- js
@@ -398,5 +399,10 @@ jobs:
398399
- publish-dry-run
399400
- test-links
400401
steps:
402+
- name: Check for failures or cancellations
403+
if: ${{ contains(needs.*.result, 'failure') || contains(needs.*.result, 'cancelled') }}
404+
run: |
405+
echo "One or more required jobs failed or were cancelled."
406+
exit 1
401407
- name: All required jobs passed
402-
run: echo "All required jobs completed."
408+
run: echo "All required jobs completed successfully."

‎.vscode/settings.json‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,6 @@
44
"editor.trimAutoWhitespace": true,
55
"editor.insertSpaces": true,
66
"editor.tabSize": 2,
7-
"editor.codeActionsOnSave": {
8-
"source.fixAll.eslint": "explicit"
9-
},
107
// Use the OXC formatter as the default formatter which matches what yarn format will do
118
"editor.defaultFormatter": "oxc.oxc-vscode",
129

@@ -16,9 +13,6 @@
1613
"prettier.printWidth": 140,
1714
"prettier.trailingComma": "all",
1815

19-
"eslint.enable": true,
20-
"eslint.workingDirectories": [{ "pattern": "./packages/framework/eslint-config-rules" }], // use the common eslint config file
21-
2216
"explorer.fileNesting.enabled": true,
2317
"explorer.fileNesting.patterns": {
2418
"*.js": "${capture}.js.map, ${capture}.d.ts, ${capture}.d.ts.map",

‎.yarnrc.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ catalog:
2222
"@rnx-kit/reporter": ^0.1.0
2323
"@rnx-kit/tools-packages": ^0.1.2
2424
"@rnx-kit/tools-typescript": ^0.1.3
25-
"@rnx-kit/tsconfig": ^3.0.0
26-
"@rnx-kit/types-kit-config": ^1.0.0
27-
"@rnx-kit/types-node": ^1.0.0
25+
"@rnx-kit/tsconfig": ^3.0.3
26+
"@rnx-kit/types-kit-config": "^1.0.0"
27+
"@rnx-kit/types-node": "^1.0.0"
2828
"@types/jasmine": 5.1.13
2929
"@types/node": ^22.19.7
3030
"@wdio/appium-service": ^9.24.0
@@ -239,7 +239,7 @@ catalogs:
239239
react-native-windows: ^0.81.0
240240
react-test-renderer: 19.1.4
241241

242-
dynamicPackageExtensions: ./scripts/dynamic.extensions.mjs
242+
dynamicPackageExtensions: ./scripts/dynamic.extensions.mts
243243

244244
enableGlobalCache: false
245245

0 commit comments

Comments
 (0)