feat(api): refactor sandpack provider

package.json

@@ -9,7 +9,7 @@
     "lint": "eslint '**/*.ts?(x)' --fix",
     "format:check": "prettier --check '**/*.{ts,tsx}'",
     "format": "prettier --write '**/*.{ts,tsx}'",
-    "test": "jest sandpack-react",
+    "test": "jest sandpack-react sandpack-client",
     "cy:open": "cypress open",
     "cy:run": "cypress run",
     "build": "yarn workspace @codesandbox/sandpack-client run build && yarn workspace @codesandbox/sandpack-react run build",
@@ -33,6 +33,7 @@
     "@babel/preset-typescript": "^7.16.5",
     "@cypress/snapshot": "^2.1.7",
     "@octokit/rest": "^18.12.0",
+    "@types/jest": "^27.4.0",
     "@typescript-eslint/eslint-plugin": "^4.0.0",
     "@typescript-eslint/parser": "^4.0.0",
     "babel-eslint": "^10.0.0",

sandpack-client/src/client.ts

@@ -134,7 +134,9 @@ export class SandpackClient {
       const element = document.querySelector(selector);
 
       if (!element) {
-        throw new Error(`No element found for selector '${selector}'`);
+        throw new Error(
+          `[sandpack-client]: the element '${selector}' was not found`
+        );
       }
 
       this.element = element;
@@ -254,7 +256,8 @@ export class SandpackClient {
       packageJSON = JSON.parse(files["/package.json"].code);
     } catch (e) {
       console.error(
-        "Could not parse package.json file: " + (e as Error).message
+        "[sandpack-client]: could not parse package.json file: " +
+          (e as Error).message
       );
     }
 
@@ -375,7 +378,9 @@ export class SandpackClient {
 
     if (!this.element.parentNode) {
       // This should never happen
-      throw new Error("Given element does not have a parent.");
+      throw new Error(
+        `[sandpack-client]: the given iframe does not have a parent.`
+      );
     }
 
     this.element.parentNode.replaceChild(this.iframe, this.element);

sandpack-client/src/utils.test.ts

@@ -0,0 +1,80 @@
+import { addPackageJSONIfNeeded } from "./utils";
+
+const files = {
+  "/package.json": {
+    code: `{
+  "name": "custom-package",
+  "main": "old-entry.js",
+  "dependencies": { "baz": "*" },
+  "devDependencies": { "baz": "*" }
+}`,
+  },
+};
+
+describe(addPackageJSONIfNeeded, () => {
+  test("it merges the package.json - dependencies", () => {
+    const output = addPackageJSONIfNeeded(files, { foo: "*" });
+
+    expect(JSON.parse(output["/package.json"].code).dependencies).toEqual({
+      baz: "*",
+      foo: "*",
+    });
+  });
+
+  test("it merges the package.json - dev-dependencies", () => {
+    const output = addPackageJSONIfNeeded(files, undefined, { foo: "*" });
+
+    expect(JSON.parse(output["/package.json"].code).devDependencies).toEqual({
+      baz: "*",
+      foo: "*",
+    });
+  });
+
+  test("it merges the package.json - entry", () => {
+    const output = addPackageJSONIfNeeded(
+      files,
+      undefined,
+      undefined,
+      "new-entry.js"
+    );
+
+    expect(JSON.parse(output["/package.json"].code).main).toEqual(
+      "new-entry.js"
+    );
+  });
+
+  test("it returns an error when there is not dependencies at all", () => {
+    try {
+      addPackageJSONIfNeeded({ "/package.json": { code: `{}` } });
+
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    } catch (err: any) {
+      expect(err.message).toBe(
+        '[sandpack-client]: "dependencies" was not specified - provide either a package.json or a "dependencies" value'
+      );
+    }
+  });
+
+  test("it supports package.json without leading slash", () => {
+    const output = addPackageJSONIfNeeded(
+      {
+        "package.json": {
+          code: `{
+  "main": "old-entry.js",
+  "dependencies": { "baz": "*" },
+  "devDependencies": { "baz": "*" }
+}`,
+        },
+      },
+      { foo: "*" },
+      { foo: "*" },
+      "new-entry.ts"
+    );
+
+    expect(JSON.parse(output["package.json"].code)).toEqual({
+      main: "new-entry.ts",
+      dependencies: { baz: "*", foo: "*" },
+      devDependencies: { baz: "*", foo: "*" },
+    });
+  });
+});

sandpack-client/src/utils.ts

@@ -6,6 +6,9 @@ import type {
   ErrorStackFrame,
 } from "./types";
 
+const DEPENDENCY_ERROR_MESSAGE = `[sandpack-client]: "dependencies" was not specified - provide either a package.json or a "dependencies" value`;
+const ENTRY_ERROR_MESSAGE = `[sandpack-client]: "entry" was not specified - provide either a package.json with the "main" field or na "entry" value`;
+
 export function createPackageJSON(
   dependencies: Dependencies = {},
   devDependencies: Dependencies = {},
@@ -31,22 +34,59 @@ export function addPackageJSONIfNeeded(
 ): SandpackBundlerFiles {
   const newFiles = { ...files };
 
-  if (!newFiles["/package.json"]) {
-    if (!dependencies) {
-      throw new Error(
-        "No dependencies specified, please specify either a package.json or dependencies."
-      );
-    }
+  const getPackageJsonFile = (): string | undefined => {
+    if (newFiles["/package.json"]) return "/package.json";
+    if (newFiles["package.json"]) return "package.json";
 
-    if (!entry) {
-      throw new Error(
-        "Missing 'entry' parameter. Either specify an entry point, or pass in a package.json with the 'main' field set."
-      );
-    }
+    return undefined;
+  };
+  const packageJsonFile = getPackageJsonFile();
+
+  /**
+   * Create a new package json
+   */
+  if (!packageJsonFile) {
+    if (!dependencies) throw new Error(DEPENDENCY_ERROR_MESSAGE);
+    if (!entry) throw new Error(ENTRY_ERROR_MESSAGE);
 
     newFiles["/package.json"] = {
       code: createPackageJSON(dependencies, devDependencies, entry),
     };
+
+    return newFiles;
+  }
+
+  /**
+   * Merge package json with custom setup
+   */
+  if (packageJsonFile) {
+    const packageJsonContent = JSON.parse(newFiles[packageJsonFile].code);
+
+    if (!dependencies && !packageJsonContent.dependencies) {
+      throw new Error(DEPENDENCY_ERROR_MESSAGE);
+    }
+
+    if (dependencies) {
+      packageJsonContent.dependencies = {
+        ...(packageJsonContent.dependencies ?? {}),
+        ...(dependencies ?? {}),
+      };
+    }
+
+    if (devDependencies) {
+      packageJsonContent.devDependencies = {
+        ...(packageJsonContent.devDependencies ?? {}),
+        ...(devDependencies ?? {}),
+      };
+    }
+
+    if (entry) {
+      packageJsonContent.main = entry;
+    }
+
+    newFiles[packageJsonFile] = {
+      code: JSON.stringify(packageJsonContent, null, 2),
+    };
   }
 
   return newFiles;

sandpack-client/tsconfig.json

@@ -14,5 +14,5 @@
     "skipLibCheck": true
   },
   "include": ["./src"],
-  "exclude": ["node_modules"]
+  "exclude": ["node_modules", "src/**/*.test.ts"]
 }

sandpack-react/src/components/CodeEditor/CodeEditor.stories.tsx

@@ -17,13 +17,13 @@ export default {
 
 export const Component: Story<CodeEditorProps> = (args) => (
   <SandpackProvider
+    files={{
+      "/index.js": {
+        code: 'const title = "This is a simple code editor"',
+      },
+    }}
     customSetup={{
       entry: "/index.js",
-      files: {
-        "/index.js": {
-          code: 'const title = "This is a simple code editor"',
-        },
-      },
     }}
   >
     <SandpackThemeProvider>
@@ -90,13 +90,13 @@ export const ReadOnly: React.FC = () => {
     <>
       <p>Read-only by file</p>
       <Sandpack
-        customSetup={{ entry: "/index.tsx", main: "/App.tsx" }}
+        customSetup={{ entry: "/index.tsx" }}
         files={{
           "/index.tsx": { code: "", hidden: true },
           "/src/App.tsx": { code: "Hello", readOnly: true, active: true },
           "/src/components/button.tsx": { code: "World", readOnly: false },
         }}
-        options={{ showTabs: true }}
+        options={{ showTabs: true, activePath: "/App.tsx" }}
         template="react-ts"
       />
 

sandpack-react/src/components/CodeViewer/CodeViewer.stories.tsx

@@ -16,9 +16,10 @@ export const Component: Story<CodeViewerProps> = (args) => (
   <SandpackProvider
     customSetup={{
       entry: "/index.js",
-      files: {
-        "/index.js": {
-          code: `const people = [{
+    }}
+    files={{
+      "/index.js": {
+        code: `const people = [{
   id: 0,
   name: 'Creola Katherine Johnson',
   profession: 'mathematician',
@@ -34,7 +35,6 @@ export default function List() {
   );
   return <ul>{listItems}</ul>;
 }`,
-        },
       },
     }}
   >
@@ -65,9 +65,10 @@ export const Decorators: React.FC = () => {
     <SandpackProvider
       customSetup={{
         entry: "/index.js",
-        files: {
-          "/index.js": {
-            code: `const people = [{
+      }}
+      files={{
+        "/index.js": {
+          code: `const people = [{
   id: 0,
   name: 'Creola Katherine Johnson',
   profession: 'mathematician',
@@ -84,7 +85,6 @@ export default function List() {
   );
   return <ul>{listItems}</ul>;
 }`,
-          },
         },
       }}
     >

sandpack-react/src/components/FileExplorer/FileExplorer.stories.tsx

@@ -15,11 +15,11 @@ export const Component: React.FC = () => (
     <SandpackProvider
       customSetup={{
         entry: "/index.tsx",
-        files: {
-          "/index.tsx": "",
-          "/src/app.tsx": "",
-          "/src/components/button.tsx": "",
-        },
+      }}
+      files={{
+        "/index.tsx": "",
+        "/src/app.tsx": "",
+        "/src/components/button.tsx": "",
       }}
     >
       <SandpackLayout>
@@ -30,11 +30,11 @@ export const Component: React.FC = () => (
     <SandpackProvider
       customSetup={{
         entry: "/index.tsx",
-        files: {
-          "/index.tsx": "",
-          "/src/app.tsx": "",
-          "/src/components/button.tsx": "",
-        },
+      }}
+      files={{
+        "/index.tsx": "",
+        "/src/app.tsx": "",
+        "/src/components/button.tsx": "",
       }}
     >
       <SandpackLayout theme="night-owl">

sandpack-react/src/components/FileTabs/FileTabs.stories.tsx

@@ -1,6 +1,5 @@
 import * as React from "react";
 
-import { Sandpack } from "../../";
 import { SandpackLayout } from "../../common/Layout";
 import { SandpackProvider } from "../../contexts/sandpackContext";
 import { SandpackCodeViewer } from "../CodeViewer";
@@ -15,11 +14,11 @@ export const Component: React.FC = () => (
   <SandpackProvider
     customSetup={{
       entry: "/index.tsx",
-      files: {
-        "/index.tsx": "",
-        "/src/app.tsx": { code: "", active: true },
-        "/src/components/button.tsx": "",
-      },
+    }}
+    files={{
+      "/index.tsx": "",
+      "/src/app.tsx": { code: "", active: true },
+      "/src/components/button.tsx": "",
     }}
   >
     <SandpackLayout>
@@ -32,11 +31,11 @@ export const WithClosableTabs: React.FC = () => (
   <SandpackProvider
     customSetup={{
       entry: "/index.tsx",
-      files: {
-        "/index.tsx": { code: "", hidden: true },
-        "/src/app.tsx": "Hello",
-        "/src/components/button.tsx": "World",
-      },
+    }}
+    files={{
+      "/index.tsx": { code: "", hidden: true },
+      "/src/app.tsx": "Hello",
+      "/src/components/button.tsx": "World",
     }}
   >
     <SandpackLayout>
@@ -49,11 +48,11 @@ export const WithHiddenFiles: React.FC = () => (
   <SandpackProvider
     customSetup={{
       entry: "/index.tsx",
-      files: {
-        "/index.tsx": { code: "", hidden: true },
-        "/src/app.tsx": "Hello",
-        "/src/components/button.tsx": "World",
-      },
+    }}
+    files={{
+      "/index.tsx": { code: "", hidden: true },
+      "/src/app.tsx": "Hello",
+      "/src/components/button.tsx": "World",
     }}
   >
     <SandpackLayout>