@modern-js/utils 2.18.0 → 2.18.1

package/dist/esm/{nodeEnv.js → cli/package.js}

@@ -1,4 +1,10 @@
-import { execa } from "./compiled";
+import { execa } from "../compiled";
+export async function getPnpmVersion() {
+  const { stdout } = await execa("pnpm", [
+    "--version"
+  ]);
+  return stdout;
+}
 export async function canUseNpm() {
   try {
     await execa("npm", [

package/dist/esm/{path.js → cli/path.js}

@@ -1,7 +1,7 @@
 import path from "path";
 import os from "os";
 import fs from "fs";
-import { nanoid, upath, lodash as _ } from "./compiled";
+import { nanoid, upath, lodash as _ } from "../compiled";
 export const isPathString = (test) => path.posix.basename(test) !== test || path.win32.basename(test) !== test;
 export const isRelativePath = (test) => /^\.\.?($|[\\/])/.test(test);
 export const normalizeOutputPath = (s) => s.replace(/\\/g, "\\\\");
@@ -41,3 +41,6 @@ export function getRealTemporaryDirectory() {
 export function splitPathString(str) {
   return str.split(/[\\/]/);
 }
+export const removeLeadingSlash = (s) => s.replace(/^\/+/, "");
+export const removeTailSlash = (s) => s.replace(/\/+$/, "");
+export const removeSlash = (s) => removeLeadingSlash(removeTailSlash(s));

package/dist/esm/{pathSerializer.js → cli/pathSerializer.js}

@@ -1,5 +1,5 @@
 import os from "os";
-import _ from "../compiled/lodash";
+import _ from "../../compiled/lodash";
 import { compilePathMatcherRegExp, normalizeToPosixPath, getRealTemporaryDirectory, splitPathString, upwardPaths } from "./path";
 export const matchUpwardPathsAsUnknown = (p) => _(upwardPaths(normalizeToPosixPath(p))).map((match) => ({
   match,

package/dist/esm/{getPort.js → cli/port.js}

@@ -1,5 +1,5 @@
 import net from "net";
-import { chalk } from "./compiled";
+import { chalk } from "../compiled";
 import { logger } from "./logger";
 export const getPort = async (port, { tryLimits = 20, strictPort = false } = {}) => {
   if (typeof port === "string") {

package/dist/esm/{prettyInstructions.js → cli/prettyInstructions.js}

@@ -1,9 +1,9 @@
 import os from "os";
-import { chalk } from "./compiled";
+import { chalk } from "../compiled";
 import { isDev, isSingleEntry } from "./is";
 import { DEFAULT_DEV_HOST } from "./constants";
 const normalizeUrl = (url) => url.replace(/([^:]\/)\/+/g, "$1");
-export const getIpv4Interfaces = () => {
+const getIpv4Interfaces = () => {
   const interfaces = os.networkInterfaces();
   const ipv4Interfaces = [];
   Object.keys(interfaces).forEach((key) => {

package/dist/esm/{printBuildError.js → cli/print.js}

@@ -1,4 +1,4 @@
-import { chalk } from "./compiled";
+import { chalk } from "../compiled";
 import { logger } from "./logger";
 export function printBuildError(err) {
   const message = err != null && err.message;

package/dist/esm/{compatRequire.js → cli/require.js}

@@ -1,4 +1,4 @@
-import { findExists } from "./findExists";
+import { findExists } from "./fs";
 export const compatRequire = (filePath, interop = true) => {
   const mod = require(filePath);
   const rtnESMDefault = interop && (mod === null || mod === void 0 ? void 0 : mod.__esModule);
@@ -33,3 +33,20 @@ export function deleteRequireCache(path) {
     module.children = module.children.filter((item) => item.filename !== path);
   }
 }
+export const tryResolve = (name, resolvePath) => {
+  let filePath = "";
+  try {
+    filePath = require.resolve(name, {
+      paths: [
+        resolvePath
+      ]
+    });
+    delete require.cache[filePath];
+  } catch (err) {
+    if (err.code === "MODULE_NOT_FOUND") {
+      throw new Error(`Can not find module ${name}.`);
+    }
+    throw err;
+  }
+  return filePath;
+};

package/dist/esm/{routes.js → cli/routes.js}

@@ -1,7 +1,7 @@
 import path from "path";
-import { normalizeToPosixPath } from "./path";
 import { MAIN_ENTRY_NAME } from "./constants";
-export const getPathWithoutExt = (filename) => {
+import { normalizeToPosixPath } from "./path";
+const getPathWithoutExt = (filename) => {
   const extname = path.extname(filename);
   return filename.slice(0, -extname.length);
 };

package/dist/esm/{runtimeExports.js → cli/runtimeExports.js}

@@ -1,5 +1,5 @@
 import path from "path";
-import { fs } from "./compiled";
+import { fs } from "../compiled";
 import { normalizeOutputPath } from "./path";
 const memo = (fn) => {
   const cache = /* @__PURE__ */ new Map();

package/dist/esm/{watch.js → cli/watch.js}

@@ -1,5 +1,5 @@
-import * as path from "path";
-import { chokidar } from "./compiled";
+import path from "path";
+import { chokidar } from "../compiled";
 export const WatchChangeType = {
   ADD: "add",
   UNLINK: "unlink",

package/dist/esm/index.js

@@ -1,44 +1,3 @@
 export * from "./compiled";
-export * from "./commands";
-export * from "./FileSizeReporter";
-export * from "./printBuildError";
-export * from "./debug";
-export * from "./findExists";
-export * from "./is";
-export * from "./compatRequire";
-export * from "./logger";
-export * from "./constants";
-export * from "./ensureArray";
-export * from "./ensureAbsolutePath";
-export * from "./clearConsole";
-export * from "./applyOptionsChain";
-export * from "./getBrowserslist";
-export * from "./removeSlash";
-export * from "./getEntryOptions";
-export * from "./getPort";
-export * from "./monorepo";
-export * from "./getPackageManager";
-export * from "./runtimeExports";
-export * from "./readTsConfig";
-export * from "./path";
-export * from "./pathSerializer";
-export * from "./generateMetaTags";
-export * from "./prettyInstructions";
-export * from "./alias";
+export * from "./cli";
 export * from "./import";
-export * from "./watch";
-export * from "./nodeEnv";
-export * from "./wait";
-export * from "./emptyDir";
-export * from "./getServerConfig";
-export * from "./resolve";
-export * from "./analyzeProject";
-export * from "./chainId";
-export * from "./version";
-export * from "./plugin";
-export * from "./routes";
-export * from "./testUtils";
-export * from "./getCoreJsVersion";
-export * from "./react";
-export * from "./getTargetDir";
-export * from "./babel";

package/dist/esm/runtime/router.js

@@ -0,0 +1,2 @@
+export * from "./nestedRoutes";
+export * from "./remixRouter";

package/dist/esm/{ssr.js → runtime-node/index.js}

@@ -1,3 +1,4 @@
 import { createStorage } from "./storage";
 const { run, useContext: useHeaders } = createStorage();
 export { run, useHeaders };
+export { serializeJson } from "./serialize";

package/dist/types/{applyOptionsChain.d.ts → cli/applyOptionsChain.d.ts}

@@ -1,3 +1,3 @@
-import type { Falsy } from './types';
+export type Falsy = false | null | undefined | 0 | '';
 export declare function applyOptionsChain<T, U>(defaults: T, options?: T | ((config: T, utils?: U) => T | void) | Array<T | ((config: T, utils?: U) => T | void)> | Falsy, utils?: U, mergeFn?: typeof Object.assign): T;
 export declare function applyOptionsChain<T, U>(defaults: T, options: T | ((config: T, utils: U) => T | void) | Array<T | ((config: T, utils: U) => T | void)> | Falsy, utils: U, mergeFn?: typeof Object.assign): T;

package/dist/types/{debug.d.ts → cli/common.d.ts}

@@ -3,4 +3,6 @@
  * @param scope - Custom module name of your debug function.
  * @returns Debug function which namespace start with modern-js:.
  */
-export declare const createDebugger: (scope: string) => import("../compiled/debug").Debugger;
+export declare const createDebugger: (scope: string) => import("../../compiled/debug").Debugger;
+export declare const clearConsole: () => void;
+export declare const wait: (time?: number) => Promise<unknown>;

package/dist/types/{constants.d.ts → cli/constants/index.d.ts}

@@ -9,11 +9,6 @@ export declare const ROUTE_SPEC_FILE = "route.json";
  */
 
 export declare const MAIN_ENTRY_NAME = "main";
-/**
- * open editor request path
- */
-
-export declare const LAUNCH_EDITOR_ENDPOINT = "/__open-stack-frame-in-editor";
 /**
  * server side bundles directory, which relative to dist.
  */
@@ -245,4 +240,5 @@ export declare const DEFAULT_BABEL_PRESET_TYPESCRIPT_OPTIONS: {
   allowDeclareFields: boolean;
   optimizeConstEnums: boolean;
   isTSX: boolean;
-};
+};
+export * from './chainId';

package/dist/types/{ensureAbsolutePath.d.ts → cli/ensure.d.ts}

@@ -4,4 +4,5 @@
  * @param filePath - Absolute or relative file path.
  * @returns Resolved absolute file path.
  */
-export declare const ensureAbsolutePath: (base: string, filePath: string) => string;
+export declare const ensureAbsolutePath: (base: string, filePath: string) => string;
+export declare const ensureArray: <T>(params: T | T[]) => T[];

package/dist/types/{findExists.d.ts → cli/fs.d.ts}

@@ -3,4 +3,5 @@
  * @param files - Absolute file paths with extension.
  * @returns The file path if exists, or false if no file exists.
  */
-export declare const findExists: (files: string[]) => string | false;
+export declare const findExists: (files: string[]) => string | false;
+export declare const emptyDir: (dir: string) => Promise<void>;

package/dist/types/cli/get/data.d.ts

@@ -0,0 +1,9 @@
+import { InternalPlugins } from '@modern-js/types';
+export declare function getPackageManager(cwd?: string): Promise<"pnpm" | "npm" | "yarn">;
+export declare const getCoreJsVersion: (corejsPkgPath: string) => string;
+export declare const getAntdMajorVersion: (appDirectory: string) => number | null;
+export declare const defaults: string[];
+export declare const getBrowserslist: (appDirectory: string) => string[];
+export declare function getInternalPlugins(appDirectory: string, internalPlugins?: InternalPlugins): string[];
+export declare const readTsConfig: (root: string) => any;
+export declare const readTsConfigByFile: (filename: string) => any;

package/dist/types/cli/get/index.d.ts

@@ -0,0 +1,4 @@
+export declare const getServerConfig: (appDirectory: string, configFile: string) => Promise<string | false>;
+export declare const getTargetDir: (from: string, baseDir: string, targetBaseDir: string) => string;
+export * from './data';
+export * from './config';

package/dist/types/cli/index.d.ts

@@ -0,0 +1,24 @@
+export * from './constants';
+export * from './get';
+export * from './is';
+export * from './alias';
+export * from './applyOptionsChain';
+export * from './babel';
+export * from './commands';
+export * from './common';
+export * from './ensure';
+export * from './fs';
+export * from './generateMetaTags';
+export * from './logger';
+export * from './monorepo';
+export * from './package';
+export * from './path';
+export * from './pathSerializer';
+export * from './port';
+export * from './prettyInstructions';
+export * from './print';
+export * from './require';
+export * from './routes';
+export * from './runtimeExports';
+export * from './test';
+export * from './watch';

package/dist/types/cli/is/config.d.ts

@@ -0,0 +1,30 @@
+interface EntryPoint {
+  entryName: string;
+}
+/**
+ * Is SSR project
+ *
+ * @param config - User config.
+ * @returns Whether to use server side render.
+ */
+
+export declare const isSSR: (config: any) => boolean;
+export declare const isUseSSRBundle: (config: any) => boolean;
+/**
+ * Is Worker project
+ *
+ * @param config - User config.
+ * @returns Whether to use worker deploy.
+ */
+
+export declare const isServiceWorker: (config: any) => boolean;
+export declare const isRouterV5: (config: {
+  runtime?: {
+    router?: {
+      mode?: string;
+    } | boolean;
+  };
+}) => boolean;
+export declare const isSSGEntry: (config: any, entryName: string, entrypoints: EntryPoint[]) => boolean;
+export declare const isSingleEntry: (entrypoints: EntryPoint[]) => boolean;
+export {};

package/dist/types/{is/nodeEnv.d.ts → cli/is/env.d.ts}

@@ -5,4 +5,5 @@ export declare const getNodeEnv: () => string;
 export declare const isDev: () => boolean;
 export declare const isProd: () => boolean;
 export declare const isTest: () => boolean;
-export declare const isProdProfile: () => boolean;
+export declare const isProdProfile: () => boolean;
+export declare const isFastRefresh: () => boolean;

package/dist/types/cli/is/index.d.ts

@@ -0,0 +1,5 @@
+export * from './env';
+export * from './platform';
+export * from './type';
+export * from './config';
+export * from './project';

package/dist/types/cli/is/project.d.ts

@@ -0,0 +1,25 @@
+/**
+ * Check if the package name is in dependencies or devDependencies.
+ *
+ * @param appDirectory - Project root directory.
+ * @param name - Package name.
+ * @returns True if the name is in dependencies or devDependencies, false otherwise.
+ */
+export declare const isDepExists: (appDirectory: string, name: string) => boolean;
+/**
+ * Try to resolve npm package, return true if package is installed.
+ */
+
+export declare const isPackageInstalled: (name: string, resolvePaths: string | string[]) => boolean;
+export declare const isApiOnly: (appDirectory: string, entryDir?: string) => Promise<boolean>;
+export declare const isWebOnly: () => Promise<boolean>;
+export declare const isBeyondReact17: (cwd: string) => boolean;
+export declare const isReact18: (cwd: string) => boolean;
+/**
+ * Is typescript project.
+ *
+ * @param root - App directory.
+ * @returns Whether to use typescript.
+ */
+
+export declare const isTypescript: (root: string) => boolean;

package/dist/types/{is → cli/is}/type.d.ts

@@ -5,4 +5,12 @@ export declare function isFunction(func: any): func is Function;
 export declare function isObject(obj: unknown): obj is Record<string, any>;
 export declare function isPlainObject(obj: unknown): obj is Record<string, any>;
 export declare function isPromise(obj: any): obj is Promise<any>;
-export declare function isRegExp(obj: any): obj is RegExp;
+export declare function isRegExp(obj: any): obj is RegExp;
+/**
+ * Is Empty object
+ *
+ * @param o - Any object.
+ * @returns Whether it is empty object.
+ */
+
+export declare const isEmpty: (o: Record<string, unknown>) => boolean;

package/dist/types/{logger.d.ts → cli/logger.d.ts}

@@ -1,4 +1,4 @@
-import { Color } from '../compiled/chalk';
+import { Color } from '../../compiled/chalk';
 type LogLevel = 'debug' | 'info' | 'warn' | 'error';
 type LogMsg = number | string | Error | null;
 interface LoggerConfiguration {

package/dist/types/cli/package.d.ts

@@ -0,0 +1,4 @@
+export declare function getPnpmVersion(): Promise<string>;
+export declare function canUseNpm(): Promise<boolean>;
+export declare function canUseYarn(): Promise<boolean>;
+export declare function canUsePnpm(): Promise<boolean>;

package/dist/types/{path.d.ts → cli/path.d.ts}

@@ -1,4 +1,4 @@
-import { lodash as _ } from './compiled';
+import { lodash as _ } from '../compiled';
 export declare const isPathString: (test: string) => boolean;
 export declare const isRelativePath: (test: string) => boolean;
 export declare const normalizeOutputPath: (s: string) => string;
@@ -15,4 +15,7 @@ export declare function compilePathMatcherRegExp(match: string | RegExp): RegExp
 export declare const _joinPathParts: (_part: unknown, i: number, parts: _.List<string>) => string;
 export declare function upwardPaths(start: string): string[];
 export declare function getRealTemporaryDirectory(): string | null;
-export declare function splitPathString(str: string): string[];
+export declare function splitPathString(str: string): string[];
+export declare const removeLeadingSlash: (s: string) => string;
+export declare const removeTailSlash: (s: string) => string;
+export declare const removeSlash: (s: string) => string;

package/dist/types/{prettyInstructions.d.ts → cli/prettyInstructions.d.ts}

@@ -1,6 +1,3 @@
-/// <reference types="node" />
-import os from 'os';
-export declare const getIpv4Interfaces: () => os.NetworkInterfaceInfo[];
 export type AddressUrl = {
   label: string;
   url: string;

package/dist/types/{compatRequire.d.ts → cli/require.d.ts}

@@ -10,4 +10,12 @@ export declare const requireExistModule: (filename: string, opt?: {
   interop?: boolean;
 }) => any;
 export declare const cleanRequireCache: (filelist: string[]) => void;
-export declare function deleteRequireCache(path: string): void;
+export declare function deleteRequireCache(path: string): void;
+/**
+ * Try to resolve npm package entry file path.
+ * @param name - Package name.
+ * @param resolvePath - Path to resolve dependencies.
+ * @returns Resolved file path.
+ */
+
+export declare const tryResolve: (name: string, resolvePath: string) => string;

package/dist/types/cli/routes.d.ts

@@ -0,0 +1 @@
+export declare const getRouteId: (componentPath: string, routesDir: string, entryName: string) => string;

package/dist/types/{watch.d.ts → cli/watch.d.ts}

@@ -4,5 +4,5 @@ type RunTaskType = (option: {
   changedFilePath: string;
   changeType: WatchChangeTypeValueT;
 }) => void | Promise<void>;
-export declare const watch: (watchDir: string | string[], runTask: RunTaskType, ignored?: string[]) => import("./compiled").FSWatcher;
+export declare const watch: (watchDir: string | string[], runTask: RunTaskType, ignored?: string[]) => import("../compiled").FSWatcher;
 export {};

package/dist/types/index.d.ts

@@ -1,44 +1,3 @@
 export * from './compiled';
-export * from './commands';
-export * from './FileSizeReporter';
-export * from './printBuildError';
-export * from './debug';
-export * from './findExists';
-export * from './is';
-export * from './compatRequire';
-export * from './logger';
-export * from './constants';
-export * from './ensureArray';
-export * from './ensureAbsolutePath';
-export * from './clearConsole';
-export * from './applyOptionsChain';
-export * from './getBrowserslist';
-export * from './removeSlash';
-export * from './getEntryOptions';
-export * from './getPort';
-export * from './monorepo';
-export * from './getPackageManager';
-export * from './runtimeExports';
-export * from './readTsConfig';
-export * from './path';
-export * from './pathSerializer';
-export * from './generateMetaTags';
-export * from './prettyInstructions';
-export * from './alias';
-export * from './import';
-export * from './watch';
-export * from './nodeEnv';
-export * from './wait';
-export * from './emptyDir';
-export * from './getServerConfig';
-export * from './resolve';
-export * from './analyzeProject';
-export * from './chainId';
-export * from './version';
-export * from './plugin';
-export * from './routes';
-export * from './testUtils';
-export * from './getCoreJsVersion';
-export * from './react';
-export * from './getTargetDir';
-export * from './babel';
+export * from './cli';
+export * from './import';

package/dist/types/runtime/router.d.ts

@@ -0,0 +1,2 @@
+export * from './nestedRoutes';
+export * from './remixRouter';

package/dist/types/{ssr.d.ts → runtime-node/index.d.ts}

@@ -5,4 +5,5 @@
  */
 import type { IncomingHttpHeaders } from 'http';
 declare const run: <O>(context: IncomingHttpHeaders, cb: () => O | Promise<O>) => Promise<O>, useHeaders: () => IncomingHttpHeaders;
-export { run, useHeaders };
+export { run, useHeaders };
+export { serializeJson } from './serialize';