@utoo/pack 1.2.8 → 1.2.10-alpha.0

package/README.md

@@ -22,7 +22,7 @@
 - **Resolve**: Full support for `alias` and `extensions`.
 - **Styles**: Built-in support for Less, Sass, PostCSS, CSS Modules, and LightningCSS.
 - **Optimization**: Minification, Tree Shaking, Module Concatenation, and more.
-- **Frameworks**: Optimized for React (including `styled-jsx`, `emotion`, `styled-components`).
+- **Frameworks**: Optimized for React (including `styled-jsx`, `styled-components`).
 - **Tools**: Integrated Bundle Analyzer and Tracing Logs.
 
 > [!TIP]

package/cjs/commands/build.js

@@ -16,6 +16,7 @@ const common_1 = require("../utils/common");
 const findRoot_1 = require("../utils/findRoot");
 const getInitialAssets_1 = require("../utils/getInitialAssets");
 const htmlEntry_1 = require("../utils/htmlEntry");
+const normalize_path_1 = require("../utils/normalize-path");
 const validateEntry_1 = require("../utils/validateEntry");
 const xcodeProfile_1 = require("../utils/xcodeProfile");
 function build(options, projectPath, rootPath) {
@@ -54,7 +55,7 @@ async function buildInternal(bundleOptions, projectPath, rootPath) {
                 bundleOptions.config.stats ||
                 bundleOptions.config.entry.some((e) => !!e.html),
         },
-        projectPath: projectPath || process.cwd(),
+        projectPath: (0, normalize_path_1.normalizePath)(resolvedProjectPath),
         rootPath: rootPath || projectPath || process.cwd(),
         packPath: (0, common_1.getPackPath)(),
     }, {

package/cjs/core/hmr.js

@@ -13,6 +13,7 @@ const HtmlPlugin_1 = require("../plugins/HtmlPlugin");
 const common_1 = require("../utils/common");
 const getInitialAssets_1 = require("../utils/getInitialAssets");
 const htmlEntry_1 = require("../utils/htmlEntry");
+const normalize_path_1 = require("../utils/normalize-path");
 const validateEntry_1 = require("../utils/validateEntry");
 const project_1 = require("./project");
 const wsServer = new ws_1.default.Server({ noServer: true });
@@ -51,7 +52,7 @@ async function createHotReloader(bundleOptions, projectPath, rootPath) {
                 moduleIds: "named",
             },
         },
-        projectPath: projectPath || process.cwd(),
+        projectPath: (0, normalize_path_1.normalizePath)(resolvedProjectPath),
         rootPath: rootPath || projectPath || process.cwd(),
         packPath: (0, common_1.getPackPath)(),
     }, {

package/cjs/core/project.js

@@ -35,6 +35,7 @@ var __importStar = (this && this.__importStar) || (function () {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TurbopackInternalError = void 0;
 exports.projectFactory = projectFactory;
+const util_1 = require("util");
 const binding = __importStar(require("../binding"));
 const common_1 = require("../utils/common");
 const loaderWorkerPool_1 = require("./loaderWorkerPool");
@@ -80,8 +81,109 @@ async function serializeConfig(config) {
             ]));
         }
     }
+    if (configSerializable.module && configSerializable.module.rules) {
+        configSerializable.module.rules = serializeModuleRules(configSerializable.module.rules);
+    }
     return JSON.stringify(configSerializable, null, 2);
 }
+// converts regexes to a `RegexComponents` object so that it can be JSON-serialized when passed to
+// Turbopack
+function serializeRuleCondition(cond) {
+    function regexComponents(regex) {
+        return {
+            source: regex.source,
+            flags: regex.flags,
+        };
+    }
+    if (typeof cond === "string") {
+        return cond;
+    }
+    else if ("all" in cond) {
+        return { ...cond, all: cond.all.map(serializeRuleCondition) };
+    }
+    else if ("any" in cond) {
+        return { ...cond, any: cond.any.map(serializeRuleCondition) };
+    }
+    else if ("not" in cond) {
+        return { ...cond, not: serializeRuleCondition(cond.not) };
+    }
+    else {
+        return {
+            ...cond,
+            path: cond.path == null
+                ? undefined
+                : cond.path instanceof RegExp
+                    ? {
+                        type: "regex",
+                        value: regexComponents(cond.path),
+                    }
+                    : { type: "glob", value: cond.path },
+            content: cond.content && regexComponents(cond.content),
+            query: cond.query == null
+                ? undefined
+                : cond.query instanceof RegExp
+                    ? {
+                        type: "regex",
+                        value: regexComponents(cond.query),
+                    }
+                    : { type: "constant", value: cond.query },
+            contentType: cond.contentType == null
+                ? undefined
+                : cond.contentType instanceof RegExp
+                    ? {
+                        type: "regex",
+                        value: regexComponents(cond.contentType),
+                    }
+                    : { type: "glob", value: cond.contentType },
+        };
+    }
+}
+// Note: Returns an updated `turbopackRules` with serialized conditions. Does not mutate in-place.
+function serializeModuleRules(turbopackRules) {
+    const serializedRules = {};
+    for (const [glob, rule] of Object.entries(turbopackRules)) {
+        if (Array.isArray(rule)) {
+            serializedRules[glob] = rule.map((item) => {
+                if (typeof item !== "string" &&
+                    ("loaders" in item || "type" in item || "condition" in item)) {
+                    return serializeConfigItem(item, glob);
+                }
+                else {
+                    checkLoaderItem(item, glob);
+                    return item;
+                }
+            });
+        }
+        else {
+            serializedRules[glob] = serializeConfigItem(rule, glob);
+        }
+    }
+    return serializedRules;
+    function serializeConfigItem(rule, glob) {
+        if (!rule)
+            return rule;
+        if (rule.loaders) {
+            for (const item of rule.loaders) {
+                checkLoaderItem(item, glob);
+            }
+        }
+        let serializedRule = rule;
+        if (rule.condition != null) {
+            serializedRule = {
+                ...rule,
+                condition: serializeRuleCondition(rule.condition),
+            };
+        }
+        return serializedRule;
+    }
+    function checkLoaderItem(loaderItem, glob) {
+        if (typeof loaderItem !== "string" &&
+            !(0, util_1.isDeepStrictEqual)(loaderItem, JSON.parse(JSON.stringify(loaderItem)))) {
+            throw new Error(`loader ${loaderItem.loader} for match "${glob}" does not have serializable options. ` +
+                "Ensure that options passed are plain JavaScript objects and values.");
+        }
+    }
+}
 async function rustifyPartialProjectOptions(options) {
     return {
         ...options,

package/cjs/utils/normalize-path.d.ts

@@ -0,0 +1 @@
+export declare function normalizePath(file: string): string;

package/cjs/utils/normalize-path.js

@@ -0,0 +1,10 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.normalizePath = normalizePath;
+const path_1 = __importDefault(require("path"));
+function normalizePath(file) {
+    return path_1.default.sep === "\\" ? file.replace(/\\/g, "/") : file;
+}

package/config_schema.json

@@ -1021,6 +1021,13 @@
             "null"
           ]
         },
+        "chunkLoadingGlobal": {
+          "description": "The global variable name used by the runtime for loading chunks. Default: 'TURBOPACK'",
+          "type": [
+            "string",
+            "null"
+          ]
+        },
         "clean": {
           "description": "Whether to clean output directory before build",
           "type": [
@@ -1038,6 +1045,13 @@
             "$ref": "#/definitions/SchemaCopyItem"
           }
         },
+        "entryRootExport": {
+          "description": "Expose entry module exports to global scope with the specified name. When set, all named exports from the entry module will be available on window/globalThis under the specified name. If set to empty string, will use package.json name. Default: None (no exposure)",
+          "type": [
+            "string",
+            "null"
+          ]
+        },
         "filename": {
           "description": "Filename pattern for main files",
           "type": [
@@ -1207,9 +1221,6 @@
       "description": "Style configuration",
       "type": "object",
       "properties": {
-        "emotion": {
-          "description": "Emotion transform configuration"
-        },
         "inlineCss": {
           "description": "Inline CSS configuration"
         },
@@ -1261,6 +1272,16 @@
           "description": "Whether to watch the filesystem for file changes.",
           "type": "boolean"
         },
+        "ignored": {
+          "description": "Paths to ignore when watching for file changes. By default, ignores: node_modules",
+          "type": [
+            "array",
+            "null"
+          ],
+          "items": {
+            "type": "string"
+          }
+        },
         "pollInterval": {
           "description": "Enable polling at a certain interval if the native file watching doesn't work (e.g. docker).",
           "type": [

package/esm/commands/build.js

@@ -10,6 +10,7 @@ import { blockStdout, createDefineEnv, getPackPath } from "../utils/common";
 import { findRootDir } from "../utils/findRoot";
 import { getInitialAssetsFromStats } from "../utils/getInitialAssets";
 import { processHtmlEntry } from "../utils/htmlEntry";
+import { normalizePath } from "../utils/normalize-path";
 import { validateEntryPaths } from "../utils/validateEntry";
 import { xcodeProfilingReady } from "../utils/xcodeProfile";
 export function build(options, projectPath, rootPath) {
@@ -48,7 +49,7 @@ async function buildInternal(bundleOptions, projectPath, rootPath) {
                 bundleOptions.config.stats ||
                 bundleOptions.config.entry.some((e) => !!e.html),
         },
-        projectPath: projectPath || process.cwd(),
+        projectPath: normalizePath(resolvedProjectPath),
         rootPath: rootPath || projectPath || process.cwd(),
         packPath: getPackPath(),
     }, {

package/esm/core/hmr.js

@@ -6,6 +6,7 @@ import { HtmlPlugin } from "../plugins/HtmlPlugin";
 import { createDefineEnv, debounce, getPackPath, processIssues, } from "../utils/common";
 import { getInitialAssetsFromStats } from "../utils/getInitialAssets";
 import { processHtmlEntry } from "../utils/htmlEntry";
+import { normalizePath } from "../utils/normalize-path";
 import { validateEntryPaths } from "../utils/validateEntry";
 import { projectFactory } from "./project";
 const wsServer = new ws.Server({ noServer: true });
@@ -43,7 +44,7 @@ export async function createHotReloader(bundleOptions, projectPath, rootPath) {
                 moduleIds: "named",
             },
         },
-        projectPath: projectPath || process.cwd(),
+        projectPath: normalizePath(resolvedProjectPath),
         rootPath: rootPath || projectPath || process.cwd(),
         packPath: getPackPath(),
     }, {

package/esm/core/project.js

@@ -1,3 +1,4 @@
+import { isDeepStrictEqual } from "util";
 import * as binding from "../binding";
 import { rustifyEnv } from "../utils/common";
 import { runLoaderWorkerPool } from "./loaderWorkerPool";
@@ -42,8 +43,109 @@ async function serializeConfig(config) {
             ]));
         }
     }
+    if (configSerializable.module && configSerializable.module.rules) {
+        configSerializable.module.rules = serializeModuleRules(configSerializable.module.rules);
+    }
     return JSON.stringify(configSerializable, null, 2);
 }
+// converts regexes to a `RegexComponents` object so that it can be JSON-serialized when passed to
+// Turbopack
+function serializeRuleCondition(cond) {
+    function regexComponents(regex) {
+        return {
+            source: regex.source,
+            flags: regex.flags,
+        };
+    }
+    if (typeof cond === "string") {
+        return cond;
+    }
+    else if ("all" in cond) {
+        return { ...cond, all: cond.all.map(serializeRuleCondition) };
+    }
+    else if ("any" in cond) {
+        return { ...cond, any: cond.any.map(serializeRuleCondition) };
+    }
+    else if ("not" in cond) {
+        return { ...cond, not: serializeRuleCondition(cond.not) };
+    }
+    else {
+        return {
+            ...cond,
+            path: cond.path == null
+                ? undefined
+                : cond.path instanceof RegExp
+                    ? {
+                        type: "regex",
+                        value: regexComponents(cond.path),
+                    }
+                    : { type: "glob", value: cond.path },
+            content: cond.content && regexComponents(cond.content),
+            query: cond.query == null
+                ? undefined
+                : cond.query instanceof RegExp
+                    ? {
+                        type: "regex",
+                        value: regexComponents(cond.query),
+                    }
+                    : { type: "constant", value: cond.query },
+            contentType: cond.contentType == null
+                ? undefined
+                : cond.contentType instanceof RegExp
+                    ? {
+                        type: "regex",
+                        value: regexComponents(cond.contentType),
+                    }
+                    : { type: "glob", value: cond.contentType },
+        };
+    }
+}
+// Note: Returns an updated `turbopackRules` with serialized conditions. Does not mutate in-place.
+function serializeModuleRules(turbopackRules) {
+    const serializedRules = {};
+    for (const [glob, rule] of Object.entries(turbopackRules)) {
+        if (Array.isArray(rule)) {
+            serializedRules[glob] = rule.map((item) => {
+                if (typeof item !== "string" &&
+                    ("loaders" in item || "type" in item || "condition" in item)) {
+                    return serializeConfigItem(item, glob);
+                }
+                else {
+                    checkLoaderItem(item, glob);
+                    return item;
+                }
+            });
+        }
+        else {
+            serializedRules[glob] = serializeConfigItem(rule, glob);
+        }
+    }
+    return serializedRules;
+    function serializeConfigItem(rule, glob) {
+        if (!rule)
+            return rule;
+        if (rule.loaders) {
+            for (const item of rule.loaders) {
+                checkLoaderItem(item, glob);
+            }
+        }
+        let serializedRule = rule;
+        if (rule.condition != null) {
+            serializedRule = {
+                ...rule,
+                condition: serializeRuleCondition(rule.condition),
+            };
+        }
+        return serializedRule;
+    }
+    function checkLoaderItem(loaderItem, glob) {
+        if (typeof loaderItem !== "string" &&
+            !isDeepStrictEqual(loaderItem, JSON.parse(JSON.stringify(loaderItem)))) {
+            throw new Error(`loader ${loaderItem.loader} for match "${glob}" does not have serializable options. ` +
+                "Ensure that options passed are plain JavaScript objects and values.");
+        }
+    }
+}
 async function rustifyPartialProjectOptions(options) {
     return {
         ...options,

package/esm/utils/normalize-path.d.ts

@@ -0,0 +1 @@
+export declare function normalizePath(file: string): string;

package/esm/utils/normalize-path.js

@@ -0,0 +1,4 @@
+import path from "path";
+export function normalizePath(file) {
+    return path.sep === "\\" ? file.replace(/\\/g, "/") : file;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@utoo/pack",
-  "version": "1.2.8",
+  "version": "1.2.10-alpha.0",
   "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": "1.2.8",
+    "@utoo/pack-shared": "1.2.10-alpha.0",
     "@utoo/style-loader": "^1.0.0",
     "domparser-rs": "^0.0.7",
     "find-up": "4.1.0",
@@ -86,12 +86,12 @@
   },
   "repository": "git@github.com:utooland/utoo.git",
   "optionalDependencies": {
-    "@utoo/pack-darwin-arm64": "1.2.8",
-    "@utoo/pack-darwin-x64": "1.2.8",
-    "@utoo/pack-linux-arm64-gnu": "1.2.8",
-    "@utoo/pack-linux-arm64-musl": "1.2.8",
-    "@utoo/pack-linux-x64-gnu": "1.2.8",
-    "@utoo/pack-linux-x64-musl": "1.2.8",
-    "@utoo/pack-win32-x64-msvc": "1.2.8"
+    "@utoo/pack-darwin-arm64": "1.2.10-alpha.0",
+    "@utoo/pack-darwin-x64": "1.2.10-alpha.0",
+    "@utoo/pack-linux-arm64-gnu": "1.2.10-alpha.0",
+    "@utoo/pack-linux-arm64-musl": "1.2.10-alpha.0",
+    "@utoo/pack-linux-x64-gnu": "1.2.10-alpha.0",
+    "@utoo/pack-linux-x64-musl": "1.2.10-alpha.0",
+    "@utoo/pack-win32-x64-msvc": "1.2.10-alpha.0"
   }
 }