From a4822ee90d7859cb2e4192a4c48184fbdd229302 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9e=20Kooi?= Date: Mon, 18 Jun 2018 11:45:15 +0200 Subject: [PATCH] Update require() paths in examples. --- examples/aws-presigned-url/main.js | 6 +++--- examples/aws-presigned-url/serve.js | 4 ++-- examples/aws-uppy-server/aliasify.js | 7 ------- examples/aws-uppy-server/main.js | 10 +++++----- examples/aws-uppy-server/package.json | 6 +++++- examples/bundled-example/main.js | 5 ++--- examples/bundled-example/package.json | 16 ++++++++++++++++ .../custom-provider/client/MyCustomProvider.js | 8 ++++---- examples/custom-provider/client/aliasify.js | 7 ------- examples/custom-provider/client/main.js | 8 ++++---- examples/custom-provider/package.json | 6 +++++- examples/digitalocean-spaces/main.js | 6 +++--- examples/digitalocean-spaces/server.js | 4 ++-- examples/multiple-instances/aliasify.js | 7 ------- examples/multiple-instances/main.js | 6 +++--- examples/multiple-instances/package.json | 6 +++++- examples/react-example/App.js | 8 ++++---- examples/react-example/aliasify.js | 7 ------- examples/react-example/package.json | 6 +++++- examples/redux/aliasify.js | 7 ------- examples/redux/main.js | 8 ++++---- examples/redux/package.json | 6 +++++- examples/xhr-bundle/aliasify.js | 7 ------- examples/xhr-bundle/main.js | 6 +++--- examples/xhr-bundle/package.json | 6 +++++- 25 files changed, 85 insertions(+), 88 deletions(-) delete mode 100644 examples/aws-uppy-server/aliasify.js create mode 100644 examples/bundled-example/package.json delete mode 100644 examples/custom-provider/client/aliasify.js delete mode 100644 examples/multiple-instances/aliasify.js delete mode 100644 examples/react-example/aliasify.js delete mode 100644 examples/redux/aliasify.js delete mode 100644 examples/xhr-bundle/aliasify.js diff --git a/examples/aws-presigned-url/main.js b/examples/aws-presigned-url/main.js index cb9377cd8..bcd6f565f 100644 --- a/examples/aws-presigned-url/main.js +++ b/examples/aws-presigned-url/main.js @@ -1,6 +1,6 @@ -const Uppy = require('uppy/lib/core/Core.js') -const Dashboard = require('uppy/lib/plugins/Dashboard') -const AwsS3 = require('uppy/lib/plugins/AwsS3') +const Uppy = require('@uppy/core') +const Dashboard = require('@uppy/dashboard') +const AwsS3 = require('@uppy/aws-s3') const uppy = Uppy({ debug: true, diff --git a/examples/aws-presigned-url/serve.js b/examples/aws-presigned-url/serve.js index ef93be8cc..6a0486f1d 100644 --- a/examples/aws-presigned-url/serve.js +++ b/examples/aws-presigned-url/serve.js @@ -20,8 +20,8 @@ b.plugin(watchify) b.transform(babelify) b.transform(aliasify, { - replacements: { - '^uppy/lib/(.*?)$': path.join(__dirname, '../../src/$1') + aliases: { + '@uppy': path.join(__dirname, '../../packages/@uppy') } }) diff --git a/examples/aws-uppy-server/aliasify.js b/examples/aws-uppy-server/aliasify.js deleted file mode 100644 index 694ca67e1..000000000 --- a/examples/aws-uppy-server/aliasify.js +++ /dev/null @@ -1,7 +0,0 @@ -const path = require('path') - -module.exports = { - replacements: { - '^uppy/lib/(.*?)$': path.join(__dirname, '../../src/$1') - } -} diff --git a/examples/aws-uppy-server/main.js b/examples/aws-uppy-server/main.js index d70f83fa9..80c04e255 100644 --- a/examples/aws-uppy-server/main.js +++ b/examples/aws-uppy-server/main.js @@ -1,8 +1,8 @@ -const Uppy = require('uppy/lib/core') -const GoogleDrive = require('uppy/lib/plugins/GoogleDrive') -const Webcam = require('uppy/lib/plugins/Webcam') -const Dashboard = require('uppy/lib/plugins/Dashboard') -const AwsS3 = require('uppy/lib/plugins/AwsS3') +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') const uppy = Uppy({ debug: true, diff --git a/examples/aws-uppy-server/package.json b/examples/aws-uppy-server/package.json index d036dcef4..89b04697a 100644 --- a/examples/aws-uppy-server/package.json +++ b/examples/aws-uppy-server/package.json @@ -7,7 +7,11 @@ "start:server": "node server.js", "start": "npm-run-all --serial copy --parallel start:*" }, - "aliasify": "./aliasify.js", + "aliasify": { + "aliases": { + "@uppy": "../../packages/@uppy" + } + }, "dependencies": { "aliasify": "^2.1.0", "babelify": "^7.3.0", diff --git a/examples/bundled-example/main.js b/examples/bundled-example/main.js index e593d33ad..e96751ea9 100644 --- a/examples/bundled-example/main.js +++ b/examples/bundled-example/main.js @@ -1,8 +1,7 @@ const Uppy = require('@uppy/core') const Dashboard = require('@uppy/dashboard') const Instagram = require('@uppy/instagram') -// Not ported yet -// const GoogleDrive = require('@uppy/google-drive') +const GoogleDrive = require('@uppy/google-drive') const Webcam = require('@uppy/webcam') const Tus = require('@uppy/tus') const Form = require('@uppy/form') @@ -29,7 +28,7 @@ const uppy = Uppy({ proudlyDisplayPoweredByUppy: true, note: '2 files, images and video only' }) - // .use(GoogleDrive, { target: Dashboard, serverUrl: 'http://localhost:3020' }) + .use(GoogleDrive, { target: Dashboard, serverUrl: 'http://localhost:3020' }) .use(Instagram, { target: Dashboard, serverUrl: 'http://localhost:3020' }) .use(Webcam, { target: Dashboard }) .use(Tus, { endpoint: TUS_ENDPOINT }) diff --git a/examples/bundled-example/package.json b/examples/bundled-example/package.json new file mode 100644 index 000000000..0d27d9d58 --- /dev/null +++ b/examples/bundled-example/package.json @@ -0,0 +1,16 @@ +{ + "dependencies": { + "aliasify": "^2.1.0", + "babel-core": "^6.26.3", + "babelify": "^8.0.0", + "watchify": "^3.11.0" + }, + "scripts": { + "watch": "watchify -t babelify -t aliasify main.js -o bundle.js -vd" + }, + "aliasify": { + "aliases": { + "@uppy": "../../packages/@uppy" + } + } +} diff --git a/examples/custom-provider/client/MyCustomProvider.js b/examples/custom-provider/client/MyCustomProvider.js index 974f6c65c..a290f0556 100644 --- a/examples/custom-provider/client/MyCustomProvider.js +++ b/examples/custom-provider/client/MyCustomProvider.js @@ -1,6 +1,6 @@ -const Plugin = require('uppy/lib/core/Plugin') -const { Provider } = require('uppy/lib/server') -const { ProviderView } = require('uppy/lib/views') +const Plugin = require('@uppy/core/lib/Plugin') +const { Provider } = require('@uppy/server-utils') +const ProviderViews = require('@uppy/provider-views') const { h } = require('preact') module.exports = class MyCustomProvider extends Plugin { @@ -29,7 +29,7 @@ module.exports = class MyCustomProvider extends Plugin { } install () { - this.view = new ProviderView(this) + this.view = new ProviderViews(this) // Set default state this.setPluginState({ authenticated: false, diff --git a/examples/custom-provider/client/aliasify.js b/examples/custom-provider/client/aliasify.js deleted file mode 100644 index 459550363..000000000 --- a/examples/custom-provider/client/aliasify.js +++ /dev/null @@ -1,7 +0,0 @@ -const path = require('path') - -module.exports = { - replacements: { - '^uppy/lib/(.*?)$': path.join(__dirname, '../../../src/$1') - } -} diff --git a/examples/custom-provider/client/main.js b/examples/custom-provider/client/main.js index ab7df86ac..cba3b9727 100644 --- a/examples/custom-provider/client/main.js +++ b/examples/custom-provider/client/main.js @@ -1,8 +1,8 @@ -const Uppy = require('uppy/lib/core') -const GoogleDrive = require('uppy/lib/plugins/GoogleDrive') -const Tus = require('uppy/lib/plugins/Tus') +const Uppy = require('@uppy/core') +const GoogleDrive = require('@uppy/google-drive') +const Tus = require('@uppy/tus') const MyCustomProvider = require('./MyCustomProvider') -const Dashboard = require('uppy/lib/plugins/Dashboard') +const Dashboard = require('@uppy/dashboard') const uppy = Uppy({ debug: true, diff --git a/examples/custom-provider/package.json b/examples/custom-provider/package.json index dd3bdbe87..c7384474c 100644 --- a/examples/custom-provider/package.json +++ b/examples/custom-provider/package.json @@ -7,7 +7,11 @@ "start:server": "node server/index.js", "start": "npm-run-all --serial copy --parallel start:*" }, - "aliasify": "client/aliasify.js", + "aliasify": { + "aliases": { + "@uppy": "../../packages/@uppy" + } + }, "dependencies": { "aliasify": "^2.1.0", "babelify": "^7.3.0", diff --git a/examples/digitalocean-spaces/main.js b/examples/digitalocean-spaces/main.js index 51134326f..1130fe0b6 100644 --- a/examples/digitalocean-spaces/main.js +++ b/examples/digitalocean-spaces/main.js @@ -1,6 +1,6 @@ -const Uppy = require('uppy/lib/core') -const Dashboard = require('uppy/lib/plugins/Dashboard') -const AwsS3 = require('uppy/lib/plugins/AwsS3') +const Uppy = require('@uppy/core') +const Dashboard = require('@uppy/dashboard') +const AwsS3 = require('@uppy/aws-s3') const uppy = Uppy({ debug: true, diff --git a/examples/digitalocean-spaces/server.js b/examples/digitalocean-spaces/server.js index 5b9e43fec..4dde2b917 100644 --- a/examples/digitalocean-spaces/server.js +++ b/examples/digitalocean-spaces/server.js @@ -58,8 +58,8 @@ budo(path.join(__dirname, 'main.js'), { transform: [ 'babelify', ['aliasify', { - replacements: { - '^uppy/lib/(.*?)$': path.join(__dirname, '../../src/$1') + aliases: { + '@uppy': path.join(__dirname, '../../packages/@uppy') } }] ] diff --git a/examples/multiple-instances/aliasify.js b/examples/multiple-instances/aliasify.js deleted file mode 100644 index 694ca67e1..000000000 --- a/examples/multiple-instances/aliasify.js +++ /dev/null @@ -1,7 +0,0 @@ -const path = require('path') - -module.exports = { - replacements: { - '^uppy/lib/(.*?)$': path.join(__dirname, '../../src/$1') - } -} diff --git a/examples/multiple-instances/main.js b/examples/multiple-instances/main.js index 6a0c9a234..15802fafe 100644 --- a/examples/multiple-instances/main.js +++ b/examples/multiple-instances/main.js @@ -1,6 +1,6 @@ -const Uppy = require('uppy/lib/core') -const Dashboard = require('uppy/lib/plugins/Dashboard') -const GoldenRetriever = require('uppy/lib/plugins/GoldenRetriever') +const Uppy = require('@uppy/core') +const Dashboard = require('@uppy/dashboard') +const GoldenRetriever = require('@uppy/golden-retriever') // Initialise two Uppy instances with the GoldenRetriever plugin, // but with different `id`s. diff --git a/examples/multiple-instances/package.json b/examples/multiple-instances/package.json index 72c7d8254..b45cb1012 100644 --- a/examples/multiple-instances/package.json +++ b/examples/multiple-instances/package.json @@ -5,7 +5,11 @@ "css": "cp ../../dist/uppy.min.css .", "start": "npm run css && budo main.js:bundle.js -- -t babelify -g aliasify" }, - "aliasify": "./aliasify.js", + "aliasify": { + "aliases": { + "@uppy": "../../packages/@uppy" + } + }, "dependencies": {}, "devDependencies": { "aliasify": "^2.1.0", diff --git a/examples/react-example/App.js b/examples/react-example/App.js index 75043761c..d02b0f037 100644 --- a/examples/react-example/App.js +++ b/examples/react-example/App.js @@ -1,9 +1,9 @@ /* eslint-disable */ const React = require('react') -const Uppy = require('uppy/lib/core') -const Tus = require('uppy/lib/plugins/Tus') -const GoogleDrive = require('uppy/lib/plugins/GoogleDrive') -const { Dashboard, DashboardModal, DragDrop, ProgressBar } = require('uppy/lib/react') +const Uppy = require('@uppy/core') +const Tus = require('@uppy/tus') +const GoogleDrive = require('@uppy/google-drive') +const { Dashboard, DashboardModal, DragDrop, ProgressBar } = require('@uppy/react') module.exports = class App extends React.Component { constructor (props) { diff --git a/examples/react-example/aliasify.js b/examples/react-example/aliasify.js deleted file mode 100644 index 694ca67e1..000000000 --- a/examples/react-example/aliasify.js +++ /dev/null @@ -1,7 +0,0 @@ -const path = require('path') - -module.exports = { - replacements: { - '^uppy/lib/(.*?)$': path.join(__dirname, '../../src/$1') - } -} diff --git a/examples/react-example/package.json b/examples/react-example/package.json index b044b4707..f9640131b 100644 --- a/examples/react-example/package.json +++ b/examples/react-example/package.json @@ -5,7 +5,11 @@ "css": "cp ../../dist/uppy.min.css .", "start": "npm run css && budo main.js:bundle.js -- -r react:react -r react-dom:react-dom -t babelify -g aliasify" }, - "aliasify": "./aliasify.js", + "aliasify": { + "aliases": { + "@uppy": "../../packages/@uppy" + } + }, "dependencies": { "babel-preset-react": "^6.24.1", "react": "^15.6.1", diff --git a/examples/redux/aliasify.js b/examples/redux/aliasify.js deleted file mode 100644 index 694ca67e1..000000000 --- a/examples/redux/aliasify.js +++ /dev/null @@ -1,7 +0,0 @@ -const path = require('path') - -module.exports = { - replacements: { - '^uppy/lib/(.*?)$': path.join(__dirname, '../../src/$1') - } -} diff --git a/examples/redux/main.js b/examples/redux/main.js index e93612df8..ec18eee0f 100644 --- a/examples/redux/main.js +++ b/examples/redux/main.js @@ -1,9 +1,9 @@ const { createStore, compose, combineReducers, applyMiddleware } = require('redux') const logger = require('redux-logger').default -const Uppy = require('uppy/lib/core') -const uppyReduxStore = require('uppy/lib/store/ReduxStore') -const Dashboard = require('uppy/lib/plugins/Dashboard') -const Tus = require('uppy/lib/plugins/Tus') +const Uppy = require('@uppy/core') +const uppyReduxStore = require('@uppy/store-redux') +const Dashboard = require('@uppy/dashboard') +const Tus = require('@uppy/tus') function counter (state = 0, action) { switch (action.type) { diff --git a/examples/redux/package.json b/examples/redux/package.json index f1d4b06d3..a729a9160 100644 --- a/examples/redux/package.json +++ b/examples/redux/package.json @@ -5,7 +5,11 @@ "css": "cp ../../dist/uppy.min.css .", "start": "npm run css && budo main.js:bundle.js -- -t babelify -g aliasify" }, - "aliasify": "./aliasify.js", + "aliasify": { + "aliases": { + "@uppy": "../../packages/@uppy" + } + }, "dependencies": { "redux": "^3.7.2", "redux-logger": "^3.0.6" diff --git a/examples/xhr-bundle/aliasify.js b/examples/xhr-bundle/aliasify.js deleted file mode 100644 index 694ca67e1..000000000 --- a/examples/xhr-bundle/aliasify.js +++ /dev/null @@ -1,7 +0,0 @@ -const path = require('path') - -module.exports = { - replacements: { - '^uppy/lib/(.*?)$': path.join(__dirname, '../../src/$1') - } -} diff --git a/examples/xhr-bundle/main.js b/examples/xhr-bundle/main.js index 94b228136..61b8490a3 100644 --- a/examples/xhr-bundle/main.js +++ b/examples/xhr-bundle/main.js @@ -1,6 +1,6 @@ -const Uppy = require('uppy/lib/core') -const Dashboard = require('uppy/lib/plugins/Dashboard') -const XHRUpload = require('uppy/lib/plugins/XHRUpload') +const Uppy = require('@uppy/core') +const Dashboard = require('@uppy/dashboard') +const XHRUpload = require('@uppy/xhrupload') const uppy = Uppy({ autoProceed: false, diff --git a/examples/xhr-bundle/package.json b/examples/xhr-bundle/package.json index ad42e67ed..98b1b000e 100644 --- a/examples/xhr-bundle/package.json +++ b/examples/xhr-bundle/package.json @@ -7,7 +7,11 @@ "start:server": "node serve.js", "start": "run-p start:*" }, - "aliasify": "./aliasify.js", + "aliasify": { + "aliases": { + "@uppy": "../../packages/@uppy" + } + }, "dependencies": { "cors": "^2.8.4", "express": "^4.16.2",