-
Notifications
You must be signed in to change notification settings - Fork 170
Switch fluentui-react-native to pnpm mode #3984
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
18 commits
Select commit
Hold shift + click to select a range
75f15b3
switch over to pnpm and make non-appium fixes
JasonVMo c4f80ac
first stage of appium fixes
JasonVMo c84bed4
fix type errors after upgrading to new appium version
JasonVMo 710f0de
get e2e tests running
JasonVMo 99c32e9
use cross-env to normalize the e2e commands for both prep and run
JasonVMo 898ae67
having peer dependencies on the root package breaks scripts in pnpm m…
JasonVMo ed1cfc2
Change files
JasonVMo c114bd9
fix some pipeline failures
JasonVMo e365f8e
use the right node
JasonVMo 4df8799
set global folder to be inside repo
JasonVMo 00cf866
fix ado scripts and attempt to fix win32 launching
JasonVMo 1c88d27
Change files
JasonVMo 5ab78ab
fix align-deps issue
JasonVMo bf6aa31
fix incorrect type fixes
JasonVMo 831dd2a
update e2e typings and usage
JasonVMo 0af55d4
bump typescript to 5.8+ for tester and e2e packages to address type l…
JasonVMo f4502eb
fix win32 tests
JasonVMo 2fda5d1
comment only updates from PR feedback
JasonVMo File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -115,4 +115,7 @@ apps/*/.vscode/.react/ | |
| !**/.yarn/versions | ||
|
|
||
| # Ccache | ||
| .ccache | ||
| .ccache | ||
|
|
||
| # Appium | ||
| **/.appium | ||
97 changes: 97 additions & 0 deletions
97
.yarn/patches/expect-webdriverio-npm-5.6.1-69666d39e9.patch
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,97 @@ | ||
| diff --git a/lib/index.js b/lib/index.js | ||
| index cff5a1256df83e746d874c5ca722d5b3b8c8ac3c..178a004a0b4231a6be964b8c33d153a2525ac168 100644 | ||
| --- a/lib/index.js | ||
| +++ b/lib/index.js | ||
| @@ -20,18 +20,26 @@ expectLib.extend = (m) => { | ||
| }; | ||
| expectLib.extend(filteredMatchers); | ||
| const expectWithSoft = expectLib; | ||
| -Object.defineProperty(expectWithSoft, 'soft', { | ||
| - value: (actual) => createSoftExpect(actual) | ||
| -}); | ||
| -Object.defineProperty(expectWithSoft, 'getSoftFailures', { | ||
| - value: (testId) => SoftAssertService.getInstance().getFailures(testId) | ||
| -}); | ||
| -Object.defineProperty(expectWithSoft, 'assertSoftFailures', { | ||
| - value: (testId) => SoftAssertService.getInstance().assertNoFailures(testId) | ||
| -}); | ||
| -Object.defineProperty(expectWithSoft, 'clearSoftFailures', { | ||
| - value: (testId) => SoftAssertService.getInstance().clearFailures(testId) | ||
| -}); | ||
| +if (!Object.prototype.hasOwnProperty.call(expectWithSoft, 'soft')) { | ||
| + Object.defineProperty(expectWithSoft, 'soft', { | ||
| + value: (actual) => createSoftExpect(actual) | ||
| + }); | ||
| +} | ||
| +if (!Object.prototype.hasOwnProperty.call(expectWithSoft, 'getSoftFailures')) { | ||
| + Object.defineProperty(expectWithSoft, 'getSoftFailures', { | ||
| + value: (testId) => SoftAssertService.getInstance().getFailures(testId) | ||
| + }); | ||
| +} | ||
| +if (!Object.prototype.hasOwnProperty.call(expectWithSoft, 'assertSoftFailures')) { | ||
| + Object.defineProperty(expectWithSoft, 'assertSoftFailures', { | ||
| + value: (testId) => SoftAssertService.getInstance().assertNoFailures(testId) | ||
| + }); | ||
| +} | ||
| +if (!Object.prototype.hasOwnProperty.call(expectWithSoft, 'clearSoftFailures')) { | ||
| + Object.defineProperty(expectWithSoft, 'clearSoftFailures', { | ||
| + value: (testId) => SoftAssertService.getInstance().clearFailures(testId) | ||
| + }); | ||
| +} | ||
| export const expect = expectWithSoft; | ||
| export const getConfig = () => DEFAULT_OPTIONS; | ||
| export const setDefaultOptions = (options = {}) => { | ||
| diff --git a/lib/index.js.bak b/lib/index.js.bak | ||
| new file mode 100644 | ||
| index 0000000000000000000000000000000000000000..cff5a1256df83e746d874c5ca722d5b3b8c8ac3c | ||
| --- /dev/null | ||
| +++ b/lib/index.js.bak | ||
| @@ -0,0 +1,48 @@ | ||
| +import { expect as expectLib } from 'expect'; | ||
| +import * as wdioMatchers from './matchers.js'; | ||
| +import { DEFAULT_OPTIONS } from './constants.js'; | ||
| +import createSoftExpect from './softExpect.js'; | ||
| +import { SoftAssertService } from './softAssert.js'; | ||
| +export const matchers = new Map(); | ||
| +const filteredMatchers = {}; | ||
| +const extend = expectLib.extend; | ||
| +Object.keys(wdioMatchers).forEach(matcher => { | ||
| + if (typeof wdioMatchers[matcher] === 'function') { | ||
| + filteredMatchers[matcher] = wdioMatchers[matcher]; | ||
| + } | ||
| +}); | ||
| +expectLib.extend = (m) => { | ||
| + if (!m || typeof m !== 'object') { | ||
| + return; | ||
| + } | ||
| + Object.entries(m).forEach(([name, matcher]) => matchers.set(name, matcher)); | ||
| + return extend(m); | ||
| +}; | ||
| +expectLib.extend(filteredMatchers); | ||
| +const expectWithSoft = expectLib; | ||
| +Object.defineProperty(expectWithSoft, 'soft', { | ||
| + value: (actual) => createSoftExpect(actual) | ||
| +}); | ||
| +Object.defineProperty(expectWithSoft, 'getSoftFailures', { | ||
| + value: (testId) => SoftAssertService.getInstance().getFailures(testId) | ||
| +}); | ||
| +Object.defineProperty(expectWithSoft, 'assertSoftFailures', { | ||
| + value: (testId) => SoftAssertService.getInstance().assertNoFailures(testId) | ||
| +}); | ||
| +Object.defineProperty(expectWithSoft, 'clearSoftFailures', { | ||
| + value: (testId) => SoftAssertService.getInstance().clearFailures(testId) | ||
| +}); | ||
| +export const expect = expectWithSoft; | ||
| +export const getConfig = () => DEFAULT_OPTIONS; | ||
| +export const setDefaultOptions = (options = {}) => { | ||
| + Object.entries(options).forEach(([key, value]) => { | ||
| + if (key in DEFAULT_OPTIONS) { | ||
| + DEFAULT_OPTIONS[key] = value; | ||
| + } | ||
| + }); | ||
| +}; | ||
| +export const setOptions = setDefaultOptions; | ||
| +export { SnapshotService } from './snapshot.js'; | ||
| +export { SoftAssertService } from './softAssert.js'; | ||
| +export { SoftAssertionService } from './softAssertService.js'; | ||
| +export * as utils from './utils.js'; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,23 +1,82 @@ | ||
| dynamicPackageExtensions: ./scripts/dynamic.extensions.mjs | ||
| catalog: | ||
| '@types/jasmine': '5.1.13' | ||
| '@wdio/appium-service': '^9.23.0' | ||
| '@wdio/cli': '^9.23.0' | ||
| '@wdio/globals': '^9.23.0' | ||
| '@wdio/jasmine-framework': '^9.23.0' | ||
| '@wdio/json-reporter': '^9.20.0' | ||
| '@wdio/local-runner': '^9.23.0' | ||
| '@wdio/logger': '^9.18.0' | ||
| '@wdio/runner': '^9.23.0' | ||
| '@wdio/spec-reporter': '^9.20.0' | ||
| 'appium': '^3.1.2' | ||
| 'appium-mac2-driver': '^3.2.13' | ||
| 'appium-uiautomator2-driver': '^6.7.8' | ||
| 'appium-windows-driver': '^5.1.5' | ||
| 'appium-xcuitest-driver': '^10.14.5' | ||
| 'expect-webdriverio': '^5.6.1' | ||
| 'rimraf': '^6.1.2' | ||
| 'webdriverio': '^9.23.0' | ||
|
|
||
| enableGlobalCache: false | ||
| dynamicPackageExtensions: ./scripts/dynamic.extensions.mjs | ||
|
|
||
| enableScripts: false | ||
|
|
||
| nodeLinker: node-modules | ||
| globalFolder: .yarn/store | ||
|
|
||
| nodeLinker: pnpm | ||
|
|
||
| packageExtensions: | ||
| "@svgr/core@*": | ||
| 'appium@*': | ||
| dependencies: | ||
| '@colors/colors': '*' | ||
| 'appium-mac2-driver': '*' | ||
| 'appium-uiautomator2-driver': '*' | ||
| 'appium-windows-driver': '*' | ||
| 'appium-xcuitest-driver': '*' | ||
| 'appium-mac2-driver@*': | ||
| dependencies: | ||
| 'appium': '*' | ||
| 'appium-uiautomator2-driver@*': | ||
| dependencies: | ||
| 'appium': '*' | ||
| 'appium-windows-driver@*': | ||
| dependencies: | ||
| 'appium': '*' | ||
| 'appium-xcuitest-driver@*': | ||
| dependencies: | ||
| 'appium': '*' | ||
| 'iconv-lite@*': | ||
| dependencies: | ||
| 'iconv-lite': '*' | ||
| '@wdio/appium-service@*': | ||
| dependencies: | ||
| 'appium': '*' | ||
| 'appium-webdriveragent@*': | ||
| dependencies: | ||
| appium-xcode: '*' | ||
| 'expect-webdriverio@*': | ||
| dependencies: | ||
| '@wdio/globals': '*' | ||
| '@wdio/logger': '*' | ||
| 'webdriverio': '*' | ||
| '@wdio/runner@*': | ||
| dependencies: | ||
| 'expect-webdriverio': '*' | ||
| '@wdio/jasmine-framework@*': | ||
| dependencies: | ||
| 'expect-webdriverio': '*' | ||
| '@svgr/core@*': | ||
| dependencies: | ||
| "@svgr/plugin-jsx": "*" | ||
| "@svgr/plugin-svgo": "*" | ||
| '@svgr/plugin-jsx': '*' | ||
| '@svgr/plugin-svgo': '*' | ||
| react-native-svg@*: | ||
| dependencies: | ||
| buffer: "*" | ||
| buffer: '*' | ||
|
|
||
| plugins: | ||
| - checksum: 672e525b81762c6162366bd3ffec5e86ab8fac2655ef0267047e86a0f32e79a4bde0f170bc30479663f40aa3f006d91f8dc3289f679dd4dc5ae5a5d12ba3ad0b | ||
| path: .yarn/plugins/@rnx-kit/yarn-plugin-dynamic-extensions.cjs | ||
| spec: "https://raw.githubusercontent.com/microsoft/rnx-kit/main/incubator/yarn-plugin-dynamic-extensions/index.js" | ||
| spec: 'https://raw.githubusercontent.com/microsoft/rnx-kit/main/incubator/yarn-plugin-dynamic-extensions/index.js' | ||
|
|
||
| yarnPath: .yarn/releases/yarn-4.11.0.cjs |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.