@utoo/pack 1.1.8-rc.1 → 1.1.8-rc.3

package/cjs/commands/build.js

@@ -47,18 +47,7 @@ const find_root_1 = require("../utils/find-root");
 const html_entry_1 = require("../utils/html-entry");
 const xcodeProfile_1 = require("../utils/xcodeProfile");
 function build(options, projectPath, rootPath) {
-    let bundleOptions;
-    if (options.webpackMode) {
-        let webpackConfig = options;
-        if (!webpackConfig.entry) {
-            const loadedConfig = (0, webpackCompat_1.readWebpackConfig)(projectPath, rootPath);
-            webpackConfig = { ...webpackConfig, ...loadedConfig };
-        }
-        bundleOptions = (0, webpackCompat_1.compatOptionsFromWebpack)(webpackConfig);
-    }
-    else {
-        bundleOptions = options;
-    }
+    const bundleOptions = (0, webpackCompat_1.resolveBundleOptions)(options, projectPath, rootPath);
     if (!rootPath) {
         // help user to find the rootDir automatically.
         rootPath = (0, find_root_1.findRootDir)(projectPath || process.cwd());

package/cjs/commands/dev.js

@@ -27,18 +27,7 @@ const mkcert_1 = require("../utils/mkcert");
 const print_server_info_1 = require("../utils/print-server-info");
 const xcodeProfile_1 = require("../utils/xcodeProfile");
 function serve(options, projectPath, rootPath, serverOptions) {
-    let bundleOptions;
-    if (options.webpackMode) {
-        let webpackConfig = options;
-        if (!webpackConfig.entry) {
-            const loadedConfig = (0, webpackCompat_1.readWebpackConfig)(projectPath, rootPath);
-            webpackConfig = { ...webpackConfig, ...loadedConfig };
-        }
-        bundleOptions = (0, webpackCompat_1.compatOptionsFromWebpack)(webpackConfig);
-    }
-    else {
-        bundleOptions = options;
-    }
+    const bundleOptions = (0, webpackCompat_1.resolveBundleOptions)(options, projectPath, rootPath);
     if (!rootPath) {
         // help user to find the rootDir automatically
         rootPath = (0, find_root_1.findRootDir)(projectPath || process.cwd());

package/cjs/config/readWebpackConfig.js

@@ -4,16 +4,23 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.readWebpackConfig = readWebpackConfig;
+const fs_1 = __importDefault(require("fs"));
 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 { env, argv } = parseArgs();
     try {
-        const configPath = require.resolve("webpack.config", {
-            paths: [projectPathOutOfRoot],
-        });
-        return require(configPath);
+        const configPath = path_1.default.resolve(projectPathOutOfRoot, "./webpack.config");
+        const configFile = [".js", ".cjs"]
+            .map((ext) => configPath + ext)
+            .find(fs_1.default.existsSync);
+        const config = require(configFile || configPath);
+        if (typeof config === "function") {
+            return config(env, argv);
+        }
+        return config;
     }
     catch (error) {
         if (error && error.code === "MODULE_NOT_FOUND") {
@@ -22,3 +29,27 @@ function readWebpackConfig(projectPath, rootPath) {
         throw error;
     }
 }
+function parseArgs() {
+    const env = {};
+    const argv = {};
+    process.argv.forEach((arg) => {
+        if (arg.startsWith("--env")) {
+            if (arg.startsWith("--env.")) {
+                const [key, val] = arg.substring(6).split("=");
+                env[key] = val === undefined ? true : val;
+            }
+            else if (arg === "--env") {
+                // noop
+            }
+            else {
+                const [key, val] = arg.substring(5).split("=");
+                env[key] = val === undefined ? true : val;
+            }
+        }
+        if (arg.startsWith("--")) {
+            const [key, val] = arg.substring(2).split("=");
+            argv[key] = val === undefined ? true : val;
+        }
+    });
+    return { env, argv };
+}

package/cjs/config/webpackCompat.d.ts

@@ -1,2 +1,4 @@
+import { type BundleOptions, type WebpackConfig } from "@utoo/pack-shared";
 export { compatOptionsFromWebpack, type WebpackConfig, } from "@utoo/pack-shared";
 export { readWebpackConfig } from "./readWebpackConfig";
+export declare function resolveBundleOptions(options: BundleOptions | WebpackConfig, projectPath?: string, rootPath?: string): BundleOptions;

package/cjs/config/webpackCompat.js

@@ -1,7 +1,26 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.readWebpackConfig = exports.compatOptionsFromWebpack = void 0;
-var pack_shared_1 = require("@utoo/pack-shared");
-Object.defineProperty(exports, "compatOptionsFromWebpack", { enumerable: true, get: function () { return pack_shared_1.compatOptionsFromWebpack; } });
-var readWebpackConfig_1 = require("./readWebpackConfig");
-Object.defineProperty(exports, "readWebpackConfig", { enumerable: true, get: function () { return readWebpackConfig_1.readWebpackConfig; } });
+exports.resolveBundleOptions = resolveBundleOptions;
+const pack_shared_1 = require("@utoo/pack-shared");
+const readWebpackConfig_1 = require("./readWebpackConfig");
+var pack_shared_2 = require("@utoo/pack-shared");
+Object.defineProperty(exports, "compatOptionsFromWebpack", { enumerable: true, get: function () { return pack_shared_2.compatOptionsFromWebpack; } });
+var readWebpackConfig_2 = require("./readWebpackConfig");
+Object.defineProperty(exports, "readWebpackConfig", { enumerable: true, get: function () { return readWebpackConfig_2.readWebpackConfig; } });
+function resolveBundleOptions(options, projectPath, rootPath) {
+    if (options.webpackMode) {
+        let webpackConfig = options;
+        const loadedConfig = (0, readWebpackConfig_1.readWebpackConfig)(projectPath, rootPath);
+        webpackConfig = { ...loadedConfig, ...webpackConfig };
+        try {
+            return (0, pack_shared_1.compatOptionsFromWebpack)(webpackConfig);
+        }
+        catch (e) {
+            throw new Error("Error converting webpack config: " + e);
+        }
+    }
+    else {
+        return options;
+    }
+}

package/esm/commands/build.js

@@ -3,7 +3,7 @@ import { spawn } from "child_process";
 import fs, { existsSync } from "fs";
 import { nanoid } from "nanoid";
 import { join } from "path";
-import { compatOptionsFromWebpack, readWebpackConfig, } from "../config/webpackCompat";
+import { resolveBundleOptions } from "../config/webpackCompat";
 import { projectFactory } from "../core/project";
 import { HtmlPlugin } from "../plugins/HtmlPlugin";
 import { blockStdout, createDefineEnv, getPackPath } from "../utils/common";
@@ -11,18 +11,7 @@ import { findRootDir } from "../utils/find-root";
 import { processHtmlEntry } from "../utils/html-entry";
 import { xcodeProfilingReady } from "../utils/xcodeProfile";
 export function build(options, projectPath, rootPath) {
-    let bundleOptions;
-    if (options.webpackMode) {
-        let webpackConfig = options;
-        if (!webpackConfig.entry) {
-            const loadedConfig = readWebpackConfig(projectPath, rootPath);
-            webpackConfig = { ...webpackConfig, ...loadedConfig };
-        }
-        bundleOptions = compatOptionsFromWebpack(webpackConfig);
-    }
-    else {
-        bundleOptions = options;
-    }
+    const bundleOptions = resolveBundleOptions(options, projectPath, rootPath);
     if (!rootPath) {
         // help user to find the rootDir automatically.
         rootPath = findRootDir(projectPath || process.cwd());

package/esm/commands/dev.js

@@ -5,7 +5,7 @@ import { isIPv6 } from "net";
 import path from "path";
 import send from "send";
 import url from "url";
-import { compatOptionsFromWebpack, readWebpackConfig, } from "../config/webpackCompat";
+import { resolveBundleOptions } from "../config/webpackCompat";
 import { createHotReloader } from "../core/hmr";
 import { blockStdout, getPackPath } from "../utils/common";
 import { findRootDir } from "../utils/find-root";
@@ -13,18 +13,7 @@ import { createSelfSignedCertificate } from "../utils/mkcert";
 import { printServerInfo } from "../utils/print-server-info";
 import { xcodeProfilingReady } from "../utils/xcodeProfile";
 export function serve(options, projectPath, rootPath, serverOptions) {
-    let bundleOptions;
-    if (options.webpackMode) {
-        let webpackConfig = options;
-        if (!webpackConfig.entry) {
-            const loadedConfig = readWebpackConfig(projectPath, rootPath);
-            webpackConfig = { ...webpackConfig, ...loadedConfig };
-        }
-        bundleOptions = compatOptionsFromWebpack(webpackConfig);
-    }
-    else {
-        bundleOptions = options;
-    }
+    const bundleOptions = resolveBundleOptions(options, projectPath, rootPath);
     if (!rootPath) {
         // help user to find the rootDir automatically
         rootPath = findRootDir(projectPath || process.cwd());

package/esm/config/readWebpackConfig.js

@@ -1,13 +1,20 @@
+import fs from "fs";
 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 { env, argv } = parseArgs();
     try {
-        const configPath = require.resolve("webpack.config", {
-            paths: [projectPathOutOfRoot],
-        });
-        return require(configPath);
+        const configPath = path.resolve(projectPathOutOfRoot, "./webpack.config");
+        const configFile = [".js", ".cjs"]
+            .map((ext) => configPath + ext)
+            .find(fs.existsSync);
+        const config = require(configFile || configPath);
+        if (typeof config === "function") {
+            return config(env, argv);
+        }
+        return config;
     }
     catch (error) {
         if (error && error.code === "MODULE_NOT_FOUND") {
@@ -16,3 +23,27 @@ export function readWebpackConfig(projectPath, rootPath) {
         throw error;
     }
 }
+function parseArgs() {
+    const env = {};
+    const argv = {};
+    process.argv.forEach((arg) => {
+        if (arg.startsWith("--env")) {
+            if (arg.startsWith("--env.")) {
+                const [key, val] = arg.substring(6).split("=");
+                env[key] = val === undefined ? true : val;
+            }
+            else if (arg === "--env") {
+                // noop
+            }
+            else {
+                const [key, val] = arg.substring(5).split("=");
+                env[key] = val === undefined ? true : val;
+            }
+        }
+        if (arg.startsWith("--")) {
+            const [key, val] = arg.substring(2).split("=");
+            argv[key] = val === undefined ? true : val;
+        }
+    });
+    return { env, argv };
+}

package/esm/config/webpackCompat.d.ts

@@ -1,2 +1,4 @@
+import { type BundleOptions, type WebpackConfig } from "@utoo/pack-shared";
 export { compatOptionsFromWebpack, type WebpackConfig, } from "@utoo/pack-shared";
 export { readWebpackConfig } from "./readWebpackConfig";
+export declare function resolveBundleOptions(options: BundleOptions | WebpackConfig, projectPath?: string, rootPath?: string): BundleOptions;

package/esm/config/webpackCompat.js

@@ -1,2 +1,20 @@
+import { compatOptionsFromWebpack, } from "@utoo/pack-shared";
+import { readWebpackConfig } from "./readWebpackConfig";
 export { compatOptionsFromWebpack, } from "@utoo/pack-shared";
 export { readWebpackConfig } from "./readWebpackConfig";
+export function resolveBundleOptions(options, projectPath, rootPath) {
+    if (options.webpackMode) {
+        let webpackConfig = options;
+        const loadedConfig = readWebpackConfig(projectPath, rootPath);
+        webpackConfig = { ...loadedConfig, ...webpackConfig };
+        try {
+            return compatOptionsFromWebpack(webpackConfig);
+        }
+        catch (e) {
+            throw new Error("Error converting webpack config: " + e);
+        }
+    }
+    else {
+        return options;
+    }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@utoo/pack",
-  "version": "1.1.8-rc.1",
+  "version": "1.1.8-rc.3",
   "main": "cjs/index.js",
   "module": "esm/index.js",
   "types": "esm/index.d.ts",
@@ -39,7 +39,7 @@
   "dependencies": {
     "@babel/code-frame": "7.22.5",
     "@swc/helpers": "0.5.15",
-    "@utoo/pack-shared": "^0.0.8",
+    "@utoo/pack-shared": "1.1.8-rc.3",
     "@utoo/style-loader": "^1.0.0",
     "domparser-rs": "^0.0.5",
     "find-up": "4.1.0",
@@ -88,12 +88,12 @@
   },
   "repository": "git@github.com:utooland/utoo.git",
   "optionalDependencies": {
-    "@utoo/pack-darwin-arm64": "1.1.8-rc.1",
-    "@utoo/pack-darwin-x64": "1.1.8-rc.1",
-    "@utoo/pack-linux-arm64-gnu": "1.1.8-rc.1",
-    "@utoo/pack-linux-arm64-musl": "1.1.8-rc.1",
-    "@utoo/pack-linux-x64-gnu": "1.1.8-rc.1",
-    "@utoo/pack-linux-x64-musl": "1.1.8-rc.1",
-    "@utoo/pack-win32-x64-msvc": "1.1.8-rc.1"
+    "@utoo/pack-darwin-arm64": "1.1.8-rc.3",
+    "@utoo/pack-darwin-x64": "1.1.8-rc.3",
+    "@utoo/pack-linux-arm64-gnu": "1.1.8-rc.3",
+    "@utoo/pack-linux-arm64-musl": "1.1.8-rc.3",
+    "@utoo/pack-linux-x64-gnu": "1.1.8-rc.3",
+    "@utoo/pack-linux-x64-musl": "1.1.8-rc.3",
+    "@utoo/pack-win32-x64-msvc": "1.1.8-rc.3"
   }
 }