feat(deployment): Amazon S3 China region support

Close #1799 #1816
electron-userland · Jul 11, 2017 · 33bb25c · 33bb25c
1 parent 7da827e
commit 33bb25c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/packages/electron-builder-http/src/publishOptions.ts b/packages/electron-builder-http/src/publishOptions.ts
@@ -132,7 +132,12 @@ export interface S3Options extends PublishConfiguration {
 export function s3Url(options: S3Options) {
   let url: string
   if (!options.bucket.includes(".")) {
-    url = `https://${options.bucket}.s3.amazonaws.com`
+    if (options.region === "cn-north-1") {
+      url = `https://${options.bucket}.s3.${options.region}.amazonaws.com.cn`
+    }
+    else {
+      url = `https://${options.bucket}.s3.amazonaws.com`
+    }
   }
   else {
     if (!options.region) {
@@ -177,4 +182,4 @@ export interface BintrayOptions extends PublishConfiguration {
   readonly user?: string | null
 
   readonly token?: string | null
-}
+}
diff --git a/test/src/helpers/checkDeps.ts b/test/src/helpers/checkDeps.ts
@@ -45,9 +45,10 @@ async function check(projectDir: string, devPackageData: any): Promise<boolean>
     delete (result.missing as any).toml
   }
 
-  const squirrel = (result.missing as any)["electron-builder-squirrel-windows"]
-  if (squirrel != null && squirrel.length === 1 && squirrel[0].endsWith("winPackager.js")) {
-    delete (result.missing as any)["electron-builder-squirrel-windows"]
+  for (const name of Object.keys(result.missing)) {
+    if (name === "electron-builder-squirrel-windows" || name === "electron-webpack") {
+      delete (result.missing as any)[name]
+    }
   }
 
   if (Object.keys(result.missing).length > 0) {