@gravity-ui/app-builder 0.15.1-beta.2 → 0.15.1-beta.3

package/dist/commands/dev/client.js

@@ -74,9 +74,6 @@ async function buildDevServer(config) {
         }
     }
     else {
-        if (isSsr) {
-            throw new Error(`SSR is not supported in ${bundler}`);
-        }
         rspackConfigs = [
             await (0, config_1.rspackConfigFactory)({
                 webpackMode: "development" /* WebpackMode.Dev */,
@@ -84,6 +81,15 @@ async function buildDevServer(config) {
                 logger,
             }),
         ];
+        if (isSsr) {
+            const ssrLogger = new logger_1.Logger('rspack(SSR)', config.verbose);
+            rspackConfigs.push(await (0, config_1.rspackConfigFactory)({
+                webpackMode: "development" /* WebpackMode.Dev */,
+                config: normalizedConfig,
+                logger: ssrLogger,
+                isSsr,
+            }));
+        }
     }
     const publicPath = path.normalize(config.client.publicPathPrefix + '/build/');
     const staticFolder = path.resolve(paths_1.default.appDist, 'public');
@@ -163,8 +169,9 @@ async function buildDevServer(config) {
     options.proxy = proxy;
     let server;
     if (bundler === 'rspack') {
-        // Rspack multicompiler dont work with lazy compilation
-        const compiler = (0, core_1.rspack)(rspackConfigs[0]);
+        // Rspack multicompiler dont work with lazy compilation.
+        // Pass a single config to avoid multicompiler when SSR disabled.
+        const compiler = (0, core_1.rspack)(isSsr ? rspackConfigs : rspackConfigs[0]);
         server = new dev_server_1.RspackDevServer(options, compiler);
         // Need to clean cache before start. https://github.com/web-infra-dev/rspack/issues/9025
         (0, rspack_1.clearCacheDirectory)(rspackConfigs[0], logger);

package/dist/common/webpack/config.js

@@ -74,10 +74,7 @@ function getHelperOptions({ webpackMode, config, logger, isSsr = false, }) {
         isSsr,
     };
 }
-async function webpackConfigFactory(options) {
-    const { config } = options;
-    const helperOptions = getHelperOptions(options);
-    const { isSsr, isEnvProduction } = helperOptions;
+function configureExternals({ config, isSsr }) {
     let externals = config.externals;
     if (isSsr) {
         externals =
@@ -88,6 +85,24 @@ async function webpackConfigFactory(options) {
                     module: config.ssr?.moduleType === 'esm',
                 });
     }
+    return externals;
+}
+function prepareRspackExternals(externals) {
+    if (Array.isArray(externals)) {
+        const rspackExternals = {};
+        for (const ext of externals) {
+            if (typeof ext === 'object' && ext !== null) {
+                Object.assign(rspackExternals, ext);
+            }
+        }
+        return rspackExternals;
+    }
+    return externals;
+}
+async function webpackConfigFactory(options) {
+    const { config } = options;
+    const helperOptions = getHelperOptions(options);
+    const { isSsr, isEnvProduction } = helperOptions;
     let webpackConfig = {
         mode: isEnvProduction ? 'production' : 'development',
         context: paths_1.default.app,
@@ -102,7 +117,7 @@ async function webpackConfigFactory(options) {
         },
         plugins: configureWebpackPlugins(helperOptions),
         optimization: configureOptimization(helperOptions),
-        externals,
+        externals: configureExternals(helperOptions),
         node: config.node,
         watchOptions: configureWatchOptions(helperOptions),
         ignoreWarnings: [/Failed to parse source map/],
@@ -147,7 +162,7 @@ async function rspackConfigFactory(options) {
         },
         plugins: configureRspackPlugins(helperOptions),
         optimization: configureRspackOptimization(helperOptions),
-        // TODO externals,
+        externals: prepareRspackExternals(configureExternals(helperOptions)),
         node: config.node,
         watchOptions: configureWatchOptions(helperOptions),
         ignoreWarnings: [/Failed to parse source map/],

package/dist/common/webpack/rspack.js

@@ -33,6 +33,7 @@ exports.rspackCompilerHandlerFactory = rspackCompilerHandlerFactory;
 const core_1 = require("@rspack/core");
 const fs = __importStar(require("node:fs"));
 const path = __importStar(require("node:path"));
+const pretty_time_1 = require("../logger/pretty-time");
 const paths_1 = __importDefault(require("../../common/paths"));
 function clearCacheDirectory(config, logger) {
     if (!config.cache) {
@@ -66,7 +67,7 @@ const generateAssetsManifest = (seed, files, entries) => {
         };
     }, {});
     return {
-        files: manifestFiles,
+        ...manifestFiles,
         entrypoints,
     };
 };
@@ -111,7 +112,6 @@ function prepareRspackRules(webpackRules) {
     }
     return rspackRules;
 }
-const pretty_time_1 = require("../logger/pretty-time");
 class RspackProgressPlugin extends core_1.rspack.ProgressPlugin {
     _logger;
     _state = {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gravity-ui/app-builder",
-  "version": "0.15.1-beta.2",
+  "version": "0.15.1-beta.3",
   "description": "Develop and build your React client-server projects, powered by typescript and webpack",
   "license": "MIT",
   "type": "commonjs",