some changes

Author: christianalfoni

esbuild.cjs

@@ -21,15 +21,15 @@ Promise.all([
   // Browser builds:
   // CommonJS build
   esbuild.build({
-    entryPoints: ["src/sessions/WebSocketSession/browser.ts"],
+    entryPoints: ["src/browser.ts"],
     bundle: true,
     format: "cjs",
     // .cjs extension is required because "type": "module" is set in package.json
     outfile: "dist/cjs/browser.cjs",
     platform: "browser",
     // pitcher-common currently requires this, but breaks the first experience
     banner: {
-      js: `if (!window.process) {
+      js: `if (typeof window !== "undefined" && !window.process) {
   window.process = {
     env: {},
   };
@@ -41,14 +41,14 @@ Promise.all([
 
   // ESM build
   esbuild.build({
-    entryPoints: ["src/sessions/WebSocketSession/browser.ts"],
+    entryPoints: ["src/browser.ts"],
     bundle: true,
     format: "esm",
     outdir: "dist/esm",
     platform: "browser",
     // pitcher-common currently requires this, but breaks the first experience
     banner: {
-      js: `if (!window.process) {
+      js: `if (typeof window !== "undefined" && !window.process) {
   window.process = {
     env: {},
   };

package.json

@@ -43,7 +43,7 @@
       "default": "./dist/cjs/index.cjs"
     },
     "./browser": {
-      "types": "./dist/esm/sessions/WebSocketSession/browser.d.ts",
+      "types": "./dist/esm/browser.d.ts",
       "import": "./dist/esm/browser.js",
       "require": "./dist/cjs/browser.cjs",
       "default": "./dist/cjs/browser.cjs"

src/sessions/WebSocketSession/browser.ts renamed to src/browser.ts

@@ -1,8 +1,10 @@
 import { initPitcherClient, protocol } from "@codesandbox/pitcher-client";
-import { DEFAULT_SUBSCRIPTIONS, SandboxBrowserSession } from "../../types";
-import { WebSocketSession } from ".";
+import { DEFAULT_SUBSCRIPTIONS, SandboxBrowserSession } from "./types";
+import { WebSocketSession } from "./sessions/WebSocketSession";
 
-export * from ".";
+export * from "./sessions/WebSocketSession";
+
+export { createPreview } from "./previews";
 
 /**
  * With this function you can connect to a sandbox from the browser.

src/sessions/WebSocketSession/previews/Preview.ts renamed to src/previews/Preview.ts

@@ -6,7 +6,6 @@ import {
   InjectMessage,
   Message,
 } from "./types";
-import { Disposable } from "../../../utils/disposable";
 import { injectAndInvokeInsidePreview } from "./preview-script";
 
 type PreviewStatus = "DISCONNECTED" | "CONNECTED";
@@ -34,10 +33,7 @@ export class Preview<
   onStatusChange = this.onStatusChangeEmitter.event;
   iframe: HTMLIFrameElement;
 
-  constructor(sessionDisposable: Disposable, src: string) {
-    sessionDisposable.onWillDispose(() => {
-      this.dispose();
-    });
+  constructor(src: string) {
     this.origin = new URL(src).origin;
     this.iframe = this.createIframe(src);
     this.windowListener = (event: MessageEvent) => {
@@ -65,7 +61,6 @@ export class Preview<
 
     this.onPreviewLoad = () => {
       this.status = "CONNECTED";
-      console.log("INJECT SCRIPT");
       this._injectAndInvoke(injectAndInvokeInsidePreview, {});
     };
 
@@ -111,10 +106,21 @@ export class Preview<
     }
   }
 
-  injectAndInvoke<Scope extends Record<string, unknown>>(
+  async injectAndInvoke<Scope extends Record<string, unknown>>(
     func: InjectFunction<MessageToPreview, MessageFromPreview, Scope>,
     scope: Scope
   ) {
+    if (this.status !== "CONNECTED") {
+      return new Promise(() => {
+        const listener = this.onStatusChange((status) => {
+          if (status === "CONNECTED") {
+            this._injectAndInvoke(func, scope);
+            listener.dispose();
+          }
+        });
+      });
+    }
+
     this._injectAndInvoke(func, scope);
   }
 

src/previews/index.ts

@@ -0,0 +1,8 @@
+import { Preview } from "./Preview";
+import { InjectFunction } from "./types";
+
+export { Preview, InjectFunction };
+
+export function createPreview(src: string) {
+  return new Preview(src);
+}

src/sessions/WebSocketSession/previews/preview-script.ts renamed to src/previews/preview-script.ts

@@ -1,14 +1,28 @@
 import type { Id, IPitcherClient } from "@codesandbox/pitcher-client";
-import { listenOnce } from "@codesandbox/pitcher-common/dist/event";
 
-import { Disposable } from "../../utils/disposable";
-import { Emitter } from "../../utils/event";
-
-export class Git extends Disposable {
-  constructor(private pitcherClient: IPitcherClient) {
-    super();
+export class Git {
+  onStatusChange = this.pitcherClient.clients.git.onStatusUpdated;
+  constructor(private pitcherClient: IPitcherClient) {}
+  pull(force?: boolean) {
+    return this.pitcherClient.clients.git.pull(undefined, force);
+  }
+  commit(message: string, paths?: string[]) {
+    return this.pitcherClient.clients.git.commit(message, paths);
+  }
+  push() {
+    return this.pitcherClient.clients.git.push();
+  }
+  status() {
+    return this.pitcherClient.clients.git.getStatus();
+  }
+  discard(path?: string[]) {
+    return this.pitcherClient.clients.git.discard(path);
+  }
+  resetToRemote() {
+    return this.pitcherClient.clients.git.resetLocalWithRemote();
   }
-  pull() {
-    return this.pitcherClient.clients.git.pull();
+  // TODO: Expose git checkout
+  checkout(branch: string) {
+    return this.pitcherClient.clients.task.runCommand(`git checkout ${branch}`);
   }
 }

src/sessions/WebSocketSession/previews/types.ts renamed to src/previews/types.ts

@@ -12,7 +12,6 @@ import { Shells } from "./shells";
 import { Tasks } from "./tasks";
 import { DEFAULT_SUBSCRIPTIONS, SandboxSession } from "../../types";
 import { Client } from "@hey-api/client-fetch";
-import { Previews } from "./previews";
 import { Interpreters } from "./interpreters";
 import { Terminals } from "./terminals";
 import { Commands } from "./commands";
@@ -22,7 +21,6 @@ export * from "./ports";
 export * from "./setup";
 export * from "./shells";
 export * from "./tasks";
-export * from "./previews";
 export * from "./terminals";
 export * from "./commands";
 export * from "./interpreters";
@@ -82,11 +80,6 @@ export class WebSocketSession {
    */
   public readonly fs = new FileSystem(this.disposable, this.pitcherClient);
 
-  /**
-   * Namespace for previews
-   */
-  public readonly previews = new Previews(this.disposable);
-
   /**
    * Namespace for running shell commands on this sandbox.
    */