@react-native-oh/react-native-harmony 0.72.86 → 0.77.18

package/package.json

@@ -1,59 +1,80 @@
 {
   "name": "@react-native-oh/react-native-harmony",
-  "version": "0.72.86",
+  "version": "0.77.18",
   "description": "",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
     "access": "public"
   },
+  "license": "MIT",
+  "author": "",
+  "types": "types/index.harmony.d.ts",
+  "files": [
+    "./Libraries/**/*",
+    "./delegates/**/*",
+    "./src/**/*",
+    "./types/**/*",
+    "./*.js",
+    "./*.json",
+    "./LICENSE",
+    "./LICENSE-Meta",
+    "./NOTICE.md",
+    "./metro.config.d.ts",
+    "./react_native_openharmony.har"
+  ],
   "scripts": {
-    "install:local-cli": "cd ../react-native-harmony-cli && npm pack && cd ../react-native-harmony && npm i ../react-native-harmony-cli/rnoh-react-native-harmony-cli-0.0.25.tgz && cd ../react-native-harmony",
-    "prepublishOnly": "npm run verify",
-    "hermes:build": "sh ./scripts/build-hermes.sh",
-    "update_version": "node ./scripts/update-version.js",
-    "gen:changelog": "node ./scripts/generate-changelog.js",
-    "deploy": "node ./scripts/deploy.js",
-    "verify": "react-native verify-package-harmony --package-path . --skip-checks oh_package_name_is_derived_from_npm_package_name",
-    "test": "jest"
+    "build": "node ./scripts/build-har.js",
+    "build:har": "node ./scripts/build-har.js",
+    "build:hermes": "sh ./scripts/build-hermes.sh",
+    "prepack": "cd .. && pnpm _integrate-upstream-code && cd react-native-harmony && pnpm build:har",
+    "test": "jest",
+    "verify": "npm run test"
   },
-  "author": "",
-  "license": "MIT",
-  "peerDependencies": {
-    "react-native": "0.72.5"
+  "dependencies": {
+    "@react-native/assets-registry": "0.77.1",
+    "@react-native/js-polyfills": "0.77.1",
+    "@react-native/normalize-colors": "0.77.1",
+    "@react-native/virtualized-lists": "0.77.1",
+    "abort-controller": "^3.0.0",
+    "anser": "^1.4.9",
+    "ansi-regex": "^5.0.0",
+    "base64-js": "^1.5.1",
+    "colors": "^1.4.0",
+    "event-target-shim": "^5.0.1",
+    "invariant": "^2.2.4",
+    "memoize-one": "^5.0.0",
+    "metro-runtime": "^0.81.0",
+    "nullthrows": "^1.1.1",
+    "pretty-format": "^29.7.0",
+    "promise": "^8.3.0",
+    "react-devtools-core": "^6.0.1",
+    "react-refresh": "^0.14.0",
+    "regenerator-runtime": "^0.13.2",
+    "scheduler": "0.24.0-canary-efb381bbf-20230505",
+    "stacktrace-parser": "^0.1.10",
+    "whatwg-fetch": "^3.0.0"
   },
-  "types": "types",
   "devDependencies": {
-    "@react-native-community/cli": "^11.2.0",
     "@react-native-community/cli-types": "^11.2.0",
-    "@react-native/metro-config": "^0.72.6",
-    "@tsconfig/react-native": "^2.0.3",
-    "@types/fs-extra": "^11.0.1",
-    "@types/jest": "^29.5.12",
-    "@types/node": "^18.16.0",
+    "@react-native/metro-config": "0.77.1",
+    "@react-native/typescript-config": "0.77.1",
+    "@types/invariant": "^2.2.37",
+    "@types/jest": "^29.5.14",
+    "@types/node": "^22.7.5",
     "@types/react": "^18.2.24",
     "@types/tmp": "^0.2.6",
     "jest": "^29.5.0",
-    "json5": "^2.2.3",
-    "rimraf": "^5.0.0",
+    "metro": "^0.81.0",
+    "metro-config": "0.80.12",
     "tmp": "^0.2.1",
     "ts-jest": "^29.1.2",
-    "ts-node": "^10.9.1",
     "typescript": "^5.0.4"
   },
-  "files": [
-    "./Libraries/**/*",
-    "./types/**/*",
-    "./*.js",
-    "./*.json",
-    "./harmony/*",
-    "./*.har"
-  ],
-  "dependencies": {
-    "@react-native-oh/react-native-harmony-cli": "^0.0.36",
-    "colors": "^1.4.0",
-    "fs-extra": "^11.1.1",
-    "metro": "^0.76.3",
-    "metro-config": "^0.76.3"
+  "peerDependencies": {
+    "react-native": "0.77.1"
+  },
+  "engines": {
+    "node": ">=18"
   },
   "harmony": {
     "autolinking": null

package/react-native.config.js

@@ -1,17 +1,65 @@
+const pathUtils = require('node:path');
+
+let commands = [];
+try {
+  const harmony = require('@react-native-oh/react-native-harmony-cli');
+  commands = harmony?.config?.commands;
+} catch (err) {
+  if (typeof err === 'object' && err?.code === 'MODULE_NOT_FOUND') {
+    console.warn(
+      'react-native-harmony is installed but @react-native-oh/react-native-harmony-cli is not. "*-harmony" commands are unavailable. Please install @react-native-oh/react-native-harmony-cli in your project. This change was introduced in React native 0.76.\n'
+    );
+  }
+}
+
 /**
- * Copyright (c) 2024 Huawei Technologies Co., Ltd.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE-MIT file in the root directory of this source tree.
+ * Package name shouldn't be hardcoded because this package can be installed under an alias.
  */
-
-const { config: harmonyConfig } = require('@react-native-oh/react-native-harmony-cli')
+const rnohNpmPackageName =
+  deriveFullNpmPackageNameFromDirname(__dirname) ??
+  '@react-native-oh/react-native-harmony';
 
 /**
  * @type {import("@react-native-community/cli-types").Config}
  */
 const config = {
-  commands: harmonyConfig.commands,
-}
+  commands,
+  platforms: {
+    harmony: {
+      npmPackageName: rnohNpmPackageName,
+      projectConfig: () => ({}),
+      dependencyConfig: () => ({}),
+    },
+  },
+};
 
-module.exports = config
+module.exports = config;
+
+/**
+ * @param {string} dirname
+ * @return {string | null}
+ */
+function deriveFullNpmPackageNameFromDirname(dirname) {
+  const pathSegments = dirname.split(pathUtils.sep);
+  if (pathSegments.includes('node_modules')) {
+    /**
+     * Production environment
+     */
+    const nodeModulesIndex = pathSegments.indexOf('node_modules');
+    const organizationNameMaybeAndPackageName = pathSegments.slice(
+      nodeModulesIndex + 1
+    );
+    if (organizationNameMaybeAndPackageName.length === 1) {
+      return organizationNameMaybeAndPackageName[0]; // packageName
+    }
+    if (organizationNameMaybeAndPackageName.length === 2) {
+      return organizationNameMaybeAndPackageName.join('/');
+    }
+    return null;
+  } else {
+    /**
+     * RNOH development environment
+     */
+    return null;
+  }
+}

package/tsconfig.json

@@ -1,14 +1,20 @@
 {
   "extends": [
-    "@tsconfig/react-native/tsconfig.json",
+    "@react-native/typescript-config/tsconfig.json",
   ],
-  "exclude": [
-    "./harmony/cpp"
+  "include": [
+    "metro.config.js",
+    "react-native.config.js",
+    "index.js",
+    "tests"
   ],
   "compilerOptions": {
+    "noImplicitAny": false,
+    "allowJs": true,
     "types": [
       "node", // Removes an error when exporting with module.exports.
       "jest"
-    ]
+    ],
+    "preserveSymlinks": true,
   }
 }

package/types/index.harmony.d.ts

@@ -0,0 +1,99 @@
+// export * from '../Libraries/ActionSheetIOS/ActionSheetIOS';
+export * from '../Libraries/Alert/Alert';
+export * from '../Libraries/Animated/Animated';
+export * from '../Libraries/Animated/Easing';
+export * from '../Libraries/Animated/useAnimatedValue';
+export * from '../Libraries/AppState/AppState';
+export * from '../Libraries/BatchedBridge/NativeModules';
+export * from '../Libraries/Components/AccessibilityInfo/AccessibilityInfo';
+export * from '../Libraries/Components/ActivityIndicator/ActivityIndicator';
+// export * from '../Libraries/Components/Clipboard/Clipboard';
+// export * from '../Libraries/Components/DatePicker/DatePickerIOS';
+export * from '../Libraries/Components/DrawerAndroid/DrawerLayoutAndroid';
+export * from '../Libraries/Components/Keyboard/Keyboard';
+export * from '../Libraries/Components/Keyboard/KeyboardAvoidingView';
+export * from '../Libraries/Components/Pressable/Pressable';
+// export * from '../Libraries/Components/ProgressBarAndroid/ProgressBarAndroid';
+// export * from '../Libraries/Components/ProgressViewIOS/ProgressViewIOS';
+export * from '../Libraries/Components/RefreshControl/RefreshControl';
+export * from '../Libraries/Components/SafeAreaView/SafeAreaView';
+export * from '../Libraries/Components/ScrollView/ScrollView';
+// export * from '../Libraries/Components/Slider/Slider';
+export * from '../Libraries/Components/StatusBar/StatusBar';
+export * from '../Libraries/Components/Switch/Switch';
+// export * from '../Libraries/Components/TextInput/InputAccessoryView';
+export * from '../Libraries/Components/TextInput/TextInput';
+export * from '../Libraries/Components/ToastAndroid/ToastAndroid';
+export * from '../Libraries/Components/Touchable/Touchable';
+export * from '../Libraries/Components/Touchable/TouchableHighlight';
+export * from '../Libraries/Components/Touchable/TouchableNativeFeedback';
+export * from '../Libraries/Components/Touchable/TouchableOpacity';
+export * from '../Libraries/Components/Touchable/TouchableWithoutFeedback';
+export * from '../Libraries/Components/View/View';
+export * from '../Libraries/Components/View/ViewAccessibility';
+export * from '../Libraries/Components/View/ViewPropTypes';
+export * from '../Libraries/Components/Button';
+export * from '../Libraries/EventEmitter/NativeEventEmitter';
+export * from '../Libraries/EventEmitter/RCTDeviceEventEmitter';
+// export * from '../Libraries/EventEmitter/RCTNativeAppEventEmitter';
+export * from '../Libraries/Image/Image';
+// export * from '../Libraries/Image/ImageResizeMode';
+// export * from '../Libraries/Image/ImageSource';
+export * from '../Libraries/Interaction/InteractionManager';
+export * from '../Libraries/Interaction/PanResponder';
+export * from '../Libraries/LayoutAnimation/LayoutAnimation';
+export * from '../Libraries/Linking/Linking';
+export * from '../Libraries/Lists/FlatList';
+export * from '../Libraries/Lists/SectionList';
+export * from '@react-native/virtualized-lists';
+export * from '../Libraries/LogBox/LogBox';
+export * from '../Libraries/Modal/Modal';
+export * as Systrace from '../Libraries/Performance/Systrace';
+// export * from '../Libraries/PermissionsAndroid/PermissionsAndroid';
+// export * from '../Libraries/PushNotificationIOS/PushNotificationIOS';
+export * from '../Libraries/ReactNative/AppRegistry';
+export * from '../Libraries/ReactNative/I18nManager';
+export * from '../Libraries/ReactNative/RendererProxy';
+export * from '../Libraries/ReactNative/RootTag';
+export * from '../Libraries/ReactNative/UIManager';
+export * from '../Libraries/ReactNative/requireNativeComponent';
+export * from '../Libraries/Settings/Settings';
+export * from '../Libraries/Share/Share';
+export * from '../Libraries/StyleSheet/PlatformColorValueTypesIOS';
+export * from '../Libraries/StyleSheet/PlatformColorValueTypes';
+export * from '../Libraries/StyleSheet/StyleSheet';
+export * from '../Libraries/StyleSheet/StyleSheetTypes';
+export * from '../Libraries/StyleSheet/processColor';
+export * from '../Libraries/Text/Text';
+// export * from '../Libraries/TurboModule/RCTExport';
+export * as TurboModuleRegistry from '../Libraries/TurboModule/TurboModuleRegistry';
+export * from '../Libraries/Types/CoreEventTypes';
+export * from '../Libraries/Utilities/Appearance';
+export * from '../Libraries/Utilities/BackHandler';
+export * from '../Libraries/Utilities/DevSettings';
+export * from '../Libraries/Utilities/Dimensions';
+export * from '../Libraries/Utilities/PixelRatio';
+export * from '../Libraries/Utilities/Platform';
+export * from '../Libraries/Vibration/Vibration';
+// export * from '../Libraries/YellowBox/YellowBoxDeprecated';
+// export * from '../Libraries/vendor/core/ErrorUtils';
+export * from '../Libraries/vendor/emitter/EventEmitter';
+
+export * from '../types/public/DeprecatedPropertiesAlias';
+export * from '../types/public/Insets';
+export * from '../types/public/ReactNativeRenderer';
+export * from '../types/public/ReactNativeTypes';
+
+// react-native-harmony specific
+export declare function registerViewConfig(
+  componentName: string,
+  viewConfigFactory: () => Record<any, any>
+): any;
+
+export declare const ReactNativeViewAttributes: Record<any, any>;
+
+export declare function dispatchCommand(
+  currentRef: any,
+  commandName: string,
+  args: any
+): void;

package/Libraries/Alert/Alert.harmony.js

@@ -1,77 +0,0 @@
-import type { AlertOptions } from "./AlertManager";
-
-export type Buttons = Array<{
-  text?: string,
-  onPress?: ?Function,
-}>;
-
-type Options = {
-  cancelable?: ?boolean,
-  onDismiss?: ?() => void,
-  ...
-};
-
-/**
- * Launches an alert dialog with the specified title and message.
- *
- * See https://reactnative.dev/docs/alert
- */
-class Alert {
-  static alert(
-    title: ?string,
-    message?: ?string,
-    buttons?: Buttons,
-    options?: Options
-  ): void {
-    const AlertManager = require("./AlertManager").default;
-    if (!AlertManager) {
-      return;
-    }
-
-    const alertOptions: AlertOptions = {
-      title: title || "",
-      message: message || "",
-      cancelable: false,
-    };
-
-    const constants = AlertManager.getConstants();
-
-    if (options && options.cancelable) {
-      alertOptions.cancelable = options.cancelable;
-    }
-
-    // At most three buttons. Ignore rest.
-    const validButtons: Buttons = (buttons ?? [{text: "OK"}]).slice(0, 3)
-    const tertiaryButton = validButtons.pop();
-    const secondaryButton = validButtons.pop();
-    const primaryButton = validButtons.pop();
-
-    if (primaryButton) {
-      alertOptions.primaryButton = primaryButton.text || "";
-    }
-    if (secondaryButton) {
-      alertOptions.secondaryButton = secondaryButton.text || "";
-    }
-    if (tertiaryButton) {
-      alertOptions.tertiaryButton = tertiaryButton.text || "";
-    }
-
-    const onAction = (action, buttonKey) => {
-      if (action === constants.buttonClicked) {
-        if (buttonKey === constants.primaryButton) {
-          primaryButton.onPress && primaryButton.onPress();
-        } else if (buttonKey === constants.secondaryButton) {
-          secondaryButton.onPress && secondaryButton.onPress();
-        } else if (buttonKey === constants.tertiaryButton) {
-          tertiaryButton.onPress && tertiaryButton.onPress();
-        }
-      } else if (action === constants.dismissed) {
-        options && options.onDismiss && options.onDismiss();
-      }
-    };
-    const onError = (errorMessage: string) => console.warn(errorMessage);
-    AlertManager.alert(alertOptions, onError, onAction);
-  }
-}
-
-module.exports = Alert;