refactor: removing async/await for simplicity

Author: shellscape

.babelrc

@@ -16,7 +16,6 @@
   ],
   "plugins": [
     [
-      "fast-async",
       "transform-object-rest-spread",
       {
         "useBuiltIns": true

src/index.js lib/index.jssrc/index.js renamed to lib/index.js

@@ -23,41 +23,42 @@ const getClient = (compiler, options) => {
   });
 };
 
-const getMiddleware = (devWare, options) => async (context, next) => {
+const getMiddleware = (devWare, options) => (context, next) =>
   // wait for webpack-dev-middleware to signal that the build is ready
-  await new Promise((resolve, reject) => {
-    const { compiler } = options;
+  Promise.all([
+    new Promise((resolve, reject) => {
+      const { compiler } = options;
 
-    devWare.waitUntilValid(() => {
-      resolve(true);
-    });
-
-    for (const comp of [].concat(compiler.compilers || compiler)) {
-      comp.hooks.failed.tap('KoaWebpack', (error) => {
-        reject(error);
+      devWare.waitUntilValid(() => {
+        resolve(true);
       });
-    }
-  });
 
-  // tell webpack-dev-middleware to handle the request
-  await new Promise((resolve) => {
-    devWare(
-      context.req,
-      {
-        end: (content) => {
-          // eslint-disable-next-line no-param-reassign
-          context.body = content;
-          resolve();
+      for (const comp of [].concat(compiler.compilers || compiler)) {
+        comp.hooks.failed.tap('KoaWebpack', (error) => {
+          reject(error);
+        });
+      }
+    }),
+
+    // tell webpack-dev-middleware to handle the request
+    new Promise((resolve) => {
+      devWare(
+        context.req,
+        {
+          end: (content) => {
+            // eslint-disable-next-line no-param-reassign
+            context.body = content;
+            resolve();
+          },
+          setHeader: context.set.bind(context),
+          locals: context.state,
         },
-        setHeader: context.set.bind(context),
-        locals: context.state,
-      },
-      () => resolve(next())
-    );
-  });
-};
+        () => resolve(next())
+      );
+    }),
+  ]);
 
-module.exports = async (opts) => {
+module.exports = (opts) => {
   const options = Object.assign({}, defaults, opts);
 
   validate({ name: 'koa-webpack', schema, target: options });
@@ -85,17 +86,18 @@ module.exports = async (opts) => {
     options.devMiddleware.publicPath = publicPath;
   }
 
-  const client = await getClient(compiler, options);
-  const devWare = devMiddleware(compiler, options.devMiddleware);
-  const middleware = getMiddleware(devWare, options);
-  const close = (callback) => {
-    const next = client ? () => client.close(callback) : callback;
-    devWare.close(next);
-  };
-
-  return Object.assign(middleware, {
-    hotClient: client,
-    devMiddleware: devWare,
-    close,
+  return getClient(compiler, options).then((client) => {
+    const devWare = devMiddleware(compiler, options.devMiddleware);
+    const middleware = getMiddleware(devWare, options);
+    const close = (callback) => {
+      const next = client ? () => client.close(callback) : callback;
+      devWare.close(next);
+    };
+
+    return Object.assign(middleware, {
+      hotClient: client,
+      devMiddleware: devWare,
+      close,
+    });
   });
 };

package-lock.json

@@ -7,34 +7,30 @@
   "author": "Andrew Powell <[email protected]>",
   "homepage": "https://github.com/shellscape/koa-webpack",
   "bugs": "https://github.com/shellscape/koa-webpack/issues",
-  "main": "dist/index.js",
+  "main": "lib/index.js",
   "engines": {
     "node": ">= 6.9.0 < 7.0.0 || >= 8.9.0"
   },
   "scripts": {
-    "build": "cross-env NODE_ENV=production babel src -d dist --copy-files",
-    "clean": "del-cli dist",
     "commitlint": "commitlint",
     "commitmsg": "commitlint -e $GIT_PARAMS",
     "lint": "eslint --cache src test",
     "ci:lint:commits": "commitlint --from=${CIRCLE_BRANCH} --to=${CIRCLE_SHA1}",
     "lint-staged": "lint-staged",
-    "prebuild": "npm run clean",
-    "prepublishOnly": "npm run build",
     "release": "standard-version",
     "release:ci": "conventional-github-releaser -p angular",
     "release:validate": "commitlint --from=$(git describe --tags --abbrev=0) --to=$(git rev-parse HEAD)",
     "security": "nsp check",
     "test": "jest --detectOpenHandles",
     "test:watch": "jest --watch",
-    "test:coverage": "jest --collectCoverageFrom='src/**/*.js' --coverage --detectOpenHandles",
+    "test:coverage": "jest --collectCoverageFrom='lib/**/*.js' --coverage --detectOpenHandles",
     "ci:lint": "npm run lint && npm run security",
     "ci:test": "npm run test -- --runInBand",
     "ci:coverage": "npm run test:coverage -- --runInBand",
     "defaults": "defaults"
   },
   "files": [
-    "dist/",
+    "lib/",
     "LICENSE",
     "README.md"
   ],
@@ -69,7 +65,6 @@
     "eslint-config-webpack": "^1.2.5",
     "eslint-plugin-import": "^2.12.0",
     "eslint-plugin-prettier": "^2.6.0",
-    "fast-async": "^6.3.7",
     "husky": "^0.14.3",
     "jest": "^23.1.0",
     "killable": "^1.0.0",

package.json

@@ -7,7 +7,7 @@ const compose = require('koa-compose');
 const request = require('supertest');
 const webpack = require('webpack');
 
-const koaWebpack = require('../src');
+const koaWebpack = require('../lib');
 
 const defaults = {
   config: {