@modern-js/utils 1.3.6 → 1.3.8-canary.0

package/dist/types/logger.d.ts

@@ -1,63 +1,63 @@
-import { Color } from 'chalk';
+import { Color } from '../compiled/chalk';
 declare type LogLevel = 'debug' | 'info' | 'warn' | 'error';
 interface LoggerConfiguration {
-  color?: typeof Color;
-  label?: string;
-  level?: LogLevel;
+    color?: typeof Color;
+    label?: string;
+    level?: LogLevel;
 }
 interface InstanceConfiguration {
-  displayLabel?: boolean;
-  underlineLabel?: boolean;
-  uppercaseLabel?: boolean;
+    displayLabel?: boolean;
+    underlineLabel?: boolean;
+    uppercaseLabel?: boolean;
 }
 interface ConstructorOptions {
-  config?: InstanceConfiguration;
-  types?: Record<string, LoggerConfiguration>;
+    config?: InstanceConfiguration;
+    types?: Record<string, LoggerConfiguration>;
 }
 declare type LoggerFunction = (message?: number | string | Error, ...args: any[]) => void;
 declare const LOG_TYPES: {
-  error: {
-    color: string;
-    label: string;
-    level: string;
-  };
-  info: {
-    color: string;
-    label: string;
-    level: string;
-  };
-  warn: {
-    color: string;
-    label: string;
-    level: string;
-  };
-  debug: {
-    color: string;
-    label: string;
-    level: string;
-  };
-  log: {
-    level: string;
-  };
+    error: {
+        color: string;
+        label: string;
+        level: string;
+    };
+    info: {
+        color: string;
+        label: string;
+        level: string;
+    };
+    warn: {
+        color: string;
+        label: string;
+        level: string;
+    };
+    debug: {
+        color: string;
+        label: string;
+        level: string;
+    };
+    log: {
+        level: string;
+    };
 };
-
 declare class Logger {
-  private readonly logCount;
-  private history;
-  private readonly config;
-  private readonly types;
-  private readonly longestLabel;
-  [key: string]: any;
-  constructor(options?: ConstructorOptions);
-  private retainLog;
-  private _log;
-  private getLongestLabel;
-  private get longestUnderlinedLabel();
-  getRetainedLogs(type: string): string[];
-  clearRetainedLogs(type: string): void;
+    private readonly logCount;
+    private history;
+    private readonly config;
+    private readonly types;
+    private readonly longestLabel;
+    [key: string]: any;
+    constructor(options?: ConstructorOptions);
+    private retainLog;
+    private _log;
+    private getLongestLabel;
+    private get longestUnderlinedLabel();
+    getRetainedLogs(type: string): string[];
+    clearRetainedLogs(type: string): void;
 }
-
-declare type LoggerInterface = { [key in keyof typeof LOG_TYPES]: LoggerFunction };
+declare type LoggerInterface = {
+    [key in keyof typeof LOG_TYPES]: LoggerFunction;
+};
 declare const logger: Logger & LoggerInterface;
 export { logger };
-export type { LoggerInterface };
+export type { LoggerInterface };

package/dist/types/monorepo.d.ts

@@ -6,6 +6,6 @@ export declare const isMonorepo: (root: string) => boolean;
 export declare const isModernjsMonorepo: (root: string) => boolean;
 export declare const findMonorepoRoot: (appDirectory: string, maxDepth?: number) => string | undefined;
 export declare const getMonorepoPackages: (root: string) => {
-  name: string;
-  path: string;
-}[];
+    name: string;
+    path: string;
+}[];

package/dist/types/nodeEnv.d.ts

@@ -1,3 +1,3 @@
 export declare function canUseNpm(): Promise<boolean>;
 export declare function canUseYarn(): Promise<boolean>;
-export declare function canUsePnpm(): Promise<boolean>;
+export declare function canUsePnpm(): Promise<boolean>;

package/dist/types/path.d.ts

@@ -1,3 +1,3 @@
 export declare const isRelativePath: (test: string) => boolean;
 export declare const normalizeOutputPath: (s: string) => string;
-export declare const normalizeToPosixPath: (p: string) => string;
+export declare const normalizeToPosixPath: (p: string) => string;

package/dist/types/prettyInstructions.d.ts

@@ -1,6 +1,6 @@
 interface EntryPoint {
-  entryName: string;
+    entryName: string;
 }
 export declare const isSingleEntry: (entrypoints: EntryPoint[]) => boolean;
 export declare const prettyInstructions: (appContext: any, config: any) => string;
-export {};
+export {};

package/dist/types/printBuildError.d.ts

@@ -5,4 +5,4 @@
  * LICENSE file at
  * https://github.com/facebook/create-react-app/blob/master/LICENSE
  */
-export declare function printBuildError(err: Error): void;
+export declare function printBuildError(err: Error): void;

package/dist/types/readTsConfig.d.ts

@@ -1,2 +1,2 @@
 export declare const readTsConfig: (root: string) => any;
-export declare const readTsConfigByFile: (filename: string) => any;
+export declare const readTsConfigByFile: (filename: string) => any;

package/dist/types/removeSlash.d.ts

@@ -1,3 +1,3 @@
 export declare const removeLeadingSlash: (s: string) => string;
 export declare const removeTailSlash: (s: string) => string;
-export declare const removeSlash: (s: string) => string;
+export declare const removeSlash: (s: string) => string;

package/dist/types/runtimeExports.d.ts

@@ -1,4 +1,4 @@
 export declare const createRuntimeExportsUtils: (pwd: any, namespace: string, ts?: any) => {
-  addExport: (statement: string) => void;
-  getPath: () => string;
-};
+    addExport: (statement: string) => void;
+    getPath: () => string;
+};

package/dist/types/wait.d.ts

@@ -1,2 +1,2 @@
 declare const wait: (time?: number) => Promise<unknown>;
-export { wait };
+export { wait };

package/dist/types/watch.d.ts

@@ -1,8 +1,8 @@
 export declare type WatchChangeTypeValueT = 'add' | 'unlink' | 'change';
 export declare const WatchChangeType: Record<'ADD' | 'UNLINK' | 'CHANGE', WatchChangeTypeValueT>;
 declare type RunTaskType = (option: {
-  changedFilePath: string;
-  changeType: WatchChangeTypeValueT;
+    changedFilePath: string;
+    changeType: WatchChangeTypeValueT;
 }) => void | Promise<void>;
-export declare const watch: (watchDir: string | string[], runTask: RunTaskType, ignored?: string[]) => import("chokidar").FSWatcher;
-export {};
+export declare const watch: (watchDir: string | string[], runTask: RunTaskType, ignored?: string[]) => import("./compiled").FSWatcher;
+export {};

package/dist/wait.d.ts

@@ -0,0 +1,2 @@
+declare const wait: (time?: number) => Promise<unknown>;
+export { wait };

package/dist/wait.js

@@ -0,0 +1,7 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.wait = void 0;
+const wait = (time = 0) => new Promise(resolve => {
+    setTimeout(resolve, time);
+});
+exports.wait = wait;

package/dist/watch.d.ts

@@ -0,0 +1,8 @@
+export declare type WatchChangeTypeValueT = 'add' | 'unlink' | 'change';
+export declare const WatchChangeType: Record<'ADD' | 'UNLINK' | 'CHANGE', WatchChangeTypeValueT>;
+declare 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 {};

package/dist/watch.js

@@ -0,0 +1,64 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.watch = exports.WatchChangeType = void 0;
+const path = __importStar(require("path"));
+const compiled_1 = require("./compiled");
+exports.WatchChangeType = {
+    ADD: 'add',
+    UNLINK: 'unlink',
+    CHANGE: 'change',
+};
+const watch = (watchDir, runTask, ignored = []) => {
+    let ready = false;
+    const watcher = compiled_1.chokidar.watch(watchDir, {
+        ignored,
+    });
+    watcher.on('ready', () => (ready = true));
+    watcher.on('change', (filePath) => __awaiter(void 0, void 0, void 0, function* () {
+        const changedFilePath = path.resolve(filePath);
+        yield runTask({ changedFilePath, changeType: exports.WatchChangeType.CHANGE });
+    }));
+    watcher.on('add', (filePath) => __awaiter(void 0, void 0, void 0, function* () {
+        const changedFilePath = path.resolve(filePath);
+        if (ready) {
+            yield runTask({ changedFilePath, changeType: exports.WatchChangeType.ADD });
+        }
+    }));
+    watcher.on('unlink', (filePath) => __awaiter(void 0, void 0, void 0, function* () {
+        const changedFilePath = path.resolve(filePath);
+        yield runTask({ changedFilePath, changeType: exports.WatchChangeType.UNLINK });
+    }));
+    watcher.on('error', err => {
+        throw err;
+    });
+    return watcher;
+};
+exports.watch = watch;

package/jest.config.js

@@ -2,7 +2,6 @@ const sharedConfig = require('@scripts/jest-config');
 
 /** @type {import('@jest/types').Config.InitialOptions} */
 module.exports = {
-  // eslint-disable-next-line node/no-unsupported-features/es-syntax
   ...sharedConfig,
   rootDir: __dirname,
   modulePathIgnorePatterns: [

package/package.json

@@ -11,81 +11,98 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.3.6",
+  "version": "1.3.8-canary.0",
   "jsnext:source": "./src/index.ts",
-  "types": "./dist/types/index.d.ts",
-  "main": "./dist/js/node/index.js",
-  "module": "./dist/js/treeshaking/index.js",
-  "jsnext:modern": "./dist/js/modern/index.js",
+  "types": "./dist/index.d.ts",
+  "main": "./dist/index.js",
+  "module": "./dist/index.js",
+  "jsnext:modern": "./dist/index.js",
   "exports": {
     ".": {
-      "node": {
-        "jsnext:source": "./src/index.ts",
-        "import": "./dist/js/modern/index.js",
-        "require": "./dist/js/node/index.js"
-      },
-      "default": "./dist/js/treeshaking/index.js"
+      "jsnext:source": "./src/index.ts",
+      "default": "./dist/index.js"
     },
     "./format": {
       "jsnext:source": "./src/format.ts",
-      "default": "./dist/js/treeshaking/format.js"
+      "default": "./dist/format.js"
     },
     "./constants": {
       "jsnext:source": "./src/constants.ts",
-      "default": "./dist/js/treeshaking/constants.js"
+      "default": "./dist/constants.js"
+    },
+    "./lodash": {
+      "jsnext:source": "./compiled/lodash/index.js",
+      "default": "./compiled/lodash/index.js"
+    },
+    "./strip-ansi": {
+      "jsnext:source": "./compiled/strip-ansi/index.js",
+      "default": "./compiled/strip-ansi/index.js"
     }
   },
   "typesVersions": {
     "*": {
       "format": [
-        "./dist/types/format.d.ts"
+        "./dist/format.d.ts"
       ],
       "constants": [
-        "./dist/types/constants.d.ts"
+        "./dist/constants.d.ts"
+      ],
+      "lodash": [
+        "./compiled/lodash/index.d.ts"
+      ],
+      "strip-ansi": [
+        "./compiled/strip-ansi/index.d.ts"
       ]
     }
   },
   "dependencies": {
     "@babel/runtime": "^7",
-    "@types/fs-extra": "^9.0.12",
-    "browserslist": "^4.16.7",
-    "chalk": "^4.1.2",
-    "chokidar": "^3.5.2",
-    "debug": "^4.3.2",
-    "filesize": "^7.0.0",
-    "fs-extra": "^10.0.0",
-    "glob": "^7.1.7",
-    "gzip-size": "^6.0.0",
-    "import-lazy": "^4.0.0",
-    "pkg-up": "^3.1.0",
-    "recursive-readdir": "^2.2.2",
-    "strip-ansi": "6.0.0",
-    "upath": "^2.0.1",
-    "yaml": "^1.10.2",
-    "execa": "5",
     "typescript": "^4"
   },
   "devDependencies": {
-    "@types/debug": "^4.1.7",
-    "@types/fs-extra": "^9.0.12",
+    "@modern-js/types": "^1.3.6",
+    "@scripts/build": "0.0.0",
+    "@scripts/jest-config": "0.0.0",
+    "@types/debug": "4.1.7",
+    "@types/fs-extra": "9.0.13",
     "@types/glob": "^7.1.4",
     "@types/jest": "^26",
+    "@types/js-yaml": "4.0.5",
+    "@types/lodash": "4.14.181",
     "@types/node": "^14",
-    "@types/recursive-readdir": "^2.2.0",
-    "webpack": "^5.54.0",
-    "@scripts/build": "0.0.0",
+    "@types/recursive-readdir": "2.2.0",
+    "@types/signale": "1.4.4",
+    "browserslist": "4.20.2",
+    "chalk": "4.1.2",
+    "chokidar": "3.5.3",
+    "commander": "8.3.0",
+    "debug": "4.3.4",
+    "execa": "5.1.1",
+    "filesize": "8.0.7",
+    "fs-extra": "10.0.1",
+    "glob": "7.2.0",
+    "gzip-size": "6.0.0",
+    "import-lazy": "4.0.0",
     "jest": "^27",
-    "@scripts/jest-config": "0.0.0",
-    "@modern-js/types": "^1.3.5"
+    "js-yaml": "4.1.0",
+    "lodash": "4.17.21",
+    "pkg-up": "3.1.0",
+    "recursive-readdir": "2.2.2",
+    "signale": "1.4.0",
+    "strip-ansi": "6.0.1",
+    "upath": "2.0.1",
+    "webpack": "^5.71.0"
   },
   "sideEffects": false,
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
-    "access": "public"
+    "access": "public",
+    "types": "./dist/index.d.ts"
   },
   "scripts": {
     "new": "modern new",
-    "build": "modern build",
+    "dev": "tsc --watch",
+    "build": "tsc",
     "test": "jest --passWithNoTests"
   },
   "readme": "\n<p align=\"center\">\n  <a href=\"https://modernjs.dev\" target=\"blank\"><img src=\"https://lf3-static.bytednsdoc.com/obj/eden-cn/ylaelkeh7nuhfnuhf/modernjs-cover.png\" width=\"300\" alt=\"Modern.js Logo\" /></a>\n</p>\n<p align=\"center\">\n现代 Web 工程体系\n  <br/>\n  <a href=\"https://modernjs.dev\" target=\"blank\">\n    modernjs.dev\n  </a>\n</p>\n<p align=\"center\">\n  The meta-framework suite designed from scratch for frontend-focused modern web development\n</p>\n\n# Introduction\n\n> The doc site ([modernjs.dev](https://modernjs.dev)) and articles are only available in Chinese for now, we are planning to add English versions soon.\n\n- [Modern.js: Hello, World!](https://zhuanlan.zhihu.com/p/426707646)\n\n## Getting Started\n\n- [Quick Start](https://modernjs.dev/docs/start)\n- [Guides](https://modernjs.dev/docs/guides)\n- [API References](https://modernjs.dev/docs/apis)\n\n## Contributing\n\n- [Contributing Guide](https://github.com/modern-js-dev/modern.js/blob/main/CONTRIBUTING.md)\n"

package/tests/debug.test.ts

@@ -1,5 +1,5 @@
-import debug from 'debug';
-import stripAnsi from 'strip-ansi';
+import { debug } from '../src/compiled';
+import { stripAnsi } from '../src';
 import { createDebugger } from '../src/debug';
 
 describe('debug utility', () => {

package/tests/is.test.ts

@@ -0,0 +1,27 @@
+import { isEmpty, isFastRefresh } from '../src/is';
+
+describe('validate', () => {
+  it('should validate empty object correctly', () => {
+    expect(isEmpty({})).toBeTruthy();
+    expect(isEmpty({ foo: 'bar' })).toBeFalsy();
+  });
+
+  it('should validate fast refresh correctly', () => {
+    const { NODE_ENV, FAST_REFRESH } = process.env;
+
+    process.env.NODE_ENV = 'development';
+    process.env.FAST_REFRESH = 'true';
+    expect(isFastRefresh()).toBeTruthy();
+
+    process.env.NODE_ENV = 'production';
+    process.env.FAST_REFRESH = 'true';
+    expect(isFastRefresh()).toBeFalsy();
+
+    process.env.NODE_ENV = 'development';
+    process.env.FAST_REFRESH = 'false';
+    expect(isFastRefresh()).toBeFalsy();
+
+    process.env.NODE_ENV = NODE_ENV;
+    process.env.FAST_REFRESH = FAST_REFRESH;
+  });
+});

package/tests/isPlatform.test.ts

@@ -0,0 +1,19 @@
+import { isNodeJS, isBrowser } from '../src/is/platform';
+
+describe('validate platform', () => {
+  it('should validate Node.js correctly', () => {
+    expect(isNodeJS()).toBeTruthy();
+  });
+
+  it('should validate browser correctly', () => {
+    const windowSpy = jest.spyOn(window, 'window', 'get');
+
+    windowSpy.mockImplementation((): any => undefined);
+    expect(isBrowser()).toBeFalsy();
+
+    windowSpy.mockImplementation((): any => global);
+    expect(isBrowser()).toBeTruthy();
+
+    windowSpy.mockRestore();
+  });
+});

package/tests/prettyInstructions.test.ts

@@ -57,7 +57,7 @@ jest.mock('os', () => {
   };
 });
 
-jest.mock('chalk', () => ({
+jest.mock('../compiled/chalk', () => ({
   __esModule: true,
   default: {
     bold: jest.fn(str => str),

package/tsconfig.json

@@ -1,12 +1,10 @@
 {
   "extends": "@modern-js/tsconfig/base",
   "compilerOptions": {
-    "declaration": false,
-    "allowJs": true,
-    "jsx": "preserve",
+    "declaration": true,
+    "outDir": "./dist",
     "baseUrl": "./",
-    "isolatedModules": true,
-    "paths": {}
+    "isolatedModules": true
   },
   "include": ["src"]
 }