Release: uppy@2.6.0 (#3501)

| Package | Version | Package | Version | | --------------- | ------- | --------------- | ------- | | @uppy/companion | 3.3.0 | uppy | 2.6.0 | | @uppy/robodog | 2.3.2 | | | - meta: warn about not merging PR manually (Artur Paikin / #3492) - @uppy/companion: fix unpslash author meta, sanitize metadata to strings and improve companion tests (Mikael Finstad / #3478) - meta: ensure README is correctly formatted when doing releases (Antoine du Hamel / #3499) - meta: fix CDN bundle (Antoine du Hamel / #3494) - meta: fix missing EOL and end of e2e test templates (Antoine du Hamel / #3484) - meta: use a single `.env` file for config (Antoine du Hamel / #3498)
transloadit · Feb 17, 2022 · b9ecd94 · b9ecd94
1 parent 58e9fc3
commit b9ecd94
Show file tree

Hide file tree

Showing 20 changed files with 65 additions and 41 deletions.
diff --git a/BUNDLE-README.md b/BUNDLE-README.md
@@ -1,7 +1,7 @@
 # Uppy
 
 Hi, thanks for trying out the bundled version of the Uppy File Uploader. You can use
-this from a CDN (`<script src="https://releases.transloadit.com/uppy/v2.5.1/uppy.min.js"></script>`) or bundle it with your webapp.
+this from a CDN (`<script src="https://releases.transloadit.com/uppy/v2.6.0/uppy.min.js"></script>`) or bundle it with your webapp.
 
 Note that the recommended way to use Uppy is to install it with yarn/npm and use a
 bundler like Webpack so that you can create a smaller custom build with only the

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -12,6 +12,23 @@ Please add your entries in this format:
 
 In the current stage we aim to release a new version at least every month.
 
+## 2.6.0
+
+Released: 2022-02-17
+
+| Package         | Version | Package         | Version |
+| --------------- | ------- | --------------- | ------- |
+| @uppy/companion |   3.3.0 | uppy            |   2.6.0 |
+| @uppy/robodog   |   2.3.2 |                 |         |
+
+- meta: warn about not merging PR manually (Artur Paikin / #3492)
+- @uppy/companion: fix unpslash author meta, sanitize metadata to strings and improve companion tests (Mikael Finstad / #3478)
+- meta: ensure README is correctly formatted when doing releases (Antoine du Hamel / #3499)
+- meta: fix CDN bundle (Antoine du Hamel / #3494)
+- meta: fix missing EOL and end of e2e test templates (Antoine du Hamel / #3484)
+- meta: use a single `.env` file for config (Antoine du Hamel / #3498)
+
+
 ## 2.5.1
 
 Released: 2022-02-16

diff --git a/README.md b/README.md
@@ -69,18 +69,18 @@ $ npm install @uppy/core @uppy/dashboard @uppy/tus
 
 We recommend installing from npm and then using a module bundler such as [Webpack](https://webpack.js.org/), [Browserify](http://browserify.org/) or [Rollup.js](http://rollupjs.org/).
 
-Add CSS [uppy.min.css](https://releases.transloadit.com/uppy/v2.5.1/uppy.min.css), either to your HTML page’s `<head>` or include in JS, if your bundler of choice supports it — transforms and plugins are available for Browserify and Webpack.
+Add CSS [uppy.min.css](https://releases.transloadit.com/uppy/v2.6.0/uppy.min.css), either to your HTML page’s `<head>` or include in JS, if your bundler of choice supports it — transforms and plugins are available for Browserify and Webpack.
 
 Alternatively, you can also use a pre-built bundle from Transloadit’s CDN: Edgly. In that case `Uppy` will attach itself to the global `window.Uppy` object.
 
 > ⚠️ The bundle consists of most Uppy plugins, so this method is not recommended for production, as your users will have to download all plugins when you are likely using only a few.
 
 ```html
 <!-- 1. Add CSS to `<head>` -->
-<link href="https://releases.transloadit.com/uppy/v2.5.1/uppy.min.css" rel="stylesheet">
+<link href="https://releases.transloadit.com/uppy/v2.6.0/uppy.min.css" rel="stylesheet">
 
 <!-- 2. Add JS before the closing `</body>` -->
-<script src="https://releases.transloadit.com/uppy/v2.5.1/uppy.min.js"></script>
+<script src="https://releases.transloadit.com/uppy/v2.6.0/uppy.min.js"></script>
 
 <!-- 3. Initialize -->
 <div class="UppyDragDrop"></div>
@@ -190,7 +190,7 @@ If you’re using Uppy from CDN, those polyfills are already included in the leg
 bundle, so no need to include anything additionally:
 
 ```html
-<script src="https://releases.transloadit.com/uppy/v2.5.1/uppy.legacy.min.js"></script>
+<script src="https://releases.transloadit.com/uppy/v2.6.0/uppy.legacy.min.js"></script>
 ```
 
 ## FAQ
@@ -247,6 +247,7 @@ Use Uppy in your project? [Let us know](https://github.com/transloadit/uppy/issu
 ## Contributors
 
 <!--contributors-->
+
 [<img alt="arturi" src="https://avatars.githubusercontent.com/u/1199054?v=4&s=117" width="117">](https://github.com/arturi) |[<img alt="goto-bus-stop" src="https://avatars.githubusercontent.com/u/1006268?v=4&s=117" width="117">](https://github.com/goto-bus-stop) |[<img alt="kvz" src="https://avatars.githubusercontent.com/u/26752?v=4&s=117" width="117">](https://github.com/kvz) |[<img alt="ifedapoolarewaju" src="https://avatars.githubusercontent.com/u/8383781?v=4&s=117" width="117">](https://github.com/ifedapoolarewaju) |[<img alt="hedgerh" src="https://avatars.githubusercontent.com/u/2524280?v=4&s=117" width="117">](https://github.com/hedgerh) |[<img alt="aduh95" src="https://avatars.githubusercontent.com/u/14309773?v=4&s=117" width="117">](https://github.com/aduh95) |
 :---: |:---: |:---: |:---: |:---: |:---: |
 [arturi](https://github.com/arturi) |[goto-bus-stop](https://github.com/goto-bus-stop) |[kvz](https://github.com/kvz) |[ifedapoolarewaju](https://github.com/ifedapoolarewaju) |[hedgerh](https://github.com/hedgerh) |[aduh95](https://github.com/aduh95) |
@@ -257,15 +258,15 @@ Use Uppy in your project? [Let us know](https://github.com/transloadit/uppy/issu
 
 [<img alt="sadovnychyi" src="https://avatars.githubusercontent.com/u/193864?v=4&s=117" width="117">](https://github.com/sadovnychyi) |[<img alt="samuelayo" src="https://avatars.githubusercontent.com/u/14964486?v=4&s=117" width="117">](https://github.com/samuelayo) |[<img alt="richardwillars" src="https://avatars.githubusercontent.com/u/291004?v=4&s=117" width="117">](https://github.com/richardwillars) |[<img alt="ajkachnic" src="https://avatars.githubusercontent.com/u/44317699?v=4&s=117" width="117">](https://github.com/ajkachnic) |[<img alt="dependabot[bot]" src="https://avatars.githubusercontent.com/in/29110?v=4&s=117" width="117">](https://github.com/apps/dependabot) |[<img alt="zcallan" src="https://avatars.githubusercontent.com/u/13760738?v=4&s=117" width="117">](https://github.com/zcallan) |
 :---: |:---: |:---: |:---: |:---: |:---: |
-[sadovnychyi](https://github.com/sadovnychyi) |[samuelayo](https://github.com/samuelayo) |[richardwillars](https://github.com/richardwillars) |[ajkachnic](https://github.com/ajkachnic) |[dependabot[bot]](https://github.com/apps/dependabot) |[zcallan](https://github.com/zcallan) |
+[sadovnychyi](https://github.com/sadovnychyi) |[samuelayo](https://github.com/samuelayo) |[richardwillars](https://github.com/richardwillars) |[ajkachnic](https://github.com/ajkachnic) |[dependabot\[bot\]](https://github.com/apps/dependabot) |[zcallan](https://github.com/zcallan) |
 
 [<img alt="tim-kos" src="https://avatars.githubusercontent.com/u/15005?v=4&s=117" width="117">](https://github.com/tim-kos) |[<img alt="janko" src="https://avatars.githubusercontent.com/u/795488?v=4&s=117" width="117">](https://github.com/janko) |[<img alt="wilkoklak" src="https://avatars.githubusercontent.com/u/17553085?v=4&s=117" width="117">](https://github.com/wilkoklak) |[<img alt="oliverpool" src="https://avatars.githubusercontent.com/u/3864879?v=4&s=117" width="117">](https://github.com/oliverpool) |[<img alt="Botz" src="https://avatars.githubusercontent.com/u/2706678?v=4&s=117" width="117">](https://github.com/Botz) |[<img alt="mcallistertyler" src="https://avatars.githubusercontent.com/u/14939210?v=4&s=117" width="117">](https://github.com/mcallistertyler) |
 :---: |:---: |:---: |:---: |:---: |:---: |
 [tim-kos](https://github.com/tim-kos) |[janko](https://github.com/janko) |[wilkoklak](https://github.com/wilkoklak) |[oliverpool](https://github.com/oliverpool) |[Botz](https://github.com/Botz) |[mcallistertyler](https://github.com/mcallistertyler) |
 
-[<img alt="mokutsu-coursera" src="https://avatars.githubusercontent.com/u/65177495?v=4&s=117" width="117">](https://github.com/mokutsu-coursera) |[<img alt="YukeshShr" src="https://avatars.githubusercontent.com/u/71844521?v=4&s=117" width="117">](https://github.com/YukeshShr) |[<img alt="DJWassink" src="https://avatars.githubusercontent.com/u/1822404?v=4&s=117" width="117">](https://github.com/DJWassink) |[<img alt="github-actions[bot]" src="https://avatars.githubusercontent.com/in/15368?v=4&s=117" width="117">](https://github.com/apps/github-actions) |[<img alt="taoqf" src="https://avatars.githubusercontent.com/u/15901911?v=4&s=117" width="117">](https://github.com/taoqf) |[<img alt="tuoxiansp" src="https://avatars.githubusercontent.com/u/3960056?v=4&s=117" width="117">](https://github.com/tuoxiansp) |
+[<img alt="mokutsu-coursera" src="https://avatars.githubusercontent.com/u/65177495?v=4&s=117" width="117">](https://github.com/mokutsu-coursera) |[<img alt="YukeshShr" src="https://avatars.githubusercontent.com/u/71844521?v=4&s=117" width="117">](https://github.com/YukeshShr) |[<img alt="github-actions[bot]" src="https://avatars.githubusercontent.com/in/15368?v=4&s=117" width="117">](https://github.com/apps/github-actions) |[<img alt="DJWassink" src="https://avatars.githubusercontent.com/u/1822404?v=4&s=117" width="117">](https://github.com/DJWassink) |[<img alt="taoqf" src="https://avatars.githubusercontent.com/u/15901911?v=4&s=117" width="117">](https://github.com/taoqf) |[<img alt="tuoxiansp" src="https://avatars.githubusercontent.com/u/3960056?v=4&s=117" width="117">](https://github.com/tuoxiansp) |
 :---: |:---: |:---: |:---: |:---: |:---: |
-[mokutsu-coursera](https://github.com/mokutsu-coursera) |[YukeshShr](https://github.com/YukeshShr) |[DJWassink](https://github.com/DJWassink) |[github-actions[bot]](https://github.com/apps/github-actions) |[taoqf](https://github.com/taoqf) |[tuoxiansp](https://github.com/tuoxiansp) |
+[mokutsu-coursera](https://github.com/mokutsu-coursera) |[YukeshShr](https://github.com/YukeshShr) |[github-actions\[bot\]](https://github.com/apps/github-actions) |[DJWassink](https://github.com/DJWassink) |[taoqf](https://github.com/taoqf) |[tuoxiansp](https://github.com/tuoxiansp) |
 
 [<img alt="dominiceden" src="https://avatars.githubusercontent.com/u/6367692?v=4&s=117" width="117">](https://github.com/dominiceden) |[<img alt="elenalape" src="https://avatars.githubusercontent.com/u/22844059?v=4&s=117" width="117">](https://github.com/elenalape) |[<img alt="mejiaej" src="https://avatars.githubusercontent.com/u/4699893?v=4&s=117" width="117">](https://github.com/mejiaej) |[<img alt="gavboulton" src="https://avatars.githubusercontent.com/u/3900826?v=4&s=117" width="117">](https://github.com/gavboulton) |[<img alt="Hawxy" src="https://avatars.githubusercontent.com/u/975824?v=4&s=117" width="117">](https://github.com/Hawxy) |[<img alt="juliangruber" src="https://avatars.githubusercontent.com/u/10247?v=4&s=117" width="117">](https://github.com/juliangruber) |
 :---: |:---: |:---: |:---: |:---: |:---: |
@@ -451,7 +452,6 @@ Use Uppy in your project? [Let us know](https://github.com/transloadit/uppy/issu
 :---: |:---: |:---: |:---: |:---: |
 [tusharjkhunt](https://github.com/tusharjkhunt) |[vedran555](https://github.com/vedran555) |[yoann-hellopret](https://github.com/yoann-hellopret) |[olitomas](https://github.com/olitomas) |[JimmyLv](https://github.com/JimmyLv) |
 
-
 <!--/contributors-->
 
 ## Software

diff --git a/examples/cdn-example/index.html b/examples/cdn-example/index.html
@@ -4,11 +4,11 @@
     <title></title>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
-    <link href="https://releases.transloadit.com/uppy/v2.5.1/uppy.min.css" rel="stylesheet">
+    <link href="https://releases.transloadit.com/uppy/v2.6.0/uppy.min.css" rel="stylesheet">
   </head>
   <body>
     <button id="uppyModalOpener">Open Modal</button>
-    <script src="https://releases.transloadit.com/uppy/v2.5.1/uppy.min.js"></script>
+    <script src="https://releases.transloadit.com/uppy/v2.6.0/uppy.min.js"></script>
     <script>
       const uppy = new Uppy.Core({debug: true, autoProceed: false})
         .use(Uppy.Dashboard, { trigger: '#uppyModalOpener' })

diff --git a/examples/transloadit-textarea/index.html b/examples/transloadit-textarea/index.html
@@ -2,7 +2,7 @@
 <html>
   <head>
     <meta charset="utf-8">
-    <link rel="stylesheet" href="https://releases.transloadit.com/uppy/robodog/v2.3.1/robodog.css">
+    <link rel="stylesheet" href="https://releases.transloadit.com/uppy/robodog/v2.3.2/robodog.css">
     <style>
       body {
         font-family: Roboto, Open Sans;

diff --git a/examples/uppy-with-companion/client/index.html b/examples/uppy-with-companion/client/index.html
@@ -4,11 +4,11 @@
     <title></title>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
-    <link href="https://releases.transloadit.com/uppy/v2.5.1/uppy.min.css" rel="stylesheet">
+    <link href="https://releases.transloadit.com/uppy/v2.6.0/uppy.min.css" rel="stylesheet">
   </head>
   <body>
     <button id="uppyModalOpener">Open Modal</button>
-    <script src="https://releases.transloadit.com/uppy/v2.5.1/uppy.min.js"></script>
+    <script src="https://releases.transloadit.com/uppy/v2.6.0/uppy.min.js"></script>
     <script>
       const uppy = new Uppy.Core({debug: true, autoProceed: false})
         .use(Uppy.Dashboard, { trigger: '#uppyModalOpener' })

diff --git a/packages/@uppy/companion/CHANGELOG.md b/packages/@uppy/companion/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @uppy/companion
 
+## 3.3.0
+
+Released: 2022-02-17
+Included in: Uppy v2.6.0
+
+- @uppy/companion: fix unpslash author meta, sanitize metadata to strings and improve companion tests (Mikael Finstad / #3478)
+
 ## 3.2.1
 
 Released: 2022-02-16

diff --git a/packages/@uppy/companion/package.json b/packages/@uppy/companion/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@uppy/companion",
-  "version": "3.2.1",
+  "version": "3.3.0",
   "description": "OAuth helper and remote fetcher for Uppy's (https://uppy.io) extensible file upload widget with support for drag&drop, resumable uploads, previews, restrictions, file processing/encoding, remote providers like Dropbox and Google Drive, S3 and more :dog:",
   "main": "lib/companion.js",
   "types": "lib/companion.d.ts",

diff --git a/packages/@uppy/robodog/README.md b/packages/@uppy/robodog/README.md
@@ -20,8 +20,8 @@ We recommend installing from npm and then using a module bundler such as [Webpac
 Alternatively, you can also use this package in a pre-built bundle from Transloadit’s CDN: Edgly.
 
 ```html
-<link rel="stylesheet" href="https://releases.transloadit.com/uppy/v2.5.1/robodog.min.css">
-<script src="https://releases.transloadit.com/uppy/v2.5.1/robodog.min.js"></script>
+<link rel="stylesheet" href="https://releases.transloadit.com/uppy/v2.6.0/robodog.min.css">
+<script src="https://releases.transloadit.com/uppy/v2.6.0/robodog.min.js"></script>
 ```
 
 Then, a global `Robodog` variable will be available. For usage instructions, please see the [main Robodog documentation](https://uppy.io/docs/robodog).

diff --git a/packages/@uppy/robodog/package.json b/packages/@uppy/robodog/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@uppy/robodog",
   "description": "Transloadit SDK for browsers based on Uppy",
-  "version": "2.3.1",
+  "version": "2.3.2",
   "license": "MIT",
   "main": "lib/index.js",
   "jsnext:main": "src/index.js",

diff --git a/packages/uppy/package.json b/packages/uppy/package.json
@@ -1,7 +1,7 @@
 {
   "name": "uppy",
   "description": "Extensible JavaScript file upload widget with support for drag&drop, resumable uploads, previews, restrictions, file processing/encoding, remote providers like Instagram, Dropbox, Google Drive, S3 and more :dog:",
-  "version": "2.5.1",
+  "version": "2.6.0",
   "license": "MIT",
   "main": "index.js",
   "module": "index.mjs",

diff --git a/website/src/docs/index.md b/website/src/docs/index.md
@@ -19,12 +19,12 @@ Here’s the simplest example html page with Uppy (it uses a CDN bundle, while w
   <head>
     <meta charset="utf-8">
     <title>Uppy</title>
-    <link href="https://releases.transloadit.com/uppy/v2.5.1/uppy.min.css" rel="stylesheet">
+    <link href="https://releases.transloadit.com/uppy/v2.6.0/uppy.min.css" rel="stylesheet">
   </head>
   <body>
     <div id="drag-drop-area"></div>
 
-    <script src="https://releases.transloadit.com/uppy/v2.5.1/uppy.min.js"></script>
+    <script src="https://releases.transloadit.com/uppy/v2.6.0/uppy.min.js"></script>
     <script>
       var uppy = new Uppy.Core()
         .use(Uppy.Dashboard, {
@@ -118,13 +118,13 @@ You can also use a pre-built bundle from Transloadit’s CDN: Edgly. `Uppy` will
 1\. Add a script at the bottom of the closing `</body>` tag:
 
 ```html
-<script src="https://releases.transloadit.com/uppy/v2.5.1/uppy.min.js"></script>
+<script src="https://releases.transloadit.com/uppy/v2.6.0/uppy.min.js"></script>
 ```
 
 2\. Add CSS to `<head>`:
 
 ```html
-<link href="https://releases.transloadit.com/uppy/v2.5.1/uppy.min.css" rel="stylesheet">
+<link href="https://releases.transloadit.com/uppy/v2.6.0/uppy.min.css" rel="stylesheet">
 ```
 
 3\. Initialize at the bottom of the closing `</body>` tag:
@@ -183,5 +183,5 @@ export * from '@uppy/core'
 If you’re using Uppy from CDN, those polyfills are already included in the bundle, no need to include anything additionally:
 
 ```html
-<script src="https://releases.transloadit.com/uppy/v2.5.1/uppy.min.js"></script>
+<script src="https://releases.transloadit.com/uppy/v2.6.0/uppy.min.js"></script>
 ```
diff --git a/website/src/docs/locales.md b/website/src/docs/locales.md
@@ -34,7 +34,7 @@ const uppy = new Uppy({
 Add a `<script>` tag with Uppy bundle and the locale pack you’d like to use. You can copy/paste the link from the CDN column in the [locales table](#List-of-locale-packs). The locale will attach itself to the `Uppy.locales` object.
 
 ```html
-<script src="https://releases.transloadit.com/uppy/v2.5.1/uppy.min.js"></script>
+<script src="https://releases.transloadit.com/uppy/v2.6.0/uppy.min.js"></script>
 <script src="https://releases.transloadit.com/uppy/locales/v2.0.6/de_DE.min.js"></script>
 
 <script>

diff --git a/website/src/docs/migration-guides.md b/website/src/docs/migration-guides.md
@@ -41,11 +41,11 @@ If you’re using Uppy from a CDN, we now provide two bundles: one for up-to-dat
 
 ```html
 <!-- Modern browsers (recommended) -->
-<script src="https://releases.transloadit.com/uppy/v2.5.1/uppy.min.js"></script>
+<script src="https://releases.transloadit.com/uppy/v2.6.0/uppy.min.js"></script>
 
 <!-- Legacy browsers (IE11+) -->
-<script nomodule src="https://releases.transloadit.com/uppy/v2.5.1/uppy.legacy.min.js"></script>
-<script type="module">import "https://releases.transloadit.com/uppy/v2.5.1/uppy.min.js";</script>
+<script nomodule src="https://releases.transloadit.com/uppy/v2.6.0/uppy.legacy.min.js"></script>
+<script type="module">import "https://releases.transloadit.com/uppy/v2.6.0/uppy.min.js";</script>
 ```
 
 Please note that while you may be able to get 2.0 to work in IE11 this way, we do not officially support it anymore.

diff --git a/website/src/docs/robodog-form.md b/website/src/docs/robodog-form.md
@@ -150,7 +150,7 @@ Make sure to also include the Uppy css file in your `<head>` tag in case you wan
 
 ```html
 <head>
-  <link rel="stylesheet" href="https://releases.transloadit.com/uppy/robodog/v2.3.1/robodog.min.css">
+  <link rel="stylesheet" href="https://releases.transloadit.com/uppy/robodog/v2.3.2/robodog.min.css">
 </head>
 ```
 
@@ -162,7 +162,7 @@ Notice how the form is submitted to the inexistant `/uploads` route once all tra
 <html>
   <head>
     <title>Testing Robodog</title>
-    <link rel="stylesheet" href="https://releases.transloadit.com/uppy/robodog/v2.3.1/robodog.min.css">
+    <link rel="stylesheet" href="https://releases.transloadit.com/uppy/robodog/v2.3.2/robodog.min.css">
   </head>
   <body>
     <form id="upload-form" action="/uploads" enctype="multipart/form-data" method="POST">
@@ -172,7 +172,7 @@ Notice how the form is submitted to the inexistant `/uploads` route once all tra
       <button type="submit">Upload</button>
     </form>
 
-    <script src="https://releases.transloadit.com/uppy/robodog/v2.3.1/robodog.min.js"></script>
+    <script src="https://releases.transloadit.com/uppy/robodog/v2.3.2/robodog.min.js"></script>
     <script type="text/javascript">
     window.Robodog.form('#upload-form', {
       waitForEncoding: true,

diff --git a/website/src/docs/robodog.md b/website/src/docs/robodog.md
@@ -31,8 +31,8 @@ import '@uppy/robodog/dist/robodog.css'
 If you are not using a bundler, you can also import Robodog using an HTML script tag.
 
 ```html
-<link rel="stylesheet" href="https://releases.transloadit.com/uppy/robodog/v2.3.1/robodog.min.css">
-<script src="https://releases.transloadit.com/uppy/robodog/v2.3.1/robodog.min.js"></script>
+<link rel="stylesheet" href="https://releases.transloadit.com/uppy/robodog/v2.3.2/robodog.min.css">
+<script src="https://releases.transloadit.com/uppy/robodog/v2.3.2/robodog.min.js"></script>
 <!-- you can now use: window.Robodog.pick() -->
 ```