Merge remote-tracking branch 'origin/v2' into v2

# Conflicts:
#	serverless.component.yml

Author: dfounderliu

README.md

@@ -85,7 +85,7 @@ $ serverless deploy
 ```yml
 # serverless.yml
 
-component: tencent-website # (必填) 引用 component 的名称，当前用到的是 tencent-website 组件
+component: website # (必填) 引用 component 的名称，当前用到的是 tencent-website 组件
 name: websitedemo # (必填) 该 website 组件创建的实例名称
 org: test # (可选) 用于记录组织信息，默认值为您的腾讯云账户 appid
 app: websiteApp # (可选) 该 website 应用名称

src/serverless.js

@@ -89,8 +89,8 @@ class Express extends Component {
     if (inputs.env) {
       websiteInputs.env = inputs.env
     }
-    if (inputs.envPath) {
-      websiteInputs.envPath = inputs.envPath
+    if (inputs.srcOriginal.envPath) {
+      websiteInputs.code.envPath = path.join(websiteInputs.code.src, inputs.srcOriginal.envPath)
     }
     if (inputs.cors) {
       websiteInputs.cors = inputs.cors