@gravity-ui/app-builder 0.14.0-beta.1 → 0.14.0-beta.2

package/README.md

@@ -192,11 +192,8 @@ With this `{rootDir}/src/ui/tsconfig.json`:
 - `forkTsCheker` (`false | ForkTsCheckerWebpackPluginOptions`) - config for ForkTsCheckerWebpackPlugin [more](https://github.com/TypeStrong/fork-ts-checker-webpack-plugin#options). If `false`, ForkTsCheckerWebpackPlugin will be disabled.
 - `cache` (`boolean | FileCacheOptions | MemoryCacheOptions`) — Cache the generated webpack modules and chunks to improve build speed. [more](https://webpack.js.org/configuration/cache/)
 - `babelCacheDirectory` (`boolean | string`) — Set directory for babel-loader cache (`default: node_modules/.cache/babel-loader``)
-- `babel` (`(config: babel.TransformOptions, options: {configType: 'development' | 'production'; isSsr: boolean}) => babel.TransformOptions | Promise<babel.TransformOptions>`) - Allow override the default babel transform options.
-- `webpack` (`(config: webpack.Configuration, options: {configType: 'development' | 'production'; isSsr: boolean}) => webpack.Configuration | Promise<webpack.Configuration>`) - Allow override the default configuration.
-- `ssr` - build SSR bundle. The SSR entries should be inside `src/ui/ssr` directory and match the client entries.
-  - `noExternal` (`string | RegExp | (string | RegExp)[] | true`) - prevent listed dependencies from being externalized for SSR. By default, all dependencies are externalized.
-  - `moduleType`: (`'commonjs' | 'esm'`) - library type for the SSR bundle, by default `commonjs`.
+- `babel` (`(config: babel.TransformOptions, options: {configType: 'development' | 'production'}) => babel.TransformOptions | Promise<babel.TransformOptions>`) - Allow override the default babel transform options.
+- `webpack` (`(config: webpack.Configuration, options: {configType: 'development' | 'production'}) => webpack.Configuration | Promise<webpack.Configuration>`) - Allow override the default configuration.
 
 ##### Dev build
 

package/dist/commands/dev/client.js

@@ -40,6 +40,9 @@ const config_1 = require("../../common/webpack/config");
 async function watchClientCompilation(config, onManifestReady) {
     const clientCompilation = await buildWebpackServer(config);
     const compiler = clientCompilation.compiler;
+    if ('compilers' in compiler) {
+        throw new Error('Unexpected multi compiler');
+    }
     subscribeToManifestReadyEvent(compiler, onManifestReady);
     return clientCompilation;
 }
@@ -47,14 +50,7 @@ async function buildWebpackServer(config) {
     const logger = new logger_1.Logger('webpack', 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 }));
-    }
+    const webpackConfig = await (0, config_1.webpackConfigFactory)("development" /* WebpackMode.Dev */, normalizedConfig, { logger });
     const publicPath = path.normalize(config.client.publicPathPrefix + '/build/');
     const staticFolder = path.resolve(paths_1.default.appDist, 'public');
     const options = {
@@ -62,18 +58,7 @@ async function buildWebpackServer(config) {
         devMiddleware: {
             publicPath,
             stats: 'errors-warnings',
-            writeToDisk: (target) => {
-                if (writeToDisk === true) {
-                    return true;
-                }
-                if (isSsr && target.startsWith(paths_1.default.appSsrBuild)) {
-                    return true;
-                }
-                if (typeof writeToDisk === 'function') {
-                    return writeToDisk(target);
-                }
-                return false;
-            },
+            writeToDisk,
         },
         liveReload: false,
         hot: true,
@@ -131,7 +116,7 @@ async function buildWebpackServer(config) {
         });
     }
     options.proxy = proxy;
-    const compiler = (0, webpack_1.default)(webpackConfigs);
+    const compiler = (0, webpack_1.default)(webpackConfig);
     const server = new webpack_dev_server_1.default(options, compiler);
     try {
         await server.start();
@@ -144,28 +129,17 @@ async function buildWebpackServer(config) {
     }
     return server;
 }
-function subscribeToManifestReadyEvent(webpackCompiler, onManifestReady) {
+function subscribeToManifestReadyEvent(compiler, onManifestReady) {
     const promises = [];
-    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!');
-        }
-        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);
+    const assetsManifestPlugin = compiler.options.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);
     Promise.all(promises).then(() => onManifestReady());
 }

package/dist/commands/dev/index.js

@@ -56,7 +56,7 @@ async function default_1(config) {
                 script: `${serverPath}/index.js`,
                 args: ['--dev', config.server.port ? `--port=${config.server.port}` : ''],
                 env: {
-                    ...(config.server.port ? { APP_PORT: `${config.server.port}` } : undefined),
+                    ...(config.server.port ? { APP_PORT: config.server.port } : undefined),
                 },
                 nodeArgs: inspect || inspectBrk
                     ? [`--${inspect ? 'inspect' : 'inspect-brk'}=:::${inspect || inspectBrk}`]

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

@@ -1,13 +1,9 @@
 export declare function babelPreset(config: {
     newJsxTransform?: boolean;
-    isSsr?: boolean;
 }): (string | {
     env: {
         modules: boolean;
         bugfixes: boolean;
-        targets: {
-            node: string;
-        } | undefined;
     };
     runtime: {
         version: string;

package/dist/common/babel/index.js

@@ -5,11 +5,7 @@ function babelPreset(config) {
     return [
         require.resolve('./ui-preset'),
         {
-            env: {
-                modules: false,
-                bugfixes: true,
-                targets: config.isSsr ? { node: 'current' } : undefined,
-            },
+            env: { modules: false, bugfixes: true },
             runtime: { version: '^7.13.10' },
             typescript: true,
             react: {

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

@@ -180,23 +180,17 @@ export interface ClientConfig {
      */
     webpack?: (config: Configuration, options: {
         configType: `${WebpackMode}`;
-        isSsr?: boolean;
     }) => Configuration | Promise<Configuration>;
     /**
      * Modify or return a custom Babel config.
      */
     babel?: (config: Babel.TransformOptions, options: {
         configType: `${WebpackMode}`;
-        isSsr: boolean;
     }) => Babel.TransformOptions | Promise<Babel.TransformOptions>;
     /**
      * Modify or return a custom [Terser options](https://github.com/terser/terser#minify-options).
      */
     terser?: (options: TerserOptions) => TerserOptions;
-    ssr?: {
-        noExternal?: string | RegExp | (string | RegExp)[] | true;
-        moduleType?: 'commonjs' | 'esm';
-    };
 }
 export interface CdnUploadConfig {
     bucket: string;
@@ -236,12 +230,10 @@ export type NormalizedClientConfig = Omit<ClientConfig, 'publicPathPrefix' | 'hi
     verbose?: boolean;
     webpack: (config: Configuration, options: {
         configType: `${WebpackMode}`;
-        isSsr: boolean;
     }) => Configuration | Promise<Configuration>;
     debugWebpack?: boolean;
     babel: (config: Babel.TransformOptions, options: {
         configType: `${WebpackMode}`;
-        isSsr: boolean;
     }) => Babel.TransformOptions | Promise<Babel.TransformOptions>;
     reactRefresh: NonNullable<ClientConfig['reactRefresh']>;
 };

package/dist/common/paths.d.ts

@@ -7,8 +7,6 @@ declare const _default: {
     appDist: string;
     appRun: string;
     appBuild: string;
-    appSsrEntry: string;
-    appSsrBuild: string;
     src: string;
     libBuild: string;
     libBuildEsm: string;

package/dist/common/paths.js

@@ -36,8 +36,6 @@ exports.default = {
     appDist: resolveApp('dist'),
     appRun: resolveApp('dist/run'),
     appBuild: resolveApp('dist/public/build'),
-    appSsrEntry: resolveApp('src/ui/ssr'),
-    appSsrBuild: resolveApp('dist/ssr'),
     src: resolveApp('src'),
     libBuild: resolveApp('build'),
     libBuildEsm: resolveApp('build/esm'),

package/dist/common/webpack/compile.js

@@ -10,15 +10,10 @@ 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 })];
-    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 webpackConfig = await (0, config_1.webpackConfigFactory)("production" /* WebpackMode.Prod */, config, { logger });
     logger.verbose('Config created');
     return new Promise((resolve) => {
-        const compiler = (0, webpack_1.default)(webpackConfigs, (0, utils_1.webpackCompilerHandlerFactory)(logger, async () => {
+        const compiler = (0, webpack_1.default)(webpackConfig, (0, utils_1.webpackCompilerHandlerFactory)(logger, async () => {
             resolve();
         }));
         process.on('SIGINT', async () => {

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

@@ -7,20 +7,16 @@ export interface HelperOptions {
     isEnvDevelopment: boolean;
     isEnvProduction: boolean;
     configType: `${WebpackMode}`;
-    buildDirectory: string;
-    entriesDirectory: string;
-    isSsr: boolean;
 }
 export declare const enum WebpackMode {
     Prod = "production",
     Dev = "development"
 }
-export declare function webpackConfigFactory(webpackMode: WebpackMode, config: NormalizedClientConfig, { logger, isSsr }?: {
+export declare function webpackConfigFactory(webpackMode: WebpackMode, config: NormalizedClientConfig, { logger }?: {
     logger?: Logger;
-    isSsr?: boolean;
 }): Promise<webpack.Configuration>;
 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({ config }: HelperOptions): Optimization;
 export {};

package/dist/common/webpack/config.js

@@ -44,7 +44,6 @@ const react_refresh_webpack_plugin_1 = __importDefault(require("@pmmmwh/react-re
 const moment_timezone_data_webpack_plugin_1 = __importDefault(require("moment-timezone-data-webpack-plugin"));
 const webpack_plugin_1 = __importDefault(require("@statoscope/webpack-plugin"));
 const circular_dependency_plugin_1 = __importDefault(require("circular-dependency-plugin"));
-const webpack_node_externals_1 = __importDefault(require("webpack-node-externals"));
 const paths_1 = __importDefault(require("../paths"));
 const babel_1 = require("../babel");
 const progress_plugin_1 = require("./progress-plugin");
@@ -54,7 +53,7 @@ const log_config_1 = require("../logger/log-config");
 const utils_2 = require("../typescript/utils");
 const imagesSizeLimit = 2048;
 const fontSizeLimit = 8192;
-async function webpackConfigFactory(webpackMode, config, { logger, isSsr = false } = {}) {
+async function webpackConfigFactory(webpackMode, config, { logger } = {}) {
     const isEnvDevelopment = webpackMode === "development" /* WebpackMode.Dev */;
     const isEnvProduction = webpackMode === "production" /* WebpackMode.Prod */;
     const helperOptions = {
@@ -63,25 +62,11 @@ async function webpackConfigFactory(webpackMode, config, { logger, isSsr = false
         isEnvDevelopment,
         isEnvProduction,
         configType: webpackMode,
-        buildDirectory: isSsr ? paths_1.default.appSsrBuild : paths_1.default.appBuild,
-        entriesDirectory: isSsr ? paths_1.default.appSsrEntry : paths_1.default.appEntry,
-        isSsr,
     };
-    let externals = config.externals;
-    if (isSsr) {
-        externals =
-            config.ssr?.noExternal === true
-                ? undefined
-                : (0, webpack_node_externals_1.default)({
-                    allowlist: config.ssr?.noExternal,
-                    importType: config.ssr?.moduleType === 'esm' ? 'module' : 'commonjs',
-                });
-    }
     let webpackConfig = {
         mode: webpackMode,
         context: paths_1.default.app,
         bail: isEnvProduction,
-        target: isSsr ? 'node' : undefined,
         devtool: configureDevTool(helperOptions),
         entry: configureEntry(helperOptions),
         output: configureOutput(helperOptions),
@@ -91,7 +76,7 @@ async function webpackConfigFactory(webpackMode, config, { logger, isSsr = false
         },
         plugins: configurePlugins(helperOptions),
         optimization: configureOptimization(helperOptions),
-        externals,
+        externals: config.externals,
         node: config.node,
         watchOptions: configureWatchOptions(helperOptions),
         ignoreWarnings: [/Failed to parse source map/],
@@ -107,7 +92,7 @@ async function webpackConfigFactory(webpackMode, config, { logger, isSsr = false
         },
         cache: config.cache,
     };
-    webpackConfig = await config.webpack(webpackConfig, { configType: webpackMode, isSsr });
+    webpackConfig = await config.webpack(webpackConfig, { configType: webpackMode });
     if (config.debugWebpack) {
         (0, log_config_1.logConfig)('Preview webpack config', webpackConfig);
     }
@@ -150,10 +135,7 @@ function configureWatchOptions({ config }) {
     delete watchOptions.watchPackages;
     return watchOptions;
 }
-function configureExperiments({ config, isEnvProduction, isSsr, }) {
-    if (isSsr) {
-        return config.ssr?.moduleType === 'esm' ? { outputModule: true } : undefined;
-    }
+function configureExperiments({ config, isEnvProduction, }) {
     if (isEnvProduction) {
         return undefined;
     }
@@ -208,74 +190,61 @@ function createEntryArray(entry) {
     return [require.resolve('./public-path'), entry];
 }
 function addEntry(entry, file) {
+    const newEntry = path.resolve(paths_1.default.appEntry, file);
     return {
         ...entry,
-        [path.parse(file).name]: createEntryArray(file),
+        [path.parse(file).name]: createEntryArray(newEntry),
     };
 }
-function configureEntry({ config, entriesDirectory }) {
-    let entries = fs.readdirSync(entriesDirectory).filter((file) => /\.[jt]sx?$/.test(file));
+function configureEntry({ config }) {
+    let entries = fs.readdirSync(paths_1.default.appEntry).filter((file) => /\.[jt]sx?$/.test(file));
     if (Array.isArray(config.entryFilter) && config.entryFilter.length) {
         entries = entries.filter((entry) => config.entryFilter?.includes(entry.split('.')[0] ?? ''));
     }
     if (!entries.length) {
-        throw new Error('No entries were found after applying entry filter');
+        throw new Error('No entries were found after applying UI_CORE_ENTRY_FILTER');
     }
-    return entries.reduce((entry, file) => addEntry(entry, path.resolve(entriesDirectory, file)), {});
+    return entries.reduce((entry, file) => addEntry(entry, file), {});
 }
-function getFileNames({ isEnvProduction, isSsr, config }) {
-    let ext = 'js';
-    if (isSsr) {
-        ext = config.ssr?.moduleType === 'esm' ? 'mjs' : 'cjs';
-    }
+function getFileNames({ isEnvProduction }) {
     return {
-        filename: isEnvProduction ? `js/[name].[contenthash:8].${ext}` : `js/[name].${ext}`,
+        filename: isEnvProduction ? 'js/[name].[contenthash:8].js' : 'js/[name].js',
         chunkFilename: isEnvProduction
             ? 'js/[name].[contenthash:8].chunk.js'
             : 'js/[name].chunk.js',
     };
 }
-function configureOutput(options) {
-    let ssrOptions;
-    if (options.isSsr) {
-        ssrOptions = {
-            library: { type: options.config.ssr?.moduleType === 'esm' ? 'module' : 'commonjs2' },
-            chunkFormat: false,
-        };
-    }
+function configureOutput({ isEnvDevelopment, ...rest }) {
     return {
-        ...getFileNames(options),
-        path: options.buildDirectory,
-        pathinfo: options.isEnvDevelopment,
-        ...ssrOptions,
+        ...getFileNames({ isEnvDevelopment, ...rest }),
+        path: paths_1.default.appBuild,
+        pathinfo: isEnvDevelopment,
     };
 }
-function createJavaScriptLoader({ isEnvProduction, isEnvDevelopment, configType, config, isSsr, }) {
+function createJavaScriptLoader({ isEnvProduction, isEnvDevelopment, configType, config, }) {
     const plugins = [];
-    if (!isSsr) {
-        if (isEnvDevelopment && config.reactRefresh !== false) {
-            plugins.push([
-                require.resolve('react-refresh/babel'),
-                config.devServer?.webSocketPath
-                    ? {
-                        overlay: {
-                            sockPath: config.devServer.webSocketPath,
-                        },
-                    }
-                    : undefined,
-            ]);
-        }
-        if (isEnvProduction) {
-            plugins.push([
-                require.resolve('babel-plugin-import'),
-                { libraryName: 'lodash', libraryDirectory: '', camel2DashComponentName: false },
-            ]);
-        }
+    if (isEnvDevelopment && config.reactRefresh !== false) {
+        plugins.push([
+            require.resolve('react-refresh/babel'),
+            config.devServer?.webSocketPath
+                ? {
+                    overlay: {
+                        sockPath: config.devServer.webSocketPath,
+                    },
+                }
+                : undefined,
+        ]);
+    }
+    if (isEnvProduction) {
+        plugins.push([
+            require.resolve('babel-plugin-import'),
+            { libraryName: 'lodash', libraryDirectory: '', camel2DashComponentName: false },
+        ]);
     }
     const transformOptions = config.babel({
-        presets: [(0, babel_1.babelPreset)({ newJsxTransform: config.newJsxTransform, isSsr })],
+        presets: [(0, babel_1.babelPreset)(config)],
         plugins,
-    }, { configType, isSsr });
+    }, { configType });
     return {
         loader: require.resolve('babel-loader'),
         options: {
@@ -370,7 +339,7 @@ function createStylesRule(options) {
         use: loaders,
     };
 }
-function getCssLoaders({ isEnvDevelopment, isEnvProduction, config, isSsr }, additionalRules) {
+function getCssLoaders({ isEnvDevelopment, isEnvProduction, config }, additionalRules) {
     const loaders = [];
     if (!config.transformCssWithLightningCss) {
         loaders.push({
@@ -393,32 +362,27 @@ function getCssLoaders({ isEnvDevelopment, isEnvProduction, config, isSsr }, add
     loaders.unshift({
         loader: require.resolve('css-loader'),
         options: {
+            esModule: false,
             sourceMap: !config.disableSourceMapGeneration,
             importLoaders,
             modules: {
                 auto: true,
                 localIdentName: '[name]__[local]--[hash:base64:5]',
                 exportLocalsConvention: 'camelCase',
-                exportOnlyLocals: isSsr,
             },
         },
     });
     if (isEnvProduction) {
-        loaders.unshift({ loader: mini_css_extract_plugin_1.default.loader, options: { emit: !isSsr } });
+        loaders.unshift(mini_css_extract_plugin_1.default.loader);
     }
     if (isEnvDevelopment) {
-        if (isSsr || config.ssr) {
-            loaders.unshift({ loader: mini_css_extract_plugin_1.default.loader, options: { emit: !isSsr } });
-        }
-        else {
-            loaders.unshift({
-                loader: require.resolve('style-loader'),
-            });
-        }
+        loaders.unshift({
+            loader: require.resolve('style-loader'),
+        });
     }
     return loaders;
 }
-function createIconsRule({ isEnvProduction, config, isSsr }, jsLoader) {
+function createIconsRule({ isEnvProduction, config }, jsLoader) {
     const iconIncludes = config.icons || [];
     return {
         // eslint-disable-next-line security/detect-unsafe-regex
@@ -455,12 +419,11 @@ function createIconsRule({ isEnvProduction, config, isSsr }, jsLoader) {
                 generator: {
                     filename: 'assets/images/[name].[contenthash:8][ext]',
                     publicPath: isEnvProduction ? '../' : undefined,
-                    emit: isSsr ? false : undefined,
                 },
             }),
     };
 }
-function createAssetsRules({ isEnvProduction, config, isSsr }) {
+function createAssetsRules({ isEnvProduction, config }) {
     const imagesRule = {
         test: /\.(ico|bmp|gif|jpe?g|png|svg)$/,
         include: [paths_1.default.appClient, ...(config.images || [])],
@@ -472,7 +435,6 @@ function createAssetsRules({ isEnvProduction, config, isSsr }) {
         },
         generator: {
             filename: 'assets/images/[name].[contenthash:8][ext]',
-            emit: isSsr ? false : undefined,
         },
     };
     const fontsRule = {
@@ -486,7 +448,6 @@ function createAssetsRules({ isEnvProduction, config, isSsr }) {
         },
         generator: {
             filename: 'assets/fonts/[name].[contenthash:8][ext]',
-            emit: isSsr ? false : undefined,
         },
     };
     const rules = [imagesRule, fontsRule];
@@ -506,7 +467,6 @@ function createAssetsRules({ isEnvProduction, config, isSsr }) {
             generator: {
                 filename: 'assets/images/[name].[contenthash:8][ext]',
                 publicPath: '../',
-                emit: isSsr ? false : undefined,
             },
         }, {
             test: /\.(ttf|eot|woff2?)$/,
@@ -521,19 +481,17 @@ function createAssetsRules({ isEnvProduction, config, isSsr }) {
             generator: {
                 filename: 'assets/fonts/[name].[contenthash:8][ext]',
                 publicPath: '../',
-                emit: isSsr ? false : undefined,
             },
         });
     }
     return rules;
 }
-function createFallbackRules({ isEnvProduction, isSsr }) {
+function createFallbackRules({ isEnvProduction }) {
     const rules = [
         {
             type: 'asset/resource',
             generator: {
                 filename: 'assets/[name].[contenthash:8][ext]',
-                emit: isSsr ? false : undefined,
             },
             exclude: [/\.[jt]sx?$/, /\.json$/, /\.[cm]js$/, /\.ejs$/],
         },
@@ -548,7 +506,6 @@ function createFallbackRules({ isEnvProduction, isSsr }) {
             generator: {
                 filename: 'assets/[name].[contenthash:8][ext]',
                 publicPath: '../',
-                emit: isSsr ? false : undefined,
             },
         });
     }
@@ -563,7 +520,7 @@ function createMomentTimezoneDataPlugin(options = {}) {
     return new moment_timezone_data_webpack_plugin_1.default({ ...options, startYear, endYear });
 }
 function configurePlugins(options) {
-    const { isEnvDevelopment, isEnvProduction, config, isSsr } = options;
+    const { isEnvDevelopment, isEnvProduction, config } = options;
     const excludeFromClean = config.excludeFromClean || [];
     const manifestFile = 'assets-manifest.json';
     const plugins = [
@@ -587,11 +544,11 @@ function configurePlugins(options) {
             : {
                 entrypoints: true,
                 writeToDisk: true,
-                output: path.resolve(options.buildDirectory, manifestFile),
+                output: path.resolve(paths_1.default.appBuild, manifestFile),
             }),
+        createMomentTimezoneDataPlugin(config.momentTz),
         new webpack.DefinePlugin({
             'process.env.NODE_ENV': JSON.stringify(process.env.NODE_ENV),
-            'process.env.IS_SSR': JSON.stringify(isSsr),
             ...config.definitions,
         }),
     ];
@@ -601,12 +558,51 @@ function configurePlugins(options) {
     if (process.env.WEBPACK_PROFILE === 'true') {
         plugins.push(new webpack.debug.ProfilingPlugin());
     }
+    const contextReplacement = config.contextReplacement || {};
+    plugins.push(new webpack.ContextReplacementPlugin(/moment[\\/]locale$/, 
+    // eslint-disable-next-line security/detect-non-literal-regexp
+    new RegExp(`^\\./(${(contextReplacement.locale || ['ru']).join('|')})$`)));
+    plugins.push(new webpack.ContextReplacementPlugin(/dayjs[\\/]locale$/, 
+    // eslint-disable-next-line security/detect-non-literal-regexp
+    new RegExp(`^\\./(${(contextReplacement.locale || ['ru']).join('|')})\\.js$`)));
+    if (contextReplacement['highlight.js']) {
+        plugins.push(new webpack.ContextReplacementPlugin(/highlight\.js[\\/]lib[\\/]languages$/, 
+        // eslint-disable-next-line security/detect-non-literal-regexp
+        new RegExp(`^\\./(${contextReplacement['highlight.js'].join('|')})$`)));
+    }
+    if (config.monaco) {
+        const MonacoEditorWebpackPlugin = require('monaco-editor-webpack-plugin');
+        plugins.push(new MonacoEditorWebpackPlugin({
+            filename: isEnvProduction ? '[name].[hash:8].worker.js' : undefined,
+            ...config.monaco,
+            // currently, workers located on cdn are not working properly, so we are enforcing loading workers from
+            // service instead
+            publicPath: path.normalize(config.publicPathPrefix + '/build/'),
+        }));
+    }
+    if (isEnvDevelopment && config.reactRefresh !== false) {
+        const { webSocketPath = path.normalize(`/${config.publicPathPrefix}/build/sockjs-node`) } = config.devServer || {};
+        plugins.push(new react_refresh_webpack_plugin_1.default(config.reactRefresh({
+            overlay: { sockPath: webSocketPath },
+            exclude: [/node_modules/, /\.worker\.[jt]sx?$/],
+        })));
+    }
+    if (config.detectCircularDependencies) {
+        let circularPluginOptions = {
+            exclude: /node_modules/,
+            allowAsyncCycles: true,
+        };
+        if (typeof config.detectCircularDependencies === 'object') {
+            circularPluginOptions = config.detectCircularDependencies;
+        }
+        plugins.push(new circular_dependency_plugin_1.default(circularPluginOptions));
+    }
     if (config.forkTsChecker !== false) {
         plugins.push(new fork_ts_checker_webpack_plugin_1.default({
             ...config.forkTsChecker,
             typescript: {
                 typescriptPath: (0, utils_2.resolveTypescript)(),
-                configFile: path.resolve(paths_1.default.appClient, 'tsconfig.json'),
+                configFile: path.resolve(paths_1.default.app, 'src/ui/tsconfig.json'),
                 diagnosticOptions: {
                     syntactic: true,
                 },
@@ -615,17 +611,19 @@ function configurePlugins(options) {
             },
         }));
     }
-    if (config.detectCircularDependencies) {
-        let circularPluginOptions = {
-            exclude: /node_modules/,
-            allowAsyncCycles: true,
-        };
-        if (typeof config.detectCircularDependencies === 'object') {
-            circularPluginOptions = config.detectCircularDependencies;
-        }
-        plugins.push(new circular_dependency_plugin_1.default(circularPluginOptions));
+    if (config.polyfill?.process) {
+        plugins.push(new webpack.ProvidePlugin({ process: 'process/browser.js' }));
     }
     if (isEnvProduction) {
+        plugins.push(new mini_css_extract_plugin_1.default({
+            filename: 'css/[name].[contenthash:8].css',
+            chunkFilename: 'css/[name].[contenthash:8].chunk.css',
+            ignoreOrder: true,
+        }));
+        if (config.sentryConfig) {
+            const sentryPlugin = require('@sentry/webpack-plugin').sentryWebpackPlugin;
+            plugins.push(sentryPlugin({ ...config.sentryConfig }));
+        }
         if (config.analyzeBundle === 'true') {
             plugins.push(new webpack_bundle_analyzer_1.BundleAnalyzerPlugin({
                 openAnalyzer: false,
@@ -636,8 +634,8 @@ function configurePlugins(options) {
         if (config.analyzeBundle === 'statoscope') {
             const customStatoscopeConfig = config.statoscopeConfig || {};
             plugins.push(new webpack_plugin_1.default({
-                saveReportTo: path.resolve(options.buildDirectory, 'report.html'),
-                saveStatsTo: path.resolve(options.buildDirectory, 'stats.json'),
+                saveReportTo: path.resolve(paths_1.default.appBuild, 'report.html'),
+                saveStatsTo: path.resolve(paths_1.default.appBuild, 'stats.json'),
                 open: false,
                 statsOptions: {
                     all: true,
@@ -646,104 +644,50 @@ function configurePlugins(options) {
             }));
         }
     }
-    if (isEnvProduction || isSsr || config.ssr) {
-        plugins.push(new mini_css_extract_plugin_1.default({
-            filename: isEnvProduction ? 'css/[name].[contenthash:8].css' : 'css/[name].css',
-            chunkFilename: isEnvProduction
-                ? 'css/[name].[contenthash:8].chunk.css'
-                : 'css/[name].chunk.css',
-            ignoreOrder: true,
-        }));
-    }
-    if (!isSsr) {
-        if (config.monaco) {
-            const MonacoEditorWebpackPlugin = require('monaco-editor-webpack-plugin');
-            plugins.push(new MonacoEditorWebpackPlugin({
-                filename: isEnvProduction ? '[name].[hash:8].worker.js' : undefined,
-                ...config.monaco,
-                // currently, workers located on cdn are not working properly, so we are enforcing loading workers from
-                // service instead
-                publicPath: path.normalize(config.publicPathPrefix + '/build/'),
-            }));
+    if (config.cdn) {
+        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 contextReplacement = config.contextReplacement || {};
-        plugins.push(createMomentTimezoneDataPlugin(config.momentTz));
-        plugins.push(new webpack.ContextReplacementPlugin(/moment[\\/]locale$/, 
-        // eslint-disable-next-line security/detect-non-literal-regexp
-        new RegExp(`^\\./(${(contextReplacement.locale || ['ru']).join('|')})$`)));
-        plugins.push(new webpack.ContextReplacementPlugin(/dayjs[\\/]locale$/, 
-        // eslint-disable-next-line security/detect-non-literal-regexp
-        new RegExp(`^\\./(${(contextReplacement.locale || ['ru']).join('|')})\\.js$`)));
-        if (contextReplacement['highlight.js']) {
-            plugins.push(new webpack.ContextReplacementPlugin(/highlight\.js[\\/]lib[\\/]languages$/, 
-            // eslint-disable-next-line security/detect-non-literal-regexp
-            new RegExp(`^\\./(${contextReplacement['highlight.js'].join('|')})$`)));
-        }
-        if (isEnvDevelopment && config.reactRefresh !== false) {
-            const { webSocketPath = path.normalize(`/${config.publicPathPrefix}/build/sockjs-node`), } = config.devServer || {};
-            plugins.push(new react_refresh_webpack_plugin_1.default(config.reactRefresh({
-                overlay: { sockPath: webSocketPath },
-                exclude: [/node_modules/, /\.worker\.[jt]sx?$/],
-            })));
-        }
-        if (config.polyfill?.process) {
-            plugins.push(new webpack.ProvidePlugin({ process: 'process/browser.js' }));
-        }
-        if (isEnvProduction) {
-            if (config.sentryConfig) {
-                const sentryPlugin = require('@sentry/webpack-plugin').sentryWebpackPlugin;
-                plugins.push(sentryPlugin({ ...config.sentryConfig }));
+        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;
             }
-        }
-        if (config.cdn) {
-            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,
+            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,
                 };
             }
-            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,
-                }));
-            }
+            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;
 }
-function configureOptimization({ config, isSsr }) {
-    if (isSsr) {
-        return {};
-    }
+function configureOptimization({ config }) {
     const configVendors = config.vendors ?? [];
     let vendorsList = [
         'react',

package/dist/common/webpack/public-path.js

@@ -1,4 +1,3 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-// @ts-expect-error
-__webpack_public_path__ = globalThis.__PUBLIC_PATH__ ?? '/build/';
+__webpack_public_path__ = window.__PUBLIC_PATH__ ?? '/build/';

package/dist/common/webpack/storybook.js

@@ -35,7 +35,6 @@ const css_minimizer_webpack_plugin_1 = __importDefault(require("css-minimizer-we
 const config_1 = require("./config");
 const config_2 = require("../config");
 const models_1 = require("../models");
-const paths_1 = __importDefault(require("../paths"));
 async function configureServiceWebpackConfig(mode, storybookConfig) {
     const serviceConfig = await (0, config_2.getProjectConfig)(mode === "production" /* WebpackMode.Prod */ ? 'build' : 'dev', {
         storybook: true,
@@ -105,9 +104,6 @@ async function configureWebpackConfigForStorybook(mode, userConfig = {}, storybo
         isEnvProduction,
         config: config.client,
         configType: mode,
-        buildDirectory: paths_1.default.appBuild,
-        entriesDirectory: paths_1.default.appEntry,
-        isSsr: false,
     };
     return {
         module: {

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

@@ -1,6 +1,6 @@
 import type webpack from 'webpack';
 import type { Logger } from '../logger';
-export declare function webpackCompilerHandlerFactory(logger: Logger, onCompilationEnd?: () => void): (err?: Error | null, stats?: webpack.MultiStats) => Promise<void>;
+export declare function webpackCompilerHandlerFactory(logger: Logger, onCompilationEnd?: () => void): (err?: Error | null, stats?: webpack.Stats) => Promise<void>;
 export declare function resolveTsconfigPathsToAlias(tsConfigPath: string): {
     aliases: Record<string, string[]>;
     modules: string[];

package/dist/common/webpack/utils.js

@@ -50,16 +50,11 @@ function webpackCompilerHandlerFactory(logger, onCompilationEnd) {
         if (onCompilationEnd) {
             await onCompilationEnd();
         }
-        const [clientStats, ssrStats] = stats?.stats ?? [];
-        if (clientStats) {
-            const time = clientStats.endTime - clientStats.startTime;
+        if (stats) {
+            const time = stats.endTime - stats.startTime;
             logger.success(`Client was successfully compiled in ${(0, pretty_time_1.prettyTime)(BigInt(time) * BigInt(1_000_000))}`);
         }
-        if (ssrStats) {
-            const time = ssrStats.endTime - ssrStats.startTime;
-            logger.success(`SSR: Client was successfully compiled in ${(0, pretty_time_1.prettyTime)(BigInt(time) * BigInt(1_000_000))}`);
-        }
-        if (!clientStats && !ssrStats) {
+        else {
             logger.success(`Client was successfully compiled`);
         }
     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gravity-ui/app-builder",
-  "version": "0.14.0-beta.1",
+  "version": "0.14.0-beta.2",
   "description": "Develop and build your React client-server projects, powered by typescript and webpack",
   "license": "MIT",
   "type": "commonjs",
@@ -129,7 +129,6 @@
     "webpack-bundle-analyzer": "^4.10.2",
     "webpack-dev-server": "^5.1.0",
     "webpack-manifest-plugin": "^5.0.0",
-    "webpack-node-externals": "^3.0.0",
     "worker-loader": "^3.0.8",
     "yargs": "^17.7.2"
   },
@@ -153,7 +152,6 @@
     "@types/webpack-assets-manifest": "^5.1.4",
     "@types/webpack-bundle-analyzer": "^4.7.0",
     "@types/webpack-manifest-plugin": "^3.0.8",
-    "@types/webpack-node-externals": "^3.0.4",
     "@types/yargs": "17.0.11",
     "babel-plugin-tester": "^11.0.4",
     "eslint": "^8.57.0",