Merge remote-tracking branch 'upstream/main'

* upstream/main:
  Fix output for prerelease version of poetry (actions#409)
  Update zeit/ncc to vercel/ncc (actions#393)
  Change PyPy version to rebuild cache

.github/workflows/e2e-cache.yml

@@ -61,7 +61,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, windows-latest, macos-latest]
-        python-version: ['3.9', 'pypy-3.7-v7.x']
+        python-version: ['3.9', 'pypy-3.8']
     steps:
       - uses: actions/checkout@v3
       - name: Install poetry

dist/setup/index.js

@@ -38423,7 +38423,7 @@ class PoetryCache extends cache_distributor_1.default {
             const lines = stdout.trim().split('\n');
             const config = {};
             for (let line of lines) {
-                line = line.replace(/#.*$/, '');
+                line = line.replace(/#.*$/gm, '');
                 const [key, value] = line.split('=').map(part => part.trim());
                 config[key] = JSON.parse(value);
             }

package.json

@@ -35,7 +35,7 @@
     "@types/jest": "^27.0.2",
     "@types/node": "^16.11.25",
     "@types/semver": "^7.1.0",
-    "@zeit/ncc": "^0.22.0",
+    "@vercel/ncc": "^0.33.4",
     "husky": "^7.0.2",
     "jest": "^27.2.5",
     "jest-circus": "^27.2.5",

src/cache-distributions/poetry-cache.ts

@@ -58,7 +58,7 @@ class PoetryCache extends CacheDistributor {
     const config: any = {};
 
     for (let line of lines) {
-      line = line.replace(/#.*$/, '');
+      line = line.replace(/#.*$/gm, '');
 
       const [key, value] = line.split('=').map(part => part.trim());