Skip to content

Commit

Permalink
Bump pnpm version to 6.14.2 (#17017)
Browse files Browse the repository at this point in the history
pnpm 6.13.0 includes fix to the "tar" security vulnerability issue.

* pnpm v6 rename pnpmfile.js to .pnpmfile.cjs

See https://github.com/pnpm/pnpm/releases/tag/v6.0.0 for details.

* Add changes done by `rush update`

* rush update --recheck

* bump pnpm version to current latest version 6.14.2

* Adapt to pnpm change

to reduce directory nesting in virtual store, pnpm v6 replaces '/' in package
name with '+'.

pnpm/pnpm#3117
pnpm/pnpm#3314

This breaks `communication-chat` which has an
indirect dependency on earlier version of @opentelemetry/api that doesn't
provide `esm` support thus needs the commonjs plugin's named exports when
rolling up for browser.

* Fix native deps installation script
  • Loading branch information
jeremymeng authored Sep 15, 2021
1 parent aced21f commit 1a593e5
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 3 deletions.
File renamed without changes.
2 changes: 1 addition & 1 deletion common/tools/dev-tool/src/config/rollup.base.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ export function openTelemetryCommonJs(): Record<string, string[]> {
for (const version of releasedOpenTelemetryVersions) {
namedExports[
// working around a limitation in the rollup common.js plugin - it's not able to resolve these modules so the named exports listed above will not get applied. We have to drill down to the actual path.
`../../../common/temp/node_modules/.pnpm/@opentelemetry/api@${version}/node_modules/@opentelemetry/api/build/src/index.js`
`../../../common/temp/node_modules/.pnpm/@opentelemetry+api@${version}/node_modules/@opentelemetry/api/build/src/index.js`
] = [
"SpanKind",
"TraceFlags",
Expand Down
6 changes: 5 additions & 1 deletion eng/pipelines/templates/steps/use-node-test-version.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,17 @@ steps:
# <pkg>@<version> is the leaf node of the path
# Example: [email protected]
# Move one more level up if package has org name
# for e.g. node_modules\.pnpm\@azure\[email protected]\node_modules\@azure\msal-node-extensions
# for e.g. node_modules\.pnpm\@azure+[email protected]\node_modules\@azure\msal-node-extensions
if ((Split-Path -Leaf $packageInstallPath) -eq "node_modules") {
$packageInstallPath = Join-Path $packageInstallPath ".."
}
$packageAtVersion = Split-Path -Leaf $packageInstallPath
# pnpm v6 replaces '/' in package names with '+' to reduce nesting directory in virtual store so we need to
# change it back
$packageAtVersion = $packageAtVersion.Replace("+", "/")
# Check if package has org name. for e.g @azure/msal-node-enxtensions
# This returns either @azure or .pnpm( if no org is present)
$packageParentName = Split-path -Leaf (Split-Path -Parent -Resolve $packageInstallPath)
Expand Down
2 changes: 1 addition & 1 deletion rush.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
* Specify one of: "pnpmVersion", "npmVersion", or "yarnVersion". See the Rush documentation
* for details about these alternatives.
*/
"pnpmVersion": "5.18.10",
"pnpmVersion": "6.14.2",
// "npmVersion": "4.5.0",
// "yarnVersion": "1.9.4",
/**
Expand Down

0 comments on commit 1a593e5

Please sign in to comment.