diff --git a/package.json b/package.json
index 65cdcd623d..57861c3dd4 100644
--- a/package.json
+++ b/package.json
@@ -19,7 +19,8 @@
"version": "node scripts/genChangelog.js && node scripts/genDocs.js && git add CHANGELOG.md && git add docs",
"docs": "vuepress dev docs",
"docs:build": "vuepress build docs",
- "patch-chromedriver": "node scripts/patchChromedriver.js"
+ "patch-chromedriver": "node scripts/patchChromedriver.js",
+ "postinstall": "patch-package"
},
"gitHooks": {
"pre-commit": "lint-staged",
@@ -64,6 +65,7 @@
"memfs": "^3.2.0",
"minimist": "^1.2.5",
"node-fetch": "^2.6.1",
+ "patch-package": "^6.2.2",
"prettier": ">= 1.13.0",
"rimraf": "^3.0.2",
"semver": "^7.3.4",
diff --git a/packages/@vue/cli-ui-addon-webpack/.babelrc b/packages/@vue/cli-ui-addon-webpack/.babelrc
deleted file mode 100644
index 2a818842cc..0000000000
--- a/packages/@vue/cli-ui-addon-webpack/.babelrc
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "presets": [
- "@vue/app"
- ]
-}
diff --git a/packages/@vue/cli-ui-addon-webpack/babel.config.js b/packages/@vue/cli-ui-addon-webpack/babel.config.js
new file mode 100644
index 0000000000..716b0237c6
--- /dev/null
+++ b/packages/@vue/cli-ui-addon-webpack/babel.config.js
@@ -0,0 +1,3 @@
+module.exports = {
+ presets: ['@vue/cli-plugin-babel/preset']
+}
diff --git a/packages/@vue/cli-ui-addon-widgets/babel.config.js b/packages/@vue/cli-ui-addon-widgets/babel.config.js
index ba179669a1..716b0237c6 100644
--- a/packages/@vue/cli-ui-addon-widgets/babel.config.js
+++ b/packages/@vue/cli-ui-addon-widgets/babel.config.js
@@ -1,5 +1,3 @@
module.exports = {
- presets: [
- '@vue/app'
- ]
+ presets: ['@vue/cli-plugin-babel/preset']
}
diff --git a/packages/@vue/cli-ui/.babelrc b/packages/@vue/cli-ui/.babelrc
deleted file mode 100644
index a736dde9b1..0000000000
--- a/packages/@vue/cli-ui/.babelrc
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "presets": [
- "@vue/app"
- ]
-}
\ No newline at end of file
diff --git a/packages/@vue/cli-ui/apollo-server/util/logger.js b/packages/@vue/cli-ui/apollo-server/util/logger.js
index 66ed0ff442..9f3db135ab 100644
--- a/packages/@vue/cli-ui/apollo-server/util/logger.js
+++ b/packages/@vue/cli-ui/apollo-server/util/logger.js
@@ -26,5 +26,5 @@ exports.dumpObject = (obj) => {
result[key] = type
}
})
- return result.toString()
+ return JSON.stringify(result)
}
diff --git a/packages/@vue/cli-ui/babel.config.js b/packages/@vue/cli-ui/babel.config.js
new file mode 100644
index 0000000000..716b0237c6
--- /dev/null
+++ b/packages/@vue/cli-ui/babel.config.js
@@ -0,0 +1,3 @@
+module.exports = {
+ presets: ['@vue/cli-plugin-babel/preset']
+}
diff --git a/packages/@vue/cli-ui/package.json b/packages/@vue/cli-ui/package.json
index 12e2fe0b8a..4b9f3c4a6a 100644
--- a/packages/@vue/cli-ui/package.json
+++ b/packages/@vue/cli-ui/package.json
@@ -66,6 +66,7 @@
"devDependencies": {
"@babel/core": "^7.12.16",
"@babel/eslint-parser": "^7.12.16",
+ "date-fns": "^2.17.0",
"@vue/cli-plugin-babel": "^5.0.0-alpha.5",
"@vue/cli-plugin-e2e-cypress": "^5.0.0-alpha.5",
"@vue/cli-plugin-eslint": "^5.0.0-alpha.5",
@@ -85,7 +86,7 @@
"eslint-plugin-vue": "^7.6.0",
"lint-staged": "^10.5.4",
"lodash.debounce": "^4.0.8",
- "portal-vue": "^1.3.0",
+ "portal-vue": "^2.1.7",
"rimraf": "^3.0.2",
"start-server-and-test": "^1.12.0",
"stylus": "^0.54.5",
@@ -97,13 +98,15 @@
"vue-color": "^2.8.1",
"vue-i18n": "^8.22.4",
"vue-instantsearch": "^1.5.1",
- "vue-meta": "^1.6.0",
- "vue-observe-visibility": "^0.4.6",
+ "vue-meta": "^2.4.0",
+ "vue-observe-visibility": "^1.0.0",
"vue-router": "^3.5.1",
"vue-template-compiler": "^2.6.12",
"vue-timeago": "^5.1.3",
"vue-virtual-scroller": "^1.0.10",
- "xterm": "^3.13.2"
+ "xterm": "~4.10.0",
+ "xterm-addon-fit": "^0.5.0",
+ "xterm-addon-web-links": "^0.4.0"
},
"browserslist": [
"> 1%",
diff --git a/packages/@vue/cli-ui/src/components/content/TerminalView.vue b/packages/@vue/cli-ui/src/components/content/TerminalView.vue
index 7fef0c92a7..1b170d5568 100644
--- a/packages/@vue/cli-ui/src/components/content/TerminalView.vue
+++ b/packages/@vue/cli-ui/src/components/content/TerminalView.vue
@@ -39,11 +39,8 @@