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"

0 commit comments

Comments
 (0)