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

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

Ifedapo Olarewaju 7 years ago
parent
c59a159b3a 3c41df59cc
commit
ce0f4de0b4
9 changed files with 79 additions and 16 deletions
Split View Show Diff Stats
  1. 7 3
      CHANGELOG.md
  2. 3 3
      README.md
  3. 1 1
      bin/upload-to-cdn.sh
  4. 2 2
      examples/cdn-example/index.html
  5. 57 0
      package-lock.json
  6. 3 1
      package.json
  7. 2 2
      website/src/docs/index.md
  8. 2 2
      website/src/examples/i18n/app.html
  9. 2 2
      website/themes/uppy/layout/index.ejs

+ 7 - 3
CHANGELOG.md
View File 

@@ -122,13 +122,17 @@ To be released: 2018-02-10.
 
 - [ ] webcam: URL.createObjectURL(MediaStream) is deprecated and will be removed soon: https://developer.mozilla.org/en-US/docs/Web/API/HTMLMediaElement/srcObject
 
 - [ ] xhrupload: add bundle option to send multiple files in one request (#442 / @goto-bus-stop)
 
 - [ ] xhrupload: emit a final `upload-progress` event in the XHRUpload plugin just before firing `upload-complete` (tus-js-client already handles this internally) (@arturi)
 
-- [ ] uppy-server: security audit, ask @acconut
 
+- [x] uppy-server: security audit, ask @acconut
 
 - [ ] uppy-server: benchmarks / stress test, large file, uppy-server / tus / S3 (10 GB)
 
 - [ ] meta: add https://twin.github.io/better-file-uploads-with-shrine-direct-uploads to the next blog post
 
 - [ ] uppy-server: document docker image setup for uppy-server (@ifedapoolarewaju)
 
 - [x] meta: automatically host releases on edgly and use that as our main CDN (#558 / @kvz)
 
-- [ ] uppy-server: pass response from uppy-server upload’s endpoint (@ifedapoolarewaju)
 
-- [ ] uppy-server: support localhost urls as endpoints (@ifedapoolarewaju)
 
+- [x] uppy-server: pass response from uppy-server upload’s endpoint (@ifedapoolarewaju)
 
+- [x] uppy-server: support localhost urls as endpoints (@ifedapoolarewaju)
 
+- [x] uppy-server: schedule job to delete stale upload files (@ifedapoolarewaju)
 
+- [x] uppy-server: detect file upload size from the server (@ifedapoolarewaju)
 
+- [x] uppy-server: load standalone server options via config path (@ifedapoolarewaju)
 
+- [x] uppy-server: fix circular json stringify error (@ifedapoolarewaju)
 
 
 ## 0.22.1

+ 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.22.0/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.22.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.22.0/dist/uppy.min.js"></script>
 
+<script src="https://transloadit.edgly.net/releases/uppy/v0.22.2/dist/uppy.min.js"></script>
 
 ```
 
 
 2\. Add CSS to `<head>`:
 
 ``` html
 
-<link href="https://transloadit.edgly.net/releases/uppy/v0.22.0/dist/uppy.min.css" rel="stylesheet">
 
+<link href="https://transloadit.edgly.net/releases/uppy/v0.22.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.22.0/dist/uppy.css
 
+#  - Runs npm pack, and stores files to e.g. https://transloadit.edgly.net/releases/uppy/v0.22.2/dist/uppy.css
 
 #  - Uses local package by default, if [version] argument was specified, takes package from npm
 
 #
 
 # Run as:

+ 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.22.0/dist/uppy.min.css" rel="stylesheet">
 
+    <link href="https://transloadit.edgly.net/releases/uppy/v0.22.2/dist/uppy.min.css" rel="stylesheet">
 
   </head>
 
   <body>
 
     <button id="uppyModalOpener">Open Modal</button>
 
-    <script src="https://transloadit.edgly.net/releases/uppy/v0.22.0/dist/uppy.min.js"></script>
 
+    <script src="https://transloadit.edgly.net/releases/uppy/v0.22.2/dist/uppy.min.js"></script>
 
     <script>
 
       const uppy = Uppy.Core({debug: true, autoProceed: false})
 
         .use(Uppy.Dashboard, { trigger: '#uppyModalOpener' })

+ 57 - 0
package-lock.json
View File 

@@ -11981,6 +11981,22 @@
 
       "integrity": "sha1-WuVUHQJGRdMqWPzdyc7s6nrjrC8=",
 
       "dev": true
 
     },
 
+    "nomnom": {
 
+      "version": "1.6.2",
 
+      "resolved": "https://registry.npmjs.org/nomnom/-/nomnom-1.6.2.tgz",
 
+      "integrity": "sha1-hKZqJgF0QI/Ft3oY+IjszET7aXE=",
 
+      "requires": {
 
+        "colors": "0.5.1",
 
+        "underscore": "1.4.4"
 
+      },
 
+      "dependencies": {
 
+        "colors": {
 
+          "version": "0.5.1",
 
+          "resolved": "https://registry.npmjs.org/colors/-/colors-0.5.1.tgz",
 
+          "integrity": "sha1-fQAj6usVTo7p/Oddy5I9DtFmd3Q="
 
+        }
 
+      }
 
+    },
 
     "nopt": {
 
       "version": "3.0.6",
 
       "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz",
 
@@ -14312,6 +14328,37 @@
 
         "is-finite": "1.0.2"
 
       }
 
     },
 
+    "replace": {
 
+      "version": "0.3.0",
 
+      "resolved": "https://registry.npmjs.org/replace/-/replace-0.3.0.tgz",
 
+      "integrity": "sha1-YAgXIRiGWFlatqeU63/ty0yNOcc=",
 
+      "requires": {
 
+        "colors": "0.5.1",
 
+        "minimatch": "0.2.14",
 
+        "nomnom": "1.6.2"
 
+      },
 
+      "dependencies": {
 
+        "colors": {
 
+          "version": "0.5.1",
 
+          "resolved": "https://registry.npmjs.org/colors/-/colors-0.5.1.tgz",
 
+          "integrity": "sha1-fQAj6usVTo7p/Oddy5I9DtFmd3Q="
 
+        },
 
+        "lru-cache": {
 
+          "version": "2.7.3",
 
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz",
 
+          "integrity": "sha1-bUUk6LlV+V1PW1iFHOId1y+06VI="
 
+        },
 
+        "minimatch": {
 
+          "version": "0.2.14",
 
+          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz",
 
+          "integrity": "sha1-x054BXT2PG+aCQ6Q775u9TpqdWo=",
 
+          "requires": {
 
+            "lru-cache": "2.7.3",
 
+            "sigmund": "1.0.1"
 
+          }
 
+        }
 
+      }
 
+    },
 
     "replace-comments-x": {
 
       "version": "2.0.0",
 
       "resolved": "https://registry.npmjs.org/replace-comments-x/-/replace-comments-x-2.0.0.tgz",
 
@@ -14959,6 +15006,11 @@
 
       "integrity": "sha512-vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww==",
 
       "dev": true
 
     },
 
+    "sigmund": {
 
+      "version": "1.0.1",
 
+      "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz",
 
+      "integrity": "sha1-P/IfGYytIXX587eBhT/ZTQ0ZtZA="
 
+    },
 
     "signal-exit": {
 
       "version": "3.0.2",
 
       "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
 
@@ -16192,6 +16244,11 @@
 
         }
 
       }
 
     },
 
+    "underscore": {
 
+      "version": "1.4.4",
 
+      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.4.4.tgz",
 
+      "integrity": "sha1-YaajIBBiKvoHljvzJSA88SI51gQ="
 
+    },
 
     "uniq": {
 
       "version": "1.0.1",
 
       "resolved": "https://registry.npmjs.org/uniq/-/uniq-1.0.1.tgz",

+ 3 - 1
package.json
View File 

@@ -111,6 +111,7 @@
 
     "preact": "^8.2.7",
 
     "prettier-bytes": "1.0.4",
 
     "prop-types": "^15.5.10",
 
+    "replace": "0.3.0",
 
     "socket.io-client": "^2.0.4",
 
     "tus-js-client": "^1.4.5",
 
     "url-parse": "^1.2.0",
 
@@ -131,7 +132,8 @@
 
     "release:major": "env SEMANTIC=major npm run release",
 
     "release:minor": "env SEMANTIC=minor npm run release",
 
     "release:patch": "env SEMANTIC=patch npm run release",
 
-    "release": "npm version ${SEMANTIC:-patch} -m \"Release %s\" && git push && git push --tags && npm publish",
 
+    "replace:versions": "replace -r 'uppy/v\\d+\\.\\d+\\.\\d+/dist' \"uppy/v$npm_package_version/dist\" ./examples/ README.md bin/upload-to-cdn.sh website/src/examples/ website/src/docs/ website/themes/uppy/layout/",
 
+    "release": "npm version ${SEMANTIC:-patch} -m \"Release %s\" && npm run replace:versions && git commit -m \"Change Uppy version references to v$npm_package_version\" ./examples/ README.md bin/upload-to-cdn.sh website/src/examples/ website/src/docs/ website/themes/uppy/layout/ && git push && git push --tags && npm publish",
 
     "start:server": "node bin/start-server",
 
     "start": "npm-run-all --parallel watch start:server web:preview",
 
     "test:acceptance:handleservers": "bin/bootandkill-servers node test/acceptance/index.js",

+ 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.22.0/dist/uppy.min.js"></script>
 
+<script src="https://transloadit.edgly.net/releases/uppy/v0.22.2/dist/uppy.min.js"></script>
 
 ```
 
 
 2\. Add CSS to `<head>`:
 
 ``` html
 
-<link href="https://transloadit.edgly.net/releases/uppy/v0.22.0/dist/uppy.min.css" rel="stylesheet">
 
+<link href="https://transloadit.edgly.net/releases/uppy/v0.22.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.22.0/dist/uppy.min.css -->
 
+https://transloadit.edgly.net/releases/uppy/v0.22.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.22.0/dist/uppy.min.js -->
 
+https://transloadit.edgly.net/releases/uppy/v0.22.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.22.0/dist/uppy.min.css" rel="stylesheet">
 
-<script src="https://transloadit.edgly.net/releases/uppy/v0.22.0/dist/uppy.min.js"></script>
 
+<link href="https://transloadit.edgly.net/releases/uppy/v0.22.2/dist/uppy.min.css" rel="stylesheet">
 
+<script src="https://transloadit.edgly.net/releases/uppy/v0.22.2/dist/uppy.min.js"></script>
 
 
 <script>
 
   var PROTOCOL = location.protocol === 'https:' ? 'https' : 'http'