@utoo/pack 0.0.1-alpha.41 → 0.0.1-alpha.47

package/cjs/build.js

@@ -1,7 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.build = build;
+const child_process_1 = require("child_process");
+const fs_1 = require("fs");
 const nanoid_1 = require("nanoid");
+const path_1 = require("path");
 const find_root_1 = require("./find-root");
 const project_1 = require("./project");
 const util_1 = require("./util");
@@ -18,7 +21,7 @@ function build(options, projectPath, rootPath) {
     return buildInternal(bundleOptions, projectPath, rootPath);
 }
 async function buildInternal(bundleOptions, projectPath, rootPath) {
-    var _a, _b, _c;
+    var _a, _b, _c, _d;
     (0, util_1.blockStdout)();
     if (process.env.XCODE_PROFILE) {
         await (0, xcodeProfile_1.xcodeProfilingReady)();
@@ -36,7 +39,10 @@ async function buildInternal(bundleOptions, projectPath, rootPath) {
         },
         dev: (_c = bundleOptions.dev) !== null && _c !== void 0 ? _c : false,
         buildId: bundleOptions.buildId || (0, nanoid_1.nanoid)(),
-        config: bundleOptions.config,
+        config: {
+            ...bundleOptions.config,
+            stats: Boolean(process.env.ANALYZE) || bundleOptions.config.stats,
+        },
         projectPath: projectPath || process.cwd(),
         rootPath: rootPath || projectPath || process.cwd(),
     }, {
@@ -60,6 +66,30 @@ async function buildInternal(bundleOptions, projectPath, rootPath) {
         throw new Error(`Utoopack build failed with ${topLevelErrors.length} errors:\n${topLevelErrors.join("\n")}`);
     }
     await project.shutdown();
+    if (process.env.ANALYZE) {
+        await analyzeBundle(projectPath || process.cwd(), ((_d = bundleOptions.config.output) === null || _d === void 0 ? void 0 : _d.path) || "dist");
+    }
     // TODO: Maybe run tasks in worker is a better way, see
     // https://github.com/vercel/next.js/blob/512d8283054407ab92b2583ecce3b253c3be7b85/packages/next/src/lib/worker.ts
 }
+async function analyzeBundle(projectPath, outputPath) {
+    const statsPath = (0, path_1.join)(projectPath, outputPath, "stats.json");
+    if (!(0, fs_1.existsSync)(statsPath)) {
+        console.warn(`Stats file not found at ${statsPath}. Make sure to enable stats in your configuration.`);
+        return;
+    }
+    return new Promise((resolve, reject) => {
+        const analyzer = (0, child_process_1.spawn)("npx", ["webpack-bundle-analyzer", statsPath], {
+            stdio: "inherit",
+            shell: true,
+        });
+        analyzer.on("error", (error) => {
+            reject(new Error(`Failed to start bundle analyzer: ${error.message}`));
+        });
+        analyzer.on("close", () => {
+            // The analyzer process has finished, so we can resolve the promise
+            // to allow the build process to exit gracefully.
+            resolve();
+        });
+    });
+}

package/cjs/find-root.js

@@ -21,7 +21,7 @@ function findRootLockFile(cwd) {
         cwd,
     });
 }
-// compitable with tnpm
+// compatible with tnpm
 function findPackageJson(cwd) {
     return find_up_1.default.sync(["package.json"], {
         cwd,
@@ -32,7 +32,7 @@ function isWorkspaceRoot(pkgPath) {
     const pkgJsonContent = JSON.parse(pkgJson);
     return Boolean(pkgJsonContent.workspaces);
 }
-// refer from: https://github.com/umijs/mako/blob/next/crates/cli/src/helper/workspace.rs#L153
+// refer from: https://github.com/umijs/mako/blob/next/crates/pm/src/helper/workspace.rs#L153
 // TODO: 这块逻辑后续跟 utoo-pkg 使用一套方法
 function findWorkspacesRoot(cwd) {
     const pkgJson = findPackageJson(cwd);

package/cjs/types.d.ts

@@ -132,6 +132,9 @@ export interface ConfigComplete {
             transform: string | Record<string, string>;
             preventFullImport?: boolean;
             skipDefaultConversion?: boolean;
+            handleDefaultImport?: boolean;
+            handleNamespaceImport?: boolean;
+            style?: string;
         }>;
         packageImports?: string[];
         transpilePackages?: string[];

package/cjs/webpackCompat.js

@@ -332,9 +332,7 @@ function compatOptimization(webpackOptimization) {
     if (!webpackOptimization) {
         return;
     }
-    const { moduleIds, minimize,
-    // TODO: concatenateModules to be supported, need to upgrade to next.js@15.4
-     } = webpackOptimization;
+    const { moduleIds, minimize, concatenateModules } = webpackOptimization;
     return {
         moduleIds: moduleIds === "named"
             ? "named"
@@ -342,6 +340,7 @@ function compatOptimization(webpackOptimization) {
                 ? "deterministic"
                 : undefined,
         minify: minimize,
+        concatenateModules,
     };
 }
 function compatStats(webpackStats) {

package/config_schema.json

@@ -553,6 +553,50 @@
         }
       }
     },
+    "SchemaModularizeImportPackageConfig": {
+      "description": "Modularize import package configuration",
+      "type": "object",
+      "required": [
+        "transform"
+      ],
+      "properties": {
+        "handleDefaultImport": {
+          "description": "Handle default import",
+          "default": false,
+          "type": "boolean"
+        },
+        "handleNamespaceImport": {
+          "description": "Handle namespace import",
+          "default": false,
+          "type": "boolean"
+        },
+        "preventFullImport": {
+          "description": "Prevent full import of the package",
+          "default": false,
+          "type": "boolean"
+        },
+        "skipDefaultConversion": {
+          "description": "Skip default conversion",
+          "default": false,
+          "type": "boolean"
+        },
+        "style": {
+          "description": "Style import configuration",
+          "type": [
+            "string",
+            "null"
+          ]
+        },
+        "transform": {
+          "description": "Transform configuration",
+          "allOf": [
+            {
+              "$ref": "#/definitions/SchemaTransform"
+            }
+          ]
+        }
+      }
+    },
     "SchemaModuleConfig": {
       "description": "Module configuration",
       "type": "object",
@@ -609,7 +653,9 @@
             "object",
             "null"
           ],
-          "additionalProperties": true
+          "additionalProperties": {
+            "$ref": "#/definitions/SchemaModularizeImportPackageConfig"
+          }
         },
         "moduleIds": {
           "description": "Module ID generation strategy",
@@ -856,6 +902,32 @@
           "description": "Styled components configuration"
         }
       }
+    },
+    "SchemaTransform": {
+      "description": "Transform configuration for modularize imports",
+      "anyOf": [
+        {
+          "description": "String transform template",
+          "type": "string"
+        },
+        {
+          "description": "Vector of transformation pairs",
+          "type": "array",
+          "items": {
+            "type": "array",
+            "items": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "string"
+              }
+            ],
+            "maxItems": 2,
+            "minItems": 2
+          }
+        }
+      ]
     }
   }
 }

package/esm/build.js

@@ -1,4 +1,7 @@
+import { spawn } from "child_process";
+import { existsSync } from "fs";
 import { nanoid } from "nanoid";
+import { join } from "path";
 import { findRootDir } from "./find-root";
 import { projectFactory } from "./project";
 import { blockStdout, createDefineEnv, formatIssue, isRelevantWarning, } from "./util";
@@ -15,7 +18,7 @@ export function build(options, projectPath, rootPath) {
     return buildInternal(bundleOptions, projectPath, rootPath);
 }
 async function buildInternal(bundleOptions, projectPath, rootPath) {
-    var _a, _b, _c;
+    var _a, _b, _c, _d;
     blockStdout();
     if (process.env.XCODE_PROFILE) {
         await xcodeProfilingReady();
@@ -33,7 +36,10 @@ async function buildInternal(bundleOptions, projectPath, rootPath) {
         },
         dev: (_c = bundleOptions.dev) !== null && _c !== void 0 ? _c : false,
         buildId: bundleOptions.buildId || nanoid(),
-        config: bundleOptions.config,
+        config: {
+            ...bundleOptions.config,
+            stats: Boolean(process.env.ANALYZE) || bundleOptions.config.stats,
+        },
         projectPath: projectPath || process.cwd(),
         rootPath: rootPath || projectPath || process.cwd(),
     }, {
@@ -57,6 +63,30 @@ async function buildInternal(bundleOptions, projectPath, rootPath) {
         throw new Error(`Utoopack build failed with ${topLevelErrors.length} errors:\n${topLevelErrors.join("\n")}`);
     }
     await project.shutdown();
+    if (process.env.ANALYZE) {
+        await analyzeBundle(projectPath || process.cwd(), ((_d = bundleOptions.config.output) === null || _d === void 0 ? void 0 : _d.path) || "dist");
+    }
     // TODO: Maybe run tasks in worker is a better way, see
     // https://github.com/vercel/next.js/blob/512d8283054407ab92b2583ecce3b253c3be7b85/packages/next/src/lib/worker.ts
 }
+async function analyzeBundle(projectPath, outputPath) {
+    const statsPath = join(projectPath, outputPath, "stats.json");
+    if (!existsSync(statsPath)) {
+        console.warn(`Stats file not found at ${statsPath}. Make sure to enable stats in your configuration.`);
+        return;
+    }
+    return new Promise((resolve, reject) => {
+        const analyzer = spawn("npx", ["webpack-bundle-analyzer", statsPath], {
+            stdio: "inherit",
+            shell: true,
+        });
+        analyzer.on("error", (error) => {
+            reject(new Error(`Failed to start bundle analyzer: ${error.message}`));
+        });
+        analyzer.on("close", () => {
+            // The analyzer process has finished, so we can resolve the promise
+            // to allow the build process to exit gracefully.
+            resolve();
+        });
+    });
+}

package/esm/find-root.js

@@ -12,7 +12,7 @@ export function findRootLockFile(cwd) {
         cwd,
     });
 }
-// compitable with tnpm
+// compatible with tnpm
 export function findPackageJson(cwd) {
     return findUp.sync(["package.json"], {
         cwd,
@@ -23,7 +23,7 @@ function isWorkspaceRoot(pkgPath) {
     const pkgJsonContent = JSON.parse(pkgJson);
     return Boolean(pkgJsonContent.workspaces);
 }
-// refer from: https://github.com/umijs/mako/blob/next/crates/cli/src/helper/workspace.rs#L153
+// refer from: https://github.com/umijs/mako/blob/next/crates/pm/src/helper/workspace.rs#L153
 // TODO: 这块逻辑后续跟 utoo-pkg 使用一套方法
 export function findWorkspacesRoot(cwd) {
     const pkgJson = findPackageJson(cwd);

package/esm/types.d.ts

@@ -132,6 +132,9 @@ export interface ConfigComplete {
             transform: string | Record<string, string>;
             preventFullImport?: boolean;
             skipDefaultConversion?: boolean;
+            handleDefaultImport?: boolean;
+            handleNamespaceImport?: boolean;
+            style?: string;
         }>;
         packageImports?: string[];
         transpilePackages?: string[];

package/esm/webpackCompat.js

@@ -329,9 +329,7 @@ function compatOptimization(webpackOptimization) {
     if (!webpackOptimization) {
         return;
     }
-    const { moduleIds, minimize,
-    // TODO: concatenateModules to be supported, need to upgrade to next.js@15.4
-     } = webpackOptimization;
+    const { moduleIds, minimize, concatenateModules } = webpackOptimization;
     return {
         moduleIds: moduleIds === "named"
             ? "named"
@@ -339,6 +337,7 @@ function compatOptimization(webpackOptimization) {
                 ? "deterministic"
                 : undefined,
         minify: minimize,
+        concatenateModules,
     };
 }
 function compatStats(webpackStats) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@utoo/pack",
-  "version": "0.0.1-alpha.41",
+  "version": "0.0.1-alpha.47",
   "main": "cjs/index.js",
   "module": "esm/index.js",
   "exports": {
@@ -83,14 +83,14 @@
     "version": "napi version",
     "generate-features-list": "node ./scripts/generate-feature-list.js"
   },
-  "repository": "git@github.com:umijs/mako.git",
+  "repository": "git@github.com:utooland/utoo.git",
   "optionalDependencies": {
-    "@utoo/pack-darwin-arm64": "0.0.1-alpha.41",
-    "@utoo/pack-darwin-x64": "0.0.1-alpha.41",
-    "@utoo/pack-linux-arm64-gnu": "0.0.1-alpha.41",
-    "@utoo/pack-linux-arm64-musl": "0.0.1-alpha.41",
-    "@utoo/pack-linux-x64-gnu": "0.0.1-alpha.41",
-    "@utoo/pack-linux-x64-musl": "0.0.1-alpha.41",
-    "@utoo/pack-win32-x64-msvc": "0.0.1-alpha.41"
+    "@utoo/pack-darwin-arm64": "0.0.1-alpha.47",
+    "@utoo/pack-darwin-x64": "0.0.1-alpha.47",
+    "@utoo/pack-linux-arm64-gnu": "0.0.1-alpha.47",
+    "@utoo/pack-linux-arm64-musl": "0.0.1-alpha.47",
+    "@utoo/pack-linux-x64-gnu": "0.0.1-alpha.47",
+    "@utoo/pack-linux-x64-musl": "0.0.1-alpha.47",
+    "@utoo/pack-win32-x64-msvc": "0.0.1-alpha.47"
   }
 }