@jsenv/core 27.0.0-alpha.46 → 27.0.0-alpha.49

package/dist/html_supervisor_setup.js.map

@@ -5,27 +5,24 @@
     "../src/plugins/html_supervisor/client/html_supervisor_setup.js"
   ],
   "sourcesContent": [
-    "window.__html_supervisor__ = {\n  // \"html_supervisor_installer.js\" will implement\n  // - \"addExecution\"\n  // - \"collectScriptResults\"\n  // - \"superviseScriptTypeModule\"\n  // and take all executions in \"executions\" and implement their supervision\n  executions: [],\n  addExecution: (execution) => {\n    window.__html_supervisor__.executions.push(execution)\n  },\n  collectScriptResults: () => {\n    throw new Error(\"htmlSupervisor not installed\")\n  },\n  superviseScriptTypeModule: () => {\n    throw new Error(\"htmlSupervisor not installed\")\n  },\n  superviseScript: ({ src, crossorigin, integrity }) => {\n    window.__html_supervisor__.addExecution({\n      type: \"js_classic\",\n      improveErrorWithFetch: true,\n      currentScript: document.currentScript,\n      src,\n      promise: new Promise((resolve, reject) => {\n        const script = document.createElement(\"script\")\n        if (crossorigin) {\n          script.crossorigin = crossorigin\n        }\n        if (integrity) {\n          script.integrity = integrity\n        }\n        script.src = src\n        const scriptUrl = new URL(src, window.location).href\n        let lastWindowErrorUrl\n        let lastWindowError\n        const windowErrorCallback = (e) => {\n          lastWindowErrorUrl = e.filename\n          lastWindowError = e.error\n        }\n        const cleanup = () => {\n          document.body.removeChild(script)\n          window.removeEventListener(\"error\", windowErrorCallback)\n        }\n        window.addEventListener(\"error\", windowErrorCallback)\n        script.addEventListener(\"error\", () => {\n          cleanup()\n          reject(src)\n        })\n        script.addEventListener(\"load\", () => {\n          cleanup()\n          if (lastWindowErrorUrl === scriptUrl) {\n            reject(lastWindowError)\n          } else {\n            resolve()\n          }\n        })\n        document.body.appendChild(script)\n      }),\n    })\n  },\n  getScriptExecutionResults: () => {\n    // wait for page to load before collecting script execution results\n    const htmlReadyPromise = new Promise((resolve) => {\n      if (document.readyState === \"complete\") {\n        resolve()\n        return\n      }\n      const loadCallback = () => {\n        window.removeEventListener(\"load\", loadCallback)\n        resolve()\n      }\n      window.addEventListener(\"load\", loadCallback)\n    })\n    return htmlReadyPromise.then(() => {\n      return window.__html_supervisor__.collectScriptResults()\n    })\n  },\n}\n"
+    "window.__html_supervisor__ = {\n  // \"html_supervisor_installer.js\" will implement\n  // - \"addScriptToExecute\"\n  // - \"superviseScriptTypeModule\"\n  // - \"collectScriptResults\"\n  // and take all executions in \"scriptsToExecute\" and implement their supervision\n  scriptsToExecute: [],\n  addScriptToExecute: (scriptToExecute) => {\n    window.__html_supervisor__.scriptsToExecute.push(scriptToExecute)\n  },\n  superviseScript: ({ src, isInline, crossorigin, integrity }) => {\n    window.__html_supervisor__.addScriptToExecute({\n      src,\n      type: \"js_classic\",\n      isInline,\n      currentScript: document.currentScript,\n      execute: () => {\n        return new Promise((resolve, reject) => {\n          const script = document.createElement(\"script\")\n          if (crossorigin) {\n            script.crossorigin = crossorigin\n          }\n          if (integrity) {\n            script.integrity = integrity\n          }\n          script.src = src\n          const scriptUrl = new URL(src, window.location).href\n          let lastWindowErrorUrl\n          let lastWindowError\n          const windowErrorCallback = (e) => {\n            lastWindowErrorUrl = e.filename\n            lastWindowError = e.error\n          }\n          const cleanup = () => {\n            document.body.removeChild(script)\n            window.removeEventListener(\"error\", windowErrorCallback)\n          }\n          window.addEventListener(\"error\", windowErrorCallback)\n          script.addEventListener(\"error\", () => {\n            cleanup()\n            reject(src)\n          })\n          script.addEventListener(\"load\", () => {\n            cleanup()\n            if (lastWindowErrorUrl === scriptUrl) {\n              reject(lastWindowError)\n            } else {\n              resolve()\n            }\n          })\n          document.body.appendChild(script)\n        })\n      },\n    })\n  },\n  superviseScriptTypeModule: () => {\n    throw new Error(\"htmlSupervisor not installed\")\n  },\n  getScriptExecutionResults: () => {\n    // wait for page to load before collecting script execution results\n    const htmlReadyPromise = new Promise((resolve) => {\n      if (document.readyState === \"complete\") {\n        resolve()\n        return\n      }\n      const loadCallback = () => {\n        window.removeEventListener(\"load\", loadCallback)\n        resolve()\n      }\n      window.addEventListener(\"load\", loadCallback)\n    })\n    return htmlReadyPromise.then(() => {\n      return window.__html_supervisor__.collectScriptResults()\n    })\n  },\n  collectScriptResults: () => {\n    throw new Error(\"htmlSupervisor not installed\")\n  },\n}\n"
   ],
   "names": [
     "window",
     "__html_supervisor__",
-    "executions",
-    "addExecution",
-    "execution",
+    "scriptsToExecute",
+    "addScriptToExecute",
+    "scriptToExecute",
     "push",
-    "collectScriptResults",
-    "Error",
-    "superviseScriptTypeModule",
     "superviseScript",
     "src",
+    "isInline",
     "crossorigin",
     "integrity",
     "type",
-    "improveErrorWithFetch",
     "currentScript",
     "document",
-    "promise",
+    "execute",
     "Promise",
     "resolve",
     "reject",
@@ -47,11 +44,14 @@
     "removeEventListener",
     "addEventListener",
     "appendChild",
+    "superviseScriptTypeModule",
+    "Error",
     "getScriptExecutionResults",
     "htmlReadyPromise",
     "readyState",
     "loadCallback",
-    "then"
+    "then",
+    "collectScriptResults"
   ],
-  "mappings": "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"
+  "mappings": "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"
 }

package/dist/import_meta_hot.js

@@ -0,0 +1,86 @@
+/*
+ * https://vitejs.dev/guide/api-hmr.html#hot-accept-deps-cb
+ * https://modern-web.dev/docs/dev-server/plugins/hmr/
+ */
+const urlHotMetas = {};
+const createImportMetaHot = importMetaUrl => {
+  const data = {};
+  const url = asUrlWithoutHmrQuery(importMetaUrl);
+  return {
+    data,
+    accept: (firstArg, secondArg) => {
+      if (!firstArg) {
+        addUrlMeta(url, {
+          dependencies: [url],
+          acceptCallback: () => {}
+        });
+        return;
+      }
+
+      if (typeof firstArg === "function") {
+        addUrlMeta(url, {
+          dependencies: [url],
+          acceptCallback: firstArg
+        });
+        return;
+      }
+
+      if (typeof firstArg === "string") {
+        addUrlMeta(url, {
+          dependencies: [firstArg],
+          acceptCallback: secondArg
+        });
+        return;
+      }
+
+      if (Array.isArray(firstArg)) {
+        addUrlMeta(url, {
+          dependencies: firstArg,
+          acceptCallback: secondArg
+        });
+        return;
+      }
+
+      throw new Error("invalid call to import.meta.hot.accept(), received ".concat(firstArg));
+    },
+    dispose: callback => {
+      addUrlMeta(url, {
+        disposeCallback: () => {
+          return callback(data);
+        }
+      });
+    },
+    decline: () => {
+      addUrlMeta(url, {
+        declined: true
+      });
+    },
+    invalidate: () => {
+      addUrlMeta(url, {
+        invalidated: true
+      });
+    }
+  };
+};
+
+const addUrlMeta = (url, meta) => {
+  urlHotMetas[url] = { ...urlHotMetas[url],
+    ...meta
+  };
+};
+
+const asUrlWithoutHmrQuery = url => {
+  const urlObject = new URL(url);
+
+  if (urlObject.searchParams.has("hmr")) {
+    urlObject.searchParams.delete("hmr");
+    urlObject.searchParams.delete("v");
+    return urlObject.href;
+  }
+
+  return url;
+};
+
+export { createImportMetaHot, urlHotMetas };
+
+//# sourceMappingURL=import_meta_hot.js.map

package/dist/import_meta_hot.js.map

@@ -0,0 +1,42 @@
+{
+  "version": 3,
+  "file": "import_meta_hot.js",
+  "sources": [
+    "../src/plugins/import_meta_hot/client/import_meta_hot.js"
+  ],
+  "sourcesContent": [
+    "/*\n * https://vitejs.dev/guide/api-hmr.html#hot-accept-deps-cb\n * https://modern-web.dev/docs/dev-server/plugins/hmr/\n */\n\nexport const urlHotMetas = {}\n\nexport const createImportMetaHot = (importMetaUrl) => {\n  const data = {}\n  const url = asUrlWithoutHmrQuery(importMetaUrl)\n\n  return {\n    data,\n    accept: (firstArg, secondArg) => {\n      if (!firstArg) {\n        addUrlMeta(url, {\n          dependencies: [url],\n          acceptCallback: () => {},\n        })\n        return\n      }\n      if (typeof firstArg === \"function\") {\n        addUrlMeta(url, {\n          dependencies: [url],\n          acceptCallback: firstArg,\n        })\n        return\n      }\n      if (typeof firstArg === \"string\") {\n        addUrlMeta(url, {\n          dependencies: [firstArg],\n          acceptCallback: secondArg,\n        })\n        return\n      }\n      if (Array.isArray(firstArg)) {\n        addUrlMeta(url, {\n          dependencies: firstArg,\n          acceptCallback: secondArg,\n        })\n        return\n      }\n      throw new Error(\n        `invalid call to import.meta.hot.accept(), received ${firstArg}`,\n      )\n    },\n    dispose: (callback) => {\n      addUrlMeta(url, {\n        disposeCallback: () => {\n          return callback(data)\n        },\n      })\n    },\n    decline: () => {\n      addUrlMeta(url, {\n        declined: true,\n      })\n    },\n    invalidate: () => {\n      addUrlMeta(url, {\n        invalidated: true,\n      })\n    },\n  }\n}\n\nconst addUrlMeta = (url, meta) => {\n  urlHotMetas[url] = {\n    ...urlHotMetas[url],\n    ...meta,\n  }\n}\n\nconst asUrlWithoutHmrQuery = (url) => {\n  const urlObject = new URL(url)\n  if (urlObject.searchParams.has(\"hmr\")) {\n    urlObject.searchParams.delete(\"hmr\")\n    urlObject.searchParams.delete(\"v\")\n    return urlObject.href\n  }\n  return url\n}\n"
+  ],
+  "names": [
+    "urlHotMetas",
+    "createImportMetaHot",
+    "importMetaUrl",
+    "data",
+    "url",
+    "asUrlWithoutHmrQuery",
+    "accept",
+    "firstArg",
+    "secondArg",
+    "addUrlMeta",
+    "dependencies",
+    "acceptCallback",
+    "Array",
+    "isArray",
+    "Error",
+    "dispose",
+    "callback",
+    "disposeCallback",
+    "decline",
+    "declined",
+    "invalidate",
+    "invalidated",
+    "meta",
+    "urlObject",
+    "URL",
+    "searchParams",
+    "has",
+    "delete",
+    "href"
+  ],
+  "mappings": "AAAA;AACA;AACA;AACA;AAEO,MAAMA,WAAW,GAAG,GAApB;AAEMC,MAAAA,mBAAmB,GAAIC,aAAD,IAAmB;EACpD,MAAMC,IAAI,GAAG,EAAb,CAAA;AACA,EAAA,MAAMC,GAAG,GAAGC,oBAAoB,CAACH,aAAD,CAAhC,CAAA;EAEA,OAAO;IACLC,IADK;AAELG,IAAAA,MAAM,EAAE,CAACC,QAAD,EAAWC,SAAX,KAAyB;MAC/B,IAAI,CAACD,QAAL,EAAe;QACbE,UAAU,CAACL,GAAD,EAAM;UACdM,YAAY,EAAE,CAACN,GAAD,CADA;UAEdO,cAAc,EAAE,MAAM,EAAE;AAFV,SAAN,CAAV,CAAA;AAIA,QAAA,OAAA;AACD,OAAA;;AACD,MAAA,IAAI,OAAOJ,QAAP,KAAoB,UAAxB,EAAoC;QAClCE,UAAU,CAACL,GAAD,EAAM;UACdM,YAAY,EAAE,CAACN,GAAD,CADA;AAEdO,UAAAA,cAAc,EAAEJ,QAAAA;AAFF,SAAN,CAAV,CAAA;AAIA,QAAA,OAAA;AACD,OAAA;;AACD,MAAA,IAAI,OAAOA,QAAP,KAAoB,QAAxB,EAAkC;QAChCE,UAAU,CAACL,GAAD,EAAM;UACdM,YAAY,EAAE,CAACH,QAAD,CADA;AAEdI,UAAAA,cAAc,EAAEH,SAAAA;AAFF,SAAN,CAAV,CAAA;AAIA,QAAA,OAAA;AACD,OAAA;;AACD,MAAA,IAAII,KAAK,CAACC,OAAN,CAAcN,QAAd,CAAJ,EAA6B;QAC3BE,UAAU,CAACL,GAAD,EAAM;AACdM,UAAAA,YAAY,EAAEH,QADA;AAEdI,UAAAA,cAAc,EAAEH,SAAAA;AAFF,SAAN,CAAV,CAAA;AAIA,QAAA,OAAA;AACD,OAAA;;AACD,MAAA,MAAM,IAAIM,KAAJ,CACkDP,qDAAAA,CAAAA,MAAAA,CAAAA,QADlD,CAAN,CAAA,CAAA;KA/BG;IAmCLQ,OAAO,EAAGC,QAAD,IAAc;MACrBP,UAAU,CAACL,GAAD,EAAM;AACda,QAAAA,eAAe,EAAE,MAAM;UACrB,OAAOD,QAAQ,CAACb,IAAD,CAAf,CAAA;AACD,SAAA;AAHa,OAAN,CAAV,CAAA;KApCG;AA0CLe,IAAAA,OAAO,EAAE,MAAM;MACbT,UAAU,CAACL,GAAD,EAAM;AACde,QAAAA,QAAQ,EAAE,IAAA;AADI,OAAN,CAAV,CAAA;KA3CG;AA+CLC,IAAAA,UAAU,EAAE,MAAM;MAChBX,UAAU,CAACL,GAAD,EAAM;AACdiB,QAAAA,WAAW,EAAE,IAAA;AADC,OAAN,CAAV,CAAA;AAGD,KAAA;GAnDH,CAAA;AAqDD,EAzDM;;AA2DP,MAAMZ,UAAU,GAAG,CAACL,GAAD,EAAMkB,IAAN,KAAe;EAChCtB,WAAW,CAACI,GAAD,CAAX,GAAmB,EACjB,GAAGJ,WAAW,CAACI,GAAD,CADG;IAEjB,GAAGkB,IAAAA;GAFL,CAAA;AAID,CALD,CAAA;;AAOA,MAAMjB,oBAAoB,GAAID,GAAD,IAAS;AACpC,EAAA,MAAMmB,SAAS,GAAG,IAAIC,GAAJ,CAAQpB,GAAR,CAAlB,CAAA;;EACA,IAAImB,SAAS,CAACE,YAAV,CAAuBC,GAAvB,CAA2B,KAA3B,CAAJ,EAAuC;AACrCH,IAAAA,SAAS,CAACE,YAAV,CAAuBE,MAAvB,CAA8B,KAA9B,CAAA,CAAA;AACAJ,IAAAA,SAAS,CAACE,YAAV,CAAuBE,MAAvB,CAA8B,GAA9B,CAAA,CAAA;IACA,OAAOJ,SAAS,CAACK,IAAjB,CAAA;AACD,GAAA;;AACD,EAAA,OAAOxB,GAAP,CAAA;AACD,CARD;;;;"
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/core",
-  "version": "27.0.0-alpha.46",
+  "version": "27.0.0-alpha.49",
   "description": "Tool to develop, test and build js projects",
   "license": "MIT",
   "repository": {
@@ -60,7 +60,7 @@
     "@financial-times/polyfill-useragent-normaliser": "2.0.1",
     "@jsenv/abort": "4.1.2",
     "@jsenv/babel-plugins": "1.0.2",
-    "@jsenv/filesystem": "3.2.1",
+    "@jsenv/filesystem": "3.2.2",
     "@jsenv/importmap": "1.2.0",
     "@jsenv/integrity": "0.0.1",
     "@jsenv/log": "1.5.2",

package/src/build/build.js

@@ -336,7 +336,7 @@ ${Object.keys(rawGraph.urlInfos).join("\n")}`,
     urlGraph: finalGraph,
     scenario: "build",
     sourcemaps,
-    sourcemapsRelativeSources: true,
+    sourcemapsRelativeSources: !versioning,
     runtimeCompat,
     plugins: [
       jsenvPluginUrlAnalysis(),
@@ -510,12 +510,25 @@ ${Object.keys(rawGraph.urlInfos).join("\n")}`,
           }
           // remove eventual search params and hash
           const urlUntilPathname = asUrlUntilPathname(reference.generatedUrl)
-          // if a file is in the same directory we could prefer the relative notation
-          // but to keep things simple let's keep the "absolutely relative" to baseUrl for now
-          const specifier = `${baseUrl}${urlToRelativeUrl(
-            urlUntilPathname,
-            buildDirectoryUrl,
-          )}`
+          let specifier
+          if (baseUrl === "./") {
+            const relativeUrl = urlToRelativeUrl(
+              urlUntilPathname,
+              reference.parentUrl === rootDirectoryUrl
+                ? buildDirectoryUrl
+                : reference.parentUrl,
+            )
+            // ensure "./" on relative url (otherwise it could be a "bare specifier")
+            specifier =
+              relativeUrl[0] === "." ? relativeUrl : `./${relativeUrl}`
+          } else {
+            // if a file is in the same directory we could prefer the relative notation
+            // but to keep things simple let's keep the "absolutely relative" to baseUrl for now
+            specifier = `${baseUrl}${urlToRelativeUrl(
+              urlUntilPathname,
+              buildDirectoryUrl,
+            )}`
+          }
           buildUrls[specifier] = reference.generatedUrl
           return specifier
         },
@@ -860,6 +873,7 @@ const applyUrlVersioning = async ({
       urlGraph: finalGraph,
       scenario: "build",
       sourcemaps,
+      sourcemapsRelativeSources: true,
       runtimeCompat,
       plugins: [
         jsenvPluginUrlAnalysis(),

package/src/dev/start_dev_server.js

@@ -38,7 +38,7 @@ export const startDevServer = async ({
   clientFiles = {
     "./**": true,
     "./**/.*/": false, // any folder starting with a dot is ignored (includes .git,.jsenv for instance)
-    "./dist/": false,
+    "./**/dist/": false,
     "./**/node_modules/": false,
   },
   cooldownBetweenFileEvents,

package/src/omega/kitchen.js

@@ -38,7 +38,7 @@ export const createKitchen = ({
     test: "inline",
     build: "none",
   }[scenario],
-  sourcemapsSources = {
+  sourcemapsSourcesContent = {
     // during dev/test, chrome is able to find the sourcemap sources
     // as long as they use file:// protocol in the sourcemap files
     dev: false,
@@ -227,7 +227,7 @@ export const createKitchen = ({
     logger,
     urlGraph,
     sourcemaps,
-    sourcemapsSources,
+    sourcemapsSourcesContent,
     sourcemapsRelativeSources,
     injectSourcemapPlaceholder: ({ urlInfo, specifier }) => {
       const sourcemapReference = createReference({
@@ -732,8 +732,8 @@ const applyReferenceEffectsOnUrlInfo = (reference, urlInfo, context) => {
       content: reference.isOriginalPosition
         ? parentUrlInfo.originalContent
         : parentUrlInfo.content,
-      line: reference.line,
-      column: reference.column,
+      line: reference.specifierLine,
+      column: reference.specifierColumn,
     }
     urlInfo.contentType = reference.contentType
     urlInfo.originalContent =

package/src/omega/server/file_service.js

@@ -61,6 +61,10 @@ export const createFileService = ({
       reference.parentUrl,
     )
     try {
+      // urlInfo objects are reused, they must be "reset" before cooking then again
+      if (!urlInfo.isInline && !urlInfo.type === "sourcemap") {
+        urlGraph.resetUrlInfo(urlInfo)
+      }
       await kitchen.cook({
         reference: referenceFromGraph || reference,
         urlInfo,

package/src/omega/url_graph/url_info_transformations.js

@@ -10,7 +10,7 @@ import {
 export const createUrlInfoTransformer = ({
   logger,
   sourcemaps,
-  sourcemapsSources,
+  sourcemapsSourcesContent,
   sourcemapsRelativeSources,
   urlGraph,
   injectSourcemapPlaceholder,
@@ -26,7 +26,7 @@ export const createUrlInfoTransformer = ({
       // for inline content (<script> insdide html)
       // chrome won't be able to fetch the file as it does not exists
       // so sourcemap must contain sources
-      sourcemapsSources ||
+      sourcemapsSourcesContent ||
       urlInfo.isInline ||
       (sourcemap.sources &&
         sourcemap.sources.some(
@@ -160,7 +160,10 @@ export const createUrlInfoTransformer = ({
         urlInfo.content = SOURCEMAP.writeComment({
           contentType: urlInfo.contentType,
           content: urlInfo.content,
-          specifier: sourcemapReference.generatedSpecifier,
+          specifier:
+            sourcemaps === "file" && sourcemapsRelativeSources
+              ? urlToRelativeUrl(sourcemapReference.url, urlInfo.url)
+              : sourcemapReference.generatedSpecifier,
         })
       }
     }

package/src/omega/url_graph.js

@@ -15,6 +15,16 @@ export const createUrlGraph = ({
       }
     }
   }
+  const resetUrlInfo = (urlInfo) => {
+    urlInfo.sourcemap = null
+    urlInfo.sourcemapReference = null
+    urlInfo.content = null
+    urlInfo.originalContent = null
+    urlInfo.type = null
+    urlInfo.subtype = null
+    urlInfo.data = {}
+    urlInfo.timing = {}
+  }
 
   const reuseOrCreateUrlInfo = (url) => {
     const existingUrlInfo = urlInfos[url]
@@ -150,6 +160,7 @@ export const createUrlGraph = ({
     reuseOrCreateUrlInfo,
     getUrlInfo,
     deleteUrlInfo,
+    resetUrlInfo,
     inferReference,
     findDependent,
     updateReferences,

package/src/plugins/bundling/js_module/bundle_js_module.js

@@ -1,11 +1,19 @@
-import { isFileSystemPath } from "@jsenv/filesystem"
+import {
+  isFileSystemPath,
+  normalizeStructuredMetaMap,
+  urlToMeta,
+} from "@jsenv/filesystem"
 import { createDetailedMessage } from "@jsenv/logger"
 
 import { applyRollupPlugins } from "@jsenv/utils/js_ast/apply_rollup_plugins.js"
 import { sourcemapConverter } from "@jsenv/utils/sourcemap/sourcemap_converter.js"
 import { fileUrlConverter } from "@jsenv/core/src/omega/file_url_converter.js"
 
-export const bundleJsModule = async ({ jsModuleUrlInfos, context }) => {
+export const bundleJsModule = async ({
+  jsModuleUrlInfos,
+  context,
+  options,
+}) => {
   const {
     signal,
     logger,
@@ -25,6 +33,7 @@ export const bundleJsModule = async ({ jsModuleUrlInfos, context }) => {
 
     runtimeCompat,
     sourcemaps,
+    options,
   })
   return jsModuleBundleUrlInfos
 }
@@ -39,6 +48,7 @@ export const buildWithRollup = async ({
 
   runtimeCompat,
   sourcemaps,
+  options,
 }) => {
   const resultRef = { current: null }
   try {
@@ -54,6 +64,7 @@ export const buildWithRollup = async ({
 
           runtimeCompat,
           sourcemaps,
+          options,
           resultRef,
         }),
       ],
@@ -86,6 +97,7 @@ const rollupPluginJsenv = ({
   urlGraph,
   jsModuleUrlInfos,
   sourcemaps,
+  options,
 
   resultRef,
 }) => {
@@ -98,6 +110,21 @@ const rollupPluginJsenv = ({
       ...chunk,
     })
   }
+  let importCanBeBundled = () => true
+  if (options.include) {
+    const bundleIncludeConfig = normalizeStructuredMetaMap(
+      {
+        bundle: options.include,
+      },
+      rootDirectoryUrl,
+    )
+    importCanBeBundled = (url) => {
+      return urlToMeta({
+        url,
+        structuredMetaMap: bundleIncludeConfig,
+      }).bundle
+    }
+  }
   const urlImporters = {}
 
   return {
@@ -207,6 +234,9 @@ const rollupPluginJsenv = ({
       if (!url.startsWith("file:")) {
         return { id: url, external: true }
       }
+      if (!importCanBeBundled(url)) {
+        return { id: url, external: true }
+      }
       const filePath = fileUrlConverter.asFilePath(url)
       return filePath
     },

package/src/plugins/bundling/jsenv_plugin_bundling.js

@@ -23,28 +23,31 @@ export const jsenvPluginBundling = (bundling) => {
     },
     bundle: {
       css: bundling.css
-        ? (cssUrlInfos, context) =>
-            bundleCss({
+        ? (cssUrlInfos, context) => {
+            return bundleCss({
               cssUrlInfos,
               context,
               options: bundling.css,
             })
+          }
         : undefined,
       js_classic: bundling.js_classic
-        ? (jsClassicUrlInfos, context) =>
-            bundleJsClassicWorkers({
+        ? (jsClassicUrlInfos, context) => {
+            return bundleJsClassicWorkers({
               jsClassicUrlInfos,
               context,
               options: bundling.js_classic_workers,
             })
+          }
         : undefined,
       js_module: bundling.js_module
-        ? (jsModuleUrlInfos, context) =>
-            bundleJsModule({
+        ? (jsModuleUrlInfos, context) => {
+            return bundleJsModule({
               jsModuleUrlInfos,
               context,
               options: bundling.js_module,
             })
+          }
         : undefined,
     },
   }