@modern-js/core 2.26.0 → 2.28.0

package/dist/utils/commander.js

@@ -1,20 +1,34 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.program = exports.initCommandsMap = void 0;
-const utils_1 = require("@modern-js/utils");
-Object.defineProperty(exports, "program", { enumerable: true, get: function () { return utils_1.program; } });
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+function _export(target, all) {
+  for (var name in all)
+    Object.defineProperty(target, name, {
+      enumerable: true,
+      get: all[name]
+    });
+}
+_export(exports, {
+  initCommandsMap: function() {
+    return initCommandsMap;
+  },
+  program: function() {
+    return _utils.program;
+  }
+});
+const _utils = require("@modern-js/utils");
 function initCommandsMap() {
-    if (!utils_1.program.hasOwnProperty('commandsMap')) {
-        Object.defineProperty(utils_1.program, 'commandsMap', {
-            get() {
-                const map = new Map();
-                for (const command of utils_1.program.commands) {
-                    map.set(command._name, command);
-                }
-                return map;
-            },
-            configurable: false,
-        });
-    }
+  if (!_utils.program.hasOwnProperty("commandsMap")) {
+    Object.defineProperty(_utils.program, "commandsMap", {
+      get() {
+        const map = /* @__PURE__ */ new Map();
+        for (const command of _utils.program.commands) {
+          map.set(command._name, command);
+        }
+        return map;
+      },
+      configurable: false
+    });
+  }
 }
-exports.initCommandsMap = initCommandsMap;

package/dist/utils/createFileWatcher.d.ts

@@ -1,2 +1,2 @@
 import type { CliHooksRunner, IAppContext } from '../types';
-export declare const createFileWatcher: (appContext: IAppContext, hooksRunner: CliHooksRunner) => Promise<import("@modern-js/utils").FSWatcher | undefined>;
+export declare const createFileWatcher: (appContext: IAppContext, hooksRunner: CliHooksRunner) => Promise<import("@modern-js/utils").FSWatcher | undefined>;

package/dist/utils/createFileWatcher.js

@@ -1,111 +1,90 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (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;
+Object.defineProperty(exports, "__esModule", {
+  value: true
 });
-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 __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.createFileWatcher = void 0;
-const crypto_1 = __importDefault(require("crypto"));
-const path = __importStar(require("path"));
-const fs = __importStar(require("fs"));
-const utils_1 = require("@modern-js/utils");
-const debug = (0, utils_1.createDebugger)('watch-files');
-const hashMap = new Map();
-const md5 = (data) => crypto_1.default.createHash('md5').update(data).digest('hex');
+Object.defineProperty(exports, "createFileWatcher", {
+  enumerable: true,
+  get: function() {
+    return createFileWatcher;
+  }
+});
+const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
+const _interop_require_wildcard = require("@swc/helpers/_/_interop_require_wildcard");
+const _crypto = /* @__PURE__ */ _interop_require_default._(require("crypto"));
+const _path = /* @__PURE__ */ _interop_require_wildcard._(require("path"));
+const _fs = /* @__PURE__ */ _interop_require_wildcard._(require("fs"));
+const _utils = require("@modern-js/utils");
+const debug = (0, _utils.createDebugger)("watch-files");
+const hashMap = /* @__PURE__ */ new Map();
+const md5 = (data) => _crypto.default.createHash("md5").update(data).digest("hex");
 const createFileWatcher = async (appContext, hooksRunner) => {
-    // only add fs watcher on dev mode.
-    if ((0, utils_1.isDevCommand)()) {
-        const { appDirectory } = appContext;
-        const extraFiles = await hooksRunner.watchFiles();
-        const watched = extraFiles
-            .filter((extra) => {
-            return Array.isArray(extra);
-        })
-            .flat();
-        const privateWatched = extraFiles
-            .filter((extra) => {
-            return !Array.isArray(extra) && extra.isPrivate;
-        })
-            .map(extra => {
-            return extra.files;
-        })
-            .flat();
-        const isPrivate = (filename) => privateWatched.some(ff => {
-            return path.resolve(appDirectory, filename).startsWith(ff);
-        });
-        debug(`watched: %o`, watched);
-        const watcher = utils_1.chokidar.watch([...watched, ...privateWatched], {
-            cwd: appDirectory,
-            ignoreInitial: true,
-            ignorePermissionErrors: true,
-            ignored: [
-                /node_modules/,
-                '**/__test__/**',
-                '**/*.test.(js|jsx|ts|tsx)',
-                '**/*.spec.(js|jsx|ts|tsx)',
-                '**/*.stories.(js|jsx|ts|tsx)',
-            ],
-        });
-        watcher.on('change', changed => {
-            const lastHash = hashMap.get(changed);
-            const currentHash = md5(fs.readFileSync(path.join(appDirectory, changed), 'utf8'));
-            if (currentHash !== lastHash) {
-                debug(`file change: %s`, changed);
-                hashMap.set(changed, currentHash);
-                hooksRunner.fileChange({
-                    filename: changed,
-                    eventType: 'change',
-                    isPrivate: isPrivate(changed),
-                });
-            }
-        });
-        watcher.on('add', changed => {
-            debug(`add file: %s`, changed);
-            const currentHash = md5(fs.readFileSync(path.join(appDirectory, changed), 'utf8'));
-            hashMap.set(changed, currentHash);
-            hooksRunner.fileChange({
-                filename: changed,
-                eventType: 'add',
-                isPrivate: isPrivate(changed),
-            });
-        });
-        watcher.on('unlink', changed => {
-            debug(`remove file: %s`, changed);
-            if (hashMap.has(changed)) {
-                hashMap.delete(changed);
-            }
-            hooksRunner.fileChange({
-                filename: changed,
-                eventType: 'unlink',
-                isPrivate: isPrivate(changed),
-            });
-        });
-        watcher.on('error', err => {
-            throw err;
+  if ((0, _utils.isDevCommand)()) {
+    const { appDirectory } = appContext;
+    const extraFiles = await hooksRunner.watchFiles();
+    const watched = extraFiles.filter((extra) => {
+      return Array.isArray(extra);
+    }).flat();
+    const privateWatched = extraFiles.filter((extra) => {
+      return !Array.isArray(extra) && extra.isPrivate;
+    }).map((extra) => {
+      return extra.files;
+    }).flat();
+    const isPrivate = (filename) => privateWatched.some((ff) => {
+      return _path.resolve(appDirectory, filename).startsWith(ff);
+    });
+    debug(`watched: %o`, watched);
+    const watcher = _utils.chokidar.watch([
+      ...watched,
+      ...privateWatched
+    ], {
+      cwd: appDirectory,
+      ignoreInitial: true,
+      ignorePermissionErrors: true,
+      ignored: [
+        /node_modules/,
+        "**/__test__/**",
+        "**/*.test.(js|jsx|ts|tsx)",
+        "**/*.spec.(js|jsx|ts|tsx)",
+        "**/*.stories.(js|jsx|ts|tsx)"
+      ]
+    });
+    watcher.on("change", (changed) => {
+      const lastHash = hashMap.get(changed);
+      const currentHash = md5(_fs.readFileSync(_path.join(appDirectory, changed), "utf8"));
+      if (currentHash !== lastHash) {
+        debug(`file change: %s`, changed);
+        hashMap.set(changed, currentHash);
+        hooksRunner.fileChange({
+          filename: changed,
+          eventType: "change",
+          isPrivate: isPrivate(changed)
         });
-        return watcher;
-    }
+      }
+    });
+    watcher.on("add", (changed) => {
+      debug(`add file: %s`, changed);
+      const currentHash = md5(_fs.readFileSync(_path.join(appDirectory, changed), "utf8"));
+      hashMap.set(changed, currentHash);
+      hooksRunner.fileChange({
+        filename: changed,
+        eventType: "add",
+        isPrivate: isPrivate(changed)
+      });
+    });
+    watcher.on("unlink", (changed) => {
+      debug(`remove file: %s`, changed);
+      if (hashMap.has(changed)) {
+        hashMap.delete(changed);
+      }
+      hooksRunner.fileChange({
+        filename: changed,
+        eventType: "unlink",
+        isPrivate: isPrivate(changed)
+      });
+    });
+    watcher.on("error", (err) => {
+      throw err;
+    });
+    return watcher;
+  }
 };
-exports.createFileWatcher = createFileWatcher;

package/dist/utils/index.d.ts

@@ -3,4 +3,4 @@ export * from './createFileWatcher';
 export * from './initAppDir';
 export * from './mergeConfig';
 export * from './repeatKeyWarning';
-export * from './checkIsDuplicationPlugin';
+export * from './checkIsDuplicationPlugin';

package/dist/utils/index.js

@@ -1,22 +1,11 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./commander"), exports);
-__exportStar(require("./createFileWatcher"), exports);
-__exportStar(require("./initAppDir"), exports);
-__exportStar(require("./mergeConfig"), exports);
-__exportStar(require("./repeatKeyWarning"), exports);
-__exportStar(require("./checkIsDuplicationPlugin"), exports);
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+const _export_star = require("@swc/helpers/_/_export_star");
+_export_star._(require("./commander"), exports);
+_export_star._(require("./createFileWatcher"), exports);
+_export_star._(require("./initAppDir"), exports);
+_export_star._(require("./mergeConfig"), exports);
+_export_star._(require("./repeatKeyWarning"), exports);
+_export_star._(require("./checkIsDuplicationPlugin"), exports);

package/dist/utils/initAppDir.d.ts

@@ -1 +1 @@
-export declare const initAppDir: (cwd?: string) => Promise<string>;
+export declare const initAppDir: (cwd?: string) => Promise<string>;

package/dist/utils/initAppDir.js

@@ -1,20 +1,25 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.initAppDir = void 0;
-const path_1 = __importDefault(require("path"));
-const utils_1 = require("@modern-js/utils");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+Object.defineProperty(exports, "initAppDir", {
+  enumerable: true,
+  get: function() {
+    return initAppDir;
+  }
+});
+const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
+const _path = /* @__PURE__ */ _interop_require_default._(require("path"));
+const _utils = require("@modern-js/utils");
 const initAppDir = async (cwd) => {
-    if (!cwd) {
-        // eslint-disable-next-line no-param-reassign
-        cwd = process.cwd();
-    }
-    const pkg = await (0, utils_1.pkgUp)({ cwd });
-    if (!pkg) {
-        throw new Error(`no package.json found in current work dir: ${cwd}`);
-    }
-    return path_1.default.dirname(pkg);
+  if (!cwd) {
+    cwd = process.cwd();
+  }
+  const pkg = await (0, _utils.pkgUp)({
+    cwd
+  });
+  if (!pkg) {
+    throw new Error(`no package.json found in current work dir: ${cwd}`);
+  }
+  return _path.default.dirname(pkg);
 };
-exports.initAppDir = initAppDir;

package/dist/utils/mergeConfig.d.ts

@@ -1,2 +1,2 @@
 import { UserConfig, NormalizedConfig } from '../types';
-export declare const mergeConfig: <ExtendConfig extends Record<string, any>>(configs: (UserConfig<ExtendConfig> | NormalizedConfig<ExtendConfig>)[]) => NormalizedConfig<ExtendConfig>;
+export declare const mergeConfig: <ExtendConfig extends Record<string, any>>(configs: (UserConfig<ExtendConfig> | NormalizedConfig<ExtendConfig>)[]) => NormalizedConfig<ExtendConfig>;

package/dist/utils/mergeConfig.js

@@ -1,32 +1,42 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.mergeConfig = void 0;
-const utils_1 = require("@modern-js/utils");
-const lodash_1 = require("@modern-js/utils/lodash");
-const mergeConfig = (configs) => (0, lodash_1.mergeWith)({}, ...configs, (target, source, key) => {
-    // Do not use the following merge logic for source.designSystem and tools.tailwind(css)
-    if (key === 'designSystem' ||
-        (key === 'tailwindcss' && typeof source === 'object')) {
-        return (0, lodash_1.mergeWith)({}, target !== null && target !== void 0 ? target : {}, source !== null && source !== void 0 ? source : {});
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+Object.defineProperty(exports, "mergeConfig", {
+  enumerable: true,
+  get: function() {
+    return mergeConfig;
+  }
+});
+const _utils = require("@modern-js/utils");
+const _lodash = require("@modern-js/utils/lodash");
+const mergeConfig = (configs) => (0, _lodash.mergeWith)({}, ...configs, (target, source, key) => {
+  if (key === "designSystem" || key === "tailwindcss" && typeof source === "object") {
+    return (0, _lodash.mergeWith)({}, target !== null && target !== void 0 ? target : {}, source !== null && source !== void 0 ? source : {});
+  }
+  if (Array.isArray(target) || Array.isArray(source)) {
+    if (target === void 0) {
+      return source;
+    }
+    if (source === void 0) {
+      return target;
     }
-    if (Array.isArray(target) || Array.isArray(source)) {
-        if (target === undefined) {
-            return source;
-        }
-        if (source === undefined) {
-            return target;
-        }
-        return [...(0, utils_1.ensureArray)(target), ...(0, utils_1.ensureArray)(source)];
+    return [
+      ...(0, _utils.ensureArray)(target),
+      ...(0, _utils.ensureArray)(source)
+    ];
+  }
+  if ((0, _lodash.isFunction)(target) || (0, _lodash.isFunction)(source)) {
+    if (source === void 0) {
+      return target;
     }
-    if ((0, lodash_1.isFunction)(target) || (0, lodash_1.isFunction)(source)) {
-        if (source === undefined) {
-            return target;
-        }
-        if (target === undefined) {
-            return source;
-        }
-        return [target, source];
+    if (target === void 0) {
+      return source;
     }
-    return undefined;
+    return [
+      target,
+      source
+    ];
+  }
+  return void 0;
 });
-exports.mergeConfig = mergeConfig;

package/dist/utils/repeatKeyWarning.d.ts

@@ -1,3 +1,3 @@
 import { UserConfig } from '../types';
 export declare const deepGet: (obj: any, key: string) => any;
-export declare const repeatKeyWarning: <E extends Record<string, any>>(schema: any, jsConfig: UserConfig<E>, pkgConfig: UserConfig<E>) => void;
+export declare const repeatKeyWarning: <E extends Record<string, any>>(schema: any, jsConfig: UserConfig<E>, pkgConfig: UserConfig<E>) => void;

package/dist/utils/repeatKeyWarning.js

@@ -1,22 +1,35 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.repeatKeyWarning = exports.deepGet = void 0;
-const traverseSchema_1 = require("../schema/traverseSchema");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+function _export(target, all) {
+  for (var name in all)
+    Object.defineProperty(target, name, {
+      enumerable: true,
+      get: all[name]
+    });
+}
+_export(exports, {
+  deepGet: function() {
+    return deepGet;
+  },
+  repeatKeyWarning: function() {
+    return repeatKeyWarning;
+  }
+});
+const _traverseSchema = require("../schema/traverseSchema");
 const deepGet = (obj, key) => {
-    for (const p of key.split('.')) {
-        // eslint-disable-next-line no-param-reassign
-        obj = obj ? obj[p] : undefined;
-    }
-    return obj;
+  for (const p of key.split(".")) {
+    obj = obj ? obj[p] : void 0;
+  }
+  return obj;
 };
-exports.deepGet = deepGet;
 const repeatKeyWarning = (schema, jsConfig, pkgConfig) => {
-    const keys = (0, traverseSchema_1.traverseSchema)(schema);
-    for (const key of keys) {
-        if ((0, exports.deepGet)(jsConfig, key) !== undefined &&
-            (0, exports.deepGet)(pkgConfig, key) !== undefined) {
-            throw new Error(`The same configuration ${key} exists in modern.config.js and package.json.\n Please remove it from package.json.`);
-        }
+  const keys = (0, _traverseSchema.traverseSchema)(schema);
+  for (const key of keys) {
+    if (deepGet(jsConfig, key) !== void 0 && deepGet(pkgConfig, key) !== void 0) {
+      throw new Error(`The same configuration ${key} exists in modern.config.js and package.json.
+ Please remove it from package.json.`);
     }
+  }
 };
-exports.repeatKeyWarning = repeatKeyWarning;

package/package.json

@@ -14,7 +14,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.26.0",
+  "version": "2.28.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/index.d.ts",
   "main": "./dist/index.js",
@@ -69,9 +69,10 @@
     }
   },
   "dependencies": {
-    "@modern-js/node-bundle-require": "2.26.0",
-    "@modern-js/plugin": "2.26.0",
-    "@modern-js/utils": "2.26.0"
+    "@swc/helpers": "0.5.1",
+    "@modern-js/node-bundle-require": "2.28.0",
+    "@modern-js/plugin": "2.28.0",
+    "@modern-js/utils": "2.28.0"
   },
   "devDependencies": {
     "@types/jest": "^29",
@@ -79,10 +80,10 @@
     "tsm": "2.3.0",
     "jest": "^29",
     "typescript": "^5",
-    "@modern-js/builder-shared": "2.26.0",
-    "@modern-js/types": "2.26.0",
-    "@scripts/build": "2.26.0",
-    "@scripts/jest-config": "2.26.0"
+    "@modern-js/builder-shared": "2.28.0",
+    "@modern-js/types": "2.28.0",
+    "@scripts/build": "2.28.0",
+    "@scripts/jest-config": "2.28.0"
   },
   "sideEffects": false,
   "publishConfig": {
@@ -92,8 +93,8 @@
   },
   "scripts": {
     "new": "modern-lib new",
-    "build": "tsc",
-    "dev": "tsc --watch",
+    "build": "modern-lib build",
+    "dev": "modern-lib build --watch",
     "test": "jest"
   }
 }