Uppy Server → Uppy Companion in some more places

README.md

@@ -33,8 +33,8 @@ const Tus = require('@uppy/Tus')
 
 const uppy = Uppy({ autoProceed: false })
   .use(Dashboard, { trigger: '#select-files' })
-  .use(GoogleDrive, { target: Dashboard, serverUrl: 'https://server.uppy.io' })
-  .use(Instagram, { target: Dashboard, serverUrl: 'https://server.uppy.io' })
+  .use(GoogleDrive, { target: Dashboard, serverUrl: 'https://companion.uppy.io' })
+  .use(Instagram, { target: Dashboard, serverUrl: 'https://companion.uppy.io' })
   .use(Webcam, { target: Dashboard })
   .use(Tus, { endpoint: 'https://master.tus.io/files/' })
   .on('complete', (result) => {
@@ -48,7 +48,7 @@ const uppy = Uppy({ autoProceed: false })
 
 - Lightweight, modular plugin-based architecture, easy on dependencies :zap:
 - Resumable file uploads via the open [tus](https://tus.io/) standard, so large uploads survive network hiccups
-- Supports picking files from: Webcam, Dropbox, Google Drive, Instagram, bypassing the user’s device where possible, syncing between servers directly via [uppy-server](https://github.com/transloadit/uppy-server)
+- Supports picking files from: Webcam, Dropbox, Google Drive, Instagram, bypassing the user’s device where possible, syncing between servers directly via [@uppy/companion](https://uppy.io/docs/companion)
 - Works great with file encoding and processing backends, such as [Transloadit](https://transloadit.com), works great without (just roll your own Apache/Nginx/Node/FFmpeg/etc backend)
 - Sleek user interface :sparkles:
 - Optional file recovery (after a browser crash) with [Golden Retriever](https://uppy.io/docs/golden-retriever/)
@@ -91,7 +91,7 @@ Alternatively, you can also use a pre-built bundle from Transloadit's CDN: Edgly
 
 - [Uppy](https://uppy.io/docs/uppy/) — full list of options, methods, and events.
 - [Plugins](https://uppy.io/docs/plugins/) — list of Uppy plugins and their options.
-- [Server](https://uppy.io/docs/server/) — setting up and running an Uppy Server instance, which adds support for Instagram, Dropbox, Google Drive and remote urls.
+- [Companion](https://uppy.io/docs/companion/) — setting up and running an Uppy Companion instance, which adds support for Instagram, Dropbox, Google Drive and remote urls.
 - [React](https://uppy.io/docs/react/) — components to integrate Uppy UI plugins with React apps.
 - [Architecture & Writing a Plugin](https://uppy.io/docs/writing-plugins/) — how to write a plugin for Uppy.
 
@@ -108,9 +108,9 @@ Alternatively, you can also use a pre-built bundle from Transloadit's CDN: Edgly
 
 ### Remote Providers
 
-- [`Google Drive`](https://uppy.io/docs/google-drive/), [`Dropbox`](https://uppy.io/docs/dropbox/), [`Instagram`](https://uppy.io/docs/instagram/), [`Import From URL`](https://uppy.io/docs/url/) — support picking files from remote providers or direct URLs from anywhere on the web. Note that[`uppy-server`](https://github.com/transloadit/uppy-server) is needed for these.
+- [`Google Drive`](https://uppy.io/docs/google-drive/), [`Dropbox`](https://uppy.io/docs/dropbox/), [`Instagram`](https://uppy.io/docs/instagram/), [`Import From URL`](https://uppy.io/docs/url/) — support picking files from remote providers or direct URLs from anywhere on the web. Note that [`@uppy/companion`](https://uppy.io/docs/companion) is needed for these.
 
-### Uploaders 
+### Uploaders
 
 - [`Tus`](https://uppy.io/docs/tus/) — resumable uploads via the open [tus](http://tus.io) standard
 - [`XHR Upload`](https://uppy.io/docs/xhr-upload/) — regular uploads for any backend out there (like Apache, Nginx)
@@ -194,7 +194,7 @@ Yes, whatever you want on the backend will work with `@uppy/xhr-upload` plugin,
 
 If you want resumability with the Tus plugin, use [one of the tus server implementations](https://tus.io/implementations.html) 👌🏼
 
-And you’ll need [`uppy-server`](https://github.com/transloadit/uppy-server) if you’d like your users to be able to pick files from Instagram, Google Drive, Dropbox or via direct urls (with more services coming).
+And you’ll need [`@uppy/companion`](https://uppy.io/docs/companion) if you’d like your users to be able to pick files from Instagram, Google Drive, Dropbox or via direct urls (with more services coming).
 
 ## Contributions are welcome
 

examples/aws-uppy-server/index.html

@@ -3,7 +3,7 @@
   <head>
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>Uppy Server + AWS Example</title>
+    <title>Uppy Companion + AWS Example</title>
     <link href="uppy.min.css" rel="stylesheet">
   </head>
   <body>

examples/uppy-with-server/server/index.js

@@ -1,5 +1,5 @@
 const express = require('express')
-const uppy = require('uppy-server')
+const uppy = require('../../../packages/@uppy/companion')
 const bodyParser = require('body-parser')
 const session = require('express-session')
 
@@ -29,7 +29,7 @@ app.use((req, res, next) => {
 // Routes
 app.get('/', (req, res) => {
   res.setHeader('Content-Type', 'text/plain')
-  res.send('Welcome to my uppy server')
+  res.send('Welcome to Uppy Companion')
 })
 
 // initialize uppy
@@ -69,5 +69,5 @@ app.use((err, req, res, next) => {
 
 uppy.socket(app.listen(3020), uppyOptions)
 
-console.log('Welcome to Uppy Server!')
+console.log('Welcome to Uppy Companion!')
 console.log(`Listening on http://0.0.0.0:${3020}`)

packages/@uppy/google-drive/README.md

@@ -7,7 +7,7 @@
 
 The Google Drive plugin for Uppy lets users import files from their Google Drive account.
 
-An Uppy Server instance is required for the GoogleDrive plugin to work. Uppy Server handles authentication with Google, downloads files from the Drive and uploads them to the destination. This saves the user bandwidth, especially helpful if they are on a mobile connection.
+An Uppy Companion instance is required for the GoogleDrive plugin to work. Uppy Companion handles authentication with Google, downloads files from the Drive and uploads them to the destination. This saves the user bandwidth, especially helpful if they are on a mobile connection.
 
 
 Uppy is being developed by the folks at [Transloadit](https://transloadit.com), a versatile file encoding service.

packages/@uppy/instagram/README.md

@@ -7,7 +7,7 @@
 
 The Instagram plugin lets users import photos from their Instagram account.
 
-An [Uppy Server](https://uppy.io/docs/server) instance is required for the Instagram plugin to work. Uppy Server handles authentication with Instagram, downloads the pictures and videos, and uploads them to the destination. This saves the user bandwidth, especially helpful if they are on a mobile connection.
+An [Uppy Companion](https://uppy.io/docs/server) instance is required for the Instagram plugin to work. Uppy Companion handles authentication with Instagram, downloads the pictures and videos, and uploads them to the destination. This saves the user bandwidth, especially helpful if they are on a mobile connection.
 
 Uppy is being developed by the folks at [Transloadit](https://transloadit.com), a versatile file encoding service.
 

packages/@uppy/url/README.md

@@ -7,7 +7,7 @@
 
 The Url plugin lets users import files from the Internet. Paste any URL and it’ll be added!
 
-An Uppy Server instance is required for the Url plugin to work. Uppy Server will download the files and upload them to their destination. This saves bandwidth for the user (especially on mobile connections) and helps avoid CORS restrictions.
+An Uppy Companion instance is required for the Url plugin to work. Uppy Companion will download the files and upload them to their destination. This saves bandwidth for the user (especially on mobile connections) and helps avoid CORS restrictions.
 
 Uppy is being developed by the folks at [Transloadit](https://transloadit.com), a versatile file encoding service.
 

website/src/docs/aws-s3-multipart.md

@@ -12,7 +12,7 @@ The `@uppy/aws-s3-multipart` plugin can be used to upload files directly to an S
 const AwsS3Multipart = require('@uppy/aws-s3-multipart')
 uppy.use(AwsS3Multipart, {
   limit: 4,
-  serverUrl: 'https://uppy-server.myapp.net/'
+  serverUrl: 'https://uppy-companion.myapp.net/'
 })
 ```
 
@@ -42,7 +42,7 @@ The maximum amount of chunks to upload simultaneously. Set to `0` to disable lim
 
 ### serverUrl: null
 
-The Uppy Server URL to use for proxying calls to the S3 Multipart API.
+The Uppy Companion URL to use for proxying calls to the S3 Multipart API.
 
 ### createMultipartUpload(file)
 
@@ -53,7 +53,7 @@ Return a Promise for an object with keys:
  - `uploadId` - The UploadID returned by S3.
  - `key` - The object key for the file. This needs to be returned to allow it to be different from the `file.name`.
 
-The default implementation calls out to Uppy Server's S3 signing endpoints.
+The default implementation calls out to Uppy Companion's S3 signing endpoints.
 
 ### listParts(file, { uploadId, key })
 
@@ -68,7 +68,7 @@ Return a Promise for an array of S3 Part objects, as returned by the S3 Multipar
  - `Size` - The size of the part in bytes.
  - `ETag` - The ETag of the part, used to identify it when completing the multipart upload and combining all parts into a single file.
 
-The default implementation calls out to Uppy Server's S3 signing endpoints.
+The default implementation calls out to Uppy Companion's S3 signing endpoints.
 
 ### prepareUploadPart(file, partData)
 
@@ -103,7 +103,7 @@ A function that calls the S3 Multipart API to abort a Multipart upload, and dele
 
 This is typically called when the user cancels an upload. Cancellation cannot fail in Uppy, so the result of this function is ignored.
 
-The default implementation calls out to Uppy Server's S3 signing endpoints.
+The default implementation calls out to Uppy Companion's S3 signing endpoints.
 
 ### completeMultipartUpload(file, { uploadId, key, parts })
 
@@ -117,7 +117,7 @@ Return a Promise for an object with properties:
 
  - `location` - **(Optional)** A publically accessible URL to the object in the S3 bucket.
 
-The default implementation calls out to Uppy Server's S3 signing endpoints.
+The default implementation calls out to Uppy Companion's S3 signing endpoints.
 
 ## S3 Bucket Configuration
 

website/src/docs/aws-s3.md

@@ -7,7 +7,7 @@ permalink: docs/aws-s3/
 ---
 
 The `@uppy/aws-s3` plugin can be used to upload files directly to an S3 bucket.
-Uploads can be signed using either [Uppy Server][uppy-server docs] or a custom signing function.
+Uploads can be signed using either [Uppy Companion][companion docs] or a custom signing function.
 
 ```js
 const AwsS3 = require('@uppy/aws-s3')
@@ -16,11 +16,11 @@ const ms = require('ms')
 uppy.use(AwsS3, {
   limit: 2,
   timeout: ms('1 minute'),
-  serverUrl: 'https://uppy-server.myapp.com/'
+  serverUrl: 'https://uppy-companion.myapp.com/'
 })
 ```
 
-There are broadly two ways of uploading to S3 in a browser. A server can generate a presigned URL for a [PUT upload](https://docs.aws.amazon.com/AmazonS3/latest/API/RESTObjectPUT.html), or a server can generate form data for a [POST upload](https://docs.aws.amazon.com/AmazonS3/latest/API/RESTObjectPOST.html). Uppy-server uses a POST upload. See [POST Uploads](#post-uploads) for some caveats if you would like to use POST uploads without uppy-server. See [Generating a presigned upload URL server-side](#example-presigned-url) for an example of a PUT upload.
+There are broadly two ways of uploading to S3 in a browser. A server can generate a presigned URL for a [PUT upload](https://docs.aws.amazon.com/AmazonS3/latest/API/RESTObjectPUT.html), or a server can generate form data for a [POST upload](https://docs.aws.amazon.com/AmazonS3/latest/API/RESTObjectPOST.html). Uppy Companion uses a POST upload. See [POST Uploads](#post-uploads) for some caveats if you would like to use POST uploads without Uppy Companion. See [Generating a presigned upload URL server-side](#example-presigned-url) for an example of a PUT upload.
 
 There is also a separate plugin for S3 Multipart uploads. Multipart in this sense refers to Amazon's proprietary chunked, resumable upload mechanism for large files. See the [`@uppy/aws-s3-multipart`](/docs/aws-s3-multipart) documentation.
 
@@ -50,17 +50,17 @@ A unique identifier for this plugin. Defaults to `'AwsS3'`.
 
 ### `serverUrl`
 
-When using [uppy-server][uppy-server docs] to sign S3 uploads, set this option to the root URL of the uppy-server.
+When using [Uppy Companion][companion docs] to sign S3 uploads, set this option to the root URL of the Companion instance.
 
 ```js
 uppy.use(AwsS3, {
-  serverUrl: 'https://uppy-server.my-app.com/'
+  serverUrl: 'https://uppy-companion.my-app.com/'
 })
 ```
 
 ### `getUploadParameters(file)`
 
-> Note: When using [uppy-server][uppy-server docs] to sign S3 uploads, do not define this option.
+> Note: When using [Uppy Companion][companion docs] to sign S3 uploads, do not define this option.
 
 A function that returns upload parameters for a file.
 Parameters should be returned as an object, or a Promise for an object, with keys `{ method, url, fields, headers }`.
@@ -137,7 +137,7 @@ At minimum, the domain from which the uploads will happen must be whitelisted, a
 <MaxAgeSeconds>3000</MaxAgeSeconds>
 ```
 
-When using uppy-server, which generates a POST policy document, the following permissions must be granted:
+When using Uppy Companion, which generates a POST policy document, the following permissions must be granted:
 
 ```xml
 <AllowedMethod>POST</AllowedMethod>
@@ -180,7 +180,7 @@ In-depth documentation about CORS rules is available on the [AWS documentation s
 
 ## POST uploads
 
-uppy-server uses POST uploads by default, but you can also use them with your own endpoints. There are a few things to be aware of when doing so:
+Uppy Companion uses POST uploads by default, but you can also use them with your own endpoints. There are a few things to be aware of when doing so:
 
  - The `@uppy/aws-s3` plugin attempts to read the `<Location>` XML tag from POST upload responses. S3 does not respond with an XML document by default. When generating the form data for POST uploads, you must set the `success_action_status` field to `201`.
    ```js
@@ -196,7 +196,7 @@ uppy-server uses POST uploads by default, but you can also use them with your ow
 
 ## S3 alternatives
 
-Many other object storage providers have an identical API to S3, so you can use the `@uppy/aws-s3` plugin with them as well. To use them with Uppy Server, you can set the `UPPYSERVER_AWS_ENDPOINT` variable to the endpoint of your preferred service.
+Many other object storage providers have an identical API to S3, so you can use the `@uppy/aws-s3` plugin with them as well. To use them with Uppy Companion, you can set the `UPPYSERVER_AWS_ENDPOINT` variable to the endpoint of your preferred service.
 
 ### DigitalOcean Spaces
 
@@ -213,7 +213,7 @@ For a working example that you can run and play around with, see the [digitaloce
 
 ### Google Cloud Storage
 
-For Google Cloud Storage, you need to take a few more steps. For the `@uppy/aws-s3` plugin to be able to upload to a GCS bucket, it needs the Interoperability setting enabled. You can enable the Interoperability setting and [generate interoperable storage access keys](https://cloud.google.com/storage/docs/migrating#keys) by going to [Google Cloud Storage](https://console.cloud.google.com/storage) » Settings » Interoperability. Then set the environment variables for Uppy Server like this:
+For Google Cloud Storage, you need to take a few more steps. For the `@uppy/aws-s3` plugin to be able to upload to a GCS bucket, it needs the Interoperability setting enabled. You can enable the Interoperability setting and [generate interoperable storage access keys](https://cloud.google.com/storage/docs/migrating#keys) by going to [Google Cloud Storage](https://console.cloud.google.com/storage) » Settings » Interoperability. Then set the environment variables for Uppy Companion like this:
 
 ```bash
 export UPPYSERVER_AWS_ENDPOINT="https://storage.googleapis.com"
@@ -322,4 +322,4 @@ uppy.on('upload-success', (file, data) => {
 })
 ```
 
-[uppy-server docs]: /docs/server/index.html
+[companion docs]: /docs/companion

website/src/docs/dropbox.md

@@ -8,7 +8,7 @@ permalink: docs/dropbox/
 
 The `@uppy/dropbox` plugin lets users import files from their Dropbox account.
 
-An Uppy Server instance is required for the Dropbox plugin to work. Uppy Server handles authentication with Dropbox, downloads the files, and uploads them to the destination. This saves the user bandwidth, especially helpful if they are on a mobile connection.
+An Uppy Companion instance is required for the Dropbox plugin to work. Uppy Companion handles authentication with Dropbox, downloads the files, and uploads them to the destination. This saves the user bandwidth, especially helpful if they are on a mobile connection.
 
 ```js
 const Dropbox = require('@uppy/dropbox')
@@ -43,7 +43,7 @@ The `@uppy/dropbox` plugin has the following configurable options:
 ```js
 uppy.use(Dropbox, {
   target: Dashboard,
-  serverUrl: 'https://server.uppy.io/',
+  serverUrl: 'https://companion.uppy.io/',
 })
 ```
 
@@ -61,11 +61,11 @@ DOM element, CSS selector, or plugin to mount the Dropbox provider into. This sh
 
 ### `serverUrl: null`
 
-URL to an [Uppy Server](/docs/server) instance.
+URL to an [Uppy Companion](/docs/companion) instance.
 
 ### `serverHeaders: {}`
 
-Custom headers that should be sent along to [Uppy Server](/docs/server) on every request.
+Custom headers that should be sent along to [Uppy Companion](/docs/companion) on every request.
 
 ### `serverPattern: serverUrl`
 
@@ -73,7 +73,7 @@ The valid and authorised URL(s) from which OAuth responses should be accepted.
 
 This value can be a `String`, a `Regex` pattern, or an `Array` of both.
 
-This is useful when you have your [Uppy Server](/docs/server) running on multiple hosts. Otherwise, the default value should do just fine.
+This is useful when you have your [Uppy Companion](/docs/companion) running on multiple hosts. Otherwise, the default value should do just fine.
 
 ### `locale: {}`
 

website/src/docs/google-drive.md

@@ -8,7 +8,7 @@ permalink: docs/google-drive/
 
 The `@uppy/google-drive` plugin lets users import files from their Google Drive account.
 
-An Uppy Server instance is required for the `@uppy/google-drive` plugin to work. Uppy Server handles authentication with Google, downloads files from the Drive and uploads them to the destination. This saves the user bandwidth, especially helpful if they are on a mobile connection.
+An Uppy Companion instance is required for the `@uppy/google-drive` plugin to work. Uppy Companion handles authentication with Google, downloads files from the Drive and uploads them to the destination. This saves the user bandwidth, especially helpful if they are on a mobile connection.
 
 ```js
 const GoogleDrive = require('@uppy/google-drive')
@@ -43,7 +43,7 @@ The `@uppy/google-drive` plugin has the following configurable options:
 ```js
 uppy.use(GoogleDrive, {
   target: Dashboard,
-  serverUrl: 'https://server.uppy.io/',
+  serverUrl: 'https://companion.uppy.io/',
 })
 ```
 
@@ -61,11 +61,11 @@ DOM element, CSS selector, or plugin to mount the Google Drive provider into. Th
 
 ### `serverUrl: null`
 
-URL to an [Uppy Server](/docs/server) instance.
+URL to an [Uppy Companion](/docs/companion) instance.
 
 ### `serverHeaders: {}`
 
-Custom headers that should be sent along to [Uppy Server](/docs/server) on every request.
+Custom headers that should be sent along to [Uppy Companion](/docs/companion) on every request.
 
 ### `serverPattern: serverUrl`
 
@@ -73,7 +73,7 @@ The valid and authorised URL(s) from which OAuth responses should be accepted.
 
 This value can be a `String`, a `Regex` pattern, or an `Array` of both.
 
-This is useful when you have your [Uppy Server](/docs/server) running on multiple hosts. Otherwise, the default value should be good enough.
+This is useful when you have your [Uppy Companion](/docs/companion) running on multiple hosts. Otherwise, the default value should be good enough.
 
 ### `locale: {}`
 

website/src/docs/index.md

@@ -35,11 +35,11 @@ uppy.on('complete', (result) => {
 
 Drag and drop, webcam, basic file manipulation (adding metadata), uploading via tus-resumable uploads or XHR/Multipart is all possible using just the Uppy client module.
 
-Adding [Uppy Server](/docs/server/) to the mix enables remote sources such as Instagram, Google Drive, Dropbox, and remote URLs. Uploads from remote sources are handled server-to-server, so a 5 GB video won’t be eating into your mobile data plan. Files are removed from Uppy Server after an upload is complete, or after a reasonable timeout. Access tokens also don’t stick around for long, for security reasons.
+Adding [Uppy Companion](/docs/companion/) to the mix enables remote sources such as Instagram, Google Drive, Dropbox, and remote URLs. Uploads from remote sources are handled server-to-server, so a 5 GB video won’t be eating into your mobile data plan. Files are removed from Uppy Companion after an upload is complete, or after a reasonable timeout. Access tokens also don’t stick around for long, for security reasons.
 
 ## Installation
 
-Uppy can be used with a module bundler such as [Webpack](http://webpack.github.io/) or [Browserify](http://browserify.org/), or by including it in a script tag.
+Uppy can be used with a module bundler such as [Webpack](http://webpack.js.org/) or [Browserify](http://browserify.org/), or by including it in a script tag.
 
 > You may need polyfills if your application supports Internet Explorer or other older browsers. See [Browser Support](#browser-support).
 

website/src/docs/instagram.md

@@ -8,7 +8,7 @@ permalink: docs/instagram/
 
 The `@uppy/instagram` plugin lets users import files from their Instagram account.
 
-An Uppy Server instance is required for the `@uppy/instagram` plugin to work. Uppy Server handles authentication with Instagram, downloads the pictures and videos, and uploads them to the destination. This saves the user bandwidth, especially helpful if they are on a mobile connection.
+An Uppy Companion instance is required for the `@uppy/instagram` plugin to work. Uppy Companion handles authentication with Instagram, downloads the pictures and videos, and uploads them to the destination. This saves the user bandwidth, especially helpful if they are on a mobile connection.
 
 ```js
 const Instagram = require('@uppy/instagram')
@@ -45,7 +45,7 @@ The `@uppy/instagram` plugin has the following configurable options:
 ```js
 uppy.use(Instagram, {
   target: Dashboard,
-  serverUrl: 'https://server.uppy.io/',
+  serverUrl: 'https://companion.uppy.io/',
 })
 ```
 
@@ -63,11 +63,11 @@ DOM element, CSS selector, or plugin to mount the Instagram provider into. This
 
 ### `serverUrl: null`
 
-URL to an [Uppy Server](/docs/server) instance.
+URL to an [Uppy Companion](/docs/companion) instance.
 
 ### `serverHeaders: {}`
 
-Custom headers that should be sent along to [Uppy Server](/docs/server) on every request.
+Custom headers that should be sent along to [Uppy Companion](/docs/companion) on every request.
 
 ### `serverPattern: serverUrl`
 
@@ -75,7 +75,7 @@ The valid and authorised URL(s) from which OAuth responses should be accepted.
 
 This value can be a `String`, a `Regex` pattern, or an `Array` of both.
 
-This is useful when you have your [Uppy Server](/docs/server) running on multiple hosts. Otherwise, the default value should be good enough.
+This is useful when you have your [Uppy Companion](/docs/companion) running on multiple hosts. Otherwise, the default value should be good enough.
 
 ### `locale: {}`
 

website/src/docs/plugins.md

@@ -12,7 +12,7 @@ Plugins are what makes Uppy useful: they help select, manipulate and upload file
   - [@uppy/drag-drop](/docs/drag-drop) — plain and simple drag-and-drop area
   - [@uppy/file-input](/docs/file-input) — even more plain and simple, just a button
   - [@uppy/webcam](/docs/webcam) — upload selfies or audio / video recordings
-- **[Remote Providers](/docs/providers):** (remote sources that work through [Uppy Server](/docs/server/))
+- **[Remote Providers](/docs/providers):** (remote sources that work through [Uppy Companion](/docs/companion/))
   - [@uppy/dropbox](/docs/dropbox) – import files from Dropbox
   - [@uppy/google-drive](/docs/google-drive) – import files from Google Drive
   - [@uppy/instagram](/docs/instagram) – import files from Instagram

website/src/docs/uppy.md

@@ -200,7 +200,7 @@ locale: {
     },
     exceedsSize: 'This file exceeds maximum allowed size of',
     youCanOnlyUploadFileTypes: 'You can only upload:',
-    uppyServerError: 'Connection with Uppy Server failed'
+    uppyServerError: 'Connection with Uppy Companion failed'
   }
 }
 ```

website/src/docs/url.md

@@ -8,7 +8,7 @@ permalink: docs/url/
 
 The `@uppy/url` plugin allows users to import files from the internet. Paste any URL and it will be added!
 
-An Uppy Server instance is required for the `@uppy/url` plugin to work. Uppy Server will download the files and upload them to their destination. This saves bandwidth for the user (especially on mobile connections) and helps to avoid CORS restrictions.
+An Uppy Companion instance is required for the `@uppy/url` plugin to work. Uppy Companion will download the files and upload them to their destination. This saves bandwidth for the user (especially on mobile connections) and helps to avoid CORS restrictions.
 
 ```js
 const Url = require('@uppy/url')
@@ -43,7 +43,7 @@ The `@uppy/url` plugin has the following configurable options:
 ```js
 uppy.use(Url, {
   target: Dashboard,
-  serverUrl: 'https://server.uppy.io/',
+  serverUrl: 'https://companion.uppy.io/',
   locale: {}
 })
 ```
@@ -62,7 +62,7 @@ DOM element, CSS selector, or plugin to mount the URL provider into. This should
 
 ### `serverUrl: null`
 
-URL to an Uppy Server instance.
+URL to an Uppy Companion instance.
 
 ### `locale: {}`
 
@@ -76,8 +76,8 @@ strings: {
   import: 'Import',
   // Placeholder text for the URL input.
   enterUrlToImport: 'Enter URL to import a file',
-  // Error message shown if Uppy Server could not load a URL.
-  failedToFetch: 'Uppy Server failed to fetch this URL, please make sure it’s correct',
+  // Error message shown if Uppy Companion could not load a URL.
+  failedToFetch: 'Uppy Companion failed to fetch this URL, please make sure it’s correct',
   // Error message shown if the input does not look like a URL.
   enterCorrectUrl: 'Incorrect URL: Please make sure you are entering a direct link to a file'
 }

website/src/docs/xhrupload.md

@@ -136,7 +136,7 @@ getResponseData (responseText, response) {
 
 The `responseText` is the XHR endpoint response as a string. For uploads from the user's device, `response` is the [XMLHttpRequest](https://developer.mozilla.org/en-US/docs/Web/API/XMLHttpRequest) object.
 
-When uploading files from remote providers such as Dropbox or Instagram, Uppy Server sends upload response data to the client. This is made available in the `getResponseData()` function as well. The `response` object from Uppy Server contains some properties named after their [XMLHttpRequest](https://developer.mozilla.org/en-US/docs/Web/API/XMLHttpRequest) counterparts:
+When uploading files from remote providers such as Dropbox or Instagram, Uppy Companion sends upload response data to the client. This is made available in the `getResponseData()` function as well. The `response` object from Uppy Companion contains some properties named after their [XMLHttpRequest](https://developer.mozilla.org/en-US/docs/Web/API/XMLHttpRequest) counterparts:
 
  - `response.responseText` - the XHR endpoint response as a string;
  - `response.status` - the HTTP status code;

website/src/examples/transloadit/index.ejs

@@ -6,7 +6,7 @@ order: 5
 ---
 
 {% blockquote %}
-Transloadit is the inventor of <a href="https://tus.io" rel="noreferrer noopener" target="_blank">tus.io</a> and Uppy. Besides a robust encoding platform, Transloadit offers hosted versions of tusd and Uppy Server. This means you can enjoy video encoding, watermarking, face detection, resumable file uploads, fetching from Instagram, etc — all without running a single server yourself.
+Transloadit is the inventor of <a href="https://tus.io" rel="noreferrer noopener" target="_blank">tus.io</a> and Uppy. Besides a robust encoding platform, Transloadit offers hosted versions of tusd and Uppy Companion. This means you can enjoy video encoding, watermarking, face detection, resumable file uploads, fetching from Instagram, etc — all without running a single server yourself.
 
 This example demonstrates how to unlock Transloadit’s features within Uppy.
 {% endblockquote %}