Skip to content

Commit

Permalink
chore: update major deps (#8572)
Browse files Browse the repository at this point in the history
  • Loading branch information
bluwy authored Jun 13, 2022
1 parent 26ecd5a commit 0e20949
Show file tree
Hide file tree
Showing 19 changed files with 529 additions and 349 deletions.
2 changes: 1 addition & 1 deletion .eslintrc.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ module.exports = defineConfig({
}
},
{
files: ['*.js'],
files: ['playground/**', '*.js'],
rules: {
'@typescript-eslint/explicit-module-boundary-types': 'off'
}
Expand Down
8 changes: 2 additions & 6 deletions .github/renovate.json5
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,11 @@
"typescript",

// breaking changes
"cac", // `cac:v6.7.10+` has breaking changes
"react-router", // `react-router:v6.0.0+` has breaking changes
"react-router-dom", // `react-router-dom:v6.0.0+` has breaking changes
"source-map", // `source-map:v0.7.0+` needs more investigation
"dotenv-expand", // `dotenv-expand:6.0.0+` has breaking changes (#6858)

// ESM Only => https://gist.github.com/sindresorhus/a39789f98801d908bbc7ff3ecc99d99c#how-can-i-move-my-commonjs-project-to-esm
"node-fetch",
"periscopic",
"strip-ansi"
"kill-port", // `kill-port:^2.0.0 has perf issues (#8392)
"miniflare" // `miniflare:v2.0.0+` only supports node 16.7
]
}
10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
"@types/micromatch": "^4.0.2",
"@types/mime": "^2.0.3",
"@types/minimist": "^1.2.2",
"@types/node": "^17.0.31",
"@types/node": "^17.0.42",
"@types/prompts": "^2.4.0",
"@types/resolve": "^1.20.2",
"@types/sass": "~1.43.1",
Expand All @@ -61,26 +61,26 @@
"@typescript-eslint/parser": "^5.27.1",
"conventional-changelog-cli": "^2.2.2",
"cross-env": "^7.0.3",
"esbuild": "^0.14.38",
"esbuild": "^0.14.43",
"eslint": "^8.17.0",
"eslint-define-config": "^1.5.1",
"eslint-plugin-import": "^2.26.0",
"eslint-plugin-node": "^11.1.0",
"esno": "^0.16.3",
"execa": "^5.1.1",
"execa": "^6.1.0",
"fs-extra": "^10.1.0",
"kill-port": "^1.6.1",
"lint-staged": "^13.0.1",
"minimist": "^1.2.6",
"node-fetch": "^2.6.7",
"node-fetch": "^3.2.6",
"npm-run-all": "^4.1.5",
"picocolors": "^1.0.0",
"playwright-chromium": "^1.22.2",
"pnpm": "^7.2.1",
"prettier": "2.6.2",
"prompts": "^2.4.2",
"rimraf": "^3.0.2",
"rollup": "^2.72.1",
"rollup": "^2.75.6",
"semver": "^7.3.7",
"simple-git-hooks": "^2.8.0",
"sirv": "^2.0.2",
Expand Down
4 changes: 2 additions & 2 deletions packages/create-vite/__tests__/cli.spec.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { join } from 'path'
import type { ExecaSyncReturnValue, SyncOptions } from 'execa'
import { commandSync } from 'execa'
import { execaCommandSync } from 'execa'
import { mkdirpSync, readdirSync, remove, writeFileSync } from 'fs-extra'
import { afterEach, beforeAll, expect, test } from 'vitest'

Expand All @@ -13,7 +13,7 @@ const run = (
args: string[],
options: SyncOptions<string> = {}
): ExecaSyncReturnValue<string> => {
return commandSync(`node ${CLI_PATH} ${args.join(' ')}`, options)
return execaCommandSync(`node ${CLI_PATH} ${args.join(' ')}`, options)
}

// Helper to create a non-empty directory
Expand Down
6 changes: 3 additions & 3 deletions packages/plugin-legacy/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
},
"homepage": "https://github.com/vitejs/vite/tree/main/packages/plugin-legacy#readme",
"dependencies": {
"@babel/standalone": "^7.18.4",
"@babel/standalone": "^7.18.5",
"core-js": "^3.22.8",
"magic-string": "^0.26.2",
"regenerator-runtime": "^0.13.9",
Expand All @@ -46,7 +46,7 @@
"vite": "^3.0.0-alpha"
},
"devDependencies": {
"vite": "workspace:*",
"@babel/core": "^7.18.2"
"@babel/core": "^7.18.5",
"vite": "workspace:*"
}
}
2 changes: 1 addition & 1 deletion packages/plugin-react/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
},
"homepage": "https://github.com/vitejs/vite/tree/main/packages/plugin-react#readme",
"dependencies": {
"@babel/core": "^7.18.2",
"@babel/core": "^7.18.5",
"@babel/plugin-transform-react-jsx": "^7.17.12",
"@babel/plugin-transform-react-jsx-development": "^7.16.7",
"@babel/plugin-transform-react-jsx-self": "^7.17.12",
Expand Down
2 changes: 1 addition & 1 deletion packages/plugin-vue-jsx/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
},
"homepage": "https://github.com/vitejs/vite/tree/main/packages/plugin-vue-jsx#readme",
"dependencies": {
"@babel/core": "^7.18.2",
"@babel/core": "^7.18.5",
"@babel/plugin-syntax-import-meta": "^7.10.4",
"@babel/plugin-transform-typescript": "^7.18.4",
"@vue/babel-plugin-jsx": "^1.1.1"
Expand Down
2 changes: 1 addition & 1 deletion packages/plugin-vue/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
"@jridgewell/gen-mapping": "^0.3.1",
"@jridgewell/trace-mapping": "^0.3.13",
"debug": "^4.3.4",
"rollup": "^2.72.1",
"rollup": "^2.75.6",
"slash": "^4.0.0",
"source-map": "^0.6.1",
"vite": "workspace:*",
Expand Down
6 changes: 3 additions & 3 deletions packages/vite/LICENSE.md
Original file line number Diff line number Diff line change
Expand Up @@ -682,7 +682,7 @@ Repository: chalk/ansi-regex

> MIT License
>
> Copyright (c) Sindre Sorhus <sindresorhus@gmail.com> (sindresorhus.com)
> Copyright (c) Sindre Sorhus <sindresorhus@gmail.com> (https://sindresorhus.com)
>
> Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
>
Expand Down Expand Up @@ -3477,7 +3477,7 @@ Repository: chalk/strip-ansi

> MIT License
>
> Copyright (c) Sindre Sorhus <sindresorhus@gmail.com> (sindresorhus.com)
> Copyright (c) Sindre Sorhus <sindresorhus@gmail.com> (https://sindresorhus.com)
>
> Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
>
Expand Down Expand Up @@ -3854,7 +3854,7 @@ License: ISC
By: Eemeli Aro
Repository: github:eemeli/yaml

> Copyright 2018 Eemeli Aro <eemeli@gmail.com>
> Copyright Eemeli Aro <eemeli@gmail.com>
>
> Permission to use, copy, modify, and/or distribute this software for any purpose
> with or without fee is hereby granted, provided that the above copyright notice
Expand Down
16 changes: 8 additions & 8 deletions packages/vite/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -57,17 +57,17 @@
},
"//": "READ CONTRIBUTING.md to understand what to put under deps vs. devDeps!",
"dependencies": {
"esbuild": "^0.14.38",
"esbuild": "^0.14.43",
"postcss": "^8.4.14",
"resolve": "^1.22.0",
"rollup": "^2.72.1"
"rollup": "^2.75.6"
},
"optionalDependencies": {
"fsevents": "~2.3.2"
},
"devDependencies": {
"@ampproject/remapping": "^2.2.0",
"@babel/parser": "^7.18.4",
"@babel/parser": "^7.18.5",
"@babel/types": "^7.18.4",
"@jridgewell/trace-mapping": "^0.3.13",
"@rollup/plugin-alias": "^3.1.9",
Expand All @@ -79,7 +79,7 @@
"@rollup/pluginutils": "^4.2.1",
"@vue/compiler-dom": "^3.2.37",
"acorn": "^8.7.1",
"cac": "6.7.9",
"cac": "^6.7.12",
"chokidar": "^3.5.3",
"connect": "^3.7.0",
"connect-history-api-fallback": "^1.6.0",
Expand All @@ -91,7 +91,7 @@
"dotenv-expand": "^5.1.0",
"es-module-lexer": "^0.10.5",
"esno": "^0.16.3",
"estree-walker": "^2.0.2",
"estree-walker": "^3.0.1",
"etag": "^1.8.1",
"fast-glob": "^3.2.11",
"http-proxy": "^1.18.1",
Expand All @@ -103,17 +103,17 @@
"node-forge": "^1.3.1",
"okie": "^1.0.1",
"open": "^8.4.0",
"periscopic": "^2.0.3",
"periscopic": "^3.0.4",
"picocolors": "^1.0.0",
"postcss-import": "^14.1.0",
"postcss-load-config": "^3.1.4",
"postcss-load-config": "^4.0.1",
"postcss-modules": "^4.3.1",
"resolve.exports": "^1.1.0",
"rollup-plugin-license": "^2.8.1",
"sirv": "^2.0.2",
"source-map-js": "^1.0.2",
"source-map-support": "^0.5.21",
"strip-ansi": "^6.0.1",
"strip-ansi": "^7.0.1",
"strip-literal": "^0.3.0",
"tsconfck": "^2.0.1",
"tslib": "^2.4.0",
Expand Down
5 changes: 0 additions & 5 deletions packages/vite/rollup.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -123,11 +123,6 @@ function createNodePlugins(
src: `require('fsevents')`,
replacement: `__require('fsevents')`
},
// cac re-assigns module.exports even in its mjs dist
'cac/dist/index.mjs': {
src: `if (typeof module !== "undefined") {`,
replacement: `if (false) {`
},
// postcss-import -> sugarss
'process-content.js': {
src: 'require("sugarss")',
Expand Down
2 changes: 2 additions & 0 deletions packages/vite/src/node/ssr/ssrTransform.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ import type {
Node as _Node
} from 'estree'
import { extract_names as extractNames } from 'periscopic'
// `eslint-plugin-node` doesn't support package without main
// eslint-disable-next-line node/no-missing-import
import { walk as eswalk } from 'estree-walker'
import type { RawSourceMap } from '@ampproject/remapping'
import type { TransformResult } from '../server/transformRequest'
Expand Down
6 changes: 3 additions & 3 deletions playground/cli-module/__tests__/serve.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// this is automatically detected by playground/vitestSetup.ts and will replace
// the default e2e test serve behavior

import execa from 'execa'
import { execaCommand } from 'execa'
import kill from 'kill-port'
import {
isBuild,
Expand Down Expand Up @@ -45,7 +45,7 @@ export async function serve() {
if (isBuild) {
const buildCommand = `${viteBinPath} build`
try {
const buildProcess = execa.command(buildCommand, {
const buildProcess = execaCommand(buildCommand, {
cwd: rootDir,
stdio: 'pipe'
})
Expand All @@ -67,7 +67,7 @@ export async function serve() {
viteServerArgs.unshift('preview')
}
const serverCommand = `${viteBinPath} ${viteServerArgs.join(' ')}`
const serverProcess = execa.command(serverCommand, {
const serverProcess = execaCommand(serverCommand, {
cwd: rootDir,
stdio: 'pipe'
})
Expand Down
6 changes: 3 additions & 3 deletions playground/cli/__tests__/serve.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// this is automatically detected by playground/vitestSetup.ts and will replace
// the default e2e test serve behavior

import execa from 'execa'
import { execaCommand } from 'execa'
import kill from 'kill-port'
import {
isBuild,
Expand Down Expand Up @@ -45,7 +45,7 @@ export async function serve() {
if (isBuild) {
const buildCommand = `${viteBinPath} build`
try {
const buildProcess = execa.command(buildCommand, {
const buildProcess = execaCommand(buildCommand, {
cwd: rootDir,
stdio: 'pipe'
})
Expand All @@ -67,7 +67,7 @@ export async function serve() {
viteServerArgs.unshift('preview')
}
const serverCommand = `${viteBinPath} ${viteServerArgs.join(' ')}`
const serverProcess = execa.command(serverCommand, {
const serverProcess = execaCommand(serverCommand, {
cwd: rootDir,
stdio: 'pipe'
})
Expand Down
4 changes: 2 additions & 2 deletions playground/resolve-config/__tests__/resolve-config.spec.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import fs from 'fs'
import path from 'path'
import { commandSync } from 'execa'
import { execaCommandSync } from 'execa'
import { isBuild, testDir, viteBinPath } from '~utils'

const fromTestDir = (...p: string[]) => path.resolve(testDir, ...p)

const build = (configName: string) => {
commandSync(`${viteBinPath} build`, { cwd: fromTestDir(configName) })
execaCommandSync(`${viteBinPath} build`, { cwd: fromTestDir(configName) })
}

const getDistFile = (configName: string, extension: string) => {
Expand Down
4 changes: 2 additions & 2 deletions playground/ssr-react/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
"dependencies": {
"react": "^17.0.2",
"react-dom": "^17.0.2",
"react-router": "^5.3.1",
"react-router-dom": "^5.3.1"
"react-router": "^5.3.3",
"react-router-dom": "^5.3.3"
},
"devDependencies": {
"@vitejs/plugin-react": "workspace:*",
Expand Down
4 changes: 2 additions & 2 deletions playground/test-utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -182,8 +182,8 @@ export async function killProcess(
): Promise<void> {
if (isWindows) {
try {
const { default: execa } = await import('execa')
execa.commandSync(`taskkill /pid ${serverProcess.pid} /T /F`)
const { execaCommandSync } = await import('execa')
execaCommandSync(`taskkill /pid ${serverProcess.pid} /T /F`)
} catch (e) {
console.error('failed to taskkill:', e)
}
Expand Down
Loading

0 comments on commit 0e20949

Please sign in to comment.