@jsenv/core 27.0.0-alpha.15 → 27.0.0-alpha.18

package/package.json

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

package/src/build/build.js

@@ -309,10 +309,25 @@ ${Object.keys(rawGraph.urlInfos).join("\n")}`,
           if (reference.specifier[0] === "#") {
             reference.external = true
           }
-          const url =
+          let url =
             reference.specifier[0] === "/"
               ? new URL(reference.specifier.slice(1), buildDirectoryUrl).href
               : new URL(reference.specifier, reference.parentUrl).href
+          const parentIsFromBundle = Boolean(
+            bundleUrlInfos[reference.parentUrl],
+          )
+          // urls inside css bundled by parcel
+          // contains url relative to the bundle file (which is considered inside build directory)
+          // if the file is not itself a bundle file it must be resolved against
+          // the original css url
+          if (
+            parentIsFromBundle &&
+            !bundleUrlInfos[url] &&
+            urlIsInsideOf(url, buildDirectoryUrl)
+          ) {
+            const parentRawUrl = rawUrls[reference.parentUrl]
+            url = new URL(reference.specifier, parentRawUrl).href
+          }
           const urlRedirected = rawUrlRedirections[url]
           return urlRedirected || url
         },

package/src/build/start_build_server.js

@@ -26,6 +26,7 @@ import { createLogger } from "@jsenv/logger"
 
 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 ({
@@ -46,6 +47,7 @@ export const startBuildServer = async ({
   buildCommand,
   watchedFilePatterns,
   cooldownBetweenFileEvents,
+  autorestart,
 }) => {
   const operation = Abort.startOperation()
   operation.addAbortSignal(signal)
@@ -59,118 +61,128 @@ export const startBuildServer = async ({
       )
     })
   }
-  const logger = createLogger({ logLevel })
+  setupFileRestart({
+    signal: operation.signal,
+    autorestart,
+    injectedUrlsToWatch: [
+      new URL("package.json", rootDirectoryUrl),
+      new URL("jsenv.config.mjs", rootDirectoryUrl),
+    ],
+    job: async () => {
+      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`)
+        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
+          }
+        }
       }
-    }
-  }
 
-  const startServerTask = createTaskLog(logger, "start build server")
-  const server = await startServer({
-    signal,
-    stopOnExit: false,
-    stopOnSIGINT: false,
-    stopOnInternalError: false,
-    keepProcessAlive: true,
-    logLevel,
-    startLog: false,
+      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")
+        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")
 
-      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,
+          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: ({ relativeUrl, 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(`${relativeUrl} ${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()
     },
   })
-  operation.addAbortCallback(() => {
-    unregisterDirectoryLifecyle()
-  })
-  runBuild()
-
-  return server
 }
 
 const SECONDS_IN_30_DAYS = 60 * 60 * 24 * 30

package/src/plugins/autoreload/dev_sse/jsenv_plugin_dev_sse_server.js

@@ -134,8 +134,8 @@ export const jsenvPluginDevSSEServer = ({
     watchedFilePatterns,
     cooldownBetweenFileEvents,
     serverEventCallbackList,
-    onFileChange: ({ relativeUrl, event }) => {
-      const url = new URL(relativeUrl, rootDirectoryUrl).href
+    onFileChange: ({ url, event }) => {
+      const relativeUrl = urlToRelativeUrl(url, rootDirectoryUrl)
       const urlInfo = urlGraph.urlInfos[url]
       // file not part of dependency graph
       if (!urlInfo) {

package/src/plugins/bundling/css/bundle_css.js

@@ -1,16 +1,20 @@
 import { bundleWithParcel } from "@jsenv/utils/css_ast/parcel_css.js"
 
-export const bundleCss = ({ cssUrlInfos, context }) => {
+export const bundleCss = async ({ cssUrlInfos, context }) => {
   const bundledCssUrlInfos = {}
   cssUrlInfos.forEach((cssUrlInfo) => {
     const { code, map } = bundleWithParcel(cssUrlInfo, context)
+    const content = String(code)
+    const sourcemap = map
+    // here we need to replace css urls to ensure
+    // all urls targets the correct stuff
     bundledCssUrlInfos[cssUrlInfo.url] = {
       data: {
         generatedBy: "parcel",
       },
       contentType: "text/css",
-      content: String(code),
-      sourcemap: map,
+      content,
+      sourcemap,
     }
   })
   return bundledCssUrlInfos