@rspack/dev-server 2.2.0 → 2.2.1

package/client/overlay.js

@@ -408,7 +408,11 @@ const createOverlay = (options)=>{
             });
         }, trustedTypesPolicyName);
     }
-    let handleEscapeKey;
+    function handleEscapeKey(event) {
+        if ('Escape' === event.key || 'Esc' === event.key || 27 === event.keyCode) overlayService.send({
+            type: 'DISMISS'
+        });
+    }
     const hideOverlayWithEscCleanup = ()=>{
         window.removeEventListener('keydown', handleEscapeKey);
         hide();
@@ -417,11 +421,6 @@ const createOverlay = (options)=>{
         showOverlay: ({ level = 'error', messages, messageSource })=>show(level, messages, options.trustedTypesPolicyName, messageSource),
         hideOverlay: hideOverlayWithEscCleanup
     });
-    handleEscapeKey = (event)=>{
-        if ('Escape' === event.key || 'Esc' === event.key || 27 === event.keyCode) overlayService.send({
-            type: 'DISMISS'
-        });
-    };
     window.addEventListener('keydown', handleEscapeKey);
     if (options.catchRuntimeError) {
         const handleError = (error, fallbackMessage)=>{

package/dist/0~connect-next.js

@@ -591,17 +591,17 @@ __nested_rspack_require_364__.add({
             return lastIndex !== index ? html + str.substring(lastIndex, index) : html;
         }
     },
-    "./node_modules/.pnpm/finalhandler@2.1.1/node_modules/finalhandler/index.js" (module, __unused_rspack_exports, __nested_rspack_require_23493_23512__) {
+    "./node_modules/.pnpm/finalhandler@2.1.1_supports-color@8.1.1/node_modules/finalhandler/index.js" (module, __unused_rspack_exports, __nested_rspack_require_23514_23533__) {
         /*!
  * finalhandler
  * Copyright(c) 2014-2022 Douglas Christopher Wilson
  * MIT Licensed
- */ var debug = __nested_rspack_require_23493_23512__("./node_modules/.pnpm/debug@4.4.3_supports-color@8.1.1/node_modules/debug/src/index.js")('finalhandler');
-        var encodeUrl = __nested_rspack_require_23493_23512__("./node_modules/.pnpm/encodeurl@2.0.0/node_modules/encodeurl/index.js");
-        var escapeHtml = __nested_rspack_require_23493_23512__("./node_modules/.pnpm/escape-html@1.0.3/node_modules/escape-html/index.js");
-        var onFinished = __nested_rspack_require_23493_23512__("./node_modules/.pnpm/on-finished@2.4.1/node_modules/on-finished/index.js");
-        var parseUrl = __nested_rspack_require_23493_23512__("./node_modules/.pnpm/parseurl@1.3.3/node_modules/parseurl/index.js");
-        var statuses = __nested_rspack_require_23493_23512__("./node_modules/.pnpm/statuses@2.0.2/node_modules/statuses/index.js");
+ */ var debug = __nested_rspack_require_23514_23533__("./node_modules/.pnpm/debug@4.4.3_supports-color@8.1.1/node_modules/debug/src/index.js")('finalhandler');
+        var encodeUrl = __nested_rspack_require_23514_23533__("./node_modules/.pnpm/encodeurl@2.0.0/node_modules/encodeurl/index.js");
+        var escapeHtml = __nested_rspack_require_23514_23533__("./node_modules/.pnpm/escape-html@1.0.3/node_modules/escape-html/index.js");
+        var onFinished = __nested_rspack_require_23514_23533__("./node_modules/.pnpm/on-finished@2.4.1/node_modules/on-finished/index.js");
+        var parseUrl = __nested_rspack_require_23514_23533__("./node_modules/.pnpm/parseurl@1.3.3/node_modules/parseurl/index.js");
+        var statuses = __nested_rspack_require_23514_23533__("./node_modules/.pnpm/statuses@2.0.2/node_modules/statuses/index.js");
         var isFinished = onFinished.isFinished;
         function createHtmlDocument(message) {
             var body = escapeHtml(message).replaceAll('\n', '<br>').replaceAll('  ', ' &nbsp;');
@@ -781,7 +781,7 @@ __nested_rspack_require_364__.add({
             return Math.round(ms / n) + ' ' + name + (isPlural ? 's' : '');
         }
     },
-    "./node_modules/.pnpm/on-finished@2.4.1/node_modules/on-finished/index.js" (module, __unused_rspack_exports, __nested_rspack_require_32097_32116__) {
+    "./node_modules/.pnpm/on-finished@2.4.1/node_modules/on-finished/index.js" (module, __unused_rspack_exports, __nested_rspack_require_32118_32137__) {
         /*!
  * on-finished
  * Copyright(c) 2013 Jonathan Ong
@@ -790,7 +790,7 @@ __nested_rspack_require_364__.add({
  */ module.exports = onFinished;
         module.exports.isFinished = isFinished;
         var asyncHooks = tryRequireAsyncHooks();
-        var first = __nested_rspack_require_32097_32116__("./node_modules/.pnpm/ee-first@1.1.1/node_modules/ee-first/index.js");
+        var first = __nested_rspack_require_32118_32137__("./node_modules/.pnpm/ee-first@1.1.1/node_modules/ee-first/index.js");
         var defer = 'function' == typeof setImmediate ? setImmediate : function(fn) {
             process.nextTick(fn.bind.apply(fn, arguments));
         };
@@ -869,7 +869,7 @@ __nested_rspack_require_364__.add({
         }
         function tryRequireAsyncHooks() {
             try {
-                return __nested_rspack_require_32097_32116__("async_hooks");
+                return __nested_rspack_require_32118_32137__("async_hooks");
             } catch (e) {
                 return {};
             }
@@ -881,13 +881,13 @@ __nested_rspack_require_364__.add({
             return res.runInAsyncScope.bind(res, fn, null);
         }
     },
-    "./node_modules/.pnpm/parseurl@1.3.3/node_modules/parseurl/index.js" (module, __unused_rspack_exports, __nested_rspack_require_36017_36036__) {
+    "./node_modules/.pnpm/parseurl@1.3.3/node_modules/parseurl/index.js" (module, __unused_rspack_exports, __nested_rspack_require_36038_36057__) {
         /*!
  * parseurl
  * Copyright(c) 2014 Jonathan Ong
  * Copyright(c) 2014-2017 Douglas Christopher Wilson
  * MIT Licensed
- */ var url = __nested_rspack_require_36017_36036__("url");
+ */ var url = __nested_rspack_require_36038_36057__("url");
         var parse = url.parse;
         var Url = url.Url;
         module.exports = parseurl;
@@ -947,13 +947,13 @@ __nested_rspack_require_364__.add({
             return 'object' == typeof parsedUrl && null !== parsedUrl && (void 0 === Url || parsedUrl instanceof Url) && parsedUrl._raw === url;
         }
     },
-    "./node_modules/.pnpm/statuses@2.0.2/node_modules/statuses/index.js" (module, __unused_rspack_exports, __nested_rspack_require_38488_38507__) {
+    "./node_modules/.pnpm/statuses@2.0.2/node_modules/statuses/index.js" (module, __unused_rspack_exports, __nested_rspack_require_38509_38528__) {
         /*!
  * statuses
  * Copyright(c) 2014 Jonathan Ong
  * Copyright(c) 2016 Douglas Christopher Wilson
  * MIT Licensed
- */ var codes = __nested_rspack_require_38488_38507__("./node_modules/.pnpm/statuses@2.0.2/node_modules/statuses/codes.json");
+ */ var codes = __nested_rspack_require_38509_38528__("./node_modules/.pnpm/statuses@2.0.2/node_modules/statuses/codes.json");
         module.exports = status;
         status.message = codes;
         status.code = createMessageToStatusCodeMap(codes);
@@ -1008,10 +1008,10 @@ __nested_rspack_require_364__.add({
             return getStatusCode(code);
         }
     },
-    "./node_modules/.pnpm/supports-color@8.1.1/node_modules/supports-color/index.js" (module, __unused_rspack_exports, __nested_rspack_require_40780_40799__) {
-        const os = __nested_rspack_require_40780_40799__("os");
-        const tty = __nested_rspack_require_40780_40799__("tty");
-        const hasFlag = __nested_rspack_require_40780_40799__("./node_modules/.pnpm/has-flag@4.0.0/node_modules/has-flag/index.js");
+    "./node_modules/.pnpm/supports-color@8.1.1/node_modules/supports-color/index.js" (module, __unused_rspack_exports, __nested_rspack_require_40801_40820__) {
+        const os = __nested_rspack_require_40801_40820__("os");
+        const tty = __nested_rspack_require_40801_40820__("tty");
+        const hasFlag = __nested_rspack_require_40801_40820__("./node_modules/.pnpm/has-flag@4.0.0/node_modules/has-flag/index.js");
         const { env } = process;
         let flagForceColor;
         if (hasFlag('no-color') || hasFlag('no-colors') || hasFlag('color=false') || hasFlag('color=never')) flagForceColor = 0;
@@ -1115,7 +1115,7 @@ __nested_rspack_require_364__.add({
 });
 const src = __nested_rspack_require_364__("./node_modules/.pnpm/debug@4.4.3_supports-color@8.1.1/node_modules/debug/src/index.js");
 var src_default = /*#__PURE__*/ __nested_rspack_require_364__.n(src);
-const dist_finalhandler = __nested_rspack_require_364__("./node_modules/.pnpm/finalhandler@2.1.1/node_modules/finalhandler/index.js");
+const dist_finalhandler = __nested_rspack_require_364__("./node_modules/.pnpm/finalhandler@2.1.1_supports-color@8.1.1/node_modules/finalhandler/index.js");
 var finalhandler_default = /*#__PURE__*/ __nested_rspack_require_364__.n(dist_finalhandler);
 const dist_parseurl = __nested_rspack_require_364__("./node_modules/.pnpm/parseurl@1.3.3/node_modules/parseurl/index.js");
 var parseurl_default = /*#__PURE__*/ __nested_rspack_require_364__.n(dist_parseurl);
@@ -1219,13 +1219,29 @@ function call(handle, route, err, req, res, next) {
     const hasError = void 0 !== err;
     dist_debug('%s %s : %s', handle.name || '<anonymous>', route, req.originalUrl);
     try {
-        if (hasError && 4 === arity) return void handle(err, req, res, next);
-        if (!hasError && arity < 4) return void handle(req, res, next);
+        if (hasError && 4 === arity) {
+            const result = handle(err, req, res, next);
+            handlePromise(result, next);
+            return;
+        }
+        if (!hasError && arity < 4) {
+            const result = handle(req, res, next);
+            handlePromise(result, next);
+            return;
+        }
     } catch (caughtError) {
         error = caughtError;
     }
     next(error);
 }
+function isPromise(value) {
+    return null !== value && ('object' == typeof value || 'function' == typeof value) && 'function' == typeof value.then;
+}
+function handlePromise(result, next) {
+    if (isPromise(result)) result.then(null, (error)=>{
+        next(error || new Error('Rejected promise'));
+    });
+}
 function logerror(err) {
     if ('test' !== dist_env) {
         if (err instanceof Error) return void console.error(err.stack || err.toString());

package/dist/0~open.js

@@ -127,24 +127,64 @@ const wslDefaultBrowser = async ()=>{
     const psPath = await wsl_utils_powerShellPath();
     const command = String.raw`(Get-ItemProperty -Path "HKCU:\Software\Microsoft\Windows\Shell\Associations\UrlAssociations\http\UserChoice").ProgId`;
     const { stdout } = await executePowerShell(command, {
-        powerShellPath: psPath
+        powerShellPath: psPath,
+        cwd: node_path.dirname(psPath)
     });
     return stdout.trim();
 };
-const convertWslPathToWindows = async (path)=>{
-    if (/^[a-z]+:\/\//i.test(path)) return path;
-    try {
+const isUrl = (path)=>/^[a-z]+:\/\//i.test(path);
+const convertWslPathToWindows = async (paths)=>{
+    const isBatch = Array.isArray(paths);
+    const pathArray = isBatch ? paths : [
+        paths
+    ];
+    const indicesToConvert = [];
+    const pathsToConvert = [];
+    for (const [index, path] of pathArray.entries())if (!isUrl(path)) {
+        indicesToConvert.push(index);
+        pathsToConvert.push(path);
+    }
+    const results = [
+        ...pathArray
+    ];
+    if (pathsToConvert.length > 0) try {
         const { stdout } = await wsl_utils_execFile('wslpath', [
             '-aw',
-            path
+            ...pathsToConvert
         ], {
             encoding: 'utf8'
         });
-        return stdout.trim();
-    } catch  {
-        return path;
-    }
+        const convertedPaths = stdout.split(/\r?\n/).filter(Boolean);
+        for (const [index, originalIndex] of indicesToConvert.entries())results[originalIndex] = convertedPaths[index] ?? pathArray[originalIndex];
+    } catch  {}
+    return isBatch ? results : results[0];
+};
+const powershell_utils_execFile = promisify(node_child_process.execFile);
+const powershell_utils_powerShellPath = ()=>`${node_process.env.SYSTEMROOT || node_process.env.windir || String.raw`C:\Windows`}\\System32\\WindowsPowerShell\\v1.0\\powershell.exe`;
+const argumentsPrefix = [
+    '-NoProfile',
+    '-NonInteractive',
+    '-ExecutionPolicy',
+    'Bypass',
+    '-EncodedCommand'
+];
+const encodeCommand = (command)=>Buffer.from(command, 'utf16le').toString('base64');
+const escapeArgument = (value)=>`'${String(value).replaceAll('\'', '\'\'')}'`;
+const createArguments = (command)=>[
+        ...argumentsPrefix,
+        encodeCommand(command)
+    ];
+const powershell_utils_executePowerShell = async (command, options = {})=>{
+    const { powerShellPath: psPath, ...execFileOptions } = options;
+    return powershell_utils_execFile(psPath ?? powershell_utils_powerShellPath(), createArguments(command), {
+        encoding: 'utf8',
+        ...execFileOptions
+    });
 };
+powershell_utils_executePowerShell.argumentsPrefix = argumentsPrefix;
+powershell_utils_executePowerShell.encodeCommand = encodeCommand;
+powershell_utils_executePowerShell.escapeArgument = escapeArgument;
+powershell_utils_executePowerShell.createArguments = createArguments;
 function defineLazyProperty(object, propertyName, valueGetter) {
     const define = (value)=>Object.defineProperty(object, propertyName, {
             value,
@@ -409,7 +449,7 @@ const baseOpen = async (options)=>{
         if (app) cliArguments.push('-a', app);
     } else if ('win32' === platform || shouldUseWindowsInWsl) {
         command = await wsl_utils_powerShellPath();
-        cliArguments.push(...executePowerShell.argumentsPrefix);
+        cliArguments.push(...powershell_utils_executePowerShell.argumentsPrefix);
         if (!is_wsl) childProcessOptions.windowsVerbatimArguments = true;
         if (is_wsl && options.target) options.target = await convertWslPathToWindows(options.target);
         const encodedArguments = [
@@ -418,15 +458,16 @@ const baseOpen = async (options)=>{
         ];
         if (options.wait) encodedArguments.push('-Wait');
         if (app) {
-            encodedArguments.push(executePowerShell.escapeArgument(app));
+            encodedArguments.push(powershell_utils_executePowerShell.escapeArgument(app));
             if (options.target) appArguments.push(options.target);
-        } else if (options.target) encodedArguments.push(executePowerShell.escapeArgument(options.target));
+        } else if (options.target) encodedArguments.push(powershell_utils_executePowerShell.escapeArgument(options.target));
         if (appArguments.length > 0) {
-            appArguments = appArguments.map((argument)=>executePowerShell.escapeArgument(argument));
+            appArguments = appArguments.map((argument)=>powershell_utils_executePowerShell.escapeArgument(argument));
             encodedArguments.push('-ArgumentList', appArguments.join(','));
         }
-        options.target = executePowerShell.encodeCommand(encodedArguments.join(' '));
+        options.target = powershell_utils_executePowerShell.encodeCommand(encodedArguments.join(' '));
         if (!options.wait) childProcessOptions.stdio = 'ignore';
+        if (is_wsl) childProcessOptions.cwd = node_path.dirname(command);
     } else {
         if (app) command = app;
         else {