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

package/dist/commands/dev/client.js

@@ -64,7 +64,7 @@ async function buildDevServer(config) {
             }),
         ];
         if (isSsr) {
-            const ssrLogger = new logger_1.Logger('webpack(SSR)', config.verbose);
+            const ssrLogger = new logger_1.Logger('client(SSR)', config.verbose);
             webpackConfigs.push(await (0, config_1.webpackConfigFactory)({
                 webpackMode: "development" /* WebpackMode.Dev */,
                 config: normalizedConfig,
@@ -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('client(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/library/index.js

@@ -129,7 +129,6 @@ function compileStyles(inputDir, outputDir, onFinish, additionalGlobs = []) {
                 const sassTransformed = sass_1.default.compile(scssFile, {
                     sourceMap: true,
                     sourceMapIncludeSources: true,
-                    silenceDeprecations: ['legacy-js-api'],
                     importers: [
                         {
                             findFileUrl(url) {

package/dist/common/webpack/compile.js

@@ -9,7 +9,6 @@ const core_1 = require("@rspack/core");
 const logger_1 = require("../logger");
 const config_1 = require("./config");
 const utils_1 = require("./utils");
-const rspack_1 = require("./rspack");
 async function clientCompile(config) {
     const logger = new logger_1.Logger('client', config.verbose);
     const webpackConfigs = [];
@@ -41,13 +40,12 @@ async function clientCompile(config) {
     }
     logger.verbose('Config created');
     return new Promise((resolve) => {
+        const compilerHandler = (0, utils_1.compilerHandlerFactory)(logger, async () => {
+            resolve();
+        });
         const compiler = config.bundler === 'rspack'
-            ? (0, core_1.rspack)(rspackConfigs, (0, rspack_1.rspackCompilerHandlerFactory)(logger, async () => {
-                resolve();
-            }))
-            : (0, webpack_1.default)(webpackConfigs, (0, utils_1.webpackCompilerHandlerFactory)(logger, async () => {
-                resolve();
-            }));
+            ? (0, core_1.rspack)(rspackConfigs, compilerHandler)
+            : (0, webpack_1.default)(webpackConfigs, compilerHandler);
         process.on('SIGINT', async () => {
             compiler?.close(() => {
                 process.exit(1);

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,12 @@ async function webpackConfigFactory(options) {
                     module: config.ssr?.moduleType === 'esm',
                 });
     }
+    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 +105,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/],
@@ -140,14 +143,14 @@ async function rspackConfigFactory(options) {
         target: isSsr ? 'node' : undefined,
         devtool: configureDevTool(helperOptions),
         entry: configureEntry(helperOptions),
-        output: configureRspackOutput(helperOptions),
+        output: configureOutput(helperOptions),
         resolve: configureRspackResolve(helperOptions),
         module: {
             rules: (0, rspack_1.prepareRspackRules)(configureModuleRules(helperOptions)),
         },
         plugins: configureRspackPlugins(helperOptions),
         optimization: configureRspackOptimization(helperOptions),
-        // TODO externals,
+        externals: configureExternals(helperOptions),
         node: config.node,
         watchOptions: configureWatchOptions(helperOptions),
         ignoreWarnings: [/Failed to parse source map/],
@@ -366,18 +369,6 @@ function configureOutput(options) {
         ...ssrOptions,
     };
 }
-function configureRspackOutput(options) {
-    const { filename, chunkFilename, library, chunkFormat, path, pathinfo } = configureOutput(options);
-    return {
-        filename: typeof filename === 'string' ? filename : undefined,
-        chunkFilename: typeof chunkFilename === 'string' ? chunkFilename : undefined,
-        library,
-        chunkFormat,
-        path,
-        pathinfo,
-        clean: false,
-    };
-}
 function createJavaScriptLoader({ isEnvProduction, isEnvDevelopment, configType, config, isSsr, }) {
     const plugins = [];
     if (!isSsr) {
@@ -455,9 +446,7 @@ function createWorkerRule(options) {
                     loader: require.resolve('./worker/worker-loader'),
                 }
                 : {
-                    loader: require.resolve(options.config.bundler === 'rspack'
-                        ? 'worker-rspack-loader'
-                        : 'worker-loader'),
+                    loader: require.resolve('worker-rspack-loader'),
                     // currently workers located on cdn are not working properly, so we are enforcing loading workers from
                     // service instead
                     options: {
@@ -762,9 +751,28 @@ function getCssExtractPluginOptions({ isEnvProduction }) {
         ignoreOrder: true,
     };
 }
+const commonBundlerPlugins = {
+    DefinePlugin: {
+        rspack: core_1.rspack.DefinePlugin,
+        webpack: webpack.DefinePlugin,
+    },
+    ContextReplacementPlugin: {
+        rspack: core_1.rspack.ContextReplacementPlugin,
+        webpack: webpack.ContextReplacementPlugin,
+    },
+    ProvidePlugin: {
+        rspack: core_1.rspack.ProvidePlugin,
+        webpack: webpack.ProvidePlugin,
+    },
+    ProgressPlugin: {
+        rspack: progress_plugin_1.RspackProgressPlugin,
+        webpack: progress_plugin_1.WebpackProgressPlugin,
+    },
+};
 function configureCommonPlugins(options) {
     const { isEnvDevelopment, isEnvProduction, config, isSsr } = options;
     const excludeFromClean = config.excludeFromClean || [];
+    const bundler = config.bundler;
     const plugins = [
         new clean_webpack_plugin_1.CleanWebpackPlugin({
             verbose: config.verbose,
@@ -774,6 +782,10 @@ function configureCommonPlugins(options) {
                 ...excludeFromClean,
             ],
         }),
+        new commonBundlerPlugins['DefinePlugin'][bundler](getDefinitions(options)),
+        ...(options.logger
+            ? [new commonBundlerPlugins['ProgressPlugin'][bundler]({ logger: options.logger })]
+            : []),
     ];
     if (config.detectCircularDependencies) {
         let circularPluginOptions = {
@@ -795,6 +807,13 @@ function configureCommonPlugins(options) {
         }
     }
     if (!isSsr) {
+        const contextReplacements = getContextReplacements(options);
+        contextReplacements.forEach(({ resourceRegExp, newResource }) => plugins.push(new commonBundlerPlugins['ContextReplacementPlugin'][bundler](resourceRegExp, newResource)));
+        if (config.polyfill?.process) {
+            plugins.push(new commonBundlerPlugins['ProvidePlugin'][bundler]({
+                process: 'process/browser.js',
+            }));
+        }
         if (config.monaco) {
             const MonacoEditorWebpackPlugin = require('monaco-editor-webpack-plugin');
             plugins.push(new MonacoEditorWebpackPlugin({
@@ -808,6 +827,18 @@ function configureCommonPlugins(options) {
         plugins.push(createMomentTimezoneDataPlugin(config.momentTz));
     }
     if (isEnvProduction) {
+        if (config.analyzeBundle === 'statoscope') {
+            const customStatoscopeConfig = config.statoscopeConfig || {};
+            plugins.push(new webpack_plugin_1.default({
+                saveReportTo: path.resolve(options.buildDirectory, 'report.html'),
+                saveStatsTo: path.resolve(options.buildDirectory, 'stats.json'),
+                open: false,
+                statsOptions: {
+                    all: true,
+                },
+                ...customStatoscopeConfig,
+            }));
+        }
         if (config.sentryConfig) {
             const sentryPlugin = require('@sentry/webpack-plugin').sentryWebpackPlugin;
             plugins.push(sentryPlugin({ ...config.sentryConfig }));
@@ -823,8 +854,6 @@ function configureWebpackPlugins(options) {
     const forkTsCheckerOptions = getForkTsCheckerOptions(options);
     const webpackPlugins = [
         ...configureCommonPlugins(options),
-        ...(options.logger ? [new progress_plugin_1.ProgressPlugin({ logger: options.logger })] : []),
-        new webpack.DefinePlugin(getDefinitions(options)),
         new webpack_manifest_plugin_1.WebpackManifestPlugin({
             writeToFileEmit: true,
             publicPath: '',
@@ -846,18 +875,6 @@ function configureWebpackPlugins(options) {
         webpackPlugins.push(new mini_css_extract_plugin_1.default(getCssExtractPluginOptions(options)));
     }
     if (isEnvProduction) {
-        if (config.analyzeBundle === 'statoscope') {
-            const customStatoscopeConfig = config.statoscopeConfig || {};
-            webpackPlugins.push(new webpack_plugin_1.default({
-                saveReportTo: path.resolve(options.buildDirectory, 'report.html'),
-                saveStatsTo: path.resolve(options.buildDirectory, 'stats.json'),
-                open: false,
-                statsOptions: {
-                    all: true,
-                },
-                ...customStatoscopeConfig,
-            }));
-        }
         if (config.analyzeBundle === 'rsdoctor') {
             const { RsdoctorWebpackPlugin } = require('@rsdoctor/webpack-plugin');
             webpackPlugins.push(new RsdoctorWebpackPlugin({
@@ -865,20 +882,13 @@ function configureWebpackPlugins(options) {
             }));
         }
     }
-    if (!isSsr) {
-        const contextReplacements = getContextReplacements(options);
-        contextReplacements.forEach(({ resourceRegExp, newResource }) => webpackPlugins.push(new webpack.ContextReplacementPlugin(resourceRegExp, newResource)));
-        if (isEnvDevelopment && config.reactRefresh !== false) {
-            const { webSocketPath = path.normalize(`/${config.publicPathPrefix}/build/sockjs-node`), } = config.devServer || {};
-            const reactRefreshConfig = config.reactRefresh({
-                overlay: { sockPath: webSocketPath },
-                exclude: [/node_modules/, /\.worker\.[jt]sx?$/],
-            });
-            webpackPlugins.push(new react_refresh_webpack_plugin_1.default(reactRefreshConfig));
-        }
-        if (config.polyfill?.process) {
-            webpackPlugins.push(new webpack.ProvidePlugin({ process: 'process/browser.js' }));
-        }
+    if (!isSsr && isEnvDevelopment && config.reactRefresh !== false) {
+        const { webSocketPath = path.normalize(`/${config.publicPathPrefix}/build/sockjs-node`) } = config.devServer || {};
+        const reactRefreshConfig = config.reactRefresh({
+            overlay: { sockPath: webSocketPath },
+            exclude: [/node_modules/, /\.worker\.[jt]sx?$/],
+        });
+        webpackPlugins.push(new react_refresh_webpack_plugin_1.default(reactRefreshConfig));
     }
     return webpackPlugins;
 }
@@ -887,8 +897,6 @@ function configureRspackPlugins(options) {
     const forkTsCheckerOptions = getForkTsCheckerOptions(options);
     const rspackPlugins = [
         ...configureCommonPlugins(options),
-        ...(options.logger ? [new rspack_1.RspackProgressPlugin({ logger: options.logger })] : []),
-        new core_1.rspack.DefinePlugin(getDefinitions(options)),
         new rspack_manifest_plugin_1.RspackManifestPlugin({
             fileName: isEnvProduction
                 ? assetsManifestFile
@@ -911,35 +919,26 @@ function configureRspackPlugins(options) {
             }));
         }
     }
-    if (!isSsr) {
-        const contextReplacements = getContextReplacements(options);
-        contextReplacements.forEach(({ resourceRegExp, newResource }) => rspackPlugins.push(new core_1.rspack.ContextReplacementPlugin(resourceRegExp, newResource)));
-        if (isEnvDevelopment && config.reactRefresh !== false) {
-            const { webSocketPath = path.normalize(`/${config.publicPathPrefix}/build/sockjs-node`), } = config.devServer || {};
-            const { overlay, ...reactRefreshConfig } = config.reactRefresh({
-                overlay: { sockPath: webSocketPath },
-                exclude: [/node_modules/, /\.worker\.[jt]sx?$/],
-            });
-            rspackPlugins.push(new plugin_react_refresh_1.default({
-                ...reactRefreshConfig,
-                overlay: typeof overlay === 'object'
-                    ? {
-                        entry: typeof overlay.entry === 'string' ? overlay.entry : undefined,
-                        module: typeof overlay.module === 'string'
-                            ? overlay.module
-                            : undefined,
-                        sockPath: overlay.sockPath,
-                        sockHost: overlay.sockHost,
-                        sockPort: overlay.sockPort?.toString(),
-                        sockProtocol: overlay.sockProtocol,
-                        sockIntegration: overlay.sockIntegration === 'wds' ? 'wds' : undefined,
-                    }
-                    : undefined,
-            }));
-        }
-        if (config.polyfill?.process) {
-            rspackPlugins.push(new core_1.rspack.ProvidePlugin({ process: 'process/browser.js' }));
-        }
+    if (!isSsr && isEnvDevelopment && config.reactRefresh !== false) {
+        const { webSocketPath = path.normalize(`/${config.publicPathPrefix}/build/sockjs-node`) } = config.devServer || {};
+        const { overlay, ...reactRefreshConfig } = config.reactRefresh({
+            overlay: { sockPath: webSocketPath },
+            exclude: [/node_modules/, /\.worker\.[jt]sx?$/],
+        });
+        rspackPlugins.push(new plugin_react_refresh_1.default({
+            ...reactRefreshConfig,
+            overlay: typeof overlay === 'object'
+                ? {
+                    entry: typeof overlay.entry === 'string' ? overlay.entry : undefined,
+                    module: typeof overlay.module === 'string' ? overlay.module : undefined,
+                    sockPath: overlay.sockPath,
+                    sockHost: overlay.sockHost,
+                    sockPort: overlay.sockPort?.toString(),
+                    sockProtocol: overlay.sockProtocol,
+                    sockIntegration: overlay.sockIntegration === 'wds' ? 'wds' : undefined,
+                }
+                : undefined,
+        }));
     }
     return rspackPlugins;
 }

package/dist/common/webpack/progress-plugin.d.ts

@@ -1,12 +1,27 @@
-import webpack from 'webpack';
 import type * as Webpack from 'webpack';
 import type { Logger } from '../logger';
-export declare class ProgressPlugin extends webpack.ProgressPlugin {
-    private _logger;
-    private _state;
-    constructor({ logger }: {
-        logger: Logger;
-    });
-    handler: (percent: number, message: string, ...details: string[]) => void;
-    apply(compiler: Webpack.Compiler): void;
+interface State {
+    done?: boolean;
+    start?: bigint;
 }
+export declare const WebpackProgressPlugin: {
+    new ({ logger }: {
+        logger: Logger;
+    }): {
+        logger: Logger;
+        state: State;
+        handler: (percent: number, message: string, ...details: string[]) => void;
+        apply(compiler: Webpack.Compiler): void;
+    };
+};
+export declare const RspackProgressPlugin: {
+    new ({ logger }: {
+        logger: Logger;
+    }): {
+        logger: Logger;
+        state: State;
+        handler: (percent: number, message: string, ...details: string[]) => void;
+        apply(compiler: Webpack.Compiler): void;
+    };
+};
+export {};

package/dist/common/webpack/progress-plugin.js

@@ -3,49 +3,53 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ProgressPlugin = void 0;
+exports.RspackProgressPlugin = exports.WebpackProgressPlugin = void 0;
 const webpack_1 = __importDefault(require("webpack"));
 const pretty_time_1 = require("../logger/pretty-time");
-class ProgressPlugin extends webpack_1.default.ProgressPlugin {
-    _logger;
-    _state = {};
-    constructor({ logger }) {
-        super();
-        this._logger = logger;
-    }
-    handler = (percent, message, ...details) => {
-        const progress = Math.floor(percent * 100);
-        this._logger.status(`${this._logger.colors.green(`${progress}%`)} - ${this._logger.colors.yellow(message)}${details.length > 0 ? `: ${this._logger.colors.dim(...details)}` : ''}`);
+const core_1 = require("@rspack/core");
+function createProgressPlugin(BaseClass) {
+    return class ProgressPlugin extends BaseClass {
+        logger;
+        state = {};
+        constructor({ logger }) {
+            super();
+            this.logger = logger;
+        }
+        handler = (percent, message, ...details) => {
+            const progress = Math.floor(percent * 100);
+            this.logger.status(`${this.logger.colors.green(`${progress}%`)} - ${this.logger.colors.yellow(message)}${details.length > 0 ? `: ${this.logger.colors.dim(...details)}` : ''}`);
+        };
+        apply(compiler) {
+            super.apply(compiler);
+            hook(compiler, 'compile', () => {
+                this.logger.message('Start compilation');
+                if ('rspackVersion' in compiler.webpack) {
+                    this.logger.message(`Rspack v${compiler.webpack.rspackVersion}`);
+                }
+                else {
+                    this.logger.message(`Webpack v${compiler.webpack.version}`);
+                }
+                this.state.start = process.hrtime.bigint();
+            });
+            hook(compiler, 'invalid', (fileName, changeTime) => {
+                this.logger.verbose(`Invalidate file: ${fileName} at ${changeTime}`);
+            });
+            hook(compiler, 'done', (stats) => {
+                const time = this.state.start ? ' in ' + (0, pretty_time_1.elapsedTime)(this.state.start) : '';
+                const hasErrors = stats.hasErrors();
+                if (hasErrors) {
+                    this.logger.error('Compiled with some errors' + time);
+                }
+                else {
+                    this.logger.success('Compiled successfully' + time);
+                }
+            });
+        }
     };
-    apply(compiler) {
-        super.apply(compiler);
-        hook(compiler, 'compile', () => {
-            this._logger.message('Start compilation');
-            if ('rspackVersion' in compiler.webpack) {
-                this._logger.message(`Rspack v${compiler.webpack.rspackVersion}`);
-            }
-            else {
-                this._logger.message(`Webpack v${compiler.webpack.version}`);
-            }
-            this._state.start = process.hrtime.bigint();
-        });
-        hook(compiler, 'invalid', (fileName, changeTime) => {
-            this._logger.verbose(`Invalidate file: ${fileName} at ${changeTime}`);
-        });
-        hook(compiler, 'done', (stats) => {
-            const time = this._state.start ? ' in ' + (0, pretty_time_1.elapsedTime)(this._state.start) : '';
-            const hasErrors = stats.hasErrors();
-            if (hasErrors) {
-                this._logger.error('Compiled with some errors' + time);
-            }
-            else {
-                this._logger.success('Compiled successfully' + time);
-            }
-        });
-    }
 }
-exports.ProgressPlugin = ProgressPlugin;
 function hook(compiler, hookName, callback) {
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     compiler.hooks[hookName].tap(`app-builder: ${hookName}`, callback);
 }
+exports.WebpackProgressPlugin = createProgressPlugin(webpack_1.default.ProgressPlugin);
+exports.RspackProgressPlugin = createProgressPlugin(core_1.rspack.ProgressPlugin);

package/dist/common/webpack/rspack.d.ts

@@ -1,18 +1,7 @@
 import { ManifestPluginOptions } from 'rspack-manifest-plugin';
 import type { RuleSetRule as WebpackRuleSetRule } from 'webpack';
-import { Compiler, MultiStats, rspack } from '@rspack/core';
 import type { Configuration, RuleSetRule as RspackRuleSetRule } from '@rspack/core';
 import type { Logger } from '../logger';
 export declare function clearCacheDirectory(config: Configuration, logger: Logger): void;
 export declare const generateAssetsManifest: ManifestPluginOptions['generate'];
 export declare function prepareRspackRules(webpackRules: (undefined | null | false | '' | 0 | WebpackRuleSetRule | '...')[]): (RspackRuleSetRule | '...')[];
-export declare class RspackProgressPlugin extends rspack.ProgressPlugin {
-    private _logger;
-    private _state;
-    constructor({ logger }: {
-        logger: Logger;
-    });
-    handler: (percent: number, message: string, ...details: string[]) => void;
-    apply(compiler: Compiler): void;
-}
-export declare function rspackCompilerHandlerFactory(logger: Logger, onCompilationEnd?: () => void): (err?: Error | null, stats?: MultiStats) => Promise<void>;

package/dist/common/webpack/rspack.js

@@ -26,11 +26,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.RspackProgressPlugin = exports.generateAssetsManifest = void 0;
+exports.generateAssetsManifest = void 0;
 exports.clearCacheDirectory = clearCacheDirectory;
 exports.prepareRspackRules = prepareRspackRules;
-exports.rspackCompilerHandlerFactory = rspackCompilerHandlerFactory;
-const core_1 = require("@rspack/core");
 const fs = __importStar(require("node:fs"));
 const path = __importStar(require("node:path"));
 const paths_1 = __importDefault(require("../../common/paths"));
@@ -66,7 +64,7 @@ const generateAssetsManifest = (seed, files, entries) => {
         };
     }, {});
     return {
-        files: manifestFiles,
+        ...manifestFiles,
         entrypoints,
     };
 };
@@ -111,80 +109,3 @@ function prepareRspackRules(webpackRules) {
     }
     return rspackRules;
 }
-const pretty_time_1 = require("../logger/pretty-time");
-class RspackProgressPlugin extends core_1.rspack.ProgressPlugin {
-    _logger;
-    _state = {};
-    constructor({ logger }) {
-        super();
-        this._logger = logger;
-    }
-    handler = (percent, message, ...details) => {
-        const progress = Math.floor(percent * 100);
-        this._logger.status(`${this._logger.colors.green(`${progress}%`)} - ${this._logger.colors.yellow(message)}${details.length > 0 ? `: ${this._logger.colors.dim(...details)}` : ''}`);
-    };
-    apply(compiler) {
-        super.apply(compiler);
-        hook(compiler, 'compile', () => {
-            this._logger.message('Start compilation');
-            this._logger.message(`rspack v${compiler.rspack.rspackVersion}`);
-            this._state.start = process.hrtime.bigint();
-        });
-        hook(compiler, 'invalid', (fileName, changeTime) => {
-            this._logger.verbose(`Invalidate file: ${fileName} at ${changeTime}`);
-        });
-        hook(compiler, 'done', (stats) => {
-            const time = this._state.start ? ' in ' + (0, pretty_time_1.elapsedTime)(this._state.start) : '';
-            const hasErrors = stats.hasErrors();
-            if (hasErrors) {
-                this._logger.error('Compiled with some errors' + time);
-            }
-            else {
-                this._logger.success('Compiled successfully' + time);
-            }
-        });
-    }
-}
-exports.RspackProgressPlugin = RspackProgressPlugin;
-function hook(compiler, hookName, callback) {
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    compiler.hooks[hookName].tap(`app-builder: ${hookName}`, callback);
-}
-function rspackCompilerHandlerFactory(logger, onCompilationEnd) {
-    return async (err, stats) => {
-        if (err) {
-            logger.panic(err.message, err);
-        }
-        if (stats) {
-            logger.message('Stats:\n' +
-                stats.toString({
-                    preset: 'errors-warnings',
-                    colors: process.stdout.isTTY,
-                    assets: logger.isVerbose,
-                    modules: logger.isVerbose,
-                    entrypoints: logger.isVerbose,
-                    timings: logger.isVerbose,
-                }));
-            if (stats.hasErrors()) {
-                process.exit(1);
-            }
-        }
-        if (onCompilationEnd) {
-            await onCompilationEnd();
-        }
-        const [clientStats, ssrStats] = stats?.stats ?? [];
-        if (clientStats) {
-            const { startTime = 0, endTime = 0 } = clientStats;
-            const time = endTime - startTime;
-            logger.success(`Client was successfully compiled in ${(0, pretty_time_1.prettyTime)(BigInt(time) * BigInt(1_000_000))}`);
-        }
-        if (ssrStats) {
-            const { startTime = 0, endTime = 0 } = ssrStats;
-            const time = endTime - startTime;
-            logger.success(`SSR: Client was successfully compiled in ${(0, pretty_time_1.prettyTime)(BigInt(time) * BigInt(1_000_000))}`);
-        }
-        if (!clientStats && !ssrStats) {
-            logger.success(`Client was successfully compiled`);
-        }
-    };
-}

package/dist/common/webpack/utils.d.ts

@@ -1,6 +1,7 @@
 import type * as Webpack from 'webpack';
 import type { Logger } from '../logger';
-export declare function webpackCompilerHandlerFactory(logger: Logger, onCompilationEnd?: () => void): (err?: Error | null, stats?: Webpack.MultiStats) => Promise<void>;
+import { MultiStats } from '@rspack/core';
+export declare function compilerHandlerFactory(logger: Logger, onCompilationEnd?: () => void): (err?: Error | null, stats?: Webpack.MultiStats | MultiStats) => Promise<void>;
 export declare function resolveTsConfigPathsToAlias(projectPath: string, filename?: string): {
     aliases?: undefined;
     modules?: undefined;

package/dist/common/webpack/utils.js

@@ -23,13 +23,13 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.webpackCompilerHandlerFactory = webpackCompilerHandlerFactory;
+exports.compilerHandlerFactory = compilerHandlerFactory;
 exports.resolveTsConfigPathsToAlias = resolveTsConfigPathsToAlias;
 const path = __importStar(require("node:path"));
 const ts = __importStar(require("typescript"));
 const pretty_time_1 = require("../logger/pretty-time");
 const utils_1 = require("../typescript/utils");
-function webpackCompilerHandlerFactory(logger, onCompilationEnd) {
+function compilerHandlerFactory(logger, onCompilationEnd) {
     return async (err, stats) => {
         if (err) {
             logger.panic(err.message, err);

package/package.json

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