Home Explore Help
Sign In
biheng
/
uppy
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Merge branch 'master' of https://github.com/transloadit/uppy

Artur Paikin 7 years ago
parent
179bdf7f84 30b48048f7
commit
b0cac891a7
13 changed files with 55 additions and 21 deletions
Split View Show Diff Stats
  1. 3 3
      README.md
  2. 1 1
      bin/upload-to-cdn.sh
  3. 7 3
      examples/aws-uppy-server/server.js
  4. 2 2
      examples/cdn-example/index.html
  5. 2 2
      examples/uppy-with-server/client/index.html
  6. 1 1
      package-lock.json
  7. 1 1
      package.json
  8. 0 2
      src/core/Core.js
  9. 15 0
      src/core/Core.test.js
  10. 17 0
      src/plugins/AwsS3/index.js
  11. 2 2
      website/src/docs/index.md
  12. 2 2
      website/src/examples/i18n/app.html
  13. 2 2
      website/themes/uppy/layout/index.ejs

+ 3 - 3
README.md
View File 

@@ -64,7 +64,7 @@ $ npm install uppy --save
 
 
 We recommend installing from npm and then using a module bundler such as [Webpack](http://webpack.github.io/), [Browserify](http://browserify.org/) or [Rollup.js](http://rollupjs.org/).
 
 
-Add CSS [uppy.min.css](https://transloadit.edgly.net/releases/uppy/v0.23.1/dist/uppy.min.css), either to `<head>` of your HTML page 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://transloadit.edgly.net/releases/uppy/v0.23.2/dist/uppy.min.css), either to `<head>` of your HTML page 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.
 
 
@@ -73,12 +73,12 @@ Alternatively, you can also use a pre-built bundle from Transloadit's CDN: Edgly
 
 1\. Add a script to the bottom of `<body>`:
 
 
 ``` html
 
-<script src="https://transloadit.edgly.net/releases/uppy/v0.23.1/dist/uppy.min.js"></script>
 
+<script src="https://transloadit.edgly.net/releases/uppy/v0.23.2/dist/uppy.min.js"></script>
 
 ```
 
 
 2\. Add CSS to `<head>`:
 
 ``` html
 
-<link href="https://transloadit.edgly.net/releases/uppy/v0.23.1/dist/uppy.min.css" rel="stylesheet">
 
+<link href="https://transloadit.edgly.net/releases/uppy/v0.23.2/dist/uppy.min.css" rel="stylesheet">
 
 ```
 
 
 3\. Initialize:

+ 1 - 1
bin/upload-to-cdn.sh
View File 

@@ -8,7 +8,7 @@
 
 #  - Checks if a tag is being built (on Travis - otherwise opts to continue execution regardless)
 
 #  - Installs AWS CLI if needed
 
 #  - Assumed a fully built uppy is in root dir (unless a specific tag was specified, then it's fetched from npm)
 
-#  - Runs npm pack, and stores files to e.g. https://transloadit.edgly.net/releases/uppy/v0.23.1/dist/uppy.css
 
+#  - Runs npm pack, and stores files to e.g. https://transloadit.edgly.net/releases/uppy/v0.23.2/dist/uppy.css
 
 #  - Uses local package by default, if [version] argument was specified, takes package from npm
 
 #
 
 # Run as:

+ 7 - 3
examples/aws-uppy-server/server.js
View File 

@@ -4,7 +4,7 @@ const app = require('express')()
 
 app.use(require('cors')())
 
 app.use(require('body-parser').json())
 
 
-app.use(uppy.app({
 
+const options = {
 
   providerOptions: {
 
     s3: {
 
       getKey: (req, filename) =>
 
@@ -16,8 +16,12 @@ app.use(uppy.app({
 
     }
 
   },
 
   server: { host: 'localhost:3020' }
 
-}))
 
+}
 
 
-app.listen(3020, () => {
 
+app.use(uppy.app(options))
 
+
 
+const server = app.listen(3020, () => {
 
   console.log('listening on port 3020')
 
 })
 
+
 
+uppy.socket(server, options)

+ 2 - 2
examples/cdn-example/index.html
View File 

@@ -4,11 +4,11 @@
 
     <title></title>
 
     <meta charset="UTF-8">
 
     <meta name="viewport" content="width=device-width, initial-scale=1">
 
-    <link href="https://transloadit.edgly.net/releases/uppy/v0.23.1/dist/uppy.min.css" rel="stylesheet">
 
+    <link href="https://transloadit.edgly.net/releases/uppy/v0.23.2/dist/uppy.min.css" rel="stylesheet">
 
   </head>
 
   <body>
 
     <button id="uppyModalOpener">Open Modal</button>
 
-    <script src="https://transloadit.edgly.net/releases/uppy/v0.23.1/dist/uppy.min.js"></script>
 
+    <script src="https://transloadit.edgly.net/releases/uppy/v0.23.2/dist/uppy.min.js"></script>
 
     <script>
 
       const uppy = Uppy.Core({debug: true, autoProceed: false})
 
         .use(Uppy.Dashboard, { trigger: '#uppyModalOpener' })

+ 2 - 2
examples/uppy-with-server/client/index.html
View File 

@@ -4,11 +4,11 @@
 
     <title></title>
 
     <meta charset="UTF-8">
 
     <meta name="viewport" content="width=device-width, initial-scale=1">
 
-    <link href="https://transloadit.edgly.net/releases/uppy/v0.23.1/dist/uppy.min.css" rel="stylesheet">
 
+    <link href="https://transloadit.edgly.net/releases/uppy/v0.23.2/dist/uppy.min.css" rel="stylesheet">
 
   </head>
 
   <body>
 
     <button id="uppyModalOpener">Open Modal</button>
 
-    <script src="https://transloadit.edgly.net/releases/uppy/v0.23.1/dist/uppy.min.js"></script>
 
+    <script src="https://transloadit.edgly.net/releases/uppy/v0.23.2/dist/uppy.min.js"></script>
 
     <script>
 
       const uppy = Uppy.Core({debug: true, autoProceed: false})
 
         .use(Uppy.Dashboard, { trigger: '#uppyModalOpener' })

+ 1 - 1
package-lock.json
View File 

@@ -1,6 +1,6 @@
 
 {
 
   "name": "uppy",
 
-  "version": "0.23.1",
 
+  "version": "0.23.2",
 
   "lockfileVersion": 1,
 
   "requires": true,
 
   "dependencies": {

+ 1 - 1
package.json
View File 

@@ -1,6 +1,6 @@
 
 {
 
   "name": "uppy",
 
-  "version": "0.23.1",
 
+  "version": "0.23.2",
 
   "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:",
 
   "main": "lib/index.js",
 
   "jsnext:main": "src/index.js",

+ 0 - 2
src/core/Core.js
View File 

@@ -63,8 +63,6 @@ class Uppy {
 
     // Container for different types of plugins
 
     this.plugins = {}
 
 
-    this.translator = new Translator({locale: this.opts.locale})
 
-    this.i18n = this.translator.translate.bind(this.translator)
 
     this.getState = this.getState.bind(this)
 
     this.getPlugin = this.getPlugin.bind(this)
 
     this.setFileMeta = this.setFileMeta.bind(this)

+ 15 - 0
src/core/Core.test.js
View File 

@@ -1187,4 +1187,19 @@ describe('src/Core', () => {
 
       })
 
     })
 
   })
 
+
 
+  describe('i18n', () => {
 
+    it('merges in custom locale strings', () => {
 
+      const core = new Core({
 
+        locale: {
 
+          strings: {
 
+            test: 'beep boop'
 
+          }
 
+        }
 
+      })
 
+
 
+      expect(core.i18n('exceedsSize')).toBe('This file exceeds maximum allowed size of')
 
+      expect(core.i18n('test')).toBe('beep boop')
 
+    })
 
+  })
 
 })

+ 17 - 0
src/plugins/AwsS3/index.js
View File 

@@ -57,6 +57,21 @@ module.exports = class AwsS3 extends Plugin {
 
     }).then((response) => response.json())
 
   }
 
 
+  validateParameters (file, params) {
 
+    const valid = typeof params === 'object' && params &&
 
+      typeof params.url === 'string' &&
 
+      (typeof params.fields === 'object' || params.fields == null) &&
 
+      (params.method == null || /^(put|post)$/i.test(params.method))
 
+
 
+    if (!valid) {
 
+      const err = new TypeError(`AwsS3: got incorrect result from 'getUploadParameters()' for file '${file.name}', expected an object '{ url, method, fields }'.\nSee https://uppy.io/docs/aws-s3/#getUploadParameters-file for more on the expected format.`)
 
+      console.error(err)
 
+      throw err
 
+    }
 
+
 
+    return params
 
+  }
 
+
 
   prepareUpload (fileIDs) {
 
     fileIDs.forEach((id) => {
 
       const file = this.uppy.getFile(id)
 
@@ -75,6 +90,8 @@ module.exports = class AwsS3 extends Plugin {
 
         const paramsPromise = Promise.resolve()
 
           .then(() => getUploadParameters(file))
 
         return paramsPromise.then((params) => {
 
+          return this.validateParameters(file, params)
 
+        }).then((params) => {
 
           this.uppy.emit('preprocess-progress', file, {
 
             mode: 'determinate',
 
             message: this.i18n('preparingUpload'),

+ 2 - 2
website/src/docs/index.md
View File 

@@ -48,12 +48,12 @@ Alternatively, you can also use a pre-built bundle from Transloadit's CDN: Edgly
 
 1\. Add a script to the bottom of `<body>`:
 
 
 ``` html
 
-<script src="https://transloadit.edgly.net/releases/uppy/v0.23.1/dist/uppy.min.js"></script>
 
+<script src="https://transloadit.edgly.net/releases/uppy/v0.23.2/dist/uppy.min.js"></script>
 
 ```
 
 
 2\. Add CSS to `<head>`:
 
 ``` html
 
-<link href="https://transloadit.edgly.net/releases/uppy/v0.23.1/dist/uppy.min.css" rel="stylesheet">
 
+<link href="https://transloadit.edgly.net/releases/uppy/v0.23.2/dist/uppy.min.css" rel="stylesheet">
 
 ```
 
 
 3\. Initialize:

+ 2 - 2
website/src/examples/i18n/app.html
View File 

@@ -1,11 +1,11 @@
 
 <!-- Basic Uppy styles. You can use Transloadit's CDN, Edgly: 
-https://transloadit.edgly.net/releases/uppy/v0.23.1/dist/uppy.min.css -->
 
+https://transloadit.edgly.net/releases/uppy/v0.23.2/dist/uppy.min.css -->
 
 <link rel="stylesheet" href="/uppy/uppy.min.css">
 
 
 <div class="UppyDragDrop"></div>
 
 
 <!-- Load Uppy pre-built bundled version. You can use Transloadit's CDN, Edgly: 
-https://transloadit.edgly.net/releases/uppy/v0.23.1/dist/uppy.min.js -->
 
+https://transloadit.edgly.net/releases/uppy/v0.23.2/dist/uppy.min.js -->
 
 <script src="/uppy/uppy.min.js"></script>
 
 <script>
 
   var uppy = Uppy.Core({ debug: true });

+ 2 - 2
website/themes/uppy/layout/index.ejs
View File 

@@ -79,8 +79,8 @@
 
   <p>© <%- date(Date.now(), 'YYYY') %> <a href="https://transloadit.com" target="_blank">Transloadit</a></p>
 
 </footer>
 
 
-<link href="https://transloadit.edgly.net/releases/uppy/v0.23.1/dist/uppy.min.css" rel="stylesheet">
 
-<script src="https://transloadit.edgly.net/releases/uppy/v0.23.1/dist/uppy.min.js"></script>
 
+<link href="https://transloadit.edgly.net/releases/uppy/v0.23.2/dist/uppy.min.css" rel="stylesheet">
 
+<script src="https://transloadit.edgly.net/releases/uppy/v0.23.2/dist/uppy.min.js"></script>
 
 
 <script>
 
   var PROTOCOL = location.protocol === 'https:' ? 'https' : 'http'