@unpackjs/core 1.6.0 → 1.6.2

package/dist/utils.cjs

@@ -31,10 +31,11 @@ __export(utils_exports, {
   getAddressUrls: () => getAddressUrls,
   getCompiledPkgPath: () => getCompiledPkgPath,
   getNodeEnv: () => getNodeEnv,
+  getPathInJs: () => getPathInJs,
   getPort: () => getPort,
   getTime: () => getTime,
   getUserDepPath: () => getUserDepPath,
-  getValidPath: () => getValidPath,
+  getUserDepVersion: () => getUserDepVersion,
   getValueByPath: () => getValueByPath,
   isBoolean: () => isBoolean,
   isDev: () => isDev,
@@ -45,10 +46,10 @@ __export(utils_exports, {
   isProd: () => isProd,
   isRegExp: () => isRegExp,
   isString: () => isString,
-  isTs: () => isTs,
   isUndefined: () => isUndefined,
   isWatch: () => isWatch,
   isWin: () => isWin,
+  mergeConfig: () => mergeConfig,
   prettyTime: () => prettyTime,
   setDevServer: () => setDevServer,
   setNodeEnv: () => setNodeEnv,
@@ -64,8 +65,8 @@ var import_node_os = __toESM(require("node:os"));
 var import_node_path = __toESM(require("node:path"));
 var import_constants = require("./constants.cjs");
 var import_logger = require("./logger.cjs");
-const glob = require("../compiled/fast-glob/index.js");
 const portfinder = require("../compiled/portfinder/index.js");
+const { merge } = require("../compiled/webpack-merge/index.js");
 const getNodeEnv = () => process.env.NODE_ENV;
 const setNodeEnv = (env) => {
   process.env.NODE_ENV = env;
@@ -138,13 +139,13 @@ const getPort = (startPort) => {
 };
 const getCompiledPkgPath = (packageName) => import_node_path.default.join(__dirname, "../compiled", packageName);
 const getUserDepPath = (root, deps) => {
-  const paths = glob.sync(deps, {
-    cwd: import_node_path.default.resolve(root, "node_modules"),
-    absolute: true,
-    onlyDirectories: true,
-    deep: 1
-  });
-  return paths?.[0];
+  const dependencies = Array.isArray(deps) ? deps : [deps];
+  for (const dep of dependencies) {
+    const absPath = import_node_path.default.resolve(root, "node_modules", dep);
+    if (import_node_fs.default.existsSync(absPath)) {
+      return absPath;
+    }
+  }
 };
 const uniqueId = (length) => {
   const generateId = () => Date.now().toString(36);
@@ -167,17 +168,6 @@ const debounce = (fn, delay) => {
     }, delay);
   };
 };
-const getValidPath = (filePath) => {
-  const absPath = import_node_path.default.isAbsolute(filePath) ? filePath : import_node_path.default.resolve(process.cwd(), filePath);
-  if (import_node_fs.default.existsSync(absPath)) {
-    return absPath;
-  }
-  return void 0;
-};
-const isTs = () => {
-  const tsconfigPath = import_node_path.default.resolve(process.cwd(), "tsconfig.json");
-  return import_node_fs.default.existsSync(tsconfigPath);
-};
 const getIpv4Interfaces = () => {
   const interfaces = import_node_os.default.networkInterfaces();
   const ipv4Interfaces = /* @__PURE__ */ new Map();
@@ -255,21 +245,33 @@ const trackPerformance = (msg) => {
   }
   if (msg) {
     import_logger.logger.wait(
-      `${msg} ${import_colors.default.dim("for")} ${import_colors.default.bold(import_colors.default.yellow(`${Math.ceil(performance.now() - global[k])}ms`))}`
+      `${msg} ${import_colors.default.dim("for")} ${import_colors.default.bold(import_colors.default.yellow(`${(performance.now() - global[k]).toFixed(2)}ms`))}`
     );
   }
   global[k] = performance.now();
 };
+const getPathInJs = (absPath) => {
+  return JSON.stringify(absPath).slice(1, -1);
+};
+const mergeConfig = merge;
+const getUserDepVersion = (root, dep) => {
+  const depPath = getUserDepPath(root, dep);
+  if (!depPath)
+    return;
+  const packageInfo = JSON.parse(import_node_fs.default.readFileSync(import_node_path.default.resolve(depPath, "package.json"), "utf-8"));
+  return packageInfo.version;
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   debounce,
   getAddressUrls,
   getCompiledPkgPath,
   getNodeEnv,
+  getPathInJs,
   getPort,
   getTime,
   getUserDepPath,
-  getValidPath,
+  getUserDepVersion,
   getValueByPath,
   isBoolean,
   isDev,
@@ -280,10 +282,10 @@ const trackPerformance = (msg) => {
   isProd,
   isRegExp,
   isString,
-  isTs,
   isUndefined,
   isWatch,
   isWin,
+  mergeConfig,
   prettyTime,
   setDevServer,
   setNodeEnv,

package/dist/utils.d.ts

@@ -23,8 +23,6 @@ export declare const getUserDepPath: (root: string, deps: string | string[]) =>
 export declare const uniqueId: (length: number) => string;
 export declare function getTime(): string;
 export declare const debounce: (fn: any, delay: any) => (...args: any[]) => void;
-export declare const getValidPath: (filePath: string) => string;
-export declare const isTs: () => boolean;
 type AddressUrl = {
     label: string;
     url: string;
@@ -35,5 +33,12 @@ export declare const getAddressUrls: ({ protocol, port, host, }: {
     host?: string;
 }) => AddressUrl[];
 export declare const trackPerformance: (msg?: string) => void;
+/**
+ * Fix path on windows
+ * C:\Users\Desktop\project\src\index.js -> C:\\Users\\Desktop\\project\\src\\index.js
+ */
+export declare const getPathInJs: (absPath: string) => string;
+export declare const mergeConfig: any;
+export declare const getUserDepVersion: (root: string, dep: string) => any;
 export {};
 //# sourceMappingURL=utils.d.ts.map

package/dist/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,eAAe,EAAE,OAAO,EAAE,MAAM,eAAe,CAAA;AAE7D,eAAO,MAAM,UAAU,QAAiC,OAAO,CAAA;AAE/D,eAAO,MAAM,UAAU,QAAS,OAAO,SAEtC,CAAA;AAED,eAAO,MAAM,YAAY,gBAAiB,OAAO,SAEhD,CAAA;AAED,eAAO,MAAM,KAAK,QAAO,OAAyC,CAAA;AAElE,eAAO,MAAM,WAAW,QAAO,OAA4C,CAAA;AAE3E,eAAO,MAAM,OAAO,QAAO,OAAoC,CAAA;AAE/D,eAAO,MAAM,MAAM,QAAO,OAAwC,CAAA;AAElE,eAAO,MAAM,KAAK,QAAO,OAAuC,CAAA;AAEhE,eAAO,MAAM,QAAQ,QAAS,OAAO,KAAG,GAAG,IAAI,MAAiC,CAAA;AAEhF,eAAO,MAAM,SAAS,SAAU,OAAO,KAAG,IAAI,IAAI,OAAoC,CAAA;AAEtF,eAAO,MAAM,WAAW,QAAS,OAAO,KAAG,GAAG,IAAI,SAAuC,CAAA;AAEzF,eAAO,MAAM,UAAU,SAAU,OAAO,KAAG,IAAI,IAAI,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,GAC3C,CAAA;AAE5B,eAAO,MAAM,QAAQ,QAAS,OAAO,KAAG,GAAG,IAAI,MAAM,CAAC,MAAM,EAAE,GAAG,CACxB,CAAA;AAEzC,eAAO,MAAM,aAAa,QAAS,OAAO,KAAG,GAAG,IAAI,MAAM,CAAC,MAAM,EAAE,GAAG,CACM,CAAA;AAE5E,eAAO,MAAM,QAAQ,QAAS,GAAG,KAAG,GAAG,IAAI,MACgB,CAAA;AAE3D,eAAO,MAAM,UAAU,YAAa,MAAM,WAYzC,CAAA;AAED,eAAO,MAAM,cAAc,WAAY,GAAG,aAAa,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,gBAAgB,GAAG,QAc5F,CAAA;AAED,eAAO,MAAM,cAAc,WAAY,GAAG,aAAa,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,SAAS,GAAG,SAUrF,CAAA;AAED,eAAO,MAAM,OAAO,cAAe,MAAM,KAAG,OAAO,CAAC,MAAM,CAWzD,CAAA;AAED,eAAO,MAAM,kBAAkB,gBAAiB,eAAe,WACb,CAAA;AAElD,eAAO,MAAM,cAAc,SAAU,MAAM,QAAQ,MAAM,GAAG,MAAM,EAAE,KAAG,MAAM,GAAG,SAQ/E,CAAA;AAED,eAAO,MAAM,QAAQ,WAAY,MAAM,WAItC,CAAA;AAED,wBAAgB,OAAO,WAMtB;AAED,eAAO,MAAM,QAAQ,mDAQpB,CAAA;AAED,eAAO,MAAM,YAAY,aAAc,MAAM,WAM5C,CAAA;AAED,eAAO,MAAM,IAAI,eAGhB,CAAA;AA6CD,KAAK,UAAU,GAAG;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,CAAA;CAAE,CAAA;AAEhD,eAAO,MAAM,cAAc,8BAIxB;IACD,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,CAAC,EAAE,MAAM,CAAA;CACd,KAAG,UAAU,EAuCb,CAAA;AAED,eAAO,MAAM,gBAAgB,SAAU,MAAM,SAY5C,CAAA"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,eAAe,EAAE,OAAO,EAAE,MAAM,eAAe,CAAA;AAG7D,eAAO,MAAM,UAAU,QAAiC,OAAO,CAAA;AAE/D,eAAO,MAAM,UAAU,QAAS,OAAO,SAEtC,CAAA;AAED,eAAO,MAAM,YAAY,gBAAiB,OAAO,SAEhD,CAAA;AAED,eAAO,MAAM,KAAK,QAAO,OAAyC,CAAA;AAElE,eAAO,MAAM,WAAW,QAAO,OAA4C,CAAA;AAE3E,eAAO,MAAM,OAAO,QAAO,OAAoC,CAAA;AAE/D,eAAO,MAAM,MAAM,QAAO,OAAwC,CAAA;AAElE,eAAO,MAAM,KAAK,QAAO,OAAuC,CAAA;AAEhE,eAAO,MAAM,QAAQ,QAAS,OAAO,KAAG,GAAG,IAAI,MAAiC,CAAA;AAEhF,eAAO,MAAM,SAAS,SAAU,OAAO,KAAG,IAAI,IAAI,OAAoC,CAAA;AAEtF,eAAO,MAAM,WAAW,QAAS,OAAO,KAAG,GAAG,IAAI,SAAuC,CAAA;AAEzF,eAAO,MAAM,UAAU,SAAU,OAAO,KAAG,IAAI,IAAI,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,GAC3C,CAAA;AAE5B,eAAO,MAAM,QAAQ,QAAS,OAAO,KAAG,GAAG,IAAI,MAAM,CAAC,MAAM,EAAE,GAAG,CACxB,CAAA;AAEzC,eAAO,MAAM,aAAa,QAAS,OAAO,KAAG,GAAG,IAAI,MAAM,CAAC,MAAM,EAAE,GAAG,CACM,CAAA;AAE5E,eAAO,MAAM,QAAQ,QAAS,GAAG,KAAG,GAAG,IAAI,MACgB,CAAA;AAE3D,eAAO,MAAM,UAAU,YAAa,MAAM,WAYzC,CAAA;AAED,eAAO,MAAM,cAAc,WAAY,GAAG,aAAa,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,gBAAgB,GAAG,QAc5F,CAAA;AAED,eAAO,MAAM,cAAc,WAAY,GAAG,aAAa,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,SAAS,GAAG,SAUrF,CAAA;AAED,eAAO,MAAM,OAAO,cAAe,MAAM,KAAG,OAAO,CAAC,MAAM,CAWzD,CAAA;AAED,eAAO,MAAM,kBAAkB,gBAAiB,eAAe,WACb,CAAA;AAElD,eAAO,MAAM,cAAc,SAAU,MAAM,QAAQ,MAAM,GAAG,MAAM,EAAE,KAAG,MAAM,GAAG,SAQ/E,CAAA;AAED,eAAO,MAAM,QAAQ,WAAY,MAAM,WAItC,CAAA;AAED,wBAAgB,OAAO,WAMtB;AAED,eAAO,MAAM,QAAQ,mDAQpB,CAAA;AA6CD,KAAK,UAAU,GAAG;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,CAAA;CAAE,CAAA;AAEhD,eAAO,MAAM,cAAc,8BAIxB;IACD,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,CAAC,EAAE,MAAM,CAAA;CACd,KAAG,UAAU,EAuCb,CAAA;AAED,eAAO,MAAM,gBAAgB,SAAU,MAAM,SAY5C,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,WAAW,YAAa,MAAM,WAE1C,CAAA;AAED,eAAO,MAAM,WAAW,KAAQ,CAAA;AAEhC,eAAO,MAAM,iBAAiB,SAAU,MAAM,OAAO,MAAM,QAK1D,CAAA"}

package/dist/utils.js

@@ -7,7 +7,6 @@ var getFilename = () => fileURLToPath(import.meta.url);
 var getDirname = () => path.dirname(getFilename());
 var __dirname = /* @__PURE__ */ getDirname();
 var __filename = /* @__PURE__ */ getFilename();
-const glob = require("../compiled/fast-glob/index.js");
 import colors from "./colors.js";
 const portfinder = require("../compiled/portfinder/index.js");
 import fs from "node:fs";
@@ -16,6 +15,7 @@ import os from "node:os";
 import path2 from "node:path";
 import { DEFAULT_DEV_HOST } from "./constants.js";
 import { logger } from "./logger.js";
+const { merge } = require("../compiled/webpack-merge/index.js");
 const getNodeEnv = () => process.env.NODE_ENV;
 const setNodeEnv = (env) => {
   process.env.NODE_ENV = env;
@@ -88,13 +88,13 @@ const getPort = (startPort) => {
 };
 const getCompiledPkgPath = (packageName) => path2.join(__dirname, "../compiled", packageName);
 const getUserDepPath = (root, deps) => {
-  const paths = glob.sync(deps, {
-    cwd: path2.resolve(root, "node_modules"),
-    absolute: true,
-    onlyDirectories: true,
-    deep: 1
-  });
-  return paths?.[0];
+  const dependencies = Array.isArray(deps) ? deps : [deps];
+  for (const dep of dependencies) {
+    const absPath = path2.resolve(root, "node_modules", dep);
+    if (fs.existsSync(absPath)) {
+      return absPath;
+    }
+  }
 };
 const uniqueId = (length) => {
   const generateId = () => Date.now().toString(36);
@@ -117,17 +117,6 @@ const debounce = (fn, delay) => {
     }, delay);
   };
 };
-const getValidPath = (filePath) => {
-  const absPath = path2.isAbsolute(filePath) ? filePath : path2.resolve(process.cwd(), filePath);
-  if (fs.existsSync(absPath)) {
-    return absPath;
-  }
-  return void 0;
-};
-const isTs = () => {
-  const tsconfigPath = path2.resolve(process.cwd(), "tsconfig.json");
-  return fs.existsSync(tsconfigPath);
-};
 const getIpv4Interfaces = () => {
   const interfaces = os.networkInterfaces();
   const ipv4Interfaces = /* @__PURE__ */ new Map();
@@ -205,20 +194,32 @@ const trackPerformance = (msg) => {
   }
   if (msg) {
     logger.wait(
-      `${msg} ${colors.dim("for")} ${colors.bold(colors.yellow(`${Math.ceil(performance.now() - global[k])}ms`))}`
+      `${msg} ${colors.dim("for")} ${colors.bold(colors.yellow(`${(performance.now() - global[k]).toFixed(2)}ms`))}`
     );
   }
   global[k] = performance.now();
 };
+const getPathInJs = (absPath) => {
+  return JSON.stringify(absPath).slice(1, -1);
+};
+const mergeConfig = merge;
+const getUserDepVersion = (root, dep) => {
+  const depPath = getUserDepPath(root, dep);
+  if (!depPath)
+    return;
+  const packageInfo = JSON.parse(fs.readFileSync(path2.resolve(depPath, "package.json"), "utf-8"));
+  return packageInfo.version;
+};
 export {
   debounce,
   getAddressUrls,
   getCompiledPkgPath,
   getNodeEnv,
+  getPathInJs,
   getPort,
   getTime,
   getUserDepPath,
-  getValidPath,
+  getUserDepVersion,
   getValueByPath,
   isBoolean,
   isDev,
@@ -229,10 +230,10 @@ export {
   isProd,
   isRegExp,
   isString,
-  isTs,
   isUndefined,
   isWatch,
   isWin,
+  mergeConfig,
   prettyTime,
   setDevServer,
   setNodeEnv,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unpackjs/core",
-  "version": "1.6.0",
+  "version": "1.6.2",
   "description": "",
   "type": "module",
   "exports": {
@@ -104,7 +104,7 @@
     "esbuild": "0.24.0",
     "esbuild-loader": "4.2.2",
     "fork-ts-checker-webpack-plugin": "9.0.2",
-    "html-webpack-plugin": "5.6.2",
+    "html-webpack-plugin": "5.6.3",
     "json5": "2.2.3",
     "lightningcss": "1.27.0",
     "loader-runner": "4.3.0",

package/dist/createService.cjs

@@ -1,65 +0,0 @@
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var createService_exports = {};
-__export(createService_exports, {
-  createService: () => createService
-});
-module.exports = __toCommonJS(createService_exports);
-var import_colors = __toESM(require("./colors.cjs"));
-var import_config = require("./config.cjs");
-var import_run = require("./run/index.cjs");
-var import_utils = require("./utils.cjs");
-async function createService({ command, cliOptions, defaultConfig }) {
-  if (command === "build") {
-    (0, import_utils.setNodeEnv)(cliOptions.watch ? "development" : "production");
-    (0, import_utils.setDevServer)(false);
-  } else {
-    (0, import_utils.setNodeEnv)("development");
-    (0, import_utils.setDevServer)(true);
-  }
-  if (!(0, import_utils.isDevServer)()) {
-    console.log(
-      import_colors.default.rainbow(`unpack v${"1.6.0"}`),
-      import_colors.default.green(`building for ${(0, import_utils.isDev)() ? "development" : "production"}...`)
-    );
-  }
-  const unpackConfig = await (0, import_config.loadConfig)({ cliOptions, defaultConfig });
-  const commandMap = {
-    build: () => {
-      (0, import_run.bundlerBuild)(unpackConfig);
-    },
-    dev: () => {
-      (0, import_run.bundlerDev)(unpackConfig);
-    }
-  };
-  commandMap[command]();
-}
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  createService
-});

package/dist/createService.d.ts

@@ -1,8 +0,0 @@
-import type { CliOptions, Command, UnpackConfig } from './types/index';
-export type CreateServiceOptions = {
-    command: Command;
-    cliOptions?: CliOptions;
-    defaultConfig?: UnpackConfig;
-};
-export declare function createService({ command, cliOptions, defaultConfig }: CreateServiceOptions): Promise<void>;
-//# sourceMappingURL=createService.d.ts.map

package/dist/createService.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"createService.d.ts","sourceRoot":"","sources":["../src/createService.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAA;AAMxE,MAAM,MAAM,oBAAoB,GAAG;IACjC,OAAO,EAAE,OAAO,CAAA;IAChB,UAAU,CAAC,EAAE,UAAU,CAAA;IACvB,aAAa,CAAC,EAAE,YAAY,CAAA;CAC7B,CAAA;AACD,wBAAsB,aAAa,CAAC,EAAE,OAAO,EAAE,UAAU,EAAE,aAAa,EAAE,EAAE,oBAAoB,iBA0B/F"}

package/dist/createService.js

@@ -1,41 +0,0 @@
-import { createRequire } from 'node:module';
-var require = createRequire(import.meta['url']);
-
-import path from "path";
-import { fileURLToPath } from "url";
-var getFilename = () => fileURLToPath(import.meta.url);
-var getDirname = () => path.dirname(getFilename());
-var __dirname = /* @__PURE__ */ getDirname();
-var __filename = /* @__PURE__ */ getFilename();
-import colors from "./colors.js";
-import { loadConfig } from "./config.js";
-import { bundlerBuild, bundlerDev } from "./run/index.js";
-import { isDev, isDevServer, setDevServer, setNodeEnv } from "./utils.js";
-async function createService({ command, cliOptions, defaultConfig }) {
-  if (command === "build") {
-    setNodeEnv(cliOptions.watch ? "development" : "production");
-    setDevServer(false);
-  } else {
-    setNodeEnv("development");
-    setDevServer(true);
-  }
-  if (!isDevServer()) {
-    console.log(
-      colors.rainbow(`unpack v${"1.6.0"}`),
-      colors.green(`building for ${isDev() ? "development" : "production"}...`)
-    );
-  }
-  const unpackConfig = await loadConfig({ cliOptions, defaultConfig });
-  const commandMap = {
-    build: () => {
-      bundlerBuild(unpackConfig);
-    },
-    dev: () => {
-      bundlerDev(unpackConfig);
-    }
-  };
-  commandMap[command]();
-}
-export {
-  createService
-};