happo 6.0.4 → 6.0.6

package/dist/playwright/index.js

@@ -10,119 +10,6 @@ import limitConcur from "limit-concur";
 // src/config/loadConfig.ts
 import fs from "node:fs";
 import { any as findAny } from "empathic/find";
-var CONFIG_FILENAMES = [
-  "happo.config.js",
-  "happo.config.mjs",
-  "happo.config.cjs",
-  "happo.config.ts",
-  "happo.config.mts",
-  "happo.config.cts"
-];
-var DEFAULT_ENDPOINT = "https://happo.io";
-function findConfigFile() {
-  if (process.env.HAPPO_CONFIG_FILE) {
-    return process.env.HAPPO_CONFIG_FILE;
-  }
-  const configFilePath = findAny(CONFIG_FILENAMES, { cwd: process.cwd() });
-  if (!configFilePath) {
-    throw new Error(
-      "Happo config file could not be found. Please create a config file in the root of your project."
-    );
-  }
-  return configFilePath;
-}
-function assertIsPullRequestTokenResponse(response) {
-  if (typeof response !== "object" || response === null || !("secret" in response)) {
-    throw new TypeError("Unexpected pull request token response");
-  }
-}
-async function getPullRequestSecret(endpoint, prUrl) {
-  const res = await fetch(`${endpoint}/api/pull-request-token`, {
-    method: "POST",
-    headers: { "Content-Type": "application/json" },
-    body: JSON.stringify({ prUrl })
-  });
-  if (!res || !res.ok) {
-    throw new Error(
-      `Failed to get pull request secret: ${res.status} - ${await res.text()}`
-    );
-  }
-  const json = await res.json();
-  assertIsPullRequestTokenResponse(json);
-  return json.secret;
-}
-async function loadConfigFile(configFilePath, environment, logger = console) {
-  try {
-    const stats = await fs.promises.stat(configFilePath);
-    if (!stats.isFile()) {
-      throw new Error(`Happo config file path is not a file: ${configFilePath}`);
-    }
-  } catch (error) {
-    if (error instanceof Error && "code" in error && error.code === "ENOENT") {
-      throw new Error(`Happo config file could not be found: ${configFilePath}`);
-    }
-    throw error;
-  }
-  const config = (await import(configFilePath)).default;
-  if (!config.apiKey && process.env.HAPPO_API_KEY) {
-    config.apiKey = process.env.HAPPO_API_KEY;
-  }
-  if (!config.apiSecret && process.env.HAPPO_API_SECRET) {
-    config.apiSecret = process.env.HAPPO_API_SECRET;
-  }
-  if (!config.apiKey || !config.apiSecret) {
-    const missing = [
-      config.apiKey ? null : "apiKey",
-      config.apiSecret ? null : "apiSecret"
-    ].filter(Boolean).map((key) => `\`${key}\``).join(" and ");
-    if (!environment?.link) {
-      throw new Error(
-        `Missing ${missing} in your Happo config. Reference yours at https://happo.io/settings`
-      );
-    }
-    try {
-      logger.log(
-        `Missing ${missing} in Happo config. Falling back to pull-request authentication.`
-      );
-      config.apiKey = environment.link;
-      config.apiSecret = await getPullRequestSecret(
-        config.endpoint || DEFAULT_ENDPOINT,
-        environment.link
-      );
-    } catch (e) {
-      throw new Error("Failed to obtain temporary pull-request token", { cause: e });
-    }
-  }
-  if (!config.targets) {
-    config.targets = {
-      chrome: {
-        type: "chrome",
-        viewport: "1024x768"
-      }
-    };
-  }
-  if (!config.integration) {
-    config.integration = {
-      type: "storybook"
-    };
-  }
-  const allTargets = Object.values(config.targets);
-  for (const target of allTargets) {
-    target.viewport = target.viewport || "1024x768";
-    target.freezeAnimations = target.freezeAnimations || "last-frame";
-    target.prefersReducedMotion = target.prefersReducedMotion ?? true;
-  }
-  const configWithDefaults = {
-    endpoint: DEFAULT_ENDPOINT,
-    githubApiUrl: "https://api.github.com",
-    targets: allTargets,
-    ...config
-  };
-  return configWithDefaults;
-}
-
-// src/network/makeHappoAPIRequest.ts
-import { SignJWT } from "jose";
 
 // src/network/fetchWithRetry.ts
 import asyncRetry from "async-retry";
@@ -130,7 +17,7 @@ import asyncRetry from "async-retry";
 // package.json
 var package_default = {
   name: "happo",
-  version: "6.0.4",
+  version: "6.0.6",
   description: "Catch unexpected visual and accessibility changes and UI bugs",
   license: "MIT",
   repository: {
@@ -140,7 +27,7 @@ var package_default = {
   bugs: "https://github.com/happo/happo/issues",
   homepage: "https://happo.io",
   bin: {
-    happo: "dist/cli/index.js"
+    happo: "dist/cli/main.js"
   },
   type: "module",
   main: "./dist/config/index.js",
@@ -198,12 +85,12 @@ var package_default = {
     prepublishOnly: "pnpm clean && pnpm build",
     "storybook:dev": "storybook dev --config-dir src/storybook/__tests__/storybook-app -p ${PORT:-6007}",
     test: "node --env-file-if-exists=.env.local ./scripts/test.ts",
-    "test:custom": "pnpm build:dist && pnpm build:custom && node --env-file-if-exists=.env.local dist/cli/index.js -c ./happoconfigs/happo.custom.config.ts",
-    "test:cypress": "pnpm build:dist && node --env-file-if-exists=.env.local dist/cli/index.js -c ./happoconfigs/happo.cypress.config.ts e2e -- cypress run -C src/cypress/__cypress__/cypress.config.ts",
+    "test:custom": "pnpm build:dist && pnpm build:custom && node --env-file-if-exists=.env.local dist/cli/main.js -c ./happoconfigs/happo.custom.config.ts",
+    "test:cypress": "pnpm build:dist && node --env-file-if-exists=.env.local dist/cli/main.js -c ./happoconfigs/happo.cypress.config.ts e2e -- cypress run -C src/cypress/__cypress__/cypress.config.ts",
     "test:cypress:open": "cypress open -C src/cypress/__cypress__/cypress.config.ts",
-    "test:playwright": "pnpm build:dist && node --env-file-if-exists=.env.local dist/cli/index.js -c ./happoconfigs/happo.playwright.config.ts e2e -- playwright test",
-    "test:storybook": "pnpm build:dist && node --env-file-if-exists=.env.local dist/cli/index.js -c ./happoconfigs/happo.storybook.config.ts",
-    "test:pages": "pnpm build:dist && node --env-file-if-exists=.env.local dist/cli/index.js -c ./happoconfigs/happo.pages.config.ts",
+    "test:playwright": "pnpm build:dist && node --env-file-if-exists=.env.local dist/cli/main.js -c ./happoconfigs/happo.playwright.config.ts e2e -- playwright test",
+    "test:storybook": "pnpm build:dist && node --env-file-if-exists=.env.local dist/cli/main.js -c ./happoconfigs/happo.storybook.config.ts",
+    "test:pages": "pnpm build:dist && node --env-file-if-exists=.env.local dist/cli/main.js -c ./happoconfigs/happo.pages.config.ts",
     tsc: "tsc --build tsconfig.json"
   },
   browserslist: {
@@ -397,7 +284,126 @@ async function fetchWithRetry(url, {
   );
 }
 
+// src/config/loadConfig.ts
+var CONFIG_FILENAMES = [
+  "happo.config.js",
+  "happo.config.mjs",
+  "happo.config.cjs",
+  "happo.config.ts",
+  "happo.config.mts",
+  "happo.config.cts"
+];
+var DEFAULT_ENDPOINT = "https://happo.io";
+function findConfigFile() {
+  if (process.env.HAPPO_CONFIG_FILE) {
+    return process.env.HAPPO_CONFIG_FILE;
+  }
+  const configFilePath = findAny(CONFIG_FILENAMES, { cwd: process.cwd() });
+  if (!configFilePath) {
+    throw new Error(
+      "Happo config file could not be found. Please create a config file in the root of your project."
+    );
+  }
+  return configFilePath;
+}
+function assertIsPullRequestTokenResponse(response) {
+  if (typeof response !== "object" || response === null || !("secret" in response)) {
+    throw new TypeError("Unexpected pull request token response");
+  }
+}
+async function getPullRequestSecret(endpoint, prUrl, logger) {
+  const url = new URL("/api/pull-request-token", endpoint);
+  const res = await fetchWithRetry(
+    url,
+    {
+      method: "POST",
+      body: { prUrl },
+      retryCount: 3
+    },
+    logger
+  );
+  if (!res || !res.ok) {
+    throw new Error(
+      `Failed to get pull request secret: ${res.status} - ${await res.text()}`
+    );
+  }
+  const json = await res.json();
+  assertIsPullRequestTokenResponse(json);
+  return json.secret;
+}
+async function loadConfigFile(configFilePath, environment, logger = console) {
+  try {
+    const stats = await fs.promises.stat(configFilePath);
+    if (!stats.isFile()) {
+      throw new Error(`Happo config file path is not a file: ${configFilePath}`);
+    }
+  } catch (error) {
+    if (error instanceof Error && "code" in error && error.code === "ENOENT") {
+      throw new Error(`Happo config file could not be found: ${configFilePath}`);
+    }
+    throw error;
+  }
+  const config = (await import(configFilePath)).default;
+  if (!config.apiKey && process.env.HAPPO_API_KEY) {
+    config.apiKey = process.env.HAPPO_API_KEY;
+  }
+  if (!config.apiSecret && process.env.HAPPO_API_SECRET) {
+    config.apiSecret = process.env.HAPPO_API_SECRET;
+  }
+  if (!config.apiKey || !config.apiSecret) {
+    const missing = [
+      config.apiKey ? null : "apiKey",
+      config.apiSecret ? null : "apiSecret"
+    ].filter(Boolean).map((key) => `\`${key}\``).join(" and ");
+    if (!environment?.link) {
+      throw new Error(
+        `Missing ${missing} in your Happo config. Reference yours at https://happo.io/settings`
+      );
+    }
+    try {
+      logger.log(
+        `Missing ${missing} in Happo config. Falling back to pull-request authentication.`
+      );
+      config.apiKey = environment.link;
+      config.apiSecret = await getPullRequestSecret(
+        config.endpoint || DEFAULT_ENDPOINT,
+        environment.link,
+        logger
+      );
+    } catch (e) {
+      throw new Error("Failed to obtain temporary pull-request token", { cause: e });
+    }
+  }
+  if (!config.targets) {
+    config.targets = {
+      chrome: {
+        type: "chrome",
+        viewport: "1024x768"
+      }
+    };
+  }
+  if (!config.integration) {
+    config.integration = {
+      type: "storybook"
+    };
+  }
+  const allTargets = Object.values(config.targets);
+  for (const target of allTargets) {
+    target.viewport = target.viewport || "1024x768";
+    target.freezeAnimations = target.freezeAnimations || "last-frame";
+    target.prefersReducedMotion = target.prefersReducedMotion ?? true;
+  }
+  const configWithDefaults = {
+    endpoint: DEFAULT_ENDPOINT,
+    githubApiUrl: "https://api.github.com",
+    targets: allTargets,
+    ...config
+  };
+  return configWithDefaults;
+}
+
 // src/network/makeHappoAPIRequest.ts
+import { SignJWT } from "jose";
 async function signRequest(apiKey, apiSecret) {
   const encodedSecret = new TextEncoder().encode(apiSecret);
   return await new SignJWT({ key: apiKey }).setProtectedHeader({ alg: "HS256", kid: apiKey }).sign(encodedSecret);