@webiny/build-tools 6.6.0-alpha.0 → 6.6.0-alpha.1

package/bundling/admin/createRsbuildConfig.js

@@ -45,7 +45,12 @@ export const createRsbuildConfig = ({ cwd }) => {
                 }
             }
         },
-        server: { port: process.env.PORT || 3001, host: "0.0.0.0" },
+        // Port precedence matches the served admin app (`webiny serve admin`): an explicit
+        // WEBINY_ADMIN_PORT wins, then a PORT injected by the environment, then the 3001 default.
+        server: {
+            port: process.env.WEBINY_ADMIN_PORT || process.env.PORT || 3001,
+            host: "0.0.0.0"
+        },
         html: {
             template: paths.projectRootFolder + "/public/index.html"
         },

package/bundling/function/createRsbuildConfig.js

@@ -2,7 +2,7 @@ import path from "path";
 import { pluginTypeCheck } from "@rsbuild/plugin-type-check";
 import { createImportValidatorPlugin } from "../importValidatorPlugin.js";
 
-const DEFAULT_WEBINY_INFRA_API_MAX_BUNDLE_SIZE = 4_718_592; // 4.5 MB
+const DEFAULT_WEBINY_INFRA_API_MAX_BUNDLE_SIZE = 6_291_456; // 6 MB
 
 export const createRsbuildConfig = async ({ cwd, enforceMaxBundleSize }) => {
     // Must be a dynamic import — see rslibCompile.js for the reason.
@@ -57,6 +57,21 @@ export const createRsbuildConfig = async ({ cwd, enforceMaxBundleSize }) => {
         },
         tools: {
             rspack: {
+                output: {
+                    // Declares the entry's exports as the bundle's public API, so ALL of them survive.
+                    //
+                    // Nothing imports an entry's exports, so without this rspack treats any unused one
+                    // as dead: it dropped `streamHandler` AND every module reachable only from it. The
+                    // api bundle then exported just `handler` and contained zero streaming code, so the
+                    // response-streaming Lambda (`handler.streamHandler`) had no handler to load and
+                    // failed at cold start. `handler` survived only by accident of being first.
+                    //
+                    // To verify after changing anything here, grep the built bundle:
+                    //   .webiny/workspace/apps/api/graphql/build/_handler.mjs
+                    // It must export BOTH `handler` and `streamHandler`. Removing this line takes the
+                    // export count back to one — silently, with a green build.
+                    library: { type: "module" }
+                },
                 ...(enforceMaxBundleSize && {
                     performance: {
                         hints: "error",
@@ -74,11 +89,11 @@ export const createRsbuildConfig = async ({ cwd, enforceMaxBundleSize }) => {
                     ? [/^sharp$/, /^knex(\/|$)/]
                     : [/^@aws-sdk/, /^aws-sdk$/, /^sharp$/, /^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: {
@@ -87,7 +102,19 @@ export const createRsbuildConfig = async ({ cwd, enforceMaxBundleSize }) => {
                         // Not needed in Lambda environment and can cause bundling/deployment issues.
                         bufferutil: false
                     }
-                }
+                },
+                // bree's root-jobs loader does `await import(importUrl)` on a path it builds at runtime,
+                // which rspack can't resolve statically, so it reports a critical dependency. That import
+                // sits behind `if (this.config.root && ...)` (node_modules/bree/src/index.js), and
+                // BreeSchedulerService constructs Bree with `root: false` — the branch never runs, and
+                // nothing is missing from the bundle. Matched narrowly so a genuine expression-based
+                // import anywhere else still gets reported.
+                ignoreWarnings: [
+                    {
+                        module: /node_modules[\\/]bree[\\/]/,
+                        message: /Critical dependency: the request of a dependency is an expression/
+                    }
+                ]
             }
         },
         mode,

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@webiny/build-tools",
-	"version": "6.6.0-alpha.0",
+	"version": "6.6.0-alpha.1",
 	"type": "module",
 	"exports": {
 		".": "./index.js",
@@ -17,17 +17,17 @@
 		"Adrian Smijulj <adrian@webiny.com>"
 	],
 	"dependencies": {
-		"@rsbuild/core": "2.1.8",
+		"@rsbuild/core": "2.1.13",
 		"@rsbuild/plugin-react": "2.1.0",
 		"@rsbuild/plugin-sass": "2.0.1",
 		"@rsbuild/plugin-svgr": "2.0.5",
 		"@rsbuild/plugin-type-check": "1.6.0",
-		"@rsdoctor/rspack-plugin": "1.6.1",
+		"@rsdoctor/rspack-plugin": "1.6.2",
 		"@rslib/core": "0.23.2",
-		"@rspack/core": "2.1.5",
-		"@swc/plugin-emotion": "14.15.0",
+		"@rspack/core": "2.1.10",
+		"@swc/plugin-emotion": "15.0.0",
 		"@tailwindcss/postcss": "4.3.3",
-		"@webiny/stdlib": "0.0.14",
+		"@webiny/stdlib": "0.0.17",
 		"chalk": "6.0.0",
 		"css-loader": "7.1.4",
 		"fast-glob": "3.3.3",
@@ -40,15 +40,16 @@
 		"react-dom": "18.3.1",
 		"react-refresh": "0.18.0",
 		"rimraf": "6.1.3",
-		"sass": "1.102.0",
+		"sass": "1.103.1",
 		"sass-loader": "17.0.0",
 		"strip-json-comments": "5.0.3",
 		"style-loader": "4.0.0",
 		"ts-morph": "28.0.0",
-		"tsx": "4.23.1",
+		"tsx": "4.23.12",
 		"typescript": "7.0.2",
 		"url-loader": "4.1.1",
-		"utf-8-validate": "6.0.6"
+		"utf-8-validate": "6.0.6",
+		"yargs": "18.1.0"
 	},
 	"license": "MIT",
 	"adio": {

package/testing/presets.d.ts

@@ -0,0 +1,6 @@
+interface Preset {
+    setupFiles?: string[];
+    setupFilesAfterEnv?: string[];
+}
+
+export function getPresets(...keywords: string[][]): Promise<Preset[]>;

package/testing/presets.js

@@ -0,0 +1,162 @@
+import path from "path";
+import fs from "fs";
+import { listWorkspaces } from "@webiny/stdlib/node";
+import yargs from "yargs";
+import { hideBin } from "yargs/helpers";
+import { PackageJson } from "@webiny/build-tools/utils/PackageJson.js";
+
+const MIN_STORAGE_LENGTH = 1;
+const DEFAULT_STORAGE = "ddb";
+/**
+ * @param argv {string[]}
+ * @returns {string}
+ */
+const getStorage = argv => {
+    /**
+     * Storage is available in process.env?
+     */
+    const envValue = process.env.WEBINY_STORAGE;
+    if (typeof envValue === "string" && envValue.length > 2) {
+        return envValue;
+    }
+    /**
+     * This is if storage is available in args.
+     */
+    const args = yargs(argv);
+    const argsValue = args.storage;
+    if (typeof argsValue === "string" && argsValue.length > 2) {
+        return argsValue;
+    }
+    /**
+     * Then we try to get --storage=([a-z])
+     */
+    const matched = argv
+        .map(item => {
+            const matched = item.match(/^--storage=([^\s]+)$/);
+            return matched ? matched[1] : null;
+        })
+        .find(item => {
+            return !!item;
+        });
+    if (typeof matched === "string" && matched.length > MIN_STORAGE_LENGTH) {
+        return matched;
+    }
+    /**
+     * Last attempt is to find --storage and then take next index.
+     */
+    const index = argv.findIndex(item => {
+        return item === "--storage";
+    });
+    if (index === -1) {
+        return DEFAULT_STORAGE;
+    }
+    const value = argv[index + 1];
+    if (typeof value === "string" && value.length > MIN_STORAGE_LENGTH) {
+        return value;
+    }
+    return DEFAULT_STORAGE;
+};
+
+const getAllPackages = targetKeywords => {
+    const storage = getStorage(hideBin(process.argv));
+
+    if (!storage) {
+        throw Error(`Missing required --storage parameter!`);
+    }
+
+    // Set the storage type as an environment variable.
+    process.env.WEBINY_STORAGE_OPS = storage;
+
+    const storagePriority = storage.split(",");
+
+    const packages = listWorkspaces({
+        cwd: process.cwd()
+    })
+        .map(pkg => {
+            return pkg.path.replace(/\\/g, "/");
+        })
+        .filter(pkg => pkg.match(/\/packages\//) !== null);
+
+    // Find packages that match the given sets of tags.
+    const packageJsons = [];
+    for (const pkg of packages) {
+        const pkgJson = PackageJson.fromFile(pkg + "/package.json");
+        const { name, keywords = [] } = pkgJson.getJson();
+
+        for (const set of targetKeywords) {
+            if (set.every(tag => keywords.includes(tag))) {
+                packageJsons.push({
+                    path: pkg,
+                    name,
+                    keywords
+                });
+            }
+        }
+    }
+    // Now we need to filter based on the required storage type, but also use fallback, if possible.
+    const results = [];
+
+    for (const set of targetKeywords) {
+        for (const storage of storagePriority) {
+            const matchingPackage = packageJsons.find(pkg => {
+                return [...set, storage].every(tag => pkg.keywords.includes(tag));
+            });
+
+            if (matchingPackage) {
+                results.push(matchingPackage);
+                break;
+            }
+        }
+    }
+
+    return results;
+};
+
+const removeEmptyPreset = preset => {
+    if (!preset || Object.keys(preset).length === 0) {
+        return false;
+    }
+    return true;
+};
+
+const getPackagesPresets = async targetKeywords => {
+    if (!targetKeywords || targetKeywords.length === 0) {
+        throw new Error(`You must pass keywords to search for in the packages.`);
+    }
+
+    if (!Array.isArray(targetKeywords[0])) {
+        targetKeywords = [targetKeywords];
+    }
+
+    const packages = getAllPackages(targetKeywords);
+    if (packages.length === 0) {
+        return [];
+    }
+    const items = [];
+    /**
+     * We go through all available packages to build presets for them.
+     */
+    for (const pkg of packages) {
+        const presetsPath = path.join(pkg.path, "__tests__/__api__/presets.js");
+        if (!fs.existsSync(presetsPath)) {
+            throw new Error(`Missing presets.js of the "${pkg.name}" package: ${presetsPath}`);
+        }
+        /**
+         * We expect presets file to contain an array of presets.
+         * We do not check for the actual contents of the presets arrays since they can be quite different per package.
+         */
+        const presets = await import(presetsPath).then(m => m.default ?? m);
+        if (Array.isArray(presets) === false) {
+            throw new Error(`Presets in package "${pkg.name}" must be defined as an array.`);
+        } else if (presets.length === 0) {
+            throw new Error(`There are no presets in the file "${presetsPath}".`);
+        }
+
+        items.push(...presets.filter(removeEmptyPreset));
+    }
+    return items;
+};
+
+export const getPresets = async (...targetKeywords) => {
+    return getPackagesPresets(targetKeywords);
+};