Skip to content

Commit 7d2b345

Browse files
committed
chore: merge branch 'docs' into dev [ci skip]
2 parents 13a9f6f + 68bc0d8 commit 7d2b345

File tree

3 files changed

+11
-7
lines changed

3 files changed

+11
-7
lines changed

docs/config/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ module.exports = {
101101

102102
Build the app in multi-page mode. Each "page" should have a corresponding JavaScript entry file. The value should be an object where the key is the name of the entry, and the value is either:
103103

104-
- An object that specifies its `entry`, `template`, `filename`, `title` and `chunks` (all optional except `entry`);
104+
- An object that specifies its `entry`, `template`, `filename`, `title` and `chunks` (all optional except `entry`). Any other properties added beside those will also be passed directly to `html-webpack-plugin`, allowing user to customize said plugin;
105105
- Or a string specifying its `entry`.
106106

107107
``` js

docs/guide/deployment.md

+9-5
Original file line numberDiff line numberDiff line change
@@ -143,13 +143,13 @@ Create a new Firebase project on your [Firebase console](https://console.firebas
143143
144144
Make sure you have installed [firebase-tools](https://github.com/firebase/firebase-tools) globally:
145145
146-
```
146+
```bash
147147
npm install -g firebase-tools
148148
```
149149
150150
From the root of your project, initialize `firebase` using the command:
151151
152-
```
152+
```bash
153153
firebase init
154154
```
155155
@@ -190,7 +190,7 @@ Run `npm run build` to build your project.
190190

191191
To deploy your project on Firebase Hosting, run the command:
192192

193-
```
193+
```bash
194194
firebase deploy --only hosting
195195
```
196196

@@ -202,7 +202,11 @@ Please refer to the [Firebase Documentation](https://firebase.google.com/docs/ho
202202

203203
### Now
204204

205-
1. Install the Now CLI globally: `npm install -g now`
205+
1. Install the Now CLI globally:
206+
207+
```bash
208+
npm install -g now
209+
```
206210

207211
2. Add a `now.json` file to your project root:
208212

@@ -256,7 +260,7 @@ To deploy with [Surge](http://surge.sh/) the steps are very straightforward.
256260

257261
First you would need to build your project by running `npm run build`. And if you haven't installed Surge's command line tool, you can simply do so by running the command:
258262

259-
```
263+
```bash
260264
npm install --global surge
261265
```
262266

docs/zh/dev-guide/plugin-dev.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,7 @@ module.exports = api => {
300300

301301
#### 第三方插件的对话
302302

303-
第三方插件通常会在一个项目创建完毕后被手动安装,且用户将会通过调用 `vue invoke` 来初始化这个插件。如果这个插件在其根目录包含一个 `prompt.js`,那么它将会用在该插件被初始化调用的时候。这个文件应该导出一个用于 Inquirer.js 的[问题](https://github.com/SBoudrias/Inquirer.js#question)的数组。这些被解析的答案对象会作为选项被传递给插件的 generator。
303+
第三方插件通常会在一个项目创建完毕后被手动安装,且用户将会通过调用 `vue invoke` 来初始化这个插件。如果这个插件在其根目录包含一个 `prompts.js`,那么它将会用在该插件被初始化调用的时候。这个文件应该导出一个用于 Inquirer.js 的[问题](https://github.com/SBoudrias/Inquirer.js#question)的数组。这些被解析的答案对象会作为选项被传递给插件的 generator。
304304

305305
或者,用户可以通过在命令行传递选项来跳过对话直接初始化插件,比如:
306306

0 commit comments

Comments
 (0)