@atlaspack/reporter-dev-server 2.14.21 → 2.14.22-typescript-17c3d1dec.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/HMRServer.d.ts

@@ -0,0 +1,54 @@
+import type { Asset, BundleGraph, NamedBundle, PackagedBundle, PluginOptions } from '@atlaspack/types';
+import type { Diagnostic } from '@atlaspack/diagnostic';
+import type { AnsiDiagnosticResult } from '@atlaspack/utils';
+import type { ServerError, HMRServerOptions, Request, Response } from './types.js.flow';
+import WebSocket from 'ws';
+export type SetComplement<A, B extends A> = A extends B ? never : A;
+export type Diff<T extends U, U extends object> = Pick<T, SetComplement<keyof T, keyof U>>;
+export type HMRAsset = {
+    id: string;
+    url: string;
+    type: string;
+    output: string;
+    envHash: string;
+    outputFormat: string;
+    depsByBundle: {
+        [key: string]: {
+            [key: string]: string;
+        };
+    };
+};
+export type HMRMessage = {
+    type: 'update';
+    assets: Array<HMRAsset>;
+} | {
+    type: 'reload';
+} | {
+    type: 'error';
+    diagnostics: {
+        ansi: Array<AnsiDiagnosticResult>;
+        html: Array<Partial<Diff<AnsiDiagnosticResult, {
+            codeframe: string;
+        }>>>;
+    };
+};
+export default class HMRServer {
+    wss: WebSocket.Server;
+    unresolvedError: HMRMessage | null;
+    options: HMRServerOptions;
+    bundleGraph: BundleGraph<PackagedBundle> | BundleGraph<NamedBundle> | null;
+    stopServer: (() => Promise<void>) | null | undefined;
+    constructor(options: HMRServerOptions);
+    start(): Promise<void>;
+    handle(req: Request, res: Response): boolean;
+    stop(): Promise<void>;
+    emitError(options: PluginOptions, diagnostics: Array<Diagnostic>): Promise<void>;
+    emitUpdate(event: {
+        readonly bundleGraph: BundleGraph<PackagedBundle> | BundleGraph<NamedBundle>;
+        readonly changedAssets: Map<string, Asset>;
+    }): Promise<void>;
+    getHotAssetContents(asset: Asset): Promise<string>;
+    getSourceURL(asset: Asset): string;
+    handleSocketError(err: ServerError): void;
+    broadcast(msg: HMRMessage): void;
+}

package/lib/HMRServer.js

@@ -48,6 +48,14 @@ function _utils() {
   return data;
 }
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+// @ts-expect-error TS7016
+
+// @ts-expect-error TS7016
+
+// flow-to-ts helpers
+
+// /flow-to-ts helpers
+
 const FS_CONCURRENCY = 64;
 const HMR_ENDPOINT = '/__parcel_hmr';
 const BROADCAST_MAX_ASSETS = 10000;
@@ -88,8 +96,6 @@ class HMRServer {
         ws.send(JSON.stringify(this.unresolvedError));
       }
     });
-
-    // $FlowFixMe[incompatible-exact]
     this.wss.on('error', err => this.handleSocketError(err));
   }
   handle(req, res) {
@@ -165,6 +171,7 @@ class HMRServer {
         });
         if (isOnlyReferencedByRuntimes) {
           for (let runtime of runtimes) {
+            // @ts-expect-error TS2345
             changedAssets.add(runtime);
           }
           continue;
@@ -204,6 +211,7 @@ class HMRServer {
     } else {
       this.broadcast({
         type: 'update',
+        // @ts-expect-error TS2322
         assets
       });
     }
@@ -220,7 +228,6 @@ class HMRServer {
       let sourcemapStringified = await sourcemap.stringify({
         format: 'inline',
         sourceRoot: _Server.SOURCES_ENDPOINT + '/',
-        // $FlowFixMe
         fs: asset.fs
       });
       (0, _assert().default)(typeof sourcemapStringified === 'string');

package/lib/Server.d.ts

@@ -0,0 +1,45 @@
+import type { DevServerOptions, Request, Response } from './types.js.flow';
+import type { BuildSuccessEvent, BundleGraph, FilePath, PluginOptions, PackagedBundle } from '@atlaspack/types';
+import type { Diagnostic } from '@atlaspack/diagnostic';
+import type { FileSystem } from '@atlaspack/fs';
+import type { HTTPServer, FormattedCodeFrame } from '@atlaspack/utils';
+export declare function setHeaders(res: Response): void;
+export declare const SOURCES_ENDPOINT = "/__parcel_source_root";
+type NextFunction = (req: Request, res: Response, next?: (arg1?: any) => any) => any;
+export default class Server {
+    pending: boolean;
+    pendingRequests: Array<[Request, Response]>;
+    middleware: Array<(req: Request, res: Response) => boolean>;
+    options: DevServerOptions;
+    rootPath: string;
+    bundleGraph: BundleGraph<PackagedBundle> | null;
+    requestBundle: ((bundle: PackagedBundle) => Promise<BuildSuccessEvent>) | null | undefined;
+    errors: Array<{
+        message: string;
+        stack: string | null | undefined;
+        frames: Array<FormattedCodeFrame>;
+        hints: Array<string>;
+        documentation: string;
+    }> | null;
+    stopServer: (() => Promise<void>) | null | undefined;
+    constructor(options: DevServerOptions);
+    buildStart(): void;
+    buildSuccess(bundleGraph: BundleGraph<PackagedBundle>, requestBundle: (bundle: PackagedBundle) => Promise<BuildSuccessEvent>): void;
+    buildError(options: PluginOptions, diagnostics: Array<Diagnostic>): Promise<void>;
+    respond(req: Request, res: Response): unknown;
+    sendIndex(req: Request, res: Response): void;
+    serveBundle(req: Request, res: Response, next: NextFunction): Promise<void>;
+    serveDist(req: Request, res: Response, next: NextFunction): Promise<undefined> | Promise<unknown>;
+    serve(fs: FileSystem, root: FilePath, req: Request, res: Response, next: NextFunction): Promise<unknown>;
+    sendError(res: Response, statusCode: number): void;
+    send404(req: Request, res: Response): void;
+    send500(req: Request, res: Response): undefined | Response;
+    logAccessIfVerbose(req: Request): void;
+    /**
+     * Load proxy table from package.json and apply them.
+     */
+    applyProxyTable(app: any): Promise<Server>;
+    start(): Promise<HTTPServer>;
+    stop(): Promise<void>;
+}
+export {};

package/lib/Server.js

@@ -86,6 +86,18 @@ function _fresh() {
 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 TS2307
+
+// @ts-expect-error TS7016
+
+// @ts-expect-error TS7016
+
+// @ts-expect-error TS7016
+
+// @ts-expect-error TS7016
+
+// @ts-expect-error TS7016
+
 function setHeaders(res) {
   res.setHeader('Access-Control-Allow-Origin', '*');
   res.setHeader('Access-Control-Allow-Methods', 'GET, HEAD, PUT, PATCH, POST, DELETE');
@@ -324,9 +336,13 @@ class Server {
       public: root,
       cleanUrls: false
     }, {
+      // @ts-expect-error TS7006
       lstat: path => fs.stat(path),
+      // @ts-expect-error TS7006
       realpath: path => fs.realpath(path),
+      // @ts-expect-error TS7006
       createReadStream: (path, options) => fs.createReadStream(path, options),
+      // @ts-expect-error TS7006
       readdir: path => fs.readdir(path)
     });
   }
@@ -379,13 +395,12 @@ class Server {
       }
       for (const [context, options] of Object.entries(cfg)) {
         // each key is interpreted as context, and value as middleware options
+        // @ts-expect-error TS2345
         app.use((0, _httpProxyMiddleware().createProxyMiddleware)(context, options));
       }
     } else {
       let cfg = await this.options.packageManager.require(configFilePath, fileInRoot);
-      if (
-      // $FlowFixMe
-      Object.prototype.toString.call(cfg) === '[object Module]') {
+      if (Object.prototype.toString.call(cfg) === '[object Module]') {
         cfg = cfg.default;
       }
       if (typeof cfg !== 'function') {
@@ -410,10 +425,13 @@ class Server {
       }
     };
     const app = (0, _connect().default)();
+    // @ts-expect-error TS7006
     app.use((req, res, next) => {
       setHeaders(res);
       next();
     });
+
+    // @ts-expect-error TS7006
     app.use((req, res, next) => {
       if (req.url === '/__parcel_healthcheck') {
         res.statusCode = 200;
@@ -438,14 +456,17 @@ class Server {
     });
     this.stopServer = stop;
     server.listen(this.options.port, this.options.host);
+    // @ts-expect-error TS2322
     return new Promise((resolve, reject) => {
       server.once('error', err => {
         this.options.logger.error({
+          // @ts-expect-error TS2345
           message: (0, _serverErrors.default)(err, this.options.port)
         });
         reject(err);
       });
       server.once('listening', () => {
+        // @ts-expect-error TS2345
         resolve(server);
       });
     });

package/lib/ServerReporter.d.ts

@@ -0,0 +1,3 @@
+import { Reporter } from '@atlaspack/plugin';
+declare const _default: Reporter;
+export default _default;

package/lib/ServerReporter.js

@@ -61,6 +61,7 @@ var _default = exports.default = new (_plugin().Reporter)({
                 port: serveOptions.port,
                 host: hmrOptions.host,
                 devServer,
+                // @ts-expect-error TS7006
                 addMiddleware: handler => {
                   var _server;
                   (_server = server) === null || _server === void 0 || _server.middleware.push(handler);
@@ -106,7 +107,6 @@ var _default = exports.default = new (_plugin().Reporter)({
         }
         if (hmrOptions && hmrServer) {
           await hmrServer.stop();
-          // $FlowFixMe[prop-missing]
           hmrServers.delete(hmrServer.wss.options.port);
         }
         break;

package/lib/serverErrors.d.ts

@@ -0,0 +1,4 @@
+export type ServerError = Error & {
+    code: string;
+};
+export default function serverErrors(err: ServerError, port: number): string;

package/lib/serverErrors.js

@@ -10,7 +10,10 @@ const serverErrorList = {
 };
 function serverErrors(err, port) {
   let desc = `Error: ${err.code} occurred while setting up server on port ${port.toString()}.`;
+
+  // @ts-expect-error TS7053
   if (serverErrorList[err.code]) {
+    // @ts-expect-error TS7053
     desc = serverErrorList[err.code].replace(/{port}/g, port);
   }
   return desc;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaspack/reporter-dev-server",
-  "version": "2.14.21",
+  "version": "2.14.22-typescript-17c3d1dec.0",
   "description": "Blazing fast, zero configuration web application bundler",
   "license": "(MIT OR Apache-2.0)",
   "type": "commonjs",
@@ -11,8 +11,9 @@
     "type": "git",
     "url": "https://github.com/atlassian-labs/atlaspack.git"
   },
-  "main": "lib/ServerReporter.js",
-  "source": "src/ServerReporter.js",
+  "main": "./lib/ServerReporter.js",
+  "source": "./src/ServerReporter.ts",
+  "types": "./lib/ServerReporter.d.ts",
   "engines": {
     "node": ">= 16.0.0"
   },
@@ -25,9 +26,9 @@
     }
   },
   "dependencies": {
-    "@atlaspack/plugin": "2.14.21",
-    "@atlaspack/utils": "2.17.3",
-    "@atlaspack/types": "2.15.11",
+    "@atlaspack/plugin": "2.14.22-typescript-17c3d1dec.0",
+    "@atlaspack/types": "2.15.12-typescript-17c3d1dec.0",
+    "@atlaspack/utils": "2.17.4-typescript-17c3d1dec.0",
     "connect": "^3.7.0",
     "ejs": "^3.1.6",
     "fresh": "^0.5.2",
@@ -39,6 +40,10 @@
     "ws": "^7.0.0"
   },
   "devDependencies": {
-    "@atlaspack/babel-preset": "2.14.1"
-  }
-}
+    "@atlaspack/babel-preset": "2.14.2-typescript-17c3d1dec.0"
+  },
+  "scripts": {
+    "check-ts": "tsc --emitDeclarationOnly --rootDir src"
+  },
+  "gitHead": "17c3d1decf641e688fcfe3ca985e80e9897b7573"
+}

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

@@ -1,4 +1,3 @@
-// @flow
 import type {
   Asset,
   BundleGraph,
@@ -14,12 +13,15 @@ import type {
   HMRServerOptions,
   Request,
   Response,
+  // @ts-expect-error TS2307
 } from './types.js.flow';
 import {setHeaders, SOURCES_ENDPOINT} from './Server';
 
 import nullthrows from 'nullthrows';
 import url from 'url';
+// @ts-expect-error TS7016
 import mime from 'mime-types';
+// @ts-expect-error TS7016
 import WebSocket from 'ws';
 import invariant from 'assert';
 import {
@@ -29,31 +31,52 @@ import {
   PromiseQueue,
 } from '@atlaspack/utils';
 
-export type HMRAsset = {|
-  id: string,
-  url: string,
-  type: string,
-  output: string,
-  envHash: string,
-  outputFormat: string,
-  depsByBundle: {[string]: {[string]: string, ...}, ...},
-|};
+// flow-to-ts helpers
+export type SetComplement<A, B extends A> = A extends B ? never : A;
+export type Diff<T extends U, U extends object> = Pick<
+  T,
+  SetComplement<keyof T, keyof U>
+>;
+// /flow-to-ts helpers
+
+export type HMRAsset = {
+  id: string;
+  url: string;
+  type: string;
+  output: string;
+  envHash: string;
+  outputFormat: string;
+  depsByBundle: {
+    [key: string]: {
+      [key: string]: string;
+    };
+  };
+};
 
 export type HMRMessage =
-  | {|
-      type: 'update',
-      assets: Array<HMRAsset>,
-    |}
-  | {|
-      type: 'reload',
-    |}
-  | {|
-      type: 'error',
-      diagnostics: {|
-        ansi: Array<AnsiDiagnosticResult>,
-        html: Array<$Rest<AnsiDiagnosticResult, {|codeframe: string|}>>,
-      |},
-    |};
+  | {
+      type: 'update';
+      assets: Array<HMRAsset>;
+    }
+  | {
+      type: 'reload';
+    }
+  | {
+      type: 'error';
+      diagnostics: {
+        ansi: Array<AnsiDiagnosticResult>;
+        html: Array<
+          Partial<
+            Diff<
+              AnsiDiagnosticResult,
+              {
+                codeframe: string;
+              }
+            >
+          >
+        >;
+      };
+    };
 
 const FS_CONCURRENCY = 64;
 const HMR_ENDPOINT = '/__parcel_hmr';
@@ -65,7 +88,7 @@ export default class HMRServer {
   options: HMRServerOptions;
   bundleGraph: BundleGraph<PackagedBundle> | BundleGraph<NamedBundle> | null =
     null;
-  stopServer: ?() => Promise<void>;
+  stopServer: (() => Promise<void>) | null | undefined;
 
   constructor(options: HMRServerOptions) {
     this.options = options;
@@ -91,18 +114,19 @@ export default class HMRServer {
       server.listen(this.options.port, this.options.host);
       this.stopServer = result.stop;
     } else {
-      this.options.addMiddleware?.((req, res) => this.handle(req, res));
+      this.options.addMiddleware?.((req: Request, res: Response) =>
+        this.handle(req, res),
+      );
     }
     this.wss = new WebSocket.Server({server});
 
-    this.wss.on('connection', (ws) => {
+    this.wss.on('connection', (ws: any) => {
       if (this.unresolvedError) {
         ws.send(JSON.stringify(this.unresolvedError));
       }
     });
 
-    // $FlowFixMe[incompatible-exact]
-    this.wss.on('error', (err) => this.handleSocketError(err));
+    this.wss.on('error', (err: any) => this.handleSocketError(err));
   }
 
   handle(req: Request, res: Response): boolean {
@@ -158,9 +182,10 @@ export default class HMRServer {
   }
 
   async emitUpdate(event: {
-    +bundleGraph: BundleGraph<PackagedBundle> | BundleGraph<NamedBundle>,
-    +changedAssets: Map<string, Asset>,
-    ...
+    readonly bundleGraph:
+      | BundleGraph<PackagedBundle>
+      | BundleGraph<NamedBundle>;
+    readonly changedAssets: Map<string, Asset>;
   }) {
     this.unresolvedError = null;
     this.bundleGraph = event.bundleGraph;
@@ -187,6 +212,7 @@ export default class HMRServer {
 
         if (isOnlyReferencedByRuntimes) {
           for (let runtime of runtimes) {
+            // @ts-expect-error TS2345
             changedAssets.add(runtime);
           }
 
@@ -196,9 +222,9 @@ export default class HMRServer {
 
       queue.add(async () => {
         let dependencies = event.bundleGraph.getDependencies(asset);
-        let depsByBundle = {};
+        let depsByBundle: Record<string, any> = {};
         for (let bundle of event.bundleGraph.getBundlesWithAsset(asset)) {
-          let deps = {};
+          let deps: Record<string, any> = {};
           for (let dep of dependencies) {
             let resolved = event.bundleGraph.getResolvedAsset(dep, bundle);
             if (resolved) {
@@ -231,6 +257,7 @@ export default class HMRServer {
     } else {
       this.broadcast({
         type: 'update',
+        // @ts-expect-error TS2322
         assets,
       });
     }
@@ -249,7 +276,6 @@ export default class HMRServer {
       let sourcemapStringified = await sourcemap.stringify({
         format: 'inline',
         sourceRoot: SOURCES_ENDPOINT + '/',
-        // $FlowFixMe
         fs: asset.fs,
       });
 

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

@@ -1,5 +1,4 @@
-// @flow
-
+// @ts-expect-error TS2307
 import type {DevServerOptions, Request, Response} from './types.js.flow';
 import type {
   BuildSuccessEvent,
@@ -25,12 +24,17 @@ import {
 } from '@atlaspack/utils';
 import serverErrors from './serverErrors';
 import fs from 'fs';
+// @ts-expect-error TS7016
 import ejs from 'ejs';
+// @ts-expect-error TS7016
 import connect from 'connect';
+// @ts-expect-error TS7016
 import serveHandler from 'serve-handler';
 import {createProxyMiddleware} from 'http-proxy-middleware';
 import {URL, URLSearchParams} from 'url';
+// @ts-expect-error TS7016
 import launchEditor from 'launch-editor';
+// @ts-expect-error TS7016
 import fresh from 'fresh';
 
 export function setHeaders(res: Response) {
@@ -59,7 +63,11 @@ const TEMPLATE_500 = fs.readFileSync(
   path.join(__dirname, '..', 'templates/500.html'),
   'utf8',
 );
-type NextFunction = (req: Request, res: Response, next?: (any) => any) => any;
+type NextFunction = (
+  req: Request,
+  res: Response,
+  next?: (arg1?: any) => any,
+) => any;
 
 export default class Server {
   pending: boolean;
@@ -68,21 +76,24 @@ export default class Server {
   options: DevServerOptions;
   rootPath: string;
   bundleGraph: BundleGraph<PackagedBundle> | null;
-  requestBundle: ?(bundle: PackagedBundle) => Promise<BuildSuccessEvent>;
-  errors: Array<{|
-    message: string,
-    stack: ?string,
-    frames: Array<FormattedCodeFrame>,
-    hints: Array<string>,
-    documentation: string,
-  |}> | null;
-  stopServer: ?() => Promise<void>;
+  requestBundle:
+    | ((bundle: PackagedBundle) => Promise<BuildSuccessEvent>)
+    | null
+    | undefined;
+  errors: Array<{
+    message: string;
+    stack: string | null | undefined;
+    frames: Array<FormattedCodeFrame>;
+    hints: Array<string>;
+    documentation: string;
+  }> | null;
+  stopServer: (() => Promise<void>) | null | undefined;
 
   constructor(options: DevServerOptions) {
     this.options = options;
     try {
       this.rootPath = new URL(options.publicUrl).pathname;
-    } catch (e) {
+    } catch (e: any) {
       this.rootPath = options.publicUrl;
     }
     this.pending = true;
@@ -135,7 +146,7 @@ export default class Server {
     );
   }
 
-  respond(req: Request, res: Response): mixed {
+  respond(req: Request, res: Response): unknown {
     if (this.middleware.some((handler) => handler(req, res))) return;
     let {pathname, search} = url.parse(req.originalUrl || req.url);
     if (pathname == null) {
@@ -281,7 +292,7 @@ export default class Server {
       invariant(this.requestBundle != null);
       try {
         await this.requestBundle(bundle);
-      } catch (err) {
+      } catch (err: any) {
         this.send500(req, res);
         return;
       }
@@ -296,7 +307,7 @@ export default class Server {
     req: Request,
     res: Response,
     next: NextFunction,
-  ): Promise<void> | Promise<mixed> {
+  ): Promise<undefined> | Promise<unknown> {
     return this.serve(
       this.options.outputFS,
       this.options.distDir,
@@ -312,7 +323,7 @@ export default class Server {
     req: Request,
     res: Response,
     next: NextFunction,
-  ): Promise<mixed> {
+  ): Promise<unknown> {
     if (req.method !== 'GET' && req.method !== 'HEAD') {
       // method not allowed
       res.statusCode = 405;
@@ -325,7 +336,7 @@ export default class Server {
     try {
       var filePath = url.parse(req.url).pathname || '';
       filePath = decodeURIComponent(filePath);
-    } catch (err) {
+    } catch (err: any) {
       return this.sendError(res, 400);
     }
 
@@ -343,7 +354,7 @@ export default class Server {
 
     try {
       var stat = await fs.stat(filePath);
-    } catch (err) {
+    } catch (err: any) {
       if (err.code === 'ENOENT') {
         return next(req, res);
       }
@@ -370,9 +381,13 @@ export default class Server {
         cleanUrls: false,
       },
       {
+        // @ts-expect-error TS7006
         lstat: (path) => fs.stat(path),
+        // @ts-expect-error TS7006
         realpath: (path) => fs.realpath(path),
+        // @ts-expect-error TS7006
         createReadStream: (path, options) => fs.createReadStream(path, options),
+        // @ts-expect-error TS7006
         readdir: (path) => fs.readdir(path),
       },
     );
@@ -388,7 +403,7 @@ export default class Server {
     res.end(TEMPLATE_404);
   }
 
-  send500(req: Request, res: Response): void | Response {
+  send500(req: Request, res: Response): undefined | Response {
     res.setHeader('Content-Type', 'text/html; charset=utf-8');
     res.writeHead(500);
 
@@ -452,6 +467,7 @@ export default class Server {
       }
       for (const [context, options] of Object.entries(cfg)) {
         // each key is interpreted as context, and value as middleware options
+        // @ts-expect-error TS2345
         app.use(createProxyMiddleware(context, options));
       }
     } else {
@@ -459,10 +475,7 @@ export default class Server {
         configFilePath,
         fileInRoot,
       );
-      if (
-        // $FlowFixMe
-        Object.prototype.toString.call(cfg) === '[object Module]'
-      ) {
+      if (Object.prototype.toString.call(cfg) === '[object Module]') {
         cfg = cfg.default;
       }
 
@@ -491,11 +504,13 @@ export default class Server {
     };
 
     const app = connect();
+    // @ts-expect-error TS7006
     app.use((req, res, next) => {
       setHeaders(res);
       next();
     });
 
+    // @ts-expect-error TS7006
     app.use((req, res, next) => {
       if (req.url === '/__parcel_healthcheck') {
         res.statusCode = 200;
@@ -520,20 +535,26 @@ export default class Server {
     this.stopServer = stop;
 
     server.listen(this.options.port, this.options.host);
-    return new Promise((resolve, reject) => {
-      server.once('error', (err) => {
-        this.options.logger.error(
-          ({
+    // @ts-expect-error TS2322
+    return new Promise(
+      (
+        resolve: (result: Promise<Server> | Server) => void,
+        reject: (error?: any) => void,
+      ) => {
+        server.once('error', (err) => {
+          this.options.logger.error({
+            // @ts-expect-error TS2345
             message: serverErrors(err, this.options.port),
-          }: Diagnostic),
-        );
-        reject(err);
-      });
+          } as Diagnostic);
+          reject(err);
+        });
 
-      server.once('listening', () => {
-        resolve(server);
-      });
-    });
+        server.once('listening', () => {
+          // @ts-expect-error TS2345
+          resolve(server);
+        });
+      },
+    );
   }
 
   async stop(): Promise<void> {

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

@@ -1,12 +1,10 @@
-// @flow
-
 import {Reporter} from '@atlaspack/plugin';
 import HMRServer from './HMRServer';
 import Server from './Server';
 
 let servers: Map<number, Server> = new Map();
 let hmrServers: Map<number, HMRServer> = new Map();
-export default (new Reporter({
+export default new Reporter({
   async report({event, options, logger}) {
     let {serveOptions, hmrOptions} = options;
     let server = serveOptions ? servers.get(serveOptions.port) : undefined;
@@ -47,6 +45,7 @@ export default (new Reporter({
               port: serveOptions.port,
               host: hmrOptions.host,
               devServer,
+              // @ts-expect-error TS7006
               addMiddleware: (handler) => {
                 server?.middleware.push(handler);
               },
@@ -93,7 +92,6 @@ export default (new Reporter({
         }
         if (hmrOptions && hmrServer) {
           await hmrServer.stop();
-          // $FlowFixMe[prop-missing]
           hmrServers.delete(hmrServer.wss.options.port);
         }
         break;
@@ -140,4 +138,4 @@ export default (new Reporter({
         break;
     }
   },
-}): Reporter);
+}) as Reporter;

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

@@ -1,19 +1,20 @@
-// @flow
-export type ServerError = Error & {|
-  code: string,
-|};
+export type ServerError = Error & {
+  code: string;
+};
 
 const serverErrorList = {
   EACCES: "You don't have access to bind the server to port {port}.",
   EADDRINUSE: 'There is already a process listening on port {port}.',
-};
+} as const;
 
 export default function serverErrors(err: ServerError, port: number): string {
   let desc = `Error: ${
     err.code
   } occurred while setting up server on port ${port.toString()}.`;
 
+  // @ts-expect-error TS7053
   if (serverErrorList[err.code]) {
+    // @ts-expect-error TS7053
     desc = serverErrorList[err.code].replace(/{port}/g, port);
   }
 

package/templates/404.html

@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <html lang="en">
   <head>
     <meta charset="UTF-8" />

package/templates/500.html

@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <html lang="en">
   <head>
     <meta charset="UTF-8" />

package/tsconfig.json

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

package/src/types.js.flow

@@ -1,56 +0,0 @@
-// @flow
-import type {
-  ServerOptions,
-  PluginLogger,
-  HMROptions,
-  HTTPSOptions,
-  FilePath,
-} from '@atlaspack/types';
-import type {FileSystem} from '@atlaspack/fs';
-import type {HTTPServer} from '@atlaspack/utils';
-import type {PackageManager} from '@atlaspack/package-manager';
-import {
-  IncomingMessage as HTTPIncomingMessage,
-  ServerResponse as HTTPServerResponse,
-} from 'http';
-import {
-  IncomingMessage as HTTPSIncomingMessage,
-  ServerResponse as HTTPSServerResponse,
-} from 'https';
-
-interface HTTPRequest extends HTTPIncomingMessage {
-  originalUrl?: string;
-}
-interface HTTPSRequest extends HTTPSIncomingMessage {
-  originalUrl?: string;
-}
-export type Request = HTTPRequest | HTTPSRequest;
-export type Response = HTTPServerResponse | HTTPSServerResponse;
-export type DevServerOptions = {|
-  ...ServerOptions,
-  projectRoot: string,
-  publicUrl: string,
-  cacheDir: string,
-  inputFS: FileSystem,
-  outputFS: FileSystem,
-  logger: PluginLogger,
-  hmrOptions: ?HMROptions,
-  packageManager: PackageManager,
-|};
-
-// TODO: Figure out if there is a node.js type that could be imported with a complete ServerError
-export type ServerError = Error & {|
-  code: string,
-|};
-
-export type HMRServerOptions = {|
-  devServer?: HTTPServer,
-  addMiddleware?: (handler: (req: Request, res: Response) => boolean) => void,
-  port: number,
-  host: ?string,
-  logger: PluginLogger,
-  https?: HTTPSOptions | boolean,
-  cacheDir: FilePath,
-  inputFS: FileSystem,
-  outputFS: FileSystem,
-|};