@utoo/pack 1.0.4 → 1.0.6

package/cjs/build.d.ts

@@ -1,4 +1,3 @@
 import { BundleOptions } from "./types";
 import { WebpackConfig } from "./webpackCompat";
-export declare function build(bundleOptions: BundleOptions, projectPath?: string, rootPath?: string): Promise<void>;
-export declare function build(webpackConfig: WebpackConfig, projectPath?: string, rootPath?: string): Promise<void>;
+export declare function build(options: BundleOptions | WebpackConfig, projectPath?: string, rootPath?: string): Promise<void>;

package/cjs/build.js

@@ -12,8 +12,8 @@ const util_1 = require("./util");
 const webpackCompat_1 = require("./webpackCompat");
 const xcodeProfile_1 = require("./xcodeProfile");
 function build(options, projectPath, rootPath) {
-    const bundleOptions = options.compatMode
-        ? (0, webpackCompat_1.compatOptionsFromWebpack)(options)
+    const bundleOptions = options.webpackMode
+        ? (0, webpackCompat_1.compatOptionsFromWebpack)(options, projectPath, rootPath)
         : options;
     if (!rootPath) {
         // help user to find the rootDir automatically.

package/cjs/dev.d.ts

@@ -3,8 +3,7 @@ import send from "send";
 import { Duplex, Writable } from "stream";
 import { BundleOptions } from "./types";
 import { WebpackConfig } from "./webpackCompat";
-export declare function serve(bundleOptions: BundleOptions, projectPath?: string, rootPath?: string, serverOptions?: StartServerOptions): Promise<void>;
-export declare function serve(webpackConfig: WebpackConfig, projectPath?: string, rootPath?: string, serverOptions?: StartServerOptions): Promise<void>;
+export declare function serve(options: BundleOptions | WebpackConfig, projectPath?: string, rootPath?: string, serverOptions?: StartServerOptions): Promise<void>;
 export interface SelfSignedCertificate {
     key: string;
     cert: string;

package/cjs/dev.js

@@ -26,8 +26,8 @@ const util_1 = require("./util");
 const webpackCompat_1 = require("./webpackCompat");
 const xcodeProfile_1 = require("./xcodeProfile");
 function serve(options, projectPath, rootPath, serverOptions) {
-    const bundleOptions = options.compatMode
-        ? (0, webpackCompat_1.compatOptionsFromWebpack)(options)
+    const bundleOptions = options.webpackMode
+        ? (0, webpackCompat_1.compatOptionsFromWebpack)(options, projectPath, rootPath)
         : options;
     if (!rootPath) {
         // help user to find the rootDir automatically

package/cjs/webpackCompat.d.ts

@@ -1,6 +1,7 @@
 import type webpack from "webpack";
 import { BundleOptions } from "./types";
-export type WebpackConfig = Pick<webpack.Configuration, "name" | "entry" | "mode" | "module" | "resolve" | "externals" | "output" | "target" | "devtool" | "optimization" | "plugins" | "stats"> & {
-    compatMode: true;
+export declare function readWebpackConfig(projectPath?: string, rootPath?: string): any;
+export type WebpackConfig = Partial<Pick<webpack.Configuration, "name" | "entry" | "mode" | "module" | "resolve" | "externals" | "output" | "target" | "devtool" | "optimization" | "plugins" | "stats">> & {
+    webpackMode: true;
 };
-export declare function compatOptionsFromWebpack(webpackConfig: WebpackConfig): BundleOptions;
+export declare function compatOptionsFromWebpack(webpackConfig: WebpackConfig, projectPath?: string, rootPath?: string): BundleOptions;

package/cjs/webpackCompat.js

@@ -1,8 +1,22 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.readWebpackConfig = readWebpackConfig;
 exports.compatOptionsFromWebpack = compatOptionsFromWebpack;
-function compatOptionsFromWebpack(webpackConfig) {
-    const { entry, mode, module, resolve, externals, output, target, devtool, optimization, plugins, stats, } = webpackConfig;
+const path_1 = __importDefault(require("path"));
+function readWebpackConfig(projectPath, rootPath) {
+    const projectPathOutOfRoot = projectPath === undefined
+        ? process.cwd()
+        : path_1.default.join(rootPath !== null && rootPath !== void 0 ? rootPath : "", projectPath);
+    const configPath = path_1.default.join(projectPathOutOfRoot, "webpack.config.js");
+    return require(configPath);
+}
+function compatOptionsFromWebpack(webpackConfig, projectPath, rootPath) {
+    const { entry, mode, module, resolve, externals, output, target, devtool, optimization, plugins, stats, } = webpackConfig.entry
+        ? webpackConfig
+        : readWebpackConfig(projectPath, rootPath);
     return {
         config: {
             entry: compatEntry(entry),
@@ -100,7 +114,20 @@ function compatFromWebpackPlugin(webpackPlugins, picker) {
 }
 compatDefine.pluginName = "DefinePlugin";
 function compatDefine(maybeWebpackPluginInstance) {
-    return maybeWebpackPluginInstance === null || maybeWebpackPluginInstance === void 0 ? void 0 : maybeWebpackPluginInstance.definitions;
+    const definitions = maybeWebpackPluginInstance === null || maybeWebpackPluginInstance === void 0 ? void 0 : maybeWebpackPluginInstance.definitions;
+    if (!definitions || typeof definitions !== "object") {
+        return definitions;
+    }
+    const processedDefinitions = {};
+    for (const [key, value] of Object.entries(definitions)) {
+        if (typeof value === "object" && value !== null) {
+            processedDefinitions[key] = JSON.stringify(value);
+        }
+        else {
+            processedDefinitions[key] = value;
+        }
+    }
+    return processedDefinitions;
 }
 function compatExternals(webpackExternals) {
     if (!webpackExternals) {

package/esm/build.d.ts

@@ -1,4 +1,3 @@
 import { BundleOptions } from "./types";
 import { WebpackConfig } from "./webpackCompat";
-export declare function build(bundleOptions: BundleOptions, projectPath?: string, rootPath?: string): Promise<void>;
-export declare function build(webpackConfig: WebpackConfig, projectPath?: string, rootPath?: string): Promise<void>;
+export declare function build(options: BundleOptions | WebpackConfig, projectPath?: string, rootPath?: string): Promise<void>;

package/esm/build.js

@@ -9,8 +9,8 @@ import { blockStdout, createDefineEnv, getPackPath } from "./util";
 import { compatOptionsFromWebpack } from "./webpackCompat";
 import { xcodeProfilingReady } from "./xcodeProfile";
 export function build(options, projectPath, rootPath) {
-    const bundleOptions = options.compatMode
-        ? compatOptionsFromWebpack(options)
+    const bundleOptions = options.webpackMode
+        ? compatOptionsFromWebpack(options, projectPath, rootPath)
         : options;
     if (!rootPath) {
         // help user to find the rootDir automatically.

package/esm/dev.d.ts

@@ -3,8 +3,7 @@ import send from "send";
 import { Duplex, Writable } from "stream";
 import { BundleOptions } from "./types";
 import { WebpackConfig } from "./webpackCompat";
-export declare function serve(bundleOptions: BundleOptions, projectPath?: string, rootPath?: string, serverOptions?: StartServerOptions): Promise<void>;
-export declare function serve(webpackConfig: WebpackConfig, projectPath?: string, rootPath?: string, serverOptions?: StartServerOptions): Promise<void>;
+export declare function serve(options: BundleOptions | WebpackConfig, projectPath?: string, rootPath?: string, serverOptions?: StartServerOptions): Promise<void>;
 export interface SelfSignedCertificate {
     key: string;
     cert: string;

package/esm/dev.js

@@ -12,8 +12,8 @@ import { blockStdout, getPackPath } from "./util";
 import { compatOptionsFromWebpack } from "./webpackCompat";
 import { xcodeProfilingReady } from "./xcodeProfile";
 export function serve(options, projectPath, rootPath, serverOptions) {
-    const bundleOptions = options.compatMode
-        ? compatOptionsFromWebpack(options)
+    const bundleOptions = options.webpackMode
+        ? compatOptionsFromWebpack(options, projectPath, rootPath)
         : options;
     if (!rootPath) {
         // help user to find the rootDir automatically

package/esm/webpackCompat.d.ts

@@ -1,6 +1,7 @@
 import type webpack from "webpack";
 import { BundleOptions } from "./types";
-export type WebpackConfig = Pick<webpack.Configuration, "name" | "entry" | "mode" | "module" | "resolve" | "externals" | "output" | "target" | "devtool" | "optimization" | "plugins" | "stats"> & {
-    compatMode: true;
+export declare function readWebpackConfig(projectPath?: string, rootPath?: string): any;
+export type WebpackConfig = Partial<Pick<webpack.Configuration, "name" | "entry" | "mode" | "module" | "resolve" | "externals" | "output" | "target" | "devtool" | "optimization" | "plugins" | "stats">> & {
+    webpackMode: true;
 };
-export declare function compatOptionsFromWebpack(webpackConfig: WebpackConfig): BundleOptions;
+export declare function compatOptionsFromWebpack(webpackConfig: WebpackConfig, projectPath?: string, rootPath?: string): BundleOptions;

package/esm/webpackCompat.js

@@ -1,5 +1,15 @@
-export function compatOptionsFromWebpack(webpackConfig) {
-    const { entry, mode, module, resolve, externals, output, target, devtool, optimization, plugins, stats, } = webpackConfig;
+import path from "path";
+export function readWebpackConfig(projectPath, rootPath) {
+    const projectPathOutOfRoot = projectPath === undefined
+        ? process.cwd()
+        : path.join(rootPath !== null && rootPath !== void 0 ? rootPath : "", projectPath);
+    const configPath = path.join(projectPathOutOfRoot, "webpack.config.js");
+    return require(configPath);
+}
+export function compatOptionsFromWebpack(webpackConfig, projectPath, rootPath) {
+    const { entry, mode, module, resolve, externals, output, target, devtool, optimization, plugins, stats, } = webpackConfig.entry
+        ? webpackConfig
+        : readWebpackConfig(projectPath, rootPath);
     return {
         config: {
             entry: compatEntry(entry),
@@ -97,7 +107,20 @@ function compatFromWebpackPlugin(webpackPlugins, picker) {
 }
 compatDefine.pluginName = "DefinePlugin";
 function compatDefine(maybeWebpackPluginInstance) {
-    return maybeWebpackPluginInstance === null || maybeWebpackPluginInstance === void 0 ? void 0 : maybeWebpackPluginInstance.definitions;
+    const definitions = maybeWebpackPluginInstance === null || maybeWebpackPluginInstance === void 0 ? void 0 : maybeWebpackPluginInstance.definitions;
+    if (!definitions || typeof definitions !== "object") {
+        return definitions;
+    }
+    const processedDefinitions = {};
+    for (const [key, value] of Object.entries(definitions)) {
+        if (typeof value === "object" && value !== null) {
+            processedDefinitions[key] = JSON.stringify(value);
+        }
+        else {
+            processedDefinitions[key] = value;
+        }
+    }
+    return processedDefinitions;
 }
 function compatExternals(webpackExternals) {
     if (!webpackExternals) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@utoo/pack",
-  "version": "1.0.4",
+  "version": "1.0.6",
   "main": "cjs/index.js",
   "module": "esm/index.js",
   "exports": {
@@ -85,12 +85,12 @@
   },
   "repository": "git@github.com:utooland/utoo.git",
   "optionalDependencies": {
-    "@utoo/pack-darwin-arm64": "1.0.4",
-    "@utoo/pack-darwin-x64": "1.0.4",
-    "@utoo/pack-linux-arm64-gnu": "1.0.4",
-    "@utoo/pack-linux-arm64-musl": "1.0.4",
-    "@utoo/pack-linux-x64-gnu": "1.0.4",
-    "@utoo/pack-linux-x64-musl": "1.0.4",
-    "@utoo/pack-win32-x64-msvc": "1.0.4"
+    "@utoo/pack-darwin-arm64": "1.0.6",
+    "@utoo/pack-darwin-x64": "1.0.6",
+    "@utoo/pack-linux-arm64-gnu": "1.0.6",
+    "@utoo/pack-linux-arm64-musl": "1.0.6",
+    "@utoo/pack-linux-x64-gnu": "1.0.6",
+    "@utoo/pack-linux-x64-musl": "1.0.6",
+    "@utoo/pack-win32-x64-msvc": "1.0.6"
   }
 }