@umijs/utils 4.0.37 → 4.0.39

package/dist/getDevBanner.js

@@ -28,9 +28,6 @@ module.exports = __toCommonJS(getDevBanner_exports);
 var import_address = __toESM(require("../compiled/address"));
 var import_chalk = __toESM(require("../compiled/chalk"));
 var import_strip_ansi = __toESM(require("../compiled/strip-ansi"));
-var logger = __toESM(require("./logger"));
-var import_openBrowser = require("./openBrowser");
-var import_readline = __toESM(require("readline"));
 var BORDERS = {
   TL: import_chalk.default.gray.dim("\u2554"),
   TR: import_chalk.default.gray.dim("\u2557"),
@@ -42,15 +39,9 @@ var BORDERS = {
 function getDevBanner(protocol, host = "0.0.0.0", port, offset = 8) {
   const header = " App listening at:";
   const footer = import_chalk.default.bold(" Now you can open browser with the above addresses\u2191 ");
-  const localUrl = `${protocol}//${host === "0.0.0.0" ? "localhost" : host}:${port}`;
-  const local = `  ${import_chalk.default.gray(">")}   Local: ${import_chalk.default.green(localUrl)} `;
+  const local = `  ${import_chalk.default.gray(">")}   Local: ${import_chalk.default.green(`${protocol}//${host === "0.0.0.0" ? "localhost" : host}:${port}`)} `;
   const network = `  ${import_chalk.default.gray(">")} Network: ${import_chalk.default.green(`${protocol}//${import_address.default.ip()}:${port}`)} `;
-  const isOpenShortcuts = !process.env.CI && process.env.UMI_SHORTCUTS !== "none";
-  const shortcutsHelper = import_chalk.default.gray(` Press ${import_chalk.default.cyan.bold("h")} to show shortcuts help`);
-  if (isOpenShortcuts) {
-    initShortcuts({ localUrl });
-  }
-  const maxLen = Math.max(...[header, footer, local, network, isOpenShortcuts && shortcutsHelper].filter(Boolean).map((x) => (0, import_strip_ansi.default)(x).length));
+  const maxLen = Math.max(...[header, footer, local, network].map((x) => (0, import_strip_ansi.default)(x).length));
   const beforeLines = [
     `${BORDERS.TL}${import_chalk.default.gray.dim("".padStart(maxLen, BORDERS.H_PURE))}${BORDERS.TR}`,
     `${BORDERS.V}${header}${"".padStart(maxLen - header.length)}${BORDERS.V}`,
@@ -59,73 +50,15 @@ function getDevBanner(protocol, host = "0.0.0.0", port, offset = 8) {
   const mainLine = `${BORDERS.V}${network}${"".padStart(maxLen - (0, import_strip_ansi.default)(network).length)}${BORDERS.V}`;
   const afterLines = [
     `${BORDERS.V}${"".padStart(maxLen)}${BORDERS.V}`,
-    isOpenShortcuts && `${BORDERS.V}${shortcutsHelper}${"".padStart(maxLen - (0, import_strip_ansi.default)(shortcutsHelper).length)}${BORDERS.V}`,
     `${BORDERS.V}${footer}${"".padStart(maxLen - (0, import_strip_ansi.default)(footer).length)}${BORDERS.V}`,
     `${BORDERS.BL}${import_chalk.default.gray.dim("".padStart(maxLen, BORDERS.H_PURE))}${BORDERS.BR}`
-  ].filter(Boolean);
+  ];
   return {
     before: beforeLines.map((l) => l.padStart(l.length + offset)).join("\n"),
     main: mainLine,
     after: afterLines.map((l) => l.padStart(l.length + offset)).join("\n")
   };
 }
-function initShortcuts(opts) {
-  const { localUrl } = opts;
-  const shortcuts = [
-    {
-      key: "r" /* r */,
-      description: "restart the server",
-      action() {
-        process.emit("UMI_RESTART_SERVER");
-      }
-    },
-    {
-      key: "o" /* o */,
-      description: "open in browser",
-      action() {
-        if (!localUrl) {
-          logger.warn("No URL available to open in browser");
-          return;
-        }
-        (0, import_openBrowser.openBrowser)(localUrl);
-      }
-    },
-    {
-      key: "q" /* q */,
-      description: "quit",
-      action() {
-        logger.event(`Shutdown server`);
-        process.exit(1);
-      }
-    }
-  ];
-  let active = false;
-  const onKeypress = async (input) => {
-    if (input === "" || input === "") {
-      process.exit(1);
-    }
-    if (active)
-      return;
-    if (input === "h" /* h */) {
-      console.log(`
-${import_chalk.default.bold("Shortcuts help")}:`);
-      console.log(shortcuts.map((shortcut2) => import_chalk.default.dim("  Press ") + import_chalk.default.cyan.bold(shortcut2.key) + import_chalk.default.dim(` to ${shortcut2.description}`)).join("\n"));
-      console.log();
-    }
-    const shortcut = shortcuts.find((shortcut2) => shortcut2.key === input);
-    if (!shortcut) {
-      return;
-    }
-    active = true;
-    await shortcut.action();
-    active = false;
-  };
-  import_readline.default.emitKeypressEvents(process.stdin);
-  if (process.stdin.isTTY) {
-    process.stdin.setRawMode(true);
-  }
-  process.stdin.on("keypress", onKeypress);
-}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   getDevBanner

package/dist/index.d.ts

@@ -41,5 +41,4 @@ export * as register from './register';
 export * from './tryPaths';
 export * from './winPath';
 export * from './setNoDeprecation';
-export * from './openBrowser';
 export { address, axios, chalk, cheerio, chokidar, crossSpawn, debug, deepmerge, execa, fsExtra, glob, Generator, BaseGenerator, generateFile, installDeps, lodash, logger, Mustache, pkgUp, portfinder, prompts, resolve, rimraf, semver, stripAnsi, updatePackageJSON, yParser, getGitInfo, printHelp, filesize, gzipSize, fastestLevenshtein, };

package/dist/index.js

@@ -101,7 +101,6 @@ var register = __toESM(require("./register"));
 __reExport(src_exports, require("./tryPaths"), module.exports);
 __reExport(src_exports, require("./winPath"), module.exports);
 __reExport(src_exports, require("./setNoDeprecation"), module.exports);
-__reExport(src_exports, require("./openBrowser"), module.exports);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   BaseGenerator,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/utils",
-  "version": "4.0.37",
+  "version": "4.0.39",
   "homepage": "https://github.com/umijs/umi/tree/master/packages/utils#readme",
   "bugs": "https://github.com/umijs/umi/issues",
   "repository": {
@@ -52,7 +52,6 @@
     "import-lazy": "4.0.0",
     "lodash": "4.17.21",
     "mustache": "4.2.0",
-    "open": "8.4.0",
     "pirates": "4.0.5",
     "pkg-up": "4.0.0",
     "portfinder": "1.0.28",

package/compiled/open/LICENSE

@@ -1,9 +0,0 @@
-MIT License
-
-Copyright (c) Sindre Sorhus <sindresorhus@gmail.com> (https://sindresorhus.com)
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

package/compiled/open/index.d.ts

@@ -1,153 +0,0 @@
-import {ChildProcess} from 'child_process';
-
-declare namespace open {
-	interface Options {
-		/**
-		Wait for the opened app to exit before fulfilling the promise. If `false` it's fulfilled immediately when opening the app.
-
-		Note that it waits for the app to exit, not just for the window to close.
-
-		On Windows, you have to explicitly specify an app for it to be able to wait.
-
-		@default false
-		*/
-		readonly wait?: boolean;
-
-		/**
-		__macOS only__
-
-		Do not bring the app to the foreground.
-
-		@default false
-		*/
-		readonly background?: boolean;
-
-		/**
-		__macOS only__
-
-		Open a new instance of the app even it's already running.
-
-		A new instance is always opened on other platforms.
-
-		@default false
-		*/
-		readonly newInstance?: boolean;
-
-		/**
-		Specify the `name` of the app to open the `target` with, and optionally, app `arguments`. `app` can be an array of apps to try to open and `name` can be an array of app names to try. If each app fails, the last error will be thrown.
-
-		The app name is platform dependent. Don't hard code it in reusable modules. For example, Chrome is `google chrome` on macOS, `google-chrome` on Linux and `chrome` on Windows. If possible, use [`open.apps`](#openapps) which auto-detects the correct binary to use.
-
-		You may also pass in the app's full path. For example on WSL, this can be `/mnt/c/Program Files (x86)/Google/Chrome/Application/chrome.exe` for the Windows installation of Chrome.
-
-		The app `arguments` are app dependent. Check the app's documentation for what arguments it accepts.
-		*/
-		readonly app?: App | readonly App[];
-
-		/**
-		Allow the opened app to exit with nonzero exit code when the `wait` option is `true`.
-
-		We do not recommend setting this option. The convention for success is exit code zero.
-
-		@default false
-		*/
-		readonly allowNonzeroExitCode?: boolean;
-	}
-
-	interface OpenAppOptions extends Omit<Options, 'app'> {
-		/**
-		Arguments passed to the app.
-
-		These arguments are app dependent. Check the app's documentation for what arguments it accepts.
-		*/
-		readonly arguments?: readonly string[];
-	}
-
-	type AppName =
-		| 'chrome'
-		| 'firefox'
-		| 'edge';
-
-	type App = {
-		name: string | readonly string[];
-		arguments?: readonly string[];
-	};
-}
-
-// eslint-disable-next-line no-redeclare
-declare const open: {
-	/**
-	Open stuff like URLs, files, executables. Cross-platform.
-
-	Uses the command `open` on macOS, `start` on Windows and `xdg-open` on other platforms.
-
-	There is a caveat for [double-quotes on Windows](https://github.com/sindresorhus/open#double-quotes-on-windows) where all double-quotes are stripped from the `target`.
-
-	@param target - The thing you want to open. Can be a URL, file, or executable. Opens in the default app for the file type. For example, URLs open in your default browser.
-	@returns The [spawned child process](https://nodejs.org/api/child_process.html#child_process_class_childprocess). You would normally not need to use this for anything, but it can be useful if you'd like to attach custom event listeners or perform other operations directly on the spawned process.
-
-	@example
-	```
-	import open = require('./open');
-
-	// Opens the image in the default image viewer
-	await open('unicorn.png', {wait: true});
-	console.log('The image viewer app closed');
-
-	// Opens the url in the default browser
-	await open('https://sindresorhus.com');
-
-	// Opens the URL in a specified browser.
-	await open('https://sindresorhus.com', {app: {name: 'firefox'}});
-
-	// Specify app arguments.
-	await open('https://sindresorhus.com', {app: {name: 'google chrome', arguments: ['--incognito']}});
-	```
-	*/
-	(
-		target: string,
-		options?: open.Options
-	): Promise<ChildProcess>;
-
-	/**
-	An object containing auto-detected binary names for common apps. Useful to work around cross-platform differences.
-
-	@example
-	```
-	import open = require('./open');
-
-	await open('https://google.com', {
-		app: {
-			name: open.apps.chrome
-		}
-	});
-	```
-	*/
-	apps: Record<open.AppName, string | readonly string[]>;
-
-	/**
-	Open an app. Cross-platform.
-
-	Uses the command `open` on macOS, `start` on Windows and `xdg-open` on other platforms.
-
-	@param name - The app you want to open. Can be either builtin supported `open.apps` names or other name supported in platform.
-	@returns The [spawned child process](https://nodejs.org/api/child_process.html#child_process_class_childprocess). You would normally not need to use this for anything, but it can be useful if you'd like to attach custom event listeners or perform other operations directly on the spawned process.
-
-	@example
-	```
-	const {apps, openApp} = require('open');
-
-	// Open Firefox
-	await openApp(apps.firefox);
-
-	// Open Chrome incognito mode
-	await openApp(apps.chrome, {arguments: ['--incognito']});
-
-	// Open Xcode
-	await openApp('xcode');
-	```
-	*/
-	openApp: (name: open.App['name'], options?: open.OpenAppOptions) => Promise<ChildProcess>;
-};
-
-export = open;

package/compiled/open/index.js

@@ -1 +0,0 @@
-(function(){var e={34:function(e){"use strict";e.exports=(e,r,t)=>{const define=t=>Object.defineProperty(e,r,{value:t,enumerable:true,writable:true});Object.defineProperty(e,r,{configurable:true,enumerable:true,get(){const e=t();define(e);return e},set(e){define(e)}});return e}},148:function(e,r,t){"use strict";const n=t(147);let o;function hasDockerEnv(){try{n.statSync("/.dockerenv");return true}catch(e){return false}}function hasDockerCGroup(){try{return n.readFileSync("/proc/self/cgroup","utf8").includes("docker")}catch(e){return false}}e.exports=()=>{if(o===undefined){o=hasDockerEnv()||hasDockerCGroup()}return o}},272:function(e,r,t){"use strict";const n=t(37);const o=t(147);const s=t(148);const isWsl=()=>{if(process.platform!=="linux"){return false}if(n.release().toLowerCase().includes("microsoft")){if(s()){return false}return true}try{return o.readFileSync("/proc/version","utf8").toLowerCase().includes("microsoft")?!s():false}catch(e){return false}};if(process.env.__IS_WSL_TEST__){e.exports=isWsl}else{e.exports=isWsl()}},537:function(e,r,t){const n=t(17);const o=t(81);const{promises:s,constants:i}=t(147);const a=t(272);const c=t(148);const u=t(34);const f=t.ab+"xdg-open";const{platform:p,arch:l}=process;const d=(()=>{const e="/mnt/";let r;return async function(){if(r){return r}const t="/etc/wsl.conf";let n=false;try{await s.access(t,i.F_OK);n=true}catch{}if(!n){return e}const o=await s.readFile(t,{encoding:"utf8"});const a=/(?<!#.*)root\s*=\s*(?<mountPoint>.*)/g.exec(o);if(!a){return e}r=a.groups.mountPoint.trim();r=r.endsWith("/")?r:`${r}/`;return r}})();const pTryEach=async(e,r)=>{let t;for(const n of e){try{return await r(n)}catch(e){t=e}}throw t};const baseOpen=async e=>{e={wait:false,background:false,newInstance:false,allowNonzeroExitCode:false,...e};if(Array.isArray(e.app)){return pTryEach(e.app,(r=>baseOpen({...e,app:r})))}let{name:r,arguments:n=[]}=e.app||{};n=[...n];if(Array.isArray(r)){return pTryEach(r,(r=>baseOpen({...e,app:{name:r,arguments:n}})))}let u;const l=[];const m={};if(p==="darwin"){u="open";if(e.wait){l.push("--wait-apps")}if(e.background){l.push("--background")}if(e.newInstance){l.push("--new")}if(r){l.push("-a",r)}}else if(p==="win32"||a&&!c()){const t=await d();u=a?`${t}c/Windows/System32/WindowsPowerShell/v1.0/powershell.exe`:`${process.env.SYSTEMROOT}\\System32\\WindowsPowerShell\\v1.0\\powershell`;l.push("-NoProfile","-NonInteractive","–ExecutionPolicy","Bypass","-EncodedCommand");if(!a){m.windowsVerbatimArguments=true}const o=["Start"];if(e.wait){o.push("-Wait")}if(r){o.push(`"\`"${r}\`""`,"-ArgumentList");if(e.target){n.unshift(e.target)}}else if(e.target){o.push(`"${e.target}"`)}if(n.length>0){n=n.map((e=>`"\`"${e}\`""`));o.push(n.join(","))}e.target=Buffer.from(o.join(" "),"utf16le").toString("base64")}else{if(r){u=r}else{const e=!__dirname||__dirname==="/";let r=false;try{await s.access(t.ab+"xdg-open",i.X_OK);r=true}catch{}const n=process.versions.electron||p==="android"||e||!r;u=n?"xdg-open":f}if(n.length>0){l.push(...n)}if(!e.wait){m.stdio="ignore";m.detached=true}}if(e.target){l.push(e.target)}if(p==="darwin"&&n.length>0){l.push("--args",...n)}const w=o.spawn(u,l,m);if(e.wait){return new Promise(((r,t)=>{w.once("error",t);w.once("close",(n=>{if(e.allowNonzeroExitCode&&n>0){t(new Error(`Exited with code ${n}`));return}r(w)}))}))}w.unref();return w};const open=(e,r)=>{if(typeof e!=="string"){throw new TypeError("Expected a `target`")}return baseOpen({...r,target:e})};const openApp=(e,r)=>{if(typeof e!=="string"){throw new TypeError("Expected a `name`")}const{arguments:t=[]}=r||{};if(t!==undefined&&t!==null&&!Array.isArray(t)){throw new TypeError("Expected `appArguments` as Array type")}return baseOpen({...r,app:{name:e,arguments:t}})};function detectArchBinary(e){if(typeof e==="string"||Array.isArray(e)){return e}const{[l]:r}=e;if(!r){throw new Error(`${l} is not supported`)}return r}function detectPlatformBinary({[p]:e},{wsl:r}){if(r&&a){return detectArchBinary(r)}if(!e){throw new Error(`${p} is not supported`)}return detectArchBinary(e)}const m={};u(m,"chrome",(()=>detectPlatformBinary({darwin:"google chrome",win32:"chrome",linux:["google-chrome","google-chrome-stable","chromium"]},{wsl:{ia32:"/mnt/c/Program Files (x86)/Google/Chrome/Application/chrome.exe",x64:["/mnt/c/Program Files/Google/Chrome/Application/chrome.exe","/mnt/c/Program Files (x86)/Google/Chrome/Application/chrome.exe"]}})));u(m,"firefox",(()=>detectPlatformBinary({darwin:"firefox",win32:"C:\\Program Files\\Mozilla Firefox\\firefox.exe",linux:"firefox"},{wsl:"/mnt/c/Program Files/Mozilla Firefox/firefox.exe"})));u(m,"edge",(()=>detectPlatformBinary({darwin:"microsoft edge",win32:"msedge",linux:["microsoft-edge","microsoft-edge-dev"]},{wsl:"/mnt/c/Program Files (x86)/Microsoft/Edge/Application/msedge.exe"})));open.apps=m;open.openApp=openApp;e.exports=open},81:function(e){"use strict";e.exports=require("child_process")},147:function(e){"use strict";e.exports=require("fs")},37:function(e){"use strict";e.exports=require("os")},17:function(e){"use strict";e.exports=require("path")}};var r={};function __nccwpck_require__(t){var n=r[t];if(n!==undefined){return n.exports}var o=r[t]={exports:{}};var s=true;try{e[t](o,o.exports,__nccwpck_require__);s=false}finally{if(s)delete r[t]}return o.exports}if(typeof __nccwpck_require__!=="undefined")__nccwpck_require__.ab=__dirname+"/";var t=__nccwpck_require__(537);module.exports=t})();

package/compiled/open/package.json

@@ -1 +0,0 @@
-{"name":"open","version":"8.4.0","author":{"name":"Sindre Sorhus","email":"sindresorhus@gmail.com","url":"https://sindresorhus.com"},"license":"MIT"}