rename 'server-utils' to 'companion-client'

bin/build-lib.js

@@ -11,7 +11,7 @@ const writeFile = promisify(fs.writeFile)
 
 const SOURCE = 'packages/{*,@uppy/*}/src/**/*.js'
 // Files not to build (such as tests)
-const IGNORE = /\.test\.js$|__mocks__|companion/
+const IGNORE = /\.test\.js$|__mocks__|companion\//
 
 async function buildLib () {
   const files = await glob(SOURCE)

examples/custom-provider/client/MyCustomProvider.js

@@ -1,5 +1,5 @@
 const { Plugin } = require('@uppy/core')
-const { Provider } = require('@uppy/server-utils')
+const { Provider } = require('@uppy/companion-client')
 const ProviderViews = require('@uppy/provider-views')
 const { h } = require('preact')
 

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

@@ -24,7 +24,7 @@
     "url": "git+https://github.com/transloadit/uppy.git"
   },
   "dependencies": {
-    "@uppy/server-utils": "0.26.0",
+    "@uppy/companion-client": "0.26.0",
     "@uppy/utils": "0.26.0",
     "resolve-url": "^0.2.1"
   },

packages/@uppy/aws-s3-multipart/src/index.js

@@ -1,5 +1,5 @@
 const { Plugin } = require('@uppy/core')
-const { Socket, RequestClient } = require('@uppy/server-utils')
+const { Socket, RequestClient } = require('@uppy/companion-client')
 const emitSocketProgress = require('@uppy/utils/lib/emitSocketProgress')
 const getSocketHost = require('@uppy/utils/lib/getSocketHost')
 const limitPromises = require('@uppy/utils/lib/limitPromises')

packages/@uppy/companion-client/README.md

@@ -1,8 +1,8 @@
-# @uppy/server-utils
+# @uppy/companion-client
 
 <img src="https://uppy.io/images/logos/uppy-dog-head-arrow.svg" width="120" alt="Uppy logo: a superman puppy in a pink suit" align="right">
 
-<a href="https://www.npmjs.com/package/@uppy/server-utils"><img src="https://img.shields.io/npm/v/@uppy/server-utils.svg?style=flat-square"></a>
+<a href="https://www.npmjs.com/package/@uppy/companion-client"><img src="https://img.shields.io/npm/v/@uppy/companion-client.svg?style=flat-square"></a>
 <a href="https://travis-ci.org/transloadit/uppy"><img src="https://img.shields.io/travis/transloadit/uppy/master.svg?style=flat-square" alt="Build Status"></a>
 
 Client library for communication with Uppy Server. Intended for use in Uppy plugins.
@@ -13,7 +13,7 @@ Uppy is being developed by the folks at [Transloadit](https://transloadit.com),
 
 ```js
 const Uppy = require('@uppy/core')
-const { Provider, RequestClient, Socket } = require('@uppy/server-utils')
+const { Provider, RequestClient, Socket } = require('@uppy/companion-client')
 
 const uppy = Uppy()
 
@@ -35,7 +35,7 @@ socket.on('progress', () => {})
 > Unless you are writing a custom provider plugin, you do not need to install this.
 
 ```bash
-$ npm install @uppy/server-utils --save
+$ npm install @uppy/companion-client --save
 ```
 
 <!-- Undocumented currently

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

@@ -1,5 +1,5 @@
 {
-  "name": "@uppy/server-utils",
+  "name": "@uppy/companion-client",
   "description": "Client library for communication with Uppy Server. Intended for use in Uppy plugins.",
   "version": "0.26.0",
   "license": "MIT",

packages/@uppy/dropbox/package.json

@@ -22,7 +22,7 @@
   },
   "dependencies": {
     "@uppy/provider-views": "0.26.0",
-    "@uppy/server-utils": "0.26.0",
+    "@uppy/companion-client": "0.26.0",
     "@uppy/utils": "0.26.0",
     "preact": "^8.2.9"
   },

packages/@uppy/dropbox/src/index.js

@@ -1,5 +1,5 @@
 const { Plugin } = require('@uppy/core')
-const { Provider } = require('@uppy/server-utils')
+const { Provider } = require('@uppy/companion-client')
 const ProviderViews = require('@uppy/provider-views')
 const icons = require('./icons')
 const { h } = require('preact')

packages/@uppy/dropbox/types/index.d.ts

@@ -1,5 +1,5 @@
 import { Plugin, PluginOptions, Uppy } from '@uppy/core';
-import { ProviderOptions } from '@uppy/server-utils';
+import { ProviderOptions } from '@uppy/companion-client';
 
 export interface DropboxOptions extends PluginOptions, ProviderOptions {
   serverUrl: string;

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

@@ -23,7 +23,7 @@
   },
   "dependencies": {
     "@uppy/provider-views": "0.26.0",
-    "@uppy/server-utils": "0.26.0",
+    "@uppy/companion-client": "0.26.0",
     "@uppy/utils": "0.26.0",
     "preact": "^8.2.9"
   },

packages/@uppy/google-drive/src/index.js

@@ -1,5 +1,5 @@
 const { Plugin } = require('@uppy/core')
-const { Provider } = require('@uppy/server-utils')
+const { Provider } = require('@uppy/companion-client')
 const ProviderViews = require('@uppy/provider-views')
 const { h } = require('preact')
 

packages/@uppy/google-drive/types/index.d.ts

@@ -1,5 +1,5 @@
 import { Plugin, PluginOptions, Uppy } from '@uppy/core';
-import { ProviderOptions } from '@uppy/server-utils';
+import { ProviderOptions } from '@uppy/companion-client';
 
 export interface GoogleDriveOptions extends PluginOptions, ProviderOptions {
   serverUrl: string;

packages/@uppy/instagram/package.json

@@ -25,7 +25,7 @@
   },
   "dependencies": {
     "@uppy/provider-views": "0.26.0",
-    "@uppy/server-utils": "0.26.0",
+    "@uppy/companion-client": "0.26.0",
     "@uppy/utils": "0.26.0",
     "preact": "^8.2.9"
   },

packages/@uppy/instagram/src/index.js

@@ -1,5 +1,5 @@
 const { Plugin } = require('@uppy/core')
-const { Provider } = require('@uppy/server-utils')
+const { Provider } = require('@uppy/companion-client')
 const ProviderViews = require('@uppy/provider-views')
 const { h } = require('preact')
 

packages/@uppy/instagram/types/index.d.ts

@@ -1,5 +1,5 @@
 import { Plugin, PluginOptions, Uppy } from '@uppy/core';
-import { ProviderOptions } from '@uppy/server-utils';
+import { ProviderOptions } from '@uppy/companion-client';
 
 export interface InstagramOptions extends PluginOptions, ProviderOptions {
   serverUrl: string;

packages/@uppy/transloadit/package.json

@@ -29,7 +29,7 @@
   },
   "dependencies": {
     "@uppy/provider-views": "0.26.0",
-    "@uppy/server-utils": "0.26.0",
+    "@uppy/companion-client": "0.26.0",
     "@uppy/tus": "0.26.0",
     "@uppy/utils": "0.26.0",
     "namespace-emitter": "^2.0.1",

packages/@uppy/tus/package.json

@@ -23,7 +23,7 @@
     "url": "git+https://github.com/transloadit/uppy.git"
   },
   "dependencies": {
-    "@uppy/server-utils": "0.26.0",
+    "@uppy/companion-client": "0.26.0",
     "@uppy/utils": "0.26.0",
     "tus-js-client": "^1.5.1"
   },

packages/@uppy/tus/src/index.js

@@ -1,6 +1,6 @@
 const { Plugin } = require('@uppy/core')
 const tus = require('tus-js-client')
-const { Provider, RequestClient, Socket } = require('@uppy/server-utils')
+const { Provider, RequestClient, Socket } = require('@uppy/companion-client')
 const emitSocketProgress = require('@uppy/utils/lib/emitSocketProgress')
 const getSocketHost = require('@uppy/utils/lib/getSocketHost')
 const settle = require('@uppy/utils/lib/settle')

packages/@uppy/url/package.json

@@ -23,7 +23,7 @@
     "url": "git+https://github.com/transloadit/uppy.git"
   },
   "dependencies": {
-    "@uppy/server-utils": "0.26.0",
+    "@uppy/companion-client": "0.26.0",
     "@uppy/utils": "0.26.0",
     "preact": "^8.2.9"
   },

packages/@uppy/url/src/index.js

@@ -1,7 +1,7 @@
 const { Plugin } = require('@uppy/core')
 const Translator = require('@uppy/utils/lib/Translator')
 const { h } = require('preact')
-const { RequestClient } = require('@uppy/server-utils')
+const { RequestClient } = require('@uppy/companion-client')
 const UrlUI = require('./UrlUI.js')
 const toArray = require('@uppy/utils/lib/toArray')
 

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

@@ -25,7 +25,7 @@
     "url": "git+https://github.com/transloadit/uppy.git"
   },
   "dependencies": {
-    "@uppy/server-utils": "0.26.0",
+    "@uppy/companion-client": "0.26.0",
     "@uppy/utils": "0.26.0",
     "cuid": "^2.1.1"
   },

packages/@uppy/xhr-upload/src/index.js

@@ -1,7 +1,7 @@
 const { Plugin } = require('@uppy/core')
 const cuid = require('cuid')
 const Translator = require('@uppy/utils/lib/Translator')
-const { Provider, Socket } = require('@uppy/server-utils')
+const { Provider, Socket } = require('@uppy/companion-client')
 const emitSocketProgress = require('@uppy/utils/lib/emitSocketProgress')
 const getSocketHost = require('@uppy/utils/lib/getSocketHost')
 const settle = require('@uppy/utils/lib/settle')

packages/uppy/index.js

@@ -2,7 +2,7 @@
 exports.Core = require('@uppy/core')
 
 // Utilities
-exports.server = require('@uppy/server-utils')
+exports.server = require('@uppy/companion-client')
 exports.views = {
   ProviderView: require('@uppy/provider-views')
 }

packages/uppy/index.mjs

@@ -2,7 +2,7 @@
 export { default as Core } from '@uppy/core'
 
 // Utilities
-export { default as server } from '@uppy/server-utils'
+export { default as server } from '@uppy/companion-client'
 import ProviderView from '@uppy/provider-views'
 export var views = { ProviderView: ProviderView }
 

packages/uppy/package.json

@@ -45,7 +45,7 @@
     "@uppy/progress-bar": "0.26.0",
     "@uppy/provider-views": "0.26.0",
     "@uppy/redux-dev-tools": "0.26.0",
-    "@uppy/server-utils": "0.26.0",
+    "@uppy/companion-client": "0.26.0",
     "@uppy/status-bar": "0.26.0",
     "@uppy/store-default": "0.26.0",
     "@uppy/store-redux": "0.26.0",