Kaynağa Gözat

Move `utils` files to `@uppy/utils` package.

And rewrite all the require calls.

```bash
git mv src/utils/* packages/@uppy/utils/src
sed -i 's/[./]*\/utils\//@uppy\/utils\/lib\//' src/**/*.js # transform (../)*utils → @uppy/utils
```
Renée Kooi 6 yıl önce
ebeveyn
işleme
2e257b7e55
71 değiştirilmiş dosya ile 42 ekleme ve 40 silme
  1. 3 1
      packages/@uppy/utils/package.json
  2. 0 0
      packages/@uppy/utils/src/canvasToBlob.js
  3. 0 0
      packages/@uppy/utils/src/copyToClipboard.js
  4. 0 0
      packages/@uppy/utils/src/copyToClipboard.test.js
  5. 0 0
      packages/@uppy/utils/src/dataURItoBlob.js
  6. 0 0
      packages/@uppy/utils/src/dataURItoBlob.test.js
  7. 0 0
      packages/@uppy/utils/src/dataURItoFile.js
  8. 0 0
      packages/@uppy/utils/src/dataURItoFile.test.js
  9. 0 0
      packages/@uppy/utils/src/emitSocketProgress.js
  10. 0 0
      packages/@uppy/utils/src/findAllDOMElements.js
  11. 0 0
      packages/@uppy/utils/src/findDOMElement.js
  12. 0 0
      packages/@uppy/utils/src/generateFileID.js
  13. 0 0
      packages/@uppy/utils/src/generateFileID.test.js
  14. 0 0
      packages/@uppy/utils/src/getArrayBuffer.js
  15. 0 0
      packages/@uppy/utils/src/getArrayBuffer.test.js
  16. 0 0
      packages/@uppy/utils/src/getBytesRemaining.js
  17. 0 0
      packages/@uppy/utils/src/getBytesRemaining.test.js
  18. 0 0
      packages/@uppy/utils/src/getETA.js
  19. 0 0
      packages/@uppy/utils/src/getETA.test.js
  20. 0 0
      packages/@uppy/utils/src/getFileNameAndExtension.js
  21. 0 0
      packages/@uppy/utils/src/getFileNameAndExtension.test.js
  22. 0 0
      packages/@uppy/utils/src/getFileType.js
  23. 0 0
      packages/@uppy/utils/src/getFileType.test.js
  24. 0 0
      packages/@uppy/utils/src/getFileTypeExtension.js
  25. 0 0
      packages/@uppy/utils/src/getFileTypeExtension.test.js
  26. 0 0
      packages/@uppy/utils/src/getSocketHost.js
  27. 0 0
      packages/@uppy/utils/src/getSocketHost.test.js
  28. 0 0
      packages/@uppy/utils/src/getSpeed.js
  29. 0 0
      packages/@uppy/utils/src/getSpeed.test.js
  30. 0 0
      packages/@uppy/utils/src/getTimeStamp.js
  31. 0 0
      packages/@uppy/utils/src/isDOMElement.js
  32. 0 0
      packages/@uppy/utils/src/isObjectURL.js
  33. 0 0
      packages/@uppy/utils/src/isObjectURL.test.js
  34. 0 0
      packages/@uppy/utils/src/isPreviewSupported.js
  35. 0 0
      packages/@uppy/utils/src/isPreviewSupported.test.js
  36. 0 0
      packages/@uppy/utils/src/isTouchDevice.js
  37. 0 0
      packages/@uppy/utils/src/isTouchDevice.test.js
  38. 0 0
      packages/@uppy/utils/src/limitPromises.js
  39. 0 0
      packages/@uppy/utils/src/limitPromises.test.js
  40. 0 0
      packages/@uppy/utils/src/mimeTypes.js
  41. 0 0
      packages/@uppy/utils/src/prettyETA.js
  42. 0 0
      packages/@uppy/utils/src/prettyETA.test.js
  43. 0 0
      packages/@uppy/utils/src/runPromiseSequence.js
  44. 0 0
      packages/@uppy/utils/src/runPromiseSequence.test.js
  45. 0 0
      packages/@uppy/utils/src/sampleImageDataURI.js
  46. 0 0
      packages/@uppy/utils/src/secondsToTime.js
  47. 0 0
      packages/@uppy/utils/src/secondsToTime.test.js
  48. 0 0
      packages/@uppy/utils/src/settle.js
  49. 0 0
      packages/@uppy/utils/src/settle.test.js
  50. 0 0
      packages/@uppy/utils/src/toArray.js
  51. 0 0
      packages/@uppy/utils/src/toArray.test.js
  52. 0 0
      packages/@uppy/utils/src/truncateString.js
  53. 0 0
      packages/@uppy/utils/src/truncateString.test.js
  54. 5 5
      src/core/Core.js
  55. 1 1
      src/core/Core.test.js
  56. 1 1
      src/core/Plugin.js
  57. 3 3
      src/plugins/AwsS3/Multipart.js
  58. 1 1
      src/plugins/AwsS3/index.js
  59. 1 1
      src/plugins/Dashboard/Dashboard.js
  60. 3 3
      src/plugins/Dashboard/FileItem.js
  61. 2 2
      src/plugins/Dashboard/index.js
  62. 1 1
      src/plugins/DragDrop/index.js
  63. 1 1
      src/plugins/FileInput.js
  64. 1 1
      src/plugins/Form.js
  65. 3 3
      src/plugins/StatusBar/index.js
  66. 2 2
      src/plugins/ThumbnailGenerator/index.js
  67. 4 4
      src/plugins/Tus.js
  68. 1 1
      src/plugins/Url/index.js
  69. 2 2
      src/plugins/Webcam/index.js
  70. 4 4
      src/plugins/XHRUpload.js
  71. 3 3
      src/views/ProviderView/index.js

+ 3 - 1
packages/@uppy/utils/package.json

@@ -18,5 +18,7 @@
     "type": "git",
     "url": "git+https://github.com/transloadit/uppy.git"
   },
-  "dependencies": {}
+  "dependencies": {
+    "lodash.throttle": "^4.1.1"
+  }
 }

+ 0 - 0
src/utils/canvasToBlob.js → packages/@uppy/utils/src/canvasToBlob.js


+ 0 - 0
src/utils/copyToClipboard.js → packages/@uppy/utils/src/copyToClipboard.js


+ 0 - 0
src/utils/copyToClipboard.test.js → packages/@uppy/utils/src/copyToClipboard.test.js


+ 0 - 0
src/utils/dataURItoBlob.js → packages/@uppy/utils/src/dataURItoBlob.js


+ 0 - 0
src/utils/dataURItoBlob.test.js → packages/@uppy/utils/src/dataURItoBlob.test.js


+ 0 - 0
src/utils/dataURItoFile.js → packages/@uppy/utils/src/dataURItoFile.js


+ 0 - 0
src/utils/dataURItoFile.test.js → packages/@uppy/utils/src/dataURItoFile.test.js


+ 0 - 0
src/utils/emitSocketProgress.js → packages/@uppy/utils/src/emitSocketProgress.js


+ 0 - 0
src/utils/findAllDOMElements.js → packages/@uppy/utils/src/findAllDOMElements.js


+ 0 - 0
src/utils/findDOMElement.js → packages/@uppy/utils/src/findDOMElement.js


+ 0 - 0
src/utils/generateFileID.js → packages/@uppy/utils/src/generateFileID.js


+ 0 - 0
src/utils/generateFileID.test.js → packages/@uppy/utils/src/generateFileID.test.js


+ 0 - 0
src/utils/getArrayBuffer.js → packages/@uppy/utils/src/getArrayBuffer.js


+ 0 - 0
src/utils/getArrayBuffer.test.js → packages/@uppy/utils/src/getArrayBuffer.test.js


+ 0 - 0
src/utils/getBytesRemaining.js → packages/@uppy/utils/src/getBytesRemaining.js


+ 0 - 0
src/utils/getBytesRemaining.test.js → packages/@uppy/utils/src/getBytesRemaining.test.js


+ 0 - 0
src/utils/getETA.js → packages/@uppy/utils/src/getETA.js


+ 0 - 0
src/utils/getETA.test.js → packages/@uppy/utils/src/getETA.test.js


+ 0 - 0
src/utils/getFileNameAndExtension.js → packages/@uppy/utils/src/getFileNameAndExtension.js


+ 0 - 0
src/utils/getFileNameAndExtension.test.js → packages/@uppy/utils/src/getFileNameAndExtension.test.js


+ 0 - 0
src/utils/getFileType.js → packages/@uppy/utils/src/getFileType.js


+ 0 - 0
src/utils/getFileType.test.js → packages/@uppy/utils/src/getFileType.test.js


+ 0 - 0
src/utils/getFileTypeExtension.js → packages/@uppy/utils/src/getFileTypeExtension.js


+ 0 - 0
src/utils/getFileTypeExtension.test.js → packages/@uppy/utils/src/getFileTypeExtension.test.js


+ 0 - 0
src/utils/getSocketHost.js → packages/@uppy/utils/src/getSocketHost.js


+ 0 - 0
src/utils/getSocketHost.test.js → packages/@uppy/utils/src/getSocketHost.test.js


+ 0 - 0
src/utils/getSpeed.js → packages/@uppy/utils/src/getSpeed.js


+ 0 - 0
src/utils/getSpeed.test.js → packages/@uppy/utils/src/getSpeed.test.js


+ 0 - 0
src/utils/getTimeStamp.js → packages/@uppy/utils/src/getTimeStamp.js


+ 0 - 0
src/utils/isDOMElement.js → packages/@uppy/utils/src/isDOMElement.js


+ 0 - 0
src/utils/isObjectURL.js → packages/@uppy/utils/src/isObjectURL.js


+ 0 - 0
src/utils/isObjectURL.test.js → packages/@uppy/utils/src/isObjectURL.test.js


+ 0 - 0
src/utils/isPreviewSupported.js → packages/@uppy/utils/src/isPreviewSupported.js


+ 0 - 0
src/utils/isPreviewSupported.test.js → packages/@uppy/utils/src/isPreviewSupported.test.js


+ 0 - 0
src/utils/isTouchDevice.js → packages/@uppy/utils/src/isTouchDevice.js


+ 0 - 0
src/utils/isTouchDevice.test.js → packages/@uppy/utils/src/isTouchDevice.test.js


+ 0 - 0
src/utils/limitPromises.js → packages/@uppy/utils/src/limitPromises.js


+ 0 - 0
src/utils/limitPromises.test.js → packages/@uppy/utils/src/limitPromises.test.js


+ 0 - 0
src/utils/mimeTypes.js → packages/@uppy/utils/src/mimeTypes.js


+ 0 - 0
src/utils/prettyETA.js → packages/@uppy/utils/src/prettyETA.js


+ 0 - 0
src/utils/prettyETA.test.js → packages/@uppy/utils/src/prettyETA.test.js


+ 0 - 0
src/utils/runPromiseSequence.js → packages/@uppy/utils/src/runPromiseSequence.js


+ 0 - 0
src/utils/runPromiseSequence.test.js → packages/@uppy/utils/src/runPromiseSequence.test.js


+ 0 - 0
src/utils/sampleImageDataURI.js → packages/@uppy/utils/src/sampleImageDataURI.js


+ 0 - 0
src/utils/secondsToTime.js → packages/@uppy/utils/src/secondsToTime.js


+ 0 - 0
src/utils/secondsToTime.test.js → packages/@uppy/utils/src/secondsToTime.test.js


+ 0 - 0
src/utils/settle.js → packages/@uppy/utils/src/settle.js


+ 0 - 0
src/utils/settle.test.js → packages/@uppy/utils/src/settle.test.js


+ 0 - 0
src/utils/toArray.js → packages/@uppy/utils/src/toArray.js


+ 0 - 0
src/utils/toArray.test.js → packages/@uppy/utils/src/toArray.test.js


+ 0 - 0
src/utils/truncateString.js → packages/@uppy/utils/src/truncateString.js


+ 0 - 0
src/utils/truncateString.test.js → packages/@uppy/utils/src/truncateString.test.js


+ 5 - 5
src/core/Core.js

@@ -5,11 +5,11 @@ const cuid = require('cuid')
 const prettyBytes = require('prettier-bytes')
 const match = require('mime-match')
 const DefaultStore = require('../store/DefaultStore')
-const getFileType = require('../utils/getFileType')
-const getFileNameAndExtension = require('../utils/getFileNameAndExtension')
-const generateFileID = require('../utils/generateFileID')
-const isObjectURL = require('../utils/isObjectURL')
-const getTimeStamp = require('../utils/getTimeStamp')
+const getFileType = require('@uppy/utils/lib/getFileType')
+const getFileNameAndExtension = require('@uppy/utils/lib/getFileNameAndExtension')
+const generateFileID = require('@uppy/utils/lib/generateFileID')
+const isObjectURL = require('@uppy/utils/lib/isObjectURL')
+const getTimeStamp = require('@uppy/utils/lib/getTimeStamp')
 
 /**
  * Uppy Core module.

+ 1 - 1
src/core/Core.test.js

@@ -11,7 +11,7 @@ const InvalidPluginWithoutType = require('../../test/mocks/invalidPluginWithoutT
 jest.mock('cuid', () => {
   return () => 'cjd09qwxb000dlql4tp4doz8h'
 })
-jest.mock('../utils/findDOMElement', () => {
+jest.mock('@uppy/utils/lib/findDOMElement', () => {
   return () => null
 })
 

+ 1 - 1
src/core/Plugin.js

@@ -1,5 +1,5 @@
 const preact = require('preact')
-const findDOMElement = require('../utils/findDOMElement')
+const findDOMElement = require('@uppy/utils/lib/findDOMElement')
 
 /**
  * Defer a frequent call to the microtask queue.

+ 3 - 3
src/plugins/AwsS3/Multipart.js

@@ -1,9 +1,9 @@
 const Plugin = require('../../core/Plugin')
 const RequestClient = require('../../server/RequestClient')
 const UppySocket = require('../../core/UppySocket')
-const emitSocketProgress = require('../../utils/emitSocketProgress')
-const getSocketHost = require('../../utils/getSocketHost')
-const limitPromises = require('../../utils/limitPromises')
+const emitSocketProgress = require('@uppy/utils/lib/emitSocketProgress')
+const getSocketHost = require('@uppy/utils/lib/getSocketHost')
+const limitPromises = require('@uppy/utils/lib/limitPromises')
 const Uploader = require('./MultipartUploader')
 
 /**

+ 1 - 1
src/plugins/AwsS3/index.js

@@ -1,7 +1,7 @@
 const resolveUrl = require('resolve-url')
 const Plugin = require('../../core/Plugin')
 const Translator = require('../../core/Translator')
-const limitPromises = require('../../utils/limitPromises')
+const limitPromises = require('@uppy/utils/lib/limitPromises')
 const XHRUpload = require('../XHRUpload')
 
 function isXml (xhr) {

+ 1 - 1
src/plugins/Dashboard/Dashboard.js

@@ -2,7 +2,7 @@ const FileList = require('./FileList')
 const Tabs = require('./Tabs')
 const FileCard = require('./FileCard')
 const classNames = require('classnames')
-const isTouchDevice = require('../../utils/isTouchDevice')
+const isTouchDevice = require('@uppy/utils/lib/isTouchDevice')
 const { h } = require('preact')
 
 // http://dev.edenspiekermann.com/2016/02/11/introducing-accessible-modal-dialog

+ 3 - 3
src/plugins/Dashboard/FileItem.js

@@ -1,6 +1,6 @@
-const getFileNameAndExtension = require('../../utils/getFileNameAndExtension')
-const truncateString = require('../../utils/truncateString')
-const copyToClipboard = require('../../utils/copyToClipboard')
+const getFileNameAndExtension = require('@uppy/utils/lib/getFileNameAndExtension')
+const truncateString = require('@uppy/utils/lib/truncateString')
+const copyToClipboard = require('@uppy/utils/lib/copyToClipboard')
 const prettyBytes = require('prettier-bytes')
 const FileItemProgress = require('./FileItemProgress')
 const getFileTypeIcon = require('./getFileTypeIcon')

+ 2 - 2
src/plugins/Dashboard/index.js

@@ -5,8 +5,8 @@ const DashboardUI = require('./Dashboard')
 const StatusBar = require('../StatusBar')
 const Informer = require('../Informer')
 const ThumbnailGenerator = require('../ThumbnailGenerator')
-const findAllDOMElements = require('../../utils/findAllDOMElements')
-const toArray = require('../../utils/toArray')
+const findAllDOMElements = require('@uppy/utils/lib/findAllDOMElements')
+const toArray = require('@uppy/utils/lib/toArray')
 const prettyBytes = require('prettier-bytes')
 const { defaultTabIcon } = require('./icons')
 

+ 1 - 1
src/plugins/DragDrop/index.js

@@ -1,6 +1,6 @@
 const Plugin = require('../../core/Plugin')
 const Translator = require('../../core/Translator')
-const toArray = require('../../utils/toArray')
+const toArray = require('@uppy/utils/lib/toArray')
 const dragDrop = require('drag-drop')
 const { h } = require('preact')
 

+ 1 - 1
src/plugins/FileInput.js

@@ -1,5 +1,5 @@
 const Plugin = require('../core/Plugin')
-const toArray = require('../utils/toArray')
+const toArray = require('@uppy/utils/lib/toArray')
 const Translator = require('../core/Translator')
 const { h } = require('preact')
 

+ 1 - 1
src/plugins/Form.js

@@ -1,5 +1,5 @@
 const Plugin = require('../core/Plugin')
-const findDOMElement = require('../utils/findDOMElement')
+const findDOMElement = require('@uppy/utils/lib/findDOMElement')
 // Rollup uses get-form-data's ES modules build, and rollup-plugin-commonjs automatically resolves `.default`.
 // So, if we are being built using rollup, this require() won't have a `.default` property.
 const getFormData = require('get-form-data').default || require('get-form-data')

+ 3 - 3
src/plugins/StatusBar/index.js

@@ -2,9 +2,9 @@ const Plugin = require('../../core/Plugin')
 const Translator = require('../../core/Translator')
 const StatusBarUI = require('./StatusBar')
 const statusBarStates = require('./StatusBarStates')
-const getSpeed = require('../../utils/getSpeed')
-const getBytesRemaining = require('../../utils/getBytesRemaining')
-const prettyETA = require('../../utils/prettyETA')
+const getSpeed = require('@uppy/utils/lib/getSpeed')
+const getBytesRemaining = require('@uppy/utils/lib/getBytesRemaining')
+const prettyETA = require('@uppy/utils/lib/prettyETA')
 const prettyBytes = require('prettier-bytes')
 
 /**

+ 2 - 2
src/plugins/ThumbnailGenerator/index.js

@@ -1,6 +1,6 @@
 const Plugin = require('../../core/Plugin')
-const dataURItoBlob = require('../../utils/dataURItoBlob')
-const isPreviewSupported = require('../../utils/isPreviewSupported')
+const dataURItoBlob = require('@uppy/utils/lib/dataURItoBlob')
+const isPreviewSupported = require('@uppy/utils/lib/isPreviewSupported')
 
 /**
  * The Thumbnail Generator plugin

+ 4 - 4
src/plugins/Tus.js

@@ -2,10 +2,10 @@ const Plugin = require('../core/Plugin')
 const tus = require('tus-js-client')
 const UppySocket = require('../core/UppySocket')
 const { Provider, RequestClient } = require('../server')
-const emitSocketProgress = require('../utils/emitSocketProgress')
-const getSocketHost = require('../utils/getSocketHost')
-const settle = require('../utils/settle')
-const limitPromises = require('../utils/limitPromises')
+const emitSocketProgress = require('@uppy/utils/lib/emitSocketProgress')
+const getSocketHost = require('@uppy/utils/lib/getSocketHost')
+const settle = require('@uppy/utils/lib/settle')
+const limitPromises = require('@uppy/utils/lib/limitPromises')
 require('whatwg-fetch')
 
 // Extracted from https://github.com/tus/tus-js-client/blob/master/lib/upload.js#L13

+ 1 - 1
src/plugins/Url/index.js

@@ -3,7 +3,7 @@ const Translator = require('../../core/Translator')
 const { h } = require('preact')
 const { RequestClient } = require('../../server')
 const UrlUI = require('./UrlUI.js')
-const toArray = require('../../utils/toArray')
+const toArray = require('@uppy/utils/lib/toArray')
 
 /**
  * Url

+ 2 - 2
src/plugins/Webcam/index.js

@@ -1,8 +1,8 @@
 const { h } = require('preact')
 const Plugin = require('../../core/Plugin')
 const Translator = require('../../core/Translator')
-const getFileTypeExtension = require('../../utils/getFileTypeExtension')
-const canvasToBlob = require('../../utils/canvasToBlob')
+const getFileTypeExtension = require('@uppy/utils/lib/getFileTypeExtension')
+const canvasToBlob = require('@uppy/utils/lib/canvasToBlob')
 const supportsMediaRecorder = require('./supportsMediaRecorder')
 const CameraIcon = require('./CameraIcon')
 const CameraScreen = require('./CameraScreen')

+ 4 - 4
src/plugins/XHRUpload.js

@@ -3,10 +3,10 @@ const cuid = require('cuid')
 const Translator = require('../core/Translator')
 const UppySocket = require('../core/UppySocket')
 const Provider = require('../server/Provider')
-const emitSocketProgress = require('../utils/emitSocketProgress')
-const getSocketHost = require('../utils/getSocketHost')
-const settle = require('../utils/settle')
-const limitPromises = require('../utils/limitPromises')
+const emitSocketProgress = require('@uppy/utils/lib/emitSocketProgress')
+const getSocketHost = require('@uppy/utils/lib/getSocketHost')
+const settle = require('@uppy/utils/lib/settle')
+const limitPromises = require('@uppy/utils/lib/limitPromises')
 
 function buildResponseError (xhr, error) {
   // No error message

+ 3 - 3
src/views/ProviderView/index.js

@@ -2,9 +2,9 @@ const { h, Component } = require('preact')
 const AuthView = require('./AuthView')
 const Browser = require('./Browser')
 const LoaderView = require('./Loader')
-const generateFileID = require('../../utils/generateFileID')
-const getFileType = require('../../utils/getFileType')
-const isPreviewSupported = require('../../utils/isPreviewSupported')
+const generateFileID = require('@uppy/utils/lib/generateFileID')
+const getFileType = require('@uppy/utils/lib/getFileType')
+const isPreviewSupported = require('@uppy/utils/lib/isPreviewSupported')
 
 /**
  * Array.prototype.findIndex ponyfill for old browsers.