Merge pull request nuxt#36 from nuxt/master

Upstream Merge

Author: gbezyuk

.eslintrc.js

@@ -1,6 +1,5 @@
 module.exports = {
   'extends': 'standard',
-  'installedESLint': true,
   'plugins': [
     'standard',
     'promise'

.gitignore

@@ -5,3 +5,5 @@ node_modules
 # logs
 npm-debug.log
 .DS_Store
+.vscode
+.idea

README.md

@@ -4,35 +4,89 @@
 
 ## Developing
 
-:warning: You must at least use `node >= 7` to start the server.
+:warning: You must at least use `node >= 8.0.0` (supports async/await) to start the server.
 
-Start a dev server on `localhost:4000`
+:warning: You must also have the main [nuxtjs.org](https://github.com/nuxt/nuxtjs.org) website repo up and running on localhost to be able to run the docs...
+
+Start a dev server on `localhost:4000`:
 
 ```bash
 npm install
 npm run dev
 ```
 
+Then access the docs via the website running on `http://nuxt:3000` (see instructions on [nuxtjs.org](https://github.com/nuxt/nuxtjs.org) repo).
+
 ## On Translations
 
 ### Russian
 
 Russian translation is maintained by Translation Gang.
-* Translation Repo — [/translation-gang/ru.docs.nuxtjs](https://github.com/translation-gang/ru.docs.nuxtjs)
+
+* Translation Repo - [/translation-gang/ru.docs.nuxtjs](https://github.com/translation-gang/ru.docs.nuxtjs)
 * Primary maintainer - [Grigoriy Beziuk](https://gbezyuk.github.io)
 * Primary translator - [Nicholas Shachmatov](https://github.com/theOnlyBoy)
 
 ### Chinese
 
 Chinese translation is maintained by AOTU Labs from China, Shenzhen.
-* Translation Repo — [/o2team/i18n-cn-nuxtjs-docs](https://github.com/o2team/i18n-cn-nuxtjs-docs)
+
+* Translation Repo - [/o2team/i18n-cn-nuxtjs-docs](https://github.com/o2team/i18n-cn-nuxtjs-docs)
 * Primary maintainer - [AOTU Labs](https://aotu.io)
 * Primary translator - [Levin Wong](http://faso.me), [Edward Chu](https://github.com/chuyik)
 
+### Japanese
+
+Japanese translation team is using a translation tool called [GitLocalize](https://gitlocalize.com) in principle. See the following "Want to help with the translation?" section. 
+
+Japanese translation is maintained by INOUE Takuya.
+
+* Translation Repo - [https://gitlocalize.com/repo/100/ja](https://gitlocalize.com/repo/100/ja)
+* Primary maintainer - [INOUE Takuya](http://blog.inouetakuya.info/)
+* Primary translator - [INOUE Takuya](https://github.com/inouetakuya)
+
+### Korean
+
+Korean translation is maintained by Taewoong La.
+
+* Translation Repo - [/DiyLecko/ko.docs.nuxtjs](https://github.com/DiyLecko/ko.docs.nuxtjs)
+* Primary maintainer - [Taewoong La](http://blog.naver.com/diy_lecko)
+* Primary translator - [june](http://jicjjang.github.io), [wanybae](https://github.com/wanybae), [rellario](https://github.com/rellario)
+
+### French
+
+French translation is maintained by [Vuejs-FR](https://github.com/vuejs-fr/nuxt/issues/1) Team.
+
+* Translation Repo - [/vuejs-fr/nuxt](https://github.com/vuejs-fr/nuxt)
+* Primary maintainer - [Bruno Lesieur](https://www.lesieur.name/) ([Orchard ID](https://www.orchard-id.com/))
+* Primary translator - [Julien Grünhagel](https://rspt.io/) ([laruche](https://laruche.io))
+
+### Indonesian
+
+Indonesian translation is maintained by [Nuxt.js Indonesian Community](https://github.com/nuxtjs-id) Team.
+
+* Translation Repo - [https://gitlocalize.com/repo/100/id](https://gitlocalize.com/repo/100/id)
+* Primary maintainer - [Achan](http://achan.id/)
+* Primary translator - [afrianjunior](https://github.com/afrianjunior), [fikrizufri](https://github.com/fikrizufri), [huiralb](https://github.com/huiralb), [jefrydco](https://github.com/jefrydco), [muhibbudins](https://github.com/muhibbudins), [nusendra](https://github.com/nusendra), [perjakasunda](https://github.com/perjakasunda), [tapitapeh](https://github.com/tapitapeh), [wahwahid](https://github.com/wahwahid)
+
+
+
 ### Want to help with the translation?
 
-If you feel okay with translating sorta alone, just fork the repo, create a "work-in-progress" pull request (mark it with [WIP], see [Russian translation](https://github.com/nuxt/docs/pull/3) if you need an example) — and just go on.
+[gl]: https://gitlocalize.com
+[gl-help]: https://docs.gitlocalize.com/ 
+[gl-issue-tracker]: https://github.com/gitlocalize/feedback
+[gl-repo]: https://gitlocalize.com/repo/100
+
+We are using a translation tool called [GitLocalize][gl]. 
+
+Follow these steps to get started with your contribution:
 
-If you are more of a team player, maybe Translation Gang is for you? Then just let us know somehow that you're ready to join this international open-source translators community. Feel free to contact [Grigoriy Beziuk](https://gbezyuk.github.io) or anybody else from the team.
+1. Go to [GitLocalize's nuxt/docs repository][gl-repo].
+1. Sign up using your GitHub account :octocat:.
+1. Find the document you are going to translate. 
+1. Happy translating :sparkles: .
+1. When you are done, send the translation for reviews.
+1. Reviewed translation will be sent as a Pull Request to GitHub by language admin in the community.
 
-And thank you in advance ;)
+To learn more about how GitLocalize works, visit their [help page][gl-help]. If you find any issues or feature requests, please file them in [GitLocalize's issue tracker][gl-issue-tracker].

api.js

@@ -40,14 +40,18 @@ async function getReleases () {
   if (process.env.GITHUB_TOKEN) {
     options.headers = { 'Authorization': `token ${process.env.GITHUB_TOKEN}` }
   }
-  const res = await axios(options)
-  RELEASES = res.data.filter((r) => !r.draft).map((release) => {
-    return {
-      name: release.name,
-      date: release.published_at,
-      body: marked(release.body)
-    }
-  })
+  try {
+    const res = await axios(options)
+    RELEASES = res.data.filter((r) => !r.draft).map((release) => {
+      return {
+        name: release.name,
+        date: release.published_at,
+        body: marked(release.body)
+      }
+    })
+  } catch (e) {
+    console.error('Could not fetch nuxt.js release notes.')
+  }
   // Refresh every 15 minutes
   setTimeout(getReleases, 15 * 60 * 1000)
 }
@@ -217,7 +221,7 @@ const server = micro(async function (req, res) {
   send(res, 200, _DOC_FILES_[path])
 })
 
-getFiles()
+module.exports = getFiles()
 .then(() => getReleases())
 .then(() => {
   if (process.env.NODE_ENV !== 'production') {
@@ -226,4 +230,5 @@ getFiles()
   const port = process.env.PORT || 4000
   server.listen(port)
   console.log(`Server listening on localhost:${port}`)
+  return server
 })