@gravity-ui/app-builder 0.14.0 → 0.14.2-beta.0

package/dist/commands/build/build-service/client.js

@@ -2,6 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.buildClient = buildClient;
 const compile_1 = require("../../../common/webpack/compile");
+const compile_2 = require("../../../common/rspack/compile");
 function buildClient(config) {
-    return (0, compile_1.webpackCompile)(config.client);
+    return config.client.bundler === 'webpack'
+        ? (0, compile_1.webpackCompile)(config.client)
+        : (0, compile_2.rspackCompile)(config.client);
 }

package/dist/commands/dev/client.d.ts

@@ -1,3 +1,4 @@
 import WebpackDevServer from 'webpack-dev-server';
+import { RspackDevServer } from '@rspack/dev-server';
 import type { NormalizedServiceConfig } from '../../common/models';
-export declare function watchClientCompilation(config: NormalizedServiceConfig, onManifestReady: () => void): Promise<WebpackDevServer<import("express").Application, import("http").Server<typeof import("http").IncomingMessage, typeof import("http").ServerResponse>>>;
+export declare function watchClientCompilation(config: NormalizedServiceConfig, onManifestReady: () => void): Promise<WebpackDevServer<import("express").Application, import("http").Server<typeof import("http").IncomingMessage, typeof import("http").ServerResponse>> | RspackDevServer>;

package/dist/commands/dev/client.js

@@ -34,26 +34,40 @@ const webpack_dev_server_1 = __importDefault(require("webpack-dev-server"));
 const webpack_manifest_plugin_1 = require("webpack-manifest-plugin");
 const webpack_assets_manifest_1 = __importDefault(require("webpack-assets-manifest"));
 const utils_1 = require("../../common/utils");
+const rspack_manifest_plugin_1 = require("rspack-manifest-plugin");
+const core_1 = require("@rspack/core");
+const dev_server_1 = require("@rspack/dev-server");
 const paths_1 = __importDefault(require("../../common/paths"));
 const logger_1 = require("../../common/logger");
 const config_1 = require("../../common/webpack/config");
+const config_2 = require("../../common/rspack/config");
+const utils_2 = require("../../common/rspack/utils");
 async function watchClientCompilation(config, onManifestReady) {
-    const clientCompilation = await buildWebpackServer(config);
+    const clientCompilation = await buildDevServer(config);
     const compiler = clientCompilation.compiler;
     subscribeToManifestReadyEvent(compiler, onManifestReady);
     return clientCompilation;
 }
-async function buildWebpackServer(config) {
-    const logger = new logger_1.Logger('webpack', config.verbose);
+async function buildDevServer(config) {
+    const bundler = config.client.bundler;
+    const logger = new logger_1.Logger(bundler, config.verbose);
     const { webSocketPath = path.normalize(`/${config.client.publicPathPrefix}/build/sockjs-node`), writeToDisk, ...devServer } = config.client.devServer || {};
     const normalizedConfig = { ...config.client, devServer: { ...devServer, webSocketPath } };
-    const webpackConfigs = [
-        await (0, config_1.webpackConfigFactory)("development" /* WebpackMode.Dev */, normalizedConfig, { logger }),
-    ];
     const isSsr = Boolean(normalizedConfig.ssr);
-    if (isSsr) {
-        const logger = new logger_1.Logger('webpack(SSR)', config.verbose);
-        webpackConfigs.push(await (0, config_1.webpackConfigFactory)("development" /* WebpackMode.Dev */, normalizedConfig, { logger, isSsr }));
+    let webpackConfigs = [];
+    let rspackConfigs = [];
+    if (bundler === 'webpack') {
+        webpackConfigs = [await (0, config_1.webpackConfigFactory)("development" /* WebpackMode.Dev */, normalizedConfig, { logger })];
+        if (isSsr) {
+            const logger = new logger_1.Logger('webpack(SSR)', config.verbose);
+            webpackConfigs.push(await (0, config_1.webpackConfigFactory)("development" /* WebpackMode.Dev */, normalizedConfig, { logger, isSsr }));
+        }
+    }
+    else {
+        if (isSsr) {
+            throw new Error(`SSR is not supported in ${bundler}`);
+        }
+        rspackConfigs = [await (0, config_2.rspackConfigFactory)("development" /* RspackMode.Dev */, normalizedConfig, { logger })];
     }
     const publicPath = path.normalize(config.client.publicPathPrefix + '/build/');
     const staticFolder = path.resolve(paths_1.default.appDist, 'public');
@@ -131,41 +145,60 @@ async function buildWebpackServer(config) {
         });
     }
     options.proxy = proxy;
-    const compiler = (0, webpack_1.default)(webpackConfigs);
-    const server = new webpack_dev_server_1.default(options, compiler);
+    let server;
+    if (bundler === 'rspack') {
+        // Rspack multicompiler dont work with lazy compilation
+        const compiler = (0, core_1.rspack)(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, utils_2.clearCacheDirectory)(rspackConfigs[0], logger);
+    }
+    else {
+        const compiler = (0, webpack_1.default)(webpackConfigs);
+        server = new webpack_dev_server_1.default(options, compiler);
+    }
     try {
         await server.start();
     }
     catch (e) {
-        logger.logError('Cannot start webpack dev server', e);
+        logger.logError(`Cannot start ${bundler} dev server`, e);
     }
     if (options.ipc && typeof options.ipc === 'string') {
         fs.chmod(options.ipc, 0o666, (e) => logger.logError('', e));
     }
     return server;
 }
-function subscribeToManifestReadyEvent(webpackCompiler, onManifestReady) {
+function isRspackCompiler(compiler) {
+    return 'rspack' in compiler;
+}
+function subscribeToManifestReadyEvent(compiler, onManifestReady) {
     const promises = [];
-    const options = Array.isArray(webpackCompiler.options)
-        ? webpackCompiler.options
-        : [webpackCompiler.options];
-    const compilers = 'compilers' in webpackCompiler ? webpackCompiler.compilers : [webpackCompiler];
+    const options = Array.isArray(compiler.options) ? compiler.options : [compiler.options];
+    const compilers = 'compilers' in compiler ? compiler.compilers : [compiler];
     for (let i = 0; i < options.length; i++) {
         const config = options[i];
         const compiler = compilers[i];
         if (!config || !compiler) {
             throw new Error('Something goes wrong!');
         }
-        const assetsManifestPlugin = config.plugins.find((plugin) => plugin instanceof webpack_assets_manifest_1.default);
-        if (assetsManifestPlugin) {
-            const assetsManifestReady = (0, utils_1.deferredPromise)();
-            promises.push(assetsManifestReady.promise);
-            assetsManifestPlugin.hooks.done.tap('app-builder', assetsManifestReady.resolve);
+        if (!isRspackCompiler(compiler)) {
+            const assetsManifestPlugin = config.plugins.find((plugin) => plugin instanceof webpack_assets_manifest_1.default);
+            if (assetsManifestPlugin) {
+                const assetsManifestReady = (0, utils_1.deferredPromise)();
+                promises.push(assetsManifestReady.promise);
+                assetsManifestPlugin.hooks.done.tap('app-builder', assetsManifestReady.resolve);
+            }
         }
         const manifestReady = (0, utils_1.deferredPromise)();
         promises.push(manifestReady.promise);
-        const { afterEmit } = (0, webpack_manifest_plugin_1.getCompilerHooks)(compiler);
-        afterEmit.tap('app-builder', manifestReady.resolve);
+        if (isRspackCompiler(compiler)) {
+            const { afterEmit } = (0, rspack_manifest_plugin_1.getCompilerHooks)(compiler);
+            afterEmit.tap('app-builder', manifestReady.resolve);
+        }
+        else {
+            const { afterEmit } = (0, webpack_manifest_plugin_1.getCompilerHooks)(compiler);
+            afterEmit.tap('app-builder', manifestReady.resolve);
+        }
     }
     Promise.all(promises).then(() => onManifestReady());
 }

package/dist/common/babel/index.js

@@ -10,7 +10,7 @@ function babelPreset(config) {
                 bugfixes: true,
                 targets: config.isSsr ? { node: 'current' } : undefined,
             },
-            runtime: { version: '^7.13.10' },
+            runtime: { version: '^7.26.0' },
             typescript: true,
             react: {
                 runtime: config.newJsxTransform ? 'automatic' : 'classic',

package/dist/common/babel/ui-preset.js

@@ -16,20 +16,6 @@ module.exports = function (_context, options = {}) {
     const isTypeScriptEnabled = getOption(options.typescript, false);
     const reactOptions = getOption(options.react, {});
     const presets = [
-        [
-            () => ({
-                /**
-                 * Safari 15 has a buggy implementation of class properties,
-                 * but @babel/compat-data marks it as stable.
-                 * Can be removed once the issue is fixed and released.
-                 * @see https://github.com/babel/babel/issues/14289
-                 */
-                plugins: [
-                    require.resolve('@babel/plugin-transform-private-methods'),
-                    require.resolve('@babel/plugin-transform-class-properties'),
-                ],
-            }),
-        ],
         // Latest stable ECMAScript features
         (isEnvDevelopment || isEnvProduction) && [require.resolve('@babel/preset-env'), envOptions],
         // ES features necessary for current Node version

package/dist/common/config.js

@@ -196,9 +196,11 @@ async function normalizeClientConfig(client, mode) {
         svgr: client.svgr ?? {},
         entryFilter: client.entryFilter && splitPaths(client.entryFilter),
         webpack: typeof client.webpack === 'function' ? client.webpack : (config) => config,
+        rspack: typeof client.rspack === 'function' ? client.rspack : (config) => config,
         babel: typeof client.babel === 'function' ? client.babel : (config) => config,
         devServer: undefined,
         lazyCompilation: undefined,
+        bundler: client.bundler || 'webpack',
     };
     if (mode === 'dev') {
         if (client.lazyCompilation) {

package/dist/common/library/index.js

@@ -129,6 +129,7 @@ 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/logger/colors.d.ts

@@ -5,7 +5,7 @@ export declare const colors: chalk.Chalk & chalk.ChalkFunction & {
     Color: ("black" | "red" | "green" | "yellow" | "blue" | "magenta" | "cyan" | "white" | "gray" | "grey" | "blackBright" | "redBright" | "greenBright" | "yellowBright" | "blueBright" | "magentaBright" | "cyanBright" | "whiteBright") | ("bgBlack" | "bgRed" | "bgGreen" | "bgYellow" | "bgBlue" | "bgMagenta" | "bgCyan" | "bgWhite" | "bgGray" | "bgGrey" | "bgBlackBright" | "bgRedBright" | "bgGreenBright" | "bgYellowBright" | "bgBlueBright" | "bgMagentaBright" | "bgCyanBright" | "bgWhiteBright");
     ForegroundColor: "black" | "red" | "green" | "yellow" | "blue" | "magenta" | "cyan" | "white" | "gray" | "grey" | "blackBright" | "redBright" | "greenBright" | "yellowBright" | "blueBright" | "magentaBright" | "cyanBright" | "whiteBright";
     BackgroundColor: "bgBlack" | "bgRed" | "bgGreen" | "bgYellow" | "bgBlue" | "bgMagenta" | "bgCyan" | "bgWhite" | "bgGray" | "bgGrey" | "bgBlackBright" | "bgRedBright" | "bgGreenBright" | "bgYellowBright" | "bgBlueBright" | "bgMagentaBright" | "bgCyanBright" | "bgWhiteBright";
-    Modifiers: "bold" | "reset" | "dim" | "italic" | "underline" | "inverse" | "hidden" | "strikethrough" | "visible";
+    Modifiers: "bold" | "hidden" | "reset" | "dim" | "italic" | "underline" | "inverse" | "strikethrough" | "visible";
     stderr: chalk.Chalk & {
         supportsColor: chalk.ColorSupport | false;
     };

package/dist/common/logger/index.d.ts

@@ -12,7 +12,7 @@ export declare class Logger implements BaseLogger {
         Color: ("black" | "red" | "green" | "yellow" | "blue" | "magenta" | "cyan" | "white" | "gray" | "grey" | "blackBright" | "redBright" | "greenBright" | "yellowBright" | "blueBright" | "magentaBright" | "cyanBright" | "whiteBright") | ("bgBlack" | "bgRed" | "bgGreen" | "bgYellow" | "bgBlue" | "bgMagenta" | "bgCyan" | "bgWhite" | "bgGray" | "bgGrey" | "bgBlackBright" | "bgRedBright" | "bgGreenBright" | "bgYellowBright" | "bgBlueBright" | "bgMagentaBright" | "bgCyanBright" | "bgWhiteBright");
         ForegroundColor: "black" | "red" | "green" | "yellow" | "blue" | "magenta" | "cyan" | "white" | "gray" | "grey" | "blackBright" | "redBright" | "greenBright" | "yellowBright" | "blueBright" | "magentaBright" | "cyanBright" | "whiteBright";
         BackgroundColor: "bgBlack" | "bgRed" | "bgGreen" | "bgYellow" | "bgBlue" | "bgMagenta" | "bgCyan" | "bgWhite" | "bgGray" | "bgGrey" | "bgBlackBright" | "bgRedBright" | "bgGreenBright" | "bgYellowBright" | "bgBlueBright" | "bgMagentaBright" | "bgCyanBright" | "bgWhiteBright";
-        Modifiers: "bold" | "reset" | "dim" | "italic" | "underline" | "inverse" | "hidden" | "strikethrough" | "visible";
+        Modifiers: "bold" | "hidden" | "reset" | "dim" | "italic" | "underline" | "inverse" | "strikethrough" | "visible";
         stderr: import("chalk").Chalk & {
             supportsColor: import("chalk").ColorSupport | false;
         };

package/dist/common/models/index.d.ts

@@ -3,6 +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, ResolveOptions } from 'webpack';
+import type { Configuration as RspackConfiguration } from '@rspack/core';
 import type * as Babel from '@babel/core';
 import type { ServerConfiguration } from 'webpack-dev-server';
 import type { Options as CircularDependenciesOptions } from 'circular-dependency-plugin';
@@ -14,6 +15,7 @@ import type { WebpackMode } from '../webpack/config';
 import type { UploadOptions } from '../s3-upload/upload';
 import type { TerserOptions } from 'terser-webpack-plugin';
 import type { ReactRefreshPluginOptions } from '@pmmmwh/react-refresh-webpack-plugin/types/lib/types';
+type Bundler = 'webpack' | 'rspack';
 export interface Entities<T> {
     data: Record<string, T>;
     keys: string[];
@@ -182,6 +184,12 @@ export interface ClientConfig {
         configType: `${WebpackMode}`;
         isSsr?: boolean;
     }) => Configuration | Promise<Configuration>;
+    /**
+     * Modify or return a custom Rspack config.
+     */
+    rspack?: (config: RspackConfiguration, options: {
+        configType: `${WebpackMode}`;
+    }) => RspackConfiguration | Promise<RspackConfiguration>;
     /**
      * Modify or return a custom Babel config.
      */
@@ -197,6 +205,7 @@ export interface ClientConfig {
         noExternal?: string | RegExp | (string | RegExp)[] | true;
         moduleType?: 'commonjs' | 'esm';
     };
+    bundler?: Bundler;
 }
 export interface CdnUploadConfig {
     bucket: string;
@@ -225,6 +234,7 @@ export interface ServiceConfig {
     verbose?: boolean;
 }
 export type NormalizedClientConfig = Omit<ClientConfig, 'publicPathPrefix' | 'hiddenSourceMap' | 'svgr' | 'lazyCompilation' | 'devServer' | 'disableForkTsChecker' | 'disableReactRefresh'> & {
+    bundler: Bundler;
     publicPathPrefix: string;
     hiddenSourceMap: boolean;
     svgr: NonNullable<ClientConfig['svgr']>;
@@ -238,6 +248,9 @@ export type NormalizedClientConfig = Omit<ClientConfig, 'publicPathPrefix' | 'hi
         configType: `${WebpackMode}`;
         isSsr: boolean;
     }) => Configuration | Promise<Configuration>;
+    rspack: (config: RspackConfiguration, options: {
+        configType: `${WebpackMode}`;
+    }) => RspackConfiguration | Promise<RspackConfiguration>;
     debugWebpack?: boolean;
     babel: (config: Babel.TransformOptions, options: {
         configType: `${WebpackMode}`;

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

@@ -0,0 +1,2 @@
+import type { NormalizedClientConfig } from '../models';
+export declare function rspackCompile(config: NormalizedClientConfig): Promise<void>;

package/dist/common/rspack/compile.js

@@ -0,0 +1,27 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.rspackCompile = rspackCompile;
+const core_1 = require("@rspack/core");
+const logger_1 = require("../logger");
+const config_1 = require("./config");
+const utils_1 = require("./utils");
+async function rspackCompile(config) {
+    const logger = new logger_1.Logger('rspack', config.verbose);
+    const rspackConfigs = [await (0, config_1.rspackConfigFactory)("production" /* RspackMode.Prod */, config, { logger })];
+    logger.verbose('Config created');
+    return new Promise((resolve) => {
+        const compiler = (0, core_1.rspack)(rspackConfigs, (0, utils_1.rspackCompilerHandlerFactory)(logger, async () => {
+            resolve();
+        }));
+        process.on('SIGINT', async () => {
+            compiler?.close(() => {
+                process.exit(1);
+            });
+        });
+        process.on('SIGTERM', async () => {
+            compiler?.close(() => {
+                process.exit(1);
+            });
+        });
+    });
+}

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

@@ -0,0 +1,24 @@
+import { Configuration, ResolveOptions, RuleSetRule } from '@rspack/core';
+import { ManifestPluginOptions } from 'rspack-manifest-plugin';
+import type { NormalizedClientConfig } from '../models';
+import type { Logger } from '../logger';
+export declare const generateManifest: ManifestPluginOptions['generate'];
+export interface HelperOptions {
+    config: NormalizedClientConfig;
+    logger?: Logger;
+    isEnvDevelopment: boolean;
+    isEnvProduction: boolean;
+    configType: `${RspackMode}`;
+}
+export declare const enum RspackMode {
+    Prod = "production",
+    Dev = "development"
+}
+export declare function rspackConfigFactory(rspackMode: RspackMode, config: NormalizedClientConfig, { logger }?: {
+    logger?: Logger;
+}): Promise<Configuration>;
+export declare function configureModuleRules(helperOptions: HelperOptions, additionalRules?: NonNullable<RuleSetRule['oneOf']>): RuleSetRule[];
+export declare function configureResolve({ isEnvProduction, config }: HelperOptions): ResolveOptions;
+type Optimization = NonNullable<Configuration['optimization']>;
+export declare function configureOptimization({ config }: HelperOptions): Optimization;
+export {};