@jsenv/core 27.0.0-alpha.52 → 27.0.0-alpha.53

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/core",
-  "version": "27.0.0-alpha.52",
+  "version": "27.0.0-alpha.53",
   "description": "Tool to develop, test and build js projects",
   "license": "MIT",
   "repository": {

package/src/build/build.js

@@ -618,6 +618,7 @@ ${Object.keys(rawGraph.urlInfos).join("\n")}`,
       urlGraph: finalGraph,
       kitchen: finalGraphKitchen,
       outDirectoryUrl: new URL(".jsenv/postbuild/", rootDirectoryUrl),
+      skipRessourceHint: true,
       startLoading: (cookEntryFile) => {
         entryUrls.forEach((entryUrl) => {
           const [, postBuildEntryUrlInfo] = cookEntryFile({
@@ -698,7 +699,7 @@ ${Object.keys(finalGraph.urlInfos).join("\n")}`,
       urlInfo.dependents.size === 0
     ) {
       cleanupActions.push(() => {
-        delete finalGraph.urlInfos[urlInfo.url]
+        finalGraph.deleteUrlInfo(urlInfo.url)
       })
     }
   })
@@ -969,6 +970,7 @@ const applyUrlVersioning = async ({
     await loadUrlGraph({
       urlGraph: finalGraph,
       kitchen: versioningKitchen,
+      skipRessourceHint: true,
       startLoading: (cookEntryFile) => {
         postBuildEntryUrls.forEach((postBuildEntryUrl) => {
           cookEntryFile({

package/src/build/build_urls_generator.js

@@ -56,8 +56,8 @@ export const createBuilUrlsGenerator = ({ buildDirectoryUrl }) => {
 // To keep in mind: if you have "user.jsx" and "user.js" AND both file are not bundled
 // you end up with "dist/js/user.js" and "dist/js/user2.js"
 const extensionMappings = {
-  ".ts": ".js",
   ".jsx": ".js",
+  ".ts": ".js",
   ".tsx": ".js",
 }
 

package/src/omega/kitchen.js

@@ -164,6 +164,12 @@ export const createKitchen = ({
           if (returnValue === reference.url) {
             return
           }
+          const normalizedReturnValue = returnValue.startsWith("data:")
+            ? returnValue
+            : returnValue.replace(/[=](?=&|$)/g, "")
+          if (normalizedReturnValue === reference.url) {
+            return
+          }
           const previousReference = { ...reference }
           reference.url = returnValue
           mutateReference(previousReference, reference)

package/src/omega/url_graph/url_graph_load.js

@@ -6,6 +6,7 @@ export const loadUrlGraph = async ({
   startLoading,
   outDirectoryUrl,
   clientRuntimeCompat,
+  skipRessourceHint = false,
 }) => {
   if (outDirectoryUrl) {
     await ensureEmptyDirectory(outDirectoryUrl)
@@ -33,6 +34,9 @@ export const loadUrlGraph = async ({
     })
     const { references } = urlInfo
     references.forEach((reference) => {
+      if (skipRessourceHint && reference.isRessourceHint) {
+        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(

package/src/plugins/inline/jsenv_plugin_js_inline_content.js

@@ -274,8 +274,9 @@ const getOriginalName = (path, name) => {
     return getOriginalName(path, importedName)
   }
   if (binding.path.type === "VariableDeclarator") {
-    if (binding.path.node.init.type === "Identifier") {
-      const previousName = binding.path.node.init.name
+    const { init } = binding.path.node
+    if (init && init.type === "Identifier") {
+      const previousName = init.name
       return getOriginalName(path, previousName)
     }
   }

package/src/plugins/transpilation/as_js_classic/jsenv_plugin_as_js_classic.js

@@ -119,7 +119,15 @@ const asJsClassic = ({ systemJsInjection, systemJsClientFileUrl }) => {
 
 const generateJsClassicFilename = (url) => {
   const filename = urlToFilename(url)
-  const [basename, extension] = splitFileExtension(filename)
+  let [basename, extension] = splitFileExtension(filename)
+  const { searchParams } = new URL(url)
+  if (
+    searchParams.has("as_json_module") ||
+    searchParams.has("as_css_module") ||
+    searchParams.has("as_text_module")
+  ) {
+    extension = ".js"
+  }
   return `${basename}.es5${extension}`
 }
 

package/src/plugins/transpilation/import_assertions/jsenv_plugin_import_assertions.js

@@ -27,10 +27,10 @@ export const jsenvPluginImportAssertions = () => {
         end: reference.assertNode.end,
       })
     }
-
-    return injectQueryParams(reference.url, {
+    const newUrl = injectQueryParams(reference.url, {
       [searchParam]: "",
     })
+    return newUrl
   }
 
   const importAssertions = {