@gravity-ui/app-builder 0.23.1-beta.0 → 0.24.1-beta.0

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

@@ -3,5 +3,5 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.buildClient = buildClient;
 const compile_1 = require("../../../common/webpack/compile");
 function buildClient(config) {
-    return (0, compile_1.clientCompile)(config.client);
+    return (0, compile_1.clientCompile)(config.client, config.configPath);
 }

package/dist/commands/dev/client.js

@@ -60,6 +60,7 @@ async function buildDevServer(config) {
             await (0, config_1.webpackConfigFactory)({
                 webpackMode: "development" /* WebpackMode.Dev */,
                 config: normalizedConfig,
+                configPath: config.configPath,
                 logger,
             }),
         ];
@@ -68,6 +69,7 @@ async function buildDevServer(config) {
             webpackConfigs.push(await (0, config_1.webpackConfigFactory)({
                 webpackMode: "development" /* WebpackMode.Dev */,
                 config: normalizedConfig,
+                configPath: config.configPath,
                 logger: ssrLogger,
                 isSsr,
             }));
@@ -78,6 +80,7 @@ async function buildDevServer(config) {
             await (0, config_1.rspackConfigFactory)({
                 webpackMode: "development" /* WebpackMode.Dev */,
                 config: normalizedConfig,
+                configPath: config.configPath,
                 logger,
             }),
         ];
@@ -86,6 +89,7 @@ async function buildDevServer(config) {
             rspackConfigs.push(await (0, config_1.rspackConfigFactory)({
                 webpackMode: "development" /* WebpackMode.Dev */,
                 config: normalizedConfig,
+                configPath: config.configPath,
                 logger: ssrLogger,
                 isSsr,
             }));

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

@@ -271,6 +271,7 @@ export interface ServiceConfig {
     server?: ServerConfig;
     lib?: never;
     verbose?: boolean;
+    configPath?: string;
 }
 export type NormalizedClientConfig = Omit<ClientConfig, 'publicPathPrefix' | 'publicPath' | 'assetsManifestFile' | 'hiddenSourceMap' | 'svgr' | 'lazyCompilation' | 'devServer' | 'disableForkTsChecker' | 'disableReactRefresh'> & {
     bundler: Bundler;

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

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

package/dist/common/webpack/compile.js

@@ -9,30 +9,42 @@ const core_1 = require("@rspack/core");
 const logger_1 = require("../logger");
 const config_1 = require("./config");
 const utils_1 = require("./utils");
-async function clientCompile(config) {
+async function clientCompile(config, configPath) {
     const logger = new logger_1.Logger('client', config.verbose);
     const webpackConfigs = [];
     const rspackConfigs = [];
     const isSsr = Boolean(config.ssr);
     if (config.bundler === 'rspack') {
-        rspackConfigs.push(await (0, config_1.rspackConfigFactory)({ webpackMode: "production" /* WebpackMode.Prod */, config, logger }));
+        rspackConfigs.push(await (0, config_1.rspackConfigFactory)({
+            webpackMode: "production" /* WebpackMode.Prod */,
+            config,
+            configPath,
+            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,
+                configPath,
                 logger: ssrLogger,
                 isSsr,
             }));
         }
     }
     else {
-        webpackConfigs.push(await (0, config_1.webpackConfigFactory)({ webpackMode: "production" /* WebpackMode.Prod */, config, logger }));
+        webpackConfigs.push(await (0, config_1.webpackConfigFactory)({
+            webpackMode: "production" /* WebpackMode.Prod */,
+            config,
+            configPath,
+            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,
+                configPath,
                 logger: ssrLogger,
                 isSsr,
             }));

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

@@ -13,6 +13,7 @@ export interface HelperOptions {
     entry?: string | string[] | Record<string, string | string[]>;
     entriesDirectory: string;
     isSsr: boolean;
+    configPath?: string;
 }
 export declare const enum WebpackMode {
     Prod = "production",
@@ -23,6 +24,7 @@ type ClientFactoryOptions = {
     config: NormalizedClientConfig;
     logger?: Logger;
     isSsr?: boolean;
+    configPath?: string;
 };
 export declare function webpackConfigFactory(options: ClientFactoryOptions): Promise<webpack.Configuration>;
 export declare function rspackConfigFactory(options: ClientFactoryOptions): Promise<Rspack.Configuration>;

package/dist/common/webpack/config.js

@@ -57,10 +57,9 @@ 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, }) {
+function getHelperOptions({ webpackMode, config, logger, isSsr = false, configPath, }) {
     const isEnvDevelopment = webpackMode === "development" /* WebpackMode.Dev */;
     const isEnvProduction = webpackMode === "production" /* WebpackMode.Prod */;
     return {
@@ -74,6 +73,7 @@ function getHelperOptions({ webpackMode, config, logger, isSsr = false, }) {
         entry: config.entry,
         entriesDirectory: isSsr ? paths_1.default.appSsrEntry : paths_1.default.appEntry,
         isSsr,
+        configPath,
     };
 }
 function configureExternals({ config, isSsr }) {
@@ -221,13 +221,10 @@ function configureWatchOptions({ config }) {
     delete watchOptions.watchPackages;
     return watchOptions;
 }
-function getCacheBuildDependencies({ config }) {
+function getCacheBuildDependencies({ config, configPath }) {
     const buildDependencies = {};
     const dependenciesGroups = {
-        appBuilderConfig: [
-            path.join(paths_1.default.app, 'app-builder.config.ts'),
-            path.join(paths_1.default.app, 'app-builder.config.js'),
-        ],
+        appBuilderConfig: configPath ? [configPath] : [],
         packageJson: [path.join(paths_1.default.app, 'package.json')],
         tsconfig: [
             path.join(paths_1.default.app, 'tsconfig.json'),
@@ -317,17 +314,22 @@ function configureRspackExperiments(options) {
             },
         };
     }
+    const filesystemCacheOptions = typeof config.cache === 'object' && config.cache.type === 'filesystem'
+        ? config.cache
+        : undefined;
+    const version = [filesystemCacheOptions?.name, filesystemCacheOptions?.version]
+        .filter(Boolean)
+        .join('-');
     return {
         cache: {
+            version: version || undefined,
             type: 'persistent',
             snapshot: {
                 managedPaths: config.watchOptions?.watchPackages ? [] : undefined,
             },
             storage: {
                 type: 'filesystem',
-                directory: typeof config.cache === 'object' && 'cacheDirectory' in config.cache
-                    ? config.cache.cacheDirectory
-                    : undefined,
+                directory: filesystemCacheOptions?.cacheDirectory,
             },
             buildDependencies: Object.values(getCacheBuildDependencies(options)).flat(),
         },
@@ -933,7 +935,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,
@@ -941,14 +943,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.23.1-beta.0",
+  "version": "0.24.1-beta.0",
   "description": "Develop and build your React client-server projects, powered by typescript and webpack",
   "license": "MIT",
   "type": "commonjs",
@@ -75,10 +75,10 @@
     "@rspack/core": "1.2.8",
     "@rspack/dev-server": "^1.0.10",
     "@rspack/plugin-react-refresh": "^1.0.1",
-    "@statoscope/webpack-plugin": "^5.28.2",
+    "@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;