@jsenv/core 27.0.0-alpha.25 → 27.0.0-alpha.26

package/package.json

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

package/src/omega/url_graph/url_graph_report.js

@@ -22,7 +22,7 @@ const createUrlGraphReport = (urlGraph) => {
     html: 0,
     css: 0,
     js: 0,
-    assets: 0,
+    other: 0,
     sourcemaps: 0,
     total: 0,
   }
@@ -31,7 +31,7 @@ const createUrlGraphReport = (urlGraph) => {
     css: 0,
     js: 0,
     sourcemaps: 0,
-    assets: 0,
+    other: 0,
     total: 0,
   }
   Object.keys(urlInfos).forEach((url) => {
@@ -81,8 +81,8 @@ const createUrlGraphReport = (urlGraph) => {
       sizeGroups.js += urlContentSize
       return
     }
-    countGroups.assets++
-    sizeGroups.assets += urlContentSize
+    countGroups.other++
+    sizeGroups.other += urlContentSize
     return
   })
   return {
@@ -90,7 +90,7 @@ const createUrlGraphReport = (urlGraph) => {
     css: { count: countGroups.css, size: sizeGroups.css },
     js: { count: countGroups.js, size: sizeGroups.js },
     sourcemaps: { count: countGroups.sourcemaps, size: sizeGroups.sourcemaps },
-    assets: { count: countGroups.assets, size: sizeGroups.assets },
+    other: { count: countGroups.other, size: sizeGroups.other },
     total: { count: countGroups.total, size: sizeGroups.total },
   }
 }
@@ -108,10 +108,10 @@ const determineCategory = (urlInfo) => {
   if (urlInfo.type === "js_module" || urlInfo.type === "js_classic") {
     return "js"
   }
-  return "assets"
+  return "other"
 }
 
-const createRepartitionMessage = ({ html, css, js, assets }) => {
+const createRepartitionMessage = ({ html, css, js, other }) => {
   const parts = []
   if (html.count) {
     parts.push(
@@ -141,10 +141,10 @@ const createRepartitionMessage = ({ html, css, js, assets }) => {
   //     } (${byteAsFileSize(sourcemaps.size)})`,
   //   )
   // }
-  if (assets.count) {
+  if (other.count) {
     parts.push(
-      `${ANSI.color(`assets:`, ANSI.GREY)} ${assets.count} (${byteAsFileSize(
-        assets.size,
+      `${ANSI.color(`other:`, ANSI.GREY)} ${other.count} (${byteAsFileSize(
+        other.size,
       )})`,
     )
   }

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

@@ -49,13 +49,16 @@ const asJsClassic = ({ systemJsInjection, systemJsClientFileUrl }) => {
     appliesDuring: "*",
     // forward ?as_js_classic to referenced urls
     normalizeUrl: (reference, context) => {
-      if (reference.isInline) {
-        if (reference.contentType !== "text/javascript") {
-          // We want to propagate transformation of js module to js classic
-          // so we don't want to propagate when the reference is not js:
-          // - ignore "string" in `JSON.parse(string)` for instance
-          return null
-        }
+      // We want to propagate transformation of js module to js classic
+      // but only for import specifier (static/dynamic import + re-export)
+      // All other references won't get the ?as_js_classic
+      // otherwise we could try to transform inline ressources, specifiers inside new URL(). ...
+      if (
+        reference.type !== "js_import_export" &&
+        reference.subtype !== "system_register_arg" &&
+        reference.subtype !== "system_import_arg"
+      ) {
+        return null
       }
       const parentUrlInfo = context.urlGraph.getUrlInfo(reference.parentUrl)
       if (

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

@@ -25,6 +25,7 @@ export const jsenvPluginWorkersTypeModuleAsClassic = ({
           babelPluginMetadataWorkerMentions,
           {
             workersToTranspile,
+            isJsModule: urlInfo.type === "js_module",
           },
         ],
       ],
@@ -101,7 +102,10 @@ const getWorkersToTranspile = (urlInfo, context) => {
   return { worker, serviceWorker, sharedWorker }
 }
 
-const babelPluginMetadataWorkerMentions = (_, { workersToTranspile }) => {
+const babelPluginMetadataWorkerMentions = (
+  _,
+  { workersToTranspile, isJsModule },
+) => {
   return {
     name: "metadata-worker-mentions",
     visitor: {
@@ -110,7 +114,9 @@ const babelPluginMetadataWorkerMentions = (_, { workersToTranspile }) => {
         const visitors = {
           NewExpression: (path) => {
             if (workersToTranspile.worker || workersToTranspile.sharedWorker) {
-              const mentions = analyzeNewWorkerOrNewSharedWorker(path)
+              const mentions = analyzeNewWorkerOrNewSharedWorker(path, {
+                isJsModule,
+              })
               if (mentions) {
                 workerMentions.push(...mentions)
               }

package/src/plugins/url_references/js/js_urls.js

@@ -18,10 +18,7 @@ export const parseAndTransformJsUrls = async (urlInfo, context) => {
   const isWebWorker = isWebWorkerUrlInfo(urlInfo)
   const { metadata } = await applyBabelPlugins({
     babelPlugins: [
-      [
-        babelPluginMetadataJsUrlMentions,
-        { isJsModule, isWebWorker, searchSystemJs: !isJsModule },
-      ],
+      [babelPluginMetadataJsUrlMentions, { isJsModule, isWebWorker }],
     ],
     urlInfo,
   })
@@ -67,10 +64,7 @@ export const parseAndTransformJsUrls = async (urlInfo, context) => {
  * https://github.com/mjackson/babel-plugin-import-visitor
  *
  */
-const babelPluginMetadataJsUrlMentions = (
-  _,
-  { isJsModule, isWebWorker, searchSystemJs },
-) => {
+const babelPluginMetadataJsUrlMentions = (_, { isJsModule, isWebWorker }) => {
   return {
     name: "metadata-js-mentions",
     visitor: {
@@ -112,17 +106,16 @@ const babelPluginMetadataJsUrlMentions = (
           },
           NewExpression: (path) => {
             callStaticAnalyzers(path, [
-              analyzeNewWorkerOrNewSharedWorker,
-              analyzeNewUrlCall,
+              (path) => analyzeNewWorkerOrNewSharedWorker(path, { isJsModule }),
+              (path) => analyzeNewUrlCall(path, { isJsModule }),
             ])
           },
         }
         const callExpressionStaticAnalysers = [
-          ...(isJsModule ? [analyzeImportCall] : []),
+          ...(isJsModule
+            ? [analyzeImportCall]
+            : [analyzeSystemRegisterCall, analyzeSystemImportCall]),
           ...(isWebWorker ? [analyzeImportScriptCalls] : []),
-          ...(searchSystemJs
-            ? [analyzeSystemRegisterCall, analyzeSystemImportCall]
-            : []),
           analyzeServiceWorkerRegisterCall,
         ]
         visitors.CallExpression = (path) => {