Merge branch 'dev' into patch-1

Author: fourplusone

docs/dev-guide/ui-api.md

@@ -64,7 +64,7 @@ vue ui -D
 
 You can add a project configuration with the `api.describeConfig` method.
 
-First you need to pass some informations:
+First you need to pass some information:
 
 ```js
 api.describeConfig({
@@ -430,7 +430,7 @@ api.describeTask({
     if (answers.mode) args.push('--mode', answers.mode)
     args.push('--dashboard')
   },
-  // Immediatly after running the task
+  // Immediately after running the task
   onRun: async ({ args, child, cwd }) => {
     // child: node child process
     // cwd: process working directory
@@ -1252,7 +1252,7 @@ You can also open a page instead when the user activates the suggestion with `ac
 ```js
 api.addSuggestion({
   id: 'com.my-name.my-suggestion',
-  type: 'action', // Required 
+  type: 'action', // Required
   label: 'Add vue-router',
   // Open a new tab
   actionLink: 'https://vuejs.org/'
@@ -1288,6 +1288,58 @@ In this example we only display the vue-router suggestion in the plugins view an
 
 Note: `addSuggestion` and `removeSuggestion` can be namespaced with `api.namespace()`.
 
+## Widgets
+
+You can register a widget for the project dashboard in your plugin ui file:
+
+```js
+registerWidget({
+  // Unique ID
+  id: 'org.vue.widgets.news',
+  // Basic infos
+  title: 'org.vue.widgets.news.title',
+  description: 'org.vue.widgets.news.description',
+  icon: 'rss_feed',
+  // Main component used to render the widget
+  component: 'org.vue.widgets.components.news',
+  // (Optional) Secondary component for widget 'fullscreen' view
+  detailsComponent: 'org.vue.widgets.components.news',
+  // Size
+  minWidth: 2,
+  minHeight: 1,
+  maxWidth: 6,
+  maxHeight: 6,
+  defaultWidth: 2,
+  defaultHeight: 3,
+  // (Optional) Limit the maximum number of this widget on the dashboard
+  maxCount: 1,
+  // (Optional) Add a 'fullscreen' button in widget header
+  openDetailsButton: true,
+  // (Optional) Default configuration for the widget
+  defaultConfig: () => ({
+    url: 'https://vuenews.fireside.fm/rss'
+  }),
+  // (Optional) Require user to configure widget when added
+  // You shouldn't use `defaultConfig` with this
+  needsUserConfig: true,
+  // (Optional) Display prompts to configure the widget
+  onConfigOpen: async ({ context }) => {
+    return {
+      prompts: [
+        {
+          name: 'url',
+          type: 'input',
+          message: 'org.vue.widgets.news.prompts.url',
+          validate: input => !!input // Required
+        }
+      ]
+    }
+  }
+})
+```
+
+Note: `registerWidget` can be namespaced with `api.namespace()`.
+
 ## Other methods
 
 ### hasPlugin
@@ -1324,6 +1376,21 @@ Get currently open project.
 api.getProject()
 ```
 
+### requestRoute
+
+Switch the user on a specific route in the web client.
+
+```js
+api.requestRoute({
+  name: 'foo',
+  params: {
+    id: 'bar'
+  }
+})
+
+api.requestRoute('/foobar')
+```
+
 ## Public static files
 
 You may need to expose some static files over the cli-ui builtin HTTP server (typically if you want to specify an icon to a custom view).

docs/ru/guide/plugins-and-presets.md

@@ -209,5 +209,5 @@ vue create --preset bitbucket:username/repo --clone my-project
 vue create --preset ./my-preset my-project
 
 # или напрямую использовать json-файл в cwd:
-vue create --preset my-preset.json
+vue create --preset my-preset.json my-project
 ```

docs/zh/config/README.md

@@ -384,7 +384,7 @@ Vue CLI 使用了 Babel 7 中的新配置格式 `babel.config.js`。和 `.babelr
 
 ## ESLint
 
-ESLint 可以通过 `.eslintrc` 或 `pacakge.json` 中的 `eslintConfig` 字段来配置。
+ESLint 可以通过 `.eslintrc` 或 `package.json` 中的 `eslintConfig` 字段来配置。
 
 更多细节可查阅 [@vue/cli-plugin-eslint](https://github.com/vuejs/vue-cli/tree/dev/packages/%40vue/cli-plugin-eslint)。
 

docs/zh/guide/plugins-and-presets.md

@@ -209,5 +209,5 @@ vue create --preset bitbucket:username/repo --clone my-project
 vue create --preset ./my-preset my-project
 
 # 或者，直接使用当前工作目录下的 json 文件：
-vue create --preset my-preset.json
+vue create --preset my-preset.json my-project
 ```

package.json

@@ -72,10 +72,8 @@
   "resolutions": {
     "@babel/core": "^7.0.0",
     "@babel/preset-env": "^7.0.0",
-    "fs-monkey": "0.3.1",
     "babel-core": "7.0.0-bridge.0",
     "vue": "2.5.17",
-    "vue-loader": "15.3.0",
     "vue-template-compiler": "2.5.17",
     "vue-server-renderer": "2.5.17"
   }

packages/@vue/babel-preset-app/index.js

@@ -1,3 +1,5 @@
+const path = require('path')
+
 const defaultPolyfills = [
   // promise polyfill alone doesn't work in IE,
   // needs this as well. see: #1642
@@ -138,7 +140,8 @@ module.exports = (context, options = {}) => {
     regenerator: useBuiltIns !== 'usage',
     corejs: useBuiltIns !== false ? false : 2,
     helpers: useBuiltIns === 'usage',
-    useESModules: !process.env.VUE_CLI_BABEL_TRANSPILE_MODULES
+    useESModules: !process.env.VUE_CLI_BABEL_TRANSPILE_MODULES,
+    absoluteRuntime: path.dirname(require.resolve('@babel/runtime/package.json'))
   }])
 
   return {

packages/@vue/cli-plugin-e2e-nightwatch/package.json

@@ -23,7 +23,7 @@
   },
   "dependencies": {
     "@vue/cli-shared-utils": "^3.0.5",
-    "chromedriver": "^2.42.1",
+    "chromedriver": "^2.43.1",
     "deepmerge": "^2.2.1",
     "execa": "^1.0.0",
     "nightwatch": "^0.9.21",

packages/@vue/cli-plugin-pwa/package.json

@@ -23,7 +23,7 @@
   },
   "dependencies": {
     "@vue/cli-shared-utils": "^3.0.5",
-    "workbox-webpack-plugin": "^3.6.2"
+    "workbox-webpack-plugin": "^3.6.3"
   },
   "devDependencies": {
     "register-service-worker": "^1.0.0"

packages/@vue/cli-plugin-typescript/package.json

@@ -24,7 +24,7 @@
   "dependencies": {
     "@types/webpack-env": "^1.13.6",
     "@vue/cli-shared-utils": "^3.0.5",
-    "fork-ts-checker-webpack-plugin": "^0.4.10",
+    "fork-ts-checker-webpack-plugin": "^0.4.13",
     "globby": "^8.0.1",
     "ts-loader": "^5.2.2",
     "tslint": "^5.11.0"

packages/@vue/cli-plugin-unit-jest/package.json

@@ -28,7 +28,7 @@
     "jest": "^23.6.0",
     "jest-serializer-vue": "^2.0.2",
     "jest-transform-stub": "^1.0.0",
-    "vue-jest": "^2.6.0"
+    "vue-jest": "^3.0.0"
   },
   "devDependencies": {
     "@vue/test-utils": "^1.0.0-beta.20",

packages/@vue/cli-service/generator/index.js

@@ -1,5 +1,7 @@
 module.exports = (api, options) => {
-  api.render('./template')
+  api.render('./template', {
+    doesCompile: api.hasPlugin('babel') || api.hasPlugin('typescript')
+  })
 
   api.extendPackage({
     scripts: {

packages/@vue/cli-service/generator/router/index.js

@@ -7,7 +7,8 @@ module.exports = (api, options = {}) => {
     }
   })
   api.render('./template', {
-    historyMode: options.routerHistoryMode
+    historyMode: options.routerHistoryMode,
+    doesCompile: api.hasPlugin('babel') || api.hasPlugin('typescript')
   })
 
   if (api.invoking) {

packages/@vue/cli-service/generator/router/template/src/router.js

@@ -21,7 +21,13 @@ export default new Router({
       // route level code-splitting
       // this generates a separate chunk (about.[hash].js) for this route
       // which is lazy-loaded when the route is visited.
+      <%_ if (doesCompile) { _%>
       component: () => import(/* webpackChunkName: "about" */ './views/About.vue')
+      <%_ } else { _%>
+      component: function () { 
+        return import(/* webpackChunkName: "about" */ './views/About.vue')
+      }
+      <%_ } _%>
     }
   ]
 })

packages/@vue/cli-service/generator/template/src/main.js

@@ -4,5 +4,9 @@ import App from './App.vue'
 Vue.config.productionTip = false
 
 new Vue({
-  render: h => h(App)
+  <%_ if (doesCompile) { _%>
+  render: h => h(App),
+  <%_ } else { _%>
+  render: function (h) { return h(App) },
+  <%_ } _%>
 }).$mount('#app')

packages/@vue/cli-service/lib/commands/serve.js

@@ -297,7 +297,7 @@ function checkInContainer () {
   const fs = require('fs')
   if (fs.existsSync(`/proc/1/cgroup`)) {
     const content = fs.readFileSync(`/proc/1/cgroup`, 'utf-8')
-    return /:\/(lxc|docker)\//.test(content)
+    return /:\/(lxc|docker|kubepods)\//.test(content)
   }
 }
 

packages/@vue/cli-service/package.json

@@ -34,9 +34,9 @@
     "chalk": "^2.4.1",
     "clipboardy": "^1.2.3",
     "cliui": "^4.1.0",
-    "copy-webpack-plugin": "^4.5.3",
+    "copy-webpack-plugin": "^4.5.4",
     "css-loader": "^1.0.0",
-    "cssnano": "^4.1.4",
+    "cssnano": "^4.1.7",
     "debug": "^4.1.0",
     "escape-string-regexp": "^1.0.5",
     "file-loader": "^2.0.0",
@@ -52,7 +52,7 @@
     "mini-css-extract-plugin": "^0.4.4",
     "minimist": "^1.2.0",
     "ora": "^3.0.0",
-    "portfinder": "^1.0.17",
+    "portfinder": "^1.0.19",
     "postcss-loader": "^3.0.0",
     "read-pkg": "^4.0.1",
     "semver": "^5.6.0",
@@ -64,10 +64,10 @@
     "thread-loader": "^1.2.0",
     "url-loader": "^1.1.2",
     "vue-loader": "^15.4.2",
-    "webpack": "^4.20.2",
+    "webpack": "^4.23.1",
     "webpack-bundle-analyzer": "^3.0.3",
     "webpack-chain": "^4.11.0",
-    "webpack-dev-server": "^3.1.9",
+    "webpack-dev-server": "^3.1.10",
     "webpack-merge": "^4.1.4",
     "yorkie": "^2.0.0"
   },

packages/@vue/cli-ui-addon-webpack/src/components/AssetList.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="asset-list list-block">
+  <div class="asset-list card list-block">
     <div class="content">
       <div class="title">
         {{ $t('org.vue.vue-webpack.dashboard.asset-list.title') }}

packages/@vue/cli-ui-addon-webpack/src/components/BuildProgress.vue

@@ -1,6 +1,6 @@
 <template>
   <div
-    class="build-progress"
+    class="build-progress card"
     :class="{
       [`mode-${mode}`]: true
     }"

packages/@vue/cli-ui-addon-webpack/src/components/BuildStatus.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="build-status">
+  <div class="build-status card">
     <div class="content">
       <div class="info-block status">
         <div class="label">

packages/@vue/cli-ui-addon-webpack/src/components/ModuleList.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="module-list list-block">
+  <div class="module-list card list-block">
     <div class="content">
       <div class="title">
         {{ $t('org.vue.vue-webpack.dashboard.module-list.title') }}

packages/@vue/cli-ui-addon-webpack/src/components/SpeedStats.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="speed-stats">
+  <div class="speed-stats card">
     <div class="content">
       <div class="title">
         {{ $t('org.vue.vue-webpack.dashboard.speed-stats.title') }}

packages/@vue/cli-ui-addon-webpack/src/components/WebpackAnalyzer.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="vue-webpack-analyzer">
-    <div class="pane-toolbar">
+    <div class="pane-toolbar card">
       <VueIcon icon="donut_large"/>
       <div class="title">{{ $t('org.vue.vue-webpack.analyzer.title') }}</div>
 
@@ -84,7 +84,7 @@
       </template>
 
       <div v-if="describedModule" class="described-module">
-        <div class="wrapper">
+        <div class="wrapper card">
           <div class="path" v-html="modulePath"/>
           <div
             class="stats size"
@@ -345,10 +345,6 @@ export default {
   .pane-toolbar,
   .described-module .wrapper
     padding $padding-item
-    background $vue-ui-color-light-neutral
-    border-radius $br
-    .vue-ui-dark-mode &
-      background $vue-ui-color-dark
 
   .content
     display flex

packages/@vue/cli-ui-addon-webpack/src/components/WebpackDashboard.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="vue-webpack-dashboard">
-    <div class="pane-toolbar">
+    <div class="pane-toolbar card">
       <VueIcon icon="dashboard"/>
       <div class="title">{{ $t('org.vue.vue-webpack.dashboard.title') }}</div>
 
@@ -40,7 +40,7 @@
       />
     </div>
 
-    <div class="content vue-ui-grid default-gap">
+    <div class="content vue-ui-grid">
       <BuildStatus />
       <BuildProgress />
       <SpeedStats class="span-2"/>
@@ -90,6 +90,7 @@ export default {
 .vue-webpack-dashboard
   .content
     grid-template-columns 9fr 4fr
+    grid-gap $padding-item
 
     >>>
       .title
@@ -124,13 +125,8 @@ export default {
             opacity .75
             font-size 16px
 
-  .pane-toolbar,
-  .content >>> > div
+  /deep/ .card
     padding $padding-item
-    background $vue-ui-color-light-neutral
-    border-radius $br
-    .vue-ui-dark-mode &
-      background $vue-ui-color-dark
 
   .pane-toolbar
     margin-bottom $padding-item

packages/@vue/cli-ui-addon-widgets/.browserslistrc

@@ -0,0 +1,3 @@
+> 1%
+last 2 versions
+not ie <= 8