Switch domains from uppyjs.io->uppy.io

.travis.yml

@@ -16,7 +16,7 @@ script:
   # Automatically deploy website onto gh-pages (if master and not PR)
   # Don't do this in `after_success`, because then failures won't bubble up
   - git config --global user.name 'Uppy Bot'
-  - git config --global user.email 'uppybot@uppyjs.io'
+  - git config --global user.email 'uppybot@uppy.io'
   - if [ "${TRAVIS_PULL_REQUEST}" == "false" ] && [ "${TRAVIS_BRANCH}" == "master" ]; then npm run web:deploy; else echo "Skipping for non-master/prs"; fi
 
 env:

README.md

@@ -4,7 +4,7 @@ A work in progress - you'll find nothing useful here yet.
 
 But if you're here to dig in, these are some places you might find interesting:
 
- - Our website (under construction) [http://uppyjs.io/](http://uppyjs.io/)
+ - Our website (under construction) [http://uppy.io/](http://uppy.io/)
  - Architecture in [`website/src/api/architecture.md`](website/src/api/architecture.md)
  - Contributor's guide in [`website/src/guide/contributing.md`](website/src/guide/contributing.md)
  - Open todos in for a minimum valuable product [`CHANGELOG.md`](CHANGELOG.md#todo)

website/_config.yml

@@ -11,7 +11,7 @@ uppy_gz_size: "121.27"
 
 # Theme
 google_analytics: UA-63083-12
-root_domain: uppyjs.io
+root_domain: uppy.io
 
 # Site
 title: Uppy
@@ -28,12 +28,12 @@ description_secondary: >
   support for adding their uploading and encoding backend, but this is opt-in, and you can just as easily
   roll your own. Uppy is in the early stages of development and should not be used for anything serious yet.
 author: Transloadit
-email: uppybot@uppyjs.io
+email: uppybot@uppy.io
 language: English
 
 # URL
 ## If your site is put in a subdirectory, set url as 'http://yoursite.com/child' and root as '/child/'
-url: http://uppyjs.io
+url: http://uppy.io
 root: /
 permalink: :year/:month/:day/:title/
 tag_dir: tags

website/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "uppyjs.io",
+  "name": "uppy.io",
   "version": "0.0.1",
   "private": true,
   "hexo": {

website/src/CNAME

@@ -1 +1 @@
-uppyjs.io
+uppy.io

website/src/guide/contributing.md

@@ -18,7 +18,7 @@ Our website's examples section is also our playground, read "Website Development
 
 ## Website Development
 
-We keep the [uppyjs.io](http://uppyjs.io) website in `./website` for so it's easy to keep docs & code in sync as we're still iterating at high velocity. For those reading this screaming murder, [HashiCorp does this](https://github.com/hashicorp/terraform/tree/master/website) for all their projects, and it's working well for them on a scale vastly more impressive than Uppy's.
+We keep the [uppy.io](http://uppy.io) website in `./website` for so it's easy to keep docs & code in sync as we're still iterating at high velocity. For those reading this screaming murder, [HashiCorp does this](https://github.com/hashicorp/terraform/tree/master/website) for all their projects, and it's working well for them on a scale vastly more impressive than Uppy's.
 
 The site is built with [Hexo](http://hexo.io/), and Travis automatically deploys this onto GitHub Pages (it overwrites the `gh-pages` branch with Hexo's build at every change to `master`). The content is written in Markdown and located in `./website/src`. Feel free to fork & hack!  
 

website/themes/uppy/source/js/common.js

@@ -192,7 +192,7 @@
   //   if (version.indexOf('1.') !== 0) {
   //     version = version.replace('.', '')
   //     var section = window.location.pathname.match(/\/(\w+?)\//)[1]
-  //     window.location.assign('http://' + version + '.uppyjs.io/' + section + '/')
+  //     window.location.assign('http://' + version + '.uppy.io/' + section + '/')
   //   } else {
   //     // TODO when 1.x is out
   //   }