@jsenv/core 36.2.1 → 36.3.0

package/src/plugins/reference_analysis/html/jsenv_plugin_html_reference_analysis.js

@@ -37,7 +37,6 @@ const parseAndTransformHtmlReferences = async (
   context,
   { inlineContent, inlineConvertedScript },
 ) => {
-  const url = urlInfo.originalUrl;
   const content = urlInfo.content;
   const htmlAst = parseHtmlString(content);
 
@@ -75,6 +74,7 @@ const parseAndTransformHtmlReferences = async (
       "modulepreload",
     ].includes(subtype);
     const [reference] = context.referenceUtils.found({
+      node,
       type,
       subtype,
       expectedType,
@@ -94,21 +94,13 @@ const parseAndTransformHtmlReferences = async (
         });
       });
     });
+    return reference;
   };
   const visitHref = (node, referenceProps) => {
     const href = getHtmlNodeAttribute(node, "href");
     if (href) {
       return createExternalReference(node, "href", href, referenceProps);
     }
-    const inlinedFromHref = getHtmlNodeAttribute(node, "inlined-from-href");
-    if (inlinedFromHref) {
-      return createExternalReference(
-        node,
-        "inlined-from-href",
-        new URL(inlinedFromHref, url).href,
-        referenceProps,
-      );
-    }
     return null;
   };
   const visitSrc = (node, referenceProps) => {
@@ -116,15 +108,6 @@ const parseAndTransformHtmlReferences = async (
     if (src) {
       return createExternalReference(node, "src", src, referenceProps);
     }
-    const inlinedFromSrc = getHtmlNodeAttribute(node, "inlined-from-src");
-    if (inlinedFromSrc) {
-      return createExternalReference(
-        node,
-        "inlined-from-src",
-        new URL(inlinedFromSrc, url).href,
-        referenceProps,
-      );
-    }
     return null;
   };
   const visitSrcset = (node, referenceProps) => {
@@ -146,7 +129,7 @@ const parseAndTransformHtmlReferences = async (
   const createInlineReference = (
     node,
     inlineContent,
-    { extension, type, expectedType, contentType },
+    { extension, type, subtype, expectedType, contentType },
   ) => {
     const hotAccept = getHtmlNodeAttribute(node, "hot-accept") !== undefined;
     const { line, column, lineEnd, columnEnd, isOriginal } =
@@ -177,6 +160,35 @@ const parseAndTransformHtmlReferences = async (
         debug,
       },
     );
+
+    const externalSpecifierAttributeName =
+      type === "script"
+        ? "inlined-from-src"
+        : type === "style"
+        ? "inlined-from-href"
+        : null;
+    if (externalSpecifierAttributeName) {
+      const externalSpecifier = getHtmlNodeAttribute(
+        node,
+        externalSpecifierAttributeName,
+      );
+      if (externalSpecifier) {
+        // create an external ref
+        // the goal is only to have the url in the graph (and in dependencies/implitic urls for reload)
+        // not to consider the url is actually used (at least during build)
+        // maybe we can just exlcude these urls in a special if during build, we'll see
+        const externalRef = createExternalReference(
+          node,
+          externalSpecifierAttributeName,
+          externalSpecifier,
+          { type, subtype, expectedType },
+        );
+        inlineReference.prev = externalRef;
+        inlineReference.original = externalRef;
+        externalRef.next = inlineReference;
+      }
+    }
+
     actions.push(async () => {
       await cookInlineContent({
         context,
@@ -199,12 +211,11 @@ const parseAndTransformHtmlReferences = async (
         }
       });
     });
-
     return inlineReference;
   };
   const visitTextContent = (
     node,
-    { extension, type, expectedType, contentType },
+    { extension, type, subtype, expectedType, contentType },
   ) => {
     const inlineContent = getHtmlNodeText(node);
     if (!inlineContent) {
@@ -213,6 +224,7 @@ const parseAndTransformHtmlReferences = async (
     return createInlineReference(node, inlineContent, {
       extension,
       type,
+      subtype,
       expectedType,
       contentType,
     });
@@ -254,7 +266,8 @@ const parseAndTransformHtmlReferences = async (
         return;
       }
 
-      const { type, contentType, extension } = analyzeScriptNode(scriptNode);
+      const { type, subtype, contentType, extension } =
+        analyzeScriptNode(scriptNode);
       // ignore <script type="whatever">foobar</script>
       // per HTML spec https://developer.mozilla.org/en-US/docs/Web/HTML/Element/script#attr-type
       if (type !== "text") {
@@ -286,6 +299,7 @@ const parseAndTransformHtmlReferences = async (
       const inlineRef = visitTextContent(scriptNode, {
         extension: extension || CONTENT_TYPE.asFileExtension(contentType),
         type: "script",
+        subtype,
         expectedType: type,
         contentType,
       });
@@ -427,3 +441,10 @@ const decideLinkExpectedType = (linkReference, context) => {
   }
   return undefined;
 };
+
+// const applyWebUrlResolution = (url, baseUrl) => {
+//   if (url[0] === "/") {
+//     return new URL(url.slice(1), baseUrl).href;
+//   }
+//   return new URL(url, baseUrl).href;
+// };

package/src/plugins/reference_analysis/js/jsenv_plugin_js_reference_analysis.js

@@ -132,9 +132,10 @@ const parseAndTransformJsReferences = async (
       }
     });
   };
-  const jsReferenceInfos = await parseJsUrls({
+  const jsReferenceInfos = parseJsUrls({
     js: urlInfo.content,
     url: urlInfo.originalUrl,
+    ast: urlInfo.contentAst,
     isJsModule: urlInfo.type === "js_module",
     isWebWorker: isWebWorkerUrlInfo(urlInfo),
     inlineContent,

package/dist/js/global_this_js_classic.js

@@ -1,24 +0,0 @@
-// https://mathiasbynens.be/notes/globalthis
-
-/* eslint-disable no-redeclare */
-/* global globalThis */
-let globalObject;
-if (typeof globalThis === "object") {
-  globalObject = globalThis;
-} else {
-  if (typeof this === "object") {
-    globalObject = this;
-  } else {
-    // eslint-disable-next-line no-extend-native
-    Object.defineProperty(Object.prototype, "__global__", {
-      get() {
-        return this;
-      },
-      configurable: true
-    });
-    // eslint-disable-next-line no-undef
-    globalObject = __global__;
-    delete Object.prototype.__global__;
-  }
-  globalObject.globalThis = globalObject;
-}

package/dist/js/global_this_js_module.js

@@ -1,20 +0,0 @@
-// https://mathiasbynens.be/notes/globalthis
-
-/* eslint-disable no-redeclare */
-/* global globalThis */
-let globalObject;
-if (typeof globalThis === "object") {
-  globalObject = globalThis;
-} else {
-  // eslint-disable-next-line no-extend-native
-  Object.defineProperty(Object.prototype, "__global__", {
-    get() {
-      return this;
-    },
-    configurable: true
-  });
-  // eslint-disable-next-line no-undef
-  globalObject = __global__;
-  delete Object.prototype.__global__;
-}
-globalObject.globalThis = globalObject;

package/src/build/graph_utils.js

@@ -1,34 +0,0 @@
-export const GRAPH = {
-  map: (graph, callback) => {
-    const array = [];
-    graph.urlInfoMap.forEach((urlInfo) => {
-      array.push(callback(urlInfo));
-    });
-    return array;
-  },
-
-  forEach: (graph, callback) => {
-    graph.urlInfoMap.forEach(callback);
-  },
-
-  filter: (graph, callback) => {
-    const urlInfos = [];
-    graph.urlInfoMap.forEach((urlInfo) => {
-      if (callback(urlInfo)) {
-        urlInfos.push(urlInfo);
-      }
-    });
-    return urlInfos;
-  },
-
-  find: (graph, callback) => {
-    let found = null;
-    for (const urlInfo of graph.urlInfoMap.values()) {
-      if (callback(urlInfo)) {
-        found = urlInfo;
-        break;
-      }
-    }
-    return found;
-  },
-};