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

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

@@ -2,9 +2,6 @@
 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 config.client.bundler === 'webpack'
-        ? (0, compile_1.webpackCompile)(config.client)
-        : (0, compile_2.rspackCompile)(config.client);
+    return (0, compile_1.clientCompile)(config.client);
 }

package/dist/commands/dev/client.js

@@ -40,8 +40,7 @@ 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");
+const rspack_1 = require("../../common/webpack/rspack");
 async function watchClientCompilation(config, onManifestReady) {
     const clientCompilation = await buildDevServer(config);
     const compiler = clientCompilation.compiler;
@@ -50,24 +49,41 @@ async function watchClientCompilation(config, onManifestReady) {
 }
 async function buildDevServer(config) {
     const bundler = config.client.bundler;
-    const logger = new logger_1.Logger(bundler, config.verbose);
+    const logger = new logger_1.Logger('client', 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 isSsr = Boolean(normalizedConfig.ssr);
     let webpackConfigs = [];
     let rspackConfigs = [];
     if (bundler === 'webpack') {
-        webpackConfigs = [await (0, config_1.webpackConfigFactory)("development" /* WebpackMode.Dev */, normalizedConfig, { logger })];
+        webpackConfigs = [
+            await (0, config_1.webpackConfigFactory)({
+                webpackMode: "development" /* WebpackMode.Dev */,
+                config: 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 }));
+            const ssrLogger = new logger_1.Logger('webpack(SSR)', config.verbose);
+            webpackConfigs.push(await (0, config_1.webpackConfigFactory)({
+                webpackMode: "development" /* WebpackMode.Dev */,
+                config: normalizedConfig,
+                logger: ssrLogger,
+                isSsr,
+            }));
         }
     }
     else {
         if (isSsr) {
             throw new Error(`SSR is not supported in ${bundler}`);
         }
-        rspackConfigs = [await (0, config_2.rspackConfigFactory)("development" /* RspackMode.Dev */, normalizedConfig, { logger })];
+        rspackConfigs = [
+            await (0, config_1.rspackConfigFactory)({
+                webpackMode: "development" /* WebpackMode.Dev */,
+                config: normalizedConfig,
+                logger,
+            }),
+        ];
     }
     const publicPath = path.normalize(config.client.publicPathPrefix + '/build/');
     const staticFolder = path.resolve(paths_1.default.appDist, 'public');
@@ -151,7 +167,7 @@ async function buildDevServer(config) {
         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);
+        (0, rspack_1.clearCacheDirectory)(rspackConfigs[0], logger);
     }
     else {
         const compiler = (0, webpack_1.default)(webpackConfigs);

package/dist/common/config.js

@@ -22,15 +22,10 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getProjectConfig = getProjectConfig;
 exports.normalizeConfig = normalizeConfig;
-/* eslint-disable complexity */
 const path = __importStar(require("node:path"));
-const lodash_1 = __importDefault(require("lodash"));
 const cosmiconfig_1 = require("cosmiconfig");
 const cosmiconfig_typescript_loader_1 = require("cosmiconfig-typescript-loader");
 const models_1 = require("./models");
@@ -42,7 +37,13 @@ function remapPaths(paths) {
     return splitPaths(paths).map((p) => path.resolve(process.cwd(), p));
 }
 function omitUndefined(obj) {
-    return lodash_1.default.omitBy(obj, lodash_1.default.isUndefined);
+    const newObj = {};
+    for (const [key, value] of Object.entries(obj)) {
+        if (value !== undefined) {
+            newObj[key] = value;
+        }
+    }
+    return newObj;
 }
 function getModuleLoader({ storybook } = {}) {
     if (!storybook) {
@@ -176,7 +177,7 @@ async function normalizeConfig(userConfig, mode) {
         };
         return config;
     }
-    const config = lodash_1.default.cloneDeep(userConfig);
+    const config = structuredClone(userConfig);
     config.lib.newJsxTransform = config.lib.newJsxTransform ?? true;
     return config;
 }

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" | "hidden" | "reset" | "dim" | "italic" | "underline" | "inverse" | "strikethrough" | "visible";
+    Modifiers: "bold" | "reset" | "dim" | "italic" | "underline" | "inverse" | "hidden" | "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" | "hidden" | "reset" | "dim" | "italic" | "underline" | "inverse" | "strikethrough" | "visible";
+        Modifiers: "bold" | "reset" | "dim" | "italic" | "underline" | "inverse" | "hidden" | "strikethrough" | "visible";
         stderr: import("chalk").Chalk & {
             supportsColor: import("chalk").ColorSupport | false;
         };

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

@@ -189,6 +189,7 @@ export interface ClientConfig {
      */
     rspack?: (config: RspackConfiguration, options: {
         configType: `${WebpackMode}`;
+        isSsr?: boolean;
     }) => RspackConfiguration | Promise<RspackConfiguration>;
     /**
      * Modify or return a custom Babel config.

package/dist/common/s3-upload/webpack-plugin.d.ts

@@ -1,4 +1,4 @@
-import type { Compiler } from 'webpack';
+import type * as Webpack from 'webpack';
 import type { Logger } from '../logger/index.js';
 import type { UploadOptions } from './upload.js';
 import type { S3ClientOptions } from './s3-client.js';
@@ -14,7 +14,7 @@ interface S3UploadPluginOptions {
 export declare class S3UploadPlugin {
     private options;
     constructor(options: S3UploadPluginOptions);
-    apply(compiler: Compiler): void;
+    apply(compiler: Webpack.Compiler): void;
     private isIncludeAndNotExclude;
 }
 type Rule = RegExp | string | ((s: string) => boolean);

package/dist/common/s3-upload/webpack-plugin.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.S3UploadPlugin = void 0;
-const webpack_1 = require("webpack");
 const fast_glob_1 = require("fast-glob");
 const upload_js_1 = require("./upload.js");
 class S3UploadPlugin {
@@ -12,7 +11,7 @@ class S3UploadPlugin {
     apply(compiler) {
         compiler.hooks.done.tapPromise('s3-upload-plugin', async (stats) => {
             if (stats.hasErrors()) {
-                stats.compilation.warnings.push(new webpack_1.WebpackError('s3-upload-plugin: skipped upload to s3 due to compilation errors'));
+                stats.compilation.warnings.push(new compiler.webpack.WebpackError('s3-upload-plugin: skipped upload to s3 due to compilation errors'));
                 return;
             }
             let fileNames = Object.keys(stats.compilation.assets);
@@ -39,7 +38,7 @@ class S3UploadPlugin {
                 this.options.logger?.success(`Files successfully uploaded to bucket ${this.options.s3UploadOptions.bucket}`);
             }
             catch (e) {
-                const error = new webpack_1.WebpackError(`s3-upload-plugin: ${e instanceof Error ? e.message : e}`);
+                const error = new compiler.webpack.WebpackError(`s3-upload-plugin: ${e instanceof Error ? e.message : e}`);
                 stats.compilation.errors.push(error);
             }
         });

package/dist/common/typescript/compile.js

@@ -24,7 +24,7 @@ function compile(ts, { projectPath, configFileName = 'tsconfig.json', optionsToE
     const program = ts.createProgram(parsedConfig.fileNames, parsedConfig.options, compilerHost);
     // @ts-expect-error
     const filesCount = compilerHost.readFile.disableDisplay();
-    const allDiagnostics = ts.getPreEmitDiagnostics(program).slice();
+    let allDiagnostics = ts.getPreEmitDiagnostics(program);
     logger.verbose(`Program created, read ${filesCount} files`);
     if (!hasErrors(allDiagnostics)) {
         logger.verbose('We finished making the program! Emitting...');
@@ -34,7 +34,7 @@ function compile(ts, { projectPath, configFileName = 'tsconfig.json', optionsToE
             afterDeclarations: [transformPathsToLocalModules],
         });
         logger.verbose('Emit complete!');
-        allDiagnostics.push(...emitResult.diagnostics);
+        allDiagnostics = ts.sortAndDeduplicateDiagnostics(allDiagnostics.concat(emitResult.diagnostics));
     }
     allDiagnostics.forEach(reportDiagnostic);
     if (hasErrors(allDiagnostics)) {
@@ -44,12 +44,12 @@ function compile(ts, { projectPath, configFileName = 'tsconfig.json', optionsToE
     else {
         logger.success(`Compiled successfully in ${(0, pretty_time_1.elapsedTime)(start)}`);
     }
-    const formatHost = {
-        getCanonicalFileName: (path) => path,
-        getCurrentDirectory: ts.sys.getCurrentDirectory,
-        getNewLine: () => ts.sys.newLine,
-    };
     function reportDiagnostic(diagnostic) {
+        const formatHost = {
+            getCanonicalFileName: (path) => path,
+            getCurrentDirectory: ts.sys.getCurrentDirectory,
+            getNewLine: () => ts.sys.newLine,
+        };
         if (logger.isVerbose) {
             logger.message(ts.formatDiagnosticsWithColorAndContext([diagnostic], formatHost));
         }

package/dist/common/typescript/watch.js

@@ -9,11 +9,6 @@ function watch(ts, projectPath, { logger, onAfterFilesEmitted, enableSourceMap,
     logger.message(`Typescript v${ts.version}`);
     const configPath = (0, utils_1.getTsProjectConfigPath)(ts, projectPath);
     const createProgram = ts.createEmitAndSemanticDiagnosticsBuilderProgram;
-    const formatHost = {
-        getCanonicalFileName: (path) => path,
-        getCurrentDirectory: ts.sys.getCurrentDirectory,
-        getNewLine: () => ts.sys.newLine,
-    };
     const host = ts.createWatchCompilerHost(configPath, {
         noEmit: false,
         noEmitOnError: false,
@@ -46,6 +41,11 @@ function watch(ts, projectPath, { logger, onAfterFilesEmitted, enableSourceMap,
     // the program over time.
     ts.createWatchProgram(host);
     function reportDiagnostic(diagnostic) {
+        const formatHost = {
+            getCanonicalFileName: (path) => path,
+            getCurrentDirectory: ts.sys.getCurrentDirectory,
+            getNewLine: () => ts.sys.newLine,
+        };
         if (logger.isVerbose) {
             logger.message(ts.formatDiagnosticsWithColorAndContext([diagnostic], formatHost));
         }
@@ -59,7 +59,7 @@ function watch(ts, projectPath, { logger, onAfterFilesEmitted, enableSourceMap,
      */
     function reportWatchStatusChanged(diagnostic) {
         if (diagnostic.messageText) {
-            logger.message(ts.flattenDiagnosticMessageText(diagnostic.messageText, formatHost.getNewLine()));
+            logger.message(ts.flattenDiagnosticMessageText(diagnostic.messageText, ts.sys.newLine));
         }
     }
 }

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

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

package/dist/common/webpack/compile.js

@@ -3,24 +3,48 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.webpackCompile = webpackCompile;
+exports.clientCompile = clientCompile;
 const webpack_1 = __importDefault(require("webpack"));
+const core_1 = require("@rspack/core");
 const logger_1 = require("../logger");
 const config_1 = require("./config");
 const utils_1 = require("./utils");
-async function webpackCompile(config) {
-    const logger = new logger_1.Logger('webpack', config.verbose);
-    const webpackConfigs = [await (0, config_1.webpackConfigFactory)("production" /* WebpackMode.Prod */, config, { logger })];
+async function clientCompile(config) {
+    const logger = new logger_1.Logger('client', config.verbose);
+    const webpackConfigs = [];
+    const rspackConfigs = [];
     const isSsr = Boolean(config.ssr);
-    if (isSsr) {
-        const logger = new logger_1.Logger('webpack(SSR)', config.verbose);
-        webpackConfigs.push(await (0, config_1.webpackConfigFactory)("production" /* WebpackMode.Prod */, config, { logger, isSsr }));
+    if (config.bundler === 'rspack') {
+        rspackConfigs.push(await (0, config_1.rspackConfigFactory)({ webpackMode: "production" /* WebpackMode.Prod */, config, logger }));
+        if (isSsr) {
+            const ssrLogger = new logger_1.Logger('client(SSR)', config.verbose);
+            rspackConfigs.push(await (0, config_1.rspackConfigFactory)({
+                webpackMode: "production" /* WebpackMode.Prod */,
+                config,
+                logger: ssrLogger,
+                isSsr,
+            }));
+        }
+    }
+    else {
+        webpackConfigs.push(await (0, config_1.webpackConfigFactory)({ webpackMode: "production" /* WebpackMode.Prod */, config, logger }));
+        if (isSsr) {
+            const ssrLogger = new logger_1.Logger('client(SSR)', config.verbose);
+            webpackConfigs.push(await (0, config_1.webpackConfigFactory)({
+                webpackMode: "production" /* WebpackMode.Prod */,
+                config,
+                logger: ssrLogger,
+                isSsr,
+            }));
+        }
     }
     logger.verbose('Config created');
     return new Promise((resolve) => {
-        const compiler = (0, webpack_1.default)(webpackConfigs, (0, utils_1.webpackCompilerHandlerFactory)(logger, async () => {
-            resolve();
-        }));
+        const compiler = config.bundler === 'rspack'
+            ? (0, core_1.rspack)(rspackConfigs) // TODO add compiler factory
+            : (0, webpack_1.default)(webpackConfigs, (0, utils_1.webpackCompilerHandlerFactory)(logger, async () => {
+                resolve();
+            }));
         process.on('SIGINT', async () => {
             compiler.close(() => {
                 process.exit(1);

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

@@ -1,4 +1,5 @@
 import * as webpack from 'webpack';
+import { Configuration as RspackConfiguration } from '@rspack/core';
 import type { NormalizedClientConfig } from '../models';
 import type { Logger } from '../logger';
 export interface HelperOptions {
@@ -15,12 +16,16 @@ export declare const enum WebpackMode {
     Prod = "production",
     Dev = "development"
 }
-export declare function webpackConfigFactory(webpackMode: WebpackMode, config: NormalizedClientConfig, { logger, isSsr }?: {
+type ClientFactoryOptions = {
+    webpackMode: WebpackMode;
+    config: NormalizedClientConfig;
     logger?: Logger;
     isSsr?: boolean;
-}): Promise<webpack.Configuration>;
+};
+export declare function webpackConfigFactory(options: ClientFactoryOptions): Promise<webpack.Configuration>;
+export declare function rspackConfigFactory(options: ClientFactoryOptions): Promise<RspackConfiguration>;
 export declare function configureModuleRules(helperOptions: HelperOptions, additionalRules?: NonNullable<webpack.RuleSetRule['oneOf']>): webpack.RuleSetRule[];
 export declare function configureResolve({ isEnvProduction, config }: HelperOptions): webpack.ResolveOptions;
 type Optimization = NonNullable<webpack.Configuration['optimization']>;
-export declare function configureOptimization({ config, isSsr }: HelperOptions): Optimization;
+export declare function configureOptimization(helperOptions: HelperOptions): Optimization;
 export {};