Skip to content

Unify all the macOS diff tags #1392

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 3 commits into from
Jan 10, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 2 additions & 2 deletions .circleci/Dockerfiles/Dockerfile.android
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
# Patch it to use mcr for the base ubuntu image, build the community image locally
# and then build this customized step on top of it.
#
# Disabeling this is okay because per (macOS GH#774) this test, which is redundant to Azure Devops test,
# failsin the fork because of Microsoft's V8 upgrade to Android
# Disabling this is okay because per (Github#774) this test, which is redundant to Azure Devops test,
# fails in the fork because of Microsoft's V8 upgrade to Android
#
#FROM reactnativecommunity/react-native-android:5.2

Expand Down
22 changes: 11 additions & 11 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -329,7 +329,7 @@ jobs:
- run:
name: "Run Tests: JavaScript Tests"
command: node ./scripts/run-ci-javascript-tests.js --maxWorkers 2
# TODO(macOS GH#949): Disable this failing test
# [macOS] Github#949 Disable this failing test
# - run_e2e:
# platform: js

Expand Down Expand Up @@ -904,12 +904,12 @@ workflows:
run_disabled_tests: false
filters:
branches:
# TODO(macOS GH#774): disable this test which is redundant to Azure Devops test and it requires a CCI plan with resource-class:large.
# [macOS] disable this test which is redundant to Azure Devops test and it requires a CCI plan with resource-class:large.
ignore: /.*/
- test_android_template:
filters:
branches:
# TODO(macOS GH#774): disable this test which is redundant to Azure Devops test and it requires a CCI plan with resource-class:large.
# [macOS] disable this test which is redundant to Azure Devops test and it requires a CCI plan with resource-class:large.
ignore: /.*/
- test_ios_template:
requires:
Expand Down Expand Up @@ -941,7 +941,7 @@ workflows:
# use_hermes: true
# use_frameworks: true
# run_unit_tests: true
# TODO(macOS GH#949): Disable this failing test
# [macOS] Github#949 Disable this failing test
# - test_js:
# name: test_js_prev_lts
# executor: nodeprevlts
Expand All @@ -951,15 +951,15 @@ workflows:
- test_docker:
filters:
branches:
# TODO(macOS GH#774): disable this test which is redundant to Azure Devops test and in the fork it fails because of Microsoft's V8 upgrade to Android
# [macOS] disable this test which is redundant to Azure Devops test and in the fork it fails because of Microsoft's V8 upgrade to Android
ignore: /.*/
- test_windows:
filters:
branches:
# [TODO(macOS GH#774): disable this test which requires a CCI plan.
# [macOS disable this test which requires a CCI plan.
# ignore: gh-pages
ignore: /.*/
# ]TODO(macOS GH#774)
# macOS]
run_disabled_tests: false

# This workflow should only be triggered by release script
Expand Down Expand Up @@ -1009,23 +1009,23 @@ workflows:

# Gather coverage
- js_coverage:
# [TODO(macOS GH#774): disable this test, it fails in the fork due to not being set up for coveralls
# [macOS disable this test, it fails in the fork due to not being set up for coveralls
filters:
branches:
ignore: /.*/
# ]TODO(macOS GH#774)
# macOS]
nightly:
unless: << pipeline.parameters.run_package_release_workflow_only >>
triggers:
- schedule:
cron: "0 20 * * *"
filters:
branches:
# [TODO(macOS GH#774): disable this release. We never want to release anything from this fork via CCI.
# [macOS disable this release. We never want to release anything from this fork via CCI.
ignore: /.*/
# only:
# - main
# ]TODO(macOS GH#774)
# macOS]
jobs:
- nightly_job

Expand Down
4 changes: 2 additions & 2 deletions .flowconfig
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[ignore]
; We fork some components by platform
.*/*[.]android.js
; TODO(macOS GH#774):
; [macOS]
.*/*[.]macos.js

; Ignore templates for 'react-native init'
Expand All @@ -13,7 +13,7 @@
; Ignore "BUCK" generated dirs
<PROJECT_ROOT>/\.buckd/

; TODO(macOS GH#774): Ignore metro.config.js
; [macOS] Ignore metro.config.js
<PROJECT_ROOT>/metro.config.js

; Flow doesn't support platforms
Expand Down
6 changes: 3 additions & 3 deletions .flowconfig.android
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[ignore]
; We fork some components by platform
.*/*[.]ios.js
; TODO(macOS GH#774):
; [macOS]
.*/*[.]macos.js

; Ignore templates for 'react-native init'
Expand All @@ -13,7 +13,7 @@
; Ignore "BUCK" generated dirs
<PROJECT_ROOT>/\.buckd/

; TODO(macOS GH#774): Ignore metro.config.js
; [macOS] Ignore metro.config.js
<PROJECT_ROOT>/metro.config.js

; Flow doesn't support platforms
Expand Down Expand Up @@ -45,7 +45,7 @@ module.file_ext=.js
module.file_ext=.json
module.file_ext=.android.js

# TODO(macOS GH#774):
# [macOS]
module.system.haste.name_reducers='^\(.*\)\.macos$' -> '\1'

munge_underscores=true
Expand Down
4 changes: 2 additions & 2 deletions .flowconfig.macos
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[ignore]
; TODO(macOS GH#774)
; [macOS]
; We fork some components by platform
.*/*[.]ios.js
.*/*[.]android.js
Expand All @@ -13,7 +13,7 @@
; Ignore "BUCK" generated dirs
<PROJECT_ROOT>/\.buckd/

; TODO(macOS GH#774): Ignore metro.config.js
; [macOS Ignore metro.config.js
<PROJECT_ROOT>/metro.config.js

; Flow doesn't support platforms
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-docker-android.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# TODO(macOS GH#774) - disable this test
# [macOS] disable this test

# name: Test Docker Android Image
# # This workflow is triggered on commits to main and pull requests.
Expand Down
6 changes: 3 additions & 3 deletions IntegrationTests/LayoutEventsTest.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
const React = require('react');
const ReactNative = require('react-native');
const {Image, LayoutAnimation, StyleSheet, Text, View} = ReactNative;
const {Platform} = ReactNative; // TODO(macOS GH#774)
const {Platform} = ReactNative; // [macOS]
const {TestModule} = ReactNative.NativeModules;

import type {ViewStyleProp} from 'react-native/Libraries/StyleSheet/StyleSheet';
Expand Down Expand Up @@ -54,8 +54,8 @@ class LayoutEventsTest extends React.Component<Props, State> {
animateViewLayout() {
debug('animateViewLayout invoked');
LayoutAnimation.configureNext(
Platform.OS === 'macos' // [TODO(macOS GH#774)
? LayoutAnimation.Presets.easeInEaseOut // ]TODO(macOS GH#774)
Platform.OS === 'macos' // [macOS
? LayoutAnimation.Presets.easeInEaseOut // macOS]
: LayoutAnimation.Presets.spring,
() => {
debug('animateViewLayout done');
Expand Down
2 changes: 1 addition & 1 deletion Libraries/ActionSheetIOS/React-RCTActionSheet.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ Pod::Spec.new do |s|
s.documentation_url = "https://reactnative.dev/docs/actionsheetios"
s.license = package["license"]
s.author = "Facebook, Inc. and its affiliates"
s.platforms = { :ios => "11.0", :osx => "10.15" } # TODO(macOS GH#214)
s.platforms = { :ios => "11.0", :osx => "10.15" } # [macOS]
s.source = source
s.source_files = "*.{m}"
s.preserve_paths = "package.json", "LICENSE", "LICENSE-docs"
Expand Down
20 changes: 10 additions & 10 deletions Libraries/Alert/Alert.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,21 +24,21 @@ export type Buttons = Array<{
style?: AlertButtonStyle,
...
}>;
// [TODO(macOS GH#774)
// [macOS
export type DefaultInputsArray = Array<{
default?: string,
placeholder?: string,
style?: AlertButtonStyle,
}>;
// ]TODO(macOS GH#774)
// macOS]

type Options = {
cancelable?: ?boolean,
onDismiss?: ?() => void,
// [TODO(macOS GH#774)
// [macOS
modal?: ?boolean,
critical?: ?boolean,
// ]TODO(macOS GH#774)
// macOS]
...
};

Expand All @@ -56,7 +56,7 @@ class Alert {
): void {
if (Platform.OS === 'ios') {
Alert.prompt(title, message, buttons, 'default');
// [TODO(macOS ISS#2323203)
// [macOS
} else if (Platform.OS === 'macos') {
Alert.promptMacOS(
title,
Expand All @@ -67,7 +67,7 @@ class Alert {
options?.modal,
options?.critical,
);
// ]TODO(macOS ISS#2323203)
// macOS]
} else if (Platform.OS === 'android') {
const NativeDialogManagerAndroid =
require('../NativeModules/specs/NativeDialogManagerAndroid').default;
Expand Down Expand Up @@ -170,15 +170,15 @@ class Alert {
cb && cb(value);
},
);
// [TODO(macOS GH#774)
// [macOS
} else if (Platform.OS === 'macos') {
const defaultInputs = [{default: defaultValue}];
Alert.promptMacOS(title, message, callbackOrButtons, type, defaultInputs);
}
// ]TODO(macOS GH#774)
// macOS]
}

// [TODO(macOS GH#774)
// [macOS
/**
* Create and display a prompt to enter some text.
* @static
Expand Down Expand Up @@ -266,7 +266,7 @@ class Alert {
},
);
}
// ]TODO(macOS GH#774)
// macOS]
}

module.exports = Alert;
4 changes: 2 additions & 2 deletions Libraries/Alert/NativeAlertManager.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ export type Args = {|
cancelButtonKey?: string,
destructiveButtonKey?: string,
keyboardType?: string,
// [TODO(macOS GH#774)
// [macOS
defaultInputs?: Array<Object>,
modal?: ?boolean,
critical?: ?boolean,
// ]TODO(macOS GH#774)
// macOS]
|};

export interface Spec extends TurboModule {
Expand Down
2 changes: 1 addition & 1 deletion Libraries/Alert/RCTAlertManager.macos.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
* @flow strict-local
*/

// TODO(macOS GH#774)
// [macOS]

/* $FlowFixMe allow macOS to share iOS file */
const alertWithArgs = require('./RCTAlertManager.ios');
Expand Down
4 changes: 2 additions & 2 deletions Libraries/Animated/AnimatedMock.js
Original file line number Diff line number Diff line change
Expand Up @@ -98,11 +98,11 @@ const spring = function (
return {
...emptyAnimation,
start: mockAnimationStart((callback?: ?EndCallback): void => {
// [TODO(macOS GH#774) - setValue can't handle AnimatedNodes
// [macOS setValue can't handle AnimatedNodes
if (config.toValue instanceof AnimatedNode) {
anyValue.setValue(config.toValue.__getValue());
} else {
// ]TODO(macOS GH#774)
// macOS]
anyValue.setValue(config.toValue);
}
callback?.({finished: true});
Expand Down
2 changes: 1 addition & 1 deletion Libraries/Animated/NativeAnimatedHelper.js
Original file line number Diff line number Diff line change
Expand Up @@ -403,7 +403,7 @@ module.exports = {
nativeEventEmitter = new NativeEventEmitter(
// T88715063: NativeEventEmitter only used this parameter on iOS. Now it uses it on all platforms, so this code was modified automatically to preserve its behavior
// If you want to use the native module on other platforms, please remove this condition and test its behavior
Platform.OS !== 'ios' && Platform.OS !== 'macos' // TODO(macOS GH#774): Also use this parameter on macOS
Platform.OS !== 'ios' && Platform.OS !== 'macos' // [macOS] Also use this parameter on macOS
? null
: NativeAnimatedModule,
);
Expand Down
2 changes: 1 addition & 1 deletion Libraries/AppState/AppState.js
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ class AppState {
new NativeEventEmitter(
// T88715063: NativeEventEmitter only used this parameter on iOS. Now it uses it on all platforms, so this code was modified automatically to preserve its behavior
// If you want to use the native module on other platforms, please remove this condition and test its behavior
Platform.OS !== 'ios' && Platform.OS !== 'macos' // TODO(macOS GH#774): Also use this parameter on macOS
Platform.OS !== 'ios' && Platform.OS !== 'macos' // [macOS] Also use this parameter on macOS
? null
: NativeAppState,
);
Expand Down
2 changes: 1 addition & 1 deletion Libraries/Blob/React-RCTBlob.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ Pod::Spec.new do |s|
s.homepage = "https://reactnative.dev/"
s.license = package["license"]
s.author = "Facebook, Inc. and its affiliates"
s.platforms = { :ios => "11.0", :osx => "10.15" } # TODO(macOS GH#214)
s.platforms = { :ios => "11.0", :osx => "10.15" } # [macOS]
s.compiler_flags = folly_compiler_flags + ' -Wno-nullability-completeness'
s.source = source
s.source_files = "*.{h,m,mm}"
Expand Down
Loading