@gravity-ui/app-builder 0.11.2 → 0.12.0

package/README.md

@@ -205,7 +205,7 @@ With this `{rootDir}/src/ui/tsconfig.json`:
   - `options` (`import('https').ServerOptions`) — allow to provide your own certificate.
 - `watchOptions` — a set of options used to customize watch mode, [more](https://webpack.js.org/configuration/watch/#watchoptions)
   - `watchPackages` (`boolean`) - watch all changes in `node_modules`.
-- `disableReactRefresh` (`boolean`) — disable `react-refresh` in dev mode.
+- `reactRefresh` (`false | (options: ReactRefreshPluginOptions) => ReactRefreshPluginOptions`) — disable or configure `react-refresh` in dev mode, [more](https://github.com/pmmmwh/react-refresh-webpack-plugin/blob/main/docs/API.md#options)
 - `detectCircularDependencies` (`true | CircularDependenciesOptions`) - detect modules with circular dependencies, [more](https://github.com/aackerman/circular-dependency-plugin)
 - `lazyCompilation` (`true | LazyCompilationConfig`) — enable experimental [lazy compilation](https://webpack.js.org/configuration/experiments/#experimentslazycompilation) feature
   - `true` — enable feature
@@ -244,8 +244,8 @@ With this `{rootDir}/src/ui/tsconfig.json`:
 
 - `monaco` (`object`) — use [monaco-editor-webpack-plugin](https://github.com/microsoft/monaco-editor/tree/main/webpack-plugin#monaco-editor-webpack-loader-plugin)
 
-  - `fileName` (`string`) — custom filename template for worker scripts
-  - `languages` (`string[]`) - include only a subset of the languages supported.
+  - `fileName` (`string`) — custom filename template for worker scripts.
+  - `languages` (`string[]`) - include only a subset of the languages supported. If you don't need support for all languages, set needed languages explicitly, since it may significantly affect build time.
   - `features` (`string[]`) - include only a subset of the editor features.
   - `customLanguages` (`IFeatureDefinition[]`) - include custom languages (outside of the ones shipped with the `monaco-editor`).
 

package/dist/common/config.js

@@ -28,6 +28,7 @@ var __importDefault = (this && this.__importDefault) || function (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");
@@ -183,6 +184,9 @@ async function normalizeClientConfig(client, mode) {
     const normalizedConfig = {
         ...client,
         forkTsChecker: client.disableForkTsChecker ? false : client.forkTsChecker,
+        reactRefresh: client.disableReactRefresh
+            ? false
+            : client.reactRefresh ?? ((options) => options),
         newJsxTransform: client.newJsxTransform ?? true,
         publicPathPrefix: client.publicPathPrefix || '',
         modules: client.modules && remapPaths(client.modules),

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

@@ -13,6 +13,7 @@ import type { SentryWebpackPluginOptions } from '@sentry/webpack-plugin';
 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';
 export interface Entities<T> {
     data: Record<string, T>;
     keys: string[];
@@ -129,9 +130,13 @@ export interface ClientConfig {
     statoscopeConfig?: Partial<StatoscopeOptions>;
     reactProfiling?: boolean;
     /**
-     *  Disable react-refresh in dev mode
+     * Disable react-refresh in dev mode
+     *
+     * @deprecated use `reactRefresh: false` instead
      */
     disableReactRefresh?: boolean;
+    /** Disable or configure react-refresh in dev mode */
+    reactRefresh?: false | ((options: ReactRefreshPluginOptions) => ReactRefreshPluginOptions);
     /**
      * Detect modules with circular dependencies
      */
@@ -213,7 +218,7 @@ export interface ServiceConfig {
     lib?: never;
     verbose?: boolean;
 }
-export type NormalizedClientConfig = Omit<ClientConfig, 'publicPathPrefix' | 'hiddenSourceMap' | 'svgr' | 'lazyCompilation' | 'devServer' | 'disableForkTsChecker'> & {
+export type NormalizedClientConfig = Omit<ClientConfig, 'publicPathPrefix' | 'hiddenSourceMap' | 'svgr' | 'lazyCompilation' | 'devServer' | 'disableForkTsChecker' | 'disableReactRefresh'> & {
     publicPathPrefix: string;
     hiddenSourceMap: boolean;
     svgr: NonNullable<ClientConfig['svgr']>;
@@ -230,6 +235,7 @@ export type NormalizedClientConfig = Omit<ClientConfig, 'publicPathPrefix' | 'hi
     babel: (config: Babel.TransformOptions, options: {
         configType: `${WebpackMode}`;
     }) => Babel.TransformOptions | Promise<Babel.TransformOptions>;
+    reactRefresh: NonNullable<ClientConfig['reactRefresh']>;
 };
 export type NormalizedServerConfig = Omit<ServerConfig, 'port' | 'inspect' | 'inspectBrk'> & {
     port?: number;

package/dist/common/webpack/config.js

@@ -223,7 +223,7 @@ function configureOutput({ isEnvDevelopment, ...rest }) {
 }
 function createJavaScriptLoader({ isEnvProduction, isEnvDevelopment, configType, config, }) {
     const plugins = [];
-    if (isEnvDevelopment && !config.disableReactRefresh) {
+    if (isEnvDevelopment && config.reactRefresh !== false) {
         plugins.push([
             require.resolve('react-refresh/babel'),
             config.devServer?.webSocketPath
@@ -564,12 +564,12 @@ function configurePlugins(options) {
             publicPath: path.normalize(config.publicPathPrefix + '/build/'),
         }));
     }
-    if (isEnvDevelopment && !config.disableReactRefresh) {
+    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({
+        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 = {

package/dist/common/webpack/storybook.js

@@ -133,8 +133,8 @@ function configurePlugins({ isEnvDevelopment, isEnvProduction, config }) {
             publicPath: '/',
         }));
     }
-    if (isEnvDevelopment && !config.disableReactRefresh) {
-        plugins.push(new react_refresh_webpack_plugin_1.default());
+    if (isEnvDevelopment && config.reactRefresh !== false) {
+        plugins.push(new react_refresh_webpack_plugin_1.default(config.reactRefresh({})));
     }
     if (isEnvProduction) {
         plugins.push(new mini_css_extract_plugin_1.default({

package/dist/common/webpack/worker/worker-loader.js

@@ -73,13 +73,15 @@ const pitch = function (request) {
     configureSourceMap(workerCompiler);
     const cb = this.async();
     workerCompiler.compile((err, compilation) => {
-        if (!compilation) {
-            return undefined;
+        if (compilation) {
+            workerCompiler.parentCompilation?.children.push(compilation);
         }
-        workerCompiler.parentCompilation?.children.push(compilation);
         if (err) {
             return cb(err);
         }
+        if (!compilation) {
+            return cb(new Error('Child compilation failed'));
+        }
         if (compilation.errors && compilation.errors.length) {
             const errorDetails = compilation.errors
                 .map((error) => {
@@ -95,7 +97,7 @@ const pitch = function (request) {
         const cacheIdent = request;
         const objectToHash = compilation.assets[filename];
         if (!objectToHash) {
-            throw new Error(`Asset ${filename} not found in compilation`);
+            return cb(new Error(`Asset ${filename} not found in compilation`));
         }
         const cacheETag = cache.getLazyHashedEtag(objectToHash);
         return cache.get(cacheIdent, cacheETag, (getCacheError, cacheContent) => {

package/package.json

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