@jsenv/core 24.4.1 → 24.4.6

package/src/internal/building/js/parseJsRessource.js

@@ -18,6 +18,7 @@ export const parseJsRessource = async (
 
   if (jsSourcemapUrl) {
     sourcemapReference = notifyReferenceFound({
+      referenceLabel: "js sourcemapping comment",
       contentTypeExpected: ["application/json", "application/octet-stream"],
       ressourceSpecifier: jsSourcemapUrl,
       // we don't really know the line or column
@@ -29,6 +30,7 @@ export const parseJsRessource = async (
     })
   } else {
     sourcemapReference = notifyReferenceFound({
+      referenceLabel: "js sourcemapping comment",
       contentType: "application/octet-stream",
       ressourceSpecifier: `${urlToFilename(jsUrl)}.map`,
       isPlaceholder: true,

package/src/internal/building/ressource_builder.js

@@ -3,7 +3,6 @@ import {
   urlToRelativeUrl,
   urlIsInsideOf,
   urlToParentUrl,
-  urlToBasename,
   urlToFilename,
 } from "@jsenv/filesystem"
 import { createLogger } from "@jsenv/logger"
@@ -34,10 +33,9 @@ export const createRessourceBuilder = (
     asOriginalServerUrl,
     urlToHumanUrl,
 
-    emitChunk,
     emitAsset,
     setAssetSource,
-    onJsModuleReference = () => {},
+    onJsModule,
     resolveRessourceUrl,
     lineBreakNormalization,
   },
@@ -122,6 +120,7 @@ export const createRessourceBuilder = (
   }
 
   const createReferenceFoundInJsModule = async ({
+    referenceLabel,
     jsUrl,
     jsLine,
     jsColumn,
@@ -136,6 +135,7 @@ export const createRessourceBuilder = (
       isImportAssertion,
       ressourceSpecifier,
       contentTypeExpected,
+      referenceLabel,
       referenceUrl: jsUrl,
       referenceLine: jsLine,
       referenceColumn: jsColumn,
@@ -168,6 +168,7 @@ export const createRessourceBuilder = (
     isImportAssertion,
     contentTypeExpected,
     ressourceSpecifier,
+    referenceLabel,
     referenceUrl,
     referenceColumn,
     referenceLine,
@@ -302,6 +303,7 @@ export const createRessourceBuilder = (
       isRessourceHint,
       isImportAssertion,
       contentTypeExpected,
+      referenceLabel,
       referenceUrl,
       referenceColumn,
       referenceLine,
@@ -321,12 +323,21 @@ export const createRessourceBuilder = (
 
     reference.ressource = ressource
     if (fromRollup && ressourceImporter.isEntryPoint) {
-      // do not add that reference, it's already know and would duplicate the html referencing a js file
-      // but do apply its effects
-      ressource.applyReferenceEffects(reference, { isJsModule })
+      // When HTML references JS, ressource builder has emitted the js chunk.
+      // so it already knows it exists and is part of references
+      // -> no need to push into reference (would incorrectly consider html references js twice)
+      // -> no need to log the js ressource (already logged during the HTML parsing)
     } else {
       ressource.references.push(reference)
-      ressource.applyReferenceEffects(reference, { isJsModule })
+      const effects = ressource.applyReferenceEffects(reference, { isJsModule })
+      logger.debug(
+        formatFoundReference({
+          reference,
+          referenceEffects: effects,
+          showReferenceSourceLocation,
+          shortenUrl,
+        }),
+      )
     }
 
     return reference
@@ -452,6 +463,7 @@ export const createRessourceBuilder = (
         isRessourceHint,
         contentTypeExpected,
         ressourceSpecifier,
+        referenceLabel,
         referenceLine,
         referenceColumn,
 
@@ -472,6 +484,7 @@ export const createRessourceBuilder = (
 
         const dependencyReference = createReference({
           ressourceSpecifier,
+          referenceLabel,
           referenceUrl: ressource.url,
           referenceLine,
           referenceColumn,
@@ -648,18 +661,12 @@ export const createRessourceBuilder = (
       }
     }
 
-    const onReference = (reference, infoFromReference) => {
+    const applyReferenceEffects = (reference, infoFromReference) => {
       const effects = []
       if (ressource.isEntryPoint) {
         if (ressource.contentType === "text/html") {
           effects.push(`parse html to find references`)
         }
-      } else {
-        effects.push(
-          `mark ${urlToHumanUrl(
-            ressource.url,
-          )} as referenced by ${urlToHumanUrl(reference.referenceUrl)}`,
-        )
       }
 
       if (reference.isRessourceHint) {
@@ -708,22 +715,18 @@ export const createRessourceBuilder = (
         }
 
         const jsModuleUrl = ressource.url
-
-        onJsModuleReference({
+        const rollupChunk = onJsModule({
+          ressource,
           jsModuleUrl,
           jsModuleIsInline: ressource.isInline,
           jsModuleSource: String(bufferBeforeBuild),
           line: reference.referenceLine,
           column: reference.referenceColumn,
         })
-
-        const name = urlToBasename(jsModuleUrl)
-        const rollupReferenceId = emitChunk({
-          id: jsModuleUrl,
-          name,
-        })
-        ressource.rollupReferenceId = rollupReferenceId
-        effects.push(`emit rollup chunk "${name}" (${rollupReferenceId})`)
+        ressource.rollupReferenceId = rollupChunk.rollupReferenceId
+        effects.push(
+          `emit rollup chunk "${rollupChunk.name}" (${rollupChunk.rollupReferenceId})`,
+        )
         return effects
       }
 
@@ -739,22 +742,9 @@ export const createRessourceBuilder = (
       effects.push(
         `emit rollup asset "${ressource.relativeUrl}" (${rollupReferenceId})`,
       )
-
       return effects
     }
 
-    const applyReferenceEffects = (reference, infoFromReference) => {
-      const referenceEffects = onReference(reference, infoFromReference)
-
-      logger.debug(
-        formatFoundReference({
-          reference,
-          referenceEffects,
-          showReferenceSourceLocation,
-        }),
-      )
-    }
-
     Object.assign(ressource, {
       applyReferenceEffects,
       getBufferAvailablePromise,

package/src/internal/building/ressource_builder_util.js

@@ -120,156 +120,29 @@ export const formatFoundReference = ({
   reference,
   showReferenceSourceLocation,
   referenceEffects,
+  shortenUrl,
 }) => {
-  const { isRessourceHint } = reference
-  if (isRessourceHint) {
-    return formatFoundRessourceHint({
-      reference,
-      showReferenceSourceLocation,
-      referenceEffects,
-    })
-  }
-
   const { ressource } = reference
   const { isEntryPoint } = ressource
   if (isEntryPoint) {
-    return formatCreateReferenceForEntry({
-      reference,
-      showReferenceSourceLocation,
-      referenceEffects,
-    })
-  }
-
-  const { isExternal } = ressource
-  if (isExternal) {
-    return formatFoundReferenceToExternalRessource({
-      reference,
-      showReferenceSourceLocation,
+    return `
+Start from entry file ${reference.ressource.relativeUrl}${appendEffects(
       referenceEffects,
-    })
+    )}`
   }
 
   const { isPlaceholder } = ressource
   if (isPlaceholder) {
-    return formatCreateRessourcePlaceholder({
-      reference,
-      showReferenceSourceLocation,
-      referenceEffects,
-    })
-  }
-
-  const { isInline, isJsModule } = ressource
-  if (isInline && !isJsModule) {
-    return formatFoundReferenceToInlineRessource({
-      reference,
-      showReferenceSourceLocation,
+    return `
+Create placeholder for ${showReferenceSourceLocation(reference)}${appendEffects(
       referenceEffects,
-    })
+    )}`
   }
 
-  if (isInline && isJsModule) {
-    return formatFoundReferenceToInlineModule({
-      reference,
-      showReferenceSourceLocation,
-      referenceEffects,
-    })
-  }
-
-  if (!isJsModule) {
-    return formatFoundReferenceToRessource({
-      reference,
-      showReferenceSourceLocation,
-      referenceEffects,
-    })
-  }
-
-  return formatFoundReferenceToModule({
-    reference,
-    showReferenceSourceLocation,
-    referenceEffects,
-  })
-}
-
-const formatCreateReferenceForEntry = ({ reference, referenceEffects }) => {
-  return `
-Start from entry file ${reference.ressource.relativeUrl}${appendEffects(
-    referenceEffects,
-  )}`
-}
-
-const formatFoundRessourceHint = ({
-  reference,
-  showReferenceSourceLocation,
-  referenceEffects,
-}) => {
-  return `
-Found ressource hint in ${showReferenceSourceLocation(
-    reference,
-  )}${appendEffects(referenceEffects)}`
-}
-
-const formatFoundReferenceToExternalRessource = ({
-  reference,
-  showReferenceSourceLocation,
-  referenceEffects,
-}) => {
-  return `
-Found external url in ${showReferenceSourceLocation(reference)}${appendEffects(
-    referenceEffects,
-  )}`
-}
-
-const formatCreateRessourcePlaceholder = ({
-  reference,
-  showReferenceSourceLocation,
-  referenceEffects,
-}) => {
-  return `
-Create placeholder for ressource in ${showReferenceSourceLocation(
-    reference,
-  )}${appendEffects(referenceEffects)}`
-}
-
-const formatFoundReferenceToInlineRessource = ({
-  reference,
-  showReferenceSourceLocation,
-  referenceEffects,
-}) => {
-  return `
-Found inline ressource in ${showReferenceSourceLocation(
-    reference,
-  )}${appendEffects(referenceEffects)}`
-}
-
-const formatFoundReferenceToInlineModule = ({
-  reference,
-  showReferenceSourceLocation,
-  referenceEffects,
-}) => {
-  return `
-Found inline module in ${showReferenceSourceLocation(reference)}${appendEffects(
-    referenceEffects,
-  )}`
-}
-
-const formatFoundReferenceToRessource = ({
-  reference,
-  showReferenceSourceLocation,
-  referenceEffects,
-}) => {
-  return `
-Found ressource in ${showReferenceSourceLocation(reference)}${appendEffects(
-    referenceEffects,
-  )}`
-}
-
-const formatFoundReferenceToModule = ({
-  reference,
-  showReferenceSourceLocation,
-  referenceEffects,
-}) => {
+  const { referenceLabel = "unlabelled reference" } = reference
   return `
-Found module script in ${showReferenceSourceLocation(reference)}${appendEffects(
+Found "${referenceLabel}" referencing "${shortenUrl(reference.ressource.url)}"
+  in ${showReferenceSourceLocation(reference)}${appendEffects(
     referenceEffects,
   )}`
 }

package/src/internal/building/svg/parseSvgRessource.js

@@ -60,6 +60,7 @@ const imageHrefVisitor = (image, { notifyReferenceFound }) => {
   }
 
   const hrefReference = notifyReferenceFound({
+    referenceLabel: "svg image href",
     ressourceSpecifier: hrefAttribute.value,
     ...referenceLocationFromHtmlNode(image, "href"),
   })
@@ -81,6 +82,7 @@ const useHrefVisitor = (use, { notifyReferenceFound }) => {
 
   const { hash } = new URL(href, "file://")
   const hrefReference = notifyReferenceFound({
+    referenceLabel: "svg use href",
     ressourceSpecifier: href,
     ...referenceLocationFromHtmlNode(use, "href"),
   })

package/src/internal/building/url_loader.js

@@ -30,6 +30,7 @@ export const createUrlLoader = ({
       const importer = urlImporterMap[url]
       const cssReference =
         await ressourceBuilder.createReferenceFoundInJsModule({
+          referenceLabel: "css import assertion",
           // If all references to a ressource are only import assertions
           // the file referenced do not need to be written on filesystem
           // as it was converted to a js file
@@ -84,6 +85,7 @@ export const createUrlLoader = ({
       const importer = urlImporterMap[url]
       const jsonReference =
         await ressourceBuilder.createReferenceFoundInJsModule({
+          referenceLabel: "json import assertion",
           // If all references to a ressource are only import assertions
           // the file referenced do not need to be written on filesystem
           // as it was converted to a js file
@@ -114,7 +116,7 @@ export const createUrlLoader = ({
 
     if (url in inlineModuleScripts) {
       const transformResult = await transformJs({
-        code: inlineModuleScripts[url],
+        code: String(inlineModuleScripts[url].bufferBeforeBuild),
         url: asOriginalUrl(url), // transformJs expect a file:// url
         projectDirectoryUrl,
         babelPluginMap,

package/src/internal/building/webmanifest/parseWebmanifestRessource.js

@@ -9,8 +9,9 @@ export const parseWebmanifestRessource = (
   const manifest = JSON.parse(manifestString)
   const { icons = [] } = manifest
 
-  const iconReferences = icons.map((icon) => {
+  const iconReferences = icons.map((icon, index) => {
     const iconReference = notifyReferenceFound({
+      referenceLabel: `web manifest icon ${index}`,
       ressourceSpecifier: icon.src,
     })
     return iconReference

package/src/internal/dev_server/toolbar/util/dom.js

@@ -1,4 +1,9 @@
 export const updateIframeOverflowOnParentWindow = () => {
+  if (!window.parent) {
+    // can happen while parent iframe reloads
+    return null
+  }
+
   const aTooltipIsOpened =
     document.querySelector("[data-tooltip-visible]") ||
     document.querySelector("[data-tooltip-auto-visible]")

package/src/internal/runtime/s.js

@@ -599,15 +599,18 @@
   var autoImportCandidates = {};
   var systemRegister = systemJSPrototype.register;
   var inlineScriptCount = 0;
-  systemJSPrototype.register = function (deps, declare) {
+  systemJSPrototype.register = function (deps, declare, autoUrl) {
     if (hasDocument && document.readyState === 'loading' && typeof deps !== 'string') {
       var scripts = document.querySelectorAll('script[src]');
       var lastScript = scripts[scripts.length - 1];
       var lastAutoImportUrl
       lastAutoImportDeps = deps;
-      if (lastScript) {
+      if (lastScript && lastScript.src) {
         lastAutoImportUrl = lastScript.src;
       }
+      else if (autoUrl) {
+        lastAutoImportUrl = autoUrl
+      }
       else {
         inlineScriptCount++
         lastAutoImportUrl = document.location.href + "__inline_script__" + inlineScriptCount;
@@ -725,4 +728,41 @@
       });
     };
 
+}());
+
+(function(){
+  var envGlobal = typeof self !== 'undefined' ? self : global;
+  var System = envGlobal.System;
+  var register = System.register;
+  var registerRegistry = Object.create(null)
+
+  System.register = function (name, deps, declare) {
+    if (typeof name !== 'string') return register.apply(this, arguments);
+    var define = [deps, declare];
+    return System.prepareImport().then(function () {
+      var url = System.resolve(`./${name}`);
+      registerRegistry[url] = define;
+      return register.call(System, deps, declare, url);
+    })
+  };
+
+  var instantiate = System.instantiate;
+  System.instantiate = function (url, firstParentUrl) {
+    var result = registerRegistry[url];
+
+    if (result) {
+      registerRegistry[url] = null;
+      return result;
+    } else {
+      return instantiate.call(this, url, firstParentUrl);
+    }
+  };
+
+  var getRegister = System.getRegister;
+  System.getRegister = function (url) {
+    // Calling getRegister() because other extras need to know it was called so they can perform side effects
+    var register = getRegister.call(this, url);
+    var result = registerRegistry[url] || register;
+    return result;
+  };
 }());