@gravity-ui/app-builder 0.9.3 → 0.9.5

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

@@ -12,7 +12,15 @@ function buildServer(config) {
     (0, utils_1.createRunFolder)();
     return new Promise((resolve, reject) => {
         const build = new controllable_script_1.ControllableScript(`
-        const ts = require('typescript');
+        let ts;
+        try {
+            ts = require('typescript');
+        } catch (e) {
+            if (e.code !== 'MODULE_NOT_FOUND') {
+                throw e;
+            }
+            ts = require(${JSON.stringify(require.resolve('typescript'))});
+        }
         const {Logger} = require(${JSON.stringify(require.resolve('../../../common/logger'))});
         const {compile} = require(${JSON.stringify(require.resolve('../../../common/typescript/compile'))});
 

package/dist/commands/dev/server.js

@@ -37,7 +37,15 @@ function watchServerCompilation(config) {
     rimraf_1.rimraf.sync(serverPath);
     (0, utils_1.createRunFolder)();
     const build = new controllable_script_1.ControllableScript(`
-        const ts = require('typescript');
+        let ts;
+        try {
+            ts = require('typescript');
+        } catch (e) {
+            if (e.code !== 'MODULE_NOT_FOUND') {
+                throw e;
+            }
+            ts = require(${JSON.stringify(require.resolve('typescript'))});
+        }
         const {Logger} = require(${JSON.stringify(require.resolve('../../common/logger'))});
         const {watch} = require(${JSON.stringify(require.resolve('../../common/typescript/watch'))});
 
@@ -50,7 +58,7 @@ function watchServerCompilation(config) {
                 onAfterFilesEmitted: () => {
                     process.send({type: 'Emitted'});
                 },
-                enableSourceMap: ${config.server.inspect || config.server.inspectBrk ? 'true' : 'false'}
+                enableSourceMap: true
             }
         );
         `, null);

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

@@ -20,5 +20,8 @@ export declare const enum WebpackMode {
 export declare function webpackConfigFactory(webpackMode: WebpackMode, config: NormalizedClientConfig, { logger }?: {
     logger?: Logger;
 }): Promise<webpack.Configuration>;
-export declare function configureModuleRules(helperOptions: HelperOptions): webpack.RuleSetRule[];
+export declare function configureModuleRules(helperOptions: HelperOptions, additionalRules?: NonNullable<webpack.RuleSetRule['oneOf']>): webpack.RuleSetRule[];
 export declare function configureResolve({ isEnvProduction, config, tsLinkedPackages, }: HelperOptions): webpack.ResolveOptions;
+type Optimization = NonNullable<webpack.Configuration['optimization']>;
+export declare function configureOptimization({ config }: HelperOptions): Optimization;
+export {};

package/dist/common/webpack/config.js

@@ -26,7 +26,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.configureResolve = exports.configureModuleRules = exports.webpackConfigFactory = void 0;
+exports.configureOptimization = exports.configureResolve = exports.configureModuleRules = exports.webpackConfigFactory = void 0;
 /* eslint-disable complexity */
 const path = __importStar(require("node:path"));
 const fs = __importStar(require("node:fs"));
@@ -100,7 +100,7 @@ async function webpackConfigFactory(webpackMode, config, { logger } = {}) {
     return webpackConfig;
 }
 exports.webpackConfigFactory = webpackConfigFactory;
-function configureModuleRules(helperOptions) {
+function configureModuleRules(helperOptions, additionalRules = []) {
     const jsLoader = createJavaScriptLoader(helperOptions);
     return [
         ...createSourceMapRules(!helperOptions.config.disableSourceMapGeneration),
@@ -113,6 +113,7 @@ function configureModuleRules(helperOptions) {
                 createIconsRule(helperOptions), // workaround for https://github.com/webpack/webpack/issues/9309
                 createIconsRule(helperOptions, jsLoader),
                 ...createAssetsRules(helperOptions),
+                ...additionalRules,
                 ...createFallbackRules(helperOptions),
             ],
         },
@@ -197,11 +198,10 @@ function configureExperiments({ config, isEnvProduction, }) {
     };
 }
 function configureResolve({ isEnvProduction, config, tsLinkedPackages, }) {
-    let alias = config.alias || {};
-    alias = Object.entries(alias).reduce((result, [key, value]) => {
-        result[key] = path.resolve(paths_1.default.app, value);
-        return result;
-    }, {});
+    const alias = { ...config.alias };
+    for (const [key, value] of Object.entries(alias)) {
+        alias[key] = path.resolve(paths_1.default.app, value);
+    }
     if (isEnvProduction && config.reactProfiling) {
         alias['react-dom$'] = 'react-dom/profiling';
         alias['scheduler/tracing'] = 'scheduler/tracing-profiling';
@@ -812,3 +812,4 @@ function configureOptimization({ config }) {
     };
     return optimization;
 }
+exports.configureOptimization = configureOptimization;

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

@@ -3,11 +3,15 @@ import type { ClientConfig } from '../models';
 import type * as Webpack from 'webpack';
 type Mode = `${WebpackMode}`;
 export declare function configureServiceWebpackConfig(mode: Mode, storybookConfig: Webpack.Configuration): Promise<Webpack.Configuration>;
-export declare function configureWebpackConfigForStorybook(mode: Mode, userConfig?: ClientConfig): Promise<{
+type ModuleRule = NonNullable<NonNullable<Webpack.Configuration['module']>['rules']>[number];
+export declare function configureWebpackConfigForStorybook(mode: Mode, userConfig?: ClientConfig, storybookModuleRules?: ModuleRule[]): Promise<{
     module: {
         rules: Webpack.RuleSetRule[];
     };
     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;
+    };
 }>;
 export {};

package/dist/common/webpack/storybook.js

@@ -48,7 +48,7 @@ async function configureServiceWebpackConfig(mode, storybookConfig) {
     else {
         options = serviceConfig.client;
     }
-    const webpackConfig = await configureWebpackConfigForStorybook(mode, options);
+    const webpackConfig = await configureWebpackConfigForStorybook(mode, options, storybookConfig.module?.rules);
     return {
         ...storybookConfig,
         plugins: [...(storybookConfig.plugins ?? []), ...webpackConfig.plugins],
@@ -67,15 +67,23 @@ async function configureServiceWebpackConfig(mode, storybookConfig) {
                 ...(storybookConfig.resolve?.extensions ?? []),
                 ...(webpackConfig.resolve.extensions || []),
             ],
+            fallback: {
+                ...storybookConfig.resolve?.fallback,
+                ...webpackConfig.resolve.fallback,
+            },
         },
         module: {
             ...storybookConfig.module,
             rules: webpackConfig.module.rules,
         },
+        optimization: {
+            ...storybookConfig.optimization,
+            ...webpackConfig.optimization,
+        },
     };
 }
 exports.configureServiceWebpackConfig = configureServiceWebpackConfig;
-async function configureWebpackConfigForStorybook(mode, userConfig = {}) {
+async function configureWebpackConfigForStorybook(mode, userConfig = {}, storybookModuleRules = []) {
     const isEnvDevelopment = mode === "development" /* WebpackMode.Dev */;
     const isEnvProduction = mode === "production" /* WebpackMode.Prod */;
     const config = await (0, config_2.normalizeConfig)({
@@ -92,10 +100,13 @@ async function configureWebpackConfigForStorybook(mode, userConfig = {}) {
     };
     return {
         module: {
-            rules: (0, config_1.configureModuleRules)(helperOptions),
+            rules: (0, config_1.configureModuleRules)(helperOptions, storybookModuleRules.filter((rule) => rule !== '...')),
         },
         resolve: (0, config_1.configureResolve)(helperOptions),
         plugins: configurePlugins(helperOptions),
+        optimization: {
+            minimizer: (0, config_1.configureOptimization)(helperOptions).minimizer,
+        },
     };
 }
 exports.configureWebpackConfigForStorybook = configureWebpackConfigForStorybook;
@@ -116,7 +127,7 @@ function configurePlugins({ isEnvDevelopment, isEnvProduction, config }) {
             publicPath: '/',
         }));
     }
-    if (isEnvDevelopment) {
+    if (isEnvDevelopment && !config.disableReactRefresh) {
         plugins.push(new react_refresh_webpack_plugin_1.default());
     }
     if (isEnvProduction) {

package/package.json

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