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

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.d.ts

@@ -1,4 +1,3 @@
 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>> | RspackDevServer>;
+export declare function watchClientCompilation(config: NormalizedServiceConfig, onManifestReady: () => void): Promise<WebpackDevServer<import("express").Application, import("http").Server<typeof import("http").IncomingMessage, typeof import("http").ServerResponse>>>;

package/dist/commands/dev/client.js

@@ -34,14 +34,9 @@ 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 buildDevServer(config);
     const compiler = clientCompilation.compiler;
@@ -49,25 +44,19 @@ async function watchClientCompilation(config, onManifestReady) {
     return clientCompilation;
 }
 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 webpackConfigs = [
+        await (0, config_1.webpackConfigFactory)("development" /* WebpackMode.Dev */, normalizedConfig, { logger }),
+    ];
     const isSsr = Boolean(normalizedConfig.ssr);
-    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 })];
+    if (isSsr) {
+        const ssrLogger = new logger_1.Logger('client(SSR)', config.verbose);
+        webpackConfigs.push(await (0, config_1.webpackConfigFactory)("development" /* WebpackMode.Dev */, normalizedConfig, {
+            logger: ssrLogger,
+            isSsr,
+        }));
     }
     const publicPath = path.normalize(config.client.publicPathPrefix + '/build/');
     const staticFolder = path.resolve(paths_1.default.appDist, 'public');
@@ -145,60 +134,41 @@ 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]);
-        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);
-    }
+    const compiler = (0, webpack_1.default)(webpackConfigs);
+    const server = new webpack_dev_server_1.default(options, compiler);
     try {
         await server.start();
     }
     catch (e) {
-        logger.logError(`Cannot start ${bundler} dev server`, e);
+        logger.logError('Cannot start webpack dev server', e);
     }
     if (options.ipc && typeof options.ipc === 'string') {
         fs.chmod(options.ipc, 0o666, (e) => logger.logError('', e));
     }
     return server;
 }
-function isRspackCompiler(compiler) {
-    return 'rspack' in compiler;
-}
-function subscribeToManifestReadyEvent(compiler, onManifestReady) {
+function subscribeToManifestReadyEvent(webpackCompiler, onManifestReady) {
     const promises = [];
-    const options = Array.isArray(compiler.options) ? compiler.options : [compiler.options];
-    const compilers = 'compilers' in compiler ? compiler.compilers : [compiler];
+    const options = Array.isArray(webpackCompiler.options)
+        ? webpackCompiler.options
+        : [webpackCompiler.options];
+    const compilers = 'compilers' in webpackCompiler ? webpackCompiler.compilers : [webpackCompiler];
     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!');
         }
-        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 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);
-        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);
-        }
+        const { afterEmit } = (0, webpack_manifest_plugin_1.getCompilerHooks)(compiler);
+        afterEmit.tap('app-builder', manifestReady.resolve);
     }
     Promise.all(promises).then(() => onManifestReady());
 }

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;
 }
@@ -196,11 +197,9 @@ 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,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/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

@@ -3,7 +3,6 @@ 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';
@@ -15,7 +14,6 @@ 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[];
@@ -184,12 +182,6 @@ 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.
      */
@@ -205,7 +197,6 @@ export interface ClientConfig {
         noExternal?: string | RegExp | (string | RegExp)[] | true;
         moduleType?: 'commonjs' | 'esm';
     };
-    bundler?: Bundler;
 }
 export interface CdnUploadConfig {
     bucket: string;
@@ -234,7 +225,6 @@ 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']>;
@@ -248,9 +238,6 @@ 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/s3-upload/index.d.ts

@@ -1,4 +1,3 @@
 export { S3UploadPlugin } from './webpack-plugin';
 export { uploadFiles } from './upload';
-export { createS3UploadPlugins } from './create-plugin';
 export type { UploadFilesOptions } from './upload';

package/dist/common/s3-upload/index.js

@@ -1,9 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createS3UploadPlugins = exports.uploadFiles = exports.S3UploadPlugin = void 0;
+exports.uploadFiles = exports.S3UploadPlugin = void 0;
 var webpack_plugin_1 = require("./webpack-plugin");
 Object.defineProperty(exports, "S3UploadPlugin", { enumerable: true, get: function () { return webpack_plugin_1.S3UploadPlugin; } });
 var upload_1 = require("./upload");
 Object.defineProperty(exports, "uploadFiles", { enumerable: true, get: function () { return upload_1.uploadFiles; } });
-var create_plugin_1 = require("./create-plugin");
-Object.defineProperty(exports, "createS3UploadPlugins", { enumerable: true, get: function () { return create_plugin_1.createS3UploadPlugins; } });

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,18 +3,18 @@ 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 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);
+async function clientCompile(config) {
+    const logger = new logger_1.Logger('client', config.verbose);
     const webpackConfigs = [await (0, config_1.webpackConfigFactory)("production" /* WebpackMode.Prod */, config, { logger })];
     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 }));
+        const ssrLogger = new logger_1.Logger('client(SSR)', config.verbose);
+        webpackConfigs.push(await (0, config_1.webpackConfigFactory)("production" /* WebpackMode.Prod */, config, { logger: ssrLogger, isSsr }));
     }
     logger.verbose('Config created');
     return new Promise((resolve) => {

package/dist/common/webpack/config.js

@@ -30,7 +30,6 @@ exports.webpackConfigFactory = webpackConfigFactory;
 exports.configureModuleRules = configureModuleRules;
 exports.configureResolve = configureResolve;
 exports.configureOptimization = configureOptimization;
-/* eslint-disable complexity */
 const path = __importStar(require("node:path"));
 const fs = __importStar(require("node:fs"));
 const webpack = __importStar(require("webpack"));
@@ -702,7 +701,46 @@ function configurePlugins(options) {
             }
         }
         if (config.cdn) {
-            plugins.push(...(0, s3_upload_1.createS3UploadPlugins)(config, options.logger));
+            let credentialsGlobal;
+            if (process.env.FRONTEND_S3_ACCESS_KEY_ID &&
+                process.env.FRONTEND_S3_SECRET_ACCESS_KEY) {
+                credentialsGlobal = {
+                    accessKeyId: process.env.FRONTEND_S3_ACCESS_KEY_ID,
+                    secretAccessKey: process.env.FRONTEND_S3_SECRET_ACCESS_KEY,
+                };
+            }
+            const cdns = Array.isArray(config.cdn) ? config.cdn : [config.cdn];
+            for (let index = 0; index < cdns.length; index++) {
+                const cdn = cdns[index];
+                if (!cdn) {
+                    continue;
+                }
+                let credentials = credentialsGlobal;
+                const accessKeyId = process.env[`FRONTEND_S3_ACCESS_KEY_ID_${index}`];
+                const secretAccessKey = process.env[`FRONTEND_S3_SECRET_ACCESS_KEY_${index}`];
+                if (accessKeyId && secretAccessKey) {
+                    credentials = {
+                        accessKeyId,
+                        secretAccessKey,
+                    };
+                }
+                plugins.push(new s3_upload_1.S3UploadPlugin({
+                    exclude: config.hiddenSourceMap ? /\.map$/ : undefined,
+                    compress: cdn.compress,
+                    s3ClientOptions: {
+                        region: cdn.region,
+                        endpoint: cdn.endpoint,
+                        credentials,
+                    },
+                    s3UploadOptions: {
+                        bucket: cdn.bucket,
+                        targetPath: cdn.prefix,
+                        cacheControl: cdn.cacheControl,
+                    },
+                    additionalPattern: cdn.additionalPattern,
+                    logger: options.logger,
+                }));
+            }
         }
     }
     return plugins;

package/dist/common/webpack/node-externals.d.ts

@@ -1,8 +1,10 @@
-import type * as webpack from 'webpack';
 type Pattern = RegExp | ((v: string) => boolean) | string;
 export interface NodeExternalsOptions {
     noExternal?: Pattern | Pattern[];
     module?: boolean;
 }
-export declare function nodeExternals({ noExternal, module }: NodeExternalsOptions): (data: webpack.ExternalItemFunctionData) => Promise<string | undefined>;
+export declare function nodeExternals({ noExternal, module }: NodeExternalsOptions): (data: {
+    request?: string;
+    dependencyType?: string;
+}) => Promise<string | undefined>;
 export {};

package/dist/common/webpack/node-externals.js

@@ -35,7 +35,7 @@ function nodeExternals({ noExternal = [], module }) {
     const noExternals = Array().concat(webpackInternal).concat(noExternal);
     const nodeModules = readPackagesNames(paths_1.default.appNodeModules);
     return async (data) => {
-        const { request } = data;
+        const { request, dependencyType } = data;
         if (!request) {
             return undefined;
         }
@@ -46,14 +46,14 @@ function nodeExternals({ noExternal = [], module }) {
             return undefined;
         }
         if (!module) {
-            return `commonjs ${data.request}`;
+            return `commonjs ${request}`;
         }
-        if (data.dependencyType === 'commonjs' ||
+        if (dependencyType === 'commonjs' ||
             // lodash/something without extension can't be imported so always require it
             (moduleName === 'lodash' && request.match(/^lodash\/[\w_]+($|\/[\w_]+$)/))) {
-            return `node-commonjs ${data.request}`;
+            return `node-commonjs ${request}`;
         }
-        return `module-import ${data.request}`;
+        return `module-import ${request}`;
     };
 }
 function readPackagesNames(dirName) {

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

@@ -1,13 +1,12 @@
-import * as webpack from 'webpack';
+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 _bundler;
     private _state;
-    constructor({ logger, bundler }: {
+    constructor({ logger }: {
         logger: Logger;
-        bundler?: string;
     });
     handler: (percent: number, message: string, ...details: string[]) => void;
-    apply(compiler: webpack.Compiler): void;
+    apply(compiler: Webpack.Compiler): void;
 }

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

@@ -1,39 +1,17 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __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.ProgressPlugin = void 0;
-const webpack = __importStar(require("webpack"));
+const webpack_1 = __importDefault(require("webpack"));
 const pretty_time_1 = require("../logger/pretty-time");
-class ProgressPlugin extends webpack.ProgressPlugin {
+class ProgressPlugin extends webpack_1.default.ProgressPlugin {
     _logger;
-    _bundler;
     _state = {};
-    constructor({ logger, bundler = 'webpack' }) {
+    constructor({ logger }) {
         super();
         this._logger = logger;
-        this._bundler = bundler;
     }
     handler = (percent, message, ...details) => {
         const progress = Math.floor(percent * 100);
@@ -43,12 +21,12 @@ class ProgressPlugin extends webpack.ProgressPlugin {
         super.apply(compiler);
         hook(compiler, 'compile', () => {
             this._logger.message('Start compilation');
-            // @ts-ignore
-            const compilerVersipn = this._bundler === 'webpack'
-                ? compiler.webpack.version
-                : // @ts-ignore
-                    compiler.webpack.rspackVersion;
-            this._logger.message(`${this._bundler} v${compilerVersipn}`);
+            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) => {

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

@@ -11,7 +11,7 @@ export declare function configureWebpackConfigForStorybook(mode: Mode, userConfi
     resolve: Webpack.ResolveOptions;
     plugins: (false | "" | 0 | ((this: Webpack.Compiler, compiler: Webpack.Compiler) => void) | Webpack.WebpackPluginInstance | null | undefined)[];
     optimization: {
-        minimizer: (false | "" | 0 | Webpack.WebpackPluginInstance | "..." | ((this: Webpack.Compiler, compiler: Webpack.Compiler) => void) | null | undefined)[] | undefined;
+        minimizer: (false | "" | 0 | "..." | Webpack.WebpackPluginInstance | ((this: Webpack.Compiler, compiler: Webpack.Compiler) => void) | null | undefined)[] | undefined;
     };
 }>;
 export {};