@jsenv/core 27.0.0-alpha.21 → 27.0.0-alpha.22

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/core",
-  "version": "27.0.0-alpha.21",
+  "version": "27.0.0-alpha.22",
   "description": "Tool to develop, test and build js projects",
   "license": "MIT",
   "repository": {
@@ -67,7 +67,7 @@
     "@jsenv/node-esm-resolution": "0.0.4",
     "@jsenv/server": "12.6.1",
     "@jsenv/uneval": "1.6.0",
-    "@jsenv/utils": "1.4.0",
+    "@jsenv/utils": "1.4.1",
     "construct-style-sheets-polyfill": "3.1.0",
     "cssnano": "5.1.7",
     "cssnano-preset-default": "5.2.7",

package/src/build/start_build_server.js

@@ -21,12 +21,11 @@ import {
   pluginCORS,
   fetchFileSystem,
 } from "@jsenv/server"
-import { Abort, raceProcessTeardownEvents } from "@jsenv/abort"
 import { createLogger } from "@jsenv/logger"
 
+import { initProcessAutorestart } from "@jsenv/utils/file_watcher/process_auto_restart.js"
 import { createTaskLog } from "@jsenv/utils/logs/task_log.js"
 import { watchFiles } from "@jsenv/utils/file_watcher/file_watcher.js"
-import { setupFileRestart } from "@jsenv/utils/file_watcher/file_restart.js"
 import { executeCommand } from "@jsenv/utils/command/command.js"
 
 export const startBuildServer = async ({
@@ -34,155 +33,164 @@ export const startBuildServer = async ({
   handleSIGINT = true,
   logLevel,
   buildCommandLogLevel = "warn",
-  protocol,
+  protocol = "http",
   http2,
   certificate,
   privateKey,
   listenAnyIp,
   ip,
-  port,
+  port = 9779,
 
   rootDirectoryUrl,
   buildDirectoryUrl,
   buildCommand,
+  mainBuildFile,
   watchedFilePatterns,
   cooldownBetweenFileEvents,
   autorestart,
 }) => {
-  const operation = Abort.startOperation()
-  operation.addAbortSignal(signal)
-  if (handleSIGINT) {
-    operation.addAbortSource((abort) => {
-      return raceProcessTeardownEvents(
-        {
-          SIGINT: true,
-        },
-        abort,
-      )
-    })
+  const autorestartProcess = await initProcessAutorestart({
+    signal,
+    handleSIGINT,
+    ...(autorestart
+      ? {
+          enabled: true,
+          logLevel: autorestart.logLevel,
+          urlToRestart: autorestart.url,
+          urlsToWatch: [
+            ...(autorestart.urlsToWatch || []),
+            new URL("package.json", rootDirectoryUrl),
+            new URL("jsenv.config.mjs", rootDirectoryUrl),
+          ],
+        }
+      : {
+          enabled: false,
+        }),
+  })
+  if (autorestartProcess.isPrimary) {
+    return {
+      origin: `${protocol}://127.0.0.1:${port}`,
+      stop: () => {
+        autorestartProcess.stop()
+      },
+    }
   }
-  setupFileRestart({
-    signal: operation.signal,
-    autorestart,
-    injectedUrlsToWatch: [
-      new URL("package.json", rootDirectoryUrl),
-      new URL("jsenv.config.mjs", rootDirectoryUrl),
-    ],
-    job: async () => {
-      const logger = createLogger({ logLevel })
+  signal = autorestartProcess.signal
+  const logger = createLogger({ logLevel })
 
-      let buildPromise
-      let abortController
-      const runBuild = async () => {
-        const buildTask = createTaskLog(logger, `execute build command`)
-        abortController = new AbortController()
-        operation.addAbortCallback(() => {
-          abortController.abort()
-        })
-        buildPromise = executeCommand(buildCommand, {
-          cwd: rootDirectoryUrl,
-          logLevel: buildCommandLogLevel,
-          signal: abortController.signal,
-        })
-        try {
-          await buildPromise
-          buildTask.done()
-        } catch (e) {
-          if (e.code === "ABORT_ERR") {
-            buildTask.fail(`execute build command aborted`)
-          } else {
-            buildTask.fail()
-            throw e
-          }
-        }
+  let buildPromise
+  let abortController
+  const runBuild = async () => {
+    const buildTask = createTaskLog(logger, `execute build command`)
+    buildPromise = executeCommand(buildCommand, {
+      cwd: rootDirectoryUrl,
+      logLevel: buildCommandLogLevel,
+      signal,
+    })
+    try {
+      await buildPromise
+      buildTask.done()
+    } catch (e) {
+      if (e.code === "ABORT_ERR") {
+        buildTask.fail(`execute build command aborted`)
+      } else {
+        buildTask.fail()
+        throw e
       }
+    }
+  }
 
-      const startServerTask = createTaskLog(logger, "start build server")
-      const server = await startServer({
-        signal,
-        stopOnExit: false,
-        stopOnSIGINT: false,
-        stopOnInternalError: false,
-        keepProcessAlive: true,
-        logLevel,
-        startLog: false,
-
-        protocol,
-        http2,
-        certificate,
-        privateKey,
-        listenAnyIp,
-        ip,
-        port,
-        plugins: {
-          ...pluginCORS({
-            accessControlAllowRequestOrigin: true,
-            accessControlAllowRequestMethod: true,
-            accessControlAllowRequestHeaders: true,
-            accessControlAllowedRequestHeaders: [
-              ...jsenvAccessControlAllowedHeaders,
-              "x-jsenv-execution-id",
-            ],
-            accessControlAllowCredentials: true,
-          }),
-          ...pluginServerTiming(),
-          ...pluginRequestWaitingCheck({
-            requestWaitingMs: 60 * 1000,
-          }),
-        },
-        sendErrorDetails: true,
-        requestToResponse: async (request) => {
-          await buildPromise
-          const urlIsVersioned = new URL(
-            request.ressource,
-            request.origin,
-          ).searchParams.has("v")
+  const startServerTask = createTaskLog(logger, "start build server")
+  const server = await startServer({
+    signal,
+    stopOnExit: false,
+    stopOnSIGINT: false,
+    stopOnInternalError: false,
+    keepProcessAlive: true,
+    logLevel,
+    startLog: false,
 
-          return fetchFileSystem(
-            new URL(request.ressource.slice(1), buildDirectoryUrl),
-            {
-              headers: request.headers,
-              cacheControl: urlIsVersioned
-                ? `private,max-age=${SECONDS_IN_30_DAYS},immutable`
-                : "private,max-age=0,must-revalidate",
-              etagEnabled: true,
-              compressionEnabled: !request.pathname.endsWith(".mp4"),
-              rootDirectoryUrl: buildDirectoryUrl,
-              canReadDirectory: true,
-            },
-          )
+    protocol,
+    http2,
+    certificate,
+    privateKey,
+    listenAnyIp,
+    ip,
+    port,
+    plugins: {
+      ...pluginCORS({
+        accessControlAllowRequestOrigin: true,
+        accessControlAllowRequestMethod: true,
+        accessControlAllowRequestHeaders: true,
+        accessControlAllowedRequestHeaders: [
+          ...jsenvAccessControlAllowedHeaders,
+          "x-jsenv-execution-id",
+        ],
+        accessControlAllowCredentials: true,
+      }),
+      ...pluginServerTiming(),
+      ...pluginRequestWaitingCheck({
+        requestWaitingMs: 60 * 1000,
+      }),
+    },
+    sendErrorDetails: true,
+    requestToResponse: async (request) => {
+      await buildPromise
+      const urlIsVersioned = new URL(
+        request.ressource,
+        request.origin,
+      ).searchParams.has("v")
+      if (mainBuildFile && request.ressource === "/") {
+        request = {
+          ...request,
+          ressource: `/${mainBuildFile}`,
+        }
+      }
+      return fetchFileSystem(
+        new URL(request.ressource.slice(1), buildDirectoryUrl),
+        {
+          headers: request.headers,
+          cacheControl: urlIsVersioned
+            ? `private,max-age=${SECONDS_IN_30_DAYS},immutable`
+            : "private,max-age=0,must-revalidate",
+          etagEnabled: true,
+          compressionEnabled: !request.pathname.endsWith(".mp4"),
+          rootDirectoryUrl: buildDirectoryUrl,
+          canReadDirectory: true,
         },
-      })
-      startServerTask.done()
-      logger.info(``)
-      Object.keys(server.origins).forEach((key) => {
-        logger.info(`- ${server.origins[key]}`)
-      })
-      logger.info(``)
+      )
+    },
+  })
+  startServerTask.done()
+  logger.info(``)
+  Object.keys(server.origins).forEach((key) => {
+    logger.info(`- ${server.origins[key]}`)
+  })
+  logger.info(``)
 
-      const unregisterDirectoryLifecyle = watchFiles({
-        rootDirectoryUrl,
-        watchedFilePatterns,
-        cooldownBetweenFileEvents,
-        fileChangeCallback: ({ url, event }) => {
-          abortController.abort()
-          // setTimeout is to ensure the abortController.abort() above
-          // is properly taken into account so that logs about abort comes first
-          // then logs about re-running the build happens
-          setTimeout(() => {
-            logger.info(
-              `${url.slice(rootDirectoryUrl.length)} ${event} -> rebuild`,
-            )
-            runBuild()
-          })
-        },
+  const unregisterDirectoryLifecyle = watchFiles({
+    rootDirectoryUrl,
+    watchedFilePatterns,
+    cooldownBetweenFileEvents,
+    fileChangeCallback: ({ url, event }) => {
+      abortController.abort()
+      // setTimeout is to ensure the abortController.abort() above
+      // is properly taken into account so that logs about abort comes first
+      // then logs about re-running the build happens
+      setTimeout(() => {
+        logger.info(`${url.slice(rootDirectoryUrl.length)} ${event} -> rebuild`)
+        runBuild()
       })
-      operation.addAbortCallback(() => {
-        unregisterDirectoryLifecyle()
-      })
-      runBuild()
     },
   })
+  signal.addEventListener("abort", () => {
+    unregisterDirectoryLifecyle()
+  })
+  runBuild()
+  return {
+    origin: server.origin,
+    stop: () => server.stop(),
+  }
 }
 
 const SECONDS_IN_30_DAYS = 60 * 60 * 24 * 30

package/src/dev/start_dev_server.js

@@ -1,6 +1,7 @@
 import { assertAndNormalizeDirectoryUrl } from "@jsenv/filesystem"
 import { createLogger } from "@jsenv/logger"
 
+import { initProcessAutorestart } from "@jsenv/utils/file_watcher/process_auto_restart.js"
 import { createTaskLog } from "@jsenv/utils/logs/task_log.js"
 import { getCorePlugins } from "@jsenv/core/src/plugins/plugins.js"
 import { createUrlGraph } from "@jsenv/core/src/omega/url_graph.js"
@@ -12,9 +13,10 @@ import { jsenvPluginToolbar } from "./plugins/toolbar/jsenv_plugin_toolbar.js"
 
 export const startDevServer = async ({
   signal = new AbortController().signal,
+  handleSIGINT,
   logLevel,
-  port,
-  protocol,
+  port = 3456,
+  protocol = "http",
   listenAnyIp,
   // it's better to use http1 by default because it allows to get statusText in devtools
   // which gives valuable information when there is errors
@@ -41,11 +43,39 @@ export const startDevServer = async ({
     },
   },
   toolbar = false,
+  autorestart,
 }) => {
+  rootDirectoryUrl = assertAndNormalizeDirectoryUrl(rootDirectoryUrl)
+  const autorestartProcess = await initProcessAutorestart({
+    signal,
+    handleSIGINT,
+    ...(autorestart
+      ? {
+          enabled: true,
+          logLevel: autorestart.logLevel,
+          urlToRestart: autorestart.url,
+          urlsToWatch: [
+            ...(autorestart.urlsToWatch || []),
+            new URL("package.json", rootDirectoryUrl),
+            new URL("jsenv.config.mjs", rootDirectoryUrl),
+          ],
+        }
+      : {
+          enabled: false,
+        }),
+  })
+  if (autorestartProcess.isPrimary) {
+    return {
+      origin: `${protocol}://127.0.0.1:${port}`,
+      stop: () => {
+        autorestartProcess.stop()
+      },
+    }
+  }
+
   const logger = createLogger({ logLevel })
   const startServerTask = createTaskLog(logger, "start server")
 
-  rootDirectoryUrl = assertAndNormalizeDirectoryUrl(rootDirectoryUrl)
   const urlGraph = createUrlGraph()
   const kitchen = createKitchen({
     signal,
@@ -98,5 +128,8 @@ export const startDevServer = async ({
       kitchen.pluginController.callHooks("destroy")
     }
   })
-  return server
+  return {
+    origin: server.origin,
+    stop: server.stop,
+  }
 }

package/src/omega/kitchen.js

@@ -670,9 +670,11 @@ const applyReferenceEffectsOnUrlInfo = (reference, urlInfo, context) => {
     }
     urlInfo.contentType = reference.contentType
     urlInfo.originalContent =
-      urlInfo.originalContent === undefined
-        ? reference.content
-        : urlInfo.originalContent
+      context === "build"
+        ? urlInfo.originalContent === undefined
+          ? reference.content
+          : urlInfo.originalContent
+        : reference.content
     urlInfo.content = reference.content
   }
   if (isWebWorkerEntryPointReference(reference)) {