fix(lambda-nodejs): esbuild detection with Yarn 2 in PnP mode #14739
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Refactor how `esbuild` is detected and run: check for a local version first and fallback to a global installation. For local bundling, if a local version is detected, run `esbuild` using the right package manager. In Docker, always run the globally installed version. Support for PNPM could now easily be added in another PR. Closes aws#13179
…cdk into lambda-nodejs-detect-esbuild
|
|
eladb
reviewed
May 18, 2021
| this.packageManager = PackageManager.fromLockFile(props.depsLockFilePath); | ||
|
|
||
| Bundling.esbuildInstallation = Bundling.esbuildInstallation ?? EsbuildInstallation.detect(); | ||
| const mustRunInDocker = !Bundling.esbuildInstallation?.version.startsWith(ESBUILD_VERSION); |
There was a problem hiding this comment.
Suggested change
| const mustRunInDocker = !Bundling.esbuildInstallation?.version.startsWith(ESBUILD_VERSION); | |
| const mustRunInDocker = !Bundling.esbuildInstallation?.version.startsWith(`${ESBUILD_MAJOR_VERSION}.`); |
There was a problem hiding this comment.
I am wondering if perhaps we should just emit an error if the major version doesn't match, otherwise users will not understand why we fallback to docker.
| import { BundlingOptions } from './types'; | ||
| import { exec, extractDependencies, findUp, getEsBuildVersion, LockFile } from './util'; | ||
| import { exec, extractDependencies, findUp } from './util'; | ||
|
|
||
| const ESBUILD_VERSION = '0'; |
There was a problem hiding this comment.
Suggested change
| const ESBUILD_VERSION = '0'; | |
| const ESBUILD_MAJOR_VERSION = '0'; |
2 tasks
AWS CodeBuild CI Report
Powered by github-codebuild-logs, available on the AWS Serverless Application Repository |
eladb
approved these changes
May 19, 2021
jogold
added a commit
to jogold/aws-cdk
that referenced
this pull request
May 28, 2021
…e with a NodejsFunction In aws#14739 changed how `esbuild` is run. It now uses the package manager. When consuming a node module with a `NodejsFunction` we need to run `esbuild` from the directory containing the lock file. This is where we have `node_modules\.bin`. If we run it from the directory containing the entry file the package manager doesn't "see" `node_modules\.bin`.
mergify bot
pushed a commit
that referenced
this pull request
May 30, 2021
…e with a NodejsFunction (#14914) #14739 changed how `esbuild` is run. It now uses the package manager. When consuming a node module with a `NodejsFunction` we need to run `esbuild` from the directory containing the lock file. This is where we have `node_modules\.bin`. If we run it from the directory containing the entry file the package manager doesn't "see" `node_modules\.bin`. ---- *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
hollanddd
pushed a commit
to hollanddd/aws-cdk
that referenced
this pull request
Aug 26, 2021
hollanddd
pushed a commit
to hollanddd/aws-cdk
that referenced
this pull request
Aug 26, 2021
…e with a NodejsFunction (aws#14914) aws#14739 changed how `esbuild` is run. It now uses the package manager. When consuming a node module with a `NodejsFunction` we need to run `esbuild` from the directory containing the lock file. This is where we have `node_modules\.bin`. If we run it from the directory containing the entry file the package manager doesn't "see" `node_modules\.bin`. ---- *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Original PR #13257.
Refactor how
esbuildis detected and run: check for a local versionfirst and fallback to a global installation.
For local bundling, if a local version is detected, run
esbuildusingthe right package manager.
In Docker, always run the globally installed version.
Support for PNPM could now easily be added in another PR.
Closes #13179
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license