Skip to content

Commit 5b40aae

Browse files
author
dfounderliu
committed
Merge remote-tracking branch 'origin/master'
# Conflicts: # package.json # serverless.js
2 parents 3c0d128 + e289377 commit 5b40aae

File tree

3 files changed

+12
-10
lines changed

3 files changed

+12
-10
lines changed

.eslintignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
coverage
22
dist
33
node_modules
4+
component

.prettierignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,3 +21,4 @@ env.js
2121
package-lock.json
2222
yarn.lock
2323
CHANGELOG.md
24+
component

docs/configure.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -43,16 +43,16 @@ tornado:
4343
4444
Main param description
4545
46-
| Param | Required/Optional | Default | Description |
47-
| --------------------------------------------------- | :---------------: | :----------: | :------------------------------------------------------------------------------------------ |
48-
| region | Optional | ap-guangzhou | |
49-
| tornadoProjectName | Required | | Tornado Projct Name |
50-
| functionName | Optional | | ServerlessCloudFunction Name |
51-
| serviceName | Optional | | API-Gateway service name, default to create a new serivce |
52-
| serviceId | Optional | | API-Gateway service id, if it has will use this APII-Gateway service |
53-
| code | Optional | | Default is current working directory |
54-
| [functionConf](#funtionConf-param-description) | Optional | | Function configure |
55-
| [apigatewayConf](#apigatewayConf-param-description) | Optional | | API-Gateway configure |
46+
| Param | Required/Optional | Default | Description |
47+
| --------------------------------------------------- | :---------------: | :----------: | :------------------------------------------------------------------- |
48+
| region | Optional | ap-guangzhou | |
49+
| tornadoProjectName | Required | | Tornado Projct Name |
50+
| functionName | Optional | | ServerlessCloudFunction Name |
51+
| serviceName | Optional | | API-Gateway service name, default to create a new serivce |
52+
| serviceId | Optional | | API-Gateway service id, if it has will use this APII-Gateway service |
53+
| code | Optional | | Default is current working directory |
54+
| [functionConf](#funtionConf-param-description) | Optional | | Function configure |
55+
| [apigatewayConf](#apigatewayConf-param-description) | Optional | | API-Gateway configure |
5656
5757
### funtionConf param description
5858

0 commit comments

Comments
 (0)