fixup! Merge branch `3.x`

.github/workflows/release-candidate.yml

@@ -39,6 +39,8 @@ jobs:
         run: corepack yarn version apply --all --json | jq -s > releases.json
       - name: Prepare changelog
         run: corepack yarn workspace @uppy-dev/release update-changelogs releases.json | xargs git add
+      - name: Update contributors table
+        run: corepack yarn contributors:save && corepack yarn remark -foq README.md && git add README.md
       - name: Update CDN URLs
         run: corepack yarn workspace @uppy-dev/release update-version-URLs | xargs git add
       - name: Stage changes and remove temp files

.github/workflows/release.yml

@@ -41,7 +41,7 @@ jobs:
       - name: Login to NPM
         run: corepack yarn config set npmAuthToken ${{ toJSON(secrets.NPM_TOKEN) }}
       - name: Publish to NPM
-        run: corepack yarn workspaces foreach --no-private npm publish --access public --tag next --tolerate-republish
+        run: corepack yarn workspaces foreach --no-private npm publish --access public --tolerate-republish
       - name: Merge PR
         id: merge
         run: |
@@ -62,7 +62,7 @@ jobs:
         id: uppyVersion
         run: jq -r '"##[set-output name=version;]"+.version' < packages/uppy/package.json
       - name: Create GitHub release
-        run: gh release create uppy@${{ steps.uppyVersion.outputs.version }} -t "Uppy ${{ steps.uppyVersion.outputs.version }}" -F CHANGELOG.diff.md --prerelease
+        run: gh release create uppy@${{ steps.uppyVersion.outputs.version }} -t "Uppy ${{ steps.uppyVersion.outputs.version }}" -F CHANGELOG.diff.md
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       - name: Upload `uppy` to CDN
@@ -84,8 +84,8 @@ jobs:
         run: gh api -X DELETE repos/${{ github.repository }}/git/refs/heads/release-candidate || echo "Already deleted"
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      - name: Remove release-beta branch
-        run: gh api -X DELETE repos/${{ github.repository }}/git/refs/heads/release-beta
+      - name: Remove release branch
+        run: gh api -X DELETE repos/${{ github.repository }}/git/refs/heads/release
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       - name: Disable Release workflow

packages/@uppy/audio/package.json

@@ -37,6 +37,5 @@
   },
   "publishConfig": {
     "access": "public"
-  },
-  "stableVersion": "0.3.2"
+  }
 }

packages/@uppy/aws-s3-multipart/package.json

@@ -34,6 +34,5 @@
   },
   "peerDependencies": {
     "@uppy/core": "workspace:^"
-  },
-  "stableVersion": "2.4.0"
+  }
 }

packages/@uppy/aws-s3/package.json

@@ -34,6 +34,5 @@
   },
   "peerDependencies": {
     "@uppy/core": "workspace:^"
-  },
-  "stableVersion": "2.2.0"
+  }
 }

packages/@uppy/box/package.json

@@ -31,6 +31,5 @@
   },
   "publishConfig": {
     "access": "public"
-  },
-  "stableVersion": "1.0.7"
+  }
 }

packages/@uppy/companion-client/package.json

@@ -27,6 +27,5 @@
   },
   "devDependencies": {
     "@jest/globals": "^27.4.2"
-  },
-  "stableVersion": "2.2.0"
+  }
 }

packages/@uppy/companion/package.json

@@ -114,6 +114,5 @@
   },
   "installConfig": {
     "hoistingLimits": "workspaces"
-  },
-  "stableVersion": "3.6.0"
+  }
 }

packages/@uppy/compressor/package.json

@@ -34,6 +34,5 @@
   },
   "publishConfig": {
     "access": "public"
-  },
-  "stableVersion": "0.3.0"
+  }
 }

packages/@uppy/core/package.json

@@ -32,6 +32,5 @@
   },
   "devDependencies": {
     "@jest/globals": "^27.4.2"
-  },
-  "stableVersion": "2.3.0"
+  }
 }

packages/@uppy/dashboard/package.json

@@ -44,6 +44,5 @@
   },
   "peerDependencies": {
     "@uppy/core": "workspace:^"
-  },
-  "stableVersion": "2.3.0"
+  }
 }

packages/@uppy/drag-drop/package.json

@@ -31,6 +31,5 @@
   },
   "peerDependencies": {
     "@uppy/core": "workspace:^"
-  },
-  "stableVersion": "2.1.1"
+  }
 }

packages/@uppy/drop-target/package.json

@@ -32,6 +32,5 @@
   },
   "publishConfig": {
     "access": "public"
-  },
-  "stableVersion": "1.1.3"
+  }
 }

packages/@uppy/dropbox/package.json

@@ -28,6 +28,5 @@
   },
   "peerDependencies": {
     "@uppy/core": "workspace:^"
-  },
-  "stableVersion": "2.0.7"
+  }
 }

packages/@uppy/facebook/package.json

@@ -28,6 +28,5 @@
   },
   "peerDependencies": {
     "@uppy/core": "workspace:^"
-  },
-  "stableVersion": "2.0.7"
+  }
 }

packages/@uppy/file-input/package.json

@@ -28,6 +28,5 @@
   },
   "peerDependencies": {
     "@uppy/core": "workspace:^"
-  },
-  "stableVersion": "2.1.1"
+  }
 }

packages/@uppy/form/package.json

@@ -26,6 +26,5 @@
   },
   "peerDependencies": {
     "@uppy/core": "workspace:^"
-  },
-  "stableVersion": "2.0.6"
+  }
 }

packages/@uppy/golden-retriever/package.json

@@ -30,6 +30,5 @@
   },
   "peerDependencies": {
     "@uppy/core": "workspace:^"
-  },
-  "stableVersion": "2.1.0"
+  }
 }

packages/@uppy/google-drive/package.json

@@ -29,6 +29,5 @@
   },
   "peerDependencies": {
     "@uppy/core": "workspace:^"
-  },
-  "stableVersion": "2.1.1"
+  }
 }

packages/@uppy/image-editor/package.json

@@ -36,6 +36,5 @@
   },
   "publishConfig": {
     "access": "public"
-  },
-  "stableVersion": "1.3.0"
+  }
 }

packages/@uppy/informer/package.json

@@ -29,6 +29,5 @@
   },
   "peerDependencies": {
     "@uppy/core": "workspace:^"
-  },
-  "stableVersion": "2.1.0"
+  }
 }

packages/@uppy/instagram/package.json

@@ -31,6 +31,5 @@
   },
   "peerDependencies": {
     "@uppy/core": "workspace:^"
-  },
-  "stableVersion": "2.1.1"
+  }
 }

packages/@uppy/locales/package.json

@@ -16,6 +16,5 @@
   "repository": {
     "type": "git",
     "url": "git+https://github.com/transloadit/uppy.git"
-  },
-  "stableVersion": "2.1.0"
+  }
 }

packages/@uppy/onedrive/package.json

@@ -28,6 +28,5 @@
   },
   "peerDependencies": {
     "@uppy/core": "workspace:^"
-  },
-  "stableVersion": "2.1.1"
+  }
 }

packages/@uppy/progress-bar/package.json

@@ -29,6 +29,5 @@
   },
   "peerDependencies": {
     "@uppy/core": "workspace:^"
-  },
-  "stableVersion": "2.1.1"
+  }
 }

packages/@uppy/provider-views/package.json

@@ -26,6 +26,5 @@
   },
   "peerDependencies": {
     "@uppy/core": "workspace:^"
-  },
-  "stableVersion": "2.1.1"
+  }
 }

packages/@uppy/react/package.json

@@ -37,6 +37,5 @@
   "peerDependencies": {
     "@uppy/core": "workspace:^",
     "react": "^16.0.0 || ^17.0.0 || ^18.0.0"
-  },
-  "stableVersion": "2.2.1"
+  }
 }

packages/@uppy/redux-dev-tools/package.json

@@ -23,6 +23,5 @@
   },
   "peerDependencies": {
     "@uppy/core": "workspace:^"
-  },
-  "stableVersion": "2.1.0"
+  }
 }

packages/@uppy/remote-sources/package.json

@@ -47,6 +47,5 @@
   "devDependencies": {
     "@jest/globals": "^28.1.0",
     "resize-observer-polyfill": "^1.5.1"
-  },
-  "stableVersion": "0.1.0"
+  }
 }

packages/@uppy/robodog/package.json

@@ -52,6 +52,5 @@
     "md-gum-polyfill": "^1.0.0",
     "resize-observer-polyfill": "^1.5.1",
     "whatwg-fetch": "^3.6.2"
-  },
-  "stableVersion": "2.7.0"
+  }
 }

packages/@uppy/screen-capture/package.json

@@ -33,6 +33,5 @@
   },
   "publishConfig": {
     "access": "public"
-  },
-  "stableVersion": "2.1.1"
+  }
 }

packages/@uppy/status-bar/package.json

@@ -35,6 +35,5 @@
   },
   "peerDependencies": {
     "@uppy/core": "workspace:^"
-  },
-  "stableVersion": "2.2.1"
+  }
 }

packages/@uppy/store-default/package.json

@@ -21,6 +21,5 @@
   "repository": {
     "type": "git",
     "url": "git+https://github.com/transloadit/uppy.git"
-  },
-  "stableVersion": "2.1.0"
+  }
 }

packages/@uppy/store-redux/package.json

@@ -26,6 +26,5 @@
   "devDependencies": {
     "@jest/globals": "^27.4.2",
     "redux": "4.0.5"
-  },
-  "stableVersion": "2.1.0"
+  }
 }

packages/@uppy/svelte/package.json

@@ -37,6 +37,5 @@
   "files": [
     "src",
     "dist"
-  ],
-  "stableVersion": "1.0.8"
+  ]
 }

packages/@uppy/thumbnail-generator/package.json

@@ -32,6 +32,5 @@
   },
   "peerDependencies": {
     "@uppy/core": "workspace:^"
-  },
-  "stableVersion": "2.2.0"
+  }
 }

packages/@uppy/transloadit/package.json

@@ -41,6 +41,5 @@
   "devDependencies": {
     "@jest/globals": "^27.4.2",
     "whatwg-fetch": "^3.6.2"
-  },
-  "stableVersion": "2.3.0"
+  }
 }

packages/@uppy/tus/package.json

@@ -30,6 +30,5 @@
   "peerDependencies": {
     "@jest/globals": "^27.4.2",
     "@uppy/core": "workspace:^"
-  },
-  "stableVersion": "2.4.0"
+  }
 }

packages/@uppy/unsplash/package.json

@@ -31,6 +31,5 @@
   },
   "publishConfig": {
     "access": "public"
-  },
-  "stableVersion": "2.1.0"
+  }
 }

packages/@uppy/url/package.json

@@ -29,6 +29,5 @@
   },
   "peerDependencies": {
     "@uppy/core": "workspace:^"
-  },
-  "stableVersion": "2.1.1"
+  }
 }

packages/@uppy/utils/package.json

@@ -23,6 +23,5 @@
   },
   "devDependencies": {
     "@jest/globals": "^27.4.2"
-  },
-  "stableVersion": "4.1.0"
+  }
 }

packages/@uppy/vue/package.json

@@ -21,6 +21,5 @@
   },
   "publishConfig": {
     "access": "public"
-  },
-  "stableVersion": "0.4.8"
+  }
 }

packages/@uppy/webcam/package.json

@@ -36,6 +36,5 @@
   },
   "peerDependencies": {
     "@uppy/core": "workspace:^"
-  },
-  "stableVersion": "2.2.1"
+  }
 }

packages/@uppy/xhr-upload/package.json

@@ -35,6 +35,5 @@
   },
   "peerDependencies": {
     "@uppy/core": "workspace:^"
-  },
-  "stableVersion": "2.1.1"
+  }
 }

packages/@uppy/zoom/package.json

@@ -31,6 +31,5 @@
   },
   "publishConfig": {
     "access": "public"
-  },
-  "stableVersion": "1.1.1"
+  }
 }