@utoo/pack 0.0.1-alpha.40 → 0.0.1-alpha.46

package/cjs/dev.js

@@ -19,6 +19,7 @@ const net_1 = require("net");
 const path_1 = __importDefault(require("path"));
 const send_1 = __importDefault(require("send"));
 const url_1 = __importDefault(require("url"));
+const find_root_1 = require("./find-root");
 const hmr_1 = require("./hmr");
 const mkcert_1 = require("./mkcert");
 const util_1 = require("./util");
@@ -28,6 +29,10 @@ function serve(options, projectPath, rootPath, serverOptions) {
     const bundleOptions = options.compatMode
         ? (0, webpackCompat_1.compatOptionsFromWebpack)(options)
         : options;
+    if (!rootPath) {
+        // help user to find the rootDir automatically
+        rootPath = (0, find_root_1.findRootDir)(projectPath || process.cwd());
+    }
     return serveInternal(bundleOptions, projectPath, rootPath, serverOptions);
 }
 async function serveInternal(options, projectPath, rootPath, serverOptions) {
@@ -35,7 +40,7 @@ async function serveInternal(options, projectPath, rootPath, serverOptions) {
     if (process.env.XCODE_PROFILE) {
         await (0, xcodeProfile_1.xcodeProfilingReady)();
     }
-    startServer({
+    await startServer({
         hostname: (serverOptions === null || serverOptions === void 0 ? void 0 : serverOptions.hostname) || "localhost",
         port: (serverOptions === null || serverOptions === void 0 ? void 0 : serverOptions.port) || 3000,
         https: serverOptions === null || serverOptions === void 0 ? void 0 : serverOptions.https,

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/dev.js

@@ -5,6 +5,7 @@ import { isIPv6 } from "net";
 import path from "path";
 import send from "send";
 import url from "url";
+import { findRootDir } from "./find-root";
 import { createHotReloader } from "./hmr";
 import { createSelfSignedCertificate } from "./mkcert";
 import { blockStdout } from "./util";
@@ -14,6 +15,10 @@ export function serve(options, projectPath, rootPath, serverOptions) {
     const bundleOptions = options.compatMode
         ? compatOptionsFromWebpack(options)
         : options;
+    if (!rootPath) {
+        // help user to find the rootDir automatically
+        rootPath = findRootDir(projectPath || process.cwd());
+    }
     return serveInternal(bundleOptions, projectPath, rootPath, serverOptions);
 }
 async function serveInternal(options, projectPath, rootPath, serverOptions) {
@@ -21,7 +26,7 @@ async function serveInternal(options, projectPath, rootPath, serverOptions) {
     if (process.env.XCODE_PROFILE) {
         await xcodeProfilingReady();
     }
-    startServer({
+    await startServer({
         hostname: (serverOptions === null || serverOptions === void 0 ? void 0 : serverOptions.hostname) || "localhost",
         port: (serverOptions === null || serverOptions === void 0 ? void 0 : serverOptions.port) || 3000,
         https: serverOptions === null || serverOptions === void 0 ? void 0 : serverOptions.https,

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.40",
+  "version": "0.0.1-alpha.46",
   "main": "cjs/index.js",
   "module": "esm/index.js",
   "exports": {
@@ -70,7 +70,7 @@
     "@types/webpack": "^5.28.5"
   },
   "engines": {
-    "node": ">= 10"
+    "node": ">= 20"
   },
   "scripts": {
     "build:cjs": "rm -rf cjs && tsc -p ./tsconfig.json --module commonjs --outDir cjs && cp src/*.d.ts cjs/",
@@ -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.40",
-    "@utoo/pack-darwin-x64": "0.0.1-alpha.40",
-    "@utoo/pack-linux-arm64-gnu": "0.0.1-alpha.40",
-    "@utoo/pack-linux-arm64-musl": "0.0.1-alpha.40",
-    "@utoo/pack-linux-x64-gnu": "0.0.1-alpha.40",
-    "@utoo/pack-linux-x64-musl": "0.0.1-alpha.40",
-    "@utoo/pack-win32-x64-msvc": "0.0.1-alpha.40"
+    "@utoo/pack-darwin-arm64": "0.0.1-alpha.46",
+    "@utoo/pack-darwin-x64": "0.0.1-alpha.46",
+    "@utoo/pack-linux-arm64-gnu": "0.0.1-alpha.46",
+    "@utoo/pack-linux-arm64-musl": "0.0.1-alpha.46",
+    "@utoo/pack-linux-x64-gnu": "0.0.1-alpha.46",
+    "@utoo/pack-linux-x64-musl": "0.0.1-alpha.46",
+    "@utoo/pack-win32-x64-msvc": "0.0.1-alpha.46"
   }
 }