Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: nuxt/nuxt
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v2.14.7
Choose a base ref
...
head repository: nuxt/nuxt
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v2.14.8
Choose a head ref
Loading
Showing with 2,343 additions and 2,087 deletions.
  1. +2 −2 .github/ISSUE_TEMPLATE/bug-report.md
  2. +1 −1 .github/ISSUE_TEMPLATE/feature-request.md
  3. +1 −1 .github/stale.yml
  4. +63 −24 .github/workflows/test.yml
  5. +53 −40 .github/workflows/windows.yml
  6. +1 −1 .gitpod.yml
  7. +1 −1 LICENSE
  8. +8 −8 README.md
  9. +4 −4 RELEASE_PLAN.md
  10. +2 −2 benchmarks/README.md
  11. +2 −2 distributions/nuxt-start/README.md
  12. +6 −6 distributions/nuxt-start/package.json
  13. +8 −8 distributions/nuxt/README.md
  14. +8 −9 distributions/nuxt/package.json
  15. +1 −1 examples/async-component-injection/posts/deep-dive-into-ocean.vue
  16. +1 −1 examples/async-data/README.md
  17. +1 −1 examples/auth-jwt/README.md
  18. +2 −2 examples/auth-routes/nuxt.config.js
  19. +1 −1 examples/auth-routes/store/index.js
  20. +2 −2 examples/axios/README.md
  21. +2 −2 examples/coffeescript/README.md
  22. +1 −1 examples/coffeescript/nuxt.config.js
  23. +1 −1 examples/coffeescript/package.json
  24. +1 −1 examples/coffeescript/pages/index.vue
  25. +1 −0 examples/custom-build/nuxt.config.js
  26. +1 −1 examples/custom-loading/README.md
  27. +1 −1 examples/custom-page-loading/README.md
  28. +1 −1 examples/custom-port-host/README.md
  29. +1 −1 examples/custom-routes/README.md
  30. +1 −1 examples/custom-server/pages/index.vue
  31. +1 −1 examples/custom-server/server.js
  32. +1 −1 examples/docker-build/.dockerignore
  33. +1 −1 examples/docker-build/nuxt.config.js
  34. +1 −1 examples/dynamic-components/README.md
  35. +1 −1 examples/dynamic-components/nuxt.config.js
  36. +1 −1 examples/global-css/README.md
  37. +1 −1 examples/hello-world/README.md
  38. +1 −1 examples/layout-transitions/README.md
  39. +3 −3 examples/layout-transitions/pages/users-2.vue
  40. +3 −3 examples/layout-transitions/pages/users.vue
  41. +2 −2 examples/markdownit/README.md
  42. +2 −2 examples/meta-info/README.md
  43. +3 −3 examples/meta-info/components/twitter-head-card.vue
  44. +1 −1 examples/meta-info/nuxt.config.js
  45. +1 −1 examples/minimal-features/README.md
  46. +1 −1 examples/nested-routes/README.md
  47. +2 −2 examples/new-fetch/README.md
  48. +3 −3 examples/new-fetch/components/Author.vue
  49. +4 −4 examples/new-fetch/pages/index.vue
  50. +3 −3 examples/new-fetch/pages/posts/_id.vue
  51. +1 −1 examples/no-ssr/README.md
  52. +1 −1 examples/nuxt-prefetch/README.md
  53. +1 −1 examples/plugins-vendor/README.md
  54. +1 −1 examples/plugins-vendor/pages/index.vue
  55. +2 −2 examples/pug-stylus-coffee/README.md
  56. +1 −1 examples/pug-stylus-coffee/components/README.md
  57. +1 −1 examples/pug-stylus-coffee/nuxt.config.coffee
  58. +1 −1 examples/pug-stylus-coffee/package.json
  59. +1 −1 examples/pug-stylus-coffee/pages/index.vue
  60. +1 −1 examples/pug-stylus-coffee/store/README.md
  61. +1 −1 examples/pug/README.md
  62. +1 −1 examples/routes-meta/README.md
  63. +1 −1 examples/routes-transitions/README.md
  64. +3 −3 examples/routes-transitions/pages/users.vue
  65. +1 −1 examples/scroll-behavior/README.md
  66. +2 −2 examples/scroll-behavior/pages/about/contact.vue
  67. +3 −3 examples/scroll-behavior/pages/users.vue
  68. +2 −2 examples/spa/nuxt.config.js
  69. +1 −1 examples/static-images/pages/about.vue
  70. +3 −3 examples/storybook/README.md
  71. +1 −1 examples/storybook/pages/index.vue
  72. +1 −1 examples/storybook/store/README.md
  73. +2 −2 examples/style-resources/README.md
  74. +1 −1 examples/tailwindcss-purgecss/nuxt.config.js
  75. +1 −1 examples/tailwindcss/README.md
  76. +1 −1 examples/tailwindcss/package.json
  77. +1 −1 examples/uikit/pages/index.vue
  78. +5 −5 examples/vue-apollo/pages/car/_id.vue
  79. +1 −1 examples/vue-chartjs/nuxt.config.js
  80. +1 −1 examples/vue-chartjs/pages/contributors.vue
  81. +1 −1 examples/vue-chartjs/pages/index.vue
  82. +2 −2 examples/web-worker/README.md
  83. +1 −1 examples/web-worker/components/README.md
  84. +1 −1 examples/web-worker/nuxt.config.js
  85. +1 −1 examples/web-worker/package.json
  86. +1 −1 examples/web-worker/pages/index.vue
  87. +1 −1 examples/with-ava/Readme.md
  88. +2 −2 examples/with-ava/test/index.test.js
  89. +1 −1 examples/with-cookies/README.md
  90. +1 −1 examples/with-feathers/package.json
  91. +2 −2 examples/with-feathers/src/middleware/nuxt.js
  92. +1 −1 examples/with-firebase/README.md
  93. +1 −1 examples/with-firebase/layouts/default.vue
  94. +1 −1 examples/with-firebase/package.json
  95. +1 −1 examples/with-keep-alive/README.md
  96. +1 −1 examples/with-museui/pages/index.vue
  97. +1 −1 examples/with-purgecss/README.md
  98. +1 −1 examples/with-purgecss/package.json
  99. +1 −1 examples/with-sockets/README.md
  100. +3 −3 examples/with-sockets/pages/index.vue
  101. +1 −1 examples/with-sockets/server.js
  102. +2 −2 examples/with-vue-material/README.md
  103. +1 −1 examples/with-vuetify/README.md
  104. +3 −3 examples/with-vuetify/layouts/default.vue
  105. +1 −1 examples/with-vux/README.md
  106. +5 −5 examples/with-vux/pages/index.vue
  107. +2 −2 examples/with-vux/plugins/vux-components.js
  108. +1 −1 lerna.json
  109. +20 −20 package.json
  110. +12 −12 packages/babel-preset-app/package.json
  111. +5 −5 packages/builder/package.json
  112. +1 −1 packages/builder/src/builder.js
  113. +5 −6 packages/cli/package.json
  114. +1 −1 packages/cli/src/commands/generate.js
  115. +3 −1 packages/cli/src/commands/webpack.js
  116. +2 −2 packages/cli/src/options/common.js
  117. +1 −1 packages/cli/src/utils/banner.js
  118. +4 −4 packages/cli/src/utils/generate.js
  119. +2 −2 packages/cli/src/utils/index.js
  120. +3 −2 packages/cli/src/utils/serve.js
  121. +4 −4 packages/cli/test/unit/__snapshots__/command.test.js.snap
  122. +5 −1 packages/cli/test/unit/command.test.js
  123. +4 −4 packages/cli/test/unit/utils.test.js
  124. +6 −1 packages/cli/test/utils/index.js
  125. +1 −1 packages/cli/test/utils/mocking.js
  126. +6 −6 packages/config/package.json
  127. +1 −0 packages/config/src/config/generate.js
  128. +1 −1 packages/config/src/config/messages.js
  129. +1 −0 packages/config/src/options.js
  130. +2 −1 packages/config/test/__snapshots__/options.test.js.snap
  131. +4 −2 packages/config/test/config/__snapshots__/index.test.js.snap
  132. +5 −5 packages/core/package.json
  133. +4 −3 packages/generator/package.json
  134. +34 −8 packages/generator/src/generator.js
  135. +4 −4 packages/server/package.json
  136. +4 −1 packages/server/src/jsdom.js
  137. +1 −0 packages/server/src/listener.js
  138. +8 −8 packages/server/src/middleware/nuxt.js
  139. +16 −1 packages/server/src/server.js
  140. +2 −2 packages/server/test/middleware/nuxt.test.js
  141. +31 −1 packages/types/app/index.d.ts
  142. +1 −1 packages/types/config/head.d.ts
  143. +3 −1 packages/types/config/index.d.ts
  144. +7 −7 packages/types/package.json
  145. +1 −1 packages/utils/package.json
  146. +18 −6 packages/utils/src/route.js
  147. +3 −3 packages/vue-app/package.json
  148. +28 −6 packages/vue-app/template/App.js
  149. +11 −4 packages/vue-app/template/client.js
  150. +2 −2 packages/vue-app/template/components/nuxt-link.client.js
  151. +3 −3 packages/vue-app/template/mixins/fetch.client.js
  152. +2 −2 packages/vue-app/template/mixins/fetch.server.js
  153. +14 −3 packages/vue-app/template/router.js
  154. +1 −1 packages/vue-app/template/server.js
  155. +27 −4 packages/vue-app/template/utils.js
  156. +2 −2 packages/vue-renderer/package.json
  157. +3 −2 packages/vue-renderer/src/renderer.js
  158. +7 −4 packages/vue-renderer/src/renderers/spa.js
  159. +16 −9 packages/vue-renderer/src/renderers/ssr.js
  160. +10 −10 packages/webpack/package.json
  161. +1 −1 packages/webpack/src/config/base.js
  162. +10 −8 packages/webpack/src/utils/postcss.js
  163. +3 −0 renovate.json
  164. +2 −2 test/dev/basic.generate.test.js
  165. +8 −8 test/dev/basic.ssr.test.js
  166. +3 −3 test/dev/{unicode-base.test.js → encoding.test.js}
  167. +1 −1 test/dev/express.test.js
  168. +53 −0 test/dev/full-static.test.js
  169. +4 −4 test/dev/named-views.test.js
  170. +2 −2 test/dev/nuxt.test.js
  171. +0 −26 test/dev/unicode-base.size-limit.test.js
  172. +2 −2 test/dev/with-config.test.js
  173. +11 −6 test/e2e/basic.browser.test.js
  174. +1 −1 test/fixtures/basic/nuxt.config.js
  175. +1 −1 test/fixtures/basic/pages/async-data.vue
  176. +1 −1 test/fixtures/basic/pages/await-async-data.vue
  177. +1 −1 test/fixtures/basic/pages/callback-async-data.vue
  178. +1 −1 test/fixtures/basic/pages/noloading.vue
  179. +1 −1 test/fixtures/basic/pages/redirect-external-no-slash.vue
  180. +1 −1 test/fixtures/basic/pages/redirect-external.vue
  181. +18 −0 test/fixtures/basic/pages/redirection/_slug.vue
  182. +1 −1 test/fixtures/{unicode-base/unicode-base.test.js → encoding/encoding.test.js}
  183. +32 −0 test/fixtures/encoding/layouts/default.vue
  184. +12 −0 test/fixtures/encoding/nuxt.config.js
  185. +5 −0 test/fixtures/encoding/pages/index.vue
  186. 0 test/fixtures/{unicode-base/pages/index.vue → encoding/pages/тест.vue}
  187. +5 −5 test/fixtures/fetch/components/Team.vue
  188. +5 −5 test/fixtures/fetch/pages/fetch-button.vue
  189. +3 −3 test/fixtures/fetch/pages/fetch-client.vue
  190. +5 −5 test/fixtures/fetch/pages/fetch-conditional.vue
  191. +7 −7 test/fixtures/fetch/pages/fetch-deep.vue
  192. +5 −5 test/fixtures/fetch/pages/fetch-delay.vue
  193. +3 −3 test/fixtures/fetch/pages/fetch-error.vue
  194. +5 −5 test/fixtures/fetch/pages/fetch-root.vue
  195. +5 −5 test/fixtures/fetch/pages/index.vue
  196. +3 −3 test/fixtures/fetch/pages/old-fetch.vue
  197. +1 −1 test/fixtures/full-static/nuxt.config.js
  198. +3 −3 test/fixtures/full-static/pages/store.vue
  199. +0 −43 test/fixtures/unicode-base/nuxt.config.js
  200. +1 −1 test/fixtures/with-config/app.html
  201. +1 −1 test/fixtures/with-config/nuxt.config.js
  202. +1,454 −1,491 yarn.lock
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/bug-report.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
name: 🚨 Bug report | Bug 提交
about: Report a bug report to help us improve Nuxt.js.
about: Report a bug report to help us improve Nuxt.
title: ''
labels: 'bug-report'
assignees: ''
@@ -11,7 +11,7 @@ assignees: ''
**IMPORTANT** Before reporting a bug:
- Please make sure that you have read through Nuxt.js documentation: https://nuxtjs.org
- Please make sure that you have read through Nuxt documentation: https://nuxtjs.org
- If issue is related to a module please create the issue in corresponding repository
- Ensure using latest version of nuxt dependencies using `yarn upgrade nuxt` or `npm upgrade nuxt`
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/feature-request.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
name: 🙋 Feature request | 新功能提案
about: Suggest an idea or enhancement for Nuxt.js.
about: Suggest an idea or enhancement for Nuxt.
title: ''
labels: 'feature-request'
assignees: ''
2 changes: 1 addition & 1 deletion .github/stale.yml
Original file line number Diff line number Diff line change
@@ -11,7 +11,7 @@ exemptLabels:
exemptAssignees: true
only: issues
markComment: >
Thanks for your contribution to Nuxt.js!
Thanks for your contribution to Nuxt!
This issue has been automatically marked as stale because it has not had
recent activity. It will be closed if no further activity occurs.
87 changes: 63 additions & 24 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -36,18 +36,25 @@ jobs:

- name: cache node_modules
id: node_modules_cache_id
uses: actions/cache@v1
uses: actions/cache@v2
with:
path: node_modules
path: |
node_modules
packages/*/node_modules
distributions/*/node_modules
key: ${{ matrix.os }}-node-v${{ matrix.node }}-deps-${{ hashFiles(format('{0}{1}', github.workspace, '/yarn.lock')) }}

- name: install
run: yarn --check-files --frozen-lockfile --non-interactive

- name: cache workspace
uses: actions/cache@v1
uses: actions/cache@v2
with:
path: ${{ github.workspace }}
path: |
node_modules
packages/*/node_modules
distributions/*/node_modules
packages/*/dist
key: ${{ matrix.os }}-node-v${{ matrix.node }}-nuxt-${{ github.sha }}

lint:
@@ -67,9 +74,13 @@ jobs:
uses: actions/checkout@master

- name: restore workspace cache
uses: actions/cache@v1
uses: actions/cache@v2
with:
path: ${{ github.workspace }}
path: |
node_modules
packages/*/node_modules
distributions/*/node_modules
packages/*/dist
key: ${{ matrix.os }}-node-v${{ matrix.node }}-nuxt-${{ github.sha }}

- name: lint
@@ -96,9 +107,13 @@ jobs:
uses: actions/checkout@master

- name: restore workspace cache
uses: actions/cache@v1
uses: actions/cache@v2
with:
path: ${{ github.workspace }}
path: |
node_modules
packages/*/node_modules
distributions/*/node_modules
packages/*/dist
key: ${{ matrix.os }}-node-v${{ matrix.node }}-nuxt-${{ github.sha }}

- name: audit
@@ -123,9 +138,13 @@ jobs:
uses: actions/checkout@master

- name: restore workspace cache
uses: actions/cache@v1
uses: actions/cache@v2
with:
path: ${{ github.workspace }}
path: |
node_modules
packages/*/node_modules
distributions/*/node_modules
packages/*/dist
key: ${{ matrix.os }}-node-v${{ matrix.node }}-nuxt-${{ github.sha }}

- name: test unit
@@ -160,16 +179,20 @@ jobs:
uses: actions/checkout@master

- name: restore workspace cache
uses: actions/cache@v1
uses: actions/cache@v2
with:
path: ${{ github.workspace }}
path: |
node_modules
packages/*/node_modules
distributions/*/node_modules
packages/*/dist
key: ${{ matrix.os }}-node-v${{ matrix.node }}-nuxt-${{ github.sha }}

- name: build
run: yarn test:fixtures -i

- name: cache fixtures
uses: actions/cache@v1
uses: actions/cache@v2
with:
path: test/fixtures
key: ${{ matrix.os }}-node-v${{ matrix.node }}-fixtures-${{ github.sha }}
@@ -192,13 +215,17 @@ jobs:
uses: actions/checkout@master

- name: restore workspace cache
uses: actions/cache@v1
uses: actions/cache@v2
with:
path: ${{ github.workspace }}
path: |
node_modules
packages/*/node_modules
distributions/*/node_modules
packages/*/dist
key: ${{ matrix.os }}-node-v${{ matrix.node }}-nuxt-${{ github.sha }}

- name: restore fixtures
uses: actions/cache@v1
uses: actions/cache@v2
with:
path: test/fixtures
key: ${{ matrix.os }}-node-v${{ matrix.node }}-fixtures-${{ github.sha }}
@@ -225,13 +252,17 @@ jobs:
uses: actions/checkout@master

- name: restore workspace cache
uses: actions/cache@v1
uses: actions/cache@v2
with:
path: ${{ github.workspace }}
path: |
node_modules
packages/*/node_modules
distributions/*/node_modules
packages/*/dist
key: ${{ matrix.os }}-node-v${{ matrix.node }}-nuxt-${{ github.sha }}

- name: restore fixtures
uses: actions/cache@v1
uses: actions/cache@v2
with:
path: test/fixtures
key: ${{ matrix.os }}-node-v${{ matrix.node }}-fixtures-${{ github.sha }}
@@ -258,13 +289,17 @@ jobs:
uses: actions/checkout@master

- name: restore workspace cache
uses: actions/cache@v1
uses: actions/cache@v2
with:
path: ${{ github.workspace }}
path: |
node_modules
packages/*/node_modules
distributions/*/node_modules
packages/*/dist
key: ${{ matrix.os }}-node-v${{ matrix.node }}-nuxt-${{ github.sha }}

- name: restore fixtures
uses: actions/cache@v1
uses: actions/cache@v2
with:
path: test/fixtures
key: ${{ matrix.os }}-node-v${{ matrix.node }}-fixtures-${{ github.sha }}
@@ -283,9 +318,13 @@ jobs:

steps:
- name: restore workspace cache
uses: actions/cache@v1
uses: actions/cache@v2
with:
path: ${{ github.workspace }}
path: |
node_modules
packages/*/node_modules
distributions/*/node_modules
packages/*/dist
key: ${{ matrix.os }}-node-v${{ matrix.node }}-nuxt-${{ github.sha }}

- uses: actions/setup-node@v1
93 changes: 53 additions & 40 deletions .github/workflows/windows.yml
Original file line number Diff line number Diff line change
@@ -30,56 +30,61 @@ jobs:

- name: cache node_modules
id: node_modules_cache_id
uses: actions/cache@v1
uses: actions/cache@v2
with:
path: node_modules
path: |
node_modules
packages/*/node_modules
distributions/*/node_modules
key: ${{ matrix.os }}-node-v${{ matrix.node }}-deps-${{ hashFiles(format('{0}{1}', github.workspace, '/yarn.lock')) }}

- name: install
run: yarn --check-files --frozen-lockfile --non-interactive

- name: cache workspace
uses: actions/cache@v1
uses: actions/cache@v2
with:
path: ${{ github.workspace }}
path: |
node_modules
packages/*/node_modules
distributions/*/node_modules
packages/*/dist
key: ${{ matrix.os }}-node-v${{ matrix.node }}-nuxt-${{ github.sha }}


# TODO: Investigate [error]Process completed with exit code 1.
# test-unit:
# runs-on: ${{ matrix.os }}
test-unit:
runs-on: ${{ matrix.os }}

# strategy:
# matrix:
# os: [windows-latest]
# node: [12]
strategy:
matrix:
os: [windows-latest]
node: [12]

# env:
# NODE_OPTIONS: "--max_old_space_size=4096"
env:
NODE_OPTIONS: "--max_old_space_size=4096"

# steps:
# - uses: actions/setup-node@v1
# with:
# node-version: ${{ matrix.node }}
steps:
- uses: actions/setup-node@v1
with:
node-version: ${{ matrix.node }}

# - name: checkout
# uses: actions/checkout@master
- name: checkout
uses: actions/checkout@master

# - name: restore workspace cache
# uses: actions/cache@v1
# with:
# path: ${{ github.workspace }}
# key: ${{ matrix.os }}-node-v${{ matrix.node }}-nuxt-${{ github.sha }}
- name: restore workspace cache
uses: actions/cache@v2
with:
path: |
node_modules
packages/*/node_modules
distributions/*/node_modules
packages/*/dist
key: ${{ matrix.os }}-node-v${{ matrix.node }}-nuxt-${{ github.sha }}

# - name: test unit
# run: node node_modules/jest/bin/jest packages -i --coverage --verbose
- name: test unit
run: yarn test:unit --testPathIgnorePatterns=packages/cli

# - name: codecov
# uses: codecov/codecov-action@v1
# with:
# token: ${{ secrets.CODECOV_TOKEN }}
# flags: unittests
# needs: setup
needs: setup

build:
runs-on: ${{ matrix.os }}
@@ -101,16 +106,20 @@ jobs:
uses: actions/checkout@master

- name: restore workspace cache
uses: actions/cache@v1
uses: actions/cache@v2
with:
path: ${{ github.workspace }}
path: |
node_modules
packages/*/node_modules
distributions/*/node_modules
packages/*/dist
key: ${{ matrix.os }}-node-v${{ matrix.node }}-nuxt-${{ github.sha }}

- name: build
run: yarn test:fixtures -i
run: yarn test:fixtures

- name: cache fixtures
uses: actions/cache@v1
uses: actions/cache@v2
with:
path: test/fixtures
key: ${{ matrix.os }}-node-v${{ matrix.node }}-fixtures-${{ github.sha }}
@@ -136,17 +145,21 @@ jobs:
uses: actions/checkout@master

- name: restore workspace cache
uses: actions/cache@v1
uses: actions/cache@v2
with:
path: ${{ github.workspace }}
path: |
node_modules
packages/*/node_modules
distributions/*/node_modules
packages/*/dist
key: ${{ matrix.os }}-node-v${{ matrix.node }}-nuxt-${{ github.sha }}

- name: restore fixtures
uses: actions/cache@v1
uses: actions/cache@v2
with:
path: test/fixtures
key: ${{ matrix.os }}-node-v${{ matrix.node }}-fixtures-${{ github.sha }}

- name: test dev
run: yarn test:dev -i
run: yarn test:dev
needs: build
2 changes: 1 addition & 1 deletion .gitpod.yml
Original file line number Diff line number Diff line change
@@ -3,4 +3,4 @@ tasks:

vscode:
extensions:
- octref.vetur@0.22.6:7frR53XJ71Pa6fZpNmC2pA==
- octref.vetur@0.28.0:bW1RGNnmWYQO43JdJgK34w==
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2016-2020 Nuxt.js Team
Copyright (c) 2016-2020 Nuxt Team
- Sebastien Chopin ([@Atinux](https://github.com/Atinux))
- Alexandre Chopin ([@alexchopin](https://github.com/alexchopin))
- Pooya Parsa ([@pi0](https://github.com/pi0))
Loading