chore: transpile async, fix compiler references

Author: shellscape

.babelrc

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

package-lock.json

@@ -44,6 +44,7 @@
   "dependencies": {
     "@webpack-contrib/schema-utils": "^1.0.0-beta.0",
     "app-root-path": "^2.0.1",
+    "loud-rejection": "^1.6.0",
     "merge-options": "^1.0.0",
     "webpack-dev-middleware": "^3.0.0",
     "webpack-hot-client": "^3.0.0",
@@ -68,13 +69,13 @@
     "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",
     "koa": "^2.2.0",
     "koa-compose": "^4.0.0",
     "lint-staged": "^7.1.3",
-    "loud-rejection": "^1.6.0",
     "memory-fs": "^0.4.1",
     "nsp": "^3.2.1",
     "pre-commit": "^1.2.2",

package.json

@@ -10,33 +10,6 @@ const schema = require('../schemas/options.json');
 
 const defaults = { devMiddleware: {}, hotClient: {} };
 
-const getDevMiddleware = (options) => {
-  /* eslint-disable import/no-dynamic-require, global-require, no-param-reassign */
-  const { compiler, config } = options;
-
-  if (!compiler) {
-    if (!config) {
-      options.config = require(join(root.path, 'webpack.config.js'));
-    }
-
-    options.compiler = webpack(config);
-  }
-
-  if (!options.devMiddleware.publicPath) {
-    const { publicPath } = compiler.options.output;
-
-    if (!publicPath) {
-      throw new Error(
-        "koa-webpack: publicPath must be set on `dev` options, or in a compiler's `output` configuration."
-      );
-    }
-
-    options.devMiddleware.publicPath = publicPath;
-  }
-
-  return devMiddleware(options.compiler, options.devMiddleware);
-};
-
 const getClient = (compiler, options) => {
   if (!options.hotClient) {
     return Promise.resolve(null);
@@ -72,6 +45,7 @@ const getMiddleware = (devWare, options) => async (context, next) => {
       context.req,
       {
         end: (content) => {
+          // eslint-disable-next-line no-param-reassign
           context.body = content;
           resolve();
         },
@@ -88,8 +62,31 @@ module.exports = async (opts) => {
 
   validate({ name: 'koa-webpack', schema, target: options });
 
-  const devWare = getDevMiddleware(options);
-  const client = await getClient(options.compiler, options);
+  let { compiler, config } = options;
+
+  if (!compiler) {
+    if (!config) {
+      // eslint-disable-next-line import/no-dynamic-require, global-require
+      config = require(join(root.path, 'webpack.config.js'));
+    }
+
+    compiler = webpack(config);
+  }
+
+  if (!options.devMiddleware.publicPath) {
+    const { publicPath } = compiler.options.output;
+
+    if (!publicPath) {
+      throw new Error(
+        "koa-webpack: publicPath must be set on `dev` options, or in a compiler's `output` configuration."
+      );
+    }
+
+    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;

src/index.js

@@ -44,8 +44,6 @@ async function setup(opts, setupMiddleware = defaultApp) {
   const options = buildOptions(opts);
   const middleware = await koaWebpack(options);
 
-  // console.log(middleware);
-
   app.use(setupMiddleware(middleware));
 
   const server = app.listen();