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.

Sign up for GitHub

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

fix: better dev server & webpack 4 compatibility and some trivial dependency updates #6291

Merged
merged 7 commits into from
Feb 19, 2021
Merged

fix: better dev server & webpack 4 compatibility and some trivial dependency updates #6291

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
bb08ee0
chore: some trivial dependency updates
haoqunjiang Feb 18, 2021
45a949a
fix: pin eslint-webpack-plugin version due to weird cache issues
haoqunjiang Feb 18, 2021
5fb5dd0
fix: simplify the webpack-4 alias setting
haoqunjiang Feb 18, 2021
50878c4
fix: should resolve to the same graphql instance
haoqunjiang Feb 18, 2021
86caec0
fix: set webpack 4 alias for client side hmr code
haoqunjiang Feb 18, 2021
5415a51
chore: cleanup the lockfile
haoqunjiang Feb 19, 2021
65b75ee
fix: update @vue/ui to fix the issue that selects are not clickable
haoqunjiang Feb 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 19 additions & 19 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,48 +30,48 @@
"packages/**/bin/*": "eslint --fix"
},
"devDependencies": {
"@babel/core": "^7.12.10",
"@babel/eslint-parser": "^7.12.1",
"@typescript-eslint/eslint-plugin": "^4.9.1",
"@typescript-eslint/parser": "^4.9.1",
"@babel/core": "^7.12.16",
"@babel/eslint-parser": "^7.12.16",
"@typescript-eslint/eslint-plugin": "^4.15.1",
"@typescript-eslint/parser": "^4.15.1",
"@vue/eslint-config-airbnb": "^5.3.0",
"@vue/eslint-config-prettier": "^6.0.0",
"@vue/eslint-config-standard": "^6.0.0",
"@vue/eslint-config-typescript": "^7.0.0",
"@vuepress/plugin-pwa": "^1.5.4",
"@vuepress/theme-vue": "^1.5.4",
"@vuepress/plugin-pwa": "^1.8.1",
"@vuepress/theme-vue": "^1.8.1",
"babel-core": "7.0.0-bridge.0",
"babel-jest": "^26.6.3",
"chromedriver": "^87.0.2",
"chromedriver": "^88.0.0",
"debug": "^4.1.0",
"eslint": "^7.15.0",
"eslint": "^7.20.0",
"eslint-plugin-graphql": "^4.0.0",
"eslint-plugin-import": "^2.20.2",
"eslint-plugin-node": "^11.1.0",
"eslint-plugin-prettier": "^3.2.0",
"eslint-plugin-promise": "^4.2.1",
"eslint-plugin-vue": "^7.2.0",
"eslint-plugin-prettier": "^3.3.1",
"eslint-plugin-promise": "^4.3.1",
"eslint-plugin-vue": "^7.6.0",
"execa": "^1.0.0",
"geckodriver": "^1.20.0",
"globby": "^11.0.1",
"graphql": "^15.4.0",
"geckodriver": "^1.22.1",
"globby": "^11.0.2",
"graphql": "^15.5.0",
"http-server": "^0.12.3",
"inquirer": "^7.1.0",
"jest": "^26.6.3",
"lerna": "^3.22.0",
"lerna-changelog": "^1.0.1",
"lint-staged": "^10.5.3",
"lint-staged": "^10.5.4",
"memfs": "^3.2.0",
"minimist": "^1.2.5",
"node-fetch": "^2.6.1",
"prettier": ">= 1.13.0",
"rimraf": "^3.0.2",
"semver": "^7.3.4",
"stylus-loader": "^3.0.2",
"typescript": "~4.1.2",
"verdaccio": "^4.10.0",
"vuepress": "^1.6.0",
"webpack": "^5.10.0",
"typescript": "~4.1.5",
"verdaccio": "^4.11.0",
"vuepress": "^1.8.1",
"webpack": "^5.22.0",
"yorkie": "^2.0.0"
},
"resolutions": {
Expand Down
24 changes: 12 additions & 12 deletions packages/@vue/babel-preset-app/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,21 +22,21 @@
},
"homepage": "https://github.com/vuejs/vue-cli/tree/dev/packages/@vue/babel-preset-app#readme",
"dependencies": {
"@babel/core": "^7.12.10",
"@babel/helper-compilation-targets": "^7.9.6",
"@babel/helper-module-imports": "^7.8.3",
"@babel/plugin-proposal-class-properties": "^7.8.3",
"@babel/plugin-proposal-decorators": "^7.8.3",
"@babel/core": "^7.12.16",
"@babel/helper-compilation-targets": "^7.12.16",
"@babel/helper-module-imports": "^7.12.13",
"@babel/plugin-proposal-class-properties": "^7.12.13",
"@babel/plugin-proposal-decorators": "^7.12.13",
"@babel/plugin-syntax-dynamic-import": "^7.8.3",
"@babel/plugin-syntax-jsx": "^7.8.3",
"@babel/plugin-transform-runtime": "^7.12.0",
"@babel/preset-env": "^7.12.10",
"@babel/runtime": "^7.11.2",
"@vue/babel-plugin-jsx": "^1.0.0-0",
"@babel/plugin-syntax-jsx": "^7.12.13",
"@babel/plugin-transform-runtime": "^7.12.15",
"@babel/preset-env": "^7.12.16",
"@babel/runtime": "^7.12.13",
"@vue/babel-plugin-jsx": "^1.0.3",
"@vue/babel-preset-jsx": "^1.1.2",
"babel-plugin-dynamic-import-node": "^2.3.3",
"core-js": "^3.8.1",
"core-js-compat": "^3.8.1",
"core-js": "^3.8.3",
"core-js-compat": "^3.8.3",
"semver": "^7.3.4"
},
"peerDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/@vue/cli-plugin-babel/generator.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ module.exports = api => {
presets: ['@vue/cli-plugin-babel/preset']
},
dependencies: {
'core-js': '^3.8.1'
'core-js': '^3.8.3'
}
})
}
2 changes: 1 addition & 1 deletion packages/@vue/cli-plugin-babel/migrator/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ module.exports = api => {
api.extendPackage(
{
dependencies: {
'core-js': '^3.8.1'
'core-js': '^3.8.3'
}
},
{ warnIncompatibleVersions: false }
Expand Down
6 changes: 3 additions & 3 deletions packages/@vue/cli-plugin-babel/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,18 +20,18 @@
},
"homepage": "https://github.com/vuejs/vue-cli/tree/dev/packages/@vue/cli-plugin-babel#readme",
"dependencies": {
"@babel/core": "^7.12.10",
"@babel/core": "^7.12.16",
"@vue/babel-preset-app": "^5.0.0-alpha.4",
"@vue/cli-shared-utils": "^5.0.0-alpha.4",
"babel-loader": "^8.2.2",
"thread-loader": "^3.0.0",
"webpack": "^5.10.0"
"webpack": "^5.22.0"
},
"peerDependencies": {
"@vue/cli-service": "^3.0.0 || ^4.0.0 || ^5.0.0-0"
},
"devDependencies": {
"@babel/preset-env": "^7.12.10",
"@babel/preset-env": "^7.12.16",
"jscodeshift": "^0.11.0"
},
"publishConfig": {
Expand Down
2 changes: 1 addition & 1 deletion packages/@vue/cli-plugin-e2e-cypress/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
},
"dependencies": {
"@vue/cli-shared-utils": "^5.0.0-alpha.4",
"cypress": "^6.1.0",
"cypress": "^6.5.0",
"eslint-plugin-cypress": "^2.11.2"
},
"peerDependencies": {
Expand Down
4 changes: 2 additions & 2 deletions packages/@vue/cli-plugin-e2e-nightwatch/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@
"nightwatch": "^1.4.1"
},
"devDependencies": {
"chromedriver": "^87.0.2",
"geckodriver": "^1.20.0",
"chromedriver": "^88.0.0",
"geckodriver": "^1.22.1",
"selenium-server": "^3.141.59"
},
"peerDependencies": {
Expand Down
10 changes: 5 additions & 5 deletions packages/@vue/cli-plugin-e2e-webdriverio/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"access": "public"
},
"dependencies": {
"@types/mocha": "^8.0.4",
"@types/mocha": "^8.2.1",
"@vue/cli-shared-utils": "^5.0.0-alpha.4",
"@wdio/cli": "^6.10.5",
"@wdio/local-runner": "^6.10.5",
Expand All @@ -40,7 +40,7 @@
"chromedriver": "*",
"geckodriver": "*",
"wdio-chromedriver-service": "^6.0.4",
"wdio-geckodriver-service": "^1.1.0"
"wdio-geckodriver-service": "^1.1.2"
},
"peerDependenciesMeta": {
"chromedriver": {
Expand All @@ -57,10 +57,10 @@
}
},
"devDependencies": {
"chromedriver": "^87.0.2",
"geckodriver": "^1.20.0",
"chromedriver": "^88.0.0",
"geckodriver": "^1.22.1",
"ts-node": "^9.1.1",
"wdio-chromedriver-service": "^6.0.4",
"wdio-geckodriver-service": "^1.1.0"
"wdio-geckodriver-service": "^1.1.2"
}
}
16 changes: 8 additions & 8 deletions packages/@vue/cli-plugin-eslint/eslintDeps.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,27 +1,27 @@
const DEPS_MAP = {
base: {
eslint: '^7.15.0',
'eslint-plugin-vue': '^7.2.0'
eslint: '^7.20.0',
'eslint-plugin-vue': '^7.6.0'
},
airbnb: {
'@vue/eslint-config-airbnb': '^5.3.0',
'eslint-plugin-import': '^2.20.2'
},
prettier: {
'@vue/eslint-config-prettier': '^6.0.0',
'eslint-plugin-prettier': '^3.2.0',
'eslint-plugin-prettier': '^3.3.1',
prettier: '^2.2.1'
},
standard: {
'@vue/eslint-config-standard': '^6.0.0',
'eslint-plugin-import': '^2.20.2',
'eslint-plugin-node': '^11.1.0',
'eslint-plugin-promise': '^4.2.1'
'eslint-plugin-promise': '^4.3.1'
},
typescript: {
'@vue/eslint-config-typescript': '^7.0.0',
'@typescript-eslint/eslint-plugin': '^4.9.1',
'@typescript-eslint/parser': '^4.9.1'
'@typescript-eslint/eslint-plugin': '^4.15.1',
'@typescript-eslint/parser': '^4.15.1'
}
}

Expand All @@ -40,8 +40,8 @@ exports.getDeps = function (api, preset, rootOptions = {}) {

if (api.hasPlugin('babel') && !api.hasPlugin('typescript')) {
Object.assign(deps, {
'@babel/eslint-parser': '^7.12.1',
'@babel/core': '^7.12.10'
'@babel/eslint-parser': '^7.12.16',
'@babel/core': '^7.12.16'
})
}

Expand Down
2 changes: 1 addition & 1 deletion packages/@vue/cli-plugin-eslint/generator/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ module.exports = (api, { config, lintOn = [] }, rootOptions, invoking) => {

if (lintOn.includes('commit')) {
Object.assign(pkg.devDependencies, {
'lint-staged': '^10.5.3'
'lint-staged': '^10.5.4'
})
pkg.gitHooks = {
'pre-commit': 'lint-staged'
Expand Down
2 changes: 1 addition & 1 deletion packages/@vue/cli-plugin-eslint/migrator/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ module.exports = async (api) => {
api.extendPackage({
devDependencies: {
eslint: localESLintRange,
'@babel/eslint-parser': '^7.12.1',
'@babel/eslint-parser': '^7.12.16',
'eslint-plugin-vue': '^4.5.0'
}
})
Expand Down
6 changes: 3 additions & 3 deletions packages/@vue/cli-plugin-eslint/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@
},
"dependencies": {
"@vue/cli-shared-utils": "^5.0.0-alpha.4",
"eslint-webpack-plugin": "^2.4.1",
"globby": "^11.0.1",
"eslint-webpack-plugin": "2.4.3",
"globby": "^11.0.2",
"inquirer": "^7.1.0",
"webpack": "^5.10.0",
"webpack": "^5.22.0",
"yorkie": "^2.0.0"
},
"peerDependencies": {
Expand Down
6 changes: 3 additions & 3 deletions packages/@vue/cli-plugin-pwa/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@
},
"dependencies": {
"@vue/cli-shared-utils": "^5.0.0-alpha.4",
"html-webpack-plugin": "^5.0.0",
"webpack": "^5.10.0",
"workbox-webpack-plugin": "^6.0.2"
"html-webpack-plugin": "^5.1.0",
"webpack": "^5.22.0",
"workbox-webpack-plugin": "^6.1.0"
},
"devDependencies": {
"register-service-worker": "^1.7.2"
Expand Down
4 changes: 2 additions & 2 deletions packages/@vue/cli-plugin-router/generator/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@ module.exports = (api, options = {}, rootOptions = {}) => {
api.transformScript(api.entryFile, require('./injectUseRouter'))
api.extendPackage({
dependencies: {
'vue-router': '^4.0.1'
'vue-router': '^4.0.3'
}
})
} else {
api.injectRootOptions(api.entryFile, `router`)

api.extendPackage({
dependencies: {
'vue-router': '^3.4.3'
'vue-router': '^3.5.1'
}
})
}
Expand Down
16 changes: 8 additions & 8 deletions packages/@vue/cli-plugin-typescript/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@
"@vue/cli-shared-utils": "^5.0.0-alpha.4",
"babel-loader": "^8.2.2",
"cache-loader": "^4.1.0",
"fork-ts-checker-webpack-plugin": "^6.0.5",
"globby": "^11.0.1",
"fork-ts-checker-webpack-plugin": "^6.1.0",
"globby": "^11.0.2",
"thread-loader": "^3.0.0",
"ts-loader": "^8.0.12",
"webpack": "^5.10.0",
"ts-loader": "^8.0.17",
"webpack": "^5.22.0",
"yorkie": "^2.0.0"
},
"peerDependencies": {
Expand All @@ -45,11 +45,11 @@
}
},
"devDependencies": {
"@types/chai": "^4.2.11",
"@types/jest": "^26.0.19",
"@types/mocha": "^8.0.4",
"@types/chai": "^4.2.15",
"@types/jest": "^26.0.20",
"@types/mocha": "^8.2.1",
"jscodeshift": "^0.11.0",
"typescript": "~4.1.2",
"typescript": "~4.1.5",
"vue-class-component": "^7.2.3",
"vue-property-decorator": "^9.1.2"
}
Expand Down
4 changes: 2 additions & 2 deletions packages/@vue/cli-plugin-unit-jest/generator/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ module.exports = (api, options, rootOptions, invoking) => {
'test:unit': 'vue-cli-service test:unit'
},
devDependencies: {
'@vue/test-utils': isVue3 ? '^2.0.0-0' : '^1.0.3'
'@vue/test-utils': isVue3 ? '^2.0.0-0' : '^1.1.3'
},
jest: {
preset: api.hasPlugin('babel')
Expand Down Expand Up @@ -71,7 +71,7 @@ const applyTS = (module.exports.applyTS = (api, invoking) => {
: '@vue/cli-plugin-unit-jest/presets/typescript'
},
devDependencies: {
'@types/jest': '^26.0.19'
'@types/jest': '^26.0.20'
}
})

Expand Down
10 changes: 5 additions & 5 deletions packages/@vue/cli-plugin-unit-jest/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@
"access": "public"
},
"dependencies": {
"@babel/core": "^7.12.10",
"@babel/plugin-transform-modules-commonjs": "^7.9.6",
"@types/jest": "^26.0.19",
"@babel/core": "^7.12.16",
"@babel/plugin-transform-modules-commonjs": "^7.12.13",
"@types/jest": "^26.0.20",
"@vue/cli-shared-utils": "^5.0.0-alpha.4",
"babel-core": "^7.0.0-bridge.0",
"babel-jest": "^26.6.3",
Expand All @@ -35,11 +35,11 @@
"jest-serializer-vue": "^2.0.2",
"jest-transform-stub": "^2.0.0",
"jest-watch-typeahead": "^0.6.1",
"ts-jest": "^26.4.4",
"ts-jest": "^26.5.1",
"vue-jest": "^3.0.5"
},
"devDependencies": {
"@vue/test-utils": "^1.0.5"
"@vue/test-utils": "^1.1.3"
},
"peerDependencies": {
"@vue/cli-service": "^3.0.0 || ^4.0.0 || ^5.0.0-0"
Expand Down
Loading