@atlaspack/fs 2.15.16-typescript-bc4459c37.0 → 2.15.16

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 # @atlaspack/fs
 
+## 2.15.16
+
+### Patch Changes
+
+- Updated dependencies [[`069de47`](https://github.com/atlassian-labs/atlaspack/commit/069de478e64fb5889f6f2ce023eb510782767fbd)]:
+  - @atlaspack/types-internal@2.16.0
+  - @atlaspack/feature-flags@2.20.0
+  - @atlaspack/workers@2.14.21
+  - @atlaspack/utils@2.17.3
+  - @atlaspack/watcher-watchman-js@2.14.21
+
 ## 2.15.15
 
 ### Patch Changes

package/index.d.ts

@@ -0,0 +1,34 @@
+import type {FileSystem, FilePath} from '@atlaspack/types-internal';
+import type {Event} from '@parcel/watcher';
+import type WorkerFarm from '@atlaspack/workers';
+
+export type {
+  FileSystem,
+  FileOptions,
+  ReaddirOptions,
+  Stats,
+  Encoding,
+  Dirent,
+} from '@atlaspack/types-internal';
+
+export const NodeFS: {
+  new (): FileSystem;
+};
+
+export const MemoryFS: {
+  new (farm: WorkerFarm): FileSystem;
+};
+
+export const OverlayFS: {
+  new (writable: FileSystem, readable: FileSystem): FileSystem;
+};
+
+interface NodeVCSAwareFSOptions {
+  gitRepoPath: null | FilePath;
+  excludePatterns: Array<string>;
+  logEventDiff: null | ((watcherEvents: Event[], vcsEvents: Event[]) => void);
+}
+
+export const NodeVCSAwareFS: {
+  new (options: NodeVCSAwareFSOptions): FileSystem;
+};

package/lib/MemoryFS.js

@@ -35,7 +35,7 @@ function _utils() {
 }
 var _package = _interopRequireDefault(require("../package.json"));
 function _workers() {
-  const data = _interopRequireDefault(require("@atlaspack/workers"));
+  const data = _interopRequireWildcard(require("@atlaspack/workers"));
   _workers = function () {
     return data;
   };
@@ -56,14 +56,12 @@ 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)();
@@ -102,7 +100,7 @@ class MemoryFS {
   serialize() {
     if (!this.handle) {
       this.handle = this.farm.createReverseHandle((fn, args) => {
-        // @ts-expect-error TS7053
+        // $FlowFixMe
         return this[fn](...args);
       });
     }
@@ -110,7 +108,6 @@ 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,
@@ -474,8 +471,6 @@ class MemoryFS {
     // Batch events
     this._eventQueue.push(event);
     clearTimeout(this._watcherTimer);
-
-    // @ts-expect-error TS2322
     this._watcherTimer = setTimeout(() => {
       let events = this._eventQueue;
       this._eventQueue = [];
@@ -501,9 +496,7 @@ class MemoryFS {
   async _sendWorkerEvent(event) {
     // Wait for worker instances to register their handles
     while (this._workerHandles.length < this._numWorkerInstances) {
-      await new Promise(resolve =>
-      // @ts-expect-error TS2345
-      this._workerRegisterResolves.push(resolve));
+      await new Promise(resolve => this._workerRegisterResolves.push(resolve));
     }
     await Promise.all(this._workerHandles.map(workerHandle => this.farm.workerApi.runHandle(workerHandle, [event])));
   }
@@ -617,9 +610,7 @@ class WriteStream extends _stream().Writable {
     callback();
   }
   _final(callback) {
-    this.fs.writeFile(this.filePath, this.buffer, this.options)
-    // @ts-expect-error TS2345
-    .then(callback).catch(callback);
+    this.fs.writeFile(this.filePath, this.buffer, this.options).then(callback).catch(callback);
   }
 }
 const S_IFREG = 0o100000;
@@ -752,7 +743,7 @@ function makeShared(contents) {
     return contents;
   }
   let contentsBuffer = contents;
-  // @ts-expect-error TS2339
+  // $FlowFixMe
   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)
@@ -773,7 +764,7 @@ function makeShared(contents) {
 class WorkerFS extends MemoryFS {
   constructor(id, handle) {
     // TODO Make this not a subclass
-    // @ts-expect-error TS2554
+    // $FlowFixMe
     super();
     this.id = id;
     this.handleFn = (methodName, args) => _workers().default.getWorkerApi().runHandle(handle, [methodName, args]);
@@ -800,7 +791,7 @@ class WorkerFS extends MemoryFS {
     return (0, _nullthrows().default)(instances.get(opts.id));
   }
   serialize() {
-    // @ts-expect-error TS2739
+    // $FlowFixMe
     return {
       id: this.id
     };

package/lib/NodeFS.browser.js

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

package/lib/NodeFS.js

@@ -86,10 +86,6 @@ 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);
@@ -97,6 +93,8 @@ 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 {
@@ -115,15 +113,9 @@ class NodeFS {
   realpathSync = process.platform === 'win32' ? _gracefulFs().default.realpathSync : _gracefulFs().default.realpathSync.native;
   existsSync = _gracefulFs().default.existsSync;
   readdirSync = _gracefulFs().default.readdirSync;
-  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;
+  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;
   watcher() {
     return (0, _featureFlags().getFeatureFlag)('useWatchmanWatcher') ? getWatchmanWatcher() : _watcher().default;
   }
@@ -152,9 +144,7 @@ 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);
@@ -237,6 +227,7 @@ class NodeFS {
       return;
     }
     if (stat.isDirectory()) {
+      // $FlowFixMe
       await _fs().default.promises.rmdir(filePath, {
         recursive: true
       });
@@ -248,8 +239,6 @@ class NodeFS {
 exports.NodeFS = NodeFS;
 (0, _buildCache().registerSerializableClass)(`${_package.default.version}:NodeFS`, NodeFS);
 let writeStreamCalls = 0;
-
-// @ts-expect-error TS7034
 let threadId;
 try {
   ({
@@ -258,13 +247,9 @@ 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 {
@@ -292,7 +277,5 @@ function getTempFilePath(filePath) {
   if (shouldUseOsTmpDir(filePath)) {
     tmpFilePath = _path().default.join((0, _os().tmpdir)(), _path().default.basename(filePath));
   }
-  return tmpFilePath + '.' + process.pid + (
-  // @ts-expect-error TS7005
-  threadId != null ? '.' + threadId : '') + '.' + (writeStreamCalls++).toString(36);
+  return tmpFilePath + '.' + process.pid + (threadId != null ? '.' + threadId : '') + '.' + (writeStreamCalls++).toString(36);
 }

package/lib/NodeVCSAwareFS.js

@@ -44,6 +44,7 @@ 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
@@ -65,6 +66,8 @@ 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,
@@ -74,7 +77,7 @@ class NodeVCSAwareFS extends _NodeFS.NodeFS {
     return fs;
   }
 
-  // @ts-expect-error TS2416
+  // $FlowFixMe[incompatible-extend] the serialization API is not happy with inheritance
   serialize() {
     return {
       excludePatterns: this.#excludePatterns,
@@ -100,14 +103,7 @@ class NodeVCSAwareFS extends _NodeFS.NodeFS {
       return JSON.parse(snapshotFileContent);
     });
     let watcherEventsSince = [];
-    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 => ({
+    const vcsEventsSince = vcsState != null ? (await (0, _logger().instrumentAsync)('NodeVCSAwareFS::rust.getEventsSince', () => (0, _rust().getEventsSince)(gitRepoPath, vcsState, null))).map(e => ({
       path: e.path,
       type: e.changeType
     })) : null;
@@ -116,8 +112,6 @@ 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({
@@ -151,17 +145,13 @@ class NodeVCSAwareFS extends _NodeFS.NodeFS {
     let vcsState = null;
     try {
       var _vcsState, _vcsState2;
-      vcsState = await (0, _logger().instrumentAsync)('NodeVCSAwareFS::getVcsStateSnapshot',
-      // @ts-expect-error TS2322
-      () => (0, _rust().getVcsStateSnapshot)(gitRepoPath, this.#excludePatterns));
+      vcsState = await (0, _logger().instrumentAsync)('NodeVCSAwareFS::getVcsStateSnapshot', () => (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 {
-      // @ts-expect-error TS2345
+      // $FlowFixMe[incompatible-call]
       return this.writable.readFileSync(filePath, encoding);
     } catch (err) {
-      // @ts-expect-error TS2345
+      // $FlowFixMe[incompatible-call]
       return this.readable.readFileSync(filePath, encoding);
     }
   }
@@ -304,7 +304,6 @@ 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;
@@ -314,7 +313,6 @@ 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.16-typescript-bc4459c37.0",
+  "version": "2.15.16",
   "description": "Blazing fast, zero configuration web application bundler",
   "license": "(MIT OR Apache-2.0)",
   "publishConfig": {
@@ -10,9 +10,9 @@
     "type": "git",
     "url": "https://github.com/atlassian-labs/atlaspack.git"
   },
-  "main": "./lib/index.js",
-  "source": "./src/index.ts",
-  "types": "./lib/index.d.ts",
+  "main": "lib/index.js",
+  "source": "src/index.js",
+  "types": "index.d.ts",
   "engines": {
     "node": ">= 16.0.0"
   },
@@ -48,18 +48,19 @@
     }
   },
   "scripts": {
-    "check-ts": "tsc --emitDeclarationOnly --rootDir src"
+    "build-ts": "mkdir -p lib && flow-to-ts src/types.js > lib/types.d.ts",
+    "check-ts": "tsc --noEmit index.d.ts"
   },
   "dependencies": {
-    "@atlaspack/build-cache": "2.13.4-typescript-bc4459c37.0",
-    "@atlaspack/feature-flags": "2.19.3-typescript-bc4459c37.0",
-    "@atlaspack/logger": "2.14.14-typescript-bc4459c37.0",
-    "@atlaspack/rust": "3.4.2-typescript-bc4459c37.0",
-    "@atlaspack/types-internal": "2.15.3-typescript-bc4459c37.0",
-    "@atlaspack/utils": "2.17.3-typescript-bc4459c37.0",
-    "@atlaspack/watcher-watchman-js": "2.14.21-typescript-bc4459c37.0",
-    "@atlaspack/workers": "2.14.21-typescript-bc4459c37.0",
+    "@atlaspack/build-cache": "2.13.3",
+    "@atlaspack/feature-flags": "2.20.0",
+    "@atlaspack/logger": "2.14.13",
+    "@atlaspack/rust": "3.4.1",
+    "@atlaspack/types-internal": "2.16.0",
+    "@atlaspack/utils": "2.17.3",
     "@parcel/watcher": "^2.0.7",
+    "@atlaspack/workers": "2.14.21",
+    "@atlaspack/watcher-watchman-js": "2.14.21",
     "graceful-fs": "^4.2.4",
     "ncp": "^2.0.0",
     "nullthrows": "^1.1.1",
@@ -69,6 +70,5 @@
     "@atlaspack/fs": "./lib/browser.js",
     "./src/NodeFS.js": "./src/NodeFS.browser.js"
   },
-  "type": "commonjs",
-  "gitHead": "bc4459c37a38ef1f74772126637e1d8841d1fcb0"
-}
+  "type": "commonjs"
+}

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

@@ -1,3 +1,5 @@
+// @flow
+
 import type {
   FilePath,
   FileSystem,
@@ -26,21 +28,22 @@ 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 = () => unknown;
+type ResolveFunction = () => mixed;
 
 export class MemoryFS implements FileSystem {
   dirs: Map<FilePath, Directory>;
@@ -49,13 +52,11 @@ 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>;
-  // @ts-expect-error TS2564
-  _watcherTimer: number;
+  _watcherTimer: TimeoutID;
   _numWorkerInstances: number = 0;
   _workerHandles: Array<Handle>;
   _workerRegisterResolves: Array<ResolveFunction> = [];
@@ -102,8 +103,8 @@ export class MemoryFS implements FileSystem {
   serialize(): SerializedMemoryFS {
     if (!this.handle) {
       this.handle = this.farm.createReverseHandle(
-        (fn: string, args: Array<unknown>) => {
-          // @ts-expect-error TS7053
+        (fn: string, args: Array<mixed>) => {
+          // $FlowFixMe
           return this[fn](...args);
         },
       );
@@ -113,7 +114,6 @@ 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 | null,
+    options?: ?FileOptions,
   ) {
     filePath = this._normalizePath(filePath);
     if (this.dirs.has(filePath)) {
@@ -256,7 +256,7 @@ export class MemoryFS implements FileSystem {
       dir += path.sep;
     }
 
-    let res: Array<Dirent | any | string> = [];
+    let res = [];
     for (let [filePath, entry] of this.dirs) {
       if (filePath === dir) {
         continue;
@@ -496,10 +496,7 @@ export class MemoryFS implements FileSystem {
     return new ReadStream(this, filePath);
   }
 
-  createWriteStream(
-    filePath: FilePath,
-    options?: FileOptions | null,
-  ): WriteStream {
+  createWriteStream(filePath: FilePath, options: ?FileOptions): WriteStream {
     this.mkdirp(path.dirname(filePath));
     return new WriteStream(this, filePath, options);
   }
@@ -544,7 +541,6 @@ 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 = [];
@@ -576,10 +572,8 @@ 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: (result: Promise<undefined> | undefined) => void) =>
-          // @ts-expect-error TS2345
-          this._workerRegisterResolves.push(resolve),
+      await new Promise((resolve) =>
+        this._workerRegisterResolves.push(resolve),
       );
     }
 
@@ -592,7 +586,7 @@ export class MemoryFS implements FileSystem {
 
   watch(
     dir: FilePath,
-    fn: (err: Error | null | undefined, events: Array<Event>) => unknown,
+    fn: (err: ?Error, events: Array<Event>) => mixed,
     opts: WatcherOptions,
   ): Promise<AsyncSubscription> {
     dir = this._normalizePath(dir);
@@ -646,28 +640,25 @@ export class MemoryFS implements FileSystem {
     fileNames: Array<string>,
     fromDir: FilePath,
     root: FilePath,
-  ): FilePath | null | undefined {
+  ): ?FilePath {
     return findAncestorFile(this, fileNames, fromDir, root);
   }
 
-  findNodeModule(
-    moduleName: string,
-    fromDir: FilePath,
-  ): FilePath | null | undefined {
+  findNodeModule(moduleName: string, fromDir: FilePath): ?FilePath {
     return findNodeModule(this, moduleName, fromDir);
   }
 
-  findFirstFile(filePaths: Array<FilePath>): FilePath | null | undefined {
+  findFirstFile(filePaths: Array<FilePath>): ?FilePath {
     return findFirstFile(this, filePaths);
   }
 }
 
 class Watcher {
-  fn: (err: Error | null | undefined, events: Array<Event>) => unknown;
+  fn: (err: ?Error, events: Array<Event>) => mixed;
   options: WatcherOptions;
 
   constructor(
-    fn: (err: Error | null | undefined, events: Array<Event>) => unknown,
+    fn: (err: ?Error, events: Array<Event>) => mixed,
     options: WatcherOptions,
   ) {
     this.fn = fn;
@@ -735,14 +726,10 @@ class ReadStream extends Readable {
 class WriteStream extends Writable {
   fs: FileSystem;
   filePath: FilePath;
-  options: FileOptions | null | undefined;
+  options: ?FileOptions;
   buffer: Buffer;
 
-  constructor(
-    fs: FileSystem,
-    filePath: FilePath,
-    options?: FileOptions | null,
-  ) {
+  constructor(fs: FileSystem, filePath: FilePath, options: ?FileOptions) {
     super({emitClose: true, autoDestroy: true});
     this.fs = fs;
     this.filePath = filePath;
@@ -763,7 +750,6 @@ 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);
   }
@@ -949,7 +935,7 @@ export function makeShared(contents: Buffer | string): Buffer {
   }
 
   let contentsBuffer: Buffer | string = contents;
-  // @ts-expect-error TS2339
+  // $FlowFixMe
   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)
@@ -979,10 +965,10 @@ class WorkerFS extends MemoryFS {
 
   constructor(id: number, handle: Handle) {
     // TODO Make this not a subclass
-    // @ts-expect-error TS2554
+    // $FlowFixMe
     super();
     this.id = id;
-    this.handleFn = (methodName: any, args: any) =>
+    this.handleFn = (methodName, args) =>
       WorkerFarm.getWorkerApi().runHandle(handle, [methodName, args]);
 
     this.handleFn('_registerWorker', [
@@ -1012,7 +998,7 @@ class WorkerFS extends MemoryFS {
   }
 
   serialize(): SerializedMemoryFS {
-    // @ts-expect-error TS2739
+    // $FlowFixMe
     return {
       id: this.id,
     };
@@ -1021,7 +1007,7 @@ class WorkerFS extends MemoryFS {
   writeFile(
     filePath: FilePath,
     contents: Buffer | string,
-    options?: FileOptions | null,
+    options: ?FileOptions,
   ): Promise<void> {
     super.writeFile(filePath, contents, options);
     let buffer = makeShared(contents);

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

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