@unpackjs/core 0.10.1 → 0.12.0

package/dist/config/index.cjs

@@ -0,0 +1,114 @@
+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 config_exports = {};
+__export(config_exports, {
+  defineConfig: () => defineConfig,
+  loadConfig: () => loadConfig
+});
+module.exports = __toCommonJS(config_exports);
+var import_shared = require("@unpackjs/shared");
+var import_node_fs = __toESM(require("node:fs"));
+var import_node_path = require("node:path");
+const { merge } = require("@unpackjs/shared/webpack-merge");
+async function loadConfig({
+  root,
+  cliOptions
+}) {
+  const configPath = resolveConfigPath(root, cliOptions?.config);
+  let userConfig = {};
+  if (configPath) {
+    userConfig = await (0, import_shared.bundleRequire)(configPath);
+    if (typeof userConfig === "function") {
+      const params = {
+        env: (0, import_shared.getNodeEnv)(),
+        command: process.argv[2]
+      };
+      userConfig = await userConfig(params);
+      if (userConfig === void 0) {
+        throw new Error("Unpack config function must return a config object.");
+      }
+    }
+  }
+  const parsedUserConfig = userConfig;
+  const defaultConfig = {
+    bundler: "webpack",
+    build: {
+      outDir: "dist"
+    },
+    server: {
+      port: 3e3,
+      open: false
+    },
+    html: {
+      mountId: "root"
+    },
+    experiments: {
+      css: true
+    }
+  };
+  if (cliOptions.port)
+    (0, import_shared.setValueByPath)(parsedUserConfig, ["server", "port"], cliOptions.port);
+  if (cliOptions.open)
+    (0, import_shared.setValueByPath)(parsedUserConfig, ["server", "open"], cliOptions.open);
+  if (cliOptions.analyze)
+    (0, import_shared.setValueByPath)(parsedUserConfig, ["performance", "bundleAnalyze"], cliOptions.analyze);
+  return merge(defaultConfig, parsedUserConfig);
+}
+function defineConfig(config) {
+  return config;
+}
+function resolveConfigPath(root, customConfig) {
+  if (customConfig) {
+    const customConfigPath = (0, import_node_path.isAbsolute)(customConfig) ? customConfig : (0, import_node_path.join)(root, customConfig);
+    if (import_node_fs.default.existsSync(customConfigPath)) {
+      return customConfigPath;
+    }
+    import_shared.logger.warn(`Cannot find config file: ${customConfigPath}
+`);
+  }
+  const CONFIG_FILES = [
+    "unpack.config.ts",
+    "unpack.config.js",
+    "unpack.config.mjs",
+    "unpack.config.cjs",
+    "unpack.config.mts",
+    "unpack.config.cts"
+  ];
+  for (const file of CONFIG_FILES) {
+    const configFile = (0, import_node_path.join)(root, file);
+    if (import_node_fs.default.existsSync(configFile)) {
+      return configFile;
+    }
+  }
+  return null;
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  defineConfig,
+  loadConfig
+});

package/dist/config/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/config/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,UAAU,EACf,KAAK,YAAY,EAIjB,KAAK,OAAO,EACZ,KAAK,OAAO,EACb,MAAM,kBAAkB,CAAA;AAWzB,wBAAsB,UAAU,CAAC,EAC/B,IAAI,EACJ,UAAU,GACX,EAAE;IACD,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,UAAU,CAAC,EAAE,UAAU,CAAA;CACxB,GAAG,OAAO,CAAC,YAAY,CAAC,CAoCxB;AACD,MAAM,MAAM,YAAY,GAAG;IACzB,GAAG,EAAE,OAAO,CAAA;IACZ,OAAO,EAAE,OAAO,CAAA;CACjB,CAAA;AACD,MAAM,MAAM,mBAAmB,GAAG,CAAC,MAAM,EAAE,YAAY,KAAK,OAAO,CAAC,YAAY,CAAC,CAAA;AAEjF,MAAM,MAAM,kBAAkB,GAAG,CAAC,MAAM,EAAE,YAAY,KAAK,YAAY,CAAA;AAEvE,MAAM,MAAM,kBAAkB,GAAG,YAAY,GAAG,kBAAkB,GAAG,mBAAmB,CAAA;AACxF,wBAAgB,YAAY,CAAC,MAAM,EAAE,YAAY,GAAG,YAAY,CAAA;AAChE,wBAAgB,YAAY,CAAC,MAAM,EAAE,kBAAkB,GAAG,kBAAkB,CAAA;AAC5E,wBAAgB,YAAY,CAAC,MAAM,EAAE,mBAAmB,GAAG,mBAAmB,CAAA;AAC9E,wBAAgB,YAAY,CAAC,MAAM,EAAE,kBAAkB,GAAG,kBAAkB,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/config/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,UAAU,EACf,KAAK,YAAY,EAIjB,KAAK,OAAO,EACZ,KAAK,OAAO,EAEb,MAAM,kBAAkB,CAAA;AAKzB,wBAAsB,UAAU,CAAC,EAC/B,IAAI,EACJ,UAAU,GACX,EAAE;IACD,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,UAAU,CAAC,EAAE,UAAU,CAAA;CACxB,GAAG,OAAO,CAAC,YAAY,CAAC,CAuCxB;AACD,MAAM,MAAM,YAAY,GAAG;IACzB,GAAG,EAAE,OAAO,CAAA;IACZ,OAAO,EAAE,OAAO,CAAA;CACjB,CAAA;AACD,MAAM,MAAM,mBAAmB,GAAG,CAAC,MAAM,EAAE,YAAY,KAAK,OAAO,CAAC,YAAY,CAAC,CAAA;AAEjF,MAAM,MAAM,kBAAkB,GAAG,CAAC,MAAM,EAAE,YAAY,KAAK,YAAY,CAAA;AAEvE,MAAM,MAAM,kBAAkB,GAAG,YAAY,GAAG,kBAAkB,GAAG,mBAAmB,CAAA;AACxF,wBAAgB,YAAY,CAAC,MAAM,EAAE,YAAY,GAAG,YAAY,CAAA;AAChE,wBAAgB,YAAY,CAAC,MAAM,EAAE,kBAAkB,GAAG,kBAAkB,CAAA;AAC5E,wBAAgB,YAAY,CAAC,MAAM,EAAE,mBAAmB,GAAG,mBAAmB,CAAA;AAC9E,wBAAgB,YAAY,CAAC,MAAM,EAAE,kBAAkB,GAAG,kBAAkB,CAAA"}

package/dist/config/index.js

@@ -1,46 +1,21 @@
-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 config_exports = {};
-__export(config_exports, {
-  defineConfig: () => defineConfig,
-  loadConfig: () => loadConfig
-});
-module.exports = __toCommonJS(config_exports);
-var import_shared = require("@unpackjs/shared");
-var import_node_fs = __toESM(require("node:fs"));
-var import_node_path = require("node:path");
-var import_webpack_merge = require("@unpackjs/shared/webpack-merge");
-const jiti = require("@unpackjs/shared/jiti")(__filename, {
-  esmResolve: true,
-  // disable require cache to support restart CLI and read the new config
-  requireCache: false,
-  interopDefault: true
-});
+import { createRequire } from 'module';
+var require = createRequire(import.meta['url']);
+
+import { fileURLToPath } from "url";
+import path from "path";
+var getFilename = () => fileURLToPath(import.meta.url);
+var getDirname = () => path.dirname(getFilename());
+var __dirname = /* @__PURE__ */ getDirname();
+var __filename = /* @__PURE__ */ getFilename();
+import {
+  getNodeEnv,
+  logger,
+  setValueByPath,
+  bundleRequire
+} from "@unpackjs/shared";
+import fs from "node:fs";
+import { isAbsolute, join } from "node:path";
+const { merge } = require("@unpackjs/shared/webpack-merge");
 async function loadConfig({
   root,
   cliOptions
@@ -48,10 +23,10 @@ async function loadConfig({
   const configPath = resolveConfigPath(root, cliOptions?.config);
   let userConfig = {};
   if (configPath) {
-    userConfig = jiti(configPath);
+    userConfig = await bundleRequire(configPath);
     if (typeof userConfig === "function") {
       const params = {
-        env: (0, import_shared.getNodeEnv)(),
+        env: getNodeEnv(),
         command: process.argv[2]
       };
       userConfig = await userConfig(params);
@@ -72,26 +47,29 @@ async function loadConfig({
     },
     html: {
       mountId: "root"
+    },
+    experiments: {
+      css: true
     }
   };
   if (cliOptions.port)
-    (0, import_shared.setValueByPath)(parsedUserConfig, ["server", "port"], cliOptions.port);
+    setValueByPath(parsedUserConfig, ["server", "port"], cliOptions.port);
   if (cliOptions.open)
-    (0, import_shared.setValueByPath)(parsedUserConfig, ["server", "open"], cliOptions.open);
+    setValueByPath(parsedUserConfig, ["server", "open"], cliOptions.open);
   if (cliOptions.analyze)
-    (0, import_shared.setValueByPath)(parsedUserConfig, ["performance", "bundleAnalyze"], cliOptions.analyze);
-  return (0, import_webpack_merge.merge)(defaultConfig, parsedUserConfig);
+    setValueByPath(parsedUserConfig, ["performance", "bundleAnalyze"], cliOptions.analyze);
+  return merge(defaultConfig, parsedUserConfig);
 }
 function defineConfig(config) {
   return config;
 }
 function resolveConfigPath(root, customConfig) {
   if (customConfig) {
-    const customConfigPath = (0, import_node_path.isAbsolute)(customConfig) ? customConfig : (0, import_node_path.join)(root, customConfig);
-    if (import_node_fs.default.existsSync(customConfigPath)) {
+    const customConfigPath = isAbsolute(customConfig) ? customConfig : join(root, customConfig);
+    if (fs.existsSync(customConfigPath)) {
       return customConfigPath;
     }
-    import_shared.logger.warn(`Cannot find config file: ${customConfigPath}
+    logger.warn(`Cannot find config file: ${customConfigPath}
 `);
   }
   const CONFIG_FILES = [
@@ -103,15 +81,14 @@ function resolveConfigPath(root, customConfig) {
     "unpack.config.cts"
   ];
   for (const file of CONFIG_FILES) {
-    const configFile = (0, import_node_path.join)(root, file);
-    if (import_node_fs.default.existsSync(configFile)) {
+    const configFile = join(root, file);
+    if (fs.existsSync(configFile)) {
       return configFile;
     }
   }
   return null;
 }
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
+export {
   defineConfig,
   loadConfig
-});
+};

package/dist/index.cjs

@@ -0,0 +1,72 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+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 __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var src_exports = {};
+__export(src_exports, {
+  createService: () => createService,
+  defineConfig: () => import_config2.defineConfig
+});
+module.exports = __toCommonJS(src_exports);
+var import_shared = require("@unpackjs/shared");
+var import_config = require("./config/index.cjs");
+var import_bundler_webpack = require("@unpackjs/bundler-webpack");
+var import_bundler_rspack = require("@unpackjs/bundler-rspack");
+var import_config2 = require("./config/index.cjs");
+async function createService({ command, root, cliOptions }) {
+  const { npm_execpath } = process.env;
+  if (!npm_execpath || npm_execpath.includes("npx-cli") || npm_execpath.includes(".bun") || npm_execpath.includes("yarn")) {
+    console.log();
+  }
+  import_shared.logger.greet(`Unpack v${"0.12.0"}
+`);
+  if (command === "build") {
+    (0, import_shared.setNodeEnv)(cliOptions.watch ? "development" : "production");
+    (0, import_shared.setDevServer)(false);
+  } else {
+    (0, import_shared.setNodeEnv)("development");
+    (0, import_shared.setDevServer)(true);
+  }
+  const unpackConfig = await (0, import_config.loadConfig)({ root, cliOptions });
+  const bundlerMap = {
+    webpack: () => {
+      return {
+        build: () => {
+          (0, import_bundler_webpack.build)({ root, unpackConfig });
+        },
+        dev: () => {
+          (0, import_bundler_webpack.dev)({ root, unpackConfig });
+        }
+      };
+    },
+    rspack: () => {
+      return {
+        build: () => {
+          (0, import_bundler_rspack.build)({ root, unpackConfig });
+        },
+        dev: () => {
+          (0, import_bundler_rspack.dev)({ root, unpackConfig });
+        }
+      };
+    }
+  };
+  bundlerMap[unpackConfig.bundler]()[command]();
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  createService,
+  defineConfig
+});

package/dist/{index.d.ts → index.d.cts}

@@ -1,5 +1,5 @@
 import { type Command, type CliOptions } from '@unpackjs/shared';
-export { defineConfig } from './config';
+export { defineConfig } from './config/index';
 export type CreateServiceOptions = {
     command: Command;
     root: string;

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,OAAO,EAIZ,KAAK,UAAU,EAEhB,MAAM,kBAAkB,CAAA;AAIzB,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAA;AAEvC,MAAM,MAAM,oBAAoB,GAAG;IACjC,OAAO,EAAE,OAAO,CAAA;IAChB,IAAI,EAAE,MAAM,CAAA;IACZ,UAAU,CAAC,EAAE,UAAU,CAAA;CACxB,CAAA;AACD,wBAAsB,aAAa,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,EAAE,oBAAoB,iBA8CtF"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,OAAO,EAIZ,KAAK,UAAU,EAEhB,MAAM,kBAAkB,CAAA;AAIzB,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAA;AAE7C,MAAM,MAAM,oBAAoB,GAAG;IACjC,OAAO,EAAE,OAAO,CAAA;IAChB,IAAI,EAAE,MAAM,CAAA;IACZ,UAAU,CAAC,EAAE,UAAU,CAAA;CACxB,CAAA;AACD,wBAAsB,aAAa,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,EAAE,oBAAoB,iBA8CtF"}

package/dist/index.js

@@ -1,72 +1,61 @@
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-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 __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var src_exports = {};
-__export(src_exports, {
-  createService: () => createService,
-  defineConfig: () => import_config2.defineConfig
-});
-module.exports = __toCommonJS(src_exports);
-var import_shared = require("@unpackjs/shared");
-var import_config = require("./config");
-var import_bundler_webpack = require("@unpackjs/bundler-webpack");
-var import_bundler_rspack = require("@unpackjs/bundler-rspack");
-var import_config2 = require("./config");
+import { createRequire } from 'module';
+var require = createRequire(import.meta['url']);
+
+import { fileURLToPath } from "url";
+import path from "path";
+var getFilename = () => fileURLToPath(import.meta.url);
+var getDirname = () => path.dirname(getFilename());
+var __dirname = /* @__PURE__ */ getDirname();
+var __filename = /* @__PURE__ */ getFilename();
+import {
+  setDevServer,
+  setNodeEnv,
+  logger
+} from "@unpackjs/shared";
+import { loadConfig } from "./config/index.js";
+import { build as webpackBuild, dev as webpackDev } from "@unpackjs/bundler-webpack";
+import { build as rspackBuild, dev as rspackDev } from "@unpackjs/bundler-rspack";
+import { defineConfig } from "./config/index.js";
 async function createService({ command, root, cliOptions }) {
   const { npm_execpath } = process.env;
   if (!npm_execpath || npm_execpath.includes("npx-cli") || npm_execpath.includes(".bun") || npm_execpath.includes("yarn")) {
     console.log();
   }
-  import_shared.logger.greet(`  Unpack v${"0.10.1"}
+  logger.greet(`Unpack v${"0.12.0"}
 `);
   if (command === "build") {
-    (0, import_shared.setNodeEnv)(cliOptions.watch ? "development" : "production");
-    (0, import_shared.setDevServer)(false);
+    setNodeEnv(cliOptions.watch ? "development" : "production");
+    setDevServer(false);
   } else {
-    (0, import_shared.setNodeEnv)("development");
-    (0, import_shared.setDevServer)(true);
+    setNodeEnv("development");
+    setDevServer(true);
   }
-  const unpackConfig = await (0, import_config.loadConfig)({ root, cliOptions });
+  const unpackConfig = await loadConfig({ root, cliOptions });
   const bundlerMap = {
     webpack: () => {
       return {
         build: () => {
-          (0, import_bundler_webpack.build)({ root, unpackConfig });
+          webpackBuild({ root, unpackConfig });
         },
         dev: () => {
-          (0, import_bundler_webpack.dev)({ root, unpackConfig });
+          webpackDev({ root, unpackConfig });
         }
       };
     },
     rspack: () => {
       return {
         build: () => {
-          (0, import_bundler_rspack.build)({ root, unpackConfig });
+          rspackBuild({ root, unpackConfig });
         },
         dev: () => {
-          (0, import_bundler_rspack.dev)({ root, unpackConfig });
+          rspackDev({ root, unpackConfig });
         }
       };
     }
   };
   bundlerMap[unpackConfig.bundler]()[command]();
 }
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
+export {
   createService,
   defineConfig
-});
+};

package/package.json

@@ -1,9 +1,20 @@
 {
   "name": "@unpackjs/core",
-  "version": "0.10.1",
+  "version": "0.12.0",
   "description": "",
-  "main": "dist/index.js",
-  "types": "dist/index.d.ts",
+  "type": "module",
+  "exports": {
+    ".": {
+      "import": {
+        "types": "./dist/index.d.ts",
+        "default": "./dist/index.js"
+      },
+      "require": {
+        "types": "./dist/index.d.cts",
+        "default": "./dist/index.cjs"
+      }
+    }
+  },
   "keywords": [],
   "authors": [],
   "license": "MIT",
@@ -15,9 +26,9 @@
     "access": "public"
   },
   "dependencies": {
-    "@unpackjs/bundler-rspack": "^0.10.1",
-    "@unpackjs/bundler-webpack": "^0.10.1",
-    "@unpackjs/shared": "^0.10.1"
+    "@unpackjs/bundler-rspack": "^0.12.0",
+    "@unpackjs/bundler-webpack": "^0.12.0",
+    "@unpackjs/shared": "^0.12.0"
   },
   "scripts": {
     "dev": "modern build --watch",