@react-native-ohos/react-native-reanimated 4.0.0-rc.1 → 4.0.2-beta.1

package/scripts/set-reanimated-version.js

@@ -1,37 +1,37 @@
-const path = require('path');
-const { getFlags, getVersion } = require('../../../scripts/releasing');
-const {
-  updateVersion,
-  updatePeerDependency,
-} = require('../../../scripts/version-utils');
-
-const packageJsonPath = path.resolve(__dirname, '../package.json');
-const jsVersionPath = path.resolve(
-  __dirname,
-  '../src/platform-specific/jsVersion.ts'
-);
-
-const { argv } = process;
-const { currentVersion, newVersion } = getVersion(argv, packageJsonPath);
-
-updateVersion(packageJsonPath, jsVersionPath, newVersion);
-
-if (getFlags(argv).flags.nightly) {
-  const workletsPackageJsonPath = path.resolve(
-    __dirname,
-    '../../react-native-worklets/package.json'
-  );
-  const { newVersion: newWorkletsVersion } = getVersion(
-    argv,
-    workletsPackageJsonPath
-  );
-
-  updatePeerDependency(
-    packageJsonPath,
-    'react-native-worklets',
-    newWorkletsVersion
-  );
-}
-
-// Log the current version so it can be restored if needed.
-console.log(currentVersion);
+const path = require('path');
+const { getFlags, getVersion } = require('../../../scripts/releasing');
+const {
+  updateVersion,
+  updatePeerDependency,
+} = require('../../../scripts/version-utils');
+
+const packageJsonPath = path.resolve(__dirname, '../package.json');
+const jsVersionPath = path.resolve(
+  __dirname,
+  '../src/platform-specific/jsVersion.ts'
+);
+
+const { argv } = process;
+const { currentVersion, newVersion } = getVersion(argv, packageJsonPath);
+
+updateVersion(packageJsonPath, jsVersionPath, newVersion);
+
+if (getFlags(argv).flags.nightly) {
+  const workletsPackageJsonPath = path.resolve(
+    __dirname,
+    '../../react-native-worklets/package.json'
+  );
+  const { newVersion: newWorkletsVersion } = getVersion(
+    argv,
+    workletsPackageJsonPath
+  );
+
+  updatePeerDependency(
+    packageJsonPath,
+    'react-native-worklets',
+    newWorkletsVersion
+  );
+}
+
+// Log the current version so it can be restored if needed.
+console.log(currentVersion);

package/scripts/update-version.js

@@ -1,119 +1,119 @@
-//@ts-check
-const fs = require('fs');
-const path = require('path');
-const readline = require('readline');
-const { execSync } = require('node:child_process');
-const JSON5 = require('json5');
-
-const PACKAGE_DIR_NAME = 'react-native-harmony-reanimated';
-const MODULE_NAME = 'reanimated';
-const PACKAGE_TGZ_STEM_NAME_WITHOUT_VERSION =
-  'rnoh-react-native-harmony-reanimated';
-
-(async function main() {
-  const newVersionIndex = process.argv.findIndex(
-    (arg) => arg === '--new-version'
-  );
-  let version;
-
-  if (newVersionIndex !== -1 && process.argv[newVersionIndex + 1]) {
-    version = process.argv[newVersionIndex + 1];
-  } else {
-    const currentVersion = readPackage('.').version;
-    version = await askUserForVersion(currentVersion);
-  }
-
-  updatePackageVersion('.', version);
-  console.log(`Updated ${PACKAGE_DIR_NAME}/package.json`);
-  updatePackageScript('../tester', version);
-  console.log('Updated tester/package.json');
-  updateOHPackageVersion(
-    `../tester/harmony/${MODULE_NAME}/oh-package.json5`,
-    version
-  );
-  console.log(`Updated ${MODULE_NAME}/oh-package.json5`);
-  execSync('npm i && cd ../tester', { stdio: 'inherit' });
-})();
-
-/**
- * @param {string} currentVersion
- * @returns {Promise<string>}
- */
-function askUserForVersion(currentVersion) {
-  const rl = readline.createInterface({
-    input: process.stdin,
-    output: process.stdout,
-  });
-
-  return new Promise((resolve) => {
-    rl.question(
-      `Current version: ${currentVersion}. Enter new version: `,
-      (userInput) => {
-        rl.close();
-        resolve(userInput);
-      }
-    );
-  });
-}
-
-/**
- * @param {string} packageDir
- * @returns {{version: string, scripts?: Record<string, string>}} - parsed content of package.json
- */
-function readPackage(packageDir) {
-  const packageJsonPath = path.join(packageDir, 'package.json');
-  const packageContent = fs.readFileSync(packageJsonPath, 'utf-8');
-  return JSON.parse(packageContent);
-}
-
-/**
- * @param {string} packageDir
- * @param {string} version
- */
-function updatePackageVersion(packageDir, version) {
-  const packageData = readPackage(packageDir);
-  packageData.version = version;
-
-  const packageJsonPath = path.join(packageDir, 'package.json');
-  fs.writeFileSync(
-    packageJsonPath,
-    JSON.stringify(packageData, null, 2),
-    'utf-8'
-  );
-}
-
-/**
- * @param {string} packageDir
- * @param {string} version
- */
-function updatePackageScript(packageDir, version) {
-  const packageData = readPackage(packageDir);
-
-  for (let script in packageData.scripts) {
-    const regex = new RegExp(
-      `${PACKAGE_TGZ_STEM_NAME_WITHOUT_VERSION}-\\d*\\.\\d*\\.\\d*`,
-      'g'
-    );
-    packageData.scripts[script] = packageData.scripts[script].replace(
-      regex,
-      `${PACKAGE_TGZ_STEM_NAME_WITHOUT_VERSION}-${version}`
-    );
-  }
-  const packageJsonPath = path.join(packageDir, 'package.json');
-  fs.writeFileSync(
-    packageJsonPath,
-    JSON.stringify(packageData, null, 2),
-    'utf-8'
-  );
-}
-/**
- * @param {string} ohPackagePath
- * @param {string} version
- */
-function updateOHPackageVersion(ohPackagePath, version) {
-  const ohPackageContent = JSON5.parse(
-    fs.readFileSync(ohPackagePath).toString()
-  );
-  ohPackageContent.version = version;
-  fs.writeFileSync(ohPackagePath, JSON5.stringify(ohPackageContent, null, 2));
-}
+//@ts-check
+const fs = require('fs');
+const path = require('path');
+const readline = require('readline');
+const { execSync } = require('node:child_process');
+const JSON5 = require('json5');
+
+const PACKAGE_DIR_NAME = 'react-native-harmony-reanimated';
+const MODULE_NAME = 'reanimated';
+const PACKAGE_TGZ_STEM_NAME_WITHOUT_VERSION =
+  'rnoh-react-native-harmony-reanimated';
+
+(async function main() {
+  const newVersionIndex = process.argv.findIndex(
+    (arg) => arg === '--new-version'
+  );
+  let version;
+
+  if (newVersionIndex !== -1 && process.argv[newVersionIndex + 1]) {
+    version = process.argv[newVersionIndex + 1];
+  } else {
+    const currentVersion = readPackage('.').version;
+    version = await askUserForVersion(currentVersion);
+  }
+
+  updatePackageVersion('.', version);
+  console.log(`Updated ${PACKAGE_DIR_NAME}/package.json`);
+  updatePackageScript('../tester', version);
+  console.log('Updated tester/package.json');
+  updateOHPackageVersion(
+    `../tester/harmony/${MODULE_NAME}/oh-package.json5`,
+    version
+  );
+  console.log(`Updated ${MODULE_NAME}/oh-package.json5`);
+  execSync('npm i && cd ../tester', { stdio: 'inherit' });
+})();
+
+/**
+ * @param {string} currentVersion
+ * @returns {Promise<string>}
+ */
+function askUserForVersion(currentVersion) {
+  const rl = readline.createInterface({
+    input: process.stdin,
+    output: process.stdout,
+  });
+
+  return new Promise((resolve) => {
+    rl.question(
+      `Current version: ${currentVersion}. Enter new version: `,
+      (userInput) => {
+        rl.close();
+        resolve(userInput);
+      }
+    );
+  });
+}
+
+/**
+ * @param {string} packageDir
+ * @returns {{version: string, scripts?: Record<string, string>}} - parsed content of package.json
+ */
+function readPackage(packageDir) {
+  const packageJsonPath = path.join(packageDir, 'package.json');
+  const packageContent = fs.readFileSync(packageJsonPath, 'utf-8');
+  return JSON.parse(packageContent);
+}
+
+/**
+ * @param {string} packageDir
+ * @param {string} version
+ */
+function updatePackageVersion(packageDir, version) {
+  const packageData = readPackage(packageDir);
+  packageData.version = version;
+
+  const packageJsonPath = path.join(packageDir, 'package.json');
+  fs.writeFileSync(
+    packageJsonPath,
+    JSON.stringify(packageData, null, 2),
+    'utf-8'
+  );
+}
+
+/**
+ * @param {string} packageDir
+ * @param {string} version
+ */
+function updatePackageScript(packageDir, version) {
+  const packageData = readPackage(packageDir);
+
+  for (let script in packageData.scripts) {
+    const regex = new RegExp(
+      `${PACKAGE_TGZ_STEM_NAME_WITHOUT_VERSION}-\\d*\\.\\d*\\.\\d*`,
+      'g'
+    );
+    packageData.scripts[script] = packageData.scripts[script].replace(
+      regex,
+      `${PACKAGE_TGZ_STEM_NAME_WITHOUT_VERSION}-${version}`
+    );
+  }
+  const packageJsonPath = path.join(packageDir, 'package.json');
+  fs.writeFileSync(
+    packageJsonPath,
+    JSON.stringify(packageData, null, 2),
+    'utf-8'
+  );
+}
+/**
+ * @param {string} ohPackagePath
+ * @param {string} version
+ */
+function updateOHPackageVersion(ohPackagePath, version) {
+  const ohPackageContent = JSON5.parse(
+    fs.readFileSync(ohPackagePath).toString()
+  );
+  ohPackageContent.version = version;
+  fs.writeFileSync(ohPackagePath, JSON5.stringify(ohPackageContent, null, 2));
+}

package/scripts/validate-react-native-version.js

@@ -1,46 +1,46 @@
-'use strict';
-
-const semverSatisfies = require('semver/functions/satisfies');
-const semverPrerelease = require('semver/functions/prerelease');
-const path = require('path');
-
-const packageJsonPath = path.resolve(__dirname, '../package.json');
-const packageJson = require(packageJsonPath);
-const reanimatedVersion = packageJson.version;
-const compatibilityFile = require('../compatibility.json');
-
-const reactNativeVersion = process.argv[2];
-const architecture = 'fabric';
-const supportedRNVersions = [];
-
-if (semverPrerelease(reactNativeVersion)) {
-  // Don't perform any checks for pre-release versions, like nightlies or
-  // feature previews. The user knows what they're doing.
-  process.exit(0);
-}
-
-for (const key in compatibilityFile[architecture]) {
-  if (semverSatisfies(reanimatedVersion, key)) {
-    supportedRNVersions.push(
-      // @ts-ignore
-      ...compatibilityFile[architecture][key]['react-native']
-    );
-  }
-}
-
-// If user uses a version of Reanimated that is not listed in the compatibility file, we skip the check
-if (supportedRNVersions.length === 0) {
-  process.exit(0);
-}
-
-for (const version of supportedRNVersions) {
-  if (semverSatisfies(reactNativeVersion, `${version}.x`)) {
-    process.exit(0);
-  }
-}
-
-// eslint-disable-next-line reanimated/use-logger
-console.error(
-  `[Reanimated] Your installed version of React Native (${reactNativeVersion}) is not compatible with installed version of Reanimated (${reanimatedVersion}). See the documentation for the list of supported versions: https://docs.swmansion.com/react-native-reanimated/docs/guides/compatibility/`
-);
-process.exit(1);
+'use strict';
+
+const semverSatisfies = require('semver/functions/satisfies');
+const semverPrerelease = require('semver/functions/prerelease');
+const path = require('path');
+
+const packageJsonPath = path.resolve(__dirname, '../package.json');
+const packageJson = require(packageJsonPath);
+const reanimatedVersion = packageJson.version;
+const compatibilityFile = require('../compatibility.json');
+
+const reactNativeVersion = process.argv[2];
+const architecture = 'fabric';
+const supportedRNVersions = [];
+
+if (semverPrerelease(reactNativeVersion)) {
+  // Don't perform any checks for pre-release versions, like nightlies or
+  // feature previews. The user knows what they're doing.
+  process.exit(0);
+}
+
+for (const key in compatibilityFile[architecture]) {
+  if (semverSatisfies(reanimatedVersion, key)) {
+    supportedRNVersions.push(
+      // @ts-ignore
+      ...compatibilityFile[architecture][key]['react-native']
+    );
+  }
+}
+
+// If user uses a version of Reanimated that is not listed in the compatibility file, we skip the check
+if (supportedRNVersions.length === 0) {
+  process.exit(0);
+}
+
+for (const version of supportedRNVersions) {
+  if (semverSatisfies(reactNativeVersion, `${version}.x`)) {
+    process.exit(0);
+  }
+}
+
+// eslint-disable-next-line reanimated/use-logger
+console.error(
+  `[Reanimated] Your installed version of React Native (${reactNativeVersion}) is not compatible with installed version of Reanimated (${reanimatedVersion}). See the documentation for the list of supported versions: https://docs.swmansion.com/react-native-reanimated/docs/guides/compatibility/`
+);
+process.exit(1);

package/scripts/validate-worklets-build.js

@@ -1,17 +1,17 @@
-'use strict';
-
-// We don't use this script in runtime since `process` might not be available.
-
-const path = require('path');
-const packageJsonPath = path.resolve(__dirname, '../package.json');
-const packageJson = require(packageJsonPath);
-const reanimatedVersion = packageJson.version;
-
-const validateVersion = require('./validate-worklets-version');
-
-const result = validateVersion(reanimatedVersion);
-if (!result.ok) {
-  // eslint-disable-next-line reanimated/use-logger
-  console.error('[Reanimated] ' + result.message);
-  process.exit(1);
-}
+'use strict';
+
+// We don't use this script in runtime since `process` might not be available.
+
+const path = require('path');
+const packageJsonPath = path.resolve(__dirname, '../package.json');
+const packageJson = require(packageJsonPath);
+const reanimatedVersion = packageJson.version;
+
+const validateVersion = require('./validate-worklets-version');
+
+const result = validateVersion(reanimatedVersion);
+if (!result.ok) {
+  // eslint-disable-next-line reanimated/use-logger
+  console.error('[Reanimated] ' + result.message);
+  process.exit(1);
+}

package/scripts/validate-worklets-version.js

@@ -1,79 +1,84 @@
-'use strict';
-
-const semverSatisfies = require('semver/functions/satisfies');
-const semverPrerelease = require('semver/functions/prerelease');
-const semverOutside = require('semver/ranges/outside');
-const expectedVersion = require('./worklets-version.json');
-const compatibilityFile = require('../compatibility.json');
-
-const architecture = 'fabric';
-
-/**
- * @param {string} reanimatedVersion
- * @returns {{ ok: boolean; message?: string }}
- */
-function validateVersion(reanimatedVersion) {
-  let workletsVersion;
-  try {
-    const { version } = require('react-native-worklets/package.json');
-    workletsVersion = version;
-  } catch (_e) {
-    return {
-      ok: false,
-      message:
-        "react-native-worklets package isn't installed. Please install a version between " +
-        expectedVersion.min +
-        ' and ' +
-        expectedVersion.max +
-        ' to use Reanimated ' +
-        reanimatedVersion +
-        '.',
-    };
-  }
-
-  if (semverPrerelease(workletsVersion)) {
-    /**
-     * Don't perform any checks for pre-release versions, like nightlies or
-     * feature previews. The user knows what they're doing.
-     */
-    return { ok: true };
-  }
-
-  const supportedWorkletsVersions = [];
-
-  for (const key in compatibilityFile[architecture]) {
-    if (semverSatisfies(reanimatedVersion, key)) {
-      supportedWorkletsVersions.push(
-        // @ts-ignore
-        ...compatibilityFile[architecture][key]['react-native-worklets']
-      );
-    }
-  }
-
-  if (supportedWorkletsVersions.length === 0) {
-    return { ok: true };
-  }
-
-  for (const version of supportedWorkletsVersions) {
-    if (semverSatisfies(workletsVersion, version)) {
-      return { ok: true };
-    }
-  }
-
-  const earliestSupportedVersion = supportedWorkletsVersions[0];
-  const latestSupportedVersion =
-    supportedWorkletsVersions[supportedWorkletsVersions.length - 1];
-
-  const isHigher = semverOutside(workletsVersion, latestSupportedVersion, '>');
-
-  const installMessage = isHigher
-    ? `Please install the latest supported version of Worklets ${latestSupportedVersion} or older`
-    : `Please install Worklets ${earliestSupportedVersion} or newer`;
-
-  return {
-    ok: false,
-    message: `Your installed version of Worklets (${workletsVersion}) is not compatible with installed version of Reanimated (${reanimatedVersion}). ${installMessage}. See the documentation for the list of supported versions: https://docs.swmansion.com/react-native-reanimated/docs/guides/compatibility/#supported-react-native-worklets-versions`,
-  };
-}
-
-module.exports = validateVersion;
+'use strict';
+
+const semverSatisfies = require('semver/functions/satisfies');
+const semverPrerelease = require('semver/functions/prerelease');
+const semverOutside = require('semver/ranges/outside');
+const expectedVersion = require('./worklets-version.json');
+const compatibilityFile = require('../compatibility.json');
+
+const architecture = 'fabric';
+
+const HARMONY_WORKLET_LIBNAME = "@react-native-ohos/react-native-worklets";
+/**
+ * @param {string} reanimatedVersion
+ * @returns {{ ok: boolean; message?: string }}
+ */
+function validateVersion(reanimatedVersion) {
+  let workletsVersion;
+  try {
+    const { version, name , dependencies } = require('react-native-worklets/package.json');
+    if (name === HARMONY_WORKLET_LIBNAME && dependencies) {
+      workletsVersion = dependencies['react-native-worklets'];
+    } else{
+      workletsVersion = version;
+    }
+  } catch (_e) {
+    return {
+      ok: false,
+      message:
+        "react-native-worklets package isn't installed. Please install a version between " +
+        expectedVersion.min +
+        ' and ' +
+        expectedVersion.max +
+        ' to use Reanimated ' +
+        reanimatedVersion +
+        '.',
+    };
+  }
+
+  if (semverPrerelease(workletsVersion)) {
+    /**
+     * Don't perform any checks for pre-release versions, like nightlies or
+     * feature previews. The user knows what they're doing.
+     */
+    return { ok: true };
+  }
+
+  const supportedWorkletsVersions = [];
+
+  for (const key in compatibilityFile[architecture]) {
+    if (semverSatisfies(reanimatedVersion, key)) {
+      supportedWorkletsVersions.push(
+        // @ts-ignore
+        ...compatibilityFile[architecture][key]['react-native-worklets']
+      );
+    }
+  }
+
+  if (supportedWorkletsVersions.length === 0) {
+    return { ok: true };
+  }
+
+  for (const version of supportedWorkletsVersions) {
+    if (semverSatisfies(workletsVersion, version)) {
+      return { ok: true };
+    }
+  }
+
+  const earliestSupportedVersion = supportedWorkletsVersions[0];
+  const latestSupportedVersion =
+    supportedWorkletsVersions[supportedWorkletsVersions.length - 1];
+
+  const isHigher = semverOutside(workletsVersion, latestSupportedVersion, '>');
+
+  const installMessage = isHigher
+    ? `Please install the latest supported version of Worklets ${latestSupportedVersion} or older`
+    : `Please install Worklets ${earliestSupportedVersion} or newer`;
+
+  return {
+    ok: false,
+    message: `Your installed version of Worklets (${workletsVersion}) is not compatible with installed version of Reanimated (${reanimatedVersion}). ${installMessage}. See the documentation for the list of supported versions: https://docs.swmansion.com/react-native-reanimated/docs/guides/compatibility/#supported-react-native-worklets-versions`,
+  };
+}
+
+module.exports = validateVersion;

package/scripts/worklets-version.json

@@ -1,4 +1,4 @@
-{
-  "min": "0.7.0",
-  "max": "0.7"
-}
+{
+  "min": "0.7.0",
+  "max": "0.7"
+}

package/src/index.ts

@@ -1,10 +1,10 @@
-// Copyright (c) 2025 Huawei Device Co., Ltd. All rights reserved
-// Use of this source code is governed by a MIT license that can be
-// found in the LICENSE file.
-
-'use strict';
-
-import Animated from 'react-native-reanimated';
-export * from 'react-native-reanimated';
-
+// Copyright (c) 2025 Huawei Device Co., Ltd. All rights reserved
+// Use of this source code is governed by a MIT license that can be
+// found in the LICENSE file.
+
+'use strict';
+
+import Animated from 'react-native-reanimated';
+export * from 'react-native-reanimated';
+
 export default Animated;