@gravity-ui/app-builder 0.24.0 → 0.24.1-beta.1

package/dist/commands/dev/client.js

@@ -95,9 +95,22 @@ async function buildDevServer(config) {
             }));
         }
     }
+    // Rspack multicompiler dont work with lazy compilation.
+    // Pass a single config to avoid multicompiler when SSR disabled.
+    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+    const compiler = bundler === 'rspack'
+        ? (0, core_1.rspack)(isSsr ? rspackConfigs : rspackConfigs[0])
+        : (0, webpack_1.default)(webpackConfigs);
     const staticFolder = path.resolve(paths_1.default.appDist, 'public');
     const options = {
         static: staticFolder,
+        setupMiddlewares(middlewares) {
+            if (config.client.lazyCompilation && bundler === 'rspack') {
+                const lazyCompilationMiddleware = core_1.rspack.experiments.lazyCompilationMiddleware(compiler, rspackConfigs[0]?.experiments?.lazyCompilation);
+                return [lazyCompilationMiddleware, ...middlewares];
+            }
+            return middlewares;
+        },
         devMiddleware: {
             publicPath,
             stats: 'errors-warnings',
@@ -172,14 +185,9 @@ async function buildDevServer(config) {
     options.proxy = proxy;
     let server;
     if (bundler === 'rspack') {
-        // Rspack multicompiler dont work with lazy compilation.
-        // Pass a single config to avoid multicompiler when SSR disabled.
-        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-        const compiler = (0, core_1.rspack)(isSsr ? rspackConfigs : rspackConfigs[0]);
         server = new dev_server_1.RspackDevServer(options, compiler);
     }
     else {
-        const compiler = (0, webpack_1.default)(webpackConfigs);
         server = new webpack_dev_server_1.default(options, compiler);
     }
     try {

package/dist/common/webpack/config.js

@@ -57,7 +57,6 @@ const s3_upload_1 = require("../s3-upload");
 const log_config_1 = require("../logger/log-config");
 const utils_2 = require("../typescript/utils");
 const node_externals_1 = require("./node-externals");
-const statoscope_1 = require("./statoscope");
 const imagesSizeLimit = 2048;
 const fontSizeLimit = 8192;
 function getHelperOptions({ webpackMode, config, logger, isSsr = false, configPath, }) {
@@ -289,26 +288,14 @@ function configureRspackExperiments(options) {
         return undefined;
     }
     let lazyCompilation;
-    let port;
     if (config.lazyCompilation) {
-        if (typeof config.lazyCompilation === 'object') {
-            port = config.lazyCompilation.port;
-        }
         lazyCompilation = {
             // Lazy compilation works without problems only with lazy imports
             // See https://github.com/web-infra-dev/rspack/issues/8503
             entries: false,
             imports: true,
-            backend: {
-                client: require.resolve('./lazy-client.js'),
-                ...(port
-                    ? {
-                        listen: {
-                            port,
-                        },
-                    }
-                    : {}),
-            },
+            serverUrl: `http://localhost:${config.lazyCompilation.port}`,
+            client: require.resolve('./lazy-client.js'),
             test(module) {
                 // make sure that lazy-client.js won't be lazy compiled)
                 return !module.nameForCondition()?.endsWith('lazy-client.js');
@@ -936,7 +923,7 @@ function configureCommonPlugins(options, bundlerPlugins) {
         }
         if (config.analyzeBundle === 'statoscope') {
             const customStatoscopeConfig = config.statoscopeConfig || {};
-            const statoscopePlugin = new webpack_plugin_1.default({
+            plugins.push(new webpack_plugin_1.default({
                 saveReportTo: path.resolve(options.buildDirectory, 'report.html'),
                 saveStatsTo: path.resolve(options.buildDirectory, 'stats.json'),
                 open: false,
@@ -944,14 +931,7 @@ function configureCommonPlugins(options, bundlerPlugins) {
                     all: true,
                 },
                 ...customStatoscopeConfig,
-            });
-            // TIP: statoscope doesn't support rspack, but this workaround helps to run it
-            if (config.bundler === 'rspack') {
-                const compressor = statoscopePlugin.options.compressor;
-                statoscopePlugin.extensions =
-                    compressor === false ? [] : [new statoscope_1.RspackCompressedExtension(compressor)];
-            }
-            plugins.push(statoscopePlugin);
+            }));
         }
         if (config.analyzeBundle === 'rsdoctor') {
             plugins.push(new bundlerPlugins.RSDoctorPlugin({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gravity-ui/app-builder",
-  "version": "0.24.0",
+  "version": "0.24.1-beta.1",
   "description": "Develop and build your React client-server projects, powered by typescript and webpack",
   "license": "MIT",
   "type": "commonjs",
@@ -70,15 +70,15 @@
     "@babel/runtime": "^7.26.0",
     "@okikio/sharedworker": "^1.0.7",
     "@pmmmwh/react-refresh-webpack-plugin": "^0.5.15",
-    "@rsdoctor/rspack-plugin": "^0.4.13",
-    "@rsdoctor/webpack-plugin": "^0.4.13",
-    "@rspack/core": "1.2.8",
-    "@rspack/dev-server": "^1.0.10",
-    "@rspack/plugin-react-refresh": "^1.0.1",
-    "@statoscope/webpack-plugin": "^5.28.2",
+    "@rsdoctor/rspack-plugin": "^1.0.1",
+    "@rsdoctor/webpack-plugin": "^1.0.1",
+    "@rspack/core": "1.3.4",
+    "@rspack/dev-server": "^1.1.1",
+    "@rspack/plugin-react-refresh": "^1.2.0",
+    "@statoscope/webpack-plugin": "^5.29.0",
     "@statoscope/stats": "^5.28.1",
     "@statoscope/stats-extension-compressed": "^5.28.1",
-    "@statoscope/webpack-model": "^5.28.3",
+    "@statoscope/webpack-model": "^5.29.0",
     "@svgr/core": "^8.1.0",
     "@svgr/plugin-jsx": "^8.1.0",
     "@svgr/webpack": "^8.1.0",

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

@@ -1,12 +0,0 @@
-import { Compiler } from 'webpack';
-import { ExtensionDescriptor } from '@statoscope/stats/spec/extension';
-import CompressedExtensionGenerator, { CompressorOrPreset, Format, Payload } from '@statoscope/stats-extension-compressed/dist/generator';
-import { StatsExtensionWebpackAdapter } from '@statoscope/webpack-model';
-export declare class RspackCompressedExtension implements StatsExtensionWebpackAdapter<Payload> {
-    compressor: CompressorOrPreset;
-    descriptor: ExtensionDescriptor;
-    compressedExtensionGenerator: CompressedExtensionGenerator;
-    constructor(compressor: CompressorOrPreset);
-    getExtension(): Format;
-    handleCompiler(compiler: Compiler): void;
-}

package/dist/common/webpack/statoscope.js

@@ -1,159 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.RspackCompressedExtension = void 0;
-/* eslint-disable max-depth */
-/**
- * Adapted Statoscope extension @statoscope/webpack-stats-extension-compressed to support Rspack.
- * This workaround will be removed once the pull request is merged into Statoscope:
- * https://github.com/statoscope/statoscope/pull/239
- */
-const path_1 = __importDefault(require("path"));
-const util_1 = require("util");
-const generator_1 = __importDefault(require("@statoscope/stats-extension-compressed/dist/generator"));
-const name = '@statoscope/webpack-stats-extension-compressed';
-const version = 'app-builder-version';
-const pluginName = `${name}@${version}`;
-class RspackCompressedExtension {
-    compressor;
-    descriptor = { name, version };
-    compressedExtensionGenerator = new generator_1.default(this.descriptor);
-    // eslint-disable-next-line @typescript-eslint/parameter-properties
-    constructor(compressor) {
-        this.compressor = compressor;
-    }
-    getExtension() {
-        return this.compressedExtensionGenerator.get();
-    }
-    handleCompiler(compiler) {
-        const isRspack = 'rspackVersion' in compiler.webpack;
-        const rspackCodeGenerationResults = new Map();
-        if (isRspack) {
-            compiler.hooks.thisCompilation.tap(pluginName, (compilation) => {
-                rspackCodeGenerationResults.clear();
-                compilation.hooks.executeModule.tap(pluginName, ({ moduleObject, codeGenerationResult }) => {
-                    if (!moduleObject) {
-                        return;
-                    }
-                    rspackCodeGenerationResults.set(moduleObject.id, codeGenerationResult);
-                });
-            });
-        }
-        compiler.hooks.done.tapAsync(pluginName, async (stats, cb) => {
-            const stack = [stats.compilation];
-            let cursor;
-            while ((cursor = stack.pop())) {
-                stack.push(...cursor.children);
-                // webpack 4
-                let readFile = (0, util_1.promisify)(cursor.compiler.inputFileSystem.readFile.bind(cursor.compiler.inputFileSystem));
-                // webpack 5
-                if (cursor.compiler.outputFileSystem &&
-                    typeof cursor.compiler.outputFileSystem.readFile === 'function') {
-                    readFile = (0, util_1.promisify)(cursor.compiler.outputFileSystem.readFile.bind(cursor.compiler.outputFileSystem));
-                }
-                for (const name of Object.keys(cursor.assets)) {
-                    const assetPath = path_1.default.join(cursor.compiler.outputPath, name);
-                    let content;
-                    try {
-                        content = await readFile(assetPath);
-                        if (!content) {
-                            throw new Error();
-                        }
-                        this.compressedExtensionGenerator.handleResource(cursor.hash, name, content, this.compressor);
-                    }
-                    catch (e) {
-                        console.warn(`Can't read the asset ${name}`);
-                    }
-                }
-                const modulesStack = [...cursor.modules];
-                let modulesCursor;
-                while ((modulesCursor = modulesStack.pop())) {
-                    // @ts-ignore
-                    if (modulesCursor.modules) {
-                        // @ts-ignore
-                        modulesStack.push(...modulesCursor.modules);
-                    }
-                    let concatenated = Buffer.from('');
-                    if (modulesCursor.constructor.name === 'CssModule' &&
-                        // @ts-ignore
-                        (typeof modulesCursor.content === 'string' ||
-                            // @ts-ignore
-                            modulesCursor.content instanceof Buffer)) {
-                        this.compressedExtensionGenerator.handleResource(cursor.hash, modulesCursor.identifier(), 
-                        // @ts-ignore
-                        modulesCursor.content, this.compressor);
-                    }
-                    else if (cursor.chunkGraph) {
-                        // webpack 5 and rspack
-                        if (isRspack) {
-                            // Identifier contains source type and path, but keys in rspackCodeGenerationResults don't contain the source type.
-                            const id = modulesCursor.identifier().split('|')[1];
-                            if (!id) {
-                                continue;
-                            }
-                            const codeGenerationResult = rspackCodeGenerationResults.get(id);
-                            if (!codeGenerationResult || !('get' in codeGenerationResult)) {
-                                continue;
-                            }
-                            // @ts-ignore
-                            const content = codeGenerationResult.get('javascript');
-                            if (content) {
-                                concatenated = Buffer.concat([
-                                    // @ts-ignore
-                                    concatenated,
-                                    // @ts-ignore
-                                    content instanceof Buffer ? content : Buffer.from(content),
-                                ]);
-                            }
-                        }
-                        else {
-                            for (const type of modulesCursor.getSourceTypes()) {
-                                const runtimeChunk = cursor.chunkGraph
-                                    .getModuleChunks(modulesCursor)
-                                    .find((chunk) => chunk.runtime);
-                                if (runtimeChunk) {
-                                    const source = cursor.codeGenerationResults.getSource(modulesCursor, runtimeChunk.runtime, type);
-                                    if (!source) {
-                                        continue;
-                                    }
-                                    const content = source.source();
-                                    concatenated = Buffer.concat([
-                                        // @ts-ignore
-                                        concatenated,
-                                        // @ts-ignore
-                                        content instanceof Buffer ? content : Buffer.from(content),
-                                    ]);
-                                }
-                            }
-                        }
-                    }
-                    else {
-                        // webpack 4
-                        try {
-                            // @ts-ignore
-                            const source = cursor.moduleTemplates.javascript.render(modulesCursor, cursor.dependencyTemplates, { chunk: modulesCursor.getChunks()[0] });
-                            const content = source.source();
-                            concatenated = Buffer.concat([
-                                // @ts-ignore
-                                concatenated,
-                                // @ts-ignore
-                                content instanceof Buffer ? content : Buffer.from(content),
-                            ]);
-                        }
-                        catch (e) {
-                            // in webpack 4 we can't generate source for all the modules :(
-                        }
-                    }
-                    if (!concatenated.length) {
-                        continue;
-                    }
-                    this.compressedExtensionGenerator.handleResource(cursor.hash, modulesCursor.identifier(), concatenated, this.compressor);
-                }
-            }
-            cb();
-        });
-    }
-}
-exports.RspackCompressedExtension = RspackCompressedExtension;