[0.84] Picks for 0.84.7

docs/Resolution.md

@@ -75,18 +75,21 @@ Parameters: (*context*, *moduleName*, *platform*)
     2. If resolved as a Haste package path, then
         1. Perform the algorithm for resolving a path (step 2 above). Throw an error if this resolution fails.
             For example, if the Haste package path for `'a/b'` is `foo/package.json`, perform step 2 as if _moduleName_ was `foo/c`.
-6. If [`context.disableHierarchicalLookup`](#disableHierarchicalLookup-boolean) is not `true`, then
+6. If [`context.enablePackageExports`](#enablepackageexports-boolean) is enabled, then
+    1. Get the result of [**PACKAGE_SELF_RESOLVE**](#package_self_resolve)(*context*, *moduleName*, *platform*).
+    2. If resolved, return result.
+7. If [`context.disableHierarchicalLookup`](#disableHierarchicalLookup-boolean) is not `true`, then
     1. Try resolving _moduleName_ under `node_modules` from the current directory (i.e. parent of [`context.originModulePath`](#originmodulepath-string)) up to the root directory.
     2. Perform [**RESOLVE_PACKAGE**](#resolve_package)(*context*, *modulePath*, *platform*) for each candidate path.
-7. For each element _nodeModulesPath_ of [`context.nodeModulesPaths`](#nodemodulespaths-readonlyarraystring):
+8. For each element _nodeModulesPath_ of [`context.nodeModulesPaths`](#nodemodulespaths-readonlyarraystring):
     1. Try resolving _moduleName_ under _nodeModulesPath_ as if the latter was another `node_modules` directory (similar to step 5 above).
     2. Perform [**RESOLVE_PACKAGE**](#resolve_package)(*context*, *modulePath*, *platform*) for each candidate path.
-8. If [`context.extraNodeModules`](#extranodemodules-string-string) is set:
+9. If [`context.extraNodeModules`](#extranodemodules-string-string) is set:
     1. Split _moduleName_ into a package name (including an optional [scope](https://docs.npmjs.com/cli/v8/using-npm/scope)) and relative path.
     2. Look up the package name in [`context.extraNodeModules`](#extranodemodules-string-string). If found, then
         1. Construct a path _modulePath_ by replacing the package name part of _moduleName_ with the value found in [`context.extraNodeModules`](#extranodemodules-string-string)
         2. Return the result of [**RESOLVE_PACKAGE**](#resolve_package)(*context*, *modulePath*, *platform*).
-9. If no valid resolution has been found, throw a resolution failure error.
+10. If no valid resolution has been found, throw a resolution failure error.
 
 #### RESOLVE_MODULE
 
@@ -110,6 +113,18 @@ Parameters: (*context*, *moduleName*, *platform*)
     2. Else, log either a package configuration or package encapsulation warning.
 2. Return the result of [**RESOLVE_MODULE**](#resolve_module)(*context*, *filePath*, *platform*).
 
+#### PACKAGE_SELF_RESOLVE
+
+Parameters: (*context*, *moduleName*, *platform*)
+
+1. Find the closest package to [`context.originModulePath`](#originmodulepath-string). If no package is found, return no resolution.
+2. If the package does not declare both a `"name"` field and an `"exports"` field, return no resolution.
+3. Split _moduleName_ into a package name (including an optional [scope](https://docs.npmjs.com/cli/v8/using-npm/scope)) and relative path.
+4. If the package name does not match the current package's `"name"` field, return no resolution.
+5. Get the result of [**RESOLVE_PACKAGE_EXPORTS**](#resolve_package-exports)(*context*, *packagePath*, *filePath*, *exportsField*, *platform*) against the current package's `"exports"` field.
+    1. If resolved path exists, return result.
+    2. Else, log either a package configuration or package encapsulation warning, then continue with normal resolution.
+
 #### RESOLVE_PACKAGE_EXPORTS
 
 Parameters: (*context*, *packagePath*, *filePath*, *exportsField*, *platform*)

flow-typed/npm/babel-types_v7.x.x.js

@@ -3848,8 +3848,8 @@ declare module "@babel/types" {
   declare export function prependToMemberExpression(member: BabelNodeMemberExpression, prepend: BabelNodeExpression): BabelNodeMemberExpression
   declare export function removeProperties<T>(n: T, opts: ?{}): void;
   declare export function removePropertiesDeep<T>(n: T, opts: ?{}): T;
-  declare export function getBindingIdentifiers(node: BabelNode, duplicates: boolean, outerOnly?: boolean): { [key: string]: BabelNodeIdentifier | Array<BabelNodeIdentifier> }
-  declare export function getOuterBindingIdentifiers(node: Node, duplicates: boolean): { [key: string]: BabelNodeIdentifier | Array<BabelNodeIdentifier> }
+  declare export function getBindingIdentifiers(node: BabelNode, duplicates?: boolean, outerOnly?: boolean): { [key: string]: BabelNodeIdentifier | Array<BabelNodeIdentifier> }
+  declare export function getOuterBindingIdentifiers(node: Node, duplicates?: boolean): { [key: string]: BabelNodeIdentifier | Array<BabelNodeIdentifier> }
   declare export type TraversalAncestors = Array<{
     node: BabelNode,
     key: string,

packages/buck-worker-tool/package.json

@@ -1,6 +1,6 @@
 {
   "name": "buck-worker-tool",
-  "version": "0.84.6",
+  "version": "0.84.7",
   "description": "Implementation of the Buck worker protocol for Node.js.",
   "license": "MIT",
   "repository": {

packages/metro-babel-register/package.json

@@ -1,6 +1,6 @@
 {
   "name": "metro-babel-register",
-  "version": "0.84.6",
+  "version": "0.84.7",
   "description": "🚇 babel/register configuration for Metro.",
   "main": "src/babel-register.js",
   "exports": {

packages/metro-babel-transformer/package.json

@@ -1,6 +1,6 @@
 {
   "name": "metro-babel-transformer",
-  "version": "0.84.6",
+  "version": "0.84.7",
   "description": "🚇 Base Babel transformer for Metro.",
   "main": "src/index.js",
   "exports": {
@@ -26,7 +26,7 @@
     "@babel/core": "^7.25.2",
     "flow-enums-runtime": "^0.0.6",
     "hermes-parser": "0.35.0",
-    "metro-cache-key": "0.84.6",
+    "metro-cache-key": "0.84.7",
     "nullthrows": "^1.1.1"
   },
   "engines": {

packages/metro-babel-transformer/src/index.js

@@ -40,6 +40,7 @@ type BabelTransformerOptions = Readonly<{
   extendsBabelConfigPath?: string,
   experimentalImportSupport?: boolean,
   hermesParser?: boolean,
+  inlinePlatform?: boolean,
   minify: boolean,
   platform: ?string,
   projectRoot: string,
@@ -105,7 +106,12 @@ function transform(
     const babelConfig: BabelTransformOptions = {
       ast: true,
       babelrc: options.enableBabelRCLookup,
-      caller: {bundler: 'metro', name: 'metro', platform: options.platform},
+      caller: {
+        bundler: 'metro',
+        name: 'metro',
+        platform: options.platform,
+        inlinePlatform: options.inlinePlatform,
+      },
       // NOTE(EvanBacon): We split the parse/transform steps up to accommodate
       // Hermes parsing, but this defaults to cloning the AST which increases
       // the transformation time by a fair amount.

packages/metro-babel-transformer/types/index.d.ts

@@ -6,7 +6,7 @@
  *
  * @noformat
  * @oncall react_native
- * @generated SignedSource<<2503f88efd80b39e4d860870017af66d>>
+ * @generated SignedSource<<d2abc246f3316d666e3344863aa9f844>>
  *
  * This file was translated from Flow by scripts/generateTypeScriptDefinitions.js
  * Original file: packages/metro-babel-transformer/src/index.js
@@ -35,6 +35,7 @@ type BabelTransformerOptions = Readonly<{
   extendsBabelConfigPath?: string;
   experimentalImportSupport?: boolean;
   hermesParser?: boolean;
+  inlinePlatform?: boolean;
   minify: boolean;
   platform: null | undefined | string;
   projectRoot: string;

packages/metro-cache-key/package.json

@@ -1,6 +1,6 @@
 {
   "name": "metro-cache-key",
-  "version": "0.84.6",
+  "version": "0.84.7",
   "description": "🚇 Cache key utility.",
   "main": "src/index.js",
   "exports": {

packages/metro-cache/package.json

@@ -1,6 +1,6 @@
 {
   "name": "metro-cache",
-  "version": "0.84.6",
+  "version": "0.84.7",
   "description": "🚇 Cache layers for Metro.",
   "main": "src/index.js",
   "exports": {
@@ -21,7 +21,7 @@
     "exponential-backoff": "^3.1.1",
     "flow-enums-runtime": "^0.0.6",
     "https-proxy-agent": "^7.0.5",
-    "metro-core": "0.84.6"
+    "metro-core": "0.84.7"
   },
   "devDependencies": {
     "memfs": "^4.38.2"

packages/metro-cache/src/stores/HttpStore.js

@@ -369,10 +369,22 @@ export default class HttpStore<T> {
         res.resume();
       });
 
+      // Without this listener a socket-level failure mid-upload (e.g. the peer
+      // resetting a pooled keep-alive connection) is emitted as an unhandled
+      // 'error' and takes down the whole process instead of rejecting, which
+      // also makes #withRetries unable to retry the write.
+      req.on('error', err => {
+        reject(new NetworkError(err.message, err.code));
+      });
+
       req.on('timeout', () => {
         req.destroy(new Error('Request timed out'));
       });
 
+      gzip.on('error', err => {
+        reject(err);
+      });
+
       gzip.pipe(req);
 
       if (value instanceof Buffer) {
@@ -396,14 +408,12 @@ export default class HttpStore<T> {
     return backOff(fn, {
       jitter: 'full',
       maxDelay: 30000,
-      numOfAttempts: this.#getEndpoint.maxAttempts || Number.POSITIVE_INFINITY,
+      numOfAttempts: endpoint.maxAttempts || Number.POSITIVE_INFINITY,
       retry: (e: Error) => {
         if (e instanceof HttpError) {
-          return this.#getEndpoint.retryStatuses.has(e.code);
+          return endpoint.retryStatuses.has(e.code);
         }
-        return (
-          e instanceof NetworkError && this.#getEndpoint.retryNetworkErrors
-        );
+        return e instanceof NetworkError && endpoint.retryNetworkErrors;
       },
     });
   }

packages/metro-cache/src/stores/__tests__/HttpStore-test.js

@@ -290,6 +290,39 @@ describe('HttpStore', () => {
     });
   });
 
+  test('set() retries use the set endpoint config, not the get endpoint', async () => {
+    jest.useRealTimers();
+    // Distinct read/write retry config: reads do not retry, writes retry 503s.
+    const store = new HttpStore({
+      getOptions: {endpoint: 'http://example.com', maxAttempts: 1},
+      setOptions: {
+        endpoint: 'http://example.com',
+        maxAttempts: 2,
+        retryStatuses: [503],
+      },
+    });
+    const {request} = require('http');
+
+    request.mockImplementation((opts, callback) => {
+      if (request.mock.calls.length === 1) {
+        callback(responseHttpError(503));
+      } else {
+        callback(responseHttpOk(''));
+      }
+      return new PassThrough();
+    });
+
+    let error;
+    try {
+      await store.set(Buffer.from('key-set'), {foo: 42});
+    } catch (e) {
+      error = e;
+    }
+
+    expect(error).toBeUndefined();
+    expect(request).toHaveBeenCalledTimes(2);
+  });
+
   test('sets using the network via PUT method', done => {
     const store = new HttpStore({endpoint: 'http://www.example.com/endpoint'});
     const promise = store.set(Buffer.from('key-set'), {foo: 42});
@@ -332,6 +365,56 @@ describe('HttpStore', () => {
     });
   });
 
+  test('rejects with a NetworkError when the set request socket errors', async () => {
+    const store = new HttpStore({
+      endpoint: 'http://example.com',
+      maxAttempts: 1,
+    });
+    const promise = store.set(Buffer.from('key-set'), {foo: 42});
+    const [opts] = require('http').request.mock.calls[0];
+
+    expect(opts.method).toEqual('PUT');
+
+    const err = new Error('read ECONNRESET');
+    err.code = 'ECONNRESET';
+    httpPassThrough.emit('error', err);
+
+    await expect(promise).rejects.toMatchObject({
+      constructor: HttpStore.NetworkError,
+      code: 'ECONNRESET',
+      message: 'read ECONNRESET',
+    });
+  });
+
+  test('set() retries a request socket error when retryNetworkErrors is set', async () => {
+    jest.useRealTimers();
+    const store = new HttpStore({
+      endpoint: 'http://example.com',
+      maxAttempts: 2,
+      retryNetworkErrors: true,
+    });
+    const {request} = require('http');
+
+    request.mockImplementation((opts, callback) => {
+      const req = new PassThrough();
+
+      if (request.mock.calls.length === 1) {
+        const err = new Error('read ECONNRESET');
+        err.code = 'ECONNRESET';
+        process.nextTick(() => req.emit('error', err));
+      } else {
+        callback(responseHttpOk(''));
+        req.resume();
+      }
+
+      return req;
+    });
+
+    await store.set(Buffer.from('key-set'), {foo: 42});
+
+    expect(request).toHaveBeenCalledTimes(2);
+  });
+
   test('set() resolves when the HTTP code is in additionalSuccessStatuses', done => {
     const store = new HttpStore({
       endpoint: 'http://www.example.com/endpoint',

packages/metro-config/package.json

@@ -1,6 +1,6 @@
 {
   "name": "metro-config",
-  "version": "0.84.6",
+  "version": "0.84.7",
   "description": "🚇 Config parser for Metro.",
   "main": "src/index.js",
   "exports": {
@@ -22,15 +22,15 @@
     "connect": "^3.6.5",
     "flow-enums-runtime": "^0.0.6",
     "jest-validate": "^29.7.0",
-    "metro": "0.84.6",
-    "metro-cache": "0.84.6",
-    "metro-core": "0.84.6",
-    "metro-runtime": "0.84.6",
+    "metro": "0.84.7",
+    "metro-cache": "0.84.7",
+    "metro-core": "0.84.7",
+    "metro-runtime": "0.84.7",
     "yaml": "^2.6.1"
   },
   "devDependencies": {
     "@types/connect": "^3.4.35",
-    "metro-babel-register": "0.84.6",
+    "metro-babel-register": "0.84.7",
     "pretty-format": "^29.7.0"
   },
   "engines": {

packages/metro-config/src/__tests__/mergeConfig-test.js

@@ -29,6 +29,20 @@ describe('mergeConfig', () => {
     });
   });
 
+  test('applies trailing overrides after an async config function', async () => {
+    const base: InputConfigT = {server: {port: 8081}};
+    const asyncOverride = (): Promise<InputConfigT> =>
+      Promise.resolve({transformer: {assetPlugins: ['async-plugin']}});
+    const trailing: InputConfigT = {resolver: {sourceExts: ['ts']}};
+
+    const result = await mergeConfig(base, asyncOverride, trailing);
+
+    // The base and every config in the chain must survive the async branch.
+    expect(result.server?.port).toBe(8081);
+    expect(result.transformer?.assetPlugins).toEqual(['async-plugin']);
+    expect(result.resolver?.sourceExts).toEqual(['ts']);
+  });
+
   describe('server.tls merging', () => {
     describe('override IS applied when tls is false or object', () => {
       test('override tls: object replaces base tls: false', () => {

packages/metro-config/src/loadConfig.js

@@ -244,7 +244,12 @@ function mergeConfig<
       typeof next === 'function' ? next(currentConfig) : next;
     if (nextConfig instanceof Promise) {
       // $FlowFixMe[incompatible-type] Not clear why Flow doesn't like this
-      return mergeConfigAsync(nextConfig, reversedConfigs.toReversed());
+      return mergeConfigAsync(
+        nextConfig.then(resolved =>
+          mergeConfigObjects(currentConfig, resolved),
+        ),
+        ...reversedConfigs.toReversed(),
+      );
     }
     currentConfig = mergeConfigObjects(currentConfig, nextConfig) as T;
   }

packages/metro-core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "metro-core",
-  "version": "0.84.6",
+  "version": "0.84.7",
   "description": "🚇 Metro's core package.",
   "main": "src/index.js",
   "exports": {
@@ -20,7 +20,7 @@
   "dependencies": {
     "flow-enums-runtime": "^0.0.6",
     "lodash.throttle": "^4.1.1",
-    "metro-resolver": "0.84.6"
+    "metro-resolver": "0.84.7"
   },
   "license": "MIT",
   "engines": {

packages/metro-file-map/package.json

@@ -1,6 +1,6 @@
 {
   "name": "metro-file-map",
-  "version": "0.84.6",
+  "version": "0.84.7",
   "description": "[Experimental] - 🚇 File crawling, watching and mapping for Metro",
   "main": "src/index.js",
   "exports": {
@@ -26,8 +26,7 @@
     "invariant": "^2.2.4",
     "jest-worker": "^29.7.0",
     "micromatch": "^4.0.4",
-    "nullthrows": "^1.1.1",
-    "walker": "^1.0.7"
+    "nullthrows": "^1.1.1"
   },
   "devDependencies": {
     "slash": "^3.0.0"