Merge remote-tracking branch 'upstream/master' into working

# Conflicts resolved:
#	README.md
#	en/api/configuration-generate.md
#	en/api/configuration-loading.md
#	en/api/configuration-transition.md
#	en/api/context.md
#	en/api/internals-nuxt.md
#	en/api/pages-transition.md
#	en/faq/ios-phone-numbers.md
#	en/faq/now-deployment.md
#	en/guide/installation.md
#	en/guide/menu.json
#	en/guide/plugins.md
#	fr/faq/menu.json
#	fr/faq/netlify-deployment.md
#	fr/guide/assets.md
#	fr/guide/installation.md

Signed-off-by: MachinisteWeb <[email protected]>

Author: MachinisteWeb

de/api/configuration-router.md

@@ -153,11 +153,14 @@ const scrollBehavior = function (to, from, savedPosition) {
   // will retain current scroll position.
   let position = false
 
-  // if no children detected
-  if (to.matched.length < 2) {
+  // if no children detected and scrollToTop is not explicitly disabled
+  if (
+    to.matched.length < 2 &&
+    to.matched.every(r => r.components.default.options.scrollToTop !== false)
+  ) {
     // scroll to the top of the page
     position = { x: 0, y: 0 }
-  } else if (to.matched.some((r) => r.components.default.options.scrollToTop)) {
+  } else if (to.matched.some(r => r.components.default.options.scrollToTop)) {
     // if one of the children has scrollToTop option set to true
     position = { x: 0, y: 0 }
   }
@@ -167,14 +170,25 @@ const scrollBehavior = function (to, from, savedPosition) {
     position = savedPosition
   }
 
-  return new Promise(resolve => {
+  return new Promise((resolve) => {
     // wait for the out transition to complete (if necessary)
     window.$nuxt.$once('triggerScroll', () => {
       // coords will be used if no selector is provided,
       // or if the selector didn't match any element.
-      if (to.hash && document.querySelector(to.hash)) {
-        // scroll to anchor by returning the selector
-        position = { selector: to.hash }
+      if (to.hash) {
+        let hash = to.hash
+        // CSS.escape() is not supported with IE and Edge.
+        if (typeof window.CSS !== 'undefined' && typeof window.CSS.escape !== 'undefined') {
+          hash = '#' + window.CSS.escape(hash.substr(1))
+        }
+        try {
+          if (document.querySelector(hash)) {
+            // scroll to anchor by returning the selector
+            position = { selector: hash }
+          }
+        } catch (e) {
+          console.warn('Failed to save scroll position. Please add CSS.escape() polyfill (https://github.com/mathiasbynens/CSS.escape).')
+        }
       }
       resolve(position)
     })

en/api/configuration-generate.md

@@ -20,6 +20,14 @@ export default {
 }
 ```
 
+## concurrency
+
+- Type: `Number`
+- Default: `500`
+
+The generation of routes are concurrent, `generate.concurrency` specifies the amount of routes that run in one thread.
+
+
 ## dir
 
 - Type : `String`
@@ -36,6 +44,39 @@ Configure whether to allow [vue-devtools](https://github.com/vuejs/vue-devtools)
 
 If you already activated through nuxt.config.js or otherwise, devtools enable regardless of the flag.
 
+## exclude
+
+- Type: `Array`
+
+It accepts an array of regular expressions and will prevent generation of routes matching them. The routes will still be accessible when `generate.fallback` is used.
+
+By default, running `nuxt generate` will create a file for each route.
+
+```bash
+-| dist/
+---| index.html
+---| ignore/
+-----| about.html
+-----| item.html
+```
+
+When adding a regular expression which matches all routes with "ignore", it will prevent the generation of these routes.
+
+nuxt.config.js 
+```js
+export default {
+  generate: {
+    exclude: [
+      /^(?=.*\bignore\b).*$/,
+    ],
+  }
+}
+```
+
+```bash
+-| dist/
+---| index.html
+```
 
 ## fallback
 
@@ -229,10 +270,3 @@ export default {
 ```
 
 _Note : cette option peut être utile en utilisant [Netlify](https://netlify.com) ou n'importe quel hébergement utilisant des alternatives HTML._
-
-## concurrence
-
-- Type: `Number`
-- Default: `500`
-
-La génération de routes est concurrente, `generate.concurrency` spécifie le nombre de routes qui peuvent être exécuté par un thread.

en/api/configuration-loading.md

@@ -7,9 +7,11 @@ description: Nuxt.js uses its own component to show a progress bar between the r
 
 - Type: `Boolean` or `Object` or `String`
 
-> Nuxt.js uses its own component to show a progress bar between the routes. You can customize it, disable it or create your own component.
+> Out of the box, Nuxt.js gives you its own loading progress bar component that's shown between routes. You can customize it, disable it or create your own component.
 
-In your component you can use `this.$nuxt.$loading.start()` to start the loading bar and `this.$nuxt.$loading.finish()` to finish it.
+The loading bar can also be programmatically started in your components by calling `this.$nuxt.$loading.start()` to start the loading bar and `this.$nuxt.$loading.finish()` to finish it.
+
+During your page's component's mounting process, the `$loading` property may not be immediately available to access. To work around this, if you want to start the loader in the `mounted` method, make sure to wrap your `$loading` method calls inside ` this.$nextTick` as shown below.
 
 ```javascript
 export default {
@@ -23,8 +25,6 @@ export default {
  }
 ```
 
-> If you want to start it in the `mounted` method, make sure to use ` this.$nextTick`, because $loading may not be available immediately.
-
 ## Disable the Progress Bar
 
 - Type: `Boolean`
@@ -37,10 +37,23 @@ export default {
 }
 ```
 
-## Customize the Progress Bar
+## Customizing the Progress Bar
 
 - Type: `Object`
 
+Among other properties, the color, size, duration and direction of the progress bar can be customized to suit your application's needs. This is done by updating the `loading` property of the `nuxt.config.js` with the corresponding properties.
+
+For example, to set a blue progress bar with a height of 5px, we update the `nuxt.config.js` to the following:
+
+```js
+export default {
+  loading: {
+    color: 'blue',
+    height: '5px'
+  }
+}
+```
+
 List of properties to customize the progress bar.
 
 | Key | Type | Default | Description |
@@ -54,22 +67,26 @@ List of properties to customize the progress bar.
 | `css` | Boolean | `true` | Set to false to remove default progress bar styles (and add your own). |
 | `rtl` | Boolean | `false` | Set the direction of the progress bar from right to left. |
 
-For a blue progress bar with 5px of height, we update the `nuxt.config.js` to the following:
 
-```js
-export default {
-  loading: {
-    color: 'blue',
-    height: '5px'
-  }
-}
-```
+## Internals of the Progress Bar
+
+Unfortunately, it is not possible for the Loading component to know in advance how long loading a new page will take. Therefore, it is not possible to accurately animate the progress bar to 100% of the loading time.
+
+Nuxt's loading component partially solves this by letting you set the `duration`, this should be set to a _guestimate_ of how long the loading process will take. Unless you use a custom loading component, the progress bar will always move from 0% to 100% in `duration` time (regardless of actual progression). When the loading takes longer than `duration` time, the progress bar will stay at 100% until the loading finishes.
+
+You can change the default behaviour by setting `continuous` to true, then after reaching 100% the progress bar will start shrinking back to 0% again in `duration` time. When the loading is still not finished after reaching 0% it will start growing from 0% to 100% again, this repeats until the loading finishes.
+
+*Example of a continuous progress bar:*
+
+
+<img src="/api-continuous-loading.gif" alt="continuous loading"/>
+
 
-## Use a Custom Loading Component
+## Using a Custom Loading Component
 
 - Type: `String`
 
-You can create your own component that Nuxt.js will call instead of its default component. To do so, you need to give a path to your component in the `loading` option. Then, your component will be called directly by Nuxt.js.
+You can also create your own component that Nuxt.js will call instead of its default loading progress bar component. To do so, you need to give a path to your component in the `loading` option. Then, your component will be called directly by Nuxt.js.
 
 **Your component has to expose some of these methods:**
 

en/api/configuration-router.md

@@ -255,11 +255,14 @@ const scrollBehavior = function (to, from, savedPosition) {
   // will retain current scroll position.
   let position = false
 
-  // if no children detected
-  if (to.matched.length < 2) {
+  // if no children detected and scrollToTop is not explicitly disabled
+  if (
+    to.matched.length < 2 &&
+    to.matched.every(r => r.components.default.options.scrollToTop !== false)
+  ) {
     // scroll to the top of the page
     position = { x: 0, y: 0 }
-  } else if (to.matched.some((r) => r.components.default.options.scrollToTop)) {
+  } else if (to.matched.some(r => r.components.default.options.scrollToTop)) {
     // if one of the children has scrollToTop option set to true
     position = { x: 0, y: 0 }
   }
@@ -269,14 +272,25 @@ const scrollBehavior = function (to, from, savedPosition) {
     position = savedPosition
   }
 
-  return new Promise(resolve => {
+  return new Promise((resolve) => {
     // wait for the out transition to complete (if necessary)
     window.$nuxt.$once('triggerScroll', () => {
       // coords will be used if no selector is provided,
       // or if the selector didn't match any element.
-      if (to.hash && document.querySelector(to.hash)) {
-        // scroll to anchor by returning the selector
-        position = { selector: to.hash }
+      if (to.hash) {
+        let hash = to.hash
+        // CSS.escape() is not supported with IE and Edge.
+        if (typeof window.CSS !== 'undefined' && typeof window.CSS.escape !== 'undefined') {
+          hash = '#' + window.CSS.escape(hash.substr(1))
+        }
+        try {
+          if (document.querySelector(hash)) {
+            // scroll to anchor by returning the selector
+            position = { selector: hash }
+          }
+        } catch (e) {
+          console.warn('Failed to save scroll position. Please add CSS.escape() polyfill (https://github.com/mathiasbynens/CSS.escape).')
+        }
       }
       resolve(position)
     })

en/api/configuration-transition.md

@@ -1,9 +1,11 @@
 ---
-title: "API: The transition Property (EN)"
-description: Set the default properties of the page transitions.
+title: "API: The pageTransition and layoutTransition Properties (EN)"
+description: Set the default properties of the page and layout transitions.
 ---
 
-# The transition Property (EN)
+> Nuxt v2.7.0 introduces key "pageTransition" in favor of the "transition" key to consolidate the naming with layout transition keys.
+
+# The pageTransition Property (EN)
 
 - Type: `String` or `Object`
 
@@ -21,9 +23,9 @@ Example (`nuxt.config.js`):
 
 ```js
 export default {
-  transition: 'page'
+  pageTransition: 'page'
   // or
-  transition: {
+  pageTransition: {
     name: 'page',
     mode: 'out-in',
     beforeEnter (el) {

en/api/context.md

@@ -5,7 +5,7 @@ description: L'objet `context` fournit des objets et paramètres additionnels en
 
 # The Context (EN)
 
-> L'objet `context` fournit des objets et paramètres additionnels en provenance de Nuxt qui ne sont pas traditionnellement disponibles dans les composants Vue. Le `context` est disponible dans des aires de cycle de vie spécifique à Nuxt. On y retrouve, par exemple, `asyncData`, `plugins`, 'middlewares', 'modules', et 'store/nuxtServerInit`.
+> The `context` provides additional objects/params from Nuxt to Vue components. The `context` is available in special nuxt lifecycle areas like `asyncData`, `fetch`, `plugins`, `middleware`, `modules`, and `nuxtServerInit`.
 
 ## Available keys (EN)
 

en/api/menu.json

@@ -91,14 +91,15 @@
       {
         "name": "generate", "to": "/configuration-generate",
         "contents": [
+          { "name": "concurrency", "to": "#concurrency" },
           { "name": "dir", "to": "#dir" },
           { "name": "devtools", "to": "#devtools" },
+          { "name": "exclude", "to": "#exclude" },
           { "name": "fallback", "to": "#fallback" },
           { "name": "interval", "to": "#interval" },
           { "name": "minify", "to": "#minify" },
           { "name": "routes", "to": "#routes" },
-          { "name": "subFolders", "to": "#subfolders" },
-          { "name": "concurrency", "to": "#concurrency" }
+          { "name": "subFolders", "to": "#subfolders" }
         ]
       },
       { "name": "head (EN)", "to": "/configuration-head" },