pulumi/sdk/nodejs/npm
Julien P 5ff35273d6
Fix merge failures #2 (#15543)
<!--- 
Thanks so much for your contribution! If this is your first time
contributing, please ensure that you have read the
[CONTRIBUTING](https://github.com/pulumi/pulumi/blob/master/CONTRIBUTING.md)
documentation.
-->

# Description

<!--- Please include a summary of the change and which issue is fixed.
Please also include relevant motivation and context. -->

Fixes https://github.com/pulumi/pulumi/issues/15528

See https://github.com/pulumi/pulumi/pull/15540 &
https://github.com/pulumi/pulumi/pull/15531

Re-creating this as a PR with `ci/test` label so we can get it merged.

## Checklist

- [x] I have run `make tidy` to update any new dependencies
- [x] I have run `make lint` to verify my code passes the lint check
  - [x] I have formatted my code using `gofumpt`

<!--- Please provide details if the checkbox below is to be left
unchecked. -->
- [ ] I have added tests that prove my fix is effective or that my
feature works
<!--- 
User-facing changes require a CHANGELOG entry.
-->
- [x] I have run `make changelog` and committed the
`changelog/pending/<file>` documenting my change
<!--
If the change(s) in this PR is a modification of an existing call to the
Pulumi Cloud,
then the service should honor older versions of the CLI where this
change would not exist.
You must then bump the API version in
/pkg/backend/httpstate/client/api.go, as well as add
it to the service.
-->
- [ ] Yes, there are changes in this PR that warrants bumping the Pulumi
Cloud API version
<!-- @Pulumi employees: If yes, you must submit corresponding changes in
the service repo. -->

---------

Co-authored-by: Justin Van Patten <jvp@justinvp.com>
Co-authored-by: Anton Tayanovskyy <anton@pulumi.com>
Co-authored-by: Thomas Gummerer <t.gummerer@gmail.com>
2024-02-29 21:06:24 +00:00
..
testdata Use pnpm as package manager if we find a pnpm-lock.yaml file (#15456) 2024-02-21 13:41:21 +00:00
manager.go Use pnpm as package manager if we find a pnpm-lock.yaml file (#15456) 2024-02-21 13:41:21 +00:00
manager_test.go Fix merge failures #2 (#15543) 2024-02-29 21:06:24 +00:00
npm.go Use pnpm as package manager if we find a pnpm-lock.yaml file (#15456) 2024-02-21 13:41:21 +00:00
npm_test.go Fix TestNPMInstallCmd 2023-05-29 14:16:23 +01:00
pnpm.go Use pnpm as package manager if we find a pnpm-lock.yaml file (#15456) 2024-02-21 13:41:21 +00:00
workspaces.go Handle workspaces in computeCodePaths (#15426) 2024-02-22 11:41:37 +00:00
workspaces_test.go Use pnpm as package manager if we find a pnpm-lock.yaml file (#15456) 2024-02-21 13:41:21 +00:00
yarn.go Clean up uses of .Error() (#14965) 2023-12-20 15:54:06 +00:00