@gravity-ui/app-builder 0.23.1-beta.0 → 0.24.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

@@ -60,7 +60,7 @@ 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 +74,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 +222,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 +315,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(),
         },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gravity-ui/app-builder",
-  "version": "0.23.1-beta.0",
+  "version": "0.24.0",
   "description": "Develop and build your React client-server projects, powered by typescript and webpack",
   "license": "MIT",
   "type": "commonjs",