@jsenv/core 28.1.3 → 28.2.2

package/src/test/execute_plan.js

@@ -5,12 +5,7 @@ import wrapAnsi from "wrap-ansi"
 import stripAnsi from "strip-ansi"
 
 import { urlToFileSystemPath } from "@jsenv/urls"
-import {
-  createDetailedMessage,
-  loggerToLevels,
-  createLog,
-  startSpinner,
-} from "@jsenv/log"
+import { createDetailedMessage, createLog, startSpinner } from "@jsenv/log"
 import { Abort, raceProcessTeardownEvents } from "@jsenv/abort"
 import { ensureEmptyDirectory, writeFileSync } from "@jsenv/filesystem"
 
@@ -209,8 +204,8 @@ export const executePlan = async (
         `Force completedExecutionLogMerging to false because process.stdout.isTTY is false`,
       )
     }
-    const debugLogsEnabled = loggerToLevels(logger).debug
-    const executionLogsEnabled = loggerToLevels(logger).info
+    const debugLogsEnabled = logger.levels.debug
+    const executionLogsEnabled = logger.levels.info
     const executionSpinner =
       logRefresh &&
       !debugLogsEnabled &&

package/src/build/inject_service_worker_urls.js

@@ -1,78 +0,0 @@
-import { createMagicSource } from "@jsenv/sourcemap"
-
-import { GRAPH } from "./graph_utils.js"
-import { createVersionGenerator } from "./version_generator.js"
-
-export const injectServiceWorkerUrls = async ({
-  finalGraph,
-  finalGraphKitchen,
-  lineBreakNormalization,
-}) => {
-  const serviceWorkerEntryUrlInfos = GRAPH.filter(
-    finalGraph,
-    (finalUrlInfo) => {
-      return (
-        finalUrlInfo.subtype === "service_worker" && finalUrlInfo.isEntryPoint
-      )
-    },
-  )
-  if (serviceWorkerEntryUrlInfos.length === 0) {
-    return
-  }
-  const serviceWorkerUrls = {}
-  GRAPH.forEach(finalGraph, (urlInfo) => {
-    if (urlInfo.isInline || !urlInfo.shouldHandle) {
-      return
-    }
-    if (!urlInfo.url.startsWith("file:")) {
-      return
-    }
-    if (urlInfo.data.buildUrlIsVersioned) {
-      serviceWorkerUrls[urlInfo.data.buildUrlSpecifier] = {
-        versioned: true,
-      }
-      return
-    }
-    if (!urlInfo.data.version) {
-      // when url is not versioned we compute a "version" for that url anyway
-      // so that service worker source still changes and navigator
-      // detect there is a change
-      const versionGenerator = createVersionGenerator()
-      versionGenerator.augmentWithContent({
-        content: urlInfo.content,
-        contentType: urlInfo.contentType,
-        lineBreakNormalization,
-      })
-      const version = versionGenerator.generate()
-      urlInfo.data.version = version
-    }
-    serviceWorkerUrls[urlInfo.data.buildUrlSpecifier] = {
-      versioned: false,
-      version: urlInfo.data.version,
-    }
-  })
-  await Promise.all(
-    serviceWorkerEntryUrlInfos.map(async (serviceWorkerEntryUrlInfo) => {
-      const magicSource = createMagicSource(serviceWorkerEntryUrlInfo.content)
-      const urlsWithoutSelf = {
-        ...serviceWorkerUrls,
-      }
-      delete urlsWithoutSelf[serviceWorkerEntryUrlInfo.data.buildUrlSpecifier]
-      magicSource.prepend(generateClientCode(urlsWithoutSelf))
-      const { content, sourcemap } = magicSource.toContentAndSourcemap()
-      await finalGraphKitchen.urlInfoTransformer.applyFinalTransformations(
-        serviceWorkerEntryUrlInfo,
-        {
-          content,
-          sourcemap,
-        },
-      )
-    }),
-  )
-}
-
-const generateClientCode = (serviceWorkerUrls) => {
-  return `
-self.serviceWorkerUrls = ${JSON.stringify(serviceWorkerUrls, null, "  ")};
-`
-}

package/src/build/resync_resource_hints.js

@@ -1,112 +0,0 @@
-/*
- * Update <link rel="preload"> and friends after build (once we know everything)
- *
- * - Used to remove resource hint targeting an url that is no longer used:
- *   - Happens because of import assertions transpilation (file is inlined into JS)
- */
-
-import {
-  parseHtmlString,
-  visitHtmlNodes,
-  getHtmlNodeAttribute,
-  setHtmlNodeAttributes,
-  removeHtmlNode,
-  stringifyHtmlAst,
-} from "@jsenv/ast"
-
-import { GRAPH } from "./graph_utils.js"
-
-export const resyncResourceHints = async ({
-  logger,
-  finalGraphKitchen,
-  finalGraph,
-  rawUrls,
-  postBuildRedirections,
-}) => {
-  const resourceHintActions = []
-  GRAPH.forEach(finalGraph, (urlInfo) => {
-    if (urlInfo.type !== "html") {
-      return
-    }
-    resourceHintActions.push(async () => {
-      const htmlAst = parseHtmlString(urlInfo.content, {
-        storeOriginalPositions: false,
-      })
-      const actions = []
-      const visitLinkWithHref = (linkNode, href) => {
-        if (!href || href.startsWith("data:")) {
-          return
-        }
-        const rel = getHtmlNodeAttribute(linkNode, "rel")
-        const isresourceHint = [
-          "preconnect",
-          "dns-prefetch",
-          "prefetch",
-          "preload",
-          "modulepreload",
-        ].includes(rel)
-        if (!isresourceHint) {
-          return
-        }
-
-        let buildUrl
-        for (const key of Object.keys(rawUrls)) {
-          if (rawUrls[key] === href) {
-            buildUrl = key
-            break
-          }
-        }
-        if (!buildUrl) {
-          logger.warn(`remove resource hint because cannot find "${href}"`)
-          actions.push(() => {
-            removeHtmlNode(linkNode)
-          })
-          return
-        }
-        buildUrl = postBuildRedirections[buildUrl] || buildUrl
-        const urlInfo = finalGraph.getUrlInfo(buildUrl)
-        if (!urlInfo) {
-          logger.warn(
-            `remove resource hint because cannot find "${buildUrl}" in the graph`,
-          )
-          actions.push(() => {
-            removeHtmlNode(linkNode)
-          })
-          return
-        }
-        if (urlInfo.dependents.size === 0) {
-          logger.info(`remove resource hint because "${href}" not used anymore`)
-          actions.push(() => {
-            removeHtmlNode(linkNode)
-          })
-          return
-        }
-        actions.push(() => {
-          setHtmlNodeAttributes(linkNode, {
-            href: urlInfo.data.buildUrlSpecifier,
-          })
-        })
-      }
-      visitHtmlNodes(htmlAst, {
-        link: (node) => {
-          const href = getHtmlNodeAttribute(node, "href")
-          if (href !== undefined) {
-            visitLinkWithHref(node, href)
-          }
-        },
-      })
-      if (actions.length) {
-        actions.forEach((action) => action())
-        await finalGraphKitchen.urlInfoTransformer.applyFinalTransformations(
-          urlInfo,
-          {
-            content: stringifyHtmlAst(htmlAst),
-          },
-        )
-      }
-    })
-  })
-  await Promise.all(
-    resourceHintActions.map((resourceHintAction) => resourceHintAction()),
-  )
-}

package/src/omega/url_graph/url_graph_load.js

@@ -1,74 +0,0 @@
-import { ensureEmptyDirectory } from "@jsenv/filesystem"
-
-export const loadUrlGraph = async ({
-  operation,
-  urlGraph,
-  kitchen,
-  startLoading,
-  writeGeneratedFiles,
-  outDirectoryUrl,
-}) => {
-  if (writeGeneratedFiles && outDirectoryUrl) {
-    await ensureEmptyDirectory(outDirectoryUrl)
-  }
-  const promises = []
-  const promiseMap = new Map()
-  const cook = (urlInfo, context) => {
-    const promiseFromData = promiseMap.get(urlInfo)
-    if (promiseFromData) return promiseFromData
-    const promise = _cook(urlInfo, {
-      outDirectoryUrl,
-      ...context,
-    })
-    promises.push(promise)
-    promiseMap.set(urlInfo, promise)
-    return promise
-  }
-  const _cook = async (urlInfo, context) => {
-    await kitchen.cook(urlInfo, {
-      cookDuringCook: cook,
-      ...context,
-    })
-    const { references } = urlInfo
-    references.forEach((reference) => {
-      // we don't cook resource hints
-      // because they might refer to resource that will be modified during build
-      // It also means something else have to reference that url in order to cook it
-      // so that the preload is deleted by "resync_resource_hints.js" otherwise
-      if (reference.isResourceHint) {
-        return
-      }
-      // we use reference.generatedUrl to mimic what a browser would do:
-      // do a fetch to the specifier as found in the file
-      const referencedUrlInfo = urlGraph.reuseOrCreateUrlInfo(
-        reference.generatedUrl,
-      )
-      cook(referencedUrlInfo, { reference })
-    })
-  }
-  startLoading(
-    ({ trace, parentUrl = kitchen.rootDirectoryUrl, type, specifier }) => {
-      const [entryReference, entryUrlInfo] = kitchen.prepareEntryPoint({
-        trace,
-        parentUrl,
-        type,
-        specifier,
-      })
-      cook(entryUrlInfo, { reference: entryReference })
-      return [entryReference, entryUrlInfo]
-    },
-  )
-
-  const waitAll = async () => {
-    operation.throwIfAborted()
-    if (promises.length === 0) {
-      return
-    }
-    const promisesToWait = promises.slice()
-    promises.length = 0
-    await Promise.all(promisesToWait)
-    await waitAll()
-  }
-  await waitAll()
-  promiseMap.clear()
-}