diff --git a/.eslintignore b/.eslintignore index 8e3846f0c839..5848c5cda3e0 100644 --- a/.eslintignore +++ b/.eslintignore @@ -8,7 +8,10 @@ coverage ## cofeescript examples/coffeescript/pages/index.vue -examples/pug-stylus-coffee/ +examples/pug-stylus-coffee/**/*.* +examples/web-worker/**/*.* +examples/vue-class-component/**/*.* + # Packages # vue-app diff --git a/.eslintrc.js b/.eslintrc.js index a33862ef37bd..d77d038b93b6 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -1,18 +1,17 @@ module.exports = { root: true, - parserOptions: { - parser: 'babel-eslint', - sourceType: 'module', - ecmaFeatures: { - legacyDecorators: true - } - }, extends: [ '@nuxtjs' ], globals: { BigInt: true }, + env: { + 'jest/globals': true + }, + plugins: [ + 'jest' + ], rules: { 'no-console': 'error', 'no-debugger': 'error', @@ -20,7 +19,8 @@ module.exports = { quotes: ['error', 'single', { avoidEscape: true, allowTemplateLiterals: true }], // https://github.com/babel/babel-eslint/issues/799 'template-curly-spacing': 0, - indent: ['error', 2, { SwitchCase: 1, ignoredNodes: ['TemplateLiteral'] }] + indent: ['error', 2, { SwitchCase: 1, ignoredNodes: ['TemplateLiteral'] }], + 'vue/multi-word-component-names': 0 }, overrides: [{ files: ['test/fixtures/*/.nuxt*/**'], diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml index 3268f7a06860..cea2d434a9af 100644 --- a/.github/FUNDING.yml +++ b/.github/FUNDING.yml @@ -3,5 +3,3 @@ # github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2] github: [nuxt] open_collective: nuxtjs -tidelift: npm/nuxt -custom: https://otechie.com/nuxt diff --git a/.github/ISSUE_TEMPLATE/bug-report.md b/.github/ISSUE_TEMPLATE/bug-report.md deleted file mode 100644 index 6759cb02bb70..000000000000 --- a/.github/ISSUE_TEMPLATE/bug-report.md +++ /dev/null @@ -1,47 +0,0 @@ ---- -name: ๐Ÿšจ Bug report | Bug ๆไบค -about: Report a bug report to help us improve Nuxt. -title: '' -labels: 'bug-report' -assignees: '' - ---- - - - -### Versions - -- nuxt: -- node: - -### Reproduction - - - -
-Additional Details -
- -
- -### Steps to reproduce - - -### What is Expected? - - -### What is actually happening? diff --git a/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/bug-report.yml new file mode 100644 index 000000000000..bbea7f97464b --- /dev/null +++ b/.github/ISSUE_TEMPLATE/bug-report.yml @@ -0,0 +1,49 @@ +name: "\U0001F41E Bug report" +description: Create a report to help us improve Nuxt +labels: ["pending triage", "3.x"] +body: + - type: markdown + attributes: + value: | + Please carefully read the contribution docs before creating a bug report + ๐Ÿ‘‰ https://nuxt.com/docs/community/reporting-bugs + + Please use a template below to create a minimal reproduction + ๐Ÿ‘‰ https://stackblitz.com/github/nuxt/starter/tree/v3-stackblitz + ๐Ÿ‘‰ https://codesandbox.io/p/github/nuxt/starter/v3-codesandbox + - type: textarea + id: bug-env + attributes: + label: Environment + description: You can use `npx nuxi info` to fill this section + placeholder: Environment + validations: + required: true + - type: textarea + id: reproduction + attributes: + label: Reproduction + description: Please provide a link to a repo that can reproduce the problem you ran into. A [**minimal reproduction**](https://nuxt.com/docs/community/reporting-bugs#create-a-minimal-reproduction) is required unless you are absolutely sure that the issue is obvious and the provided information is enough to understand the problem. If a report is vague (e.g. just a generic error message) and has no reproduction, it will receive a "need reproduction" label. If no reproduction is provided we might close it. + placeholder: Reproduction + validations: + required: true + - type: textarea + id: bug-description + attributes: + label: Describe the bug + description: A clear and concise description of what the bug is. If you intend to submit a PR for this issue, tell us in the description. Thanks! + placeholder: Bug description + validations: + required: true + - type: textarea + id: additonal + attributes: + label: Additional context + description: If applicable, add any other context about the problem here + - type: textarea + id: logs + attributes: + label: Logs + description: | + Optional if provided reproduction. Please try not to insert an image but copy paste the log text. + render: shell-script diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml index f8307da7caa7..7f6ee9646cef 100644 --- a/.github/ISSUE_TEMPLATE/config.yml +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -1,6 +1,11 @@ -blank_issues_enabled: false +blank_issues_enabled: true contact_links: - - name: โ—๏ธ All other issues | ๅ…ถไป–้—ฎ้ข˜ + - name: ๐Ÿ“š Nuxt 3 Documentation + url: https://nuxt.com/docs/ + about: Check the documentation for usage of Nuxt 3 + - name: ๐Ÿ“š Nuxt 2 Documentation + url: https://nuxtjs.org/ + about: Check the documentation for usage of Nuxt 2 + - name: ๐Ÿ’ฌ Discussions url: https://github.com/nuxt/nuxt.js/discussions - about: | - Please use GitHub Discussions for other issues and asking questions. + about: Use discussions if you have another issue, an idea for improvement or for asking questions. diff --git a/.github/ISSUE_TEMPLATE/feature-request.md b/.github/ISSUE_TEMPLATE/feature-request.md deleted file mode 100644 index 5ed9ed3fd2a1..000000000000 --- a/.github/ISSUE_TEMPLATE/feature-request.md +++ /dev/null @@ -1,26 +0,0 @@ ---- -name: ๐Ÿ™‹ Feature request | ๆ–ฐๅŠŸ่ƒฝๆๆกˆ -about: Suggest an idea or enhancement for Nuxt. -title: '' -labels: 'feature-request' -assignees: '' - ---- - - - -### Is your feature request related to a problem? Please describe. - - - -### Describe the solution you'd like - - - -### Describe alternatives you've considered - - - -### Additional context - - diff --git a/.github/ISSUE_TEMPLATE/feature-request.yml b/.github/ISSUE_TEMPLATE/feature-request.yml new file mode 100644 index 000000000000..0549dbbfd0cd --- /dev/null +++ b/.github/ISSUE_TEMPLATE/feature-request.yml @@ -0,0 +1,37 @@ +name: "๐Ÿš€ Feature request" +description: Suggest a feature that will improve Nuxt +labels: ["pending triage"] +body: + - type: markdown + attributes: + value: | + Thank you for taking the time to fill out this feature request! + + Please carefully read the contribution docs before suggesting a new feature + ๐Ÿ‘‰ https://nuxt.com/docs/community/contribution/#creating-an-issue + - type: textarea + id: feature-description + attributes: + label: Describe the feature + description: A clear and concise description of what you think would be a helpful addition to Nuxt, including the possible use cases and alternatives you have considered. If you have a working prototype or module that implements it, please include a link. + placeholder: Feature description + validations: + required: true + - type: checkboxes + id: additional-info + attributes: + label: Additional information + description: Additional information that helps us decide how to proceed. + options: + - label: Would you be willing to help implement this feature? + - label: Could this feature be implemented as a module? + - type: checkboxes + id: required-info + attributes: + label: Final checks + description: Before submitting, please make sure you do the following + options: + - label: Read the [contribution guide](https://nuxt.com/docs/community/contribution). + required: true + - label: Check existing [discussions](https://github.com/nuxt/nuxt.js/discussions) and [issues](https://github.com/nuxt/nuxt.js/issues). + required: true diff --git a/.github/ISSUE_TEMPLATE/z-bug-report-2.yml b/.github/ISSUE_TEMPLATE/z-bug-report-2.yml new file mode 100644 index 000000000000..ff8132287948 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/z-bug-report-2.yml @@ -0,0 +1,49 @@ +name: "\U0001F41E Bug report (Nuxt 2)" +description: Create a report to help us improve Nuxt +labels: ["pending triage", "2.x"] +body: + - type: markdown + attributes: + value: | + Please carefully read the contribution docs before creating a bug report + ๐Ÿ‘‰ https://nuxt.com/docs/community/reporting-bugs + + Please use a template below to create a minimal reproduction + ๐Ÿ‘‰ https://stackblitz.com/github/nuxt/starter/tree/v2 + ๐Ÿ‘‰ https://codesandbox.io/p/github/nuxt/starter/v2 + - type: textarea + id: bug-env + attributes: + label: Environment + description: You can use `npx envinfo --system --npmPackages '{nuxt,@nuxt/*}' --binaries --browsers` to fill this section + placeholder: Environment + validations: + required: true + - type: textarea + id: reproduction + attributes: + label: Reproduction + description: Please provide a link to a repo that can reproduce the problem you ran into. A [**minimal reproduction**](https://nuxt.com/docs/community/reporting-bugs#create-a-minimal-reproduction) is required unless you are absolutely sure that the issue is obvious and the provided information is enough to understand the problem. If a report is vague (e.g. just a generic error message) and has no reproduction, it will receive a "need reproduction" label. If no reproduction is provided we might close it. + placeholder: Reproduction + validations: + required: true + - type: textarea + id: bug-description + attributes: + label: Describe the bug + description: A clear and concise description of what the bug is. If you intend to submit a PR for this issue, tell us in the description. Thanks! + placeholder: Bug description + validations: + required: true + - type: textarea + id: additonal + attributes: + label: Additional context + description: If applicable, add any other context about the problem here + - type: textarea + id: logs + attributes: + label: Logs + description: | + Optional if provided reproduction. Please try not to insert an image but copy paste the log text. + render: shell-script diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index a1929d1899d8..98aa03da49b4 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -1,24 +1,36 @@ - + -- [ ] Bug fix (a non-breaking change which fixes an issue) -- [ ] New feature (a non-breaking change which adds functionality) -- [ ] Breaking change (fix or feature that would cause existing functionality to change) +Please carefully read the contribution docs before creating a pull request + ๐Ÿ‘‰ https://nuxt.com/docs/community/contribution +--> +### ๐Ÿ”— Linked issue -## Description - - - + +### โ“ Type of change -## Checklist: - - - -- [ ] My change requires a change to the documentation. -- [ ] I have updated the documentation accordingly. (PR: #) -- [ ] I have added tests to cover my changes (if not applicable, please state why) -- [ ] All new and existing tests are passing. + + +- [ ] ๐Ÿ“– Documentation (updates to the documentation or readme) +- [ ] ๐Ÿž Bug fix (a non-breaking change that fixes an issue) +- [ ] ๐Ÿ‘Œ Enhancement (improving an existing functionality like performance) +- [ ] โœจ New feature (a non-breaking change that adds functionality) +- [ ] โš ๏ธ Breaking change (fix or feature that would cause existing functionality to change) + +### ๐Ÿ“š Description + + + + + +### ๐Ÿ“ Checklist + + + + + +- [ ] I have linked an issue or discussion. +- [ ] I have updated the documentation accordingly. diff --git a/.github/icons/browserstack.svg b/.github/icons/browserstack.svg new file mode 100644 index 000000000000..adf2cf914e59 --- /dev/null +++ b/.github/icons/browserstack.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/.github/icons/saucelabs.svg b/.github/icons/saucelabs.svg new file mode 100644 index 000000000000..d3e5457e3fff --- /dev/null +++ b/.github/icons/saucelabs.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/.github/logo.svg b/.github/logo.svg new file mode 100644 index 000000000000..4fa6ea976cf5 --- /dev/null +++ b/.github/logo.svg @@ -0,0 +1,17 @@ + + +
+ + + + + + + + + + + +
+
+
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml deleted file mode 100644 index a5f45cfb3488..000000000000 --- a/.github/workflows/nightly.yml +++ /dev/null @@ -1,49 +0,0 @@ -name: nightly - -on: - schedule: - - cron: '0 0 * * *' - -jobs: - nightly: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - with: - ref: 'refs/heads/dev' - fetch-depth: 0 # All history - - name: fetch tags - run: git fetch --depth=1 origin "+refs/tags/*:refs/tags/*" - - uses: actions/setup-node@v2 - with: - node-version: 14 - registry-url: 'https://registry.npmjs.org' - - name: install - run: yarn --check-files --frozen-lockfile --non-interactive - - name: lint - run: yarn test:lint - - name: audit - run: yarn run audit - - name: build - run: yarn test:fixtures -i - env: - NODE_OPTIONS: "--max_old_space_size=4096" - - name: lint app - run: yarn lint:app - - name: test types - run: yarn test:types - - name: test dev - run: yarn test:dev - - name: test unit - run: yarn test:unit - - name: test e2e - run: yarn test:e2e - - name: bump version - run: yarn lerna version --yes --no-changelog --no-git-tag-version --no-push --force-publish "*" --loglevel verbose - - name: build - run: PACKAGE_SUFFIX=edge yarn build - - name: publish - run: ./scripts/workspace-run npm publish -q - env: - NODE_AUTH_TOKEN: ${{secrets.NODE_AUTH_TOKEN}} - diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 89d8716b2508..c7c0f531e497 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -3,11 +3,9 @@ name: test on: push: branches: - - dev - 2.x pull_request: branches: - - dev - 2.x jobs: @@ -19,15 +17,15 @@ jobs: matrix: # os: [ubuntu-latest, macos-latest, windows-latest] os: [ubuntu-latest] - node: [12, 14] + node: [14] steps: - - uses: actions/setup-node@v2 + - uses: actions/setup-node@v3 with: node-version: ${{ matrix.node }} - name: checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: fetch-depth: 0 # All history @@ -36,7 +34,7 @@ jobs: - name: cache node_modules id: node_modules_cache_id - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: | node_modules @@ -48,7 +46,7 @@ jobs: run: yarn --check-files --frozen-lockfile --non-interactive - name: cache workspace - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: | node_modules @@ -66,7 +64,7 @@ jobs: node: [14] steps: - - uses: actions/setup-node@v2 + - uses: actions/setup-node@v3 with: node-version: ${{ matrix.node }} @@ -74,7 +72,7 @@ jobs: uses: actions/checkout@master - name: restore workspace cache - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: | node_modules @@ -99,7 +97,7 @@ jobs: node: [14] steps: - - uses: actions/setup-node@v2 + - uses: actions/setup-node@v3 with: node-version: ${{ matrix.node }} @@ -107,7 +105,7 @@ jobs: uses: actions/checkout@master - name: restore workspace cache - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: | node_modules @@ -127,10 +125,10 @@ jobs: matrix: # os: [ubuntu-latest, macos-latest, windows-latest] os: [ubuntu-latest] - node: [12, 14] + node: [14] steps: - - uses: actions/setup-node@v2 + - uses: actions/setup-node@v3 with: node-version: ${{ matrix.node }} @@ -138,7 +136,7 @@ jobs: uses: actions/checkout@master - name: restore workspace cache - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: | node_modules @@ -151,7 +149,7 @@ jobs: run: yarn test:unit --coverage - name: codecov - uses: codecov/codecov-action@v2 + uses: codecov/codecov-action@v3 with: token: ${{ secrets.CODECOV_TOKEN }} flags: unittests @@ -164,13 +162,13 @@ jobs: matrix: # os: [ubuntu-latest, macos-latest, windows-latest] os: [ubuntu-latest] - node: [12, 14] + node: [14] env: NODE_OPTIONS: "--max_old_space_size=4096" steps: - - uses: actions/setup-node@v2 + - uses: actions/setup-node@v3 with: node-version: ${{ matrix.node }} @@ -178,7 +176,7 @@ jobs: uses: actions/checkout@master - name: restore workspace cache - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: | node_modules @@ -191,7 +189,7 @@ jobs: run: yarn test:fixtures -i - name: Save fixtures - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: fixtures-${{ matrix.os }}-node-v${{ matrix.node }} path: test/fixtures @@ -206,7 +204,7 @@ jobs: node: [14] steps: - - uses: actions/setup-node@v2 + - uses: actions/setup-node@v3 with: node-version: ${{ matrix.node }} @@ -214,7 +212,7 @@ jobs: uses: actions/checkout@master - name: restore workspace cache - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: | node_modules @@ -224,7 +222,7 @@ jobs: key: ${{ matrix.os }}-node-v${{ matrix.node }}-nuxt-${{ github.sha }} - name: restore fixtures - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v3 with: name: fixtures-${{ matrix.os }}-node-v${{ matrix.node }} path: test/fixtures @@ -240,10 +238,10 @@ jobs: matrix: # os: [ubuntu-latest, macos-latest, windows-latest] os: [ubuntu-latest] - node: [12, 14] + node: [14] steps: - - uses: actions/setup-node@v2 + - uses: actions/setup-node@v3 with: node-version: ${{ matrix.node }} @@ -251,7 +249,7 @@ jobs: uses: actions/checkout@master - name: restore workspace cache - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: | node_modules @@ -261,7 +259,7 @@ jobs: key: ${{ matrix.os }}-node-v${{ matrix.node }}-nuxt-${{ github.sha }} - name: restore fixtures - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v3 with: name: fixtures-${{ matrix.os }}-node-v${{ matrix.node }} path: test/fixtures @@ -277,10 +275,10 @@ jobs: matrix: # os: [ubuntu-latest, macos-latest, windows-latest] os: [ubuntu-latest] - node: [12, 14] + node: [14] steps: - - uses: actions/setup-node@v2 + - uses: actions/setup-node@v3 with: node-version: ${{ matrix.node }} @@ -288,7 +286,7 @@ jobs: uses: actions/checkout@master - name: restore workspace cache - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: | node_modules @@ -298,7 +296,7 @@ jobs: key: ${{ matrix.os }}-node-v${{ matrix.node }}-nuxt-${{ github.sha }} - name: restore fixtures - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v3 with: name: fixtures-${{ matrix.os }}-node-v${{ matrix.node }} path: test/fixtures @@ -319,14 +317,14 @@ jobs: - name: checkout uses: actions/checkout@master with: - ref: 'refs/heads/dev' + ref: "refs/heads/dev" fetch-depth: 0 # All history - name: fetch tags run: git fetch --depth=1 origin "+refs/tags/*:refs/tags/*" - name: restore workspace cache - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: | node_modules @@ -335,10 +333,10 @@ jobs: packages/*/dist key: ${{ matrix.os }}-node-v${{ matrix.node }}-nuxt-${{ github.sha }} - - uses: actions/setup-node@v2 + - uses: actions/setup-node@v3 with: node-version: ${{ matrix.node }} - registry-url: 'https://registry.npmjs.org' + registry-url: "https://registry.npmjs.org" - name: bump version run: yarn lerna version --yes --no-changelog --no-git-tag-version --no-push --force-publish "*" --loglevel verbose diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 141177e14f2b..df0c1374a137 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -3,11 +3,9 @@ name: windows on: push: branches: - - dev - 2.x pull_request: branches: - - dev - 2.x jobs: @@ -21,28 +19,28 @@ jobs: node: [14] steps: - - uses: actions/setup-node@v2 + - uses: actions/setup-node@v3 with: node-version: ${{ matrix.node }} - name: checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: cache node_modules id: node_modules_cache_id - uses: actions/cache@v2 + uses: actions/cache@v3 with: - path: | + 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')) }} + key: ${{ matrix.os }}-node-v${{ matrix.node }}-deps-${{ hashFiles(format('{0}{1}', github.workspace, '/yarn.lock')) }}-2 - name: install run: yarn --check-files --frozen-lockfile --non-interactive - name: cache workspace - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: | node_modules @@ -51,7 +49,6 @@ jobs: packages/*/dist key: ${{ matrix.os }}-node-v${{ matrix.node }}-nuxt-${{ github.sha }} - test-unit: runs-on: ${{ matrix.os }} @@ -64,7 +61,7 @@ jobs: NODE_OPTIONS: "--max_old_space_size=4096" steps: - - uses: actions/setup-node@v2 + - uses: actions/setup-node@v3 with: node-version: ${{ matrix.node }} @@ -72,7 +69,7 @@ jobs: uses: actions/checkout@master - name: restore workspace cache - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: | node_modules @@ -98,7 +95,7 @@ jobs: NODE_OPTIONS: "--max_old_space_size=4096" steps: - - uses: actions/setup-node@v2 + - uses: actions/setup-node@v3 with: node-version: ${{ matrix.node }} @@ -106,7 +103,7 @@ jobs: uses: actions/checkout@master - name: restore workspace cache - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: | node_modules @@ -119,7 +116,7 @@ jobs: run: yarn test:fixtures - name: Save fixtures - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: fixtures-${{ matrix.os }}-node-v${{ matrix.node }} path: test/fixtures @@ -137,7 +134,7 @@ jobs: NODE_OPTIONS: "--max_old_space_size=4096" steps: - - uses: actions/setup-node@v2 + - uses: actions/setup-node@v3 with: node-version: ${{ matrix.node }} @@ -145,7 +142,7 @@ jobs: uses: actions/checkout@master - name: restore workspace cache - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: | node_modules @@ -155,7 +152,7 @@ jobs: key: ${{ matrix.os }}-node-v${{ matrix.node }}-nuxt-${{ github.sha }} - name: restore fixtures - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v3 with: name: fixtures-${{ matrix.os }}-node-v${{ matrix.node }} path: test/fixtures diff --git a/.iyarc b/.iyarc new file mode 100644 index 000000000000..7e3c00960081 --- /dev/null +++ b/.iyarc @@ -0,0 +1,6 @@ +# See https://github.com/nuxt/nuxt.js/issues/9284 for mor information +# These advisories won't affect nuxt + +GHSA-rp65-9cf3-cjxr +GHSA-3j8f-xvm3-ffx4 +GHSA-f8q6-p94x-37v3 diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 71e46feb1c18..19dce73b017e 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,3 +1,3 @@ # Contributing to Nuxt -Want to contribute to Nuxt? We provide a **[Contribution Guide](https://nuxtjs.org/guide/contribution-guide)** to help you get started. +Want to contribute to Nuxt? We provide a **[Contribution Guide](https://nuxtjs.org/contribution-guide/)** to help you get started. diff --git a/LICENSE b/LICENSE index 0a2a5bad2217..12f624cb4b37 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2016-2020 Nuxt Team +Copyright (c) 2016-present Nuxt Team - Sebastien Chopin ([@Atinux](https://github.com/Atinux)) - Alexandre Chopin ([@alexchopin](https://github.com/alexchopin)) - Pooya Parsa ([@pi0](https://github.com/pi0)) diff --git a/README.md b/README.md index 1026a4035b10..35674b5e363d 100644 --- a/README.md +++ b/README.md @@ -1,31 +1,30 @@ -


+

Nuxt


Tests Status Windows Status - ย Coverage Status + Coverage Status Downloads Version License Discord

- - - - - + Support us Support us

-

- Hire Nuxt -

-> Build your next Vue.js application with confidence using Nuxt: a framework making web development simple and powerful. +> Build your next Vue(2) application with confidence using Nuxt: a framework making web development simple and powerful. + +## Nuxt 3 + +The evolution of Nuxt powered by Vite and Vue 3 available on: +- GitHub: [nuxt/framework](https://github.com/nuxt/framework) +- Documentation: [nuxt.com](https://nuxt.com/) ## Links - ๐Ÿ“˜ Documentation: [https://nuxtjs.org](https://nuxtjs.org) -- ๐Ÿ‘ฅ Community: [cmty.app/nuxt](https://cmty.app/nuxt) +- ๐Ÿ‘ฅ Community: [GitHub discussions](https://github.com/nuxt/nuxt.js/discussions) - ๐ŸŽฌ 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/) @@ -73,15 +72,24 @@ Learn more at https://nuxtjs.org/guide/commands#production-deployment ## Consulting from the Nuxt team -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) +Get help with that tough bug or make sure your Nuxt app is ready to deploy. For $250 an hour, get technical support, advice and code reviews from the Nuxt core team: support@nuxtlabs.com -## Professional support with TideLift +## Agency Network -Professionally supported Nuxt is now available! +When in need for more broad or long-term consulting, reach out for one of our [agency partner](https://nuxtjs.org/partners): -Tidelift gives software development teams a single source for purchasing and maintaining their software, with professional grade assurances from the experts who know it best, while seamlessly integrating with existing tools. -[Get supported Nuxt with the Tidelift Subscription](https://tidelift.com/subscription/pkg/npm-nuxt?utm_source=npm-nuxt&utm_medium=readme). +

+ Ship Shape + 64 Robots + Passionate people + Curotec + Mirahi + Web Reinvent + Software things + Zen Architects + Funkhaus +

## Supporting Nuxt @@ -90,22 +98,8 @@ Funds donated via OpenCollective are managed with transparent expenses and will Support us with a monthly donation and help us continue our activities. [[Become a backer](https://opencollective.com/nuxtjs#contribute)] -### Platinum Sponsors - [![Open Collective Platinum Sponsors][platinum-sponsors-src]][platinum-sponsors-href] -### Gold Sponsors - -[![Open Collective Gold Sponsors][gold-sponsors-src]][gold-sponsors-href] - -### Silver Sponsors - -[![Open Collective Silver Sponsors][silver-sponsors-src]][silver-sponsors-href] - -### Bronze Sponsors - -[![Open Collective Bronze Sponsors][bronze-sponsors-src]][bronze-sponsors-href] - ## Contributors Thank you to all our [contributors](https://github.com/nuxt/nuxt.js/graphs/contributors)! @@ -116,19 +110,15 @@ Thank you to all our [contributors](https://github.com/nuxt/nuxt.js/graphs/contr [![Open in Gitpod](https://gitpod.io/button/open-in-gitpod.svg)](https://gitpod.io/#https://github.com/nuxt/nuxt.js) -Please refer to our [Contribution Guide](https://nuxtjs.org/guide/contribution-guide#codefund_ad) +Please refer to our [Contribution Guide](https://nuxtjs.org/contribution-guide/) ## Cross-browser testing -Thanks to [BrowserStack](http://browserstack.com)! - -BrowserStack +BrowserStack Thanks to [BrowserStack](http://browserstack.com)! ## Automated testing -Thanks to [SauceLabs](https://saucelabs.com) for supporting Open Source <3 - -SauceLabs +SauceLabs Thanks to [SauceLabs](https://saucelabs.com) for supporting Open Source <3 ## Security diff --git a/SECURITY.md b/SECURITY.md new file mode 100644 index 000000000000..3b6555154f26 --- /dev/null +++ b/SECURITY.md @@ -0,0 +1,5 @@ +# Security Policy + +## Reporting a Vulnerability + +If you discover a security vulnerability regarding Nuxt, please send an e-mail to the team via security@nuxtjs.org! All security vulnerabilities will be promptly addressed. Please check [nuxt/nuxt.js#9284](https://github.com/nuxt/nuxt.js/issues/9284) regarding potentially false positive reports from npm and github audit. diff --git a/distributions/nuxt-start/package.js b/distributions/nuxt-start/package.js index a421fe075a5c..09dbf6ce2fdc 100644 --- a/distributions/nuxt-start/package.js +++ b/distributions/nuxt-start/package.js @@ -26,7 +26,7 @@ export default { // discovered by config '@nuxt/telemetry', // vue-app externals for ssr - 'node-fetch', + 'node-fetch-native', 'vue', 'vue-client-only', 'vue-meta', diff --git a/distributions/nuxt-start/package.json b/distributions/nuxt-start/package.json index 81636342a543..57e85db0f7bd 100644 --- a/distributions/nuxt-start/package.json +++ b/distributions/nuxt-start/package.json @@ -1,6 +1,6 @@ { "name": "nuxt-start", - "version": "2.15.6", + "version": "2.15.8", "description": "Starts Nuxt Application in production mode", "keywords": [ "nuxt", @@ -26,19 +26,19 @@ "dist" ], "dependencies": { - "@nuxt/cli": "2.15.6", - "@nuxt/config": "2.15.6", - "@nuxt/core": "2.15.6", - "@nuxt/server": "2.15.6", - "@nuxt/telemetry": "^1.3.6", - "@nuxt/utils": "2.15.6", - "@nuxt/vue-renderer": "2.15.6", - "node-fetch": "^2.6.1", - "vue": "^2.6.14", + "@nuxt/cli": "2.15.8", + "@nuxt/config": "2.15.8", + "@nuxt/core": "2.15.8", + "@nuxt/server": "2.15.8", + "@nuxt/telemetry": "^1.3.9", + "@nuxt/utils": "2.15.8", + "@nuxt/vue-renderer": "2.15.8", + "node-fetch-native": "^1.0.1", + "vue": "^2.7.10", "vue-client-only": "^2.1.0", "vue-meta": "^2.4.0", "vue-no-ssr": "^1.1.1", - "vue-router": "^3.5.2", + "vue-router": "^3.6.5", "vuex": "^3.6.2" } } diff --git a/distributions/nuxt/README.md b/distributions/nuxt/README.md index 1026a4035b10..dd8db58063af 100644 --- a/distributions/nuxt/README.md +++ b/distributions/nuxt/README.md @@ -1,31 +1,30 @@ -


+

Nuxt


Tests Status Windows Status - ย Coverage Status + Coverage Status Downloads Version License Discord

- - - - - + Support us Support us

-

- Hire Nuxt -

-> Build your next Vue.js application with confidence using Nuxt: a framework making web development simple and powerful. +> Build your next Vue(2) application with confidence using Nuxt: a framework making web development simple and powerful. + +## Nuxt 3 + +The evolution of Nuxt powered by Vite and Vue 3 is currently in beta and available on: +- GitHub: [nuxt/framework](https://github.com/nuxt/framework) +- Documentation: [v3.nuxtjs.org](https://v3.nuxtjs.org) ## Links - ๐Ÿ“˜ Documentation: [https://nuxtjs.org](https://nuxtjs.org) -- ๐Ÿ‘ฅ Community: [cmty.app/nuxt](https://cmty.app/nuxt) +- ๐Ÿ‘ฅ Community: [GitHub discussions](https://github.com/nuxt/nuxt.js/discussions) - ๐ŸŽฌ 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/) @@ -73,15 +72,7 @@ Learn more at https://nuxtjs.org/guide/commands#production-deployment ## Consulting from the Nuxt team -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 - -Professionally supported Nuxt is now available! - -Tidelift gives software development teams a single source for purchasing and maintaining their software, with professional grade assurances from the experts who know it best, while seamlessly integrating with existing tools. - -[Get supported Nuxt with the Tidelift Subscription](https://tidelift.com/subscription/pkg/npm-nuxt?utm_source=npm-nuxt&utm_medium=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 and code reviews from the Nuxt core team: support@nuxtlabs.com ## Supporting Nuxt @@ -116,7 +107,7 @@ Thank you to all our [contributors](https://github.com/nuxt/nuxt.js/graphs/contr [![Open in Gitpod](https://gitpod.io/button/open-in-gitpod.svg)](https://gitpod.io/#https://github.com/nuxt/nuxt.js) -Please refer to our [Contribution Guide](https://nuxtjs.org/guide/contribution-guide#codefund_ad) +Please refer to our [Contribution Guide](https://nuxtjs.org/contribution-guide/) ## Cross-browser testing diff --git a/distributions/nuxt/package.json b/distributions/nuxt/package.json index 8cfd4aaff14d..bf920987a351 100644 --- a/distributions/nuxt/package.json +++ b/distributions/nuxt/package.json @@ -1,6 +1,6 @@ { "name": "nuxt", - "version": "2.15.6", + "version": "2.15.8", "description": "A minimalistic framework for server-rendered Vue.js applications (inspired by Next.js)", "keywords": [ "nuxt", @@ -31,21 +31,21 @@ "postinstall": "opencollective || exit 0" }, "dependencies": { - "@nuxt/babel-preset-app": "2.15.6", - "@nuxt/builder": "2.15.6", - "@nuxt/cli": "2.15.6", - "@nuxt/components": "^2.2.0", - "@nuxt/config": "2.15.6", - "@nuxt/core": "2.15.6", - "@nuxt/generator": "2.15.6", + "@nuxt/babel-preset-app": "2.15.8", + "@nuxt/builder": "2.15.8", + "@nuxt/cli": "2.15.8", + "@nuxt/components": "^2.2.1", + "@nuxt/config": "2.15.8", + "@nuxt/core": "2.15.8", + "@nuxt/generator": "2.15.8", "@nuxt/loading-screen": "^2.0.4", - "@nuxt/opencollective": "^0.3.2", - "@nuxt/server": "2.15.6", - "@nuxt/telemetry": "^1.3.6", - "@nuxt/utils": "2.15.6", - "@nuxt/vue-app": "2.15.6", - "@nuxt/vue-renderer": "2.15.6", - "@nuxt/webpack": "2.15.6" + "@nuxt/opencollective": "^0.3.3", + "@nuxt/server": "2.15.8", + "@nuxt/telemetry": "^1.3.9", + "@nuxt/utils": "2.15.8", + "@nuxt/vue-app": "2.15.8", + "@nuxt/vue-renderer": "2.15.8", + "@nuxt/webpack": "2.15.8" }, "collective": { "url": "https://opencollective.com/nuxtjs", diff --git a/examples/async-component-injection/pages/_slug.vue b/examples/async-component-injection/pages/_slug.vue index 120d8f32ce41..dc3eae4d1b1b 100644 --- a/examples/async-component-injection/pages/_slug.vue +++ b/examples/async-component-injection/pages/_slug.vue @@ -18,4 +18,4 @@ export default { } -