chore: merge branch 'docs' into v3

haoqunjiang · haoqunjiang · commit 8eae0d7317fb · 2019-08-09T20:11:30.000+08:00
diff --git a/docs/config/README.md b/docs/config/README.md
@@ -266,6 +266,8 @@ See [the plugin's README](https://github.com/vuejs/vue-cli/blob/dev/packages/%40
   When building as a library, you can also set this to `false` to avoid your users having to import the CSS themselves.
 
   Extracting CSS is disabled by default in development mode since it is incompatible with CSS hot reloading. However, you can still enforce extraction in all cases by explicitly setting the value to `true`.
+  
+  Instead of a `true`, you can also pass an object of options for the [mini-css-extract-plugin](https://github.com/webpack-contrib/mini-css-extract-plugin) if you want to further configure what this plugin does exactly.
 
 ### css.sourceMap
 
diff --git a/docs/guide/deployment.md b/docs/guide/deployment.md
@@ -263,75 +263,35 @@ You can now access your project on `https://<YOUR-PROJECT-ID>.firebaseapp.com`.
 
 Please refer to the [Firebase Documentation](https://firebase.google.com/docs/hosting/deploying) for more details.
 
-### Now
+### ZEIT Now
 
-This example uses the latest Now platform version 2.
+[ZEIT Now](https://zeit.co) is a cloud platform for websites and serverless APIs, that you can use to deploy your Vue projects to your personal domain (or a free `.now.sh` suffixed URL).
 
-1. Install the Now CLI globally:
+This guide will show you how to get started in a few quick steps:
+
+#### Step 1: Installing Now CLI
+
+To install their command-line interface with [npm](https://www.npmjs.com/package/now), run the following command:
 
 ```bash
 npm install -g now
 ```
 
-2. Add a `now.json` file to your project root:
-
-    ```json
-    {
-      "name": "my-example-app",
-      "version": 2,
-      "builds": [
-        { "src": "dist/**", "use": "@now/static" }
-      ],
-      "routes": [
-        { "src": "/(.*)", "dest": "dist/$1" }
-      ],
-      "alias": "vue-example"
-    }
-    ```
-    
-   In case you want to deploy an application with router mode set to history, the config file should look like the following (if you have different folder names, update your config accordingly):
-   ```json
-    {
-      "name": "my-example-app",
-      "version": 2,
-      "builds": [
-        {
-          "src": "dist/**",
-          "use": "@now/static"
-        }
-      ],
-      "routes": [
-        {
-          "src": "/(js|css|img)/(.*)",
-          "dest": "/dist/$1/$2"
-        },
-        {
-          "src": "/favicon.ico",
-          "dest": "/dist/favicon.ico"
-        },
-        {
-          "src": "/(.*)",
-          "dest": "/dist"
-        }
-      ],
-      "alias": "vue-example"
-    }
-   ```
-   This additional config is required in order to avoid issues when directly deep-linking to a specific page (e.g. when opening `my-example-app.now.sh/some-subpage`, you would be presented with a 404 error otherwise).
+#### Step 2: Deploying
 
-3. Adding a deployment script in `package.json`:
+You can deploy your application by running the following command in the root of the project directory:
 
-    ```json
-    "deploy": "npm run build && now --target production"
-    ```
+```bash
+now
+```
 
-    If you want to deploy publicly by default, you can change the deployment script to the following one:
+**Alternatively**, you can also use their integration for [GitHub](https://zeit.co/github) or [GitLab](https://zeit.co/gitlab).
 
-    ```json
-    "deploy": "npm run build && now --target production --public"
-    ```
+That’s all!
+
+Your site will deploy, and you will receive a link similar to the following: https://vue.now-examples.now.sh
 
-    This will automatically point your site's alias to the latest deployment. Now, just run `npm run deploy` to deploy your app.
+Out of the box, you are already provided with the necessary routes for rewriting requests (except for custom static files) directly to your `index.html` file and the appropiate default caching headers. This behaviour can be overwritten [like this](https://zeit.co/docs/v2/advanced/routes/).
 
 ### Stdlib
 
diff --git a/docs/zh/guide/css.md b/docs/zh/guide/css.md
@@ -12,7 +12,7 @@ Vue CLI 项目天生支持 [PostCSS](http://postcss.org/)、[CSS Modules](https:
 
 ``` bash
 # Sass
-npm install -D sass-loader node-sass
+npm install -D sass-loader sass
 
 # Less
 npm install -D less-loader less
@@ -29,6 +29,14 @@ $color: red;
 </style>
 ```
 
+::: tip Sass 性能贴士
+请注意，当使用 Dart 版本的 Sass 时，默认情况下，**同步编译的速度为异步编译速度的两倍**，这是由于异步回调造成的性能开销。为避免此开销，你可以使用 [fibers](https://www.npmjs.com/package/fibers) 的 package 在异步环境下使用同步的代码。要启用此功能，只需安装 `fibers` 到项目依赖：
+```
+npm install -D fibers
+```
+另外请注意，由于这是一个原生模块，因此 OS 与构建环境之间可能存在兼容问题。如果遇到此问题，请执行 `npm uninstall -D fibers` 来解决此问题。
+:::
+
 ### 自动化导入
 
 如果你想自动化导入文件 (用于颜色、变量、mixin……)，你可以使用 [style-resources-loader](https://github.com/yenshih/style-resources-loader)。这里有一个关于 Stylus 的在每个单文件组件和 Stylus 文件中导入 `./src/styles/imports.styl` 的例子：
