v2.5.0

2024-11-23 14:15:13 +00:00 · 2019-03-21 16:38:08 +03:30 · 2019-03-21 16:38:08 +03:30 · f457f5cac8
commit f457f5cac8
parent eef7f69509 e2c296321b
427 changed files with 11997 additions and 3649 deletions
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@ -141,9 +141,16 @@ jobs:
      - checkout
      - attach_workspace:
          at: ~/project
+      - run:
+          name: Download Chromium
+          command: |
+            cd /opt
+            sudo wget https://commondatastorage.googleapis.com/chromium-browser-snapshots/Linux_x64/641430/chrome-linux.zip
+            sudo unzip chrome-linux.zip
+            sudo ln -s `pwd`/chrome-linux/chrome /bin/chromium
      - run:
          name: E2E Tests
-          command: yarn test:e2e && yarn coverage
+          command: CHROME_PATH=/bin/chromium yarn test:e2e && yarn coverage

  test-types:
    <<: *defaults
--- a/.eslintignore
+++ b/.eslintignore
@ -8,7 +8,8 @@ coverage

 ## cofeescript
 examples/coffeescript/pages/index.vue
-
+examples/pug-stylus-coffee/
+examples/typescript-eslint/
 # Packages

 # vue-app
--- a/.gitignore
+++ b/.gitignore
@ -17,6 +17,7 @@ distributions/*/LICENSE

 # Other
 .nuxt*
+!.nuxtignore
 .cache

 # Dist folders
@ -54,3 +55,4 @@ coverage
 Network Trash Folder
 Temporary Items
 .apdisk
+commits.md
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -3,6 +3,93 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+# [2.5.0](https://github.com/nuxt/nuxt.js/compare/v2.4.5...v2.5.0) (2019-03-21)
+
+
+### Bug Fixes
+
+* **builder, vue-app:** order of plugin execution based on order in array ([#5163](https://github.com/nuxt/nuxt.js/issues/5163)) ([a867dbd](https://github.com/nuxt/nuxt.js/commit/a867dbd))
+* **cli:** enable server for implicit SPA generate in nuxt build ([c46def7](https://github.com/nuxt/nuxt.js/commit/c46def7))
+* **pkg:** add missing dependencies ([665f15a](https://github.com/nuxt/nuxt.js/commit/665f15a))
+* **postcss:** default to preset-env and cssnano last ([#5215](https://github.com/nuxt/nuxt.js/issues/5215)) ([adf423a](https://github.com/nuxt/nuxt.js/commit/adf423a))
+* **server:** handle decodeURI error ([#5243](https://github.com/nuxt/nuxt.js/issues/5243)) ([5b7f6d7](https://github.com/nuxt/nuxt.js/commit/5b7f6d7))
+* **ts:** deprecate `isClient`, `isServer`, `isStatic` ([#5211](https://github.com/nuxt/nuxt.js/issues/5211)) ([29c3c42](https://github.com/nuxt/nuxt.js/commit/29c3c42))
+* **types:** reflect chainlable NuxtLoading methods ([#5104](https://github.com/nuxt/nuxt.js/issues/5104)) ([a6756a4](https://github.com/nuxt/nuxt.js/commit/a6756a4))
+* **vua-app:** clone mount error to prevent mutating read-only error object ([#5214](https://github.com/nuxt/nuxt.js/issues/5214)) ([37006f6](https://github.com/nuxt/nuxt.js/commit/37006f6))
+* **vue-app:** avoid css chunk error ([#5173](https://github.com/nuxt/nuxt.js/issues/5173)) ([41028a4](https://github.com/nuxt/nuxt.js/commit/41028a4))
+* **vue-app:** decode router base to support unicode characters ([#5297](https://github.com/nuxt/nuxt.js/issues/5297)) ([3ac01df](https://github.com/nuxt/nuxt.js/commit/3ac01df))
+* **vue-app:** duplicated router.base when using context.redirect(object) ([#5290](https://github.com/nuxt/nuxt.js/issues/5290)) ([cf02e82](https://github.com/nuxt/nuxt.js/commit/cf02e82))
+* **vue-app:** multiple named views cause invalid syntax ([#5262](https://github.com/nuxt/nuxt.js/issues/5262)) ([d03a61b](https://github.com/nuxt/nuxt.js/commit/d03a61b))
+* **webpack:** always resolve core-js to v3 ([#5307](https://github.com/nuxt/nuxt.js/issues/5307)) ([65c1f86](https://github.com/nuxt/nuxt.js/commit/65c1f86))
+* **webpack:** clone `config.entry` (fixes [#4849](https://github.com/nuxt/nuxt.js/issues/4849)) ([#5236](https://github.com/nuxt/nuxt.js/issues/5236)) ([8216765](https://github.com/nuxt/nuxt.js/commit/8216765))
+* **webpack:** loaders in extend config is broken ([#5292](https://github.com/nuxt/nuxt.js/issues/5292)) ([0eb5ed9](https://github.com/nuxt/nuxt.js/commit/0eb5ed9))
+* await buildDone hook ([#4955](https://github.com/nuxt/nuxt.js/issues/4955)) ([5c08db2](https://github.com/nuxt/nuxt.js/commit/5c08db2))
+* bundle resources other than js(x)/json in node_modules ([#4913](https://github.com/nuxt/nuxt.js/issues/4913)) ([268851f](https://github.com/nuxt/nuxt.js/commit/268851f))
+* correct public path in generation and start ([#5202](https://github.com/nuxt/nuxt.js/issues/5202)) ([648062c](https://github.com/nuxt/nuxt.js/commit/648062c))
+* correct socket address in use error message ([2eb1965](https://github.com/nuxt/nuxt.js/commit/2eb1965))
+* default for-exit to false to prevent dev exit ([a347ef9](https://github.com/nuxt/nuxt.js/commit/a347ef9))
+* disable "analyze" for nuxt generate ([#4975](https://github.com/nuxt/nuxt.js/issues/4975)) ([574a2eb](https://github.com/nuxt/nuxt.js/commit/574a2eb))
+* disable parallel build when extractCSS is enabled ([aad46ed](https://github.com/nuxt/nuxt.js/commit/aad46ed))
+* dont force exit when it was explicitly disabled ([#4973](https://github.com/nuxt/nuxt.js/issues/4973)) ([3e9eee2](https://github.com/nuxt/nuxt.js/commit/3e9eee2))
+* extra properties in templateFiles ([#4925](https://github.com/nuxt/nuxt.js/issues/4925)) ([ca19124](https://github.com/nuxt/nuxt.js/commit/ca19124))
+* fix non standard esm modifications ([fb87a55](https://github.com/nuxt/nuxt.js/commit/fb87a55))
+* improve nuxt version number when running from git ([#4946](https://github.com/nuxt/nuxt.js/issues/4946)) ([92803b2](https://github.com/nuxt/nuxt.js/commit/92803b2))
+* keep-alive component data should not be updated ([#5188](https://github.com/nuxt/nuxt.js/issues/5188)) ([1ea8661](https://github.com/nuxt/nuxt.js/commit/1ea8661))
+* not send Server-Timing header if no timing info ([d9a0b5f](https://github.com/nuxt/nuxt.js/commit/d9a0b5f))
+* publicPath is not reactive in dev restarting ([#5227](https://github.com/nuxt/nuxt.js/issues/5227)) ([1fb7538](https://github.com/nuxt/nuxt.js/commit/1fb7538))
+* refactor file watchers (chokidar/linux workaround) ([#4950](https://github.com/nuxt/nuxt.js/issues/4950)) ([5ec5932](https://github.com/nuxt/nuxt.js/commit/5ec5932))
+* relax lock settings ([#5280](https://github.com/nuxt/nuxt.js/issues/5280)) ([65a431d](https://github.com/nuxt/nuxt.js/commit/65a431d))
+* respect namespaced in store module ([#5189](https://github.com/nuxt/nuxt.js/issues/5189)) ([9e1ef88](https://github.com/nuxt/nuxt.js/commit/9e1ef88))
+* Unexpected token .... Expected a property name in Safari ([eef7f69](https://github.com/nuxt/nuxt.js/commit/eef7f69))
+* **test:** unhandled open handles ([858c9ee](https://github.com/nuxt/nuxt.js/commit/858c9ee))
+* **vue-app:** use browser to handle scrolling position on page reload and back-navigation from other sites ([#5080](https://github.com/nuxt/nuxt.js/issues/5080)) ([ee87f4c](https://github.com/nuxt/nuxt.js/commit/ee87f4c))
+* remove cache-loader for external resources ([#4915](https://github.com/nuxt/nuxt.js/issues/4915)) ([0223e56](https://github.com/nuxt/nuxt.js/commit/0223e56))
+* revert templatFiles name ([#4924](https://github.com/nuxt/nuxt.js/issues/4924)) ([f70645e](https://github.com/nuxt/nuxt.js/commit/f70645e))
+* trailing comma in tsconfig ([#5061](https://github.com/nuxt/nuxt.js/issues/5061)) ([1fb44d9](https://github.com/nuxt/nuxt.js/commit/1fb44d9))
+* warn when using array postcss configuration ([#4936](https://github.com/nuxt/nuxt.js/issues/4936)) ([422155e](https://github.com/nuxt/nuxt.js/commit/422155e))
+
+
+### Code Refactoring
+
+* **ts:** better DX for typescript support ([#5079](https://github.com/nuxt/nuxt.js/issues/5079)) ([920f444](https://github.com/nuxt/nuxt.js/commit/920f444))
+
+
+### Features
+
+* loading screen ([#5251](https://github.com/nuxt/nuxt.js/issues/5251)) ([ef41e20](https://github.com/nuxt/nuxt.js/commit/ef41e20))
+* support core-js 3 ([#5291](https://github.com/nuxt/nuxt.js/issues/5291)) ([d094c4a](https://github.com/nuxt/nuxt.js/commit/d094c4a))
+* **babel:** include es6.object.assign by default ([52fe145](https://github.com/nuxt/nuxt.js/commit/52fe145))
+* **cli:** lock project during build or generate  ([#4985](https://github.com/nuxt/nuxt.js/issues/4985)) ([4e51723](https://github.com/nuxt/nuxt.js/commit/4e51723))
+* **cli:** option to open the project in the browser  ([#4930](https://github.com/nuxt/nuxt.js/issues/4930)) ([4c7bd9c](https://github.com/nuxt/nuxt.js/commit/4c7bd9c))
+* **generate:** return non-zero code or page error (fixes [#4991](https://github.com/nuxt/nuxt.js/issues/4991)) ([#5195](https://github.com/nuxt/nuxt.js/issues/5195)) ([c6565c9](https://github.com/nuxt/nuxt.js/commit/c6565c9))
+* **module:** support src as a function in addModule ([#4956](https://github.com/nuxt/nuxt.js/issues/4956)) ([1e9eb4b](https://github.com/nuxt/nuxt.js/commit/1e9eb4b))
+* **test:** unit tests for @nuxt/builder ([#4834](https://github.com/nuxt/nuxt.js/issues/4834)) ([43491f6](https://github.com/nuxt/nuxt.js/commit/43491f6))
+* **ts:** nuxt configuration typedefs ([#4854](https://github.com/nuxt/nuxt.js/issues/4854)) ([92f81e0](https://github.com/nuxt/nuxt.js/commit/92f81e0))
+* **vue-app:** universal fetch ([#5028](https://github.com/nuxt/nuxt.js/issues/5028)) ([2015140](https://github.com/nuxt/nuxt.js/commit/2015140))
+* **vue-renderer:** use async fs ([#5186](https://github.com/nuxt/nuxt.js/issues/5186)) ([d07aefa](https://github.com/nuxt/nuxt.js/commit/d07aefa))
+* .nuxtignore ([#4647](https://github.com/nuxt/nuxt.js/issues/4647)) ([59be77a](https://github.com/nuxt/nuxt.js/commit/59be77a))
+* show warning on forced exit ([#4958](https://github.com/nuxt/nuxt.js/issues/4958)) ([5094d9c](https://github.com/nuxt/nuxt.js/commit/5094d9c))
+* support `devModules` option ([#5102](https://github.com/nuxt/nuxt.js/issues/5102)) ([e87711c](https://github.com/nuxt/nuxt.js/commit/e87711c))
+* upgrade to jest 24 ([#4868](https://github.com/nuxt/nuxt.js/issues/4868)) ([90ba0cd](https://github.com/nuxt/nuxt.js/commit/90ba0cd))
+* **vue-renderer:** improvements ([#4722](https://github.com/nuxt/nuxt.js/issues/4722)) ([2929716](https://github.com/nuxt/nuxt.js/commit/2929716))
+* upgrade vue to 2.6 ([#4953](https://github.com/nuxt/nuxt.js/issues/4953)) ([9308954](https://github.com/nuxt/nuxt.js/commit/9308954))
+
+
+### Performance Improvements
+
+* **core:** skip esm for node_modules and non .js files ([#5220](https://github.com/nuxt/nuxt.js/issues/5220)) ([aabb1f6](https://github.com/nuxt/nuxt.js/commit/aabb1f6))
+* await routeData promises in parallel ([#5027](https://github.com/nuxt/nuxt.js/issues/5027)) ([0826d7e](https://github.com/nuxt/nuxt.js/commit/0826d7e))
+* **webpack:** use `futureEmitAssets` ([#5003](https://github.com/nuxt/nuxt.js/issues/5003)) ([3997d50](https://github.com/nuxt/nuxt.js/commit/3997d50))
+
+
+### BREAKING CHANGES
+
+* **ts:** `build.useForkTsChecker` renamed to `build.typescript.typeCheck`
+
+
+
+
+
 ## [2.4.4](https://github.com/nuxt/nuxt.js/compare/v2.4.3...v2.4.4) (2019-02-26)


--- a/README.md
+++ b/README.md
@ -27,7 +27,7 @@
 - 🎬 Video: [1 minute demo](https://www.youtube.com/watch?v=kmf-p-pTi40)
 - 🐦 Twitter: [@nuxt_js](https://twitter.nuxtjs.org/)
 - 💬 Chat: [Discord](https://discord.nuxtjs.org/)
- 📦 [Nuxt.js Modules](https://github.com/nuxt-community/modules)
+- 🌟 [AwesomeNuxt](https://awesome.nuxtjs.org/)
 - 👉 [Play with Nuxt.js online](https://template.nuxtjs.org)

 ## Features
@ -46,7 +46,7 @@ Learn more at [nuxtjs.org](https://nuxtjs.org).

 ## Consulting from the Nuxt team

-Get help with that tough bug or make sure your Nuxt app is ready to deploy. For $200 an hour, get technical support, advice, code reviews, and development from the Nuxt core team: [Hire Nuxt on Otechie](https://otechie.com/nuxt?ref=readme)
+Get help with that tough bug or make sure your Nuxt app is ready to deploy. For $250 an hour, get technical support, advice, code reviews, and development from the Nuxt core team: [Hire Nuxt on Otechie](https://otechie.com/nuxt?ref=readme)

 ## Professional support with TideLift

@ -200,7 +200,7 @@ Please refer to our [Contribution Guide](https://nuxtjs.org/guide/contribution-g

 Thanks to BrowserStack!

-<a href="http://browserstack.com"><img height="70" src="https://p3.zdusercontent.com/attachment/1015988/PWfFdN71Aung2evRkIVQuKJpE?token=eyJhbGciOiJkaXIiLCJlbmMiOiJBMTI4Q0JDLUhTMjU2In0..aUrNFb8clSXsFwgw5BUTcg.IJr5piuCen7PmSSBHSrOnqM9K5YZfxX3lvbp-5LCqoKOi4CjjgdA419iqjofs0nLtm26FMURvZ8JRTuKB4iHer6lGu5f8dXHtIkYAHjP5fXDWkl044Yg2mSdrhF6uPy62GdlBYoYxwvgkNrac8nN_In8GY-qOC7bYmlZyJT7tsTZUTYbNMQiXS86YA5LgdCEWzWreMvc3C6cvZtVXIrcVgpkroIhvsTQPm4vQA-Uq6iCbTPA4oX5cpEtMtrlg4jYBnnAE4BTw5UwU_dY83ep5g.7wpc1IKv0rSRGsvqCG_q3g" alt="BrowserStack"></a>
+<a href="http://browserstack.com"><img height="70" src="https://nuxtjs.org/browserstack.svg" alt="BrowserStack"></a>


 ## Security
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@ -16,7 +16,7 @@ steps:
  displayName: 'Install Node.js'

 - script: |
-    yarn
+    yarn --frozen-lockfile --non-interactive
  displayName: 'Install dependencies'

 - script: |
--- a/distributions/nuxt-legacy/CHANGELOG.md
+++ b/distributions/nuxt-legacy/CHANGELOG.md
@ -3,6 +3,23 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+# [2.5.0](https://github.com/nuxt/nuxt.js/compare/v2.4.5...v2.5.0) (2019-03-21)
+
+
+### Bug Fixes
+
+* **pkg:** add missing dependencies ([665f15a](https://github.com/nuxt/nuxt.js/commit/665f15a))
+* **webpack:** always resolve core-js to v3 ([#5307](https://github.com/nuxt/nuxt.js/issues/5307)) ([65c1f86](https://github.com/nuxt/nuxt.js/commit/65c1f86))
+
+
+### Features
+
+* support core-js 3 ([#5291](https://github.com/nuxt/nuxt.js/issues/5291)) ([d094c4a](https://github.com/nuxt/nuxt.js/commit/d094c4a))
+
+
+
+
+
 ## [2.4.4](https://github.com/nuxt/nuxt.js/compare/v2.4.3...v2.4.4) (2019-02-26)

 **Note:** Version bump only for package nuxt-legacy
--- a/distributions/nuxt-legacy/bin/nuxt-legacy.js
+++ b/distributions/nuxt-legacy/bin/nuxt-legacy.js
@ -1,6 +1,7 @@
 #!/usr/bin/env node

-require('@babel/polyfill')
+require('core-js/stable')
+require('renegerator-runtime/runtime')

 require('@babel/register')({
  presets: [
--- a/distributions/nuxt-legacy/package.json
+++ b/distributions/nuxt-legacy/package.json
@ -1,6 +1,6 @@
 {
  "name": "nuxt-legacy",
-  "version": "2.4.5",
+  "version": "2.5.0",
  "description": "Legacy build of Nuxt.js for Node.js < 8.0.0",
  "keywords": [
    "nuxt",
@ -50,16 +50,18 @@
  ],
  "bin": "bin/nuxt-legacy.js",
  "dependencies": {
-    "@babel/core": "^7.2.2",
-    "@babel/polyfill": "^7.2.5",
-    "@babel/preset-env": "^7.3.1",
-    "@babel/register": "^7.0.0",
-    "@nuxt/builder": "2.4.5",
-    "@nuxt/cli": "2.4.5",
-    "@nuxt/core": "2.4.5",
-    "@nuxt/generator": "2.4.5",
+    "@babel/core": "^7.4.0",
+    "@babel/preset-env": "^7.4.2",
+    "@babel/register": "^7.4.0",
+    "@nuxt/builder": "2.5.0",
+    "@nuxt/cli": "2.5.0",
+    "@nuxt/core": "2.5.0",
+    "@nuxt/generator": "2.5.0",
+    "@nuxt/loading-screen": "^0.1.2",
    "@nuxt/opencollective": "^0.2.1",
-    "@nuxt/webpack": "2.4.5"
+    "@nuxt/webpack": "2.5.0",
+    "core-js": "^3.0.0",
+    "regenerator-runtime": "^0.13.2"
  },
  "engines": {
    "node": ">=6.0.0",
--- a/distributions/nuxt-start/CHANGELOG.md
+++ b/distributions/nuxt-start/CHANGELOG.md
@ -3,6 +3,18 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+# [2.5.0](https://github.com/nuxt/nuxt.js/compare/v2.4.5...v2.5.0) (2019-03-21)
+
+
+### Features
+
+* **vue-app:** universal fetch ([#5028](https://github.com/nuxt/nuxt.js/issues/5028)) ([2015140](https://github.com/nuxt/nuxt.js/commit/2015140))
+* upgrade vue to 2.6 ([#4953](https://github.com/nuxt/nuxt.js/issues/4953)) ([9308954](https://github.com/nuxt/nuxt.js/commit/9308954))
+
+
+
+
+
 ## [2.4.4](https://github.com/nuxt/nuxt.js/compare/v2.4.3...v2.4.4) (2019-02-26)

 **Note:** Version bump only for package nuxt-start
--- a/distributions/nuxt-start/package.json
+++ b/distributions/nuxt-start/package.json
@ -1,6 +1,6 @@
 {
  "name": "nuxt-start",
-  "version": "2.4.5",
+  "version": "2.5.0",
  "description": "Starts Nuxt.js Application in production mode",
  "keywords": [
    "nuxt",
@ -52,9 +52,10 @@
  "main": "dist/nuxt-start.js",
  "bin": "bin/nuxt-start.js",
  "dependencies": {
-    "@nuxt/cli": "2.4.5",
-    "@nuxt/core": "2.4.5",
-    "vue": "^2.5.22",
+    "@nuxt/cli": "2.5.0",
+    "@nuxt/core": "2.5.0",
+    "node-fetch": "^2.3.0",
+    "vue": "^2.6.10",
    "vue-meta": "^1.5.8",
    "vue-no-ssr": "^1.1.1",
    "vue-router": "^3.0.2",
--- a/distributions/nuxt-ts/CHANGELOG.md
+++ b/distributions/nuxt-ts/CHANGELOG.md
@ -3,6 +3,27 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+# [2.5.0](https://github.com/nuxt/nuxt.js/compare/v2.4.5...v2.5.0) (2019-03-21)
+
+
+### Bug Fixes
+
+* **pkg:** add missing dependencies ([665f15a](https://github.com/nuxt/nuxt.js/commit/665f15a))
+
+
+### Code Refactoring
+
+* **ts:** better DX for typescript support ([#5079](https://github.com/nuxt/nuxt.js/issues/5079)) ([920f444](https://github.com/nuxt/nuxt.js/commit/920f444))
+
+
+### BREAKING CHANGES
+
+* **ts:** `build.useForkTsChecker` renamed to `build.typescript.typeCheck`
+
+
+
+
+
 ## [2.4.4](https://github.com/nuxt/nuxt.js/compare/v2.4.3...v2.4.4) (2019-02-26)


--- a/distributions/nuxt-ts/bin/nuxt-ts.js
+++ b/distributions/nuxt-ts/bin/nuxt-ts.js
@ -1,21 +1,49 @@
 #!/usr/bin/env node

-const { resolve } = require('path')
+const boxen = require('boxen').default
+const chalk = require('chalk').default

-// Globally indicate we are running in ts mode
-process.env.NUXT_TS = 'true'
+const warningBox = boxen([
+  chalk.yellow.bold('IMPORTANT : Package deprecation'),
+  '',
+  `Nuxt TypeScript Support has been refactored to be used with ${chalk.green.bold('nuxt')} package.`,
+  `Which means that ${chalk.yellow.bold(`nuxt-ts`)} package is now no longer needed and is now tagged as ${chalk.yellow.bold('deprecated')}.`,
+  `${chalk.bold.underline('We highly recommend')} to follow the guidelines below :`,
+  '',
+  chalk.yellow.bold('Migration guide (2.5.x)'),
+  '',
+  chalk.bold('Using yarn'),
+  'yarn remove nuxt-ts',
+  'yarn add nuxt',
+  'yarn add -D @nuxt/typescript',
+  '',
+  chalk.bold('Using npm'),
+  'npm uninstall nuxt-ts',
+  'npm install nuxt',
+  'npm install -D @nuxt/typescript',
+  '',
+  ` ----- ${chalk.bold('nuxt.config.ts')} -----`,
+  '| build: {                 |',
+  `| ${chalk.red('-- useForkTsChecker: ...')} |`,
+  `| ${chalk.green('++ typescript : {')}        |`,
+  `| ${chalk.green('++   typeCheck: ...')}      |`,
+  `| ${chalk.green('++ }')}                     |`,
+  '| }                        |',
+  ' --------------------------',
+  '',
+  'Find more information in updated docs : ' + chalk.blue.underline('https://nuxtjs.org/guide/typescript')
+].join('\n'), Object.assign({
+  borderColor: 'yellow',
+  borderStyle: 'round',
+  padding: 1,
+  margin: 1
+})) + '\n'

-const nuxtCommands = ['dev', 'build', 'generate', 'start']
-const rootDir = (process.argv[2] && !nuxtCommands.includes(process.argv[2])) ? process.argv[2] : process.cwd()
-const tsConfigPath = resolve(rootDir, 'tsconfig.json')
+process.stdout.write(warningBox)

 const suffix = require('../package.json').name.includes('-edge') ? '-edge' : ''
-
-const errorHandler = (error) => {
-  require('consola').fatal(error)
-  process.exit(2)
-}
-
-require('@nuxt/typescript' + suffix).setup(tsConfigPath).then(() => {
-  require('@nuxt/cli' + suffix).run().catch(errorHandler)
-}).catch(errorHandler)
+require('@nuxt/cli' + suffix).run()
+  .catch((error) => {
+    require('consola').fatal(error)
+    process.exit(2)
+  })
--- a/distributions/nuxt-ts/package.json
+++ b/distributions/nuxt-ts/package.json
@ -1,6 +1,6 @@
 {
  "name": "nuxt-ts",
-  "version": "2.4.5",
+  "version": "2.5.0",
  "description": "Nuxt With Runtime Typescript Support",
  "keywords": [
    "nuxt",
@ -56,13 +56,14 @@
    "nuxts": "bin/nuxt-ts.js"
  },
  "dependencies": {
-    "@nuxt/builder": "2.4.5",
-    "@nuxt/cli": "2.4.5",
-    "@nuxt/core": "2.4.5",
-    "@nuxt/generator": "2.4.5",
+    "@nuxt/builder": "2.5.0",
+    "@nuxt/cli": "2.5.0",
+    "@nuxt/core": "2.5.0",
+    "@nuxt/generator": "2.5.0",
+    "@nuxt/loading-screen": "^0.1.2",
    "@nuxt/opencollective": "^0.2.1",
-    "@nuxt/typescript": "2.4.5",
-    "@nuxt/webpack": "2.4.5"
+    "@nuxt/typescript": "2.5.0",
+    "@nuxt/webpack": "2.5.0"
  },
  "engines": {
    "node": ">=6.0.0",
--- a/distributions/nuxt/CHANGELOG.md
+++ b/distributions/nuxt/CHANGELOG.md
@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+# [2.5.0](https://github.com/nuxt/nuxt.js/compare/v2.4.5...v2.5.0) (2019-03-21)
+
+
+### Features
+
+* loading screen ([#5251](https://github.com/nuxt/nuxt.js/issues/5251)) ([ef41e20](https://github.com/nuxt/nuxt.js/commit/ef41e20))
+
+
+
+
+
 ## [2.4.4](https://github.com/nuxt/nuxt.js/compare/v2.4.3...v2.4.4) (2019-02-26)

 **Note:** Version bump only for package nuxt
--- a/distributions/nuxt/README.md
+++ b/distributions/nuxt/README.md
@ -27,7 +27,7 @@
 - 🎬 Video: [1 minute demo](https://www.youtube.com/watch?v=kmf-p-pTi40)
 - 🐦 Twitter: [@nuxt_js](https://twitter.nuxtjs.org/)
 - 💬 Chat: [Discord](https://discord.nuxtjs.org/)
- 📦 [Nuxt.js Modules](https://github.com/nuxt-community/modules)
+- 🌟 [AwesomeNuxt](https://awesome.nuxtjs.org/)
 - 👉 [Play with Nuxt.js online](https://template.nuxtjs.org)

 ## Features
@ -46,7 +46,7 @@ Learn more at [nuxtjs.org](https://nuxtjs.org).

 ## Consulting from the Nuxt team

-Get help with that tough bug or make sure your Nuxt app is ready to deploy. For $200 an hour, get technical support, advice, code reviews, and development from the Nuxt core team: [Hire Nuxt on Otechie](https://otechie.com/nuxt?ref=readme)
+Get help with that tough bug or make sure your Nuxt app is ready to deploy. For $250 an hour, get technical support, advice, code reviews, and development from the Nuxt core team: [Hire Nuxt on Otechie](https://otechie.com/nuxt?ref=readme)

 ## Professional support with TideLift

@ -200,7 +200,7 @@ Please refer to our [Contribution Guide](https://nuxtjs.org/guide/contribution-g

 Thanks to BrowserStack!

-<a href="http://browserstack.com"><img height="70" src="https://p3.zdusercontent.com/attachment/1015988/PWfFdN71Aung2evRkIVQuKJpE?token=eyJhbGciOiJkaXIiLCJlbmMiOiJBMTI4Q0JDLUhTMjU2In0..aUrNFb8clSXsFwgw5BUTcg.IJr5piuCen7PmSSBHSrOnqM9K5YZfxX3lvbp-5LCqoKOi4CjjgdA419iqjofs0nLtm26FMURvZ8JRTuKB4iHer6lGu5f8dXHtIkYAHjP5fXDWkl044Yg2mSdrhF6uPy62GdlBYoYxwvgkNrac8nN_In8GY-qOC7bYmlZyJT7tsTZUTYbNMQiXS86YA5LgdCEWzWreMvc3C6cvZtVXIrcVgpkroIhvsTQPm4vQA-Uq6iCbTPA4oX5cpEtMtrlg4jYBnnAE4BTw5UwU_dY83ep5g.7wpc1IKv0rSRGsvqCG_q3g" alt="BrowserStack"></a>
+<a href="http://browserstack.com"><img height="70" src="https://nuxtjs.org/browserstack.svg" alt="BrowserStack"></a>


 ## Security
--- a/distributions/nuxt/package.json
+++ b/distributions/nuxt/package.json
@ -1,6 +1,6 @@
 {
  "name": "nuxt",
-  "version": "2.4.5",
+  "version": "2.5.0",
  "description": "A minimalistic framework for server-rendered Vue.js applications (inspired by Next.js)",
  "keywords": [
    "nuxt",
@ -54,12 +54,13 @@
    "postinstall": "opencollective || exit 0"
  },
  "dependencies": {
-    "@nuxt/builder": "2.4.5",
-    "@nuxt/cli": "2.4.5",
-    "@nuxt/core": "2.4.5",
-    "@nuxt/generator": "2.4.5",
+    "@nuxt/builder": "2.5.0",
+    "@nuxt/cli": "2.5.0",
+    "@nuxt/core": "2.5.0",
+    "@nuxt/generator": "2.5.0",
+    "@nuxt/loading-screen": "^0.1.2",
    "@nuxt/opencollective": "^0.2.1",
-    "@nuxt/webpack": "2.4.5"
+    "@nuxt/webpack": "2.5.0"
  },
  "engines": {
    "node": ">=8.0.0",
--- a/examples/async-component-injection/README.md
+++ b/examples/async-component-injection/README.md
@ -0,0 +1,3 @@
+# Nuxt with advanced async components
+
+See [here](https://vuejs.org/v2/guide/components.html#Advanced-Async-Components) for more details
--- a/examples/async-component-injection/package.json
+++ b/examples/async-component-injection/package.json
@ -1,7 +1,7 @@
 {
  "name": "example-async-components-injection",
  "dependencies": {
-    "nuxt-edge": "latest"
+    "nuxt": "latest"
  },
  "scripts": {
    "dev": "nuxt",
--- a/examples/async-data/package.json
+++ b/examples/async-data/package.json
@ -2,7 +2,7 @@
  "name": "example-async-data",
  "dependencies": {
    "axios": "latest",
-    "nuxt-edge": "latest"
+    "nuxt": "latest"
  },
  "scripts": {
    "dev": "nuxt",
--- a/examples/auth-jwt/package.json
+++ b/examples/auth-jwt/package.json
@ -3,7 +3,7 @@
  "dependencies": {
    "cookieparser": "^0.1.0",
    "js-cookie": "^2.2.0",
-    "nuxt-edge": "latest"
+    "nuxt": "latest"
  },
  "scripts": {
    "dev": "nuxt",
--- a/examples/auth-routes/README.md
+++ b/examples/auth-routes/README.md
@ -1,3 +1,3 @@
-# Authenticated Routes with Nuxt.js
+# Authenticated Routes with Nuxt and Express sessions

 https://nuxtjs.org/examples/auth-routes
--- a/examples/auth-routes/package.json
+++ b/examples/auth-routes/package.json
@ -5,7 +5,7 @@
    "body-parser": "^1.17.2",
    "express": "^4.15.3",
    "express-session": "^1.15.3",
-    "nuxt-edge": "latest"
+    "nuxt": "latest"
  },
  "scripts": {
    "dev": "nuxt",
--- a/examples/axios/README.md
+++ b/examples/axios/README.md
@ -1,4 +1,10 @@
-# Axios Proxy Example
+# Nuxt with Axios Proxy Example
+
+Using [proxy-module](https://github.com/nuxt-community/proxy-module) and [Axios module](https://axios.nuxtjs.org/)
+
+> proxy-module is the one-liner node.js http-proxy middleware solution for Nuxt.js using [http-proxy-middleware](https://github.com/chimurai/http-proxy-middleware)
+
+> Axios-module is a secure and easy [Axios](https://github.com/mzabriskie/axios) integration with Nuxt.js.

 ## Install

--- a/examples/axios/package.json
+++ b/examples/axios/package.json
@ -4,7 +4,7 @@
  "dependencies": {
    "@nuxtjs/axios": "^5.0.0",
    "@nuxtjs/proxy": "^1.1.2",
-    "nuxt-edge": "latest"
+    "nuxt": "latest"
  },
  "scripts": {
    "dev": "nuxt",
--- a/examples/cached-components/README.md
+++ b/examples/cached-components/README.md
@ -1,3 +1,3 @@
-# Cached Components
+# Nuxt with Cached Components using lru-cache

 https://nuxtjs.org/examples/cached-components
--- a/examples/cached-components/package.json
+++ b/examples/cached-components/package.json
@ -2,7 +2,7 @@
  "name": "example-cached-components",
  "dependencies": {
    "lru-cache": "^4.0.2",
-    "nuxt-edge": "latest"
+    "nuxt": "latest"
  },
  "scripts": {
    "dev": "nuxt",
--- a/examples/coffeescript/README.md
+++ b/examples/coffeescript/README.md
@ -1,4 +1,4 @@
-# CoffeeScript
+# Nuxt with CoffeeScript

 > Nuxt.js project with CoffeeScript

--- a/examples/coffeescript/package.json
+++ b/examples/coffeescript/package.json
@ -11,7 +11,7 @@
    "post-update": "yarn upgrade --latest"
  },
  "dependencies": {
-    "nuxt-edge": "latest"
+    "nuxt": "latest"
  },
  "devDependencies": {
    "coffee-loader": "^0.8.0",
--- a/examples/custom-build/README.md
+++ b/examples/custom-build/README.md
@ -0,0 +1 @@
+# Nuxt with customised build step
--- a/examples/custom-build/package.json
+++ b/examples/custom-build/package.json
@ -2,7 +2,7 @@
  "name": "example-custom-build",
  "description": "",
  "dependencies": {
-    "nuxt-edge": "latest"
+    "nuxt": "latest"
  },
  "scripts": {
    "dev": "nuxt",
--- a/examples/custom-layouts/README.md
+++ b/examples/custom-layouts/README.md
@ -1,3 +1,5 @@
-# Layouts
+# Nuxt layouts

 https://nuxtjs.org/examples/layouts
+
+Read more on Nuxt layouts [here](https://nuxtjs.org/guide/views#layouts)
--- a/examples/custom-layouts/package.json
+++ b/examples/custom-layouts/package.json
@ -1,7 +1,7 @@
 {
  "name": "example-custom-layouts",
  "dependencies": {
-    "nuxt-edge": "latest"
+    "nuxt": "latest"
  },
  "scripts": {
    "dev": "nuxt",
--- a/examples/custom-loading/package.json
+++ b/examples/custom-loading/package.json
@ -1,7 +1,7 @@
 {
  "name": "example-custom-loading",
  "dependencies": {
-    "nuxt-edge": "latest"
+    "nuxt": "latest"
  },
  "scripts": {
    "dev": "nuxt",
--- a/examples/custom-page-loading/package.json
+++ b/examples/custom-page-loading/package.json
@ -1,7 +1,7 @@
 {
  "name": "example-custom-page-loading",
  "dependencies": {
-    "nuxt-edge": "latest"
+    "nuxt": "latest"
  },
  "scripts": {
    "dev": "nuxt",
--- a/examples/custom-port-host/package.json
+++ b/examples/custom-port-host/package.json
@ -1,7 +1,7 @@
 {
  "name": "example-custom-port-host",
  "dependencies": {
-    "nuxt-edge": "latest"
+    "nuxt": "latest"
  },
  "scripts": {
    "dev": "nuxt",
--- a/examples/custom-routes/package.json
+++ b/examples/custom-routes/package.json
@ -2,7 +2,7 @@
  "name": "example-custom-routes",
  "dependencies": {
    "axios": "latest",
-    "nuxt-edge": "latest"
+    "nuxt": "latest"
  },
  "scripts": {
    "dev": "nuxt",
--- a/examples/custom-server/README.md
+++ b/examples/custom-server/README.md
@ -0,0 +1,3 @@
+# Nuxt with custom [Express](https://expressjs.com/) Server
+
+> Express ia a fast, unopinionated, minimalist web framework for Node.js
--- a/examples/custom-server/package.json
+++ b/examples/custom-server/package.json
@ -2,7 +2,7 @@
  "name": "example-custom-server",
  "dependencies": {
    "express": "^4.15.3",
-    "nuxt-edge": "latest"
+    "nuxt": "latest"
  },
  "scripts": {
    "dev": "node server.js",
--- a/examples/dynamic-components/components/chart.js
+++ b/examples/dynamic-components/components/chart.js
@ -1,12 +1,9 @@
-let VueChart = import('vue-chartjs' /* webpackChunkName: "vue-chartjs" */)
+import { Bar } from 'vue-chartjs'

-export default async () => {
-  VueChart = await VueChart
-
-  return VueChart.Bar.extend({
-    props: ['data'],
-    mounted() {
-      this.renderChart(this.data)
-    }
-  })
+export default {
+  extends: Bar,
+  props: ['data'],
+  mounted() {
+    this.renderChart(this.data)
+  }
 }
--- a/examples/dynamic-components/package.json
+++ b/examples/dynamic-components/package.json
@ -1,9 +1,9 @@
 {
  "name": "example-dynamic-components",
  "dependencies": {
-    "chart.js": "^2.7.0",
-    "nuxt-edge": "latest",
-    "vue-chartjs": "^2.8.7"
+    "chart.js": "^2.7.3",
+    "nuxt": "latest",
+    "vue-chartjs": "^3.4.2"
  },
  "scripts": {
    "dev": "nuxt",
--- a/examples/dynamic-components/pages/index.vue
+++ b/examples/dynamic-components/pages/index.vue
@ -16,7 +16,7 @@ const components = {
  vText: () => import('@/components/text.vue' /* webpackChunkName: "components/text" */),
  vImage: () => import('@/components/image.vue' /* webpackChunkName: "components/image" */),
  vCode: () => import('@/components/code.vue' /* webpackChunkName: "components/code" */),
-  vChart: () => import('@/components/chart.js' /* webpackChunkName: "components/chart" */).then(m => m.default())
+  vChart: () => import('@/components/chart.js' /* webpackChunkName: "components/chart" */)
 }

 export default {
--- a/examples/dynamic-components/pages/ssr.vue
+++ b/examples/dynamic-components/pages/ssr.vue
@ -17,7 +17,7 @@ const components = {
  vText: () => import('@/components/text.vue' /* webpackChunkName: "components/text" */),
  vImage: () => import('@/components/image.vue' /* webpackChunkName: "components/image" */),
  vCode: () => import('@/components/code.vue' /* webpackChunkName: "components/code" */),
-  vChart: () => import('@/components/chart.js' /* webpackChunkName: "components/chart" */).then(m => m.default())
+  vChart: () => import('@/components/chart.js' /* webpackChunkName: "components/chart" */)
 }

 export default {
--- a/examples/dynamic-layouts/package.json
+++ b/examples/dynamic-layouts/package.json
@ -1,7 +1,7 @@
 {
  "name": "example-dynamic-layouts",
  "dependencies": {
-    "nuxt-edge": "latest"
+    "nuxt": "latest"
  },
  "scripts": {
    "dev": "nuxt",
--- a/examples/global-css/package.json
+++ b/examples/global-css/package.json
@ -2,7 +2,7 @@
  "name": "example-global-css",
  "dependencies": {
    "bulma": "^0.5.1",
-    "nuxt-edge": "latest"
+    "nuxt": "latest"
  },
  "scripts": {
    "dev": "nuxt",
--- a/examples/hello-world/package.json
+++ b/examples/hello-world/package.json
@ -1,7 +1,7 @@
 {
  "name": "example-hello-world",
  "dependencies": {
-    "nuxt-edge": "latest"
+    "nuxt": "latest"
  },
  "scripts": {
    "dev": "nuxt",
--- a/examples/i18n/README.md
+++ b/examples/i18n/README.md
@ -1,4 +1,4 @@
-# i18n with Nuxt.js
+# Nuxt with i18n

 https://nuxtjs.org/examples/i18n

--- a/examples/i18n/package.json
+++ b/examples/i18n/package.json
@ -1,7 +1,7 @@
 {
  "name": "example-i18n",
  "dependencies": {
-    "nuxt-edge": "latest",
+    "nuxt": "latest",
    "vue-i18n": "^7.3.2"
  },
  "scripts": {
--- a/examples/jest-puppeteer/README.md
+++ b/examples/jest-puppeteer/README.md
@ -1,4 +1,8 @@
-# Example how to test Nuxt.js app with Jest and Puppeteer
+# Nuxt with [Jest](https://jestjs.io/) and [Puppeteer](https://developers.google.com/web/tools/puppeteer/)
+
+> Jest is a delightful JavaScript Testing Framework with a focus on simplicity.
+
+> Puppeteer is a Node library which provides a high-level API to control headless Chrome or Chromium over the DevTools Protocol.

 # Install deps
 ```
@ -35,5 +39,5 @@ Ran all test suites.

 ## Documentation
 - [jest-puppeteer](https://github.com/smooth-code/jest-puppeteer)
- [jest]()
+- [jest](https://jestjs.io/)
 - [puppeteer](https://pptr.dev/)
--- a/examples/jest-puppeteer/package.json
+++ b/examples/jest-puppeteer/package.json
@ -8,7 +8,7 @@
    "build": "nuxt build",
    "start": "nuxt start",
    "test": "jest -w=4",
-    "testServer": "nuxt build & nuxt start"
+    "testServer": "nuxt build && nuxt start"
  },
  "devDependencies": {
    "jest": "latest",
--- a/examples/jest-vtu-example/README.md
+++ b/examples/jest-vtu-example/README.md
@ -1,4 +1,8 @@
-# Jest + Vue Test Utils example
+# Nuxt with [Jest](https://jestjs.io/) and [Vue Test Utils](https://vue-test-utils.vuejs.org/)
+
+> Vue Test Utils is the official unit testing utility library for Vue.js.
+
+> Jest is a delightful JavaScript Testing Framework with a focus on simplicity.

 ```sh
 # Install dependencies
--- a/examples/jest-vtu-example/package.json
+++ b/examples/jest-vtu-example/package.json
@ -9,15 +9,15 @@
    "post-update": "yarn upgrade --latest"
  },
  "dependencies": {
-    "nuxt-edge": "latest"
+    "nuxt": "latest"
  },
  "devDependencies": {
-    "@babel/core": "^7.1.2",
-    "@vue/test-utils": "^1.0.0-beta.25",
-    "babel-jest": "^24.0.0",
-    "jest": "^24.0.0",
+    "@babel/core": "^7.3.4",
+    "@vue/test-utils": "^1.0.0-beta.29",
+    "babel-jest": "^24.1.0",
+    "jest": "^24.1.0",
    "jest-serializer-vue": "^2.0.2",
-    "vue-jest": "^3.0.2"
+    "vue-jest": "^4.0.0-beta.2"
  },
  "jest": {
    "moduleFileExtensions": [
--- a/examples/jsx/README.md
+++ b/examples/jsx/README.md
@ -1,5 +1,7 @@
-# Render Functions & JSX Example
+# Nuxt with render Functions & JSX Example

 ## Documentation

 Vue: https://vuejs.org/v2/guide/render-function.html
+
+Also see [TSX example](https://github.com/nuxt/nuxt.js/examples/typescript-tsx)
--- a/examples/jsx/package.json
+++ b/examples/jsx/package.json
@ -1,7 +1,7 @@
 {
  "name": "example-jsx",
  "dependencies": {
-    "nuxt-edge": "latest"
+    "nuxt": "latest"
  },
  "scripts": {
    "dev": "nuxt",
--- a/examples/layout-transitions/package.json
+++ b/examples/layout-transitions/package.json
@ -2,7 +2,7 @@
  "name": "example-layout-transitions",
  "dependencies": {
    "axios": "^0.15.3",
-    "nuxt-edge": "latest"
+    "nuxt": "latest"
  },
  "scripts": {
    "dev": "nuxt",
--- a/examples/markdownit/README.md
+++ b/examples/markdownit/README.md
@ -1,4 +1,4 @@
-# Markdown Example
+# Nuxt with Markdown 

 > Convert Markdown file to HTML using markdown-it.

--- a/examples/markdownit/package.json
+++ b/examples/markdownit/package.json
@ -3,7 +3,7 @@
  "version": "1.0.0",
  "dependencies": {
    "@nuxtjs/markdownit": "^1.1.2",
-    "nuxt-edge": "latest",
+    "nuxt": "latest",
    "pug": "^2.0.0-rc.4"
  },
  "scripts": {
--- a/examples/meta-info/README.md
+++ b/examples/meta-info/README.md
@ -1,6 +1,6 @@
 # Manage your app's meta information

-Nuxt.js uses [vue-meta](https://github.com/declandewet/vue-meta) to manage page meta info (such as: meta, title, link, style, script) of your application.
+Nuxt.js uses [vue-meta](https://github.com/nuxt/vue-meta) to manage page meta info (such as: meta, title, link, style, script) of your application.

 ## Example

@ -10,4 +10,4 @@ SEO: https://nuxtjs.org/examples/seo-html-head

 Nuxt.js: https://nuxtjs.org/guide/views#html-head

-vue-meta: https://github.com/declandewet/vue-meta#table-of-contents
+vue-meta: https://github.com/nuxt/vue-meta#table-of-contents
--- a/examples/meta-info/package.json
+++ b/examples/meta-info/package.json
@ -1,7 +1,7 @@
 {
  "name": "example-meta-info",
  "dependencies": {
-    "nuxt-edge": "latest"
+    "nuxt": "latest"
  },
  "scripts": {
    "dev": "nuxt",
--- a/examples/middleware/README.md
+++ b/examples/middleware/README.md
@ -1,3 +1,6 @@
-# Middleware with Nuxt.js
+# Middleware with Nuxt

+## Demo
 https://nuxtjs.org/examples/middleware
+
+Read more Nuxt on middleware [here](https://nuxtjs.org/guide/routing#middleware)
--- a/examples/middleware/package.json
+++ b/examples/middleware/package.json
@ -1,7 +1,7 @@
 {
  "name": "example-middleware",
  "dependencies": {
-    "nuxt-edge": "latest"
+    "nuxt": "latest"
  },
  "scripts": {
    "dev": "nuxt",
--- a/examples/named-views/README.md
+++ b/examples/named-views/README.md
@ -0,0 +1 @@
+# Nuxt with named views
--- a/examples/nested-components/README.md
+++ b/examples/nested-components/README.md
@ -0,0 +1 @@
+# Nuxt with nested components example
--- a/examples/nested-components/package.json
+++ b/examples/nested-components/package.json
@ -1,7 +1,7 @@
 {
  "name": "example-nested-components",
  "dependencies": {
-    "nuxt-edge": "latest"
+    "nuxt": "latest"
  },
  "scripts": {
    "dev": "nuxt",
--- a/examples/nested-routes/package.json
+++ b/examples/nested-routes/package.json
@ -1,7 +1,7 @@
 {
  "name": "example-nested-routes",
  "dependencies": {
-    "nuxt-edge": "latest"
+    "nuxt": "latest"
  },
  "scripts": {
    "dev": "nuxt",
--- a/examples/no-ssr/package.json
+++ b/examples/no-ssr/package.json
@ -1,7 +1,7 @@
 {
  "name": "example-no-ssr",
  "dependencies": {
-    "nuxt-edge": "latest"
+    "nuxt": "latest"
  },
  "scripts": {
    "dev": "nuxt",
--- a/examples/nuxt-prefetch/package.json
+++ b/examples/nuxt-prefetch/package.json
@ -1,7 +1,7 @@
 {
  "name": "example-nuxt-prefetch",
  "dependencies": {
-    "nuxt-edge": "latest"
+    "nuxt": "latest"
  },
  "scripts": {
    "dev": "nuxt",
--- a/examples/plugins-vendor/package.json
+++ b/examples/plugins-vendor/package.json
@ -3,7 +3,7 @@
  "dependencies": {
    "axios": "^0.16.2",
    "mini-toastr": "^0.6.5",
-    "nuxt-edge": "latest",
+    "nuxt": "latest",
    "vue-notifications": "^0.8.0"
  },
  "scripts": {
--- a/examples/pm2-typescript/README.md
+++ b/examples/pm2-typescript/README.md
@ -0,0 +1,28 @@
+# Nuxt.ts  with PM2 example
+
+> [pm2](http://pm2.keymetrics.io/) ia an advanced process manager for production Node.js applications. Load balancer, logs facility, startup script, micro service management and more.
+
+[Gracefull zero-downtime restart](https://pm2.io/doc/en/runtime/best-practices/graceful-shutdown/#graceful-start)
+
+`ecosystem.config.js` -  configuration file for pm2
+
+`listen_timeout` option depends on your need
+
+## Zero-downtime deployment
+*all depends on your deployment method. It's just example
+
+#### Directories:
+- `$PROJECT_ROOT` - your project root path on server
+- `/current` - root dir for nginx(if you are using [proxy configuration](https://nuxtjs.org/faq/nginx-proxy/))
+- `/_tmp` - Temporary dir to install and build project
+- `/_old` - Previous build. Can be useful for fast reverting
+
+#### Steps:
+- deploy project to $PROJECT_ROOT/_tmp
+- `cd $PROJECT_ROOT/_tmp`
+- `npm i`
+- `nuxt build` or if you are using TypeScript `nuxt-ts build`
+- `mv $PROJECT_ROOT/current $PROJECT_ROOT/_old`
+- `mv $PROJECT_ROOT/_tmp $PROJECT_ROOT/current`
+- `cd $PROJECT_PATH/current`
+- `pm2 startOrReload ecosystem.config.js`
--- a/examples/pm2-typescript/ecosystem.config.js
+++ b/examples/pm2-typescript/ecosystem.config.js
@ -0,0 +1,13 @@
+module.exports = {
+  apps: [
+    {
+      name: 'pm2-nuxt-typescript',
+      script: './node_modules/.bin/nuxt',
+      args: 'start',
+      instances: 2,
+      exec_mode: 'cluster',
+      wait_ready: true,
+      listen_timeout: 5000
+    }
+  ]
+}
--- a/examples/pm2-typescript/nuxt.config.ts
+++ b/examples/pm2-typescript/nuxt.config.ts
@ -0,0 +1,9 @@
+export default {
+  hooks: {
+    listen () {
+      if (process.send) {
+        process.send('ready')
+      }
+    }
+  }
+}
--- a/examples/pm2-typescript/package.json
+++ b/examples/pm2-typescript/package.json
@ -0,0 +1,17 @@
+{
+  "version": "1.0.0",
+  "private": true,
+  "dependencies": {
+    "nuxt": "latest",
+    "vue-property-decorator": "^7.3.0"
+  },
+  "scripts": {
+    "dev": "nuxt",
+    "build": "nuxt build",
+    "start": "nuxt start",
+    "generate": "nuxt generate"
+  },
+  "devDependencies": {
+    "@nuxt/typescript": "latest"
+  }
+}
--- a/examples/pm2-typescript/pages/index.vue
+++ b/examples/pm2-typescript/pages/index.vue
@ -0,0 +1,12 @@
+<template>
+  <h1>
+    Hello world !
+  </h1>
+</template>
+
+<script lang="ts">
+import { Component, Vue } from 'vue-property-decorator'
+
+@Component
+export default class Home extends Vue {}
+</script>
--- a/examples/pm2-typescript/tsconfig.json
+++ b/examples/pm2-typescript/tsconfig.json
@ -0,0 +1 @@
+{}
--- a/examples/pug-stylus-coffee/README.md
+++ b/examples/pug-stylus-coffee/README.md
@ -0,0 +1,20 @@
+# Pug + Stylus + Coffee template for Nuxt.js
+
+> Ultimative complete pack for coding with pleasure and Nuxt.js
+
+## Build Setup
+
+``` bash
+# install dependencies
+$ npm install
+
+# serve with hot reload at localhost:3000
+$ npm run dev
+
+# build for production and launch server
+$ npm run build
+$ npm start
+
+# generate static project
+$ npm run generate
+```
--- a/examples/pug-stylus-coffee/components/Logo.vue
+++ b/examples/pug-stylus-coffee/components/Logo.vue
@ -0,0 +1,66 @@
+<template lang="pug">
+  .VueToNuxtLogo
+    .Triangle.Triangle--two
+    .Triangle.Triangle--one
+    .Triangle.Triangle--three
+    .Triangle.Triangle--four
+</template>
+
+<style lang="stylus">
+.VueToNuxtLogo
+  display: inline-block
+  animation: turn 2s linear forwards 1s
+  transform: rotateX(180deg)
+  position: relative
+  overflow: hidden
+  height: 180px
+  width: 245px
+
+.Triangle
+  position: absolute
+  top: 0
+  left: 0
+  width: 0
+  height: 0
+
+.Triangle--one
+  border-left: 105px solid transparent
+  border-right: 105px solid transparent
+  border-bottom: 180px solid #41b883
+
+.Triangle--two
+  top: 30px
+  left: 35px
+  animation: goright 0.5s linear forwards 3.5s
+  border-left: 87.5px solid transparent
+  border-right: 87.5px solid transparent
+  border-bottom: 150px solid #3b8070
+
+.Triangle--three
+  top: 60px
+  left: 35px
+  animation: goright 0.5s linear forwards 3.5s
+  border-left: 70px solid transparent
+  border-right: 70px solid transparent
+  border-bottom: 120px solid #35495e
+
+.Triangle--four
+  top: 120px
+  left: 70px
+  animation: godown 0.5s linear forwards 3s
+  border-left: 35px solid transparent
+  border-right: 35px solid transparent
+  border-bottom: 60px solid #fff
+
+@keyframes turn
+  100%
+    transform: rotateX(0deg)
+
+@keyframes godown
+  100%
+    top: 180px
+
+@keyframes goright
+  100%
+    left: 70px
+</style>
--- a/examples/pug-stylus-coffee/components/README.md
+++ b/examples/pug-stylus-coffee/components/README.md
@ -0,0 +1,7 @@
+# COMPONENTS
+
+**This directory is not required, you can delete it if you don't want to use it.**
+
+The components directory contains your Vue.js Components.
+
+_Nuxt.js doesn't supercharge these components._
--- a/examples/pug-stylus-coffee/layouts/README.md
+++ b/examples/pug-stylus-coffee/layouts/README.md
@ -0,0 +1,7 @@
+# LAYOUTS
+
+**This directory is not required, you can delete it if you don't want to use it.**
+
+This directory contains your Application Layouts.
+
+More information about the usage of this directory in [the documentation](https://nuxtjs.org/guide/views#layouts).
--- a/examples/pug-stylus-coffee/layouts/default.vue
+++ b/examples/pug-stylus-coffee/layouts/default.vue
@ -0,0 +1,46 @@
+<template lang="pug">
+  .div
+    nuxt
+</template>
+
+<style lang="stylus">
+html
+  font-family: 'Source Sans Pro', -apple-system, BlinkMacSystemFont, 'Segoe UI',
+    Roboto, 'Helvetica Neue', Arial, sans-serif
+  font-size: 16px
+  word-spacing: 1px
+  -ms-text-size-adjust: 100%
+  -webkit-text-size-adjust: 100%
+  -moz-osx-font-smoothing: grayscale
+  -webkit-font-smoothing: antialiased
+  box-sizing: border-box
+
+*
+&:before
+&:after
+  box-sizing: border-box
+  margin: 0
+
+.button--green
+  display: inline-block
+  border-radius: 4px
+  border: 1px solid #3b8070
+  color: #3b8070
+  text-decoration: none
+  padding: 10px 30px
+  &:hover
+    color: #fff
+    background-color: #3b8070
+
+.button--grey
+  display: inline-block
+  border-radius: 4px
+  border: 1px solid #35495e
+  color: #35495e
+  text-decoration: none
+  padding: 10px 30px
+  margin-left: 15px
+  &:hover
+    color: #fff
+    background-color: #35495e
+</style>
--- a/examples/pug-stylus-coffee/middleware/README.md
+++ b/examples/pug-stylus-coffee/middleware/README.md
@ -0,0 +1,8 @@
+# MIDDLEWARE
+
+**This directory is not required, you can delete it if you don't want to use it.**
+
+This directory contains your application middleware.
+Middleware let you define custom functions that can be run before rendering either a page or a group of pages.
+
+More information about the usage of this directory in [the documentation](https://nuxtjs.org/guide/routing#middleware).
--- a/examples/pug-stylus-coffee/modules/coffeescript.js
+++ b/examples/pug-stylus-coffee/modules/coffeescript.js
@ -0,0 +1,17 @@
+export default function () {
+  // Add .coffee extension for store, middleware and more
+  this.nuxt.options.extensions.push('coffee')
+  // Extend build
+  const coffeeLoader = {
+    test: /\.coffee$/,
+    loader: 'coffee-loader'
+  }
+  this.extendBuild((config) => {
+    // Add CoffeeScruot loader
+    config.module.rules.push(coffeeLoader)
+    // Add .coffee extension in webpack resolve
+    if (config.resolve.extensions.indexOf('.coffee') === -1) {
+      config.resolve.extensions.push('.coffee')
+    }
+  })
+}
--- a/examples/pug-stylus-coffee/nuxt.config.coffee
+++ b/examples/pug-stylus-coffee/nuxt.config.coffee
@ -0,0 +1,48 @@
+pkg = require('./package')
+module.exports =
+  mode: 'universal'
+  #
+  # Headers of the page
+  #
+  head:
+    title: pkg.name
+    meta:
+      [
+        {
+          charset: 'utf-8'
+        }
+        {
+          name: 'viewport'
+          content: 'width=device-width, initial-scale=1'
+        }
+        {
+          hid: 'description'
+          name: 'description'
+          content: pkg.description
+        }
+      ]
+    link:
+      [
+        rel: 'icon'
+        type: 'image/x-icon'
+        href: '/favicon.ico'
+      ]
+  # Customize the progress-bar color
+  loading:
+    {
+      color: '#3B8070'
+    }
+  # Global CSS
+  css: []
+  # Plugins to load before mounting the App
+  plugins: []
+  # Nuxt.js modules
+  modules:
+    [
+      '~/modules/coffeescript'
+    ]
+  # Build configuration
+  build:
+    # You can extend webpack config here
+    extend = (config, ctx) ->
+      pass
--- a/examples/pug-stylus-coffee/nuxt.config.js
+++ b/examples/pug-stylus-coffee/nuxt.config.js
@ -0,0 +1,2 @@
+require('coffeescript/register')
+module.exports = require('./nuxt.config.coffee')
--- a/examples/pug-stylus-coffee/package.json
+++ b/examples/pug-stylus-coffee/package.json
@ -0,0 +1,25 @@
+{
+  "name": "example-pug-stylus-coffee",
+  "version": "1.0.0",
+  "description": "Nuxt.js with Pug Stylus and CoffeeScript",
+  "author": "Alex Ananiev <alex.ananiev.r@gmail.com>, Kron Austrum <huyach@protonmail.ch>",
+  "private": true,
+  "scripts": {
+    "dev": "nuxt",
+    "build": "nuxt build",
+    "start": "nuxt start",
+    "generate": "nuxt generate",
+    "post-update": "yarn upgrade --latest"
+  },
+  "dependencies": {
+    "nuxt": "latest"
+  },
+  "devDependencies": {
+    "coffee-loader": "^0.8.0",
+    "coffeescript": "^2.0.1",
+    "pug": "^2.0.3",
+    "pug-plain-loader": "^1.0.0",
+    "stylus": "^0.54.5",
+    "stylus-loader": "^3.0.2"
+  }
+}
--- a/examples/pug-stylus-coffee/pages/README.md
+++ b/examples/pug-stylus-coffee/pages/README.md
@ -0,0 +1,7 @@
+# PAGES
+
+This directory contains your Application Views and Routes.
+The framework reads all the .vue files inside this directory and create the router of your application.
+
+More information about the usage of this directory in the documentation:
+https://nuxtjs.org/guide/routing
--- a/examples/pug-stylus-coffee/pages/index.vue
+++ b/examples/pug-stylus-coffee/pages/index.vue
@ -0,0 +1,55 @@
+<template lang="pug">
+  section.container
+    div
+      logo
+      h1.title Nuxt.js with Pug Stylus and Coffee!
+      h2.subtitle {{ $store.state.msg }}
+      //- h2.subtitle {{message}}
+      .links
+        a.button--green(
+          href='https://nuxtjs.org/'
+          arget='_blank') Documentation
+        a.button--grey(
+          href='https://github.com/nuxt/nuxt.js'
+          target='_blank') GitHub
+</template>
+
+
+<script lang="coffee">
+import Logo from '~/components/Logo.vue'
+
+export default
+  components: { Logo }
+  computed:
+    message: -> @$store.state.msgComputed
+</script>
+
+<style lang="stylus">
+.container
+  margin: 0 auto
+  min-height: 100vh
+  display: flex
+  justify-content: center
+  align-items: center
+  text-align: center
+
+.title
+  font-family: 'Quicksand', 'Source Sans Pro', -apple-system, BlinkMacSystemFont,
+    'Segoe UI', Roboto, 'Helvetica Neue', Arial, sans-serif
+  display: block
+  font-weight: 300
+  font-size: 60px
+  color: #35495e
+  letter-spacing: 1px
+  padding 5%
+
+.subtitle
+  font-weight: 300
+  font-size: 42px
+  color: #526488
+  word-spacing: 5px
+  padding-bottom: 15px
+
+.links
+  padding-top: 15px
+</style>
--- a/examples/pug-stylus-coffee/plugins/README.md
+++ b/examples/pug-stylus-coffee/plugins/README.md
@ -0,0 +1,7 @@
+# PLUGINS
+
+**This directory is not required, you can delete it if you don't want to use it.**
+
+This directory contains Javascript plugins that you want to run before mounting the root Vue.js application.
+
+More information about the usage of this directory in [the documentation](https://nuxtjs.org/guide/plugins).
--- a/examples/pug-stylus-coffee/static/README.md
+++ b/examples/pug-stylus-coffee/static/README.md
@ -0,0 +1,10 @@
+# STATIC
+
+**This directory is not required, you can delete it if you don't want to use it.**
+
+This directory contains your static files.
+Each file inside this directory is mapped to `/`.
+
+Example: `/static/robots.txt` is mapped as `/robots.txt`.
+
+More information about the usage of this directory in [the documentation](https://nuxtjs.org/guide/assets#static).
--- a/examples/pug-stylus-coffee/static/favicon.ico
+++ b/examples/pug-stylus-coffee/static/favicon.ico
--- a/examples/pug-stylus-coffee/store/README.md
+++ b/examples/pug-stylus-coffee/store/README.md
@ -0,0 +1,10 @@
+# STORE
+
+**This directory is not required, you can delete it if you don't want to use it.**
+
+This directory contains your Vuex Store files.
+Vuex Store option is implemented in the Nuxt.js framework.
+
+Creating a file in this directory automatically activates the option in the framework.
+
+More information about the usage of this directory in [the documentation](https://nuxtjs.org/guide/vuex-store).
--- a/examples/pug-stylus-coffee/store/index.coffee
+++ b/examples/pug-stylus-coffee/store/index.coffee
@ -0,0 +1,3 @@
+export state = ->
+  msg: 'Hello from /store/index.coffee!'
+  msgComputed: 'Hello from /store/index.coffee computed!'
--- a/examples/pug/package.json
+++ b/examples/pug/package.json
@ -1,9 +1,9 @@
 {
  "name": "example-pug",
  "dependencies": {
-    "nuxt-edge": "latest",
+    "nuxt": "latest",
    "pug": "^2.0.3",
-    "pug-loader": "^2.4.0"
+    "pug-plain-loader": "^1.0.0"
  },
  "scripts": {
    "dev": "nuxt",
--- a/examples/routes-meta/package.json
+++ b/examples/routes-meta/package.json
@ -1,7 +1,7 @@
 {
  "name": "examples-routes-meta",
  "dependencies": {
-    "nuxt-edge": "latest",
+    "nuxt": "latest",
    "wingcss": "^1.0.0-beta"
  },
  "scripts": {
--- a/examples/routes-transitions/package.json
+++ b/examples/routes-transitions/package.json
@ -2,7 +2,7 @@
  "name": "example-routes-transitions",
  "dependencies": {
    "axios": "^0.15.3",
-    "nuxt-edge": "latest"
+    "nuxt": "latest"
  },
  "scripts": {
    "dev": "nuxt",
--- a/examples/scroll-behavior/package.json
+++ b/examples/scroll-behavior/package.json
@ -2,7 +2,7 @@
  "name": "example-scroll-behavior",
  "dependencies": {
    "@nuxtjs/axios": "^5.3.6",
-    "nuxt-edge": "latest",
+    "nuxt": "latest",
    "vue-router": "https://github.com/homerjam/vue-router#dist"
  },
  "scripts": {
--- a/examples/spa/README.md
+++ b/examples/spa/README.md
@ -0,0 +1,2 @@
+# Nuxt in SPA mode
+
--- a/examples/spa/package.json
+++ b/examples/spa/package.json
@ -1,7 +1,7 @@
 {
  "name": "example-spa",
  "dependencies": {
-    "nuxt-edge": "latest"
+    "nuxt": "latest"
  },
  "scripts": {
    "dev": "nuxt",
--- a/examples/static-images/README.md
+++ b/examples/static-images/README.md
@ -0,0 +1,3 @@
+# Nuxt with static images
+
+How to use static images with nuxt
--- a/examples/static-images/package.json
+++ b/examples/static-images/package.json
@ -1,7 +1,7 @@
 {
  "name": "example-static-images",
  "dependencies": {
-    "nuxt-edge": "latest"
+    "nuxt": "latest"
  },
  "scripts": {
    "dev": "nuxt",
--- a/examples/storybook/package.json
+++ b/examples/storybook/package.json
@ -14,7 +14,7 @@
  },
  "dependencies": {
    "chart.js": "^2.7.1",
-    "nuxt-edge": "latest",
+    "nuxt": "latest",
    "vue-chartjs": "^3.1.1",
    "vuetify": "1.2.6"
  },
--- a/Show More
+++ b/Show More