react-native-tvos 0.74.3-0 → 0.75.2-0

package/cli.js

@@ -11,17 +11,42 @@
 'use strict';
 
 const {name, version: currentVersion} = require('./package.json');
-const cli = require('@react-native-community/cli');
 const chalk = require('chalk');
 const {get} = require('https');
+const semver = require('semver');
 const {URL} = require('url');
 
+const deprecated = () => {
+  throw new Error(
+    'react-native/cli is deprecated, please use @react-native-community/cli instead',
+  );
+};
+
+function isMissingCliDependency(error) {
+  return (
+    error.code === 'MODULE_NOT_FOUND' &&
+    /@react-native-community\/cli/.test(error.message)
+  );
+}
+
+let cli = {
+  bin: '/dev/null',
+  loadConfig: deprecated,
+  run: deprecated,
+};
+
 const isNpxRuntime = process.env.npm_lifecycle_event === 'npx';
 const isInitCommand = process.argv[2] === 'init';
 const DEFAULT_REGISTRY_HOST =
   process.env.npm_config_registry ?? 'https://registry.npmjs.org/';
 const HEAD = '1000.0.0';
 
+// We're going to deprecate the `init` command proxying requests to @react-native-community/cli transparently
+// on December 31th, 2024 or 0.76 (whichever arrives first). This is part of work to decouple of community CLI from React Native core.
+//
+// See https://github.com/react-native-community/discussions-and-proposals/blob/main/proposals/0759-react-native-frameworks.md
+const CLI_DEPRECATION_DATE = new Date('2024-12-31');
+
 async function getLatestVersion(registryHost = DEFAULT_REGISTRY_HOST) {
   return new Promise((res, rej) => {
     const url = new URL(registryHost);
@@ -42,6 +67,9 @@ async function getLatestVersion(registryHost = DEFAULT_REGISTRY_HOST) {
 
 /**
  * Warn when users are using `npx react-native init`, to raise awareness of the changes from RFC 0759.
+ *
+ * Phase 1
+ *
  * @see https://github.com/react-native-community/discussions-and-proposals/tree/main/proposals/0759-react-native-frameworks.md
  */
 function warnWhenRunningInit() {
@@ -52,6 +80,64 @@ function warnWhenRunningInit() {
   }
 }
 
+/**
+ * Warn more sternly that the ability to call `npx react-native init` is going away.
+ *
+ * Phase 2
+ *
+ * @see https://github.com/react-native-community/discussions-and-proposals/tree/main/proposals/0759-react-native-frameworks.md
+ */
+function warnWithDeprecationSchedule() {
+  if (!isInitCommand) {
+    return;
+  }
+
+  const daysRemaining = Math.ceil(
+    (CLI_DEPRECATION_DATE.getTime() - new Date().getTime()) / 86_400_000,
+  );
+
+  const emphasis =
+    daysRemaining < 10
+      ? chalk.bgRed.white.bold
+      : daysRemaining < 30
+        ? chalk.red.bold
+        : daysRemaining < 60
+          ? chalk.green.bold
+          : chalk.blueBright.bold;
+
+  console.warn(`
+${chalk.yellow('⚠️')} The \`init\` command is deprecated.
+The behavior will be changed on ${chalk.white.bold(CLI_DEPRECATION_DATE.toLocaleDateString())} ${emphasis(`(${daysRemaining} day${daysRemaining > 1 ? 's' : ''})`)}.
+
+- Switch to ${chalk.dim('npx @react-native-community/cli init')} for the identical behavior.
+- Refer to the documentation for information about alternative tools: ${chalk.dim('https://reactnative.dev/docs/getting-started')}`);
+}
+
+function warnWithDeprecated() {
+  if (!isInitCommand) {
+    return;
+  }
+
+  console.warn(`
+🚨️ The \`init\` command is deprecated.
+
+- Switch to ${chalk.dim('npx @react-native-community/cli init')} for the identical behavior.
+- Refer to the documentation for information about alternative tools: ${chalk.dim('https://reactnative.dev/docs/getting-started')}`);
+}
+
+function warnWithExplicitDependency(version = '*') {
+  console.warn(`
+${chalk.yellow('⚠')}️ ${chalk.dim('react-native')} depends on ${chalk.dim('@react-native-community/cli')} for cli commands. To fix update your ${chalk.dim('package.json')} to include:
+
+${chalk.white.bold(`
+  "devDependencies": {
+    "@react-native-community/cli": "latest",
+  }
+`)}
+
+`);
+}
+
 /**
  * npx react-native -> @react-native-community/cli
  *
@@ -70,7 +156,8 @@ async function main() {
   ) {
     try {
       const latest = await getLatestVersion();
-      if (latest !== currentVersion) {
+      // TODO: T184416093 When cli is deprecated, remove semver from package.json
+      if (semver.lt(currentVersion, latest)) {
         const msg = `
   ${chalk.bold.yellow('WARNING:')} You should run ${chalk.white.bold(
     'npx react-native@latest',
@@ -85,13 +172,55 @@ async function main() {
     }
   }
 
-  warnWhenRunningInit();
+  const isDeprecated =
+    CLI_DEPRECATION_DATE.getTime() <= new Date().getTime() ||
+    currentVersion.startsWith('0.76');
+
+  /**
+   * This command is now deprecated. We will continue to proxy commands to @react-native-community/cli, but it
+   * isn't supported anymore. We'll always show the warning.
+   *
+   * WARNING: Projects will have to have an explicit dependency on @react-native-community/cli to use the CLI.
+   *
+   * Phase 3
+   *
+   * @see https://github.com/react-native-community/discussions-and-proposals/tree/main/proposals/0759-react-native-frameworks.md
+   */
+  if (isInitCommand) {
+    if (currentVersion !== HEAD && isDeprecated) {
+      warnWithDeprecated();
+      // We only exit if the user calls `init` and it's deprecated. All other cases should proxy to to @react-native-community/cli.
+      // Be careful with this as it can break a lot of users.
+      process.exit(1);
+    } else if (currentVersion.startsWith('0.75')) {
+      warnWithDeprecationSchedule();
+    }
+    warnWhenRunningInit();
+  }
 
-  return cli.run(name);
+  try {
+    return require('@react-native-community/cli').run(name);
+  } catch (e) {
+    if (isMissingCliDependency(e)) {
+      warnWithExplicitDependency();
+      process.exit(1);
+    }
+    throw e;
+  }
 }
 
 if (require.main === module) {
   main();
+} else {
+  try {
+    cli = require('@react-native-community/cli');
+  } catch (e) {
+    // We silence @react-native-community/cli missing as it is no
+    // longer a dependency
+    if (!isMissingCliDependency(e)) {
+      throw e;
+    }
+  }
 }
 
 module.exports = cli;

package/gradle/libs.versions.toml

@@ -6,7 +6,7 @@ compileSdk = "34"
 buildTools = "34.0.0"
 ndkVersion = "26.1.10909125"
 # Dependencies versions
-agp = "8.2.1"
+agp = "8.5.0"
 androidx-annotation = "1.6.0"
 androidx-appcompat = "1.6.1"
 androidx-autofill = "1.1.0"
@@ -17,19 +17,19 @@ assertj = "3.21.0"
 binary-compatibility-validator = "0.13.2"
 download = "5.4.0"
 fbjni = "0.6.0"
-fresco = "3.1.3"
+fresco = "3.2.0"
 infer-annotation = "0.18.0"
 javax-annotation-api = "1.3.2"
 javax-inject = "1"
 jsr305 = "3.0.2"
 junit = "4.13.2"
-kotlin = "1.9.22"
+kotlin = "1.9.24"
 mockito = "3.12.4"
 nexus-publish = "1.3.0"
 okhttp = "4.9.2"
 okio = "2.9.0"
 robolectric = "4.9.2"
-soloader = "0.10.5"
+soloader = "0.11.0"
 xstream = "1.4.20"
 yoga-proguard-annotations = "1.19.0"
 # Native Dependencies

package/jest/mockComponent.js

@@ -50,6 +50,13 @@ module.exports = (moduleName, instanceMethods, isESModule) => {
     }
   };
 
+  Object.defineProperty(Component, 'name', {
+    value: name,
+    writable: false,
+    enumerable: false,
+    configurable: true,
+  });
+
   Component.displayName = nameWithoutPrefix;
 
   Object.keys(RealComponent).forEach(classStatic => {

package/jest/renderer.js

@@ -9,22 +9,33 @@
  * @oncall react_native
  */
 
+import type {ReactTestRenderer} from 'react-test-renderer';
+
+import nullthrows from 'nullthrows';
 import * as React from 'react';
-import ShallowRenderer from 'react-shallow-renderer';
 import TestRenderer from 'react-test-renderer';
 
-const renderer = new ShallowRenderer();
-
-export const shallow = (Component: React.Element<any>): any => {
-  const Wrapper = (): React.Element<any> => Component;
-
-  return renderer.render(<Wrapper />);
-};
+export async function create(
+  Component: React.Element<any>,
+): Promise<ReactTestRenderer> {
+  let component;
+  await TestRenderer.act(async () => {
+    component = TestRenderer.create(Component);
+  });
+  return nullthrows(component);
+}
 
-export const shallowRender = (Component: React.Element<any>): any => {
-  return renderer.render(Component);
-};
+export async function unmount(testRenderer: ReactTestRenderer) {
+  await TestRenderer.act(async () => {
+    testRenderer.unmount();
+  });
+}
 
-export const create = (Component: React.Element<any>): any => {
-  return TestRenderer.create(Component);
-};
+export async function update(
+  testRenderer: ReactTestRenderer,
+  element: React.Element<any>,
+) {
+  await TestRenderer.act(async () => {
+    testRenderer.update(element);
+  });
+}

package/jest/setup.js

@@ -9,6 +9,11 @@
 
 'use strict';
 
+global.IS_REACT_ACT_ENVIRONMENT = true;
+// Suppress the `react-test-renderer` warnings until New Architecture and legacy
+// mode are no longer supported by React Native.
+global.IS_REACT_NATIVE_TEST_ENVIRONMENT = true;
+
 const MockNativeMethods = jest.requireActual('./MockNativeMethods');
 const mockComponent = jest.requireActual('./mockComponent');
 
@@ -112,17 +117,9 @@ jest
       Constants: {},
     },
   }))
-  .mock('../Libraries/Image/Image', () => {
-    const Image = mockComponent('../Libraries/Image/Image');
-    Image.getSize = jest.fn();
-    Image.getSizeWithHeaders = jest.fn();
-    Image.prefetch = jest.fn();
-    Image.prefetchWithMetadata = jest.fn();
-    Image.queryCache = jest.fn();
-    Image.resolveAssetSource = jest.fn();
-
-    return Image;
-  })
+  .mock('../Libraries/Image/Image', () =>
+    mockComponent('../Libraries/Image/Image'),
+  )
   .mock('../Libraries/Text/Text', () =>
     mockComponent('../Libraries/Text/Text', MockNativeMethods),
   )
@@ -145,7 +142,9 @@ jest
   .mock('../Libraries/Components/AccessibilityInfo/AccessibilityInfo', () => ({
     __esModule: true,
     default: {
-      addEventListener: jest.fn(),
+      addEventListener: jest.fn(() => ({
+        remove: jest.fn(),
+      })),
       announceForAccessibility: jest.fn(),
       isAccessibilityServiceEnabled: jest.fn(),
       isBoldTextEnabled: jest.fn(),
@@ -208,7 +207,9 @@ jest
     openURL: jest.fn(),
     canOpenURL: jest.fn(() => Promise.resolve(true)),
     openSettings: jest.fn(),
-    addEventListener: jest.fn(),
+    addEventListener: jest.fn(() => ({
+      remove: jest.fn(),
+    })),
     getInitialURL: jest.fn(() => Promise.resolve()),
     sendIntent: jest.fn(),
   }))
@@ -261,7 +262,12 @@ jest
     },
     ImageLoader: {
       getSize: jest.fn(url => Promise.resolve([320, 240])),
+      getSizeWithHeaders: jest.fn((url, headers) =>
+        Promise.resolve({height: 222, width: 333}),
+      ),
       prefetchImage: jest.fn(),
+      prefetchImageWithMetadata: jest.fn(),
+      queryCache: jest.fn(),
     },
     ImageViewManager: {
       getSize: jest.fn((uri, success) =>

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "react-native-tvos",
-  "version": "0.74.3-0",
+  "version": "0.75.2-0",
   "description": "A framework for building native apps using React",
   "license": "MIT",
   "repository": {
     "type": "git",
-    "url": "https://github.com/facebook/react-native.git",
+    "url": "git+https://github.com/facebook/react-native.git",
     "directory": "packages/react-native"
   },
   "homepage": "https://reactnative.dev/",
@@ -23,7 +23,9 @@
   "engines": {
     "node": ">=18"
   },
-  "bin": "./cli.js",
+  "bin": {
+    "react-native": "cli.js"
+  },
   "types": "types",
   "jest-junit": {
     "outputDirectory": "reports/junit",
@@ -42,7 +44,6 @@
     "jest",
     "Libraries",
     "LICENSE",
-    "local-cli",
     "React-Core.podspec",
     "react-native.config.js",
     "React.podspec",
@@ -56,6 +57,7 @@
     "rn-get-polyfills.js",
     "scripts/compose-source-maps.js",
     "scripts/find-node-for-xcode.sh",
+    "scripts/bundle.js",
     "scripts/generate-codegen-artifacts.js",
     "scripts/generate-provider-cli.js",
     "scripts/generate-specs-cli.js",
@@ -93,13 +95,13 @@
     "types"
   ],
   "scripts": {
-    "prepack": "cp ../../README.md ./README.md; cp ../../README-core.md ./README-core.md",
+    "prepack": "node ./scripts/prepack.js; cp ../../README.md ./README.md; cp ../../README-core.md ./README-core.md",
     "featureflags-check": "node ./scripts/featureflags/index.js --verify-unchanged",
     "featureflags-update": "node ./scripts/featureflags/index.js"
   },
   "peerDependencies": {
     "@types/react": "^18.2.6",
-    "react": "18.2.0"
+    "react": "^18.2.0"
   },
   "peerDependenciesMeta": {
     "@types/react": {
@@ -108,16 +110,16 @@
   },
   "dependencies": {
     "@jest/create-cache-key-function": "^29.6.3",
-    "@react-native-community/cli": "13.6.9",
-    "@react-native-community/cli-platform-android": "13.6.9",
-    "@react-native-community/cli-platform-ios": "13.6.9",
-    "@react-native/assets-registry": "0.74.85",
-    "@react-native/codegen": "0.74.85",
-    "@react-native/community-cli-plugin": "0.74.85",
-    "@react-native/gradle-plugin": "0.74.85",
-    "@react-native/js-polyfills": "0.74.85",
-    "@react-native/normalize-colors": "0.74.85",
-    "@react-native-tvos/virtualized-lists": "0.74.3-0",
+    "@react-native-community/cli": "14.0.0",
+    "@react-native-community/cli-platform-android": "14.0.0",
+    "@react-native-community/cli-platform-ios": "14.0.0",
+    "@react-native/assets-registry": "0.75.2",
+    "@react-native/codegen": "0.75.2",
+    "@react-native/community-cli-plugin": "0.75.2",
+    "@react-native/gradle-plugin": "0.75.2",
+    "@react-native/js-polyfills": "0.75.2",
+    "@react-native/normalize-colors": "0.75.2",
+    "@react-native-tvos/virtualized-lists": "0.75.2-0",
     "abort-controller": "^3.0.0",
     "anser": "^1.4.9",
     "ansi-regex": "^5.0.0",
@@ -125,6 +127,7 @@
     "chalk": "^4.0.0",
     "event-target-shim": "^5.0.1",
     "flow-enums-runtime": "^0.0.6",
+    "glob": "^7.1.1",
     "invariant": "^2.2.4",
     "jest-environment-node": "^29.6.3",
     "jsc-android": "^250231.0.0",
@@ -135,14 +138,14 @@
     "nullthrows": "^1.1.1",
     "pretty-format": "^26.5.2",
     "promise": "^8.3.0",
-    "react-devtools-core": "^5.0.0",
+    "react-devtools-core": "^5.3.1",
     "react-refresh": "^0.14.0",
-    "react-shallow-renderer": "^16.15.0",
     "regenerator-runtime": "^0.13.2",
     "scheduler": "0.24.0-canary-efb381bbf-20230505",
+    "semver": "^7.1.3",
     "stacktrace-parser": "^0.1.10",
     "whatwg-fetch": "^3.0.0",
-    "ws": "^6.2.3",
+    "ws": "^6.2.2",
     "yargs": "^17.6.2"
   },
   "codegenConfig": {
@@ -162,8 +165,5 @@
         "jsSrcsDir": "src"
       }
     ]
-  },
-  "devDependencies": {
-    "react-native-core": "npm:react-native@0.74.3"
   }
-}
+}

package/react-native.config.js

@@ -9,11 +9,41 @@
 
 'use strict';
 
-const android = require('@react-native-community/cli-platform-android');
-const ios = require('@react-native-community/cli-platform-ios');
+// React Native shouldn't be exporting itself like this, the Community Template should be be directly
+// depending on and injecting:
+// - @react-native-community/cli-platform-android
+// - @react-native-community/cli-platform-ios
+// - @react-native/community-cli-plugin (via the @react-native/core-cli-utils package)
+// - codegen command should be inhoused into @react-native-community/cli
+//
+// This is a temporary workaround.
+
+const verbose = process.env.DEBUG && process.env.DEBUG.includes('react-native');
+
+let android;
+try {
+  android = require('@react-native-community/cli-platform-android');
+} catch {
+  if (verbose) {
+    console.warn(
+      '@react-native-community/cli-platform-android not found, the react-native.config.js may be unusable.',
+    );
+  }
+}
+
+let ios;
+try {
+  ios = require('@react-native-community/cli-platform-ios');
+} catch {
+  if (verbose) {
+    console.warn(
+      '@react-native-community/cli-platform-ios not found, the react-native.config.js may be unusable.',
+    );
+  }
+}
+
 const {
   bundleCommand,
-  ramBundleCommand,
   startCommand,
 } = require('@react-native/community-cli-plugin');
 
@@ -44,23 +74,25 @@ const codegenCommand = {
     ),
 };
 
-module.exports = {
-  commands: [
-    ...ios.commands,
-    ...android.commands,
-    bundleCommand,
-    ramBundleCommand,
-    startCommand,
-    codegenCommand,
-  ],
-  platforms: {
-    ios: {
-      projectConfig: ios.projectConfig,
-      dependencyConfig: ios.dependencyConfig,
-    },
-    android: {
-      projectConfig: android.projectConfig,
-      dependencyConfig: android.dependencyConfig,
-    },
-  },
+const config = {
+  commands: [bundleCommand, startCommand, codegenCommand],
+  platforms: {},
 };
+
+if (ios != null) {
+  config.commands.push(...ios.commands);
+  config.platforms.ios = {
+    projectConfig: ios.projectConfig,
+    dependencyConfig: ios.dependencyConfig,
+  };
+}
+
+if (android != null) {
+  config.commands.push(...android.commands);
+  config.platforms.android = {
+    projectConfig: android.projectConfig,
+    dependencyConfig: android.dependencyConfig,
+  };
+}
+
+module.exports = config;

package/rn-get-polyfills.js

@@ -4,6 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
+ * @flow strict-local
  * @format
  */
 

package/scripts/bundle.js

@@ -0,0 +1,69 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @format
+ * @oncall react_native
+ */
+
+'use strict';
+
+const {bundleCommand: bc} = require('@react-native/community-cli-plugin');
+const {execSync} = require('child_process');
+const program = require('commander');
+const {existsSync, readFileSync} = require('fs');
+const path = require('path');
+
+program.version(
+  JSON.parse(
+    readFileSync(path.resolve(__dirname, '..', 'package.json'), 'utf8'),
+  ).version,
+);
+
+program
+  .name(bc.name)
+  .description(bc.description ?? '')
+  .option(
+    '--config-cmd <string>',
+    'Command to generate a JSON project config',
+    'npx react-native config',
+  )
+  .option('--load-config <string>', 'JSON project config')
+  .action(async function handleAction() {
+    let config = null;
+    let options = program.opts();
+    if (options.loadConfig != null) {
+      config = JSON.parse(
+        options.loadConfig.replace(/^\W*'/, '').replace(/'\W*$/, ''),
+      );
+    } else if (options.configCmd != null) {
+      config = JSON.parse(
+        execSync(options.configCmd.trim(), {encoding: 'utf8'}),
+      );
+    }
+
+    if (config == null) {
+      throw new Error('No config provided');
+    }
+
+    await bc.func(program.args, config, options);
+  });
+
+if (bc.options != null) {
+  for (const o of bc.options) {
+    program.option(
+      o.name,
+      o.description ?? '',
+      o.parse ?? (value => value),
+      o.default,
+    );
+  }
+}
+
+if (require.main === module) {
+  program.parse(process.argv);
+}
+
+module.exports = program;