Fix serve and staticpkg (microsoft#4720)

guillaumejenkins · web-flow · commit 4b11ecff6bc9 · 2018-09-24T14:19:01.000-04:00
diff --git a/pxtlib/emitter/cloud.ts b/pxtlib/emitter/cloud.ts
@@ -2,7 +2,7 @@ namespace pxt.Cloud {
     import Util = pxtc.Util;
 
     // hit /api/ to stay on same domain and avoid CORS
-    export let apiRoot = isLocalHost() ? "https://www.makecode.com/api/" : "/api/";
+    export let apiRoot = isLocalHost() || Util.isNodeJS ? "https://www.makecode.com/api/" : "/api/";
     export let accessToken = "";
     export let localToken = "";
     let _isOnline = true;
@@ -97,7 +97,7 @@ namespace pxt.Cloud {
             .then(db => db.getAsync(locale, docid, "")
                 .then(entry => {
                     if (entry && Date.now() - entry.time > MARKDOWN_EXPIRATION)
-                        // background update, 
+                        // background update,
                         downloadMarkdownAsync(docid, locale, live, entry.etag)
                             .then(r => db.setAsync(locale, docid, branch, r.etag, undefined, r.md || entry.md))
                             .catch(() => { }) // swallow errors
diff --git a/pxtlib/util.ts b/pxtlib/util.ts
@@ -446,7 +446,8 @@ namespace ts.pxtc.Util {
         return a + b;
     }
 
-    export let isNodeJS = false;
+    // Reliable NodeJS detection is not possible, but the following check should be accurate enough for our needs
+    export let isNodeJS = typeof window === "undefined";
 
     export interface HttpRequestOptions {
         url: string;

Original file line number	Diff line number	Diff line change
`@@ -446,7 +446,8 @@ namespace ts.pxtc.Util {`
`446`	`446`	`return a + b;`
`447`	`447`	`}`
`448`	`448`
`449`		`- export let isNodeJS = false;`
	`449`	`+ // Reliable NodeJS detection is not possible, but the following check should be accurate enough for our needs`
	`450`	`+ export let isNodeJS = typeof window === "undefined";`
`450`	`451`
`451`	`452`	`export interface HttpRequestOptions {`
`452`	`453`	`url: string;`