fix(webpack): better plugin resolution when deps are flattened

Author: vvo

package.json

@@ -48,6 +48,7 @@
     "@babel/preset-env": "7.10.4",
     "babel-loader": "8.1.0",
     "babel-plugin-source-map-support": "2.1.2",
+    "find-up": "5.0.0",
     "noop2": "2.0.0",
     "source-map-support": "0.5.19",
     "ts-loader": "8.0.1",

src/NodejsFunction.ts

@@ -3,6 +3,7 @@ import * as path from "path";
 import * as os from "os";
 import * as process from "process";
 import { spawnSync } from "child_process";
+import findUp from "find-up";
 
 import * as lambda from "@aws-cdk/aws-lambda";
 import * as cdk from "@aws-cdk/core";
@@ -92,19 +93,41 @@ export class NodejsFunction extends lambda.Function {
     const outputDir = fs.mkdtempSync(
       path.join(os.tmpdir(), "aws-lambda-nodejs-webpack"),
     );
-    const webpackBinPath = require.resolve("webpack-cli");
     const webpackConfigPath = path.join(outputDir, "webpack.config.js");
+
+    // The code below is mostly to handle cases where this module is used through
+    // yarn link. I think otherwise just using require.resolve and passing just the babel plugin
+    // names would have worked.
+
+    const webpackBinPath = require.resolve("webpack-cli");
+
+    const plugins = [
+      "webpack",
+      "babel-loader",
+      "@babel/preset-env",
+      "@babel/plugin-transform-runtime",
+      "babel-plugin-source-map-support",
+      "noop2",
+    ];
     const pluginsPath = path.join(
       webpackBinPath.slice(0, webpackBinPath.lastIndexOf("/node_modules")),
       "node_modules",
     );
+    const pluginsPaths: any = plugins.reduce(function(acc, pluginName) {
+      return {
+        [pluginName]: findUp.sync(pluginName, {
+          type: "directory",
+          cwd: pluginsPath,
+        }),
+        ...acc,
+      };
+    }, {});
 
     const webpackConfiguration = `
     const { builtinModules } = require("module");
-    const { NormalModuleReplacementPlugin } = require("${path.join(
-      pluginsPath,
-      "webpack",
-    )}");
+    const { NormalModuleReplacementPlugin } = require("${
+      pluginsPaths["webpack"]
+    }");
 
     module.exports = {
       mode: "none",
@@ -120,12 +143,12 @@ export class NodejsFunction extends lambda.Function {
             test: /\\.js$/,
             exclude: /node_modules/,
             use: {
-              loader: "${path.join(pluginsPath, "babel-loader")}",
+              loader: "${pluginsPaths["babel-loader"]}",
               options: {
                 cacheDirectory: true,
                 presets: [
                   [
-                    "${path.join(pluginsPath, "@babel/preset-env")}",
+                    "${pluginsPaths["@babel/preset-env"]}",
                     {
                       "targets": {
                         "node": "${
@@ -138,10 +161,7 @@ export class NodejsFunction extends lambda.Function {
                   ]
                 ],
                 plugins: [
-                  "${path.join(
-                    pluginsPath,
-                    "@babel/plugin-transform-runtime",
-                  )}",
+                  "${pluginsPaths["@babel/plugin-transform-runtime"]}",
                   "${path.join(pluginsPath, "babel-plugin-source-map-support")}"
                 ]
               }
@@ -165,7 +185,7 @@ export class NodejsFunction extends lambda.Function {
       plugins: [
         new NormalModuleReplacementPlugin(
           /${props.modulesToIgnore.join("|")}/,
-          "${path.join(pluginsPath, "noop2")}",
+          "${pluginsPaths["noop2"]}",
         ),
       ]
       `) ||

yarn.lock

@@ -4931,6 +4931,14 @@ find-npm-prefix@^1.0.2:
   resolved "https://registry.yarnpkg.com/find-npm-prefix/-/find-npm-prefix-1.0.2.tgz#8d8ce2c78b3b4b9e66c8acc6a37c231eb841cfdf"
   integrity sha512-KEftzJ+H90x6pcKtdXZEPsQse8/y/UnvzRKrOSQFprnrGaFuJ62fVkP34Iu2IYuMvyauCyoLTNkJZgrrGA2wkA==
 
+find-up@5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/find-up/-/find-up-5.0.0.tgz#4c92819ecb7083561e4f4a240a86be5198f536fc"
+  integrity sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==
+  dependencies:
+    locate-path "^6.0.0"
+    path-exists "^4.0.0"
+
 find-up@^2.0.0, find-up@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7"
@@ -7067,6 +7075,13 @@ locate-path@^5.0.0:
   dependencies:
     p-locate "^4.1.0"
 
+locate-path@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-6.0.0.tgz#55321eb309febbc59c4801d931a72452a681d286"
+  integrity sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==
+  dependencies:
+    p-locate "^5.0.0"
+
 lock-verify@^2.0.2, lock-verify@^2.1.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/lock-verify/-/lock-verify-2.2.0.tgz#12432feb68bb647071c78c44bde16029a0f7d935"
@@ -8289,6 +8304,13 @@ p-limit@^2.0.0, p-limit@^2.2.0:
   dependencies:
     p-try "^2.0.0"
 
+p-limit@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.0.2.tgz#1664e010af3cadc681baafd3e2a437be7b0fb5fe"
+  integrity sha512-iwqZSOoWIW+Ew4kAGUlN16J4M7OB3ysMLSZtnhmqx7njIHFPlxWBX8xo3lVTyFVq6mI/lL9qt2IsN1sHwaxJkg==
+  dependencies:
+    p-try "^2.0.0"
+
 p-locate@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-2.0.0.tgz#20a0103b222a70c8fd39cc2e580680f3dde5ec43"
@@ -8310,6 +8332,13 @@ p-locate@^4.1.0:
   dependencies:
     p-limit "^2.2.0"
 
+p-locate@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-5.0.0.tgz#83c8315c6785005e3bd021839411c9e110e6d834"
+  integrity sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==
+  dependencies:
+    p-limit "^3.0.2"
+
 p-map@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/p-map/-/p-map-2.1.0.tgz#310928feef9c9ecc65b68b17693018a665cea175"