From 5c3f555a44808c9afd7ff4a1378d4606bbd7cd8f Mon Sep 17 00:00:00 2001 From: Antoine du Hamel Date: Wed, 29 Jun 2022 16:33:42 +0200 Subject: [PATCH 1/4] example: fix aws-companion example --- .eslintrc.js | 1 + examples/aws-companion/.gitignore | 2 +- examples/aws-companion/README.md | 23 + examples/aws-companion/index.html | 3 +- examples/aws-companion/main.js | 14 +- examples/aws-companion/package.json | 29 +- examples/aws-companion/readme.md | 23 - .../aws-companion/{server.js => server.cjs} | 10 +- yarn.lock | 546 +++++++++++++++++- 9 files changed, 581 insertions(+), 70 deletions(-) create mode 100644 examples/aws-companion/README.md delete mode 100644 examples/aws-companion/readme.md rename examples/aws-companion/{server.js => server.cjs} (87%) diff --git a/.eslintrc.js b/.eslintrc.js index 15a8fcf8ff..3814d3c9f5 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -191,6 +191,7 @@ module.exports = { files: [ '*.mjs', 'e2e/clients/**/*.js', + 'examples/aws-companion/*.js', 'examples/aws-presigned-url/*.js', 'examples/bundled/*.js', 'examples/custom-provider/client/*.js', diff --git a/examples/aws-companion/.gitignore b/examples/aws-companion/.gitignore index 70a19130fe..a9a5aecf42 100644 --- a/examples/aws-companion/.gitignore +++ b/examples/aws-companion/.gitignore @@ -1 +1 @@ -uppy.min.css +tmp diff --git a/examples/aws-companion/README.md b/examples/aws-companion/README.md new file mode 100644 index 0000000000..be2513a692 --- /dev/null +++ b/examples/aws-companion/README.md @@ -0,0 +1,23 @@ +# Uppy + AWS S3 Example + +This example uses @uppy/companion with a custom AWS S3 configuration. +Files are uploaded to a randomly named directory inside the `whatever/` +directory in a bucket. + +## Run it + +First, set up the `COMPANION_AWS_KEY`, `COMPANION_AWS_SECRET`, +`COMPANION_AWS_REGION`, and `COMPANION_AWS_BUCKET` environment variables for +`@uppy/companion` in a `.env` file. You may find useful to first copy the +`.env.example` file: + +```sh +[ -f .env ] || cp .env.example .env +``` + +To run this example, from the **repository root**, run: + +```sh +corepack yarn install +corepack yarn workspace @uppy-example/aws-companion start +``` diff --git a/examples/aws-companion/index.html b/examples/aws-companion/index.html index 9ca4cc79ce..4af13a3c60 100644 --- a/examples/aws-companion/index.html +++ b/examples/aws-companion/index.html @@ -4,9 +4,8 @@ Companion + AWS Example - - + diff --git a/examples/aws-companion/main.js b/examples/aws-companion/main.js index 22de356934..bf7545bc61 100644 --- a/examples/aws-companion/main.js +++ b/examples/aws-companion/main.js @@ -1,8 +1,12 @@ -const Uppy = require('@uppy/core') -const GoogleDrive = require('@uppy/google-drive') -const Webcam = require('@uppy/webcam') -const Dashboard = require('@uppy/dashboard') -const AwsS3 = require('@uppy/aws-s3') +import AwsS3 from '@uppy/aws-s3' +import Uppy from '@uppy/core' +import Dashboard from '@uppy/dashboard' +import GoogleDrive from '@uppy/google-drive' +import Webcam from '@uppy/webcam' + +import '@uppy/core/dist/style.css' +import '@uppy/dashboard/dist/style.css' +import '@uppy/webcam/dist/style.css' const uppy = new Uppy({ debug: true, diff --git a/examples/aws-companion/package.json b/examples/aws-companion/package.json index a4dd24c44d..90ac387f62 100644 --- a/examples/aws-companion/package.json +++ b/examples/aws-companion/package.json @@ -1,30 +1,33 @@ { "name": "@uppy-example/aws-companion", "version": "0.0.0", + "type": "module", "dependencies": { - "@babel/core": "^7.2.2", "@uppy/aws-s3": "workspace:*", "@uppy/core": "workspace:*", "@uppy/dashboard": "workspace:*", "@uppy/google-drive": "workspace:*", - "@uppy/webcam": "workspace:*", - "babelify": "^10.0.0", - "body-parser": "^1.18.3", - "budo": "^11.6.1", + "@uppy/webcam": "workspace:*" + }, + "devDependencies": { + "@uppy/companion": "workspace:*", + "body-parser": "^1.20.0", "cookie-parser": "^1.4.6", "cors": "^2.8.5", - "express": "^4.16.4", - "express-session": "^1.15.6", - "npm-run-all": "^4.1.5" + "dotenv": "^16.0.1", + "express": "^4.18.1", + "express-session": "^1.17.3", + "npm-run-all": "^4.1.5", + "vite": "^2.7.1" }, "private": true, "engines": { - "node": ">=14.14.0" + "node": ">=16.11.0" }, "scripts": { - "copy": "cp ../../packages/uppy/dist/uppy.min.css .", - "start": "npm-run-all --serial copy --parallel start:*", - "start:client": "budo main.js:bundle.js -- -t babelify", - "start:server": "node server.js" + "dev": "vite", + "start": "npm-run-all --parallel start:client start:server", + "start:client": "vite", + "start:server": "node server.cjs" } } diff --git a/examples/aws-companion/readme.md b/examples/aws-companion/readme.md deleted file mode 100644 index 5f7f3e52b5..0000000000 --- a/examples/aws-companion/readme.md +++ /dev/null @@ -1,23 +0,0 @@ -# Uppy + AWS S3 Example - -This example uses @uppy/companion with a custom AWS S3 configuration. -Files are uploaded to a randomly named directory inside the `whatever/` directory in a bucket. - -## Run it - -To run this example, make sure you've correctly installed the **repository root**: - -```bash -npm install -npm run build -``` - -That will also install the dependencies for this example. - -Then, set up the `COMPANION_AWS_KEY`, `COMPANION_AWS_SECRET`, `COMPANION_AWS_REGION`, and `COMPANION_AWS_BUCKET` environment variables for @uppy/companion. - -Then, again in the **repository root**, start this example by doing: - -```bash -npm run example aws-companion -``` diff --git a/examples/aws-companion/server.js b/examples/aws-companion/server.cjs similarity index 87% rename from examples/aws-companion/server.js rename to examples/aws-companion/server.cjs index 6c59e8015e..86162e2586 100644 --- a/examples/aws-companion/server.js +++ b/examples/aws-companion/server.cjs @@ -1,18 +1,24 @@ const fs = require('node:fs') const path = require('node:path') -const companion = require('../../packages/@uppy/companion') +const companion = require('@uppy/companion') + +require('dotenv').config() + const app = require('express')() const DATA_DIR = path.join(__dirname, 'tmp') app.use(require('cors')({ - origin: true, + origin: 'http://localhost:3000', + methods: ['GET', 'POST', 'OPTIONS'], credentials: true, })) app.use(require('cookie-parser')()) app.use(require('body-parser').json()) app.use(require('express-session')({ secret: 'hello planet', + saveUninitialized: false, + resave: false, })) const options = { diff --git a/yarn.lock b/yarn.lock index c162048e02..23583755f9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4246,6 +4246,13 @@ __metadata: languageName: node linkType: hard +"@esbuild/linux-loong64@npm:0.14.53": + version: 0.14.53 + resolution: "@esbuild/linux-loong64@npm:0.14.53" + conditions: os=linux & cpu=loong64 + languageName: node + linkType: hard + "@eslint/eslintrc@npm:^1.0.5": version: 1.0.5 resolution: "@eslint/eslintrc@npm:1.0.5" @@ -9730,20 +9737,20 @@ __metadata: version: 0.0.0-use.local resolution: "@uppy-example/aws-companion@workspace:examples/aws-companion" dependencies: - "@babel/core": ^7.2.2 "@uppy/aws-s3": "workspace:*" + "@uppy/companion": "workspace:*" "@uppy/core": "workspace:*" "@uppy/dashboard": "workspace:*" "@uppy/google-drive": "workspace:*" "@uppy/webcam": "workspace:*" - babelify: ^10.0.0 - body-parser: ^1.18.3 - budo: ^11.6.1 + body-parser: ^1.20.0 cookie-parser: ^1.4.6 cors: ^2.8.5 - express: ^4.16.4 - express-session: ^1.15.6 + dotenv: ^16.0.1 + express: ^4.18.1 + express-session: ^1.17.3 npm-run-all: ^4.1.5 + vite: ^2.7.1 languageName: unknown linkType: soft @@ -11643,6 +11650,16 @@ __metadata: languageName: node linkType: hard +"accepts@npm:~1.3.8": + version: 1.3.8 + resolution: "accepts@npm:1.3.8" + dependencies: + mime-types: ~2.1.34 + negotiator: 0.6.3 + checksum: 50c43d32e7b50285ebe84b613ee4a3aa426715a7d131b65b786e2ead0fd76b6b60091b9916d3478a75f11f162628a2139991b6c03ab3f1d9ab7c86075dc8eab4 + languageName: node + linkType: hard + "acorn-globals@npm:^4.3.2": version: 4.3.4 resolution: "acorn-globals@npm:4.3.4" @@ -13599,6 +13616,26 @@ __metadata: languageName: node linkType: hard +"body-parser@npm:1.20.0, body-parser@npm:^1.20.0": + version: 1.20.0 + resolution: "body-parser@npm:1.20.0" + dependencies: + bytes: 3.1.2 + content-type: ~1.0.4 + debug: 2.6.9 + depd: 2.0.0 + destroy: 1.2.0 + http-errors: 2.0.0 + iconv-lite: 0.4.24 + on-finished: 2.4.1 + qs: 6.10.3 + raw-body: 2.5.1 + type-is: ~1.6.18 + unpipe: 1.0.0 + checksum: 12fffdeac82fe20dddcab7074215d5156e7d02a69ae90cbe9fee1ca3efa2f28ef52097cbea76685ee0a1509c71d85abd0056a08e612c09077cad6277a644cf88 + languageName: node + linkType: hard + "bole@npm:^2.0.0": version: 2.0.0 resolution: "bole@npm:2.0.0" @@ -14293,6 +14330,13 @@ __metadata: languageName: node linkType: hard +"bytes@npm:3.1.2": + version: 3.1.2 + resolution: "bytes@npm:3.1.2" + checksum: e4bcd3948d289c5127591fbedf10c0b639ccbf00243504e4e127374a15c3bc8eed0d28d4aaab08ff6f1cf2abc0cce6ba3085ed32f4f90e82a5683ce0014e1b6e + languageName: node + linkType: hard + "cacache@npm:15.3.0, cacache@npm:^15.0.5, cacache@npm:^15.0.6, cacache@npm:^15.2.0": version: 15.3.0 resolution: "cacache@npm:15.3.0" @@ -15658,6 +15702,15 @@ __metadata: languageName: node linkType: hard +"content-disposition@npm:0.5.4": + version: 0.5.4 + resolution: "content-disposition@npm:0.5.4" + dependencies: + safe-buffer: 5.2.1 + checksum: afb9d545e296a5171d7574fcad634b2fdf698875f4006a9dd04a3e1333880c5c0c98d47b560d01216fb6505a54a2ba6a843ee3a02ec86d7e911e8315255f56c3 + languageName: node + linkType: hard + "content-type@npm:~1.0.4": version: 1.0.4 resolution: "content-type@npm:1.0.4" @@ -15712,6 +15765,20 @@ __metadata: languageName: node linkType: hard +"cookie@npm:0.4.2": + version: 0.4.2 + resolution: "cookie@npm:0.4.2" + checksum: a00833c998bedf8e787b4c342defe5fa419abd96b32f4464f718b91022586b8f1bafbddd499288e75c037642493c83083da426c6a9080d309e3bd90fd11baa9b + languageName: node + linkType: hard + +"cookie@npm:0.5.0": + version: 0.5.0 + resolution: "cookie@npm:0.5.0" + checksum: 1f4bd2ca5765f8c9689a7e8954183f5332139eb72b6ff783d8947032ec1fdf43109852c178e21a953a30c0dd42257828185be01b49d1eb1a67fd054ca588a180 + languageName: node + linkType: hard + "cookiejar@npm:^2.1.0": version: 2.1.3 resolution: "cookiejar@npm:2.1.3" @@ -16954,6 +17021,13 @@ __metadata: languageName: node linkType: hard +"depd@npm:2.0.0, depd@npm:~2.0.0": + version: 2.0.0 + resolution: "depd@npm:2.0.0" + checksum: abbe19c768c97ee2eed6282d8ce3031126662252c58d711f646921c9623f9052e3e1906443066beec1095832f534e57c523b7333f8e7e0d93051ab6baef5ab3a + languageName: node + linkType: hard + "depd@npm:^1.1.2, depd@npm:~1.1.2": version: 1.1.2 resolution: "depd@npm:1.1.2" @@ -16961,13 +17035,6 @@ __metadata: languageName: node linkType: hard -"depd@npm:~2.0.0": - version: 2.0.0 - resolution: "depd@npm:2.0.0" - checksum: abbe19c768c97ee2eed6282d8ce3031126662252c58d711f646921c9623f9052e3e1906443066beec1095832f534e57c523b7333f8e7e0d93051ab6baef5ab3a - languageName: node - linkType: hard - "dependency-graph@npm:^0.11.0": version: 0.11.0 resolution: "dependency-graph@npm:0.11.0" @@ -17013,6 +17080,13 @@ __metadata: languageName: node linkType: hard +"destroy@npm:1.2.0": + version: 1.2.0 + resolution: "destroy@npm:1.2.0" + checksum: 0acb300b7478a08b92d810ab229d5afe0d2f4399272045ab22affa0d99dbaf12637659411530a6fcd597a9bdac718fc94373a61a95b4651bbc7b83684a565e38 + languageName: node + linkType: hard + "destroy@npm:~1.0.4": version: 1.0.4 resolution: "destroy@npm:1.0.4" @@ -18161,6 +18235,13 @@ __metadata: languageName: node linkType: hard +"esbuild-android-64@npm:0.14.53": + version: 0.14.53 + resolution: "esbuild-android-64@npm:0.14.53" + conditions: os=android & cpu=x64 + languageName: node + linkType: hard + "esbuild-android-arm64@npm:0.13.12": version: 0.13.12 resolution: "esbuild-android-arm64@npm:0.13.12" @@ -18182,6 +18263,13 @@ __metadata: languageName: node linkType: hard +"esbuild-android-arm64@npm:0.14.53": + version: 0.14.53 + resolution: "esbuild-android-arm64@npm:0.14.53" + conditions: os=android & cpu=arm64 + languageName: node + linkType: hard + "esbuild-darwin-64@npm:0.13.12": version: 0.13.12 resolution: "esbuild-darwin-64@npm:0.13.12" @@ -18203,6 +18291,13 @@ __metadata: languageName: node linkType: hard +"esbuild-darwin-64@npm:0.14.53": + version: 0.14.53 + resolution: "esbuild-darwin-64@npm:0.14.53" + conditions: os=darwin & cpu=x64 + languageName: node + linkType: hard + "esbuild-darwin-arm64@npm:0.13.12": version: 0.13.12 resolution: "esbuild-darwin-arm64@npm:0.13.12" @@ -18224,6 +18319,13 @@ __metadata: languageName: node linkType: hard +"esbuild-darwin-arm64@npm:0.14.53": + version: 0.14.53 + resolution: "esbuild-darwin-arm64@npm:0.14.53" + conditions: os=darwin & cpu=arm64 + languageName: node + linkType: hard + "esbuild-freebsd-64@npm:0.13.12": version: 0.13.12 resolution: "esbuild-freebsd-64@npm:0.13.12" @@ -18245,6 +18347,13 @@ __metadata: languageName: node linkType: hard +"esbuild-freebsd-64@npm:0.14.53": + version: 0.14.53 + resolution: "esbuild-freebsd-64@npm:0.14.53" + conditions: os=freebsd & cpu=x64 + languageName: node + linkType: hard + "esbuild-freebsd-arm64@npm:0.13.12": version: 0.13.12 resolution: "esbuild-freebsd-arm64@npm:0.13.12" @@ -18266,6 +18375,13 @@ __metadata: languageName: node linkType: hard +"esbuild-freebsd-arm64@npm:0.14.53": + version: 0.14.53 + resolution: "esbuild-freebsd-arm64@npm:0.14.53" + conditions: os=freebsd & cpu=arm64 + languageName: node + linkType: hard + "esbuild-linux-32@npm:0.13.12": version: 0.13.12 resolution: "esbuild-linux-32@npm:0.13.12" @@ -18287,6 +18403,13 @@ __metadata: languageName: node linkType: hard +"esbuild-linux-32@npm:0.14.53": + version: 0.14.53 + resolution: "esbuild-linux-32@npm:0.14.53" + conditions: os=linux & cpu=ia32 + languageName: node + linkType: hard + "esbuild-linux-64@npm:0.13.12": version: 0.13.12 resolution: "esbuild-linux-64@npm:0.13.12" @@ -18308,6 +18431,13 @@ __metadata: languageName: node linkType: hard +"esbuild-linux-64@npm:0.14.53": + version: 0.14.53 + resolution: "esbuild-linux-64@npm:0.14.53" + conditions: os=linux & cpu=x64 + languageName: node + linkType: hard + "esbuild-linux-arm64@npm:0.13.12": version: 0.13.12 resolution: "esbuild-linux-arm64@npm:0.13.12" @@ -18329,6 +18459,13 @@ __metadata: languageName: node linkType: hard +"esbuild-linux-arm64@npm:0.14.53": + version: 0.14.53 + resolution: "esbuild-linux-arm64@npm:0.14.53" + conditions: os=linux & cpu=arm64 + languageName: node + linkType: hard + "esbuild-linux-arm@npm:0.13.12": version: 0.13.12 resolution: "esbuild-linux-arm@npm:0.13.12" @@ -18350,6 +18487,13 @@ __metadata: languageName: node linkType: hard +"esbuild-linux-arm@npm:0.14.53": + version: 0.14.53 + resolution: "esbuild-linux-arm@npm:0.14.53" + conditions: os=linux & cpu=arm + languageName: node + linkType: hard + "esbuild-linux-mips64le@npm:0.13.12": version: 0.13.12 resolution: "esbuild-linux-mips64le@npm:0.13.12" @@ -18371,6 +18515,13 @@ __metadata: languageName: node linkType: hard +"esbuild-linux-mips64le@npm:0.14.53": + version: 0.14.53 + resolution: "esbuild-linux-mips64le@npm:0.14.53" + conditions: os=linux & cpu=mips64el + languageName: node + linkType: hard + "esbuild-linux-ppc64le@npm:0.13.12": version: 0.13.12 resolution: "esbuild-linux-ppc64le@npm:0.13.12" @@ -18392,6 +18543,13 @@ __metadata: languageName: node linkType: hard +"esbuild-linux-ppc64le@npm:0.14.53": + version: 0.14.53 + resolution: "esbuild-linux-ppc64le@npm:0.14.53" + conditions: os=linux & cpu=ppc64 + languageName: node + linkType: hard + "esbuild-linux-riscv64@npm:0.14.39": version: 0.14.39 resolution: "esbuild-linux-riscv64@npm:0.14.39" @@ -18406,6 +18564,13 @@ __metadata: languageName: node linkType: hard +"esbuild-linux-riscv64@npm:0.14.53": + version: 0.14.53 + resolution: "esbuild-linux-riscv64@npm:0.14.53" + conditions: os=linux & cpu=riscv64 + languageName: node + linkType: hard + "esbuild-linux-s390x@npm:0.14.39": version: 0.14.39 resolution: "esbuild-linux-s390x@npm:0.14.39" @@ -18420,6 +18585,13 @@ __metadata: languageName: node linkType: hard +"esbuild-linux-s390x@npm:0.14.53": + version: 0.14.53 + resolution: "esbuild-linux-s390x@npm:0.14.53" + conditions: os=linux & cpu=s390x + languageName: node + linkType: hard + "esbuild-netbsd-64@npm:0.13.12": version: 0.13.12 resolution: "esbuild-netbsd-64@npm:0.13.12" @@ -18441,6 +18613,13 @@ __metadata: languageName: node linkType: hard +"esbuild-netbsd-64@npm:0.14.53": + version: 0.14.53 + resolution: "esbuild-netbsd-64@npm:0.14.53" + conditions: os=netbsd & cpu=x64 + languageName: node + linkType: hard + "esbuild-openbsd-64@npm:0.13.12": version: 0.13.12 resolution: "esbuild-openbsd-64@npm:0.13.12" @@ -18462,6 +18641,13 @@ __metadata: languageName: node linkType: hard +"esbuild-openbsd-64@npm:0.14.53": + version: 0.14.53 + resolution: "esbuild-openbsd-64@npm:0.14.53" + conditions: os=openbsd & cpu=x64 + languageName: node + linkType: hard + "esbuild-plugin-alias@npm:^0.2.1": version: 0.2.1 resolution: "esbuild-plugin-alias@npm:0.2.1" @@ -18499,6 +18685,13 @@ __metadata: languageName: node linkType: hard +"esbuild-sunos-64@npm:0.14.53": + version: 0.14.53 + resolution: "esbuild-sunos-64@npm:0.14.53" + conditions: os=sunos & cpu=x64 + languageName: node + linkType: hard + "esbuild-wasm@npm:0.13.12": version: 0.13.12 resolution: "esbuild-wasm@npm:0.13.12" @@ -18538,6 +18731,13 @@ __metadata: languageName: node linkType: hard +"esbuild-windows-32@npm:0.14.53": + version: 0.14.53 + resolution: "esbuild-windows-32@npm:0.14.53" + conditions: os=win32 & cpu=ia32 + languageName: node + linkType: hard + "esbuild-windows-64@npm:0.13.12": version: 0.13.12 resolution: "esbuild-windows-64@npm:0.13.12" @@ -18559,6 +18759,13 @@ __metadata: languageName: node linkType: hard +"esbuild-windows-64@npm:0.14.53": + version: 0.14.53 + resolution: "esbuild-windows-64@npm:0.14.53" + conditions: os=win32 & cpu=x64 + languageName: node + linkType: hard + "esbuild-windows-arm64@npm:0.13.12": version: 0.13.12 resolution: "esbuild-windows-arm64@npm:0.13.12" @@ -18580,6 +18787,13 @@ __metadata: languageName: node linkType: hard +"esbuild-windows-arm64@npm:0.14.53": + version: 0.14.53 + resolution: "esbuild-windows-arm64@npm:0.14.53" + conditions: os=win32 & cpu=arm64 + languageName: node + linkType: hard + "esbuild@npm:0.13.12": version: 0.13.12 resolution: "esbuild@npm:0.13.12" @@ -18713,6 +18927,80 @@ __metadata: languageName: node linkType: hard +"esbuild@npm:^0.14.27": + version: 0.14.53 + resolution: "esbuild@npm:0.14.53" + dependencies: + "@esbuild/linux-loong64": 0.14.53 + esbuild-android-64: 0.14.53 + esbuild-android-arm64: 0.14.53 + esbuild-darwin-64: 0.14.53 + esbuild-darwin-arm64: 0.14.53 + esbuild-freebsd-64: 0.14.53 + esbuild-freebsd-arm64: 0.14.53 + esbuild-linux-32: 0.14.53 + esbuild-linux-64: 0.14.53 + esbuild-linux-arm: 0.14.53 + esbuild-linux-arm64: 0.14.53 + esbuild-linux-mips64le: 0.14.53 + esbuild-linux-ppc64le: 0.14.53 + esbuild-linux-riscv64: 0.14.53 + esbuild-linux-s390x: 0.14.53 + esbuild-netbsd-64: 0.14.53 + esbuild-openbsd-64: 0.14.53 + esbuild-sunos-64: 0.14.53 + esbuild-windows-32: 0.14.53 + esbuild-windows-64: 0.14.53 + esbuild-windows-arm64: 0.14.53 + dependenciesMeta: + "@esbuild/linux-loong64": + optional: true + esbuild-android-64: + optional: true + esbuild-android-arm64: + optional: true + esbuild-darwin-64: + optional: true + esbuild-darwin-arm64: + optional: true + esbuild-freebsd-64: + optional: true + esbuild-freebsd-arm64: + optional: true + esbuild-linux-32: + optional: true + esbuild-linux-64: + optional: true + esbuild-linux-arm: + optional: true + esbuild-linux-arm64: + optional: true + esbuild-linux-mips64le: + optional: true + esbuild-linux-ppc64le: + optional: true + esbuild-linux-riscv64: + optional: true + esbuild-linux-s390x: + optional: true + esbuild-netbsd-64: + optional: true + esbuild-openbsd-64: + optional: true + esbuild-sunos-64: + optional: true + esbuild-windows-32: + optional: true + esbuild-windows-64: + optional: true + esbuild-windows-arm64: + optional: true + bin: + esbuild: bin/esbuild + checksum: cd62d3bc805c6c2ff2cfe62c2fbe6a6d617783d5095167df861be7ddba464281f719a5ded2e940ba21838abf58cce8259daffa08667515c4396ff7bf683f5b70 + languageName: node + linkType: hard + "esbuild@npm:^0.14.47": version: 0.14.49 resolution: "esbuild@npm:0.14.49" @@ -19971,6 +20259,22 @@ __metadata: languageName: node linkType: hard +"express-session@npm:^1.17.3": + version: 1.17.3 + resolution: "express-session@npm:1.17.3" + dependencies: + cookie: 0.4.2 + cookie-signature: 1.0.6 + debug: 2.6.9 + depd: ~2.0.0 + on-headers: ~1.0.2 + parseurl: ~1.3.3 + safe-buffer: 5.2.1 + uid-safe: ~2.1.5 + checksum: 1021a793433cbc6a1b32c803fcb2daa1e03a8f50dd907e8745ae57994370315a5cfde5b6ef7b062d9a9a0754ff268844bda211c08240b3a0e01014dcf1073ec5 + languageName: node + linkType: hard + "express@npm:4.17.1, express@npm:^4.14.0, express@npm:^4.16.2, express@npm:^4.16.4, express@npm:^4.17.1": version: 4.17.1 resolution: "express@npm:4.17.1" @@ -20009,6 +20313,45 @@ __metadata: languageName: node linkType: hard +"express@npm:^4.18.1": + version: 4.18.1 + resolution: "express@npm:4.18.1" + dependencies: + accepts: ~1.3.8 + array-flatten: 1.1.1 + body-parser: 1.20.0 + content-disposition: 0.5.4 + content-type: ~1.0.4 + cookie: 0.5.0 + cookie-signature: 1.0.6 + debug: 2.6.9 + depd: 2.0.0 + encodeurl: ~1.0.2 + escape-html: ~1.0.3 + etag: ~1.8.1 + finalhandler: 1.2.0 + fresh: 0.5.2 + http-errors: 2.0.0 + merge-descriptors: 1.0.1 + methods: ~1.1.2 + on-finished: 2.4.1 + parseurl: ~1.3.3 + path-to-regexp: 0.1.7 + proxy-addr: ~2.0.7 + qs: 6.10.3 + range-parser: ~1.2.1 + safe-buffer: 5.2.1 + send: 0.18.0 + serve-static: 1.15.0 + setprototypeof: 1.2.0 + statuses: 2.0.1 + type-is: ~1.6.18 + utils-merge: 1.0.1 + vary: ~1.1.2 + checksum: c3d44c92e48226ef32ec978becfedb0ecf0ca21316bfd33674b3c5d20459840584f2325726a4f17f33d9c99f769636f728982d1c5433a5b6fe6eb95b8cf0c854 + languageName: node + linkType: hard + "ext@npm:^1.1.2": version: 1.6.0 resolution: "ext@npm:1.6.0" @@ -20512,6 +20855,21 @@ __metadata: languageName: node linkType: hard +"finalhandler@npm:1.2.0": + version: 1.2.0 + resolution: "finalhandler@npm:1.2.0" + dependencies: + debug: 2.6.9 + encodeurl: ~1.0.2 + escape-html: ~1.0.3 + on-finished: 2.4.1 + parseurl: ~1.3.3 + statuses: 2.0.1 + unpipe: ~1.0.0 + checksum: 92effbfd32e22a7dff2994acedbd9bcc3aa646a3e919ea6a53238090e87097f8ef07cced90aa2cc421abdf993aefbdd5b00104d55c7c5479a8d00ed105b45716 + languageName: node + linkType: hard + "finalhandler@npm:^0.3.0": version: 0.3.6 resolution: "finalhandler@npm:0.3.6" @@ -22725,6 +23083,19 @@ hexo-filter-github-emojis@arturi/hexo-filter-github-emojis: languageName: node linkType: hard +"http-errors@npm:2.0.0": + version: 2.0.0 + resolution: "http-errors@npm:2.0.0" + dependencies: + depd: 2.0.0 + inherits: 2.0.4 + setprototypeof: 1.2.0 + statuses: 2.0.1 + toidentifier: 1.0.1 + checksum: 9b0a3782665c52ce9dc658a0d1560bcb0214ba5699e4ea15aefb2a496e2ca83db03ebc42e1cce4ac1f413e4e0d2d736a3fd755772c556a9a06853ba2a0b7d920 + languageName: node + linkType: hard + "http-errors@npm:~1.6.2": version: 1.6.3 resolution: "http-errors@npm:1.6.3" @@ -28302,6 +28673,13 @@ hexo-filter-github-emojis@arturi/hexo-filter-github-emojis: languageName: node linkType: hard +"mime-db@npm:1.52.0": + version: 1.52.0 + resolution: "mime-db@npm:1.52.0" + checksum: 0d99a03585f8b39d68182803b12ac601d9c01abfa28ec56204fa330bc9f3d1c5e14beb049bafadb3dbdf646dfb94b87e24d4ec7b31b7279ef906a8ea9b6a513f + languageName: node + linkType: hard + "mime-db@npm:~1.23.0": version: 1.23.0 resolution: "mime-db@npm:1.23.0" @@ -28345,6 +28723,15 @@ hexo-filter-github-emojis@arturi/hexo-filter-github-emojis: languageName: node linkType: hard +"mime-types@npm:~2.1.34": + version: 2.1.35 + resolution: "mime-types@npm:2.1.35" + dependencies: + mime-db: 1.52.0 + checksum: 89a5b7f1def9f3af5dad6496c5ed50191ae4331cc5389d7c521c8ad28d5fdad2d06fd81baf38fed813dc4e46bb55c8145bb0ff406330818c9cf712fb2e9b3836 + languageName: node + linkType: hard + "mime@npm:1.4.1": version: 1.4.1 resolution: "mime@npm:1.4.1" @@ -29012,6 +29399,13 @@ hexo-filter-github-emojis@arturi/hexo-filter-github-emojis: languageName: node linkType: hard +"negotiator@npm:0.6.3": + version: 0.6.3 + resolution: "negotiator@npm:0.6.3" + checksum: b8ffeb1e262eff7968fc90a2b6767b04cfd9842582a9d0ece0af7049537266e7b2506dfb1d107a32f06dd849ab2aea834d5830f7f4d0e5cb7d36e1ae55d021d9 + languageName: node + linkType: hard + "neo-async@npm:^2.5.0, neo-async@npm:^2.6.0, neo-async@npm:^2.6.1, neo-async@npm:^2.6.2": version: 2.6.2 resolution: "neo-async@npm:2.6.2" @@ -29989,6 +30383,15 @@ hexo-filter-github-emojis@arturi/hexo-filter-github-emojis: languageName: node linkType: hard +"on-finished@npm:2.4.1": + version: 2.4.1 + resolution: "on-finished@npm:2.4.1" + dependencies: + ee-first: 1.1.1 + checksum: d20929a25e7f0bb62f937a425b5edeb4e4cde0540d77ba146ec9357f00b0d497cdb3b9b05b9c8e46222407d1548d08166bff69cc56dfa55ba0e4469228920ff0 + languageName: node + linkType: hard + "on-finished@npm:^2.3.0, on-finished@npm:~2.3.0": version: 2.3.0 resolution: "on-finished@npm:2.3.0" @@ -32378,7 +32781,7 @@ hexo-filter-github-emojis@arturi/hexo-filter-github-emojis: languageName: node linkType: hard -"postcss@npm:^8.4.14": +"postcss@npm:^8.4.13, postcss@npm:^8.4.14": version: 8.4.14 resolution: "postcss@npm:8.4.14" dependencies: @@ -32813,7 +33216,7 @@ hexo-filter-github-emojis@arturi/hexo-filter-github-emojis: languageName: node linkType: hard -"proxy-addr@npm:~2.0.5": +"proxy-addr@npm:~2.0.5, proxy-addr@npm:~2.0.7": version: 2.0.7 resolution: "proxy-addr@npm:2.0.7" dependencies: @@ -33017,6 +33420,15 @@ hexo-filter-github-emojis@arturi/hexo-filter-github-emojis: languageName: node linkType: hard +"qs@npm:6.10.3, qs@npm:^6.10.0": + version: 6.10.3 + resolution: "qs@npm:6.10.3" + dependencies: + side-channel: ^1.0.4 + checksum: 0fac5e6c7191d0295a96d0e83c851aeb015df7e990e4d3b093897d3ac6c94e555dbd0a599739c84d7fa46d7fee282d94ba76943983935cf33bba6769539b8019 + languageName: node + linkType: hard + "qs@npm:6.2.3": version: 6.2.3 resolution: "qs@npm:6.2.3" @@ -33031,15 +33443,6 @@ hexo-filter-github-emojis@arturi/hexo-filter-github-emojis: languageName: node linkType: hard -"qs@npm:^6.10.0": - version: 6.10.3 - resolution: "qs@npm:6.10.3" - dependencies: - side-channel: ^1.0.4 - checksum: 0fac5e6c7191d0295a96d0e83c851aeb015df7e990e4d3b093897d3ac6c94e555dbd0a599739c84d7fa46d7fee282d94ba76943983935cf33bba6769539b8019 - languageName: node - linkType: hard - "qs@npm:^6.5.1, qs@npm:^6.9.1": version: 6.10.2 resolution: "qs@npm:6.10.2" @@ -33201,6 +33604,18 @@ hexo-filter-github-emojis@arturi/hexo-filter-github-emojis: languageName: node linkType: hard +"raw-body@npm:2.5.1": + version: 2.5.1 + resolution: "raw-body@npm:2.5.1" + dependencies: + bytes: 3.1.2 + http-errors: 2.0.0 + iconv-lite: 0.4.24 + unpipe: 1.0.0 + checksum: 5362adff1575d691bb3f75998803a0ffed8c64eabeaa06e54b4ada25a0cd1b2ae7f4f5ec46565d1bec337e08b5ac90c76eaa0758de6f72a633f025d754dec29e + languageName: node + linkType: hard + "raw-body@npm:^2.3.2": version: 2.4.2 resolution: "raw-body@npm:2.4.2" @@ -35078,6 +35493,20 @@ hexo-filter-github-emojis@arturi/hexo-filter-github-emojis: languageName: node linkType: hard +"rollup@npm:^2.59.0": + version: 2.77.2 + resolution: "rollup@npm:2.77.2" + dependencies: + fsevents: ~2.3.2 + dependenciesMeta: + fsevents: + optional: true + bin: + rollup: dist/bin/rollup + checksum: 5a84fb98a6f858906bceba091430442f6c1f362b07c5fa9123b708f87e39f52640e34a189cd9a1776ceae61300055c78ba648205fa03188451539ebeb19797df + languageName: node + linkType: hard + "rollup@npm:^2.70.2": version: 2.75.4 resolution: "rollup@npm:2.75.4" @@ -35677,6 +36106,27 @@ hexo-filter-github-emojis@arturi/hexo-filter-github-emojis: languageName: node linkType: hard +"send@npm:0.18.0": + version: 0.18.0 + resolution: "send@npm:0.18.0" + dependencies: + debug: 2.6.9 + depd: 2.0.0 + destroy: 1.2.0 + encodeurl: ~1.0.2 + escape-html: ~1.0.3 + etag: ~1.8.1 + fresh: 0.5.2 + http-errors: 2.0.0 + mime: 1.6.0 + ms: 2.1.3 + on-finished: 2.4.1 + range-parser: ~1.2.1 + statuses: 2.0.1 + checksum: 74fc07ebb58566b87b078ec63e5a3e41ecd987e4272ba67b7467e86c6ad51bc6b0b0154133b6d8b08a2ddda360464f71382f7ef864700f34844a76c8027817a8 + languageName: node + linkType: hard + "send@npm:latest": version: 0.17.2 resolution: "send@npm:0.17.2" @@ -35784,6 +36234,18 @@ hexo-filter-github-emojis@arturi/hexo-filter-github-emojis: languageName: node linkType: hard +"serve-static@npm:1.15.0": + version: 1.15.0 + resolution: "serve-static@npm:1.15.0" + dependencies: + encodeurl: ~1.0.2 + escape-html: ~1.0.3 + parseurl: ~1.3.3 + send: 0.18.0 + checksum: af57fc13be40d90a12562e98c0b7855cf6e8bd4c107fe9a45c212bf023058d54a1871b1c89511c3958f70626fff47faeb795f5d83f8cf88514dbaeb2b724464d + languageName: node + linkType: hard + "server-destroy@npm:1.0.1": version: 1.0.1 resolution: "server-destroy@npm:1.0.1" @@ -36823,6 +37285,13 @@ hexo-filter-github-emojis@arturi/hexo-filter-github-emojis: languageName: node linkType: hard +"statuses@npm:2.0.1": + version: 2.0.1 + resolution: "statuses@npm:2.0.1" + checksum: 18c7623fdb8f646fb213ca4051be4df7efb3484d4ab662937ca6fbef7ced9b9e12842709872eb3020cc3504b93bde88935c9f6417489627a7786f24f8031cbcb + languageName: node + linkType: hard + "statuses@npm:>= 1.4.0 < 2, statuses@npm:>= 1.5.0 < 2, statuses@npm:~1.5.0": version: 1.5.0 resolution: "statuses@npm:1.5.0" @@ -40465,6 +40934,35 @@ hexo-filter-github-emojis@arturi/hexo-filter-github-emojis: languageName: node linkType: hard +"vite@npm:^2.7.1": + version: 2.9.14 + resolution: "vite@npm:2.9.14" + dependencies: + esbuild: ^0.14.27 + fsevents: ~2.3.2 + postcss: ^8.4.13 + resolve: ^1.22.0 + rollup: ^2.59.0 + peerDependencies: + less: "*" + sass: "*" + stylus: "*" + dependenciesMeta: + fsevents: + optional: true + peerDependenciesMeta: + less: + optional: true + sass: + optional: true + stylus: + optional: true + bin: + vite: bin/vite.js + checksum: f78b54f58482ea97d385e36873ae1aa4744c5e467c1d6d4e0835bd55494d2d8f6ce763f17c241c66104be687d5ee535b8e1e96c14210c9ba0c343fe78c58f694 + languageName: node + linkType: hard + "vite@npm:^3.0.0": version: 3.0.0 resolution: "vite@npm:3.0.0" From 16ae4adc8393598bebecf618d8b3694e8b2ce9af Mon Sep 17 00:00:00 2001 From: Antoine du Hamel Date: Thu, 30 Jun 2022 16:19:22 +0200 Subject: [PATCH 2/4] fixup! example: fix aws-companion example --- examples/aws-companion/package.json | 2 +- examples/aws-companion/server.cjs | 19 +++++++++---------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/examples/aws-companion/package.json b/examples/aws-companion/package.json index 90ac387f62..d95be1e4ad 100644 --- a/examples/aws-companion/package.json +++ b/examples/aws-companion/package.json @@ -22,7 +22,7 @@ }, "private": true, "engines": { - "node": ">=16.11.0" + "node": ">=16.15.0" }, "scripts": { "dev": "vite", diff --git a/examples/aws-companion/server.cjs b/examples/aws-companion/server.cjs index 86162e2586..281c842c18 100644 --- a/examples/aws-companion/server.cjs +++ b/examples/aws-companion/server.cjs @@ -2,8 +2,7 @@ const fs = require('node:fs') const path = require('node:path') const companion = require('@uppy/companion') -require('dotenv').config() - +require('dotenv').config({ path: path.join(__dirname, '..', '..', '.env') }) const app = require('express')() const DATA_DIR = path.join(__dirname, 'tmp') @@ -27,14 +26,14 @@ const options = { key: process.env.COMPANION_GOOGLE_KEY, secret: process.env.COMPANION_GOOGLE_SECRET, }, - s3: { - getKey: (req, filename) => `whatever/${Math.random().toString(32).slice(2)}/${filename}`, - key: process.env.COMPANION_AWS_KEY, - secret: process.env.COMPANION_AWS_SECRET, - bucket: process.env.COMPANION_AWS_BUCKET, - region: process.env.COMPANION_AWS_REGION, - endpoint: process.env.COMPANION_AWS_ENDPOINT, - }, + }, + s3: { + getKey: (req, filename) => `whatever/${Math.random().toString(32).slice(2)}/${filename}`, + key: process.env.COMPANION_AWS_KEY, + secret: process.env.COMPANION_AWS_SECRET, + bucket: process.env.COMPANION_AWS_BUCKET, + region: process.env.COMPANION_AWS_REGION, + endpoint: process.env.COMPANION_AWS_ENDPOINT, }, server: { host: 'localhost:3020' }, filePath: DATA_DIR, From 2c5e4603256d6580e86c173d13c6b4d5ccd11030 Mon Sep 17 00:00:00 2001 From: Antoine du Hamel Date: Wed, 3 Aug 2022 15:54:20 +0200 Subject: [PATCH 3/4] Update examples/aws-companion/server.cjs Co-authored-by: Merlijn Vos --- examples/aws-companion/server.cjs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/aws-companion/server.cjs b/examples/aws-companion/server.cjs index 281c842c18..dd5bd13c55 100644 --- a/examples/aws-companion/server.cjs +++ b/examples/aws-companion/server.cjs @@ -28,7 +28,7 @@ const options = { }, }, s3: { - getKey: (req, filename) => `whatever/${Math.random().toString(32).slice(2)}/${filename}`, + getKey: (req, filename) => `${crypto.randomUUID()}-${filename}`, key: process.env.COMPANION_AWS_KEY, secret: process.env.COMPANION_AWS_SECRET, bucket: process.env.COMPANION_AWS_BUCKET, From 1336565467249e5b26e2ee1c83363da0e16c9e71 Mon Sep 17 00:00:00 2001 From: Antoine du Hamel Date: Wed, 3 Aug 2022 16:01:10 +0200 Subject: [PATCH 4/4] Update examples/aws-companion/server.cjs Co-authored-by: Merlijn Vos --- examples/aws-companion/server.cjs | 1 + 1 file changed, 1 insertion(+) diff --git a/examples/aws-companion/server.cjs b/examples/aws-companion/server.cjs index dd5bd13c55..98dc312312 100644 --- a/examples/aws-companion/server.cjs +++ b/examples/aws-companion/server.cjs @@ -1,5 +1,6 @@ const fs = require('node:fs') const path = require('node:path') +const crypto = require('node:crypto') const companion = require('@uppy/companion') require('dotenv').config({ path: path.join(__dirname, '..', '..', '.env') })