fix dirname

aws · May 7, 2020 · 7dbef6f · 7dbef6f
1 parent fb0504d
commit 7dbef6f
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/packages/@aws-cdk/aws-lambda-nodejs/lib/builder.ts b/packages/@aws-cdk/aws-lambda-nodejs/lib/builder.ts
@@ -72,7 +72,7 @@ export class Builder {
     if (!pkgPath) {
       throw new Error('Cannot find a `package.json` in this project.');
     }
-    this.pkgPath = pkgPath;
+    this.pkgPath = path.join(pkgPath, 'package.json');
     this.originalPkg = fs.readFileSync(this.pkgPath);
     this.originalPkgJson = JSON.parse(this.originalPkg.toString());
   }

diff --git a/packages/@aws-cdk/aws-lambda-nodejs/lib/function.ts b/packages/@aws-cdk/aws-lambda-nodejs/lib/function.ts
@@ -118,7 +118,7 @@ export class NodejsFunction extends lambda.Function {
       cacheDir: props.cacheDir,
       nodeVersion: extractVersion(runtime),
       nodeDockerTag: props.nodeDockerTag || `${process.versions.node}-alpine`,
-      projectRoot: path.dirname(path.resolve(projectRoot)),
+      projectRoot: path.resolve(projectRoot),
     });
     builder.build();
 

diff --git a/packages/@aws-cdk/aws-lambda-nodejs/lib/util.ts b/packages/@aws-cdk/aws-lambda-nodejs/lib/util.ts
@@ -59,7 +59,7 @@ function findClosestPathContaining(p: string): string | undefined {
   for (const nodeModulesPath of module.paths) {
     closestPath = path.join(path.dirname(nodeModulesPath), p);
     if (fs.existsSync(closestPath)) {
-      break;
+      return path.dirname(nodeModulesPath);
     }
   }