Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: update dependencies #10510

Merged
merged 27 commits into from Jun 23, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 4 additions & 1 deletion .eslintignore
Expand Up @@ -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
Expand Down
16 changes: 8 additions & 8 deletions .eslintrc.js
@@ -1,26 +1,26 @@
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',
'no-template-curly-in-string': 0,
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*/**'],
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/test.yml
Expand Up @@ -19,7 +19,7 @@ jobs:
matrix:
# os: [ubuntu-latest, macos-latest, windows-latest]
os: [ubuntu-latest]
node: [12, 14]
node: [14]

steps:
- uses: actions/setup-node@v3
Expand Down Expand Up @@ -127,7 +127,7 @@ jobs:
matrix:
# os: [ubuntu-latest, macos-latest, windows-latest]
os: [ubuntu-latest]
node: [12, 14]
node: [14]

steps:
- uses: actions/setup-node@v3
Expand All @@ -151,7 +151,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
Expand All @@ -164,7 +164,7 @@ 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"
Expand Down Expand Up @@ -240,7 +240,7 @@ jobs:
matrix:
# os: [ubuntu-latest, macos-latest, windows-latest]
os: [ubuntu-latest]
node: [12, 14]
node: [14]

steps:
- uses: actions/setup-node@v3
Expand Down Expand Up @@ -277,7 +277,7 @@ jobs:
matrix:
# os: [ubuntu-latest, macos-latest, windows-latest]
os: [ubuntu-latest]
node: [12, 14]
node: [14]

steps:
- uses: actions/setup-node@v3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/windows.yml
Expand Up @@ -36,7 +36,7 @@ jobs:
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
Expand Down
2 changes: 1 addition & 1 deletion distributions/nuxt-start/package.js
Expand Up @@ -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',
Expand Down
4 changes: 2 additions & 2 deletions distributions/nuxt-start/package.json
Expand Up @@ -33,12 +33,12 @@
"@nuxt/telemetry": "^1.3.6",
"@nuxt/utils": "2.15.6",
"@nuxt/vue-renderer": "2.15.6",
"node-fetch": "^2.6.6",
"node-fetch-native": "^0.1.4",
"vue": "^2.6.14",
"vue-client-only": "^2.1.0",
"vue-meta": "^2.4.0",
"vue-no-ssr": "^1.1.1",
"vue-router": "^3.5.3",
"vue-router": "^3.5.4",
"vuex": "^3.6.2"
}
}
31 changes: 11 additions & 20 deletions distributions/nuxt/README.md
@@ -1,4 +1,4 @@
<p align="center"><img align="center" style="width:320px" src="./.github/nuxt.png"/></p><br/>
<p align="center"><img alt="Nuxt" align="center" src="./.github/logo.svg"/></p><br/>
<p align="center">
<a href="https://github.com/nuxt/nuxt.js/actions?query=branch%3Adev+event%3Apush"><img src="https://github.com/nuxt/nuxt.js/workflows/test/badge.svg?branch=dev&event=push" alt="Tests Status"></a>
<a href="https://github.com/nuxt/nuxt.js/actions?query=branch%3Adev+event%3Apush"><img src="https://github.com/nuxt/nuxt.js/workflows/windows/badge.svg?branch=dev&event=push" alt="Windows Status"></a>
Expand All @@ -9,23 +9,22 @@
<a href="https://discord.nuxtjs.org/"><img src="https://badgen.net/badge/Discord/join-us/7289DA" alt="Discord"></a>
</p>
<p align="center">
<a href="#platinum-sponsors" alt="Platinum Sponsors on Open Collective"><img src="https://opencollective.com/nuxtjs/tiers/platinum-sponsors/badge.svg" /></a>
<a href="#gold-sponsors" alt="Gold Sponsors on Open Collective"><img src="https://opencollective.com/nuxtjs/tiers/gold-sponsors/badge.svg" /></a>
<a href="#silver-sponsors" alt="Silver Sponsors on Open Collective"><img src="https://opencollective.com/nuxtjs/tiers/silver-sponsors/badge.svg" /></a>
<a href="#bronze-sponsors" alt="Bronze Sponsors on Open Collective"><img src="https://opencollective.com/nuxtjs/tiers/bronze-sponsors/badge.svg" /></a>
<a href="#nuxters" alt="Nuxters on Open Collective"><img src="https://opencollective.com/nuxtjs/tiers/nuxters/badge.svg" /></a>
<a href="https://github.com/sponsors/nuxt"><img src="https://img.shields.io/badge/Support%20us-GitHub%20Sponsors-DB61A2.svg" alt="Support us"></a>
<a href="https://oc.nuxtjs.org/"><img src="https://img.shields.io/badge/Support%20us-Open%20Collective-41B883.svg" alt="Support us"></a>
</p>
<p align="center">
<a href="https://otechie.com/nuxt?ref=badge"><img src="https://api.otechie.com/consultancy/nuxt/badge.svg" alt="Hire Nuxt"></a>
</p>

> 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/)
Expand Down Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion distributions/nuxt/package.json
Expand Up @@ -39,7 +39,7 @@
"@nuxt/core": "2.15.6",
"@nuxt/generator": "2.15.6",
"@nuxt/loading-screen": "^2.0.4",
"@nuxt/opencollective": "^0.3.2",
"@nuxt/opencollective": "^0.3.3",
"@nuxt/server": "2.15.6",
"@nuxt/telemetry": "^1.3.6",
"@nuxt/utils": "2.15.6",
Expand Down
2 changes: 1 addition & 1 deletion examples/new-fetch/nuxt.config.js
@@ -1,4 +1,4 @@
const fetch = require('node-fetch')
const fetch = require('node-fetch-native')

export default {
plugins: [
Expand Down
3 changes: 0 additions & 3 deletions examples/web-worker/.eslintrc.js
Expand Up @@ -4,9 +4,6 @@ module.exports = {
browser: true,
node: true
},
parserOptions: {
parser: 'babel-eslint'
},
extends: [
'plugin:vue/recommended'
],
Expand Down
7 changes: 2 additions & 5 deletions examples/with-feathers/.eslintrc.js
@@ -1,9 +1,5 @@
module.exports = {
root: true,
parserOptions: {
parser: 'babel-eslint',
sourceType: 'module'
},
env: {
browser: true,
node: true,
Expand Down Expand Up @@ -36,7 +32,8 @@ module.exports = {
}],
'vue/max-attributes-per-line': [2, {
singleline: 5
}]
}],
'vue/multi-word-component-names': 0
},
globals: {}
}
2 changes: 1 addition & 1 deletion jest.config.js
Expand Up @@ -47,7 +47,7 @@ module.exports = {

transform: {
'^.+\\.js$': 'babel-jest',
'^.+\\.vue$': 'vue-jest'
'^.+\\.vue$': '@vue/vue2-jest'
},

moduleFileExtensions: [
Expand Down
69 changes: 36 additions & 33 deletions package.json
Expand Up @@ -33,55 +33,58 @@
"test:unit": "jest packages --forceExit"
},
"devDependencies": {
"@babel/core": "^7.16.0",
"@babel/preset-env": "^7.16.0",
"@ls-lint/ls-lint": "^1.10.0",
"@nuxtjs/eslint-config": "^6.0.1",
"@nuxtjs/eslint-config-typescript": "^6.0.1",
"@rollup/plugin-alias": "^3.1.8",
"@rollup/plugin-commonjs": "^21.0.1",
"@babel/core": "^7.18.5",
"@babel/preset-env": "^7.18.2",
"@ls-lint/ls-lint": "^1.11.2",
"@nuxtjs/eslint-config": "^10.0.0",
"@nuxtjs/eslint-config-typescript": "^10.0.0",
"@rollup/plugin-alias": "^3.1.9",
"@rollup/plugin-commonjs": "^22.0.0",
"@rollup/plugin-json": "^4.1.0",
"@rollup/plugin-node-resolve": "^13.0.6",
"@rollup/plugin-replace": "^3.0.0",
"@typescript-eslint/eslint-plugin": "^4.33.0",
"@typescript-eslint/parser": "^4.33.0",
"@vue/server-test-utils": "^1.2.1",
"@vue/test-utils": "^1.2.2",
"babel-eslint": "^10.1.0",
"babel-jest": "^26.6.3",
"chrome-launcher": "^0.14.2",
"@rollup/plugin-node-resolve": "^13.3.0",
"@rollup/plugin-replace": "^4.0.0",
"@typescript-eslint/eslint-plugin": "^5.29.0",
"@typescript-eslint/parser": "^5.29.0",
"@vue/server-test-utils": "^1.3.0",
"@vue/test-utils": "^1.3.0",
"@vue/vue2-jest": "^28.0.0",
"babel-jest": "^28.1.1",
"chrome-launcher": "^0.15.1",
"consola": "^2.15.3",
"create-require": "^1.1.1",
"cross-spawn": "^7.0.3",
"esbuild": "^0.13.12",
"eslint": "^7.32.0",
"esbuild": "^0.14.47",
"eslint": "^8.18.0",
"eslint-multiplexer": "^2.0.0",
"eslint-plugin-jest": "^26.5.3",
"execa": "^5.1.1",
"express": "^4.17.1",
"finalhandler": "^1.1.2",
"fs-extra": "^10.0.0",
"express": "^4.18.1",
"finalhandler": "^1.2.0",
"fs-extra": "^10.1.0",
"get-port": "^5.1.1",
"glob": "^7.2.0",
"got": "^11.8.2",
"glob": "^7.2.3",
"got": "^11.8.5",
"improved-yarn-audit": "^3.0.0",
"jest": "^26.6.3",
"jiti": "^1.12.9",
"jsdom": "^18.0.1",
"jest": "^28.1.1",
"jest-environment-jsdom": "^28.1.1",
"jest-util": "^28.1.1",
"jiti": "^1.14.0",
"jsdom": "^20.0.0",
"jsonfile": "^6.1.0",
"klaw-sync": "^6.0.0",
"lerna": "^4.0.0",
"lodash": "^4.17.21",
"node-fetch": "^2.6.6",
"node-fetch-native": "^0.1.4",
"puppeteer-core": "^11.0.0",
"request": "^2.88.2",
"rimraf": "^3.0.2",
"rollup": "2.59.0",
"rollup-plugin-esbuild": "^4.6.0",
"rollup-plugin-license": "^2.6.0",
"sass": "^1.43.4",
"rollup": "2.75.7",
"rollup-plugin-esbuild": "^4.9.1",
"rollup-plugin-license": "^2.8.1",
"sass": "^1.53.0",
"sass-loader": "^10.1.1",
"sort-package-json": "^1.52.0",
"typescript": "~4.4",
"sort-package-json": "^1.57.0",
"typescript": "~4.7",
"vue-jest": "^4.0.1"
}
}
26 changes: 13 additions & 13 deletions packages/babel-preset-app/package.json
Expand Up @@ -10,21 +10,21 @@
],
"main": "src/index.js",
"dependencies": {
"@babel/compat-data": "^7.16.0",
"@babel/core": "^7.16.0",
"@babel/helper-compilation-targets": "^7.16.0",
"@babel/helper-module-imports": "^7.16.0",
"@babel/plugin-proposal-class-properties": "^7.16.0",
"@babel/plugin-proposal-decorators": "^7.16.0",
"@babel/plugin-proposal-nullish-coalescing-operator": "^7.16.0",
"@babel/plugin-proposal-optional-chaining": "^7.16.0",
"@babel/plugin-proposal-private-methods": "^7.16.0",
"@babel/plugin-transform-runtime": "^7.16.0",
"@babel/preset-env": "^7.16.0",
"@babel/runtime": "^7.16.0",
"@babel/compat-data": "^7.18.5",
"@babel/core": "^7.18.5",
"@babel/helper-compilation-targets": "^7.18.2",
"@babel/helper-module-imports": "^7.16.7",
"@babel/plugin-proposal-class-properties": "^7.17.12",
"@babel/plugin-proposal-decorators": "^7.18.2",
"@babel/plugin-proposal-nullish-coalescing-operator": "^7.17.12",
"@babel/plugin-proposal-optional-chaining": "^7.17.12",
"@babel/plugin-proposal-private-methods": "^7.17.12",
"@babel/plugin-transform-runtime": "^7.18.5",
"@babel/preset-env": "^7.18.2",
"@babel/runtime": "^7.18.3",
"@vue/babel-preset-jsx": "^1.2.4",
"core-js": "^3.19.0",
"core-js-compat": "^3.19.1",
"core-js-compat": "^3.23.2",
"regenerator-runtime": "^0.13.9"
},
"publishConfig": {
Expand Down
8 changes: 4 additions & 4 deletions packages/builder/package.json
Expand Up @@ -13,12 +13,12 @@
"@nuxt/vue-app": "2.15.6",
"@nuxt/webpack": "2.15.6",
"chalk": "^4.1.2",
"chokidar": "^3.5.2",
"chokidar": "^3.5.3",
"consola": "^2.15.3",
"fs-extra": "^10.0.0",
"glob": "^7.2.0",
"fs-extra": "^10.1.0",
"glob": "^7.2.3",
"hash-sum": "^2.0.0",
"ignore": "^5.1.9",
"ignore": "^5.2.0",
"lodash": "^4.17.21",
"pify": "^5.0.0",
"serialize-javascript": "^6.0.0",
Expand Down
4 changes: 4 additions & 0 deletions packages/builder/test/builder.build.test.js
Expand Up @@ -13,6 +13,10 @@ jest.mock('@nuxt/utils')
jest.mock('../src/ignore')
jest.mock('@nuxt/webpack')

jest.mock('path', () => ({
...jest.requireActual('path')
}))

describe('builder: builder build', () => {
beforeAll(() => {
jest.spyOn(path, 'join').mockImplementation((...args) => `join(${args.join(', ')})`)
Expand Down