@jsenv/core 40.9.1 → 40.11.0

package/src/plugins/import_meta_css/jsenv_plugin_import_meta_css.js

@@ -29,6 +29,9 @@ export const jsenvPluginImportMetaCss = () => {
   const importMetaCssClientFileUrl = import.meta.resolve(
     "./client/import_meta_css.js",
   );
+  const importMetaCssBuildFileUrl = import.meta.resolve(
+    "./client/import_meta_css_build.js",
+  );
 
   return {
     name: "jsenv:import_meta_css",
@@ -49,35 +52,17 @@ export const jsenvPluginImportMetaCss = () => {
         if (!usesImportMetaCss) {
           return null;
         }
-        return injectImportMetaCss(urlInfo, importMetaCssClientFileUrl);
+        return injectImportMetaCss(
+          urlInfo,
+          urlInfo.context.build
+            ? importMetaCssBuildFileUrl
+            : importMetaCssClientFileUrl,
+        );
       },
     },
   };
 };
 
-const injectImportMetaCss = (urlInfo, importMetaCssClientFileUrl) => {
-  const importMetaCssClientFileReference = urlInfo.dependencies.inject({
-    parentUrl: urlInfo.url,
-    type: "js_import",
-    expectedType: "js_module",
-    specifier: importMetaCssClientFileUrl,
-  });
-  let content = urlInfo.content;
-  let prelude = `import { installImportMetaCss } from ${importMetaCssClientFileReference.generatedSpecifier};
-
-const remove = installImportMetaCss(import.meta);
-if (import.meta.hot) {
-  import.meta.hot.dispose(() => {
-    remove();
-  });
-}
-
-`;
-  return {
-    content: `${prelude.replace(/\n/g, "")}${content}`,
-  };
-};
-
 const babelPluginMetadataUsesImportMetaCss = () => {
   return {
     name: "metadata-uses-import-meta-css",
@@ -108,3 +93,26 @@ const babelPluginMetadataUsesImportMetaCss = () => {
     },
   };
 };
+
+const injectImportMetaCss = (urlInfo, importMetaCssClientFileUrl) => {
+  const importMetaCssClientFileReference = urlInfo.dependencies.inject({
+    parentUrl: urlInfo.url,
+    type: "js_import",
+    expectedType: "js_module",
+    specifier: importMetaCssClientFileUrl,
+  });
+  let content = urlInfo.content;
+  let prelude = `import { installImportMetaCss } from ${importMetaCssClientFileReference.generatedSpecifier};
+
+const remove = installImportMetaCss(import.meta);
+if (import.meta.hot) {
+  import.meta.hot.dispose(() => {
+    remove();
+  });
+}
+
+`;
+  return {
+    content: `${prelude.replace(/\n/g, "")}${content}`,
+  };
+};

package/src/plugins/inlining/jsenv_plugin_inlining_into_html.js

@@ -78,7 +78,7 @@ export const jsenvPluginInliningIntoHtml = () => {
             });
           });
         };
-        const onScriptWithSrc = (scriptNode, { src }) => {
+        const onScriptWithSrc = (scriptNode, { type, src }) => {
           let scriptReference;
           for (const dependencyReference of urlInfo.referenceToOthersSet) {
             if (
@@ -105,7 +105,7 @@ export const jsenvPluginInliningIntoHtml = () => {
             column,
             isOriginal,
             specifier: scriptInlineUrl,
-            type: scriptReference.type,
+            type,
             subtype: scriptReference.subtype,
             expectedType: scriptReference.expectedType,
           });

package/src/plugins/plugins.js

@@ -151,7 +151,7 @@ export const getCorePlugins = ({
     jsenvPluginCleanHTML(),
     jsenvPluginChromeDevtoolsJson(),
     ...(packageSideEffects
-      ? [jsenvPluginPackageSideEffects({ rootDirectoryUrl, packageDirectory })]
+      ? [jsenvPluginPackageSideEffects({ packageDirectory })]
       : []),
   ];
 };

package/src/plugins/protocol_file/jsenv_plugin_directory_listing.js

@@ -174,7 +174,6 @@ export const jsenvPluginDirectoryListing = ({
               const items = getDirectoryContentItems({
                 serverRootDirectoryUrl: rootDirectoryUrl,
                 mainFilePath,
-                requestedUrl,
                 firstExistingDirectoryUrl,
               });
               return items;
@@ -242,7 +241,6 @@ const generateDirectoryListingInjection = (
   const directoryContentItems = getDirectoryContentItems({
     serverRootDirectoryUrl,
     mainFilePath,
-    requestedUrl: urlNotFound,
     firstExistingDirectoryUrl,
   });
   package_workspaces: {

package/src/plugins/protocol_file/jsenv_plugin_protocol_file.js

@@ -95,6 +95,10 @@ export const jsenvPluginProtocolFile = ({
           return null;
         }
         const { firstReference } = urlInfo;
+        if (!firstReference) {
+          console.warn("No firstReference for", urlInfo.url);
+          return null;
+        }
         let { fsStat } = firstReference;
         if (!fsStat) {
           fsStat = readEntryStatSync(urlInfo.url, { nullIfNotFound: true });
@@ -123,6 +127,9 @@ export const jsenvPluginProtocolFile = ({
           return null;
         }
         const { firstReference } = urlInfo;
+        if (!firstReference) {
+          return null;
+        }
         let { fsStat } = firstReference;
         if (!fsStat) {
           fsStat = readEntryStatSync(urlInfo.url, { nullIfNotFound: true });

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

@@ -252,7 +252,7 @@ export const jsenvPluginHtmlReferenceAnalysis = ({
           const createInlineReference = (
             node,
             inlineContent,
-            { type, expectedType, contentType },
+            { type, subtype, expectedType, contentType },
           ) => {
             const hotAccept =
               getHtmlNodeAttribute(node, "hot-accept") !== undefined;
@@ -268,6 +268,7 @@ export const jsenvPluginHtmlReferenceAnalysis = ({
               getHtmlNodeAttribute(node, "jsenv-debug") !== undefined;
             const inlineReference = urlInfo.dependencies.foundInline({
               type,
+              subtype,
               expectedType,
               isOriginalPosition: isOriginal,
               specifierLine: line,

package/src/plugins/resolution_node_esm/jsenv_plugin_node_esm_resolution.js

@@ -22,7 +22,6 @@ export const jsenvPluginNodeEsmResolution = (
       );
     }
     return createNodeEsmResolver({
-      build: kitchenContext.build,
       runtimeCompat: kitchenContext.runtimeCompat,
       rootDirectoryUrl: kitchenContext.rootDirectoryUrl,
       packageConditions,
@@ -39,7 +38,6 @@ export const jsenvPluginNodeEsmResolution = (
     appliesDuring: "*",
     init: (kitchenContext) => {
       nodeEsmResolverDefault = createNodeEsmResolver({
-        build: kitchenContext.build,
         runtimeCompat: kitchenContext.runtimeCompat,
         rootDirectoryUrl: kitchenContext.rootDirectoryUrl,
         preservesSymlink: true,

package/src/plugins/resolution_node_esm/node_esm_resolver.js

@@ -71,7 +71,6 @@ export const createNodeEsmResolver = ({
     const resolveNodeEsmFallbackNullToDelegateToWebPlugin =
       createResolverWithFallbackOnError(
         applyNodeEsmResolution,
-
         () => DELEGATE_TO_WEB_RESOLUTION_PLUGIN,
       );