Merge branch 'master' into merceyz/fix/pnp-esm

yarnpkg · Oct 31, 2021 · d314792 · d314792
2 parents c920355 + e9947cf
commit d314792
Show file tree

Hide file tree

Showing 14 changed files with 24 additions and 14 deletions.
diff --git a/.yarn/versions/78cfe28d.yml b/.yarn/versions/78cfe28d.yml
@@ -0,0 +1,7 @@
+releases:
+  "@yarnpkg/pnpify": patch
+
+declined:
+  - vscode-zipfs
+  - "@yarnpkg/builder"
+  - "@yarnpkg/cli"
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -15,6 +15,7 @@ Yarn now accepts sponsorships! Please give a look at our [OpenCollective](https:
 ### Bugfixes
 
 - The ESM loader is now enabled regardless of the entrypoint module type, this fixes support for dynamic imports in commonjs modules when the entrypoint is also commonjs
+- `@yarnpkg/pnpify` now escapes paths correctly
 
 ### Miscellaneous Features
 

diff --git a/packages/eslint-config/package.json b/packages/eslint-config/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@yarnpkg/eslint-config",
-  "version": "0.5.0-rc.1",
+  "version": "0.5.0-rc.2",
   "license": "BSD-2-Clause",
   "dependencies": {
     "@rushstack/eslint-patch": "^1.0.6",

diff --git a/packages/plugin-git/package.json b/packages/plugin-git/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@yarnpkg/plugin-git",
-  "version": "2.6.0-rc.1",
+  "version": "2.6.0-rc.2",
   "license": "BSD-2-Clause",
   "main": "./sources/index.ts",
   "dependencies": {

diff --git a/packages/plugin-nm/package.json b/packages/plugin-nm/package.json
@@ -24,7 +24,7 @@
     "@yarnpkg/core": "workspace:^",
     "@yarnpkg/plugin-stage": "workspace:^"
   },
-  "version": "3.1.1-rc.1",
+  "version": "3.1.1-rc.2",
   "nextVersion": {
     "semver": "2.0.0-rc.5",
     "nonce": "1989925236539513"

diff --git a/packages/plugin-npm/package.json b/packages/plugin-npm/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@yarnpkg/plugin-npm",
-  "version": "2.6.0",
+  "version": "2.6.1-rc.1",
   "license": "BSD-2-Clause",
   "main": "./sources/index.ts",
   "dependencies": {
@@ -38,5 +38,6 @@
   ],
   "engines": {
     "node": ">=12 <14 || 14.2 - 14.9 || >14.10.0"
-  }
+  },
+  "stableVersion": "2.6.0"
 }
diff --git a/packages/plugin-pnp/package.json b/packages/plugin-pnp/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@yarnpkg/plugin-pnp",
-  "version": "3.1.2-rc.1",
+  "version": "3.1.2-rc.2",
   "license": "BSD-2-Clause",
   "main": "./sources/index.ts",
   "dependencies": {

diff --git a/packages/plugin-pnpm/package.json b/packages/plugin-pnpm/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@yarnpkg/plugin-pnpm",
-  "version": "1.0.1",
+  "version": "1.0.2-rc.1",
   "license": "BSD-2-Clause",
   "main": "./sources/index.ts",
   "dependencies": {
@@ -37,5 +37,6 @@
   ],
   "engines": {
     "node": ">=12 <14 || 14.2 - 14.9 || >14.10.0"
-  }
+  },
+  "stableVersion": "1.0.1"
 }
diff --git a/packages/yarnpkg-cli/package.json b/packages/yarnpkg-cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@yarnpkg/cli",
-  "version": "3.2.0-rc.1",
+  "version": "3.2.0-rc.2",
   "license": "BSD-2-Clause",
   "main": "./sources/index.ts",
   "dependencies": {

diff --git a/packages/yarnpkg-core/package.json b/packages/yarnpkg-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@yarnpkg/core",
-  "version": "3.2.0-rc.1",
+  "version": "3.2.0-rc.2",
   "license": "BSD-2-Clause",
   "main": "./sources/index.ts",
   "sideEffects": false,

diff --git a/packages/yarnpkg-nm/package.json b/packages/yarnpkg-nm/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@yarnpkg/nm",
-  "version": "3.0.1-rc.1",
+  "version": "3.0.1-rc.2",
   "license": "BSD-2-Clause",
   "main": "./sources/index.ts",
   "types": "./sources/index.ts",

diff --git a/packages/yarnpkg-pnp/package.json b/packages/yarnpkg-pnp/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@yarnpkg/pnp",
-  "version": "3.1.1-rc.1",
+  "version": "3.1.1-rc.2",
   "license": "BSD-2-Clause",
   "main": "./sources/index.ts",
   "dependencies": {

diff --git a/packages/yarnpkg-pnpify/package.json b/packages/yarnpkg-pnpify/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@yarnpkg/pnpify",
-  "version": "3.1.1-rc.1",
+  "version": "3.1.1-rc.2",
   "license": "BSD-2-Clause",
   "main": "./sources/index.ts",
   "bin": "./sources/boot-cli-dev.js",

diff --git a/packages/yarnpkg-pnpify/sources/commands/RunCommand.ts b/packages/yarnpkg-pnpify/sources/commands/RunCommand.ts
@@ -33,7 +33,7 @@ export default class RunCommand extends Command {
 
   async execute() {
     let {NODE_OPTIONS} = process.env;
-    NODE_OPTIONS = `${NODE_OPTIONS || ``} --require "${dynamicRequire.resolve(`@yarnpkg/pnpify`)}"`.trim();
+    NODE_OPTIONS = `${NODE_OPTIONS || ``} --require ${JSON.stringify(dynamicRequire.resolve(`@yarnpkg/pnpify`))}`.trim();
 
     const {code} = await execUtils.pipevp(this.commandName, this.args, {
       cwd: npath.toPortablePath(this.cwd),