feat: enable no input for website create

Author: yugasun

package.json

@@ -11,8 +11,8 @@
     "commitlint": "commitlint -f HEAD@{15}",
     "lint": "eslint --ext .js,.ts,.tsx .",
     "lint:fix": "eslint --fix --ext .js,.ts,.tsx .",
-    "prettier": "prettier --check **/*.{css,html,js,json,md,yaml,yml}",
-    "prettier:fix": "prettier --write **/*.{css,html,js,json,md,yaml,yml}",
+    "prettier": "prettier --check '**/*.{css,html,js,json,md,yaml,yml}'",
+    "prettier:fix": "prettier --write '**/*.{css,html,js,json,md,yaml,yml}'",
     "release": "semantic-release",
     "release-local": "node -r dotenv/config node_modules/semantic-release/bin/semantic-release --no-ci --dry-run",
     "check-dependencies": "npx npm-check --skip-unused --update"

serverless.component.yml

@@ -4,8 +4,8 @@ author: Tencent Cloud, Inc.
 org: Tencent Cloud, Inc.
 description: Deploys Tencent Website.
 keywords: tencent, serverless, website
-repo: https://github.com/serverless-components/tencent-website/tree/v2
-readme: https://github.com/serverless-components/tencent-website/tree/v2/README.md
+repo: https://github.com/serverless-components/tencent-website
+readme: https://github.com/serverless-components/tencent-website/tree/master/README.md
 license: MIT
 main: ./src
 webDeployable: true

src/config.js

@@ -2,6 +2,8 @@ const CONFIGS = {
   templateUrl:
     'https://serverless-templates-1300862921.cos.ap-beijing.myqcloud.com/website-demo.zip',
   region: 'ap-guangzhou',
+  compName: 'website',
+  compFullname: 'Website',
   indexPage: 'index.html',
   errorPage: 'error.html',
   protocol: 'http',

src/package.json

@@ -1,12 +1,7 @@
 {
-  "name": "@serverless/website",
-  "main": "./serverless.js",
-  "publishConfig": {
-    "access": "public"
-  },
   "dependencies": {
     "download": "^8.0.0",
-    "tencent-component-toolkit": "^1.11.4",
+    "tencent-component-toolkit": "^1.12.10",
     "type": "^2.0.0"
   }
 }

src/serverless.js

@@ -73,7 +73,7 @@ class ServerlessComponent extends Component {
   }
 
   async deploy(inputs) {
-    console.log(`Deploying Tencent Website ...`)
+    console.log(`Deploying Tencent ${CONFIGS.compFullname}`)
 
     const credentials = this.getCredentials()
 
@@ -85,26 +85,21 @@ class ServerlessComponent extends Component {
     const output = {
       region
     }
+    this.state = {
+      region,
+      website: websiteInputs
+    }
 
     if (websiteInputs.useDefault) {
       output.templateUrl = CONFIGS.templateUrl
     }
 
     inputs.srcOriginal = inputs.srcOriginal || {}
 
-    // 创建cos对象
     const cos = new Cos(credentials, region)
-
-    console.log(`Deploying Website ...`)
-
-    // 部署网站
     const websiteUrl = await cos.website(websiteInputs)
 
     output.website = this.getDefaultProtocol(websiteInputs.protocol) + '://' + websiteUrl
-    this.state = {
-      region,
-      website: websiteInputs
-    }
 
     const cosOriginAdd = `${websiteInputs.bucket}.cos-website.${websiteInputs.region}.myqcloud.com`
     if (inputs.hosts && inputs.hosts.length > 0) {
@@ -115,30 +110,29 @@ class ServerlessComponent extends Component {
         originPullProtocol: websiteInputs.protocol
       })
 
-      output.cdnDomains = deployCdnRes.cdnResult
       this.state.cdn = deployCdnRes.outputs
+      output.cdnDomains = deployCdnRes.cdnResult
     }
 
     await this.save()
-    console.log(`Deployed Tencent Website.`)
+    console.log(`Deployed Tencent ${CONFIGS.compFullname} success`)
 
     return output
   }
 
   // eslint-disable-next-line
   async remove(inputs = {}) {
-    console.log(`Removing Webiste ...`)
+    console.log(`Removing ${CONFIGS.compFullname}`)
 
     const credentials = this.getCredentials()
 
     // 默认值
     const { region } = this.state
-    const stateCdn = this.state.cdn
 
-    // 创建cos对象
     const cos = new Cos(credentials, region)
     await cos.remove(this.state.website)
 
+    const stateCdn = this.state.cdn
     if (stateCdn) {
       const cdn = new Cdn(credentials, region)
       for (let i = 0; i < stateCdn.length; i++) {
@@ -150,7 +144,7 @@ class ServerlessComponent extends Component {
     }
 
     this.state = {}
-    console.log(`Removed Website`)
+    console.log(`Removed ${CONFIGS.compFullname}`)
   }
 }
 

src/utils.js

@@ -53,6 +53,8 @@ const prepareInputs = async (instance, inputs) => {
   }
   console.log(`Files unzipped into ${sourceDirectory}...`)
 
+  const region = inputs.region || CONFIGS.region
+
   return {
     useDefault: !code.src,
     code: {
@@ -62,9 +64,9 @@ const prepareInputs = async (instance, inputs) => {
       envPath: path.join(sourceDirectory, envPath)
     },
     env: inputs.env,
-    bucket: `${inputs.bucketName}-${appId}`,
-    region: inputs.region || CONFIGS.region,
-    protocol: inputs.protocol || CONFIGS.protocolc,
+    bucket: `${inputs.bucketName || `sls-website-${region}-${generateId()}`}-${appId}`,
+    region: region,
+    protocol: inputs.protocol || CONFIGS.protocol,
     cors: inputs.cors
   }
 }