chore(serve): improve dev server types

webpack · Aug 21, 2020 · a75e611 · a75e611
1 parent e3df166
commit a75e611
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 7 deletions.
diff --git a/packages/serve/src/createConfig.ts b/packages/serve/src/createConfig.ts
@@ -1,3 +1,5 @@
+import { devServerOptionsType } from './types';
+
 /**
  *
  * Creates a devServer config from CLI args
@@ -6,7 +8,7 @@
  *
  * @returns {Object} valid devServer options object
  */
-export default function createConfig(args): any {
+export default function createConfig(args): devServerOptionsType {
     const options = { ...args };
 
     if (options.clientLogging) {

diff --git a/packages/serve/src/getDevServerOptions.ts b/packages/serve/src/getDevServerOptions.ts
@@ -1,4 +1,5 @@
 import logger from 'webpack-cli/lib/utils/logger';
+import { devServerOptionsType } from './types';
 
 /**
  *
@@ -9,7 +10,7 @@ import logger from 'webpack-cli/lib/utils/logger';
  *
  * @returns {Object}
  */
-export default function getDevServerOptions(compiler, args): any {
+export default function getDevServerOptions(compiler, args): devServerOptionsType[] {
     const defaultOpts = {};
     const devServerOptions = [];
     const compilers = compiler.compilers || [compiler];

diff --git a/packages/serve/src/mergeOptions.ts b/packages/serve/src/mergeOptions.ts
@@ -1,12 +1,15 @@
+import { devServerOptionsType } from './types';
+
 /**
  *
  * Merges CLI options and devServer options from config file
  *
- * @param {Object} cliOptions - devServer args
+ * @param {Object} cliOptions - devServer CLI args
+ * @param {Object} devServerOptions - devServer config options
  *
  * @returns {Object} merged options object
  */
-export default function mergeOptions(cliOptions, devServerOptions): any {
+export default function mergeOptions(cliOptions: devServerOptionsType, devServerOptions: devServerOptionsType): devServerOptionsType {
     // CLI options should take precedence over devServer options,
     // and CLI options should have no default values included
     const options = { ...devServerOptions, ...cliOptions };

diff --git a/packages/serve/src/startDevServer.ts b/packages/serve/src/startDevServer.ts
@@ -17,19 +17,21 @@ export default function startDevServer(compiler, args): void {
     const cliOptions = createConfig(args);
     const devServerOptions = getDevServerOptions(compiler, args);
 
-    const usedPorts = [];
+    const usedPorts: number[] = [];
     devServerOptions.forEach((devServerOpts): void => {
         const options = mergeOptions(cliOptions, devServerOpts);
 
         options.host = options.host || 'localhost';
         options.port = options.port || 8080;
 
-        if (usedPorts.find(options.port)) {
+        const portNum = +options.port;
+
+        if (usedPorts.find((port) => portNum === port)) {
             throw new Error(
                 'Unique ports must be specified for each devServer option in your webpack configuration. Alternatively, run only 1 devServer config using the --name flag to specify your desired config.',
             );
         }
-        usedPorts.push(options.port);
+        usedPorts.push(portNum);
 
         const server = new Server(compiler, options);
         server.listen(options.port, options.host, (err): void => {

diff --git a/packages/serve/src/types.ts b/packages/serve/src/types.ts
@@ -0,0 +1,5 @@
+export type devServerOptionsType = {
+    host?: string;
+    port?: string | number;
+    client?: object;
+};