Update require() paths in examples.

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,

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')
   }
 })
 

examples/aws-uppy-server/aliasify.js

@@ -1,7 +0,0 @@
-const path = require('path')
-
-module.exports = {
-  replacements: {
-    '^uppy/lib/(.*?)$': path.join(__dirname, '../../src/$1')
-  }
-}

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,

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",

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 })

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"
+    }
+  }
+}

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,

examples/custom-provider/client/aliasify.js

@@ -1,7 +0,0 @@
-const path = require('path')
-
-module.exports = {
-  replacements: {
-    '^uppy/lib/(.*?)$': path.join(__dirname, '../../../src/$1')
-  }
-}

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,

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",

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,

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')
         }
       }]
     ]

examples/multiple-instances/aliasify.js

@@ -1,7 +0,0 @@
-const path = require('path')
-
-module.exports = {
-  replacements: {
-    '^uppy/lib/(.*?)$': path.join(__dirname, '../../src/$1')
-  }
-}

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.

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",

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) {

examples/react-example/aliasify.js

@@ -1,7 +0,0 @@
-const path = require('path')
-
-module.exports = {
-  replacements: {
-    '^uppy/lib/(.*?)$': path.join(__dirname, '../../src/$1')
-  }
-}

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",

examples/redux/aliasify.js

@@ -1,7 +0,0 @@
-const path = require('path')
-
-module.exports = {
-  replacements: {
-    '^uppy/lib/(.*?)$': path.join(__dirname, '../../src/$1')
-  }
-}

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) {

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"

examples/xhr-bundle/aliasify.js

@@ -1,7 +0,0 @@
-const path = require('path')
-
-module.exports = {
-  replacements: {
-    '^uppy/lib/(.*?)$': path.join(__dirname, '../../src/$1')
-  }
-}

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,

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",