metro 0.65.2 → 0.67.0

package/src/shared/output/RamBundle/buildSourcemapWithMetadata.js.flow

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * 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.
@@ -10,15 +10,15 @@
 
 'use strict';
 
+import type {ModuleGroups, ModuleTransportLike} from '../../types.flow';
+import type {IndexMap} from 'metro-source-map';
+
 const {
   combineSourceMaps,
   combineSourceMapsAddingOffsets,
   joinModules,
 } = require('./util');
 
-import type {ModuleGroups, ModuleTransportLike} from '../../types.flow';
-import type {IndexMap} from 'metro-source-map';
-
 type Params = {|
   fixWrapperOffset: boolean,
   lazyModules: $ReadOnlyArray<ModuleTransportLike>,

package/src/shared/output/RamBundle/magic-number.js

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * 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.

package/src/shared/output/RamBundle/magic-number.js.flow

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * 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.

package/src/shared/output/RamBundle/util.js

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * 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.
@@ -9,11 +9,13 @@
  */
 "use strict";
 
-const invariant = require("invariant");
+var _countLines = _interopRequireDefault(require("../../../lib/countLines"));
 
-const newline = /\r\n?|\n|\u2028|\u2029/g; // fastest implementation
+function _interopRequireDefault(obj) {
+  return obj && obj.__esModule ? obj : { default: obj };
+}
 
-const countLines = string => (string.match(newline) || []).length + 1;
+const invariant = require("invariant");
 
 function lineToLineSourceMap(source, filename = "") {
   // The first line mapping in our package is the base64vlq code for zeros (A).
@@ -23,28 +25,28 @@ function lineToLineSourceMap(source, filename = "") {
   const line = "AACA;";
   return {
     file: filename,
-    mappings: firstLine + Array(countLines(source)).join(line),
+    mappings: firstLine + Array((0, _countLines.default)(source)).join(line),
     sources: [filename],
     names: [],
-    version: 3
+    version: 3,
   };
 }
 
-const wrapperEnd = wrappedCode => wrappedCode.indexOf("{") + 1;
+const wrapperEnd = (wrappedCode) => wrappedCode.indexOf("{") + 1;
 
 const Section = (line, column, map) => ({
   map,
   offset: {
     line,
-    column
-  }
+    column,
+  },
 });
 
 function combineSourceMaps(modules, moduleGroups, options) {
   const sections = combineMaps(modules, null, moduleGroups, options);
   return {
     sections,
-    version: 3
+    version: 3,
   };
 }
 
@@ -65,14 +67,14 @@ function combineSourceMapsAddingOffsets(
     sections,
     version: 3,
     x_facebook_offsets,
-    x_metro_module_paths
+    x_metro_module_paths,
   };
 }
 
 function combineMaps(modules, offsets, moduleGroups, options) {
   const sections = [];
   let line = 0;
-  modules.forEach(moduleTransport => {
+  modules.forEach((moduleTransport) => {
     const { code, id, name } = moduleTransport;
     let column = 0;
     let group;
@@ -90,11 +92,11 @@ function combineMaps(modules, offsets, moduleGroups, options) {
       if (group && moduleGroups) {
         const { modulesById } = moduleGroups;
         const otherModules = Array.from(group || [])
-          .map(moduleId => modulesById.get(moduleId))
+          .map((moduleId) => modulesById.get(moduleId))
           .filter(Boolean); // needed to appease flow
 
-        otherModules.forEach(m => {
-          groupLines += countLines(m.code);
+        otherModules.forEach((m) => {
+          groupLines += (0, _countLines.default)(m.code);
         });
         map = combineSourceMaps([moduleTransport].concat(otherModules));
       }
@@ -118,17 +120,17 @@ function combineMaps(modules, offsets, moduleGroups, options) {
       }
     }
 
-    line += countLines(code) + groupLines;
+    line += (0, _countLines.default)(code) + groupLines;
   });
   return sections;
 }
 
-const joinModules = modules => modules.map(m => m.code).join("\n");
+const joinModules = (modules) => modules.map((m) => m.code).join("\n");
 
 module.exports = {
   combineSourceMaps,
   combineSourceMapsAddingOffsets,
-  countLines,
+  countLines: _countLines.default,
   joinModules,
-  lineToLineSourceMap
+  lineToLineSourceMap,
 };

package/src/shared/output/RamBundle/util.js.flow

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * 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.
@@ -10,20 +10,17 @@
 
 'use strict';
 
-const invariant = require('invariant');
-
 import type {ModuleGroups, ModuleTransportLike} from '../../types.flow';
 import type {
+  BasicSourceMap,
   IndexMap,
   IndexMapSection,
   MixedSourceMap,
-  BasicSourceMap,
 } from 'metro-source-map';
 
-const newline = /\r\n?|\n|\u2028|\u2029/g;
-// fastest implementation
-const countLines = (string: string): number =>
-  (string.match(newline) || []).length + 1;
+import countLines from '../../../lib/countLines';
+
+const invariant = require('invariant');
 
 function lineToLineSourceMap(
   source: string,

package/src/shared/output/RamBundle/write-sourcemap.js

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * 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.

package/src/shared/output/RamBundle/write-sourcemap.js.flow

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * 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.

package/src/shared/output/RamBundle.js

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * 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.
@@ -19,7 +19,7 @@ async function build(packagerClient, requestOptions) {
   const options = {
     ...Server.DEFAULT_BUNDLE_OPTIONS,
     ...requestOptions,
-    bundleType: "ram"
+    bundleType: "ram",
   };
   return await packagerClient.getRamBundleInfo(options);
 }

package/src/shared/output/RamBundle.js.flow

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * 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.
@@ -10,14 +10,13 @@
 
 'use strict';
 
-const Server = require('../../Server');
+import type {RamBundleInfo} from '../../DeltaBundler/Serializers/getRamBundleInfo';
+import type {OutputOptions, RequestOptions} from '../types.flow';
 
+const Server = require('../../Server');
 const asAssets = require('./RamBundle/as-assets');
 const asIndexedFile = require('./RamBundle/as-indexed-file').save;
 
-import type {OutputOptions, RequestOptions} from '../types.flow';
-import type {RamBundleInfo} from '../../DeltaBundler/Serializers/getRamBundleInfo';
-
 async function build(
   packagerClient: Server,
   requestOptions: RequestOptions,

package/src/shared/output/bundle.js

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * 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.
@@ -9,17 +9,17 @@
  */
 "use strict";
 
-const Server = require("../../Server");
-
 const relativizeSourceMapInline = require("../../lib/relativizeSourceMap");
 
+const Server = require("../../Server");
+
 const writeFile = require("./writeFile");
 
 function buildBundle(packagerClient, requestOptions) {
   return packagerClient.build({
     ...Server.DEFAULT_BUNDLE_OPTIONS,
     ...requestOptions,
-    bundleType: "bundle"
+    bundleType: "bundle",
   });
 }
 
@@ -34,7 +34,7 @@ async function saveBundleAndMap(bundle, options, log) {
     bundleOutput,
     bundleEncoding: encoding,
     sourcemapOutput,
-    sourcemapSourcesRoot
+    sourcemapSourcesRoot,
   } = options;
   const writeFns = [];
   writeFns.push(async () => {
@@ -59,7 +59,7 @@ async function saveBundleAndMap(bundle, options, log) {
     });
   } // Wait until everything is written to disk.
 
-  await Promise.all(writeFns.map(cb => cb()));
+  await Promise.all(writeFns.map((cb) => cb()));
 }
 
 exports.build = buildBundle;

package/src/shared/output/bundle.js.flow

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * 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.
@@ -10,14 +10,13 @@
 
 'use strict';
 
-const Server = require('../../Server');
+import type {OutputOptions, RequestOptions} from '../types.flow';
+import type {MixedSourceMap} from 'metro-source-map';
 
 const relativizeSourceMapInline = require('../../lib/relativizeSourceMap');
+const Server = require('../../Server');
 const writeFile = require('./writeFile');
 
-import type {OutputOptions, RequestOptions} from '../types.flow';
-import type {MixedSourceMap} from 'metro-source-map';
-
 function buildBundle(
   packagerClient: Server,
   requestOptions: RequestOptions,

package/src/shared/output/meta.js

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * 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.
@@ -8,13 +8,12 @@
  * @format
  */
 "use strict";
-/* global Buffer: true */
 
 const crypto = require("crypto");
 
-const isUTF8 = encoding => /^utf-?8$/i.test(encoding);
+const isUTF8 = (encoding) => /^utf-?8$/i.test(encoding);
 
-const constantFor = encoding =>
+const constantFor = (encoding) =>
   /^ascii$/i.test(encoding)
     ? 1
     : isUTF8(encoding)
@@ -23,7 +22,7 @@ const constantFor = encoding =>
     ? 3
     : 0;
 
-module.exports = function(code, encoding = "utf8") {
+module.exports = function (code, encoding = "utf8") {
   const buffer = asBuffer(code, encoding);
   const hash = crypto.createHash("sha1");
   hash.update(buffer);

package/src/shared/output/meta.js.flow

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * 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.
@@ -10,8 +10,6 @@
 
 'use strict';
 
-/* global Buffer: true */
-
 const crypto = require('crypto');
 
 const isUTF8 = (encoding: 'ascii' | 'utf16le' | 'utf8') =>
@@ -26,7 +24,7 @@ const constantFor = (encoding: 'ascii' | 'utf16le' | 'utf8') =>
     ? 3
     : 0;
 
-module.exports = function(
+module.exports = function (
   code: Buffer | string,
   encoding: 'ascii' | 'utf16le' | 'utf8' = 'utf8',
 ): Buffer {

package/src/shared/output/unbundle.js

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * 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.

package/src/shared/output/unbundle.js.flow

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * 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.

package/src/shared/output/writeFile.js

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * 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.

package/src/shared/output/writeFile.js.flow

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * 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.

package/src/shared/types.flow.js

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * 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.

package/src/shared/types.flow.js.flow

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * 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.
@@ -10,12 +10,14 @@
 
 'use strict';
 
-import type {Options as DeltaBundlerOptions} from '../DeltaBundler/types.flow';
-import type {TransformInputOptions} from '../lib/transformHelpers';
+import type {
+  Options as DeltaBundlerOptions,
+  TransformInputOptions,
+} from '../DeltaBundler/types.flow';
 import type {TransformProfile} from 'metro-babel-transformer';
 import type {
-  MixedSourceMap,
   MetroSourceMapSegmentTuple,
+  MixedSourceMap,
 } from 'metro-source-map';
 import type {
   CustomTransformOptions,

package/src/node-haste/DependencyGraph/assets/empty-module.js.flow

@@ -1,9 +0,0 @@
-/**
- * Copyright (c) Facebook, Inc. and its 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
- */

package/src/node-haste/types.js

@@ -1,10 +0,0 @@
-/**
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- *
- * @format
- */
-"use strict"; // TODO(cpojer): Create a jest-types repo.

package/src/node-haste/types.js.flow

@@ -1,23 +0,0 @@
-/**
- * Copyright (c) Facebook, Inc. and its 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
- * @format
- */
-
-'use strict';
-
-// TODO(cpojer): Create a jest-types repo.
-export type HasteFS = {
-  exists(filePath: string): boolean,
-  getAllFiles(): Array<string>,
-  getDependencies(filePath: string): Array<string>,
-  getFileIterator(): Iterator<string>,
-  getModuleName(filePath: string): ?string,
-  getSha1(string): ?string,
-  matchFiles(pattern: RegExp | string): Array<string>,
-  ...
-};