Skip to content

Commit 144e137

Browse files
rurikoarakirurikoaraki
authored
Update to Yarn3 (#2980)
* Initial yarn 3 commit * Fix use yarn please * Result of yarn * Build fixes * Some more fixes * Cleanup * Change files * Fix yarn check * Port disabling PnP patching * Update tests * Port podfile.lock change * Change files * Reapply some package updates * Fix for win32? * Change files * Convert tester deps? * Edit workspaces property in package.json * Update RNTA * Update setup
1 parent fb4d5ee commit 144e137

File tree

73 files changed

+32398
-20399
lines changed

Some content is hidden

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

73 files changed

+32398
-20399
lines changed

‎.ado/templates/setup-repo.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@ steps:
1111
displayName: 'Install Nuget'
1212

1313
- script: |
14-
yarn install --frozen-lockfile
14+
yarn
1515
displayName: 'yarn install'

‎.gitignore

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,4 +102,14 @@ apps/*/.vscode/.react/
102102
.vs/
103103

104104
# Ignore Gradle build output directory
105-
**/android/**/build
105+
**/android/**/build
106+
107+
# Yarn
108+
109+
.pnp.*
110+
**/.yarn/*
111+
!**/.yarn/patches
112+
!**/.yarn/plugins
113+
!**/.yarn/releases
114+
!**/.yarn/sdks
115+
!**/.yarn/versions

‎.npmrc

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

‎.yarn/plugins/@yarnpkg/plugin-compat.cjs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
module.exports = {
2+
name: '@yarnpkg/plugin-compat',
3+
factory: () => ({}),
4+
};

‎.yarn/releases/yarn-3.6.1.cjs

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

‎.yarnrc.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
nodeLinker: node-modules
2+
npmRegistryServer: 'https://registry.npmjs.org'
3+
plugins:
4+
- path: .yarn/plugins/@yarnpkg/plugin-compat.cjs
5+
spec: '@yarnpkg/plugin-compat'
6+
yarnPath: .yarn/releases/yarn-3.6.1.cjs

‎apps/E2E/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"e2etest:android": "wdio run wdio.conf.android.js",
1010
"e2etest:ios": "wdio run wdio.conf.ios.js",
1111
"e2etest:macos": "wdio run wdio.conf.macos.js",
12-
"e2etest:windows": "rimraf errorShots/* reports/* && wdio run wdio.conf.windows.js"
12+
"e2etest:windows": "rimraf errorShots reports && wdio run wdio.conf.windows.js"
1313
},
1414
"repository": {
1515
"type": "git",
@@ -45,6 +45,7 @@
4545
"appium-xcuitest-driver": "4.16.12",
4646
"metro-config": "^0.73.7",
4747
"metro-react-native-babel-preset": "^0.73.7",
48+
"rimraf": "^5.0.1",
4849
"ts-node": "^8.10.1",
4950
"typescript": "4.9.4",
5051
"webdriverio": "7.30.1"

‎apps/fluent-tester/macos/Podfile.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -620,4 +620,4 @@ SPEC CHECKSUMS:
620620

621621
PODFILE CHECKSUM: d3fe834dea1e24594a8ba545f70b5250bbc25c91
622622

623-
COCOAPODS: 1.12.0
623+
COCOAPODS: 1.12.0

‎apps/fluent-tester/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@
4545
"@fluentui-react-native/chip": "^0.1.4",
4646
"@fluentui-react-native/default-theme": ">=0.19.4 <1.0.0",
4747
"@fluentui-react-native/divider": "^0.5.5",
48+
"@fluentui-react-native/drawer": "^0.2.6",
4849
"@fluentui-react-native/dropdown": ">=0.8.15 <1.0.0",
4950
"@fluentui-react-native/experimental-activity-indicator": ">=0.8.4 <1.0.0",
5051
"@fluentui-react-native/experimental-appearance-additions": "^0.5.5",
@@ -61,7 +62,6 @@
6162
"@fluentui-react-native/framework": ">=0.11.3 <1.0.0",
6263
"@fluentui-react-native/icon": "0.19.5",
6364
"@fluentui-react-native/input": "^0.3.7",
64-
"@fluentui-react-native/drawer": "^0.2.6",
6565
"@fluentui-react-native/interactive-hooks": ">=0.24.5 <1.0.0",
6666
"@fluentui-react-native/menu": "^1.11.14",
6767
"@fluentui-react-native/merge-props": ">=0.7.0 <1.0.0",
@@ -106,7 +106,7 @@
106106
"metro-config": "^0.73.7",
107107
"metro-react-native-babel-preset": "^0.73.7",
108108
"react-native-svg-transformer": "^1.0.0",
109-
"react-native-test-app": "^2.2.1",
109+
"react-native-test-app": "^2.5.15",
110110
"react-test-renderer": "18.2.0"
111111
},
112112
"peerDependencies": {

‎apps/win32/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"run-win32-web": "rex-win32 --bundle index --component FluentTester --basePath ./dist --useWebDebugger --windowTitle \"FluentUI Tester\" --useFastRefresh --pluginProps --debugBundlePath index --jsEngine v8",
2222
"run-win32-dev-web": "rex-win32 --bundle index --component FluentTester --basePath ./dist --useDevMain --useWebDebugger --windowTitle \"FluentUI Tester\" --useFastRefresh --pluginProps --debugBundlePath index --jsEngine v8",
2323
"run-win32-devmain": "rex-win32 --bundle index.win32 --component FluentTester --basePath ./dist --useDevMain --windowTitle \"FluentUI Tester\" --pluginProps --debugBundlePath index --jsEngine v8",
24-
"e2etest": "rimraf reports/* && wdio",
24+
"e2etest": "rimraf reports && wdio",
2525
"prettier": "fluentui-scripts prettier",
2626
"prettier-fix": "fluentui-scripts prettier --fix true"
2727
},
@@ -59,6 +59,7 @@
5959
"metro-react-native-babel-preset": "^0.73.7",
6060
"react-native-svg-transformer": "^1.0.0",
6161
"react-test-renderer": "18.2.0",
62+
"rimraf": "^5.0.1",
6263
"ts-node": "^8.10.1",
6364
"typescript": "4.9.4",
6465
"webdriverio": "7.30.1"

‎change/@fluentui-react-native-android-theme-e81f51fa-9e6f-4526-a3d3-f16b5195c3df.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"type": "patch",
3+
"comment": "Result of yarn",
4+
"packageName": "@fluentui-react-native/android-theme",
5+
"email": "[email protected]",
6+
"dependentChangeType": "patch"
7+
}

‎change/@fluentui-react-native-apple-theme-9710948f-e130-4836-abbb-58c8523cf717.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"type": "patch",
3+
"comment": "Update tests",
4+
"packageName": "@fluentui-react-native/apple-theme",
5+
"email": "[email protected]",
6+
"dependentChangeType": "patch"
7+
}

‎change/@fluentui-react-native-button-83a4d8a9-5581-41b3-b418-b8865824ec2b.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"type": "patch",
3+
"comment": "Result of yarn",
4+
"packageName": "@fluentui-react-native/button",
5+
"email": "[email protected]",
6+
"dependentChangeType": "patch"
7+
}

‎change/@fluentui-react-native-checkbox-d44ab384-78c0-4b97-b703-0a93cf6cf87e.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"type": "patch",
3+
"comment": "Result of yarn",
4+
"packageName": "@fluentui-react-native/checkbox",
5+
"email": "[email protected]",
6+
"dependentChangeType": "patch"
7+
}

‎change/@fluentui-react-native-default-theme-82d42906-082b-4b3b-accc-9a52329c1ad5.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"type": "patch",
3+
"comment": "Result of yarn",
4+
"packageName": "@fluentui-react-native/default-theme",
5+
"email": "[email protected]",
6+
"dependentChangeType": "patch"
7+
}

‎change/@fluentui-react-native-dependency-profiles-c13415a4-d428-4a9c-8e26-7c0d75111530.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"type": "patch",
3+
"comment": "Result of yarn",
4+
"packageName": "@fluentui-react-native/dependency-profiles",
5+
"email": "[email protected]",
6+
"dependentChangeType": "patch"
7+
}

‎change/@fluentui-react-native-divider-0f59ff2a-ec34-4a7c-83be-9c10314865cd.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"type": "patch",
3+
"comment": "Result of yarn",
4+
"packageName": "@fluentui-react-native/divider",
5+
"email": "[email protected]",
6+
"dependentChangeType": "patch"
7+
}

‎change/@fluentui-react-native-e2e-testing-f1fd2308-0c5a-4289-bbcb-c088dd1bf9a5.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"type": "patch",
3+
"comment": "Fix for win32?",
4+
"packageName": "@fluentui-react-native/e2e-testing",
5+
"email": "[email protected]",
6+
"dependentChangeType": "patch"
7+
}

‎change/@fluentui-react-native-experimental-shadow-3f811644-01b6-4f3f-acca-2c110cf36132.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"type": "patch",
3+
"comment": "Result of yarn",
4+
"packageName": "@fluentui-react-native/experimental-shadow",
5+
"email": "[email protected]",
6+
"dependentChangeType": "patch"
7+
}

‎change/@fluentui-react-native-experimental-shimmer-7034fb5c-237e-49b3-8dbf-340f7399a4ce.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"type": "patch",
3+
"comment": "Result of yarn",
4+
"packageName": "@fluentui-react-native/experimental-shimmer",
5+
"email": "[email protected]",
6+
"dependentChangeType": "patch"
7+
}

‎change/@fluentui-react-native-experimental-tabs-c1672133-8a37-48f9-abca-cf80fcc6c39e.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"type": "patch",
3+
"comment": "Result of yarn",
4+
"packageName": "@fluentui-react-native/experimental-tabs",
5+
"email": "[email protected]",
6+
"dependentChangeType": "patch"
7+
}

‎change/@fluentui-react-native-framework-dc2819ac-4344-4879-8fbc-3c9579b70247.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"type": "patch",
3+
"comment": "Result of yarn",
4+
"packageName": "@fluentui-react-native/framework",
5+
"email": "[email protected]",
6+
"dependentChangeType": "patch"
7+
}

‎change/@fluentui-react-native-immutable-merge-df9983bc-76aa-4eb7-be8d-c28f47b80334.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"type": "patch",
3+
"comment": "Result of yarn",
4+
"packageName": "@fluentui-react-native/immutable-merge",
5+
"email": "[email protected]",
6+
"dependentChangeType": "patch"
7+
}

‎change/@fluentui-react-native-interactive-hooks-3f7f97b4-5264-47c0-a6be-cdbd14753953.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"type": "patch",
3+
"comment": "Result of yarn",
4+
"packageName": "@fluentui-react-native/interactive-hooks",
5+
"email": "[email protected]",
6+
"dependentChangeType": "patch"
7+
}

‎change/@fluentui-react-native-link-348a3a0b-22af-4a4b-bb4f-e9a121fbad96.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"type": "patch",
3+
"comment": "Result of yarn",
4+
"packageName": "@fluentui-react-native/link",
5+
"email": "[email protected]",
6+
"dependentChangeType": "patch"
7+
}

‎change/@fluentui-react-native-memo-cache-5afd4125-c5c4-419f-bf43-5d46b9605b32.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"type": "patch",
3+
"comment": "Result of yarn",
4+
"packageName": "@fluentui-react-native/memo-cache",
5+
"email": "[email protected]",
6+
"dependentChangeType": "patch"
7+
}

‎change/@fluentui-react-native-persona-21b44213-9afe-41fb-b542-f12bd241a705.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"type": "patch",
3+
"comment": "Result of yarn",
4+
"packageName": "@fluentui-react-native/persona",
5+
"email": "[email protected]",
6+
"dependentChangeType": "patch"
7+
}

‎change/@fluentui-react-native-persona-coin-6d832698-6b56-4a37-83fd-f0bb8e1e514e.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"type": "patch",
3+
"comment": "Result of yarn",
4+
"packageName": "@fluentui-react-native/persona-coin",
5+
"email": "[email protected]",
6+
"dependentChangeType": "patch"
7+
}

‎change/@fluentui-react-native-radio-group-2ab4ff86-93d3-425d-bd40-e048a024a18b.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"type": "patch",
3+
"comment": "Result of yarn",
4+
"packageName": "@fluentui-react-native/radio-group",
5+
"email": "[email protected]",
6+
"dependentChangeType": "patch"
7+
}

‎change/@fluentui-react-native-spinner-3a68e2c1-ab87-4816-9f3f-e9affad4bcea.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"type": "patch",
3+
"comment": "Result of yarn",
4+
"packageName": "@fluentui-react-native/spinner",
5+
"email": "[email protected]",
6+
"dependentChangeType": "patch"
7+
}

‎change/@fluentui-react-native-stack-4ac428b8-7024-4fd2-82e0-a6487a9abd5a.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"type": "patch",
3+
"comment": "Result of yarn",
4+
"packageName": "@fluentui-react-native/stack",
5+
"email": "[email protected]",
6+
"dependentChangeType": "patch"
7+
}

‎change/@fluentui-react-native-tablist-23a5e58d-22d5-48fd-9312-69e24d3a6b2e.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"type": "patch",
3+
"comment": "Result of yarn",
4+
"packageName": "@fluentui-react-native/tablist",
5+
"email": "[email protected]",
6+
"dependentChangeType": "patch"
7+
}

‎change/@fluentui-react-native-tester-c5a3dbab-56a4-41b7-8d0a-fcd494d70eff.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"type": "patch",
3+
"comment": "Result of yarn",
4+
"packageName": "@fluentui-react-native/tester",
5+
"email": "[email protected]",
6+
"dependentChangeType": "patch"
7+
}

‎change/@fluentui-react-native-tester-win32-72de0ab1-a8ac-45de-988e-7d5b96eddc28.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"type": "patch",
3+
"comment": "Fix for win32?",
4+
"packageName": "@fluentui-react-native/tester-win32",
5+
"email": "[email protected]",
6+
"dependentChangeType": "patch"
7+
}

‎change/@fluentui-react-native-text-e095a712-25e2-48b9-9929-3f09ba841041.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"type": "patch",
3+
"comment": "Result of yarn",
4+
"packageName": "@fluentui-react-native/text",
5+
"email": "[email protected]",
6+
"dependentChangeType": "patch"
7+
}

‎change/@fluentui-react-native-win32-theme-bae3a97d-2712-4798-9a57-2fb038e0ddbd.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"type": "patch",
3+
"comment": "Result of yarn",
4+
"packageName": "@fluentui-react-native/win32-theme",
5+
"email": "[email protected]",
6+
"dependentChangeType": "patch"
7+
}

‎change/@uifabricshared-foundation-composable-58dfee3b-197b-4430-8df3-7289d51ef015.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"type": "patch",
3+
"comment": "Result of yarn",
4+
"packageName": "@uifabricshared/foundation-composable",
5+
"email": "[email protected]",
6+
"dependentChangeType": "patch"
7+
}

‎change/@uifabricshared-foundation-compose-6dd328f5-e185-4d1d-b3ad-47b079efc9f9.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"type": "patch",
3+
"comment": "Result of yarn",
4+
"packageName": "@uifabricshared/foundation-compose",
5+
"email": "[email protected]",
6+
"dependentChangeType": "patch"
7+
}

‎change/@uifabricshared-theming-ramp-28d42dda-a952-4b82-b880-d2d056055ea6.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"type": "patch",
3+
"comment": "Result of yarn",
4+
"packageName": "@uifabricshared/theming-ramp",
5+
"email": "[email protected]",
6+
"dependentChangeType": "patch"
7+
}

‎package.json

Lines changed: 8 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@
3535
},
3636
"devDependencies": {
3737
"@babel/core": "^7.8.0",
38+
"@babel/plugin-proposal-private-property-in-object": "^7.21.11",
3839
"@babel/preset-env": "^7.8.0",
3940
"@babel/preset-react": "^7.8.0",
4041
"@babel/preset-typescript": "^7.8.0",
41-
"@babel/plugin-proposal-private-property-in-object": "^7.21.11",
4242
"@rnx-kit/align-deps": "^2.2.2",
4343
"babel-jest": "^24.9.0",
4444
"beachball": "^2.20.0",
@@ -55,21 +55,11 @@
5555
"react-dom": "^18.2.0",
5656
"react-native": "^0.71.0"
5757
},
58-
"workspaces": {
59-
"packages": [
60-
"apps/*",
61-
"packages/**",
62-
"scripts"
63-
],
64-
"nohoist": [
65-
"@fluentui-react-native/e2e-testing/appium-windows-driver",
66-
"@fluentui-react-native/e2e-testing/appium-mac2-driver",
67-
"@fluentui-react-native/e2e-testing/appium-xcuitest-driver",
68-
"@fluentui-react-native/tester-win32/appium-windows-driver",
69-
"@fluentui-react-native/e2e-testing/appium-uiautomator2-driver",
70-
"@fluentui-react-native/e2e-testing/appium-uiautomator2-server"
71-
]
72-
},
58+
"workspaces": [
59+
"apps/*",
60+
"packages/**",
61+
"scripts"
62+
],
7363
"resolutions": {
7464
"@appium/support": "3.1.5",
7565
"es5-ext": "0.10.53",
@@ -99,5 +89,6 @@
9989
"react-dom"
10090
]
10191
}
102-
}
92+
},
93+
"packageManager": "[email protected]"
10394
}

0 commit comments

Comments
 (0)