@jsenv/core 23.9.0 → 24.0.0

package/src/internal/executing/executePlan.js

@@ -38,11 +38,11 @@ export const executePlan = async (
     coverageV8ConflictWarning,
     coverageTempDirectoryRelativeUrl,
 
-    compileServerProtocol,
-    compileServerPrivateKey,
-    compileServerCertificate,
-    compileServerIp,
-    compileServerPort,
+    protocol,
+    privateKey,
+    certificate,
+    ip,
+    port,
     compileServerCanReadFromFilesystem,
     compileServerCanWriteOnFilesystem,
     babelPluginMap,
@@ -99,7 +99,7 @@ export const executePlan = async (
   try {
     const compileServer = await startCompileServer({
       signal: multipleExecutionsOperation.signal,
-      compileServerLogLevel,
+      logLevel: compileServerLogLevel,
 
       projectDirectoryUrl,
       jsenvDirectoryRelativeUrl,
@@ -109,11 +109,11 @@ export const executePlan = async (
       importResolutionMethod,
       importDefaultExtension,
 
-      compileServerProtocol,
-      compileServerPrivateKey,
-      compileServerCertificate,
-      compileServerIp,
-      compileServerPort,
+      protocol,
+      privateKey,
+      certificate,
+      ip,
+      port,
       compileServerCanReadFromFilesystem,
       compileServerCanWriteOnFilesystem,
       keepProcessAlive: true, // to be sure it stays alive

package/src/internal/exploring/exploring.redirector.js

@@ -1,22 +1,28 @@
 import { scanBrowserRuntimeFeatures } from "../runtime/createBrowserRuntime/scanBrowserRuntimeFeatures.js"
-import { fetchExploringJson } from "./fetchExploringJson.js"
 
 const redirect = async () => {
-  const [browserRuntimeFeaturesReport, { exploringHtmlFileRelativeUrl }] =
-    await Promise.all([
-      scanBrowserRuntimeFeatures({
-        failFastOnFeatureDetection: true,
-      }),
-      fetchExploringJson(),
-    ])
+  const redirectTarget = new URLSearchParams(window.location.search).get(
+    "redirect",
+  )
+  const browserRuntimeFeaturesReport = await scanBrowserRuntimeFeatures({
+    failFastOnFeatureDetection: true,
+  })
 
-  if (browserRuntimeFeaturesReport.canAvoidCompilation) {
-    window.location.href = `/${exploringHtmlFileRelativeUrl}`
-    return
-  }
+  const href = `${getDirectoryUrl(
+    browserRuntimeFeaturesReport,
+  )}${redirectTarget}`
+  window.location.href = href
+}
 
-  const { outDirectoryRelativeUrl, compileId } = browserRuntimeFeaturesReport
-  window.location.href = `/${outDirectoryRelativeUrl}${compileId}/${exploringHtmlFileRelativeUrl}`
+const getDirectoryUrl = ({
+  canAvoidCompilation,
+  outDirectoryRelativeUrl,
+  compileId,
+}) => {
+  if (canAvoidCompilation) {
+    return `/`
+  }
+  return `/${outDirectoryRelativeUrl}${compileId}/`
 }
 
 redirect()

package/src/launchBrowser.js

@@ -59,7 +59,7 @@ chromiumRuntime.launch = async ({
       })
     : chromiumSharing.getUniqueSharingToken()
   if (!sharingToken.isUsed()) {
-    const { chromium } = await import("playwright")
+    const { chromium } = await importPlaywright({ browserName: "chromium" })
     const launchOperation = launchBrowser("chromium", {
       browserClass: chromium,
       launchBrowserOperation,
@@ -165,7 +165,7 @@ firefoxRuntime.launch = async ({
     ? firefoxSharing.getSharingToken({ firefoxExecutablePath, headless })
     : firefoxSharing.getUniqueSharingToken()
   if (!sharingToken.isUsed()) {
-    const { firefox } = await import("playwright")
+    const { firefox } = await importPlaywright({ browserName: "firefox" })
     const launchOperation = launchBrowser("firefox", {
       browserClass: firefox,
 
@@ -244,7 +244,7 @@ webkitRuntime.launch = async ({
     : webkitSharing.getUniqueSharingToken()
 
   if (!sharingToken.isUsed()) {
-    const { webkit } = await import("playwright")
+    const { webkit } = await await importPlaywright({ browserName: "webkit" })
     const launchOperation = launchBrowser("webkit", {
       browserClass: webkit,
       launchBrowserOperation,
@@ -349,6 +349,26 @@ const launchBrowser = async (
   }
 }
 
+const importPlaywright = async ({ browserName }) => {
+  try {
+    const namespace = await import("playwright")
+    return namespace
+  } catch (e) {
+    if (e.code === "ERR_MODULE_NOT_FOUND") {
+      throw new Error(
+        createDetailedMessage(
+          `"playwright" not found. You need playwright in your dependencies when using "${browserName}Runtime"`,
+          {
+            suggestion: `npm install --save-dev playwright`,
+          },
+        ),
+        { cause: e },
+      )
+    }
+    throw e
+  }
+}
+
 const stopBrowser = async (browser) => {
   const disconnected = browser.isConnected()
     ? new Promise((resolve) => {