@webiny/build-tools 0.0.0-unstable.7be00a75a9 → 0.0.0-unstable.9f53ea597d

package/bundling/function/createBuildFunction.js

@@ -8,7 +8,7 @@ export const createBuildFunction =
 
         // Must be a dynamic import — see rslibCompile.js for the reason.
         const { createRsbuild } = await import("@rsbuild/core");
-        const rsbuildConfig = await createRsbuildConfig({ cwd });
+        const rsbuildConfig = await createRsbuildConfig({ cwd, enforceMaxBundleSize: true });
 
         const rsbuild = await createRsbuild({ rsbuildConfig });
 

package/bundling/function/createRsbuildConfig.js

@@ -4,7 +4,7 @@ import { createImportValidatorPlugin } from "../importValidatorPlugin.js";
 
 const DEFAULT_WEBINY_INFRA_API_MAX_BUNDLE_SIZE = 4_718_592; // 4.5 MB
 
-export const createRsbuildConfig = async ({ cwd }) => {
+export const createRsbuildConfig = async ({ cwd, enforceMaxBundleSize }) => {
     // Must be a dynamic import — see rslibCompile.js for the reason.
     const { default: rspack } = await import("@rspack/core");
     const paths = getPaths(cwd);
@@ -12,6 +12,7 @@ export const createRsbuildConfig = async ({ cwd }) => {
     const isDebugEnabled = process.env.DEBUG === "true";
 
     // Configurable via WEBINY_INFRA_API_MAX_BUNDLE_SIZE (bytes).
+    // Only enforced during build — watch mode skips size checks.
     const maxBundleSize =
         parseInt(process.env.WEBINY_INFRA_API_MAX_BUNDLE_SIZE) ||
         DEFAULT_WEBINY_INFRA_API_MAX_BUNDLE_SIZE;
@@ -23,7 +24,7 @@ export const createRsbuildConfig = async ({ cwd }) => {
             target: "node",
             minify: true,
             sourceMap: {
-                js: isDebugEnabled ? "source-map" : false
+                js: isDebugEnabled || mode === "development" ? "source-map" : false
             },
             filename: {
                 js: pathData => {
@@ -40,18 +41,33 @@ export const createRsbuildConfig = async ({ cwd }) => {
         },
         tools: {
             rspack: {
-                performance: {
-                    hints: "error",
-                    maxEntrypointSize: maxBundleSize,
-                    maxAssetSize: maxBundleSize
-                },
-                externals: [/^@aws-sdk/, /^aws-sdk$/, /^sharp$/],
+                ...(enforceMaxBundleSize && {
+                    performance: {
+                        hints: "error",
+                        maxEntrypointSize: maxBundleSize,
+                        maxAssetSize: maxBundleSize
+                    }
+                }),
+                externals: [
+                    /^@aws-sdk/,
+                    /^aws-sdk$/,
+                    /^sharp$/,
+                    // knex is a runtime-polymorphic package: its source statically require()s a
+                    // driver for EVERY SQL dialect (pg, mysql, mariadb, mssql, sqlite, ...) and
+                    // picks one at runtime from the configured `client`. Bundling it forces the
+                    // bundler to resolve drivers that aren't installed (the mariadb/tedious/pg
+                    // "Module not found" errors). The server flavour runs as a Node process with
+                    // node_modules present, so we externalize knex and let Node load it — knex then
+                    // lazily require()s ONLY the configured dialect's driver (e.g. better-sqlite3),
+                    // never the others.
+                    /^knex(\/|$)/
+                ],
                 plugins: [
-                    // This is necessary to enable JSDOM usage in Lambda.
+                    // Ignore optional `canvas` native module required by jsdom.
                     // https://rspack.dev/plugins/webpack/ignore-plugin
                     new rspack.IgnorePlugin({
-                        resourceRegExp: /canvas/,
-                        contextRegExp: /jsdom$/
+                        resourceRegExp: /^canvas$/,
+                        contextRegExp: /jsdom/
                     })
                 ],
                 resolve: {

package/bundling/function/createWatchFunction.js

@@ -7,7 +7,7 @@ export const createWatchFunction =
 
         // Must be a dynamic import — see rslibCompile.js for the reason.
         const { createRsbuild } = await import("@rsbuild/core");
-        const rsbuildConfig = await createRsbuildConfig({ cwd });
+        const rsbuildConfig = await createRsbuildConfig({ cwd, enforceMaxBundleSize: false });
 
         const rsbuild = await createRsbuild({ rsbuildConfig });
 

package/bundling/importValidatorPlugin.js

@@ -5,7 +5,17 @@ const cyan = "\x1b[36m";
 const reset = "\x1b[0m";
 const bold = "\x1b[1m";
 
-const whitelist = ["@webiny/cognito", "@webiny/auth0", "@webiny/okta", "@webiny/plugins"];
+const whitelist = [
+    "@webiny/cognito",
+    "@webiny/auth0",
+    "@webiny/okta",
+    "@webiny/plugins",
+    "@webiny/sdk",
+    "@webiny/stdlib",
+    "@webiny/lexical-converter",
+    "@webiny/lexical-nodes",
+    "@webiny/lexical-theme"
+];
 
 export const createImportValidatorPlugin = () => {
     return {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@webiny/build-tools",
-	"version": "0.0.0-unstable.7be00a75a9",
+	"version": "0.0.0-unstable.9f53ea597d",
 	"type": "module",
 	"exports": {
 		".": "./index.js",
@@ -17,20 +17,21 @@
 		"Adrian Smijulj <adrian@webiny.com>"
 	],
 	"dependencies": {
-		"@rsbuild/core": "2.0.6",
-		"@rsbuild/plugin-react": "2.0.0",
-		"@rsbuild/plugin-sass": "1.5.2",
-		"@rsbuild/plugin-svgr": "2.0.2",
-		"@rsbuild/plugin-type-check": "1.3.4",
-		"@rslib/core": "0.21.5",
-		"@rspack/core": "2.0.3",
-		"@swc/plugin-emotion": "14.9.0",
-		"@tailwindcss/postcss": "4.3.0",
+		"@rsbuild/core": "2.1.7",
+		"@rsbuild/plugin-react": "2.1.0",
+		"@rsbuild/plugin-sass": "2.0.1",
+		"@rsbuild/plugin-svgr": "2.0.5",
+		"@rsbuild/plugin-type-check": "1.5.0",
+		"@rsdoctor/rspack-plugin": "1.6.1",
+		"@rslib/core": "0.23.2",
+		"@rspack/core": "2.1.5",
+		"@swc/plugin-emotion": "14.15.0",
+		"@tailwindcss/postcss": "4.3.3",
 		"chalk": "5.6.2",
 		"css-loader": "7.1.4",
 		"fast-glob": "3.3.3",
 		"find-up": "8.0.0",
-		"fs-extra": "11.3.5",
+		"fs-extra": "11.3.6",
 		"get-yarn-workspaces": "1.0.2",
 		"load-json-file": "7.0.1",
 		"lodash": "4.18.1",
@@ -39,12 +40,13 @@
 		"react-dom": "18.3.1",
 		"react-refresh": "0.18.0",
 		"rimraf": "6.1.3",
-		"sass": "1.99.0",
+		"sass": "1.101.3",
 		"sass-loader": "17.0.0",
+		"strip-json-comments": "5.0.3",
 		"style-loader": "4.0.0",
 		"ts-morph": "28.0.0",
-		"tsx": "4.21.0",
-		"typescript": "6.0.3",
+		"tsx": "4.23.1",
+		"typescript": "7.0.2",
 		"url-loader": "4.1.1",
 		"utf-8-validate": "6.0.6"
 	},
@@ -68,7 +70,8 @@
 				"bufferutil",
 				"utf-8-validate",
 				"css-loader",
-				"url-loader"
+				"url-loader",
+				"@rsdoctor/rspack-plugin"
 			]
 		}
 	},

package/packages/buildPackage/rslibCompile.js

@@ -6,7 +6,9 @@ import glob from "fast-glob";
 const COMPILE_EXTENSIONS = [".js", ".jsx", ".ts", ".tsx"];
 const SKIP_EXTENSIONS = [".d.ts"];
 
-export const rslibCompile = async ({ cwd }) => {
+export const rslibCompile = async ({ cwd, outputDir }) => {
+    const distRoot = outputDir || path.join(cwd, "dist");
+
     // Copy non-compilable files (assets, json, graphql, etc.) as-is.
     const pattern = path.join(cwd, "src/**/*.*").replace(/\\/g, "/");
     const allFiles = glob.sync(pattern, { onlyFiles: true, dot: true });
@@ -16,7 +18,7 @@ export const rslibCompile = async ({ cwd }) => {
         const shouldSkip = SKIP_EXTENSIONS.some(ext => file.endsWith(ext));
 
         if (!shouldCompile || shouldSkip) {
-            const destPath = file.replace(path.join(cwd, "src"), path.join(cwd, "dist"));
+            const destPath = file.replace(path.join(cwd, "src"), distRoot);
             fs.mkdirSync(dirname(destPath), { recursive: true });
             fs.copyFileSync(file, destPath);
         }
@@ -44,7 +46,7 @@ export const rslibCompile = async ({ cwd }) => {
             },
             output: {
                 target: "web",
-                distPath: { root: "./dist" },
+                distPath: { root: path.relative(cwd, distRoot) || "." },
                 cleanDistPath: false,
                 sourceMap: { js: "source-map" },
                 // mixedImport emits each SVG as a static asset for the default URL

package/packages/buildPackage/tsCompile.js

@@ -1,99 +1,80 @@
-import { join } from "path";
-import ts from "typescript";
+import { join, resolve } from "path";
+import fs from "node:fs";
 import merge from "lodash/merge.js";
 import { replaceTscAliases } from "./tsAliasReplacer.js";
+import { getTscBinaryPath } from "./typescript/getTscBinaryPath.js";
+import { readTsConfig } from "./typescript/readTsConfig.js";
+import { runTsc } from "./typescript/runTsc.js";
+import { writeTempTsConfig } from "./typescript/writeTempTsConfig.js";
 
 export const tsCompile = async ({ cwd = "", overrides, debug, outputDir, checkOnly = false }) => {
-    // Normalize path separators to forward slashes for consistent behavior on Windows.
-    const normalizedCwd = cwd.replace(/\\/g, "/");
+    const normalizedCwd = cwd || process.cwd();
+    const tscPath = getTscBinaryPath();
 
-    const tsConfigPath = join(normalizedCwd, "tsconfig.build.json");
+    const originalConfigPath = join(normalizedCwd, "tsconfig.build.json");
+    let tsConfigPath = originalConfigPath;
+    let tempConfigPath = null;
+    let resolvedOutDir = null;
 
-    let { config: readTsConfig } = ts.readConfigFile(tsConfigPath, ts.sys.readFile);
+    const hasOverrides = overrides?.tsConfig || outputDir;
 
-    if (overrides.tsConfig) {
-        if (typeof overrides.tsConfig === "function") {
-            readTsConfig = overrides.tsConfig(readTsConfig);
-        } else {
-            merge(readTsConfig, overrides.tsConfig);
-        }
-
-        if (debug) {
-            console.log(`"tsconfig.build.json" overridden. New config:`);
-            console.log(readTsConfig);
-        }
-    }
-    if (outputDir) {
-        readTsConfig.compilerOptions = readTsConfig.compilerOptions || {};
-        readTsConfig.compilerOptions.outDir = outputDir;
-        readTsConfig.compilerOptions.declarationDir = outputDir;
-    }
+    if (hasOverrides) {
+        let config = readTsConfig(originalConfigPath);
 
-    const parsedJsonConfigFile = ts.parseJsonConfigFileContent(readTsConfig, ts.sys, normalizedCwd);
+        if (overrides?.tsConfig) {
+            if (typeof overrides.tsConfig === "function") {
+                config = overrides.tsConfig(config);
+            } else {
+                merge(config, overrides.tsConfig);
+            }
 
-    const { projectReferences, options, fileNames, errors } = parsedJsonConfigFile;
+            if (debug) {
+                console.log(`"tsconfig.build.json" overridden. New config:`);
+                console.log(config);
+            }
+        }
 
-    const filteredFileNames = fileNames.filter(fileName => !fileName.endsWith(".d.ts"));
+        if (outputDir) {
+            config.compilerOptions = config.compilerOptions || {};
+            config.compilerOptions.outDir = outputDir;
+            config.compilerOptions.declarationDir = outputDir;
+        }
 
-    if (checkOnly) {
-        options.noEmit = true;
+        resolvedOutDir = config.compilerOptions?.outDir;
+        tempConfigPath = writeTempTsConfig(normalizedCwd, config);
+        tsConfigPath = tempConfigPath;
     }
 
-    const program = ts.createProgram({
-        projectReferences,
-        options,
-        rootNames: filteredFileNames,
-        configFileParsingDiagnostics: errors
-    });
-
-    if (checkOnly) {
-        const allDiagnostics = ts.getPreEmitDiagnostics(program).concat(errors);
+    try {
+        const args = ["-p", tsConfigPath];
+        args.push("--tsBuildInfoFile", join(normalizedCwd, "tsconfig.build.tsbuildinfo"));
 
-        if (allDiagnostics.length) {
-            const formatHost = {
-                getCanonicalFileName: path => path,
-                getCurrentDirectory: () => normalizedCwd,
-                getNewLine: () => ts.sys.newLine
-            };
-            const message = ts.formatDiagnostics(allDiagnostics, formatHost);
-            if (message) {
-                throw { message };
-            }
-        }
-        return;
-    }
-
-    const { diagnostics, emitSkipped } = program.emit(
-        undefined, // targetSourceFile
-        (fileName, data, writeByteOrderMark) => {
-            // Only emit files within the current package directory.
-            // Normalize path separators to handle Windows backslashes vs forward slashes.
-            const normalizedFileName = fileName.replace(/\\/g, "/");
-            const relativePath = normalizedFileName.replace(normalizedCwd, "");
-            if (normalizedFileName.startsWith(normalizedCwd) && !relativePath.includes("../")) {
-                ts.sys.writeFile(fileName, data, writeByteOrderMark);
-            }
+        if (checkOnly) {
+            args.push("--noEmit");
         }
-    );
 
-    const allDiagnostics = ts.getPreEmitDiagnostics(program).concat(diagnostics, errors);
-
-    if (allDiagnostics.length) {
-        const formatHost = {
-            getCanonicalFileName: path => path,
-            getCurrentDirectory: () => normalizedCwd,
-            getNewLine: () => ts.sys.newLine
-        };
-        const message = ts.formatDiagnostics(allDiagnostics, formatHost);
-        if (message) {
-            throw { message };
+        runTsc(tscPath, args, normalizedCwd);
+    } finally {
+        if (tempConfigPath) {
+            fs.rmSync(tempConfigPath, { force: true });
         }
     }
 
-    if (emitSkipped) {
-        throw { message: "TypeScript compilation failed." };
+    if (!checkOnly) {
+        const distDir =
+            outputDir || resolveDistDir(normalizedCwd, originalConfigPath, resolvedOutDir);
+        await replaceTscAliases({ distDir, cwd: normalizedCwd, debug });
     }
-
-    const distDir = outputDir || options.outDir || join(normalizedCwd, "dist");
-    await replaceTscAliases({ distDir, cwd: normalizedCwd, debug });
 };
+
+function resolveDistDir(cwd, configPath, overriddenOutDir) {
+    if (overriddenOutDir) {
+        return resolve(cwd, overriddenOutDir);
+    }
+    const config = readTsConfig(configPath);
+    const outDir = config.compilerOptions?.outDir;
+    if (outDir) {
+        return resolve(cwd, outDir);
+    }
+    return join(cwd, "dist");
+}

package/packages/buildPackage/typescript/getTscBinaryPath.js

@@ -0,0 +1,47 @@
+import { createRequire } from "node:module";
+import { dirname, join } from "node:path";
+import fs from "node:fs";
+
+let cachedPath = null;
+
+export function getTscBinaryPath() {
+    if (cachedPath) {
+        return cachedPath;
+    }
+
+    const require = createRequire(import.meta.url);
+    const tsPackageJsonPath = require.resolve("typescript/package.json");
+    const tsDir = dirname(tsPackageJsonPath);
+
+    const platformPackage = "@typescript/typescript-" + process.platform + "-" + process.arch;
+
+    let platformPkgPath;
+    try {
+        const platformRequire = createRequire(join(tsDir, "package.json"));
+        platformPkgPath = platformRequire.resolve(platformPackage + "/package.json");
+    } catch {
+        throw new Error(
+            "Unable to resolve " +
+                platformPackage +
+                ". " +
+                "Either your platform is unsupported, or you are missing the package on disk."
+        );
+    }
+
+    const libDir = join(dirname(platformPkgPath), "lib");
+
+    let exe = join(libDir, "tsc");
+    if (process.platform === "win32") {
+        exe += ".exe";
+        if (exe.length >= 248) {
+            exe = "\\\\?\\" + exe;
+        }
+    }
+
+    if (!fs.existsSync(exe)) {
+        throw new Error("TypeScript native binary not found: " + exe);
+    }
+
+    cachedPath = exe;
+    return cachedPath;
+}

package/packages/buildPackage/typescript/readTsConfig.js

@@ -0,0 +1,8 @@
+import fs from "node:fs";
+import stripJsonComments from "strip-json-comments";
+
+export function readTsConfig(configPath) {
+    const content = fs.readFileSync(configPath, "utf8");
+    const stripped = stripJsonComments(content, { trailingCommas: true });
+    return JSON.parse(stripped);
+}

package/packages/buildPackage/typescript/runTsc.js

@@ -0,0 +1,15 @@
+import { execFileSync } from "node:child_process";
+
+export function runTsc(tscPath, args, cwd) {
+    try {
+        execFileSync(tscPath, args, {
+            cwd,
+            stdio: ["pipe", "pipe", "pipe"],
+            encoding: "utf8",
+            maxBuffer: 10 * 1024 * 1024
+        });
+    } catch (error) {
+        const output = [error.stdout, error.stderr].filter(Boolean).join("\n").trim();
+        throw { message: output || error.message || "TypeScript compilation failed." };
+    }
+}

package/packages/buildPackage/typescript/writeTempTsConfig.js

@@ -0,0 +1,10 @@
+import { join } from "node:path";
+import fs from "node:fs";
+import { randomBytes } from "node:crypto";
+
+export function writeTempTsConfig(cwd, config) {
+    const suffix = randomBytes(4).toString("hex");
+    const tempPath = join(cwd, `tsconfig.build.tmp-${suffix}.json`);
+    fs.writeFileSync(tempPath, JSON.stringify(config, null, 2), "utf8");
+    return tempPath;
+}

package/packages/buildPackage.js

@@ -69,7 +69,7 @@ async function buildWithSafeReplace(options, distDir) {
 
     const stagingOptions = { ...options, outputDir: stagingDir };
 
-    await babelCompile(stagingOptions);
+    await rslibCompile(stagingOptions);
     await tsCompile(stagingOptions);
 
     stagingOptions.logs !== false && console.log("Copying meta files...");