@atlaspack/fs 2.15.15 → 2.15.16-typescript-80839fbd5.0

package/LICENSE

@@ -0,0 +1,201 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright (c) 2024 Atlassian US., Inc.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

package/lib/MemoryFS.js

@@ -35,7 +35,7 @@ function _utils() {
 }
 var _package = _interopRequireDefault(require("../package.json"));
 function _workers() {
-  const data = _interopRequireWildcard(require("@atlaspack/workers"));
+  const data = _interopRequireDefault(require("@atlaspack/workers"));
   _workers = function () {
     return data;
   };
@@ -56,12 +56,14 @@ function _events() {
   return data;
 }
 var _find = require("./find");
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 const instances = new Map();
 let id = 0;
 class MemoryFS {
+  // @ts-expect-error TS2564
+
+  // @ts-expect-error TS2564
+
   _numWorkerInstances = 0;
   _workerRegisterResolves = [];
   _emitter = new (_events().default)();
@@ -100,7 +102,7 @@ class MemoryFS {
   serialize() {
     if (!this.handle) {
       this.handle = this.farm.createReverseHandle((fn, args) => {
-        // $FlowFixMe
+        // @ts-expect-error TS7053
         return this[fn](...args);
       });
     }
@@ -108,6 +110,7 @@ class MemoryFS {
     // If a worker instance already exists, it will decrement this number
     this._numWorkerInstances++;
     return {
+      // @ts-expect-error TS2353
       $$raw: false,
       id: this.id,
       handle: this.handle,
@@ -471,6 +474,8 @@ class MemoryFS {
     // Batch events
     this._eventQueue.push(event);
     clearTimeout(this._watcherTimer);
+
+    // @ts-expect-error TS2322
     this._watcherTimer = setTimeout(() => {
       let events = this._eventQueue;
       this._eventQueue = [];
@@ -496,7 +501,9 @@ class MemoryFS {
   async _sendWorkerEvent(event) {
     // Wait for worker instances to register their handles
     while (this._workerHandles.length < this._numWorkerInstances) {
-      await new Promise(resolve => this._workerRegisterResolves.push(resolve));
+      await new Promise(resolve =>
+      // @ts-expect-error TS2345
+      this._workerRegisterResolves.push(resolve));
     }
     await Promise.all(this._workerHandles.map(workerHandle => this.farm.workerApi.runHandle(workerHandle, [event])));
   }
@@ -610,7 +617,9 @@ class WriteStream extends _stream().Writable {
     callback();
   }
   _final(callback) {
-    this.fs.writeFile(this.filePath, this.buffer, this.options).then(callback).catch(callback);
+    this.fs.writeFile(this.filePath, this.buffer, this.options)
+    // @ts-expect-error TS2345
+    .then(callback).catch(callback);
   }
 }
 const S_IFREG = 0o100000;
@@ -743,7 +752,7 @@ function makeShared(contents) {
     return contents;
   }
   let contentsBuffer = contents;
-  // $FlowFixMe
+  // @ts-expect-error TS2339
   if (process.browser) {
     // For the polyfilled buffer module, it's faster to always convert once so that the subsequent
     // operations are fast (.byteLength and using .set instead of .write)
@@ -764,7 +773,7 @@ function makeShared(contents) {
 class WorkerFS extends MemoryFS {
   constructor(id, handle) {
     // TODO Make this not a subclass
-    // $FlowFixMe
+    // @ts-expect-error TS2554
     super();
     this.id = id;
     this.handleFn = (methodName, args) => _workers().default.getWorkerApi().runHandle(handle, [methodName, args]);
@@ -791,7 +800,7 @@ class WorkerFS extends MemoryFS {
     return (0, _nullthrows().default)(instances.get(opts.id));
   }
   serialize() {
-    // $FlowFixMe
+    // @ts-expect-error TS2739
     return {
       id: this.id
     };

package/lib/NodeFS.browser.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.NodeFS = void 0;
-// $FlowFixMe[prop-missing] handled by the throwing constructor
+// @ts-expect-error TS2420
 class NodeFS {
   constructor() {
     throw new Error("NodeFS isn't available in the browser");

package/lib/NodeFS.js

@@ -86,6 +86,10 @@ var searchJS = _interopRequireWildcard(require("./find"));
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+// @ts-expect-error TS7016
+
+// @ts-expect-error TS7016
+
 // Most of this can go away once we only support Node 10+, which includes
 // require('fs').promises
 const realpath = (0, _util().promisify)(process.platform === 'win32' ? _gracefulFs().default.realpath : _gracefulFs().default.realpath.native);
@@ -93,8 +97,6 @@ const isPnP = process.versions.pnp != null;
 function getWatchmanWatcher() {
   // This is here to trick atlaspack into ignoring this require...
   const packageName = ['@atlaspack', 'watcher-watchman-js'].join('/');
-
-  // $FlowFixMe
   return require(packageName);
 }
 class NodeFS {
@@ -113,9 +115,15 @@ class NodeFS {
   realpathSync = process.platform === 'win32' ? _gracefulFs().default.realpathSync : _gracefulFs().default.realpathSync.native;
   existsSync = _gracefulFs().default.existsSync;
   readdirSync = _gracefulFs().default.readdirSync;
-  findAncestorFile = isPnP ? (...args) => searchJS.findAncestorFile(this, ...args) : searchNative().findAncestorFile;
-  findNodeModule = isPnP ? (...args) => searchJS.findNodeModule(this, ...args) : searchNative().findNodeModule;
-  findFirstFile = isPnP ? (...args) => searchJS.findFirstFile(this, ...args) : searchNative().findFirstFile;
+  findAncestorFile = isPnP ?
+  // @ts-expect-error TS7019
+  (...args) => searchJS.findAncestorFile(this, ...args) : searchNative().findAncestorFile;
+  findNodeModule = isPnP ?
+  // @ts-expect-error TS7019
+  (...args) => searchJS.findNodeModule(this, ...args) : searchNative().findNodeModule;
+  findFirstFile = isPnP ?
+  // @ts-expect-error TS7019
+  (...args) => searchJS.findFirstFile(this, ...args) : searchNative().findFirstFile;
   watcher() {
     return (0, _featureFlags().getFeatureFlag)('useWatchmanWatcher') ? getWatchmanWatcher() : _watcher().default;
   }
@@ -144,7 +152,9 @@ class NodeFS {
       ...options,
       fs: {
         ..._gracefulFs().default,
+        // @ts-expect-error TS7006
         close: (fd, cb) => {
+          // @ts-expect-error TS7006
           _gracefulFs().default.close(fd, err => {
             if (err) {
               cb(err);
@@ -227,7 +237,6 @@ class NodeFS {
       return;
     }
     if (stat.isDirectory()) {
-      // $FlowFixMe
       await _fs().default.promises.rmdir(filePath, {
         recursive: true
       });
@@ -239,6 +248,8 @@ class NodeFS {
 exports.NodeFS = NodeFS;
 (0, _buildCache().registerSerializableClass)(`${_package.default.version}:NodeFS`, NodeFS);
 let writeStreamCalls = 0;
+
+// @ts-expect-error TS7034
 let threadId;
 try {
   ({
@@ -247,9 +258,13 @@ try {
 } catch {
   //
 }
+
+// @ts-expect-error TS7034
 let useOsTmpDir;
 function shouldUseOsTmpDir(filePath) {
+  // @ts-expect-error TS7005
   if (useOsTmpDir != null) {
+    // @ts-expect-error TS7005
     return useOsTmpDir;
   }
   try {
@@ -277,5 +292,7 @@ function getTempFilePath(filePath) {
   if (shouldUseOsTmpDir(filePath)) {
     tmpFilePath = _path().default.join((0, _os().tmpdir)(), _path().default.basename(filePath));
   }
-  return tmpFilePath + '.' + process.pid + (threadId != null ? '.' + threadId : '') + '.' + (writeStreamCalls++).toString(36);
+  return tmpFilePath + '.' + process.pid + (
+  // @ts-expect-error TS7005
+  threadId != null ? '.' + threadId : '') + '.' + (writeStreamCalls++).toString(36);
 }

package/lib/NodeVCSAwareFS.js

@@ -44,7 +44,6 @@ var _package = _interopRequireDefault(require("../package.json"));
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-// $FlowFixMe
 class NodeVCSAwareFS extends _NodeFS.NodeFS {
   /**
    * These files are excluded from 'dirty file' tracking even if they are
@@ -66,8 +65,6 @@ class NodeVCSAwareFS extends _NodeFS.NodeFS {
     this.#logEventDiff = options.logEventDiff;
     this.#gitRepoPath = options.gitRepoPath;
   }
-
-  // $FlowFixMe[incompatible-extend] the serialization API is not happy with inheritance
   static deserialize(data) {
     const fs = new NodeVCSAwareFS({
       excludePatterns: data.excludePatterns,
@@ -77,7 +74,7 @@ class NodeVCSAwareFS extends _NodeFS.NodeFS {
     return fs;
   }
 
-  // $FlowFixMe[incompatible-extend] the serialization API is not happy with inheritance
+  // @ts-expect-error TS2416
   serialize() {
     return {
       excludePatterns: this.#excludePatterns,
@@ -103,7 +100,14 @@ class NodeVCSAwareFS extends _NodeFS.NodeFS {
       return JSON.parse(snapshotFileContent);
     });
     let watcherEventsSince = [];
-    const vcsEventsSince = vcsState != null ? (await (0, _logger().instrumentAsync)('NodeVCSAwareFS::rust.getEventsSince', () => (0, _rust().getEventsSince)(gitRepoPath, vcsState, null))).map(e => ({
+    const vcsEventsSince = vcsState != null ?
+    // @ts-expect-error TS2571
+    (await (0, _logger().instrumentAsync)('NodeVCSAwareFS::rust.getEventsSince', () =>
+    // @ts-expect-error TS2739
+    (0, _rust().getEventsSince)(gitRepoPath, vcsState, null))
+
+    // @ts-expect-error TS7006
+    ).map(e => ({
       path: e.path,
       type: e.changeType
     })) : null;
@@ -112,6 +116,8 @@ class NodeVCSAwareFS extends _NodeFS.NodeFS {
       watcherEventsSince = await (0, _logger().instrumentAsync)('NodeVCSAwareFS::watchman.getEventsSince', () => this.watcher().getEventsSince(dir, nativeSnapshotPath, opts));
       (_this$logEventDiff = this.#logEventDiff) === null || _this$logEventDiff === void 0 || _this$logEventDiff.call(this, watcherEventsSince, vcsEventsSince);
     }
+
+    // @ts-expect-error TS2345
     if (['NEW_AND_CHECK', 'NEW'].includes((0, _featureFlags().getFeatureFlagValue)('vcsMode'))) {
       if (vcsEventsSince == null) {
         _logger().default.error({
@@ -145,13 +151,17 @@ class NodeVCSAwareFS extends _NodeFS.NodeFS {
     let vcsState = null;
     try {
       var _vcsState, _vcsState2;
-      vcsState = await (0, _logger().instrumentAsync)('NodeVCSAwareFS::getVcsStateSnapshot', () => (0, _rust().getVcsStateSnapshot)(gitRepoPath, this.#excludePatterns));
+      vcsState = await (0, _logger().instrumentAsync)('NodeVCSAwareFS::getVcsStateSnapshot',
+      // @ts-expect-error TS2322
+      () => (0, _rust().getVcsStateSnapshot)(gitRepoPath, this.#excludePatterns));
       _logger().default.verbose({
         origin: '@atlaspack/fs',
         message: 'Expose VCS timing metrics',
         meta: {
           trackableEvent: 'vcs_timing_metrics',
+          // @ts-expect-error TS2339
           dirtyFilesExecutionTime: (_vcsState = vcsState) === null || _vcsState === void 0 ? void 0 : _vcsState.dirtyFilesExecutionTime,
+          // @ts-expect-error TS2339
           yarnStatesExecutionTime: (_vcsState2 = vcsState) === null || _vcsState2 === void 0 ? void 0 : _vcsState2.yarnStatesExecutionTime
         }
       });

package/lib/OverlayFS.js

@@ -252,10 +252,10 @@ class OverlayFS {
   readFileSync(filePath, encoding) {
     filePath = this.realpathSync(filePath);
     try {
-      // $FlowFixMe[incompatible-call]
+      // @ts-expect-error TS2345
       return this.writable.readFileSync(filePath, encoding);
     } catch (err) {
-      // $FlowFixMe[incompatible-call]
+      // @ts-expect-error TS2345
       return this.readable.readFileSync(filePath, encoding);
     }
   }
@@ -304,6 +304,7 @@ class OverlayFS {
     // Read from both filesystems and merge the results
     let entries = new Map();
     try {
+      // @ts-expect-error TS2769
       for (let entry of this.writable.readdirSync(dir, opts)) {
         let filePath = _path().default.join(dir, entry.name ?? entry);
         if (this.deleted.has(filePath)) continue;
@@ -313,6 +314,7 @@ class OverlayFS {
       // noop
     }
     try {
+      // @ts-expect-error TS2769
       for (let entry of this.readable.readdirSync(dir, opts)) {
         let filePath = _path().default.join(dir, entry.name ?? entry);
         if (this.deleted.has(filePath)) continue;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaspack/fs",
-  "version": "2.15.15",
+  "version": "2.15.16-typescript-80839fbd5.0",
   "description": "Blazing fast, zero configuration web application bundler",
   "license": "(MIT OR Apache-2.0)",
   "publishConfig": {
@@ -11,8 +11,8 @@
     "url": "https://github.com/atlassian-labs/atlaspack.git"
   },
   "main": "lib/index.js",
-  "source": "src/index.js",
-  "types": "index.d.ts",
+  "source": "src/index.ts",
+  "types": "src/index.ts",
   "engines": {
     "node": ">= 16.0.0"
   },
@@ -48,19 +48,18 @@
     }
   },
   "scripts": {
-    "build-ts": "mkdir -p lib && flow-to-ts src/types.js > lib/types.d.ts",
-    "check-ts": "tsc --noEmit index.d.ts"
+    "check-ts": "tsc --noEmit"
   },
   "dependencies": {
-    "@atlaspack/build-cache": "2.13.3",
-    "@atlaspack/feature-flags": "2.19.2",
-    "@atlaspack/logger": "2.14.13",
-    "@atlaspack/rust": "3.4.1",
-    "@atlaspack/types-internal": "2.15.2",
-    "@atlaspack/utils": "2.17.2",
+    "@atlaspack/build-cache": "2.13.4-typescript-80839fbd5.0",
+    "@atlaspack/feature-flags": "2.19.3-typescript-80839fbd5.0",
+    "@atlaspack/logger": "2.14.14-typescript-80839fbd5.0",
+    "@atlaspack/rust": "3.4.2-typescript-80839fbd5.0",
+    "@atlaspack/types-internal": "2.15.3-typescript-80839fbd5.0",
+    "@atlaspack/utils": "2.17.3-typescript-80839fbd5.0",
+    "@atlaspack/watcher-watchman-js": "2.14.21-typescript-80839fbd5.0",
+    "@atlaspack/workers": "2.14.21-typescript-80839fbd5.0",
     "@parcel/watcher": "^2.0.7",
-    "@atlaspack/workers": "2.14.20",
-    "@atlaspack/watcher-watchman-js": "2.14.20",
     "graceful-fs": "^4.2.4",
     "ncp": "^2.0.0",
     "nullthrows": "^1.1.1",
@@ -70,5 +69,6 @@
     "@atlaspack/fs": "./lib/browser.js",
     "./src/NodeFS.js": "./src/NodeFS.browser.js"
   },
-  "type": "commonjs"
+  "type": "commonjs",
+  "gitHead": "80839fbd5c6d6668c2622849856a4b25601354a8"
 }

package/src/{MemoryFS.js → MemoryFS.ts}

@@ -1,5 +1,3 @@
-// @flow
-
 import type {
   FilePath,
   FileSystem,
@@ -28,22 +26,21 @@ let id = 0;
 
 type HandleFunction = (...args: Array<any>) => any;
 type SerializedMemoryFS = {
-  id: number,
-  handle: any,
-  dirs: Map<FilePath, Directory>,
-  files: Map<FilePath, File>,
-  symlinks: Map<FilePath, FilePath>,
-  ...
+  id: number;
+  handle: any;
+  dirs: Map<FilePath, Directory>;
+  files: Map<FilePath, File>;
+  symlinks: Map<FilePath, FilePath>;
 };
 
-type WorkerEvent = {|
-  type: 'writeFile' | 'unlink' | 'mkdir' | 'symlink',
-  path: FilePath,
-  entry?: Entry,
-  target?: FilePath,
-|};
+type WorkerEvent = {
+  type: 'writeFile' | 'unlink' | 'mkdir' | 'symlink';
+  path: FilePath;
+  entry?: Entry;
+  target?: FilePath;
+};
 
-type ResolveFunction = () => mixed;
+type ResolveFunction = () => unknown;
 
 export class MemoryFS implements FileSystem {
   dirs: Map<FilePath, Directory>;
@@ -52,11 +49,13 @@ export class MemoryFS implements FileSystem {
   watchers: Map<FilePath, Set<Watcher>>;
   events: Array<Event>;
   id: number;
+  // @ts-expect-error TS2564
   handle: Handle;
   farm: WorkerFarm;
   _cwd: FilePath;
   _eventQueue: Array<Event>;
-  _watcherTimer: TimeoutID;
+  // @ts-expect-error TS2564
+  _watcherTimer: number;
   _numWorkerInstances: number = 0;
   _workerHandles: Array<Handle>;
   _workerRegisterResolves: Array<ResolveFunction> = [];
@@ -103,8 +102,8 @@ export class MemoryFS implements FileSystem {
   serialize(): SerializedMemoryFS {
     if (!this.handle) {
       this.handle = this.farm.createReverseHandle(
-        (fn: string, args: Array<mixed>) => {
-          // $FlowFixMe
+        (fn: string, args: Array<unknown>) => {
+          // @ts-expect-error TS7053
           return this[fn](...args);
         },
       );
@@ -114,6 +113,7 @@ export class MemoryFS implements FileSystem {
     this._numWorkerInstances++;
 
     return {
+      // @ts-expect-error TS2353
       $$raw: false,
       id: this.id,
       handle: this.handle,
@@ -166,7 +166,7 @@ export class MemoryFS implements FileSystem {
   async writeFile(
     filePath: FilePath,
     contents: Buffer | string,
-    options?: ?FileOptions,
+    options?: FileOptions | null,
   ) {
     filePath = this._normalizePath(filePath);
     if (this.dirs.has(filePath)) {
@@ -256,7 +256,7 @@ export class MemoryFS implements FileSystem {
       dir += path.sep;
     }
 
-    let res = [];
+    let res: Array<Dirent | any | string> = [];
     for (let [filePath, entry] of this.dirs) {
       if (filePath === dir) {
         continue;
@@ -496,7 +496,10 @@ export class MemoryFS implements FileSystem {
     return new ReadStream(this, filePath);
   }
 
-  createWriteStream(filePath: FilePath, options: ?FileOptions): WriteStream {
+  createWriteStream(
+    filePath: FilePath,
+    options?: FileOptions | null,
+  ): WriteStream {
     this.mkdirp(path.dirname(filePath));
     return new WriteStream(this, filePath, options);
   }
@@ -541,6 +544,7 @@ export class MemoryFS implements FileSystem {
     this._eventQueue.push(event);
     clearTimeout(this._watcherTimer);
 
+    // @ts-expect-error TS2322
     this._watcherTimer = setTimeout(() => {
       let events = this._eventQueue;
       this._eventQueue = [];
@@ -572,8 +576,10 @@ export class MemoryFS implements FileSystem {
   async _sendWorkerEvent(event: WorkerEvent) {
     // Wait for worker instances to register their handles
     while (this._workerHandles.length < this._numWorkerInstances) {
-      await new Promise((resolve) =>
-        this._workerRegisterResolves.push(resolve),
+      await new Promise(
+        (resolve: (result: Promise<undefined> | undefined) => void) =>
+          // @ts-expect-error TS2345
+          this._workerRegisterResolves.push(resolve),
       );
     }
 
@@ -586,7 +592,7 @@ export class MemoryFS implements FileSystem {
 
   watch(
     dir: FilePath,
-    fn: (err: ?Error, events: Array<Event>) => mixed,
+    fn: (err: Error | null | undefined, events: Array<Event>) => unknown,
     opts: WatcherOptions,
   ): Promise<AsyncSubscription> {
     dir = this._normalizePath(dir);
@@ -640,25 +646,28 @@ export class MemoryFS implements FileSystem {
     fileNames: Array<string>,
     fromDir: FilePath,
     root: FilePath,
-  ): ?FilePath {
+  ): FilePath | null | undefined {
     return findAncestorFile(this, fileNames, fromDir, root);
   }
 
-  findNodeModule(moduleName: string, fromDir: FilePath): ?FilePath {
+  findNodeModule(
+    moduleName: string,
+    fromDir: FilePath,
+  ): FilePath | null | undefined {
     return findNodeModule(this, moduleName, fromDir);
   }
 
-  findFirstFile(filePaths: Array<FilePath>): ?FilePath {
+  findFirstFile(filePaths: Array<FilePath>): FilePath | null | undefined {
     return findFirstFile(this, filePaths);
   }
 }
 
 class Watcher {
-  fn: (err: ?Error, events: Array<Event>) => mixed;
+  fn: (err: Error | null | undefined, events: Array<Event>) => unknown;
   options: WatcherOptions;
 
   constructor(
-    fn: (err: ?Error, events: Array<Event>) => mixed,
+    fn: (err: Error | null | undefined, events: Array<Event>) => unknown,
     options: WatcherOptions,
   ) {
     this.fn = fn;
@@ -726,10 +735,14 @@ class ReadStream extends Readable {
 class WriteStream extends Writable {
   fs: FileSystem;
   filePath: FilePath;
-  options: ?FileOptions;
+  options: FileOptions | null | undefined;
   buffer: Buffer;
 
-  constructor(fs: FileSystem, filePath: FilePath, options: ?FileOptions) {
+  constructor(
+    fs: FileSystem,
+    filePath: FilePath,
+    options?: FileOptions | null,
+  ) {
     super({emitClose: true, autoDestroy: true});
     this.fs = fs;
     this.filePath = filePath;
@@ -750,6 +763,7 @@ class WriteStream extends Writable {
   _final(callback: (error?: Error) => void) {
     this.fs
       .writeFile(this.filePath, this.buffer, this.options)
+      // @ts-expect-error TS2345
       .then(callback)
       .catch(callback);
   }
@@ -935,7 +949,7 @@ export function makeShared(contents: Buffer | string): Buffer {
   }
 
   let contentsBuffer: Buffer | string = contents;
-  // $FlowFixMe
+  // @ts-expect-error TS2339
   if (process.browser) {
     // For the polyfilled buffer module, it's faster to always convert once so that the subsequent
     // operations are fast (.byteLength and using .set instead of .write)
@@ -965,10 +979,10 @@ class WorkerFS extends MemoryFS {
 
   constructor(id: number, handle: Handle) {
     // TODO Make this not a subclass
-    // $FlowFixMe
+    // @ts-expect-error TS2554
     super();
     this.id = id;
-    this.handleFn = (methodName, args) =>
+    this.handleFn = (methodName: any, args: any) =>
       WorkerFarm.getWorkerApi().runHandle(handle, [methodName, args]);
 
     this.handleFn('_registerWorker', [
@@ -998,7 +1012,7 @@ class WorkerFS extends MemoryFS {
   }
 
   serialize(): SerializedMemoryFS {
-    // $FlowFixMe
+    // @ts-expect-error TS2739
     return {
       id: this.id,
     };
@@ -1007,7 +1021,7 @@ class WorkerFS extends MemoryFS {
   writeFile(
     filePath: FilePath,
     contents: Buffer | string,
-    options: ?FileOptions,
+    options?: FileOptions | null,
   ): Promise<void> {
     super.writeFile(filePath, contents, options);
     let buffer = makeShared(contents);

package/src/{NodeFS.browser.js → NodeFS.browser.ts}

@@ -1,7 +1,6 @@
-// @flow
 import type {FileSystem} from '@atlaspack/types-internal';
 
-// $FlowFixMe[prop-missing] handled by the throwing constructor
+// @ts-expect-error TS2420
 export class NodeFS implements FileSystem {
   constructor() {
     throw new Error("NodeFS isn't available in the browser");

package/src/{NodeFS.js → NodeFS.ts}

@@ -1,4 +1,3 @@
-// @flow
 import type {ReadStream, Stats} from 'fs';
 import type {Writable} from 'stream';
 import type {
@@ -13,8 +12,10 @@ import type {
   AsyncSubscription,
 } from '@parcel/watcher';
 
+// @ts-expect-error TS7016
 import fs from 'graceful-fs';
 import nativeFS from 'fs';
+// @ts-expect-error TS7016
 import ncp from 'ncp';
 import path from 'path';
 import {tmpdir} from 'os';
@@ -40,7 +41,6 @@ function getWatchmanWatcher(): typeof watcher {
   // This is here to trick atlaspack into ignoring this require...
   const packageName = ['@atlaspack', 'watcher-watchman-js'].join('/');
 
-  // $FlowFixMe
   return require(packageName);
 }
 
@@ -62,15 +62,18 @@ export class NodeFS implements FileSystem {
   realpathSync: (path: string, cache?: any) => string =
     process.platform === 'win32' ? fs.realpathSync : fs.realpathSync.native;
   existsSync: (path: string) => boolean = fs.existsSync;
-  readdirSync: any = (fs.readdirSync: any);
+  readdirSync: any = fs.readdirSync as any;
   findAncestorFile: any = isPnP
-    ? (...args) => searchJS.findAncestorFile(this, ...args)
+    ? // @ts-expect-error TS7019
+      (...args) => searchJS.findAncestorFile(this, ...args)
     : searchNative.findAncestorFile;
   findNodeModule: any = isPnP
-    ? (...args) => searchJS.findNodeModule(this, ...args)
+    ? // @ts-expect-error TS7019
+      (...args) => searchJS.findNodeModule(this, ...args)
     : searchNative.findNodeModule;
   findFirstFile: any = isPnP
-    ? (...args) => searchJS.findFirstFile(this, ...args)
+    ? // @ts-expect-error TS7019
+      (...args) => searchJS.findFirstFile(this, ...args)
     : searchNative.findFirstFile;
 
   watcher(): typeof watcher {
@@ -88,7 +91,7 @@ export class NodeFS implements FileSystem {
       if (!failed) {
         try {
           await fs.promises.rename(tmpFilePath, filePath);
-        } catch (e) {
+        } catch (e: any) {
           // This is adapted from fs-write-stream-atomic. Apparently
           // Windows doesn't like renaming when the target already exists.
           if (
@@ -117,7 +120,9 @@ export class NodeFS implements FileSystem {
       ...options,
       fs: {
         ...fs,
+        // @ts-expect-error TS7006
         close: (fd, cb) => {
+          // @ts-expect-error TS7006
           fs.close(fd, (err) => {
             if (err) {
               cb(err);
@@ -136,7 +141,7 @@ export class NodeFS implements FileSystem {
       failed = true;
       try {
         fs.unlinkSync(tmpFilePath);
-      } catch (_err) {
+      } catch (_err: any) {
         // ignore
       }
     });
@@ -147,7 +152,7 @@ export class NodeFS implements FileSystem {
   async writeFile(
     filePath: FilePath,
     contents: Buffer | string,
-    options: ?FileOptions,
+    options?: FileOptions | null,
   ): Promise<void> {
     let tmpFilePath = getTempFilePath(filePath);
     await fs.promises.writeFile(tmpFilePath, contents, options);
@@ -164,7 +169,7 @@ export class NodeFS implements FileSystem {
   async realpath(originalPath: string): Promise<string> {
     try {
       return await realpath(originalPath, 'utf8');
-    } catch (e) {
+    } catch (e: any) {
       // do nothing
     }
 
@@ -172,14 +177,14 @@ export class NodeFS implements FileSystem {
   }
 
   exists(filePath: FilePath): Promise<boolean> {
-    return new Promise((resolve) => {
+    return new Promise((resolve: (result: Promise<never>) => void) => {
       fs.exists(filePath, resolve);
     });
   }
 
   watch(
     dir: FilePath,
-    fn: (err: ?Error, events: Array<Event>) => mixed,
+    fn: (err: Error | null | undefined, events: Array<Event>) => unknown,
     opts: WatcherOptions,
   ): Promise<AsyncSubscription> {
     return this.watcher().subscribe(dir, fn, opts);
@@ -224,12 +229,11 @@ export class NodeFS implements FileSystem {
     let stat;
     try {
       stat = await this.stat(filePath);
-    } catch (err) {
+    } catch (err: any) {
       return;
     }
 
     if (stat.isDirectory()) {
-      // $FlowFixMe
       await nativeFS.promises.rmdir(filePath, {recursive: true});
     } else {
       await nativeFS.promises.unlink(filePath);
@@ -241,6 +245,7 @@ registerSerializableClass(`${packageJSON.version}:NodeFS`, NodeFS);
 
 let writeStreamCalls = 0;
 
+// @ts-expect-error TS7034
 let threadId;
 try {
   ({threadId} = require('worker_threads'));
@@ -248,10 +253,13 @@ try {
   //
 }
 
+// @ts-expect-error TS7034
 let useOsTmpDir;
 
-function shouldUseOsTmpDir(filePath) {
+function shouldUseOsTmpDir(filePath: FilePath) {
+  // @ts-expect-error TS7005
   if (useOsTmpDir != null) {
+    // @ts-expect-error TS7005
     return useOsTmpDir;
   }
   try {
@@ -265,7 +273,7 @@ function shouldUseOsTmpDir(filePath) {
     // Check the tmpdir is on the same partition as the target directory.
     // This is required to ensure renaming is an atomic operation.
     useOsTmpDir = tmpDirStats.dev === filePathStats.dev;
-  } catch (e) {
+  } catch (e: any) {
     // We don't have read/write access to the OS tmp directory
     useOsTmpDir = false;
   }
@@ -288,6 +296,7 @@ function getTempFilePath(filePath: FilePath) {
     tmpFilePath +
     '.' +
     process.pid +
+    // @ts-expect-error TS7005
     (threadId != null ? '.' + threadId : '') +
     '.' +
     (writeStreamCalls++).toString(36)

package/src/{NodeVCSAwareFS.js → NodeVCSAwareFS.ts}

@@ -1,5 +1,3 @@
-// @flow strict-local
-
 import path from 'path';
 import {NodeFS} from './NodeFS';
 import {getVcsStateSnapshot, getEventsSince} from '@atlaspack/rust';
@@ -9,7 +7,6 @@ import {registerSerializableClass} from '@atlaspack/build-cache';
 import logger, {instrumentAsync} from '@atlaspack/logger';
 import {getFeatureFlagValue} from '@atlaspack/feature-flags';
 
-// $FlowFixMe
 import packageJSON from '../package.json';
 
 export interface NodeVCSAwareFSOptions {
@@ -43,7 +40,6 @@ export class NodeVCSAwareFS extends NodeFS {
     this.#gitRepoPath = options.gitRepoPath;
   }
 
-  // $FlowFixMe[incompatible-extend] the serialization API is not happy with inheritance
   static deserialize(data: SerializedNodeVCSAwareFS): NodeVCSAwareFS {
     const fs = new NodeVCSAwareFS({
       excludePatterns: data.excludePatterns,
@@ -53,7 +49,7 @@ export class NodeVCSAwareFS extends NodeFS {
     return fs;
   }
 
-  // $FlowFixMe[incompatible-extend] the serialization API is not happy with inheritance
+  // @ts-expect-error TS2416
   serialize(): SerializedNodeVCSAwareFS {
     return {
       excludePatterns: this.#excludePatterns,
@@ -85,18 +81,22 @@ export class NodeVCSAwareFS extends NodeFS {
         return JSON.parse(snapshotFileContent);
       },
     );
-    let watcherEventsSince = [];
+    let watcherEventsSince: Array<Event> = [];
 
     const vcsEventsSince =
       vcsState != null
-        ? (
+        ? // @ts-expect-error TS2571
+          (
             await instrumentAsync('NodeVCSAwareFS::rust.getEventsSince', () =>
+              // @ts-expect-error TS2739
               getEventsSince(gitRepoPath, vcsState, null),
             )
-          ).map((e) => ({
-            path: e.path,
-            type: e.changeType,
-          }))
+          )
+            // @ts-expect-error TS7006
+            .map((e) => ({
+              path: e.path,
+              type: e.changeType,
+            }))
         : null;
 
     if (getFeatureFlagValue('vcsMode') !== 'NEW' && vcsEventsSince != null) {
@@ -107,6 +107,7 @@ export class NodeVCSAwareFS extends NodeFS {
       this.#logEventDiff?.(watcherEventsSince, vcsEventsSince);
     }
 
+    // @ts-expect-error TS2345
     if (['NEW_AND_CHECK', 'NEW'].includes(getFeatureFlagValue('vcsMode'))) {
       if (vcsEventsSince == null) {
         logger.error({
@@ -159,6 +160,7 @@ export class NodeVCSAwareFS extends NodeFS {
     try {
       vcsState = await instrumentAsync(
         'NodeVCSAwareFS::getVcsStateSnapshot',
+        // @ts-expect-error TS2322
         () => getVcsStateSnapshot(gitRepoPath, this.#excludePatterns),
       );
 
@@ -167,11 +169,13 @@ export class NodeVCSAwareFS extends NodeFS {
         message: 'Expose VCS timing metrics',
         meta: {
           trackableEvent: 'vcs_timing_metrics',
+          // @ts-expect-error TS2339
           dirtyFilesExecutionTime: vcsState?.dirtyFilesExecutionTime,
+          // @ts-expect-error TS2339
           yarnStatesExecutionTime: vcsState?.yarnStatesExecutionTime,
         },
       });
-    } catch (err) {
+    } catch (err: any) {
       logger.error({
         origin: '@atlaspack/fs',
         message: `Failed to get VCS state snapshot: ${err.message}`,
@@ -185,7 +189,7 @@ export class NodeVCSAwareFS extends NodeFS {
     const snapshotContents = {
       vcsState,
       nativeSnapshotPath,
-    };
+    } as const;
     await this.writeFile(snapshot, JSON.stringify(snapshotContents));
   }
 }

package/src/{OverlayFS.js → OverlayFS.ts}

@@ -1,5 +1,3 @@
-// @flow
-
 import type {Readable, Writable} from 'stream';
 import type {
   FilePath,
@@ -46,12 +44,12 @@ export class OverlayFS implements FileSystem {
     return fs;
   }
 
-  serialize(): {|
-    $$raw: boolean,
-    readable: FileSystem,
-    writable: FileSystem,
-    deleted: Set<FilePath>,
-  |} {
+  serialize(): {
+    $$raw: boolean;
+    readable: FileSystem;
+    writable: FileSystem;
+    deleted: Set<FilePath>;
+  } {
     return {
       $$raw: false,
       writable: this.writable,
@@ -108,7 +106,7 @@ export class OverlayFS implements FileSystem {
               }
             }
           }
-        } catch (e) {
+        } catch (e: any) {
           if (e.code === 'ENOENT') {
             return false;
           }
@@ -141,7 +139,7 @@ export class OverlayFS implements FileSystem {
   async writeFile(
     filePath: FilePath,
     contents: string | Buffer,
-    options: ?FileOptions,
+    options?: FileOptions | null,
   ): Promise<void> {
     filePath = await this._copyPathForWrite(filePath);
     await this.writable.writeFile(filePath, contents, options);
@@ -212,7 +210,7 @@ export class OverlayFS implements FileSystem {
 
     try {
       await this.writable.unlink(filePath);
-    } catch (e) {
+    } catch (e: any) {
       if (e.code === 'ENOENT' && !this.readable.existsSync(filePath)) {
         throw e;
       }
@@ -239,7 +237,7 @@ export class OverlayFS implements FileSystem {
   async rimraf(filePath: FilePath): Promise<void> {
     try {
       await this.unlink(filePath);
-    } catch (e) {
+    } catch (e: any) {
       // noop
     }
   }
@@ -250,7 +248,7 @@ export class OverlayFS implements FileSystem {
     return this.writable.ncp(source, destination);
   }
 
-  createReadStream(filePath: FilePath, opts?: ?FileOptions): Readable {
+  createReadStream(filePath: FilePath, opts?: FileOptions | null): Readable {
     filePath = this._deletedThrows(filePath);
     if (this.writable.existsSync(filePath)) {
       return this.writable.createReadStream(filePath, opts);
@@ -259,7 +257,7 @@ export class OverlayFS implements FileSystem {
     return this.readable.createReadStream(filePath, opts);
   }
 
-  createWriteStream(path: FilePath, opts?: ?FileOptions): Writable {
+  createWriteStream(path: FilePath, opts?: FileOptions | null): Writable {
     path = this._normalizePath(path);
     this.deleted.delete(path);
     return this.writable.createWriteStream(path, opts);
@@ -281,10 +279,10 @@ export class OverlayFS implements FileSystem {
   readFileSync(filePath: FilePath, encoding?: Encoding): any {
     filePath = this.realpathSync(filePath);
     try {
-      // $FlowFixMe[incompatible-call]
+      // @ts-expect-error TS2345
       return this.writable.readFileSync(filePath, encoding);
-    } catch (err) {
-      // $FlowFixMe[incompatible-call]
+    } catch (err: any) {
+      // @ts-expect-error TS2345
       return this.readable.readFileSync(filePath, encoding);
     }
   }
@@ -293,7 +291,7 @@ export class OverlayFS implements FileSystem {
     filePath = this._normalizePath(filePath);
     try {
       return this.writable.statSync(filePath);
-    } catch (e) {
+    } catch (e: any) {
       if (e.code === 'ENOENT' && this.existsSync(filePath)) {
         return this.readable.statSync(filePath);
       }
@@ -321,7 +319,7 @@ export class OverlayFS implements FileSystem {
 
     try {
       filePath = this.realpathSync(filePath);
-    } catch (err) {
+    } catch (err: any) {
       if (err.code !== 'ENOENT') throw err;
     }
 
@@ -343,7 +341,8 @@ export class OverlayFS implements FileSystem {
     let entries = new Map();
 
     try {
-      for (let entry: any of this.writable.readdirSync(dir, opts)) {
+      // @ts-expect-error TS2769
+      for (let entry of this.writable.readdirSync(dir, opts)) {
         let filePath = path.join(dir, entry.name ?? entry);
         if (this.deleted.has(filePath)) continue;
         entries.set(filePath, entry);
@@ -353,7 +352,8 @@ export class OverlayFS implements FileSystem {
     }
 
     try {
-      for (let entry: any of this.readable.readdirSync(dir, opts)) {
+      // @ts-expect-error TS2769
+      for (let entry of this.readable.readdirSync(dir, opts)) {
         let filePath = path.join(dir, entry.name ?? entry);
         if (this.deleted.has(filePath)) continue;
         if (entries.has(filePath)) continue;
@@ -368,7 +368,7 @@ export class OverlayFS implements FileSystem {
 
   async watch(
     dir: FilePath,
-    fn: (err: ?Error, events: Array<Event>) => mixed,
+    fn: (err: Error | null | undefined, events: Array<Event>) => unknown,
     opts: WatcherOptions,
   ): Promise<AsyncSubscription> {
     let writableSubscription = await this.writable.watch(dir, fn, opts);
@@ -411,15 +411,18 @@ export class OverlayFS implements FileSystem {
     fileNames: Array<string>,
     fromDir: FilePath,
     root: FilePath,
-  ): ?FilePath {
+  ): FilePath | null | undefined {
     return findAncestorFile(this, fileNames, fromDir, root);
   }
 
-  findNodeModule(moduleName: string, fromDir: FilePath): ?FilePath {
+  findNodeModule(
+    moduleName: string,
+    fromDir: FilePath,
+  ): FilePath | null | undefined {
     return findNodeModule(this, moduleName, fromDir);
   }
 
-  findFirstFile(filePaths: Array<FilePath>): ?FilePath {
+  findFirstFile(filePaths: Array<FilePath>): FilePath | null | undefined {
     return findFirstFile(this, filePaths);
   }
 }

package/src/{find.js → find.ts}

@@ -1,4 +1,3 @@
-// @flow
 import type {FilePath, FileSystem} from '@atlaspack/types-internal';
 import path from 'path';
 
@@ -6,7 +5,7 @@ export function findNodeModule(
   fs: FileSystem,
   moduleName: string,
   dir: FilePath,
-): ?FilePath {
+): FilePath | null | undefined {
   let {root} = path.parse(dir);
   while (dir !== root) {
     // Skip node_modules directories
@@ -20,7 +19,7 @@ export function findNodeModule(
       if (stats.isDirectory()) {
         return moduleDir;
       }
-    } catch (err) {
+    } catch (err: any) {
       // ignore
     }
 
@@ -36,7 +35,7 @@ export function findAncestorFile(
   fileNames: Array<string>,
   dir: FilePath,
   root: FilePath,
-): ?FilePath {
+): FilePath | null | undefined {
   let {root: pathRoot} = path.parse(dir);
   // eslint-disable-next-line no-constant-condition
   while (true) {
@@ -50,7 +49,7 @@ export function findAncestorFile(
         if (fs.statSync(filePath).isFile()) {
           return filePath;
         }
-      } catch (err) {
+      } catch (err: any) {
         // ignore
       }
     }
@@ -68,13 +67,13 @@ export function findAncestorFile(
 export function findFirstFile(
   fs: FileSystem,
   filePaths: Array<FilePath>,
-): ?FilePath {
+): FilePath | null | undefined {
   for (let filePath of filePaths) {
     try {
       if (fs.statSync(filePath).isFile()) {
         return filePath;
       }
-    } catch (err) {
+    } catch (err: any) {
       // ignore
     }
   }

package/src/{index.js → index.ts}

@@ -1,4 +1,3 @@
-// @flow strict-local
 import type {
   FilePath,
   FileSystem,
@@ -17,7 +16,7 @@ export * from './NodeVCSAwareFS';
 
 export type {FileSystem, FileOptions};
 
-const pipeline: (Readable, Writable) => Promise<void> = promisify(
+const pipeline: (arg1: Readable, arg2: Writable) => Promise<void> = promisify(
   stream.pipeline,
 );
 

package/test/{OverlayFS.test.js → OverlayFS.test.ts}

@@ -1,7 +1,5 @@
-// @flow
-
 import {OverlayFS} from '../src/OverlayFS';
-import {fsFixture} from '@atlaspack/test-utils/src/fsFixture';
+import {fsFixture} from '@atlaspack/test-utils';
 import {MemoryFS} from '../src/MemoryFS';
 import WorkerFarm from '@atlaspack/workers';
 import {WORKER_PATH} from '@atlaspack/core';
@@ -10,9 +8,9 @@ import assert from 'assert';
 import path from 'path';
 
 describe('OverlayFS', () => {
-  let underlayFS;
-  let fs;
-  let workerFarm;
+  let underlayFS: any;
+  let fs: any;
+  let workerFarm: any;
 
   beforeEach(() => {
     workerFarm = new WorkerFarm({

package/tsconfig.json

@@ -0,0 +1,4 @@
+{
+  "extends": "../../../tsconfig.json",
+  "include": ["src"]
+}