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

package/README.md

@@ -249,6 +249,7 @@ With this `{rootDir}/src/ui/tsconfig.json`:
   - `locale`: (`string[]=['ru']`) — list of `moment.js` or `day.js` locales to include, e.g. `['de', 'es']`. Locale `En` is always present.
 - `safari10` (`boolean`) — Enables `safari10` terser's option. [Terser options](https://github.com/terser/terser#minify-options)
 - `transformCssWithLightningCss` (`boolean`) — use [Lighting CSS](https://lightningcss.dev) to transform and minimize css instead of PostCSS and cssnano
+- `lightningCssMinimizerOptions` (`(options: LightningCssMinimizerRspackPluginOptions) => LightningCssMinimizerRspackPluginOptions`) - modify or return a custom [LightningCssMinimizerRspackPlugin](https://rspack.dev/plugins/rspack/lightning-css-minimizer-rspack-plugin)
 - `terser` (`(options: TerserOptions) => TerserOptions`) - modify or return a custom [Terser options](https://github.com/terser/terser#minify-options).
 
 ##### Monaco editor support

package/dist/commands/dev/client.js

@@ -95,22 +95,9 @@ 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',
@@ -185,9 +172,14 @@ 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/models/index.d.ts

@@ -3,7 +3,7 @@ import type { EditorFeature } from 'monaco-editor-webpack-plugin/out/features';
 import type { IFeatureDefinition } from 'monaco-editor-webpack-plugin/out/types';
 import type { Options as MomentTzOptions } from 'moment-timezone-data-webpack-plugin';
 import type { Configuration, DefinePlugin, FileCacheOptions, MemoryCacheOptions } from 'webpack';
-import type { Configuration as RspackConfiguration, SwcJsMinimizerRspackPluginOptions } from '@rspack/core';
+import type { LightningCssMinimizerRspackPluginOptions, Configuration as RspackConfiguration, SwcJsMinimizerRspackPluginOptions } from '@rspack/core';
 import type * as Babel from '@babel/core';
 import type * as Swc from '@swc/core';
 import type { ServerConfiguration } from 'webpack-dev-server';
@@ -239,6 +239,8 @@ export interface ClientConfig {
      * Available with rspack bundler.
      */
     swcMinimizerOptions?: (options: SwcJsMinimizerRspackPluginOptions) => SwcJsMinimizerRspackPluginOptions;
+    /** Modify or return a custom [LightningCssMinimizerRspackPlugin](https://rspack.dev/plugins/rspack/lightning-css-minimizer-rspack-plugin) */
+    lightningCssMinimizerOptions?: (options: LightningCssMinimizerRspackPluginOptions) => LightningCssMinimizerRspackPluginOptions;
     ssr?: {
         noExternal?: string | RegExp | (string | RegExp)[] | true;
         moduleType?: 'commonjs' | 'esm';

package/dist/common/webpack/config.js

@@ -288,14 +288,26 @@ 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,
-            serverUrl: `http://localhost:${config.lazyCompilation.port}`,
-            client: require.resolve('./lazy-client.js'),
+            backend: {
+                client: require.resolve('./lazy-client.js'),
+                ...(port
+                    ? {
+                        listen: {
+                            port,
+                        },
+                    }
+                    : {}),
+            },
             test(module) {
                 // make sure that lazy-client.js won't be lazy compiled)
                 return !module.nameForCondition()?.endsWith('lazy-client.js');
@@ -1143,7 +1155,18 @@ function configureRspackOptimization(helperOptions) {
     }
     let cssMinimizer;
     if (config.transformCssWithLightningCss) {
-        cssMinimizer = new core_1.rspack.LightningCssMinimizerRspackPlugin();
+        let lightningCssMinifyOptions = {
+            minimizerOptions: {
+                exclude: {
+                    langSelectorList: true,
+                },
+            },
+        };
+        const { lightningCssMinimizerOptions } = config;
+        if (typeof lightningCssMinimizerOptions === 'function') {
+            lightningCssMinifyOptions = lightningCssMinimizerOptions(lightningCssMinifyOptions);
+        }
+        cssMinimizer = new core_1.rspack.LightningCssMinimizerRspackPlugin(lightningCssMinifyOptions);
     }
     else {
         const CssMinimizerPlugin = require('css-minimizer-webpack-plugin');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gravity-ui/app-builder",
-  "version": "0.24.1-beta.1",
+  "version": "0.26.0",
   "description": "Develop and build your React client-server projects, powered by typescript and webpack",
   "license": "MIT",
   "type": "commonjs",
@@ -70,11 +70,11 @@
     "@babel/runtime": "^7.26.0",
     "@okikio/sharedworker": "^1.0.7",
     "@pmmmwh/react-refresh-webpack-plugin": "^0.5.15",
-    "@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",
+    "@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.29.0",
     "@statoscope/stats": "^5.28.1",
     "@statoscope/stats-extension-compressed": "^5.28.1",