metro 0.85.0 → 0.87.0

package/src/node-haste/DependencyGraph/createFileMap.js

@@ -36,36 +36,29 @@ function _interopRequireWildcard(e, t) {
 function _interopRequireDefault(e) {
   return e && e.__esModule ? e : { default: e };
 }
-function getIgnorePattern(config) {
-  const { blockList, blacklistRE } = config.resolver;
-  const ignorePattern = blacklistRE || blockList;
-  if (!ignorePattern) {
-    return / ^/;
+const flattenBlockList = (regexes) => {
+  if (!Array.isArray(regexes)) {
+    return regexes;
   }
-  const combine = (regexes) =>
-    new RegExp(
-      regexes
-        .map((regex, index) => {
-          if (regex.flags !== regexes[0].flags) {
-            throw new Error(
-              "Cannot combine blockList patterns, because they have different flags:\n" +
-                " - Pattern 0: " +
-                regexes[0].toString() +
-                "\n" +
-                ` - Pattern ${index}: ` +
-                regexes[index].toString(),
-            );
-          }
-          return "(" + regex.source + ")";
-        })
-        .join("|"),
-      regexes[0]?.flags ?? "",
-    );
-  if (Array.isArray(ignorePattern)) {
-    return combine(ignorePattern);
-  }
-  return ignorePattern;
-}
+  return new RegExp(
+    regexes
+      .map((regex, index) => {
+        if (regex.flags !== regexes[0].flags) {
+          throw new Error(
+            "Cannot combine blockList patterns, because they have different flags:\n" +
+              " - Pattern 0: " +
+              regexes[0].toString() +
+              "\n" +
+              ` - Pattern ${index}: ` +
+              regexes[index].toString(),
+          );
+        }
+        return "(" + regex.source + ")";
+      })
+      .join("|"),
+    regexes[0]?.flags ?? "",
+  );
+};
 function createFileMap(config, options) {
   const watch = options?.watch == null ? !_ciInfo.default.isCI : options.watch;
   const { enabled: autoSaveEnabled, ...autoSaveOpts } =
@@ -115,7 +108,7 @@ function createFileMap(config, options) {
       ]),
     ),
     healthCheck: config.watcher.healthCheck,
-    ignorePattern: getIgnorePattern(config),
+    ignorePattern: flattenBlockList(config.resolver.blockList),
     maxWorkers: config.maxWorkers,
     plugins,
     retainAllFiles: true,

package/src/node-haste/DependencyGraph/createFileMap.js.flow

@@ -19,43 +19,29 @@ import MetroFileMap, {
   HastePlugin,
 } from 'metro-file-map';
 
-function getIgnorePattern(config: ConfigT): RegExp {
-  // For now we support both options
-  const {blockList, blacklistRE} = config.resolver;
-  const ignorePattern = blacklistRE || blockList;
-
-  // If neither option has been set, use default pattern
-  if (!ignorePattern) {
-    return / ^/;
-  }
-
-  const combine = (regexes: Array<RegExp>) =>
-    new RegExp(
-      regexes
-        .map((regex, index) => {
-          if (regex.flags !== regexes[0].flags) {
-            throw new Error(
-              'Cannot combine blockList patterns, because they have different flags:\n' +
-                ' - Pattern 0: ' +
-                regexes[0].toString() +
-                '\n' +
-                ` - Pattern ${index}: ` +
-                regexes[index].toString(),
-            );
-          }
-          return '(' + regex.source + ')';
-        })
-        .join('|'),
-      regexes[0]?.flags ?? '',
-    );
-
-  // If ignorePattern is an array, merge it into one
-  if (Array.isArray(ignorePattern)) {
-    return combine(ignorePattern);
+const flattenBlockList = (regexes: ConfigT['resolver']['blockList']) => {
+  if (!Array.isArray(regexes)) {
+    return regexes;
   }
-
-  return ignorePattern;
-}
+  return new RegExp(
+    regexes
+      .map((regex, index) => {
+        if (regex.flags !== regexes[0].flags) {
+          throw new Error(
+            'Cannot combine blockList patterns, because they have different flags:\n' +
+              ' - Pattern 0: ' +
+              regexes[0].toString() +
+              '\n' +
+              ` - Pattern ${index}: ` +
+              regexes[index].toString(),
+          );
+        }
+        return '(' + regex.source + ')';
+      })
+      .join('|'),
+    regexes[0]?.flags ?? '',
+  );
+};
 
 export default function createFileMap(
   config: ConfigT,
@@ -126,7 +112,7 @@ export default function createFileMap(
       ]),
     ),
     healthCheck: config.watcher.healthCheck,
-    ignorePattern: getIgnorePattern(config),
+    ignorePattern: flattenBlockList(config.resolver.blockList),
     maxWorkers: config.maxWorkers,
     plugins,
     retainAllFiles: true,

package/src/DeltaBundler/__fixtures__/hasteImpl.js

@@ -1,17 +0,0 @@
-"use strict";
-
-const fs = require("fs");
-module.exports = {
-  getHasteName(filename) {
-    const matches = fs
-      .readFileSync(filename, "utf8")
-      .match(/@providesModule ([^\n]+)/);
-    if (!matches) {
-      return undefined;
-    }
-    return matches[1];
-  },
-  getCacheKey() {
-    return "hasteImplFixture";
-  },
-};

package/src/integration_tests/basic_bundle/AssetRegistry.js

@@ -1,7 +0,0 @@
-"use strict";
-
-module.exports = {
-  registerAsset(data) {
-    return data;
-  },
-};

package/src/integration_tests/basic_bundle/AssetRegistry.js.flow

@@ -1,17 +0,0 @@
-/**
- * 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
- * @flow strict
- */
-
-'use strict';
-
-module.exports = {
-  registerAsset(data: unknown): unknown {
-    return data;
-  },
-};

package/src/integration_tests/basic_bundle/Bar.js

@@ -1,7 +0,0 @@
-"use strict";
-
-const Foo = require("./Foo");
-module.exports = {
-  type: "bar",
-  foo: Foo.type,
-};

package/src/integration_tests/basic_bundle/Bar.js.flow

@@ -1,15 +0,0 @@
-/**
- * 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
- * @flow strict
- */
-
-'use strict';
-
-const Foo = require('./Foo');
-
-module.exports = {type: 'bar', foo: Foo.type};

package/src/integration_tests/basic_bundle/ErrorBundle.js

@@ -1,8 +0,0 @@
-"use strict";
-
-require("./AssetRegistry");
-const calcSum = (value) => {
-  const error = new Error("SOURCEMAP: value: " + value);
-  return error;
-};
-module.exports = calcSum("anything");

package/src/integration_tests/basic_bundle/ErrorBundle.js.flow

@@ -1,23 +0,0 @@
-/**
- * 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
- * @flow strict
- */
-
-'use strict';
-
-// Add a random require to fill the bundle with some sourcecode.
-require('./AssetRegistry');
-
-const calcSum = (value: string) => {
-  // some random function
-  const error = new Error('SOURCEMAP: value: ' + value);
-
-  return error;
-};
-
-module.exports = calcSum('anything') as Error;

package/src/integration_tests/basic_bundle/Foo.js

@@ -1,7 +0,0 @@
-"use strict";
-
-const asset = require("./test.png");
-module.exports = {
-  type: "foo",
-  asset,
-};

package/src/integration_tests/basic_bundle/Foo.js.flow

@@ -1,15 +0,0 @@
-/**
- * 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
- * @flow strict
- */
-
-'use strict';
-
-const asset = require('./test.png');
-
-module.exports = {type: 'foo', asset};

package/src/integration_tests/basic_bundle/TestBigInt.js

@@ -1,5 +0,0 @@
-"use strict";
-
-var a = 2n;
-var b = 3n;
-module.exports = a ** b;

package/src/integration_tests/basic_bundle/TestBigInt.js.flow

@@ -1,17 +0,0 @@
-/**
- * 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
- * @flow strict-local
- */
-
-'use strict';
-
-// $FlowFixMe[signature-verification-failure]
-var a = 2n;
-// $FlowFixMe[signature-verification-failure]
-var b = 3n;
-module.exports = a ** b;

package/src/integration_tests/basic_bundle/TestBundle.js

@@ -1,13 +0,0 @@
-"use strict";
-
-const Bar = require("./Bar");
-const Foo = require("./Foo");
-const TypeScript = require("./TypeScript");
-Object.keys({
-  ...Bar,
-});
-module.exports = {
-  Foo,
-  Bar,
-  TypeScript,
-};

package/src/integration_tests/basic_bundle/TestBundle.js.flow

@@ -1,21 +0,0 @@
-/**
- * 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
- * @flow strict
- */
-
-'use strict';
-
-const Bar = require('./Bar');
-const Foo = require('./Foo');
-// $FlowFixMe[untyped-import]: Flow doesn't understand TypeScript
-// $FlowFixMe[cannot-resolve-module]: Flow doesn't understand TypeScript
-const TypeScript = require('./TypeScript');
-
-Object.keys({...Bar});
-
-module.exports = {Foo, Bar, TypeScript};

package/src/integration_tests/basic_bundle/TestPolyfill.js

@@ -1,3 +0,0 @@
-"use strict";
-
-module.exports = global.POLYFILL_IS_INJECTED;

package/src/integration_tests/basic_bundle/TestPolyfill.js.flow

@@ -1,13 +0,0 @@
-/**
- * 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
- * @flow strict
- */
-
-'use strict';
-
-module.exports = global.POLYFILL_IS_INJECTED;

package/src/integration_tests/basic_bundle/TypeScript.ts

@@ -1,16 +0,0 @@
-/**
- * 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.
- */
-
-export const type = 'TypeScript' as string
-export const test = true as boolean
-
-// Exporting default interface was broken before Babel 7.0.0-beta.56
-export default interface A {}
-
-export class B {
-  constructor(public name: string){}
-}

package/src/integration_tests/basic_bundle/build-errors/cannot-resolve-import.js

@@ -1,7 +0,0 @@
-"use strict";
-
-var _doesNotExist = _interopRequireDefault(require("./does-not-exist"));
-function _interopRequireDefault(e) {
-  return e && e.__esModule ? e : { default: e };
-}
-global.x = _doesNotExist.default;

package/src/integration_tests/basic_bundle/build-errors/cannot-resolve-import.js.flow

@@ -1,17 +0,0 @@
-/**
- * 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.
- *
- * @flow strict-local
- * @format
- */
-
-// $FlowExpectedError[cannot-resolve-module]
-import type DoesNotExistT from './does-not-exist';
-
-// $FlowExpectedError[cannot-resolve-module]
-import DoesNotExist from './does-not-exist';
-
-global.x = DoesNotExist as DoesNotExistT;

package/src/integration_tests/basic_bundle/build-errors/cannot-resolve-multi-line-import-with-escapes.js

@@ -1,4 +0,0 @@
-"use strict";
-
-var _doesNotExist = require("./does-not'\"-exist");
-global.x = _doesNotExist.aaaaaaaaaa;

package/src/integration_tests/basic_bundle/build-errors/cannot-resolve-multi-line-import-with-escapes.js.flow

@@ -1,29 +0,0 @@
-/**
- * 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.
- *
- * @flow strict-local
- * @format
- */
-
-/* eslint-disable no-unused-vars */
-
-// $FlowExpectedError[cannot-resolve-module]
-import type DoesNotExistT from './does-not\'"-exist';
-
-import {
-  aaaaaaaaaa,
-  bbbbbbbbbb,
-  cccccccccc,
-  dddddddddd,
-  eeeeeeeeee,
-  ffffffffff,
-  gggggggggg,
-  hhhhhhhhhh,
-  iiiiiiiiii,
-  // $FlowExpectedError[cannot-resolve-module]
-} from './does-not\'"-exist';
-
-global.x = aaaaaaaaaa as DoesNotExistT;

package/src/integration_tests/basic_bundle/build-errors/cannot-resolve-multi-line-import.js

@@ -1,4 +0,0 @@
-"use strict";
-
-var _doesNotExist = require("./does-not-exist");
-global.x = _doesNotExist.aaaaaaaaaa;

package/src/integration_tests/basic_bundle/build-errors/cannot-resolve-multi-line-import.js.flow

@@ -1,29 +0,0 @@
-/**
- * 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.
- *
- * @flow strict-local
- * @format
- */
-
-/* eslint-disable no-unused-vars */
-
-// $FlowExpectedError[cannot-resolve-module]
-import type DoesNotExistT from './does-not-exist';
-
-import {
-  aaaaaaaaaa,
-  bbbbbbbbbb,
-  cccccccccc,
-  dddddddddd,
-  eeeeeeeeee,
-  ffffffffff,
-  gggggggggg,
-  hhhhhhhhhh,
-  iiiiiiiiii,
-  // $FlowExpectedError[cannot-resolve-module]
-} from './does-not-exist';
-
-global.x = aaaaaaaaaa as DoesNotExistT;

package/src/integration_tests/basic_bundle/build-errors/cannot-resolve-require-with-embedded-comment.js

@@ -1,4 +0,0 @@
-"use strict";
-
-const DoesNotExist = require("./foo");
-global.x = DoesNotExist;

package/src/integration_tests/basic_bundle/build-errors/cannot-resolve-require-with-embedded-comment.js.flow

@@ -1,17 +0,0 @@
-/**
- * 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.
- *
- * @flow strict-local
- * @format
- */
-
-// $FlowExpectedError[cannot-resolve-module]
-import type DoesNotExistT from './foo';
-
-// $FlowExpectedError[cannot-resolve-module]
-const DoesNotExist = require('./foo' /* ./foo */);
-
-global.x = DoesNotExist as DoesNotExistT;

package/src/integration_tests/basic_bundle/build-errors/cannot-resolve-require.js

@@ -1,4 +0,0 @@
-"use strict";
-
-const DoesNotExist = require("./does-not-exist");
-global.x = DoesNotExist;

package/src/integration_tests/basic_bundle/build-errors/cannot-resolve-require.js.flow

@@ -1,17 +0,0 @@
-/**
- * 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.
- *
- * @flow strict-local
- * @format
- */
-
-// $FlowExpectedError[cannot-resolve-module]
-import type DoesNotExistT from './does-not-exist';
-
-// $FlowExpectedError[cannot-resolve-module]
-const DoesNotExist = require('./does-not-exist');
-
-global.x = DoesNotExist as DoesNotExistT;

package/src/integration_tests/basic_bundle/build-errors/cannot-resolve-specifier-with-escapes.js

@@ -1,4 +0,0 @@
-"use strict";
-
-var _doesNotExist = require("./does-not'\"-exist");
-global.x = _doesNotExist.DoesNotExist;

package/src/integration_tests/basic_bundle/build-errors/cannot-resolve-specifier-with-escapes.js.flow

@@ -1,19 +0,0 @@
-/**
- * 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.
- *
- * @flow strict-local
- * @format
- */
-
-/* eslint-disable no-unused-vars */
-
-// $FlowExpectedError[cannot-resolve-module]
-import type DoesNotExistT from './does-not\'"-exist';
-
-// $FlowExpectedError[cannot-resolve-module]
-import {DoesNotExist} from './does-not\'"-exist';
-
-global.x = DoesNotExist as DoesNotExistT;

package/src/integration_tests/basic_bundle/build-errors/inline-requires-cannot-resolve-import.js

@@ -1,7 +0,0 @@
-"use strict";
-
-var _doesNotExist = _interopRequireDefault(require("./does-not-exist"));
-function _interopRequireDefault(e) {
-  return e && e.__esModule ? e : { default: e };
-}
-global.x = _doesNotExist.default;

package/src/integration_tests/basic_bundle/build-errors/inline-requires-cannot-resolve-import.js.flow

@@ -1,17 +0,0 @@
-/**
- * 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.
- *
- * @flow strict-local
- * @format
- */
-
-// $FlowExpectedError[cannot-resolve-module]
-import type DoesNotExistT from './does-not-exist';
-
-// $FlowExpectedError[cannot-resolve-module]
-import DoesNotExist from './does-not-exist';
-
-global.x = DoesNotExist as DoesNotExistT;

package/src/integration_tests/basic_bundle/build-errors/inline-requires-cannot-resolve-require.js

@@ -1,4 +0,0 @@
-"use strict";
-
-const DoesNotExist = require("./does-not-exist");
-global.x = DoesNotExist;

package/src/integration_tests/basic_bundle/build-errors/inline-requires-cannot-resolve-require.js.flow

@@ -1,17 +0,0 @@
-/**
- * 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.
- *
- * @flow strict-local
- * @format
- */
-
-// $FlowExpectedError[cannot-resolve-module]
-import type DoesNotExistT from './does-not-exist';
-
-// $FlowExpectedError[cannot-resolve-module]
-const DoesNotExist = require('./does-not-exist');
-
-global.x = DoesNotExist as DoesNotExistT;

package/src/integration_tests/basic_bundle/excluded_from_file_map.js

@@ -1,7 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true,
-});
-exports.default = void 0;
-var _default = (exports.default = "/* secret */");

package/src/integration_tests/basic_bundle/excluded_from_file_map.js.flow

@@ -1,11 +0,0 @@
-/**
- * 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.
- *
- * @flow strict-local
- * @format
- */
-
-export default '/* secret */';

package/src/integration_tests/basic_bundle/import-export/export-1.js

@@ -1,12 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true,
-});
-exports.foo = exports.default = void 0;
-exports.myFunction = myFunction;
-var _default = (exports.default = "export-1: DEFAULT");
-const foo = (exports.foo = "export-1: FOO");
-function myFunction() {
-  return "export-1: MY_FUNCTION";
-}

package/src/integration_tests/basic_bundle/import-export/export-1.js.flow

@@ -1,19 +0,0 @@
-/**
- * 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
- * @flow strict
- */
-
-'use strict';
-
-export default 'export-1: DEFAULT';
-
-export const foo = 'export-1: FOO';
-
-export function myFunction(): string {
-  return 'export-1: MY_FUNCTION';
-}