@jsenv/core 29.1.7 → 29.1.8

package/dist/main.js

@@ -2540,16 +2540,16 @@ const writeFileSync = (destination, content = "") => {
   }
 };
 
-const LOG_LEVEL_OFF$1 = "off";
-const LOG_LEVEL_DEBUG$1 = "debug";
-const LOG_LEVEL_INFO$1 = "info";
-const LOG_LEVEL_WARN$1 = "warn";
-const LOG_LEVEL_ERROR$1 = "error";
-
-const createLogger$1 = ({
-  logLevel = LOG_LEVEL_INFO$1
+const LOG_LEVEL_OFF = "off";
+const LOG_LEVEL_DEBUG = "debug";
+const LOG_LEVEL_INFO = "info";
+const LOG_LEVEL_WARN = "warn";
+const LOG_LEVEL_ERROR = "error";
+
+const createLogger = ({
+  logLevel = LOG_LEVEL_INFO
 } = {}) => {
-  if (logLevel === LOG_LEVEL_DEBUG$1) {
+  if (logLevel === LOG_LEVEL_DEBUG) {
     return {
       level: "debug",
       levels: {
@@ -2558,14 +2558,14 @@ const createLogger$1 = ({
         warn: true,
         error: true
       },
-      debug: debug$1,
-      info: info$1,
-      warn: warn$1,
-      error: error$1
+      debug,
+      info,
+      warn,
+      error
     };
   }
 
-  if (logLevel === LOG_LEVEL_INFO$1) {
+  if (logLevel === LOG_LEVEL_INFO) {
     return {
       level: "info",
       levels: {
@@ -2574,14 +2574,14 @@ const createLogger$1 = ({
         warn: true,
         error: true
       },
-      debug: debugDisabled$1,
-      info: info$1,
-      warn: warn$1,
-      error: error$1
+      debug: debugDisabled,
+      info,
+      warn,
+      error
     };
   }
 
-  if (logLevel === LOG_LEVEL_WARN$1) {
+  if (logLevel === LOG_LEVEL_WARN) {
     return {
       level: "warn",
       levels: {
@@ -2590,14 +2590,14 @@ const createLogger$1 = ({
         warn: true,
         error: true
       },
-      debug: debugDisabled$1,
-      info: infoDisabled$1,
-      warn: warn$1,
-      error: error$1
+      debug: debugDisabled,
+      info: infoDisabled,
+      warn,
+      error
     };
   }
 
-  if (logLevel === LOG_LEVEL_ERROR$1) {
+  if (logLevel === LOG_LEVEL_ERROR) {
     return {
       level: "error",
       levels: {
@@ -2606,14 +2606,14 @@ const createLogger$1 = ({
         warn: false,
         error: true
       },
-      debug: debugDisabled$1,
-      info: infoDisabled$1,
-      warn: warnDisabled$1,
-      error: error$1
+      debug: debugDisabled,
+      info: infoDisabled,
+      warn: warnDisabled,
+      error
     };
   }
 
-  if (logLevel === LOG_LEVEL_OFF$1) {
+  if (logLevel === LOG_LEVEL_OFF) {
     return {
       level: "off",
       levels: {
@@ -2622,10 +2622,10 @@ const createLogger$1 = ({
         warn: false,
         error: false
       },
-      debug: debugDisabled$1,
-      info: infoDisabled$1,
-      warn: warnDisabled$1,
-      error: errorDisabled$1
+      debug: debugDisabled,
+      info: infoDisabled,
+      warn: warnDisabled,
+      error: errorDisabled
     };
   }
 
@@ -2633,30 +2633,30 @@ const createLogger$1 = ({
 --- logLevel ---
 ${logLevel}
 --- allowed log levels ---
-${LOG_LEVEL_OFF$1}
-${LOG_LEVEL_ERROR$1}
-${LOG_LEVEL_WARN$1}
-${LOG_LEVEL_INFO$1}
-${LOG_LEVEL_DEBUG$1}`);
+${LOG_LEVEL_OFF}
+${LOG_LEVEL_ERROR}
+${LOG_LEVEL_WARN}
+${LOG_LEVEL_INFO}
+${LOG_LEVEL_DEBUG}`);
 };
 
-const debug$1 = (...args) => console.debug(...args);
+const debug = (...args) => console.debug(...args);
 
-const debugDisabled$1 = () => {};
+const debugDisabled = () => {};
 
-const info$1 = (...args) => console.info(...args);
+const info = (...args) => console.info(...args);
 
-const infoDisabled$1 = () => {};
+const infoDisabled = () => {};
 
-const warn$1 = (...args) => console.warn(...args);
+const warn = (...args) => console.warn(...args);
 
-const warnDisabled$1 = () => {};
+const warnDisabled = () => {};
 
-const error$1 = (...args) => console.error(...args);
+const error = (...args) => console.error(...args);
 
-const errorDisabled$1 = () => {};
+const errorDisabled = () => {};
 
-function hasFlag$1(flag, argv = process$1.argv) {
+function hasFlag(flag, argv = process$1.argv) {
   const prefix = flag.startsWith('-') ? '' : flag.length === 1 ? '-' : '--';
   const position = argv.indexOf(prefix + flag);
   const terminatorPosition = argv.indexOf('--');
@@ -2664,31 +2664,31 @@ function hasFlag$1(flag, argv = process$1.argv) {
 }
 
 const {
-  env: env$1
+  env
 } = process$1;
-let flagForceColor$1;
+let flagForceColor;
 
-if (hasFlag$1('no-color') || hasFlag$1('no-colors') || hasFlag$1('color=false') || hasFlag$1('color=never')) {
-  flagForceColor$1 = 0;
-} else if (hasFlag$1('color') || hasFlag$1('colors') || hasFlag$1('color=true') || hasFlag$1('color=always')) {
-  flagForceColor$1 = 1;
+if (hasFlag('no-color') || hasFlag('no-colors') || hasFlag('color=false') || hasFlag('color=never')) {
+  flagForceColor = 0;
+} else if (hasFlag('color') || hasFlag('colors') || hasFlag('color=true') || hasFlag('color=always')) {
+  flagForceColor = 1;
 }
 
-function envForceColor$1() {
-  if ('FORCE_COLOR' in env$1) {
-    if (env$1.FORCE_COLOR === 'true') {
+function envForceColor() {
+  if ('FORCE_COLOR' in env) {
+    if (env.FORCE_COLOR === 'true') {
       return 1;
     }
 
-    if (env$1.FORCE_COLOR === 'false') {
+    if (env.FORCE_COLOR === 'false') {
       return 0;
     }
 
-    return env$1.FORCE_COLOR.length === 0 ? 1 : Math.min(Number.parseInt(env$1.FORCE_COLOR, 10), 3);
+    return env.FORCE_COLOR.length === 0 ? 1 : Math.min(Number.parseInt(env.FORCE_COLOR, 10), 3);
   }
 }
 
-function translateLevel$1(level) {
+function translateLevel(level) {
   if (level === 0) {
     return false;
   }
@@ -2701,28 +2701,28 @@ function translateLevel$1(level) {
   };
 }
 
-function _supportsColor$1(haveStream, {
+function _supportsColor(haveStream, {
   streamIsTTY,
   sniffFlags = true
 } = {}) {
-  const noFlagForceColor = envForceColor$1();
+  const noFlagForceColor = envForceColor();
 
   if (noFlagForceColor !== undefined) {
-    flagForceColor$1 = noFlagForceColor;
+    flagForceColor = noFlagForceColor;
   }
 
-  const forceColor = sniffFlags ? flagForceColor$1 : noFlagForceColor;
+  const forceColor = sniffFlags ? flagForceColor : noFlagForceColor;
 
   if (forceColor === 0) {
     return 0;
   }
 
   if (sniffFlags) {
-    if (hasFlag$1('color=16m') || hasFlag$1('color=full') || hasFlag$1('color=truecolor')) {
+    if (hasFlag('color=16m') || hasFlag('color=full') || hasFlag('color=truecolor')) {
       return 3;
     }
 
-    if (hasFlag$1('color=256')) {
+    if (hasFlag('color=256')) {
       return 2;
     }
   }
@@ -2733,7 +2733,7 @@ function _supportsColor$1(haveStream, {
 
   const min = forceColor || 0;
 
-  if (env$1.TERM === 'dumb') {
+  if (env.TERM === 'dumb') {
     return min;
   }
 
@@ -2749,31 +2749,31 @@ function _supportsColor$1(haveStream, {
     return 1;
   }
 
-  if ('CI' in env$1) {
-    if (['TRAVIS', 'CIRCLECI', 'APPVEYOR', 'GITLAB_CI', 'GITHUB_ACTIONS', 'BUILDKITE', 'DRONE'].some(sign => sign in env$1) || env$1.CI_NAME === 'codeship') {
+  if ('CI' in env) {
+    if (['TRAVIS', 'CIRCLECI', 'APPVEYOR', 'GITLAB_CI', 'GITHUB_ACTIONS', 'BUILDKITE', 'DRONE'].some(sign => sign in env) || env.CI_NAME === 'codeship') {
       return 1;
     }
 
     return min;
   }
 
-  if ('TEAMCITY_VERSION' in env$1) {
-    return /^(9\.(0*[1-9]\d*)\.|\d{2,}\.)/.test(env$1.TEAMCITY_VERSION) ? 1 : 0;
+  if ('TEAMCITY_VERSION' in env) {
+    return /^(9\.(0*[1-9]\d*)\.|\d{2,}\.)/.test(env.TEAMCITY_VERSION) ? 1 : 0;
   } // Check for Azure DevOps pipelines
 
 
-  if ('TF_BUILD' in env$1 && 'AGENT_NAME' in env$1) {
+  if ('TF_BUILD' in env && 'AGENT_NAME' in env) {
     return 1;
   }
 
-  if (env$1.COLORTERM === 'truecolor') {
+  if (env.COLORTERM === 'truecolor') {
     return 3;
   }
 
-  if ('TERM_PROGRAM' in env$1) {
-    const version = Number.parseInt((env$1.TERM_PROGRAM_VERSION || '').split('.')[0], 10);
+  if ('TERM_PROGRAM' in env) {
+    const version = Number.parseInt((env.TERM_PROGRAM_VERSION || '').split('.')[0], 10);
 
-    switch (env$1.TERM_PROGRAM) {
+    switch (env.TERM_PROGRAM) {
       case 'iTerm.app':
         return version >= 3 ? 3 : 2;
 
@@ -2783,39 +2783,39 @@ function _supportsColor$1(haveStream, {
     }
   }
 
-  if (/-256(color)?$/i.test(env$1.TERM)) {
+  if (/-256(color)?$/i.test(env.TERM)) {
     return 2;
   }
 
-  if (/^screen|^xterm|^vt100|^vt220|^rxvt|color|ansi|cygwin|linux/i.test(env$1.TERM)) {
+  if (/^screen|^xterm|^vt100|^vt220|^rxvt|color|ansi|cygwin|linux/i.test(env.TERM)) {
     return 1;
   }
 
-  if ('COLORTERM' in env$1) {
+  if ('COLORTERM' in env) {
     return 1;
   }
 
   return min;
 }
 
-function createSupportsColor$1(stream, options = {}) {
-  const level = _supportsColor$1(stream, {
+function createSupportsColor(stream, options = {}) {
+  const level = _supportsColor(stream, {
     streamIsTTY: stream && stream.isTTY,
     ...options
   });
 
-  return translateLevel$1(level);
+  return translateLevel(level);
 }
 ({
-  stdout: createSupportsColor$1({
+  stdout: createSupportsColor({
     isTTY: tty.isatty(1)
   }),
-  stderr: createSupportsColor$1({
+  stderr: createSupportsColor({
     isTTY: tty.isatty(2)
   })
 });
 
-const processSupportsBasicColor = createSupportsColor$1(process.stdout).hasBasic;
+const processSupportsBasicColor = createSupportsColor(process.stdout).hasBasic;
 let canUseColors = processSupportsBasicColor; // GitHub workflow does support ANSI but "supports-color" returns false
 // because stream.isTTY returns false, see https://github.com/actions/runner/issues/241
 
@@ -2849,7 +2849,7 @@ const ANSI = {
   color: setANSIColor
 };
 
-function isUnicodeSupported$1() {
+function isUnicodeSupported() {
   if (process$1.platform !== 'win32') {
     return process$1.env.TERM !== 'linux'; // Linux console (kernel)
   }
@@ -2861,7 +2861,7 @@ function isUnicodeSupported$1() {
 }
 
 // see also https://github.com/sindresorhus/figures
-const canUseUnicode = isUnicodeSupported$1();
+const canUseUnicode = isUnicodeSupported();
 const COMMAND_RAW = canUseUnicode ? `❯` : `>`;
 const OK_RAW = canUseUnicode ? `✔` : `√`;
 const FAILURE_RAW = canUseUnicode ? `✖` : `×`;
@@ -2895,7 +2895,7 @@ const UNICODE = {
   supported: canUseUnicode
 };
 
-const createDetailedMessage$2 = (message, details = {}) => {
+const createDetailedMessage$1 = (message, details = {}) => {
   let string = `${message}`;
   Object.keys(details).forEach(key => {
     const value = details[key];
@@ -3194,26 +3194,26 @@ const distributePercentages = (namedNumbers, {
   return percentages;
 };
 
-const ESC$1 = '\u001B[';
-const OSC$1 = '\u001B]';
-const BEL$1 = '\u0007';
-const SEP$1 = ';';
-const isTerminalApp$1 = process$1.env.TERM_PROGRAM === 'Apple_Terminal';
-const ansiEscapes$1 = {};
+const ESC = '\u001B[';
+const OSC = '\u001B]';
+const BEL = '\u0007';
+const SEP = ';';
+const isTerminalApp = process$1.env.TERM_PROGRAM === 'Apple_Terminal';
+const ansiEscapes = {};
 
-ansiEscapes$1.cursorTo = (x, y) => {
+ansiEscapes.cursorTo = (x, y) => {
   if (typeof x !== 'number') {
     throw new TypeError('The `x` argument is required');
   }
 
   if (typeof y !== 'number') {
-    return ESC$1 + (x + 1) + 'G';
+    return ESC + (x + 1) + 'G';
   }
 
-  return ESC$1 + (y + 1) + SEP$1 + (x + 1) + 'H';
+  return ESC + (y + 1) + SEP + (x + 1) + 'H';
 };
 
-ansiEscapes$1.cursorMove = (x, y) => {
+ansiEscapes.cursorMove = (x, y) => {
   if (typeof x !== 'number') {
     throw new TypeError('The `x` argument is required');
   }
@@ -3221,71 +3221,71 @@ ansiEscapes$1.cursorMove = (x, y) => {
   let returnValue = '';
 
   if (x < 0) {
-    returnValue += ESC$1 + -x + 'D';
+    returnValue += ESC + -x + 'D';
   } else if (x > 0) {
-    returnValue += ESC$1 + x + 'C';
+    returnValue += ESC + x + 'C';
   }
 
   if (y < 0) {
-    returnValue += ESC$1 + -y + 'A';
+    returnValue += ESC + -y + 'A';
   } else if (y > 0) {
-    returnValue += ESC$1 + y + 'B';
+    returnValue += ESC + y + 'B';
   }
 
   return returnValue;
 };
 
-ansiEscapes$1.cursorUp = (count = 1) => ESC$1 + count + 'A';
+ansiEscapes.cursorUp = (count = 1) => ESC + count + 'A';
 
-ansiEscapes$1.cursorDown = (count = 1) => ESC$1 + count + 'B';
+ansiEscapes.cursorDown = (count = 1) => ESC + count + 'B';
 
-ansiEscapes$1.cursorForward = (count = 1) => ESC$1 + count + 'C';
+ansiEscapes.cursorForward = (count = 1) => ESC + count + 'C';
 
-ansiEscapes$1.cursorBackward = (count = 1) => ESC$1 + count + 'D';
+ansiEscapes.cursorBackward = (count = 1) => ESC + count + 'D';
 
-ansiEscapes$1.cursorLeft = ESC$1 + 'G';
-ansiEscapes$1.cursorSavePosition = isTerminalApp$1 ? '\u001B7' : ESC$1 + 's';
-ansiEscapes$1.cursorRestorePosition = isTerminalApp$1 ? '\u001B8' : ESC$1 + 'u';
-ansiEscapes$1.cursorGetPosition = ESC$1 + '6n';
-ansiEscapes$1.cursorNextLine = ESC$1 + 'E';
-ansiEscapes$1.cursorPrevLine = ESC$1 + 'F';
-ansiEscapes$1.cursorHide = ESC$1 + '?25l';
-ansiEscapes$1.cursorShow = ESC$1 + '?25h';
+ansiEscapes.cursorLeft = ESC + 'G';
+ansiEscapes.cursorSavePosition = isTerminalApp ? '\u001B7' : ESC + 's';
+ansiEscapes.cursorRestorePosition = isTerminalApp ? '\u001B8' : ESC + 'u';
+ansiEscapes.cursorGetPosition = ESC + '6n';
+ansiEscapes.cursorNextLine = ESC + 'E';
+ansiEscapes.cursorPrevLine = ESC + 'F';
+ansiEscapes.cursorHide = ESC + '?25l';
+ansiEscapes.cursorShow = ESC + '?25h';
 
-ansiEscapes$1.eraseLines = count => {
+ansiEscapes.eraseLines = count => {
   let clear = '';
 
   for (let i = 0; i < count; i++) {
-    clear += ansiEscapes$1.eraseLine + (i < count - 1 ? ansiEscapes$1.cursorUp() : '');
+    clear += ansiEscapes.eraseLine + (i < count - 1 ? ansiEscapes.cursorUp() : '');
   }
 
   if (count) {
-    clear += ansiEscapes$1.cursorLeft;
+    clear += ansiEscapes.cursorLeft;
   }
 
   return clear;
 };
 
-ansiEscapes$1.eraseEndLine = ESC$1 + 'K';
-ansiEscapes$1.eraseStartLine = ESC$1 + '1K';
-ansiEscapes$1.eraseLine = ESC$1 + '2K';
-ansiEscapes$1.eraseDown = ESC$1 + 'J';
-ansiEscapes$1.eraseUp = ESC$1 + '1J';
-ansiEscapes$1.eraseScreen = ESC$1 + '2J';
-ansiEscapes$1.scrollUp = ESC$1 + 'S';
-ansiEscapes$1.scrollDown = ESC$1 + 'T';
-ansiEscapes$1.clearScreen = '\u001Bc';
-ansiEscapes$1.clearTerminal = process$1.platform === 'win32' ? `${ansiEscapes$1.eraseScreen}${ESC$1}0f` // 1. Erases the screen (Only done in case `2` is not supported)
+ansiEscapes.eraseEndLine = ESC + 'K';
+ansiEscapes.eraseStartLine = ESC + '1K';
+ansiEscapes.eraseLine = ESC + '2K';
+ansiEscapes.eraseDown = ESC + 'J';
+ansiEscapes.eraseUp = ESC + '1J';
+ansiEscapes.eraseScreen = ESC + '2J';
+ansiEscapes.scrollUp = ESC + 'S';
+ansiEscapes.scrollDown = ESC + 'T';
+ansiEscapes.clearScreen = '\u001Bc';
+ansiEscapes.clearTerminal = process$1.platform === 'win32' ? `${ansiEscapes.eraseScreen}${ESC}0f` // 1. Erases the screen (Only done in case `2` is not supported)
 // 2. Erases the whole screen including scrollback buffer
 // 3. Moves cursor to the top-left position
 // More info: https://www.real-world-systems.com/docs/ANSIcode.html
-: `${ansiEscapes$1.eraseScreen}${ESC$1}3J${ESC$1}H`;
-ansiEscapes$1.beep = BEL$1;
+: `${ansiEscapes.eraseScreen}${ESC}3J${ESC}H`;
+ansiEscapes.beep = BEL;
 
-ansiEscapes$1.link = (text, url) => [OSC$1, '8', SEP$1, SEP$1, url, BEL$1, text, OSC$1, '8', SEP$1, SEP$1, BEL$1].join('');
+ansiEscapes.link = (text, url) => [OSC, '8', SEP, SEP, url, BEL, text, OSC, '8', SEP, SEP, BEL].join('');
 
-ansiEscapes$1.image = (buffer, options = {}) => {
-  let returnValue = `${OSC$1}1337;File=inline=1`;
+ansiEscapes.image = (buffer, options = {}) => {
+  let returnValue = `${OSC}1337;File=inline=1`;
 
   if (options.width) {
     returnValue += `;width=${options.width}`;
@@ -3299,14 +3299,14 @@ ansiEscapes$1.image = (buffer, options = {}) => {
     returnValue += ';preserveAspectRatio=0';
   }
 
-  return returnValue + ':' + buffer.toString('base64') + BEL$1;
+  return returnValue + ':' + buffer.toString('base64') + BEL;
 };
 
-ansiEscapes$1.iTerm = {
-  setCwd: (cwd = process$1.cwd()) => `${OSC$1}50;CurrentDir=${cwd}${BEL$1}`,
+ansiEscapes.iTerm = {
+  setCwd: (cwd = process$1.cwd()) => `${OSC}50;CurrentDir=${cwd}${BEL}`,
 
   annotation(message, options = {}) {
-    let returnValue = `${OSC$1}1337;`;
+    let returnValue = `${OSC}1337;`;
     const hasX = typeof options.x !== 'undefined';
     const hasY = typeof options.y !== 'undefined';
 
@@ -3323,7 +3323,7 @@ ansiEscapes$1.iTerm = {
       returnValue += message;
     }
 
-    return returnValue + BEL$1;
+    return returnValue + BEL;
   }
 
 };
@@ -3409,7 +3409,7 @@ const createLog = ({
     }
 
     clearAttemptResult = true;
-    return ansiEscapes$1.eraseLines(visualLineCount);
+    return ansiEscapes.eraseLines(visualLineCount);
   };
 
   const spyStream = () => {
@@ -3477,586 +3477,144 @@ const createLog = ({
   return log;
 };
 
-const noopStreamSpy = () => ""; // could be inlined but vscode do not correctly
-// expand/collapse template strings, so I put it at the bottom
-
-
-const addNewLines = (string, newLine) => {
-  if (newLine === "before") {
-    return `
-${string}`;
-  }
-
-  if (newLine === "after") {
-    return `${string}
-`;
-  }
-
-  if (newLine === "around") {
-    return `
-${string}
-`;
-  }
-
-  return string;
-};
-
-const startSpinner = ({
-  log,
-  frames = ["⠋", "⠙", "⠹", "⠸", "⠼", "⠴", "⠦", "⠧", "⠇", "⠏"],
-  fps = 20,
-  keepProcessAlive = false,
-  stopOnWriteFromOutside = true,
-  stopOnVerticalOverflow = true,
-  render = () => "",
-  effect = () => {}
-}) => {
-  let frameIndex = 0;
-  let interval;
-  let running = true;
-  const spinner = {
-    message: undefined
-  };
-
-  const update = message => {
-    spinner.message = running ? `${frames[frameIndex]} ${message}` : message;
-    return spinner.message;
-  };
-
-  spinner.update = update;
-  let cleanup;
-
-  if (ANSI.supported) {
-    running = true;
-    cleanup = effect();
-    log.write(update(render()));
-    interval = setInterval(() => {
-      frameIndex = frameIndex === frames.length - 1 ? 0 : frameIndex + 1;
-      log.dynamicWrite(({
-        outputFromOutside
-      }) => {
-        if (outputFromOutside && stopOnWriteFromOutside) {
-          stop();
-          return "";
-        }
-
-        return update(render());
-      });
-    }, 1000 / fps);
-
-    if (!keepProcessAlive) {
-      interval.unref();
-    }
-  } else {
-    log.write(update(render()));
-  }
-
-  const stop = message => {
-    running = false;
-
-    if (interval) {
-      clearInterval(interval);
-      interval = null;
-    }
-
-    if (cleanup) {
-      cleanup();
-      cleanup = null;
-    }
-
-    if (log && message) {
-      log.write(update(message));
-      log = null;
-    }
-  };
-
-  spinner.stop = stop;
-
-  if (stopOnVerticalOverflow) {
-    log.onVerticalOverflow = stop;
-  }
-
-  return spinner;
-};
-
-const createTaskLog = (label, {
-  disabled = false,
-  stopOnWriteFromOutside
-} = {}) => {
-  if (disabled) {
-    return {
-      setRightText: () => {},
-      done: () => {},
-      happen: () => {},
-      fail: () => {}
-    };
-  }
-
-  const startMs = Date.now();
-  const log = createLog();
-  let message = label;
-  const taskSpinner = startSpinner({
-    log,
-    render: () => message,
-    stopOnWriteFromOutside
-  });
-  return {
-    setRightText: value => {
-      message = `${label} ${value}`;
-    },
-    done: () => {
-      const msEllapsed = Date.now() - startMs;
-      taskSpinner.stop(`${UNICODE.OK} ${label} (done in ${msAsDuration(msEllapsed)})`);
-    },
-    happen: message => {
-      taskSpinner.stop(`${UNICODE.INFO} ${message} (at ${new Date().toLocaleTimeString()})`);
-    },
-    fail: (message = `failed to ${label}`) => {
-      taskSpinner.stop(`${UNICODE.FAILURE} ${message}`);
-    }
-  };
-};
-
-const LOG_LEVEL_OFF = "off";
-const LOG_LEVEL_DEBUG = "debug";
-const LOG_LEVEL_INFO = "info";
-const LOG_LEVEL_WARN = "warn";
-const LOG_LEVEL_ERROR = "error";
-
-const createLogger = ({
-  logLevel = LOG_LEVEL_INFO
-} = {}) => {
-  if (logLevel === LOG_LEVEL_DEBUG) {
-    return {
-      level: "debug",
-      levels: {
-        debug: true,
-        info: true,
-        warn: true,
-        error: true
-      },
-      debug,
-      info,
-      warn,
-      error
-    };
-  }
-
-  if (logLevel === LOG_LEVEL_INFO) {
-    return {
-      level: "info",
-      levels: {
-        debug: false,
-        info: true,
-        warn: true,
-        error: true
-      },
-      debug: debugDisabled,
-      info,
-      warn,
-      error
-    };
-  }
-
-  if (logLevel === LOG_LEVEL_WARN) {
-    return {
-      level: "warn",
-      levels: {
-        debug: false,
-        info: false,
-        warn: true,
-        error: true
-      },
-      debug: debugDisabled,
-      info: infoDisabled,
-      warn,
-      error
-    };
-  }
-
-  if (logLevel === LOG_LEVEL_ERROR) {
-    return {
-      level: "error",
-      levels: {
-        debug: false,
-        info: false,
-        warn: false,
-        error: true
-      },
-      debug: debugDisabled,
-      info: infoDisabled,
-      warn: warnDisabled,
-      error
-    };
-  }
-
-  if (logLevel === LOG_LEVEL_OFF) {
-    return {
-      level: "off",
-      levels: {
-        debug: false,
-        info: false,
-        warn: false,
-        error: false
-      },
-      debug: debugDisabled,
-      info: infoDisabled,
-      warn: warnDisabled,
-      error: errorDisabled
-    };
-  }
-
-  throw new Error(`unexpected logLevel.
---- logLevel ---
-${logLevel}
---- allowed log levels ---
-${LOG_LEVEL_OFF}
-${LOG_LEVEL_ERROR}
-${LOG_LEVEL_WARN}
-${LOG_LEVEL_INFO}
-${LOG_LEVEL_DEBUG}`);
-};
-
-const debug = (...args) => console.debug(...args);
-
-const debugDisabled = () => {};
-
-const info = (...args) => console.info(...args);
-
-const infoDisabled = () => {};
-
-const warn = (...args) => console.warn(...args);
-
-const warnDisabled = () => {};
-
-const error = (...args) => console.error(...args);
-
-const errorDisabled = () => {};
-
-function hasFlag(flag, argv = process$1.argv) {
-  const prefix = flag.startsWith('-') ? '' : flag.length === 1 ? '-' : '--';
-  const position = argv.indexOf(prefix + flag);
-  const terminatorPosition = argv.indexOf('--');
-  return position !== -1 && (terminatorPosition === -1 || position < terminatorPosition);
-}
-
-const {
-  env
-} = process$1;
-let flagForceColor;
-
-if (hasFlag('no-color') || hasFlag('no-colors') || hasFlag('color=false') || hasFlag('color=never')) {
-  flagForceColor = 0;
-} else if (hasFlag('color') || hasFlag('colors') || hasFlag('color=true') || hasFlag('color=always')) {
-  flagForceColor = 1;
-}
-
-function envForceColor() {
-  if ('FORCE_COLOR' in env) {
-    if (env.FORCE_COLOR === 'true') {
-      return 1;
-    }
-
-    if (env.FORCE_COLOR === 'false') {
-      return 0;
-    }
-
-    return env.FORCE_COLOR.length === 0 ? 1 : Math.min(Number.parseInt(env.FORCE_COLOR, 10), 3);
-  }
-}
-
-function translateLevel(level) {
-  if (level === 0) {
-    return false;
-  }
-
-  return {
-    level,
-    hasBasic: true,
-    has256: level >= 2,
-    has16m: level >= 3
-  };
-}
-
-function _supportsColor(haveStream, {
-  streamIsTTY,
-  sniffFlags = true
-} = {}) {
-  const noFlagForceColor = envForceColor();
-
-  if (noFlagForceColor !== undefined) {
-    flagForceColor = noFlagForceColor;
-  }
-
-  const forceColor = sniffFlags ? flagForceColor : noFlagForceColor;
-
-  if (forceColor === 0) {
-    return 0;
-  }
-
-  if (sniffFlags) {
-    if (hasFlag('color=16m') || hasFlag('color=full') || hasFlag('color=truecolor')) {
-      return 3;
-    }
-
-    if (hasFlag('color=256')) {
-      return 2;
-    }
-  }
-
-  if (haveStream && !streamIsTTY && forceColor === undefined) {
-    return 0;
-  }
-
-  const min = forceColor || 0;
-
-  if (env.TERM === 'dumb') {
-    return min;
-  }
-
-  if (process$1.platform === 'win32') {
-    // Windows 10 build 10586 is the first Windows release that supports 256 colors.
-    // Windows 10 build 14931 is the first release that supports 16m/TrueColor.
-    const osRelease = os.release().split('.');
-
-    if (Number(osRelease[0]) >= 10 && Number(osRelease[2]) >= 10_586) {
-      return Number(osRelease[2]) >= 14_931 ? 3 : 2;
-    }
-
-    return 1;
-  }
-
-  if ('CI' in env) {
-    if (['TRAVIS', 'CIRCLECI', 'APPVEYOR', 'GITLAB_CI', 'GITHUB_ACTIONS', 'BUILDKITE', 'DRONE'].some(sign => sign in env) || env.CI_NAME === 'codeship') {
-      return 1;
-    }
-
-    return min;
-  }
-
-  if ('TEAMCITY_VERSION' in env) {
-    return /^(9\.(0*[1-9]\d*)\.|\d{2,}\.)/.test(env.TEAMCITY_VERSION) ? 1 : 0;
-  } // Check for Azure DevOps pipelines
-
-
-  if ('TF_BUILD' in env && 'AGENT_NAME' in env) {
-    return 1;
-  }
-
-  if (env.COLORTERM === 'truecolor') {
-    return 3;
-  }
-
-  if ('TERM_PROGRAM' in env) {
-    const version = Number.parseInt((env.TERM_PROGRAM_VERSION || '').split('.')[0], 10);
-
-    switch (env.TERM_PROGRAM) {
-      case 'iTerm.app':
-        return version >= 3 ? 3 : 2;
-
-      case 'Apple_Terminal':
-        return 2;
-      // No default
-    }
-  }
-
-  if (/-256(color)?$/i.test(env.TERM)) {
-    return 2;
-  }
-
-  if (/^screen|^xterm|^vt100|^vt220|^rxvt|color|ansi|cygwin|linux/i.test(env.TERM)) {
-    return 1;
-  }
-
-  if ('COLORTERM' in env) {
-    return 1;
-  }
-
-  return min;
-}
-
-function createSupportsColor(stream, options = {}) {
-  const level = _supportsColor(stream, {
-    streamIsTTY: stream && stream.isTTY,
-    ...options
-  });
-
-  return translateLevel(level);
-}
-({
-  stdout: createSupportsColor({
-    isTTY: tty.isatty(1)
-  }),
-  stderr: createSupportsColor({
-    isTTY: tty.isatty(2)
-  })
-});
-
-createSupportsColor(process.stdout).hasBasic;
-// because stream.isTTY returns false, see https://github.com/actions/runner/issues/241
-
-if (process.env.GITHUB_WORKFLOW) {
-  // Check on FORCE_COLOR is to ensure it is prio over GitHub workflow check
-  if (process.env.FORCE_COLOR !== "false") ;
-} // https://github.com/Marak/colors.js/blob/master/lib/styles.js
-
-function isUnicodeSupported() {
-  if (process$1.platform !== 'win32') {
-    return process$1.env.TERM !== 'linux'; // Linux console (kernel)
-  }
-
-  return Boolean(process$1.env.CI) || Boolean(process$1.env.WT_SESSION) // Windows Terminal
-  || process$1.env.ConEmuTask === '{cmd::Cmder}' // ConEmu and cmder
-  || process$1.env.TERM_PROGRAM === 'vscode' || process$1.env.TERM === 'xterm-256color' || process$1.env.TERM === 'alacritty' || process$1.env.TERMINAL_EMULATOR === 'JetBrains-JediTerm';
-}
-
-// see also https://github.com/sindresorhus/figures
-isUnicodeSupported();
-
-const createDetailedMessage$1 = (message, details = {}) => {
-  let string = `${message}`;
-  Object.keys(details).forEach(key => {
-    const value = details[key];
-    string += `
---- ${key} ---
-${Array.isArray(value) ? value.join(`
-`) : value}`;
-  });
-  return string;
-};
-
-const ESC = '\u001B[';
-const OSC = '\u001B]';
-const BEL = '\u0007';
-const SEP = ';';
-const isTerminalApp = process.env.TERM_PROGRAM === 'Apple_Terminal';
-const ansiEscapes = {};
-
-ansiEscapes.cursorTo = (x, y) => {
-  if (typeof x !== 'number') {
-    throw new TypeError('The `x` argument is required');
-  }
-
-  if (typeof y !== 'number') {
-    return ESC + (x + 1) + 'G';
-  }
-
-  return ESC + (y + 1) + ';' + (x + 1) + 'H';
-};
-
-ansiEscapes.cursorMove = (x, y) => {
-  if (typeof x !== 'number') {
-    throw new TypeError('The `x` argument is required');
-  }
-
-  let returnValue = '';
-
-  if (x < 0) {
-    returnValue += ESC + -x + 'D';
-  } else if (x > 0) {
-    returnValue += ESC + x + 'C';
-  }
-
-  if (y < 0) {
-    returnValue += ESC + -y + 'A';
-  } else if (y > 0) {
-    returnValue += ESC + y + 'B';
-  }
-
-  return returnValue;
-};
-
-ansiEscapes.cursorUp = (count = 1) => ESC + count + 'A';
-
-ansiEscapes.cursorDown = (count = 1) => ESC + count + 'B';
-
-ansiEscapes.cursorForward = (count = 1) => ESC + count + 'C';
-
-ansiEscapes.cursorBackward = (count = 1) => ESC + count + 'D';
+const noopStreamSpy = () => ""; // could be inlined but vscode do not correctly
+// expand/collapse template strings, so I put it at the bottom
 
-ansiEscapes.cursorLeft = ESC + 'G';
-ansiEscapes.cursorSavePosition = isTerminalApp ? '\u001B7' : ESC + 's';
-ansiEscapes.cursorRestorePosition = isTerminalApp ? '\u001B8' : ESC + 'u';
-ansiEscapes.cursorGetPosition = ESC + '6n';
-ansiEscapes.cursorNextLine = ESC + 'E';
-ansiEscapes.cursorPrevLine = ESC + 'F';
-ansiEscapes.cursorHide = ESC + '?25l';
-ansiEscapes.cursorShow = ESC + '?25h';
 
-ansiEscapes.eraseLines = count => {
-  let clear = '';
+const addNewLines = (string, newLine) => {
+  if (newLine === "before") {
+    return `
+${string}`;
+  }
 
-  for (let i = 0; i < count; i++) {
-    clear += ansiEscapes.eraseLine + (i < count - 1 ? ansiEscapes.cursorUp() : '');
+  if (newLine === "after") {
+    return `${string}
+`;
   }
 
-  if (count) {
-    clear += ansiEscapes.cursorLeft;
+  if (newLine === "around") {
+    return `
+${string}
+`;
   }
 
-  return clear;
+  return string;
 };
 
-ansiEscapes.eraseEndLine = ESC + 'K';
-ansiEscapes.eraseStartLine = ESC + '1K';
-ansiEscapes.eraseLine = ESC + '2K';
-ansiEscapes.eraseDown = ESC + 'J';
-ansiEscapes.eraseUp = ESC + '1J';
-ansiEscapes.eraseScreen = ESC + '2J';
-ansiEscapes.scrollUp = ESC + 'S';
-ansiEscapes.scrollDown = ESC + 'T';
-ansiEscapes.clearScreen = '\u001Bc';
-ansiEscapes.clearTerminal = process.platform === 'win32' ? `${ansiEscapes.eraseScreen}${ESC}0f` : // 1. Erases the screen (Only done in case `2` is not supported)
-// 2. Erases the whole screen including scrollback buffer
-// 3. Moves cursor to the top-left position
-// More info: https://www.real-world-systems.com/docs/ANSIcode.html
-`${ansiEscapes.eraseScreen}${ESC}3J${ESC}H`;
-ansiEscapes.beep = BEL;
+const startSpinner = ({
+  log,
+  frames = ["⠋", "⠙", "⠹", "⠸", "⠼", "⠴", "⠦", "⠧", "⠇", "⠏"],
+  fps = 20,
+  keepProcessAlive = false,
+  stopOnWriteFromOutside = true,
+  stopOnVerticalOverflow = true,
+  render = () => "",
+  effect = () => {}
+}) => {
+  let frameIndex = 0;
+  let interval;
+  let running = true;
+  const spinner = {
+    message: undefined
+  };
 
-ansiEscapes.link = (text, url) => {
-  return [OSC, '8', SEP, SEP, url, BEL, text, OSC, '8', SEP, SEP, BEL].join('');
-};
+  const update = message => {
+    spinner.message = running ? `${frames[frameIndex]} ${message}` : message;
+    return spinner.message;
+  };
 
-ansiEscapes.image = (buffer, options = {}) => {
-  let returnValue = `${OSC}1337;File=inline=1`;
+  spinner.update = update;
+  let cleanup;
 
-  if (options.width) {
-    returnValue += `;width=${options.width}`;
-  }
+  if (ANSI.supported) {
+    running = true;
+    cleanup = effect();
+    log.write(update(render()));
+    interval = setInterval(() => {
+      frameIndex = frameIndex === frames.length - 1 ? 0 : frameIndex + 1;
+      log.dynamicWrite(({
+        outputFromOutside
+      }) => {
+        if (outputFromOutside && stopOnWriteFromOutside) {
+          stop();
+          return "";
+        }
 
-  if (options.height) {
-    returnValue += `;height=${options.height}`;
-  }
+        return update(render());
+      });
+    }, 1000 / fps);
 
-  if (options.preserveAspectRatio === false) {
-    returnValue += ';preserveAspectRatio=0';
+    if (!keepProcessAlive) {
+      interval.unref();
+    }
+  } else {
+    log.write(update(render()));
   }
 
-  return returnValue + ':' + buffer.toString('base64') + BEL;
-};
-
-ansiEscapes.iTerm = {
-  setCwd: (cwd = process.cwd()) => `${OSC}50;CurrentDir=${cwd}${BEL}`,
-  annotation: (message, options = {}) => {
-    let returnValue = `${OSC}1337;`;
-    const hasX = typeof options.x !== 'undefined';
-    const hasY = typeof options.y !== 'undefined';
+  const stop = message => {
+    running = false;
 
-    if ((hasX || hasY) && !(hasX && hasY && typeof options.length !== 'undefined')) {
-      throw new Error('`x`, `y` and `length` must be defined when `x` or `y` is defined');
+    if (interval) {
+      clearInterval(interval);
+      interval = null;
     }
 
-    message = message.replace(/\|/g, '');
-    returnValue += options.isHidden ? 'AddHiddenAnnotation=' : 'AddAnnotation=';
+    if (cleanup) {
+      cleanup();
+      cleanup = null;
+    }
 
-    if (options.length > 0) {
-      returnValue += (hasX ? [message, options.length, options.x, options.y] : [options.length, message]).join('|');
-    } else {
-      returnValue += message;
+    if (log && message) {
+      log.write(update(message));
+      log = null;
     }
+  };
 
-    return returnValue + BEL;
+  spinner.stop = stop;
+
+  if (stopOnVerticalOverflow) {
+    log.onVerticalOverflow = stop;
+  }
+
+  return spinner;
+};
+
+const createTaskLog = (label, {
+  disabled = false,
+  stopOnWriteFromOutside
+} = {}) => {
+  if (disabled) {
+    return {
+      setRightText: () => {},
+      done: () => {},
+      happen: () => {},
+      fail: () => {}
+    };
   }
+
+  const startMs = Date.now();
+  const log = createLog();
+  let message = label;
+  const taskSpinner = startSpinner({
+    log,
+    render: () => message,
+    stopOnWriteFromOutside
+  });
+  return {
+    setRightText: value => {
+      message = `${label} ${value}`;
+    },
+    done: () => {
+      const msEllapsed = Date.now() - startMs;
+      taskSpinner.stop(`${UNICODE.OK} ${label} (done in ${msAsDuration(msEllapsed)})`);
+    },
+    happen: message => {
+      taskSpinner.stop(`${UNICODE.INFO} ${message} (at ${new Date().toLocaleTimeString()})`);
+    },
+    fail: (message = `failed to ${label}`) => {
+      taskSpinner.stop(`${UNICODE.FAILURE} ${message}`);
+    }
+  };
 };
 
 const memoize = compute => {
@@ -6736,7 +6294,7 @@ const startServer = async ({
           }) => {
             const statusType = statusToType(status);
             addRequestLog(requestNode, {
-              type: {
+              type: status === 404 && request.pathname === "/favicon.ico" ? "debug" : {
                 information: "info",
                 success: "info",
                 redirection: "info",
@@ -8992,7 +8550,7 @@ const createUrlInfoTransformer = ({
   sourcemaps,
   sourcemapsSourcesProtocol,
   sourcemapsSourcesContent,
-  sourcemapsRelativeSources,
+  sourcemapsSourcesRelative,
   urlGraph,
   injectSourcemapPlaceholder,
   foundSourcemap
@@ -9182,7 +8740,7 @@ const createUrlInfoTransformer = ({
         sourcemapUrlInfo.contentType = "application/json";
         const sourcemap = urlInfo.sourcemap;
 
-        if (sourcemapsRelativeSources) {
+        if (sourcemapsSourcesRelative) {
           sourcemap.sources = sourcemap.sources.map(source => {
             const sourceRelative = urlToRelativeUrl(source, urlInfo.url);
             return sourceRelative || ".";
@@ -9210,7 +8768,7 @@ const createUrlInfoTransformer = ({
             urlInfo.content = SOURCEMAP.writeComment({
               contentType: urlInfo.contentType,
               content: urlInfo.content,
-              specifier: sourcemaps === "file" && sourcemapsRelativeSources ? urlToRelativeUrl(sourcemapReference.url, urlInfo.url) : sourcemapReference.generatedSpecifier
+              specifier: sourcemaps === "file" && sourcemapsSourcesRelative ? urlToRelativeUrl(sourcemapReference.url, urlInfo.url) : sourcemapReference.generatedSpecifier
             });
           }
         }
@@ -9539,7 +9097,7 @@ const createResolveUrlError = ({
     reason,
     ...details
   }) => {
-    const resolveError = new Error(createDetailedMessage$2(`Failed to resolve url reference`, {
+    const resolveError = new Error(createDetailedMessage$1(`Failed to resolve url reference`, {
       reason,
       ...details,
       "specifier": `"${reference.specifier}"`,
@@ -9575,7 +9133,7 @@ const createFetchUrlContentError = ({
     reason,
     ...details
   }) => {
-    const fetchError = new Error(createDetailedMessage$2(`Failed to fetch url content`, {
+    const fetchError = new Error(createDetailedMessage$1(`Failed to fetch url content`, {
       reason,
       ...details,
       "url": urlInfo.url,
@@ -9631,7 +9189,7 @@ const createTransformUrlContentError = ({
     reason,
     ...details
   }) => {
-    const transformError = new Error(createDetailedMessage$2(`"transformUrlContent" error on "${urlInfo.type}"`, {
+    const transformError = new Error(createDetailedMessage$1(`"transformUrlContent" error on "${urlInfo.type}"`, {
       reason,
       ...details,
       "url": urlInfo.url,
@@ -9687,7 +9245,7 @@ const createFinalizeUrlContentError = ({
   urlInfo,
   error
 }) => {
-  const finalizeError = new Error(createDetailedMessage$2(`"finalizeUrlContent" error on "${urlInfo.type}"`, { ...detailsFromValueThrown(error),
+  const finalizeError = new Error(createDetailedMessage$1(`"finalizeUrlContent" error on "${urlInfo.type}"`, { ...detailsFromValueThrown(error),
     "url": urlInfo.url,
     "url reference trace": reference.trace.message,
     ...detailsFromPluginController(pluginController)
@@ -9945,11 +9503,11 @@ const createKitchen = ({
   // "programmatic" and "file" also allowed
   sourcemapsSourcesProtocol,
   sourcemapsSourcesContent,
-  sourcemapsRelativeSources,
+  sourcemapsSourcesRelative,
   writeGeneratedFiles,
   outDirectoryUrl
 }) => {
-  const logger = createLogger$1({
+  const logger = createLogger({
     logLevel
   });
   const pluginController = createPluginController({
@@ -10161,7 +9719,7 @@ ${ANSI.color(normalizedReturnValue, ANSI.YELLOW)}
     sourcemaps,
     sourcemapsSourcesProtocol,
     sourcemapsSourcesContent,
-    sourcemapsRelativeSources,
+    sourcemapsSourcesRelative,
     clientRuntimeCompat,
     injectSourcemapPlaceholder: ({
       urlInfo,
@@ -10214,7 +9772,7 @@ ${ANSI.color(normalizedReturnValue, ANSI.YELLOW)}
       const fetchUrlContentReturnValue = await pluginController.callAsyncHooksUntil("fetchUrlContent", urlInfo, contextDuringFetch);
 
       if (!fetchUrlContentReturnValue) {
-        logger.warn(createDetailedMessage$2(`no plugin has handled url during "fetchUrlContent" hook -> url will be ignored`, {
+        logger.warn(createDetailedMessage$1(`no plugin has handled url during "fetchUrlContent" hook -> url will be ignored`, {
           "url": urlInfo.url,
           "url reference trace": reference.trace.message
         }));
@@ -10521,7 +10079,7 @@ ${ANSI.color(normalizedReturnValue, ANSI.YELLOW)}
       } = urlInfo;
 
       if (generatedUrl && generatedUrl.startsWith("file:")) {
-        if (urlInfo.type === "directory") ; else {
+        if (urlInfo.type === "directory") ; else if (urlInfo.content === null) ; else {
           writeFileSync(new URL(generatedUrl), urlInfo.content);
           const {
             sourcemapGeneratedUrl,
@@ -10727,8 +10285,8 @@ const adjustUrlSite = (urlInfo, {
       isOriginal: true,
       url: inlineUrlSite.url,
       content: inlineUrlSite.content,
-      line: inlineUrlSite.line + urlSite.line,
-      column: inlineUrlSite.column + urlSite.column
+      line: inlineUrlSite.line === undefined ? urlSite.line : inlineUrlSite.line + urlSite.line,
+      column: inlineUrlSite.column === undefined ? urlSite.column : inlineUrlSite.column + urlSite.column
     }, parentUrlInfo);
   };
 
@@ -16916,10 +16474,25 @@ const convertJsModuleToJsClassic = async ({
 
   if (systemJsInjection && jsClassicFormat === "system" && urlInfo.isEntryPoint) {
     const magicSource = createMagicSource(code);
-    const systemjsCode = readFileSync(systemJsClientFileUrl, {
+    let systemJsFileContent = readFileSync(systemJsClientFileUrl, {
       as: "string"
     });
-    magicSource.prepend(`${systemjsCode}\n\n`);
+    const sourcemapFound = SOURCEMAP.readComment({
+      contentType: "text/javascript",
+      content: systemJsFileContent
+    });
+
+    if (sourcemapFound) {
+      // for now let's remove s.js sourcemap
+      // because it would likely mess the sourcemap of the entry point itself
+      systemJsFileContent = SOURCEMAP.writeComment({
+        contentType: "text/javascript",
+        content: systemJsFileContent,
+        specifier: ""
+      });
+    }
+
+    magicSource.prepend(`${systemJsFileContent}\n\n`);
     const magicResult = magicSource.toContentAndSourcemap();
     sourcemap = await composeTwoSourcemaps(sourcemap, magicResult.sourcemap);
     return {
@@ -16943,14 +16516,42 @@ const jsenvPluginAsJsClassicConversion = ({
   systemJsClientFileUrl,
   generateJsClassicFilename
 }) => {
+  const isReferencingJsModule = reference => {
+    if (reference.type === "js_import_export" || reference.subtype === "system_register_arg" || reference.subtype === "system_import_arg") {
+      return true;
+    }
+
+    if (reference.type === "js_url_specifier") {
+      if (reference.expectedType === "js_classic") {
+        return false;
+      }
+
+      if (reference.expectedType === undefined && CONTENT_TYPE.fromUrlExtension(reference.url) === "text/javascript") {
+        // by default, js referenced by new URL is considered as "js_module"
+        // in case this is not desired code must use "?js_classic" like
+        // new URL('./file.js?js_classic', import.meta.url)
+        return true;
+      }
+    }
+
+    return false;
+  };
+
   const shouldPropagateJsClassic = (reference, context) => {
-    const parentUrlInfo = context.urlGraph.getUrlInfo(reference.parentUrl);
+    if (isReferencingJsModule(reference)) {
+      const parentUrlInfo = context.urlGraph.getUrlInfo(reference.parentUrl);
 
-    if (!parentUrlInfo) {
-      return false;
+      if (!parentUrlInfo) {
+        return false;
+      } // if (parentUrlInfo.isEntryPoint) {
+      //   return true
+      // }
+
+
+      return new URL(parentUrlInfo.url).searchParams.has("as_js_classic");
     }
 
-    return new URL(parentUrlInfo.url).searchParams.has("as_js_classic");
+    return false;
   };
 
   const markAsJsClassicProxy = reference => {
@@ -16973,18 +16574,16 @@ const jsenvPluginAsJsClassicConversion = ({
       if (reference.searchParams.has("as_js_classic")) {
         markAsJsClassicProxy(reference);
         return null;
-      }
+      } // We want to propagate transformation of js module to js classic to:
+      // - import specifier (static/dynamic import + re-export)
+      // - url specifier when inside System.register/_context.import()
+      //   (because it's the transpiled equivalent of static and dynamic imports)
+      // And not other references otherwise we could try to transform inline resources
+      // or specifiers inside new URL()...
 
-      if (reference.type === "js_import_export" || reference.subtype === "system_register_arg" || reference.subtype === "system_import_arg") {
-        // We want to propagate transformation of js module to js classic to:
-        // - import specifier (static/dynamic import + re-export)
-        // - url specifier when inside System.register/_context.import()
-        //   (because it's the transpiled equivalent of static and dynamic imports)
-        // And not other references otherwise we could try to transform inline resources
-        // or specifiers inside new URL()...
-        if (shouldPropagateJsClassic(reference, context)) {
-          return turnIntoJsClassicProxy(reference);
-        }
+
+      if (shouldPropagateJsClassic(reference, context)) {
+        return turnIntoJsClassicProxy(reference);
       }
 
       return null;
@@ -17195,9 +16794,23 @@ const jsenvPluginAsJsClassicHtml = ({
 
           if (needsSystemJs) {
             mutations.push(async () => {
-              const systemJsFileContent = readFileSync$1(new URL(systemJsClientFileUrl), {
+              let systemJsFileContent = readFileSync$1(new URL(systemJsClientFileUrl), {
                 encoding: "utf8"
               });
+              const sourcemapFound = SOURCEMAP.readComment({
+                contentType: "text/javascript",
+                content: systemJsFileContent
+              });
+
+              if (sourcemapFound) {
+                const sourcemapFileUrl = new URL(sourcemapFound.specifier, systemJsClientFileUrl);
+                systemJsFileContent = SOURCEMAP.writeComment({
+                  contentType: "text/javascript",
+                  content: systemJsFileContent,
+                  specifier: urlToRelativeUrl(sourcemapFileUrl, urlInfo.url)
+                });
+              }
+
               const [systemJsReference, systemJsUrlInfo] = context.referenceUtils.inject({
                 type: "script_src",
                 expectedType: "js_classic",
@@ -17471,24 +17084,34 @@ const rollupPluginJsenv = ({
         const rollupFileInfo = rollupResult[fileName]; // there is 3 types of file: "placeholder", "asset", "chunk"
 
         if (rollupFileInfo.type === "chunk") {
+          const sourceUrls = Object.keys(rollupFileInfo.modules).map(id => fileUrlConverter.asFileUrl(id));
           let url;
+          let originalUrl;
 
           if (rollupFileInfo.facadeModuleId) {
             url = fileUrlConverter.asFileUrl(rollupFileInfo.facadeModuleId);
+            originalUrl = url;
           } else {
             url = new URL(rollupFileInfo.fileName, buildDirectoryUrl).href;
+
+            if (rollupFileInfo.isDynamicEntry) {
+              originalUrl = sourceUrls[sourceUrls.length - 1];
+            } else {
+              originalUrl = url;
+            }
           }
 
           const jsModuleBundleUrlInfo = {
             url,
-            originalUrl: url,
+            originalUrl,
             type: format === "esm" ? "js_module" : "common_js",
             data: {
               generatedBy: "rollup",
               bundleRelativeUrl: rollupFileInfo.fileName,
-              usesImport: rollupFileInfo.imports.length > 0 || rollupFileInfo.dynamicImports.length > 0
+              usesImport: rollupFileInfo.imports.length > 0 || rollupFileInfo.dynamicImports.length > 0,
+              isDynamicEntry: rollupFileInfo.isDynamicEntry
             },
-            sourceUrls: Object.keys(rollupFileInfo.modules).map(id => fileUrlConverter.asFileUrl(id)),
+            sourceUrls,
             contentType: "text/javascript",
             content: rollupFileInfo.code,
             sourcemap: rollupFileInfo.map
@@ -17713,7 +17336,7 @@ const buildWithRollup = async ({
     return resultRef.current;
   } catch (e) {
     if (e.code === "MISSING_EXPORT") {
-      const detailedMessage = createDetailedMessage$2(e.message, {
+      const detailedMessage = createDetailedMessage$1(e.message, {
         frame: e.frame
       });
       throw new Error(detailedMessage, {
@@ -24278,7 +23901,7 @@ const build = async ({
     signal,
     logLevel
   }) => {
-    const logger = createLogger$1({
+    const logger = createLogger({
       logLevel
     });
     const buildOperation = Abort.startOperation();
@@ -24347,7 +23970,7 @@ build ${entryPointKeys.length} entry points`);
     const buildUrlsGenerator = createBuilUrlsGenerator({
       buildDirectoryUrl
     });
-    const buildToRawUrls = {}; // rename "buildDirectoryRedirections"?
+    const buildDirectoryRedirections = new Map();
 
     const associateBuildUrlAndRawUrl = (buildUrl, rawUrl, reason) => {
       if (urlIsInsideOf(rawUrl, buildDirectoryUrl)) {
@@ -24358,7 +23981,7 @@ build ${entryPointKeys.length} entry points`);
 ${ANSI.color(rawUrl, ANSI.GREY)} ->
 ${ANSI.color(buildUrl, ANSI.MAGENTA)}
 `);
-      buildToRawUrls[buildUrl] = rawUrl;
+      buildDirectoryRedirections.set(buildUrl, rawUrl);
     };
 
     const buildUrls = new Map();
@@ -24389,7 +24012,7 @@ ${ANSI.color(buildUrl, ANSI.MAGENTA)}
         resolveUrl: reference => {
           const getUrl = () => {
             if (reference.type === "filesystem") {
-              const parentRawUrl = buildToRawUrls[reference.parentUrl];
+              const parentRawUrl = buildDirectoryRedirections.get(reference.parentUrl);
               const baseUrl = ensurePathnameTrailingSlash(parentRawUrl);
               return new URL(reference.specifier, baseUrl).href;
             }
@@ -24420,7 +24043,7 @@ ${ANSI.color(buildUrl, ANSI.MAGENTA)}
           } // already a build url
 
 
-          const rawUrl = buildToRawUrls[reference.url];
+          const rawUrl = buildDirectoryRedirections.get(reference.url);
 
           if (rawUrl) {
             return reference.url;
@@ -24590,14 +24213,14 @@ ${ANSI.color(buildUrl, ANSI.MAGENTA)}
               return bundleUrlInfo;
             }
 
-            const rawUrl = buildToRawUrls[url] || url;
+            const rawUrl = buildDirectoryRedirections.get(url) || url;
             const rawUrlInfo = rawGraph.getUrlInfo(rawUrl);
 
             if (!rawUrlInfo) {
-              throw new Error(createDetailedMessage$2(`Cannot find url`, {
+              throw new Error(createDetailedMessage$1(`Cannot find url`, {
                 url,
-                "raw urls": Object.values(buildToRawUrls),
-                "build urls": Object.keys(buildToRawUrls)
+                "raw urls": Array.from(buildDirectoryRedirections.values()),
+                "build urls": Array.from(buildDirectoryRedirections.keys())
               }));
             } // logger.debug(`fetching from raw graph ${url}`)
 
@@ -24626,7 +24249,7 @@ ${ANSI.color(buildUrl, ANSI.MAGENTA)}
 
           if (reference.injected) {
             const [ref, rawUrlInfo] = rawGraphKitchen.injectReference({ ...reference,
-              parentUrl: buildToRawUrls[reference.parentUrl]
+              parentUrl: buildDirectoryRedirections.get(reference.parentUrl)
             });
             await rawGraphKitchen.cook(rawUrlInfo, {
               reference: ref
@@ -24657,7 +24280,7 @@ ${ANSI.color(buildUrl, ANSI.MAGENTA)}
       }],
       sourcemaps,
       sourcemapsSourcesContent,
-      sourcemapsRelativeSources: !versioning,
+      sourcemapsSourcesRelative: !versioning,
       writeGeneratedFiles,
       outDirectoryUrl: new URL(".jsenv/postbuild/", rootDirectoryUrl)
     });
@@ -24841,10 +24464,10 @@ ${ANSI.color(buildUrl, ANSI.MAGENTA)}
 
               if (bundlerGeneratedUrlInfo.sourceUrls) {
                 bundlerGeneratedUrlInfo.sourceUrls.forEach(sourceUrl => {
-                  const rawUrlInfo = rawGraph.getUrlInfo(sourceUrl);
+                  const sourceRawUrlInfo = rawGraph.getUrlInfo(sourceUrl);
 
-                  if (rawUrlInfo) {
-                    rawUrlInfo.data.bundled = true;
+                  if (sourceRawUrlInfo) {
+                    sourceRawUrlInfo.data.bundled = true;
                   }
                 });
               }
@@ -24854,7 +24477,14 @@ ${ANSI.color(buildUrl, ANSI.MAGENTA)}
               });
               bundleRedirections.set(url, buildUrl);
 
-              if (urlIsInsideOf(url, buildDirectoryUrl)) {// chunk generated by rollup to share code
+              if (urlIsInsideOf(url, buildDirectoryUrl)) {
+                if (bundlerGeneratedUrlInfo.data.isDynamicEntry) {
+                  const rawUrlInfo = rawGraph.getUrlInfo(bundlerGeneratedUrlInfo.originalUrl);
+                  rawUrlInfo.data.bundled = false;
+                  bundleRedirections.set(bundlerGeneratedUrlInfo.originalUrl, buildUrl);
+                  associateBuildUrlAndRawUrl(buildUrl, bundlerGeneratedUrlInfo.originalUrl, "bundle");
+                } else {// chunk generated by rollup to share code
+                }
               } else {
                 associateBuildUrlAndRawUrl(buildUrl, url, "bundle");
               }
@@ -25117,7 +24747,7 @@ ${ANSI.color(buildUrl, ANSI.MAGENTA)}
               },
               fetchUrlContent: versionedUrlInfo => {
                 if (versionedUrlInfo.isInline) {
-                  const rawUrlInfo = rawGraph.getUrlInfo(buildToRawUrls[versionedUrlInfo.url]);
+                  const rawUrlInfo = rawGraph.getUrlInfo(buildDirectoryRedirections.get(versionedUrlInfo.url));
                   const finalUrlInfo = finalGraph.getUrlInfo(versionedUrlInfo.url);
                   return {
                     content: versionedUrlInfo.content,
@@ -25132,7 +24762,7 @@ ${ANSI.color(buildUrl, ANSI.MAGENTA)}
             }],
             sourcemaps,
             sourcemapsSourcesContent,
-            sourcemapsRelativeSources: true,
+            sourcemapsSourcesRelative: true,
             writeGeneratedFiles,
             outDirectoryUrl: new URL(".jsenv/postbuild/", finalGraphKitchen.rootDirectoryUrl)
           });
@@ -25202,7 +24832,8 @@ ${ANSI.color(buildUrl, ANSI.MAGENTA)}
       /*
        * Update <link rel="preload"> and friends after build (once we know everything)
        * - Used to remove resource hint targeting an url that is no longer used:
-       *   - Happens because of import assertions transpilation (file is inlined into JS)
+       *   - because of bundlings
+       *   - because of import assertions transpilation (file is inlined into JS)
        */
 
 
@@ -25245,7 +24876,7 @@ ${ANSI.color(buildUrl, ANSI.MAGENTA)}
                   }
 
                   if (buildUrlInfo.dependents.size === 0) {
-                    logger.info(`remove resource hint because "${href}" not used anymore`);
+                    logger.warn(`remove resource hint because "${href}" not used anymore`);
                     mutations.push(() => {
                       removeHtmlNode(node);
                     });
@@ -25268,7 +24899,7 @@ ${ANSI.color(buildUrl, ANSI.MAGENTA)}
                   const rawUrlInfo = rawGraph.getUrlInfo(url);
 
                   if (rawUrlInfo && rawUrlInfo.data.bundled) {
-                    logger.info(`remove resource hint on "${href}" because it was bundled`);
+                    logger.warn(`remove resource hint on "${href}" because it was bundled`);
                     mutations.push(() => {
                       removeHtmlNode(node);
                     });
@@ -25276,6 +24907,7 @@ ${ANSI.color(buildUrl, ANSI.MAGENTA)}
                     url = bundleRedirections.get(url) || url;
                     url = bundleInternalRedirections.get(url) || url;
                     url = finalRedirections.get(url) || url;
+                    url = findKey(buildDirectoryRedirections, url) || url;
                     onBuildUrl(url);
                   }
                 } else {
@@ -25897,7 +25529,18 @@ const createFileService = ({
         }
 
         if (!watch) {
-          const fileContentAsBuffer = readFileSync$1(new URL(urlInfo.url));
+          let fileContentAsBuffer;
+
+          try {
+            fileContentAsBuffer = readFileSync$1(new URL(urlInfo.url));
+          } catch (e) {
+            if (e.code === "ENOENT") {
+              return false;
+            }
+
+            return false;
+          }
+
           const fileContentEtag = bufferToEtag$1(fileContentAsBuffer);
 
           if (fileContentEtag !== urlInfo.originalContentEtag) {
@@ -26018,27 +25661,27 @@ const createFileService = ({
     const ifNoneMatch = request.headers["if-none-match"];
     const urlInfoTargetedByCache = urlGraph.getParentIfInline(urlInfo);
 
-    if (ifNoneMatch) {
-      const [clientOriginalContentEtag, clientContentEtag] = ifNoneMatch.split("_");
+    try {
+      if (ifNoneMatch) {
+        const [clientOriginalContentEtag, clientContentEtag] = ifNoneMatch.split("_");
+
+        if (urlInfoTargetedByCache.originalContentEtag === clientOriginalContentEtag && urlInfoTargetedByCache.contentEtag === clientContentEtag && urlInfoTargetedByCache.isValid()) {
+          const headers = {
+            "cache-control": `private,max-age=0,must-revalidate`
+          };
+          Object.keys(urlInfo.headers).forEach(key => {
+            if (key !== "content-length") {
+              headers[key] = urlInfo.headers[key];
+            }
+          });
+          return {
+            status: 304,
+            headers
+          };
+        }
+      } // urlInfo objects are reused, they must be "reset" before cooking them again
 
-      if (urlInfoTargetedByCache.originalContentEtag === clientOriginalContentEtag && urlInfoTargetedByCache.contentEtag === clientContentEtag && urlInfoTargetedByCache.isValid()) {
-        const headers = {
-          "cache-control": `private,max-age=0,must-revalidate`
-        };
-        Object.keys(urlInfo.headers).forEach(key => {
-          if (key !== "content-length") {
-            headers[key] = urlInfo.headers[key];
-          }
-        });
-        return {
-          status: 304,
-          headers
-        };
-      }
-    }
 
-    try {
-      // urlInfo objects are reused, they must be "reset" before cooking them again
       if ((urlInfo.error || urlInfo.contentEtag) && !urlInfo.isInline && urlInfo.type !== "sourcemap") {
         urlInfo.error = null;
         urlInfo.sourcemap = null;
@@ -26231,7 +25874,7 @@ const startDevServer = async ({
   // and mitigates https://github.com/actions/runner-images/issues/3885
   writeGeneratedFiles = !process.env.CI
 }) => {
-  const logger = createLogger$1({
+  const logger = createLogger({
     logLevel
   });
   rootDirectoryUrl = assertAndNormalizeDirectoryUrl(rootDirectoryUrl);
@@ -26577,7 +26220,7 @@ const readNodeV8CoverageDirectory = async ({
             return tryReadJsonFile();
           }
 
-          console.warn(createDetailedMessage$2(`Error while reading coverage file`, {
+          console.warn(createDetailedMessage$1(`Error while reading coverage file`, {
             "error stack": e.stack,
             "file": dirEntryUrl
           }));
@@ -26751,7 +26394,7 @@ const composeV8AndIstanbul = (v8FileByFileCoverage, istanbulFileByFileCoverage,
 
     if (v8Coverage) {
       if (coverageV8ConflictWarning) {
-        console.warn(createDetailedMessage$2(`Coverage conflict on "${key}", found two coverage that cannot be merged together: v8 and istanbul. The istanbul coverage will be ignored.`, {
+        console.warn(createDetailedMessage$1(`Coverage conflict on "${key}", found two coverage that cannot be merged together: v8 and istanbul. The istanbul coverage will be ignored.`, {
           details: `This happens when a file is executed on a runtime using v8 coverage (node or chromium) and on runtime using istanbul coverage (firefox or webkit)`,
           suggestion: "You can disable this warning with coverageV8ConflictWarning: false"
         }));
@@ -27278,7 +26921,7 @@ const generateFileExecutionSteps = ({
     }
 
     if (typeof stepConfig !== "object") {
-      throw new TypeError(createDetailedMessage$2(`found unexpected value in plan, they must be object`, {
+      throw new TypeError(createDetailedMessage$1(`found unexpected value in plan, they must be object`, {
         ["file relative path"]: fileRelativeUrl,
         ["execution name"]: executionName,
         ["value"]: stepConfig
@@ -27746,7 +27389,7 @@ const executePlan = async (plan, {
       }
     });
   });
-  logger.debug(createDetailedMessage$2(`Prepare executing plan`, {
+  logger.debug(createDetailedMessage$1(`Prepare executing plan`, {
     runtimes: JSON.stringify(runtimes, null, "  ")
   }));
   const multipleExecutionsOperation = Abort.startOperation();
@@ -27778,7 +27421,7 @@ const executePlan = async (plan, {
         await ensureEmptyDirectory(process.env.NODE_V8_COVERAGE);
       } else {
         coverageMethodForNodeJs = "Profiler";
-        logger.warn(createDetailedMessage$2(`process.env.NODE_V8_COVERAGE is required to generate coverage for Node.js subprocesses`, {
+        logger.warn(createDetailedMessage$1(`process.env.NODE_V8_COVERAGE is required to generate coverage for Node.js subprocesses`, {
           "suggestion": `set process.env.NODE_V8_COVERAGE`,
           "suggestion 2": `use coverageMethodForNodeJs: "Profiler". But it means coverage for child_process and worker_thread cannot be collected`
         }));
@@ -28251,7 +27894,7 @@ const executeTestPlan = async ({
   coverageReportJsonFile = process.env.CI ? null : "./.coverage/coverage.json",
   coverageReportHtmlDirectory = process.env.CI ? "./.coverage/" : null
 }) => {
-  const logger = createLogger$1({
+  const logger = createLogger({
     logLevel
   });
   rootDirectoryUrl = assertAndNormalizeDirectoryUrl(rootDirectoryUrl);
@@ -28288,7 +27931,7 @@ const executeTestPlan = async ({
 
       if (patternsMatchingCoverAndExecute.length) {
         // It would be strange, for a given file to be both covered and executed
-        throw new Error(createDetailedMessage$2(`some file will be both covered and executed`, {
+        throw new Error(createDetailedMessage$1(`some file will be both covered and executed`, {
           patterns: patternsMatchingCoverAndExecute
         }));
       }
@@ -28838,7 +28481,7 @@ const importPlaywright = async ({
     return namespace;
   } catch (e) {
     if (e.code === "ERR_MODULE_NOT_FOUND") {
-      throw new Error(createDetailedMessage$2(`"playwright" not found. You need playwright in your dependencies to use "${browserName}"`, {
+      throw new Error(createDetailedMessage$1(`"playwright" not found. You need playwright in your dependencies to use "${browserName}"`, {
         suggestion: `npm install --save-dev playwright`
       }), {
         cause: e
@@ -29006,7 +28649,7 @@ const createChildExecOptions = async ({
   debugModeInheritBreak = true
 } = {}) => {
   if (typeof debugMode === "string" && AVAILABLE_DEBUG_MODE.indexOf(debugMode) === -1) {
-    throw new TypeError(createDetailedMessage$2(`unexpected debug mode.`, {
+    throw new TypeError(createDetailedMessage$1(`unexpected debug mode.`, {
       ["debug mode"]: debugMode,
       ["allowed debug mode"]: AVAILABLE_DEBUG_MODE
     }));
@@ -29303,7 +28946,7 @@ nodeChildProcess.run = async ({
     stdio: ["pipe", "pipe", "pipe", "ipc"],
     env: envForChildProcess
   });
-  logger.debug(createDetailedMessage$2(`child process forked (pid ${childProcess.pid})`, {
+  logger.debug(createDetailedMessage$1(`child process forked (pid ${childProcess.pid})`, {
     "execArgv": execArgv.join(`\n`),
     "custom env": JSON.stringify(env, null, "  ")
   })); // if we pass stream, pipe them https://github.com/sindresorhus/execa/issues/81
@@ -29901,7 +29544,7 @@ const startBuildServer = async ({
   buildServerMainFile = getCallerPosition().url,
   cooldownBetweenFileEvents
 }) => {
-  const logger = createLogger$1({
+  const logger = createLogger({
     logLevel
   });
   rootDirectoryUrl = assertAndNormalizeDirectoryUrl(rootDirectoryUrl);
@@ -30045,6 +29688,12 @@ const startBuildServer = async ({
     })]
   });
   startBuildServerTask.done();
+
+  if (hostname) {
+    delete server.origins.localip;
+    delete server.origins.externalip;
+  }
+
   logger.info(``);
   Object.keys(server.origins).forEach(key => {
     logger.info(`- ${server.origins[key]}`);
@@ -30126,7 +29775,7 @@ const execute = async ({
   runtimeParams,
   ignoreError = false
 }) => {
-  const logger = createLogger$1({
+  const logger = createLogger({
     logLevel
   });
   rootDirectoryUrl = assertAndNormalizeDirectoryUrl(rootDirectoryUrl);