@gravity-ui/app-builder 0.10.0-beta.0 → 0.10.0

package/dist/commands/dev/client.js

@@ -81,36 +81,38 @@ async function buildWebpackServer(config) {
     if (!listenOn) {
         options.ipc = path.resolve(paths_1.default.appDist, 'run/client.sock');
     }
-    const proxy = options.proxy || [];
     if (config.client.lazyCompilation) {
-        proxy.push({
-            context: ['/build/lazy'],
-            target: `http://localhost:${config.client.lazyCompilation.port}`,
-            pathRewrite: { '^/build/lazy': '' },
-        });
+        options.proxy = {
+            ...options.proxy,
+            '/build/lazy': {
+                target: `http://localhost:${config.client.lazyCompilation.port}`,
+                pathRewrite: { '^/build/lazy': '' },
+            },
+        };
     }
     if (config.server.port) {
-        proxy.push({
-            context: ['/'],
-            target: `http://localhost:${config.server.port}`,
-            bypass: (req) => {
-                if (req.method !== 'GET' && req.method !== 'HEAD') {
-                    return null;
-                }
-                const pathname = req.path.replace(/^\//, '');
-                const filepath = path.resolve(paths_1.default.appDist, 'public', pathname);
-                if (!fs.existsSync(filepath)) {
-                    return null;
-                }
-                const stat = fs.statSync(filepath);
-                if (!stat.isFile()) {
-                    return null;
-                }
-                return req.path;
+        options.proxy = {
+            ...options.proxy,
+            '/': {
+                target: `http://localhost:${config.server.port}`,
+                bypass: (req) => {
+                    if (req.method !== 'GET' && req.method !== 'HEAD') {
+                        return null;
+                    }
+                    const pathname = req.path.replace(/^\//, '');
+                    const filepath = path.resolve(paths_1.default.appDist, 'public', pathname);
+                    if (!fs.existsSync(filepath)) {
+                        return null;
+                    }
+                    const stat = fs.statSync(filepath);
+                    if (!stat.isFile()) {
+                        return null;
+                    }
+                    return req.path;
+                },
             },
-        });
+        };
     }
-    options.proxy = proxy;
     const compiler = (0, webpack_1.default)(webpackConfig);
     const server = new webpack_dev_server_1.default(options, compiler);
     try {

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';
@@ -392,6 +392,11 @@ function getCssLoaders({ isEnvDevelopment, isEnvProduction, config }) {
             esModule: false,
             sourceMap: !config.disableSourceMapGeneration,
             importLoaders: 2,
+            modules: {
+                auto: true,
+                localIdentName: '[name]__[local]--[hash:base64:5]',
+                exportLocalsConvention: 'camelCase',
+            },
         },
     });
     if (!config.transformCssWithLightningCss) {
@@ -812,3 +817,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/dist/common/webpack/utils.js

@@ -51,7 +51,7 @@ function webpackCompilerHandlerFactory(logger, onCompilationEnd) {
         }
         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))}`);
+            logger.success(`Client was successfully compiled in ${(0, pretty_time_1.prettyTime)(BigInt(time) * BigInt(1000000))}`);
         }
         else {
             logger.success(`Client was successfully compiled`);

package/dist/common/webpack/worker/web-worker.d.mts

@@ -3,6 +3,6 @@ declare class WebWorker extends Worker {
     constructor(url: string | URL, options?: WorkerOptions);
 }
 declare class SharedWebWorker extends SharedWorkerPolyfill {
-    constructor(url: string | URL, options?: WorkerOptions);
+    constructor(url: string | URL, options?: string | WorkerOptions);
 }
 export { WebWorker as Worker, SharedWebWorker as SharedWorker };

package/dist/common/webpack/worker/web-worker.mjs

@@ -1,3 +1,4 @@
+// @ts-expect-error ts does not find types in @okikio/sharedworker/@types/index.d.ts
 import { SharedWorkerPolyfill } from '@okikio/sharedworker';
 class WebWorker extends Worker {
     constructor(url, options) {

package/dist/create-cli.d.ts

@@ -2,11 +2,11 @@ export type CliArgs = Awaited<ReturnType<typeof createCli>>;
 export declare function createCli(argv: string[]): {
     [x: string]: unknown;
     verbose: boolean | undefined;
+    c: unknown;
     cdn: string | undefined;
     env: string[] | undefined;
     target: "client" | "server" | undefined;
     inspect: number | undefined;
-    c: unknown;
     inspectBrk: number | undefined;
     "inspect-brk": number | undefined;
     entryFilter: string[] | undefined;
@@ -30,11 +30,11 @@ export declare function createCli(argv: string[]): {
 } | Promise<{
     [x: string]: unknown;
     verbose: boolean | undefined;
+    c: unknown;
     cdn: string | undefined;
     env: string[] | undefined;
     target: "client" | "server" | undefined;
     inspect: number | undefined;
-    c: unknown;
     inspectBrk: number | undefined;
     "inspect-brk": number | undefined;
     entryFilter: string[] | undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gravity-ui/app-builder",
-  "version": "0.10.0-beta.0",
+  "version": "0.10.0",
   "description": "Develop and build your React client-server projects, powered by typescript and webpack",
   "license": "MIT",
   "type": "commonjs",
@@ -44,7 +44,7 @@
   },
   "homepage": "https://github.com/gravity-ui/app-builder#readme",
   "scripts": {
-    "prepare": "husky",
+    "prepare": "husky install",
     "lint": "run-p lint:*",
     "lint:js": "eslint --ext .js,.ts --report-unused-disable-directives .",
     "lint:other": "npm run prettier -- --check",
@@ -58,20 +58,20 @@
   },
   "dependencies": {
     "@aws-sdk/client-s3": "^3.353.0",
-    "@babel/core": "^7.24.0",
-    "@babel/helper-plugin-utils": "^7.24.0",
-    "@babel/plugin-transform-class-properties": "^7.24.0",
-    "@babel/plugin-transform-dynamic-import": "^7.24.0",
-    "@babel/plugin-transform-modules-commonjs": "^7.24.0",
-    "@babel/plugin-transform-private-methods": "^7.24.0",
-    "@babel/plugin-transform-runtime": "^7.24.0",
-    "@babel/preset-env": "^7.24.0",
-    "@babel/preset-react": "^7.24.0",
-    "@babel/preset-typescript": "^7.24.0",
-    "@babel/runtime": "^7.24.0",
-    "@okikio/sharedworker": "^1.0.7",
-    "@pmmmwh/react-refresh-webpack-plugin": "^0.5.13",
-    "@statoscope/webpack-plugin": "^5.28.2",
+    "@babel/core": "^7.23.4",
+    "@babel/helper-plugin-utils": "^7.22.5",
+    "@babel/plugin-transform-class-properties": "^7.22.5",
+    "@babel/plugin-transform-dynamic-import": "^7.22.0",
+    "@babel/plugin-transform-modules-commonjs": "^7.23.4",
+    "@babel/plugin-transform-private-methods": "^7.24.1",
+    "@babel/plugin-transform-runtime": "^7.22.0",
+    "@babel/preset-env": "^7.22.0",
+    "@babel/preset-react": "^7.22.0",
+    "@babel/preset-typescript": "^7.23.4",
+    "@babel/runtime": "^7.23.4",
+    "@okikio/sharedworker": "^1.0.4",
+    "@pmmmwh/react-refresh-webpack-plugin": "^0.5.11",
+    "@statoscope/webpack-plugin": "^5.27.0",
     "@svgr/core": "^8.1.0",
     "@svgr/plugin-jsx": "^8.1.0",
     "@svgr/webpack": "^8.1.0",
@@ -79,92 +79,92 @@
     "babel-plugin-import": "^1.13.8",
     "babel-plugin-inline-react-svg": "^2.0.2",
     "babel-plugin-transform-react-remove-prop-types": "^0.4.24",
-    "browserslist": "^4.23.0",
+    "browserslist": "^4.21.10",
     "chalk": "^4.1.2",
     "circular-dependency-plugin": "^5.2.2",
     "clean-webpack-plugin": "^4.0.0",
     "clear": "^0.1.0",
     "common-tags": "^1.8.2",
-    "cosmiconfig": "^8.3.6",
+    "cosmiconfig": "^8.1.3",
     "cosmiconfig-typescript-loader": "^5.0.0",
-    "css-loader": "^7.1.1",
-    "css-minimizer-webpack-plugin": "^6.0.0",
-    "dotenv": "^16.4.5",
+    "css-loader": "^6.8.1",
+    "css-minimizer-webpack-plugin": "^5.0.1",
+    "dotenv": "^16.3.1",
     "execa": "^5.1.1",
-    "fast-glob": "^3.3.2",
+    "fast-glob": "^3.3.1",
     "file-type": "^16.5.3",
     "find-cache-dir": "^3.3.2",
-    "fork-ts-checker-webpack-plugin": "^9.0.2",
-    "fs-extra": "^11.2.0",
-    "get-port": "^7.1.0",
+    "fork-ts-checker-webpack-plugin": "^8.0.0",
+    "fs-extra": "^11.1.1",
+    "get-port": "^7.0.0",
     "lodash": "^4.17.21",
     "mime-types": "^2.1.35",
-    "mini-css-extract-plugin": "^2.9.0",
+    "mini-css-extract-plugin": "^2.8.1",
     "moment-timezone-data-webpack-plugin": "^1.5.1",
-    "nodemon": "^3.1.0",
+    "nodemon": "^3.0.1",
     "p-map": "^4.0.0",
     "p-queue": "^6.6.2",
-    "pino-pretty": "^11.0.0",
-    "postcss": "^8.4.38",
-    "postcss-loader": "^8.1.1",
+    "pino-pretty": "^10.2.0",
+    "postcss": "^8.4.23",
+    "postcss-loader": "^7.3.3",
     "postcss-preset-env": "^9.1.3",
-    "react": "^18.3.1",
-    "react-dom": "^18.3.1",
-    "react-refresh": "^0.14.2",
+    "react": "^18.2.0",
+    "react-dom": "^18.2.0",
+    "react-refresh": "^0.14.0",
     "resolve-url-loader": "^5.0.0",
-    "rimraf": "^5.0.5",
-    "sass": "^1.75.0",
-    "sass-loader": "^14.2.1",
-    "semver": "^7.6.0",
+    "rimraf": "^5.0.1",
+    "sass": "^1.69.0",
+    "sass-loader": "^13.3.2",
+    "semver": "^7.5.4",
     "signal-exit": "^4.1.0",
-    "source-map-loader": "^5.0.0",
+    "source-map-loader": "^4.0.1",
     "strip-ansi": "^6.0.1",
-    "style-loader": "^4.0.0",
-    "svgo": "^3.2.0",
+    "style-loader": "^3.3.3",
+    "svgo": "^3.0.2",
     "terser-webpack-plugin": "5.3.10",
     "ts-node": "10.9.2",
     "tslib": "^2.6.2",
-    "typescript": "^5.4.5",
+    "typescript": "^5.3.3",
     "webpack": "^5.91.0",
     "webpack-assets-manifest": "^5.2.1",
-    "webpack-bundle-analyzer": "^4.10.2",
-    "webpack-dev-server": "^5.0.4",
+    "webpack-bundle-analyzer": "^4.10.1",
+    "webpack-dev-server": "^4.15.1",
     "webpack-manifest-plugin": "^5.0.0",
     "worker-loader": "^3.0.8",
     "yargs": "^17.7.2"
   },
   "devDependencies": {
-    "@commitlint/cli": "^19.3.0",
-    "@commitlint/config-conventional": "^19.2.2",
-    "@gravity-ui/eslint-config": "^3.2.0",
+    "@commitlint/cli": "^17.7.1",
+    "@commitlint/config-conventional": "^17.7.0",
+    "@gravity-ui/eslint-config": "^3.0.0",
     "@gravity-ui/prettier-config": "^1.1.0",
     "@gravity-ui/tsconfig": "^1.0.0",
     "@sentry/webpack-plugin": "^2.7.1",
-    "@types/babel__helper-plugin-utils": "^7.10.3",
-    "@types/circular-dependency-plugin": "^5.0.8",
-    "@types/common-tags": "^1.8.4",
+    "@types/babel__helper-plugin-utils": "^7.10.1",
+    "@types/circular-dependency-plugin": "^5.0.6",
+    "@types/common-tags": "^1.8.2",
     "@types/find-cache-dir": "^3.2.1",
-    "@types/fs-extra": "^11.0.4",
+    "@types/fs-extra": "^11.0.2",
     "@types/jest": "^29.5.2",
-    "@types/lodash": "^4.17.0",
-    "@types/mime-types": "^2.1.4",
+    "@types/lodash": "^4.14.198",
+    "@types/mime-types": "^2.1.1",
     "@types/node": "^18",
-    "@types/nodemon": "^1.19.6",
-    "@types/semver": "^7.5.8",
-    "@types/webpack-assets-manifest": "^5.1.4",
-    "@types/webpack-bundle-analyzer": "^4.7.0",
-    "@types/webpack-manifest-plugin": "^3.0.8",
+    "@types/nodemon": "^1.19.2",
+    "@types/semver": "^7.5.2",
+    "@types/webpack-assets-manifest": "^5.1.0",
+    "@types/webpack-bundle-analyzer": "^4.6.0",
+    "@types/webpack-manifest-plugin": "^3.0.5",
     "@types/yargs": "17.0.11",
     "babel-plugin-tester": "^11.0.4",
     "eslint": "^8.49.0",
-    "husky": "^9.0.11",
+    "husky": "^8.0.3",
     "jest": "^29.5.0",
     "lightningcss": "^1.21.5",
     "monaco-editor-webpack-plugin": "^6.0.0",
     "nano-staged": "^0.8.0",
     "npm-run-all": "^4.1.5",
-    "prettier": "3.2.5",
-    "ts-jest": "^29.1.2"
+    "prettier": "3.0.3",
+    "ts-jest": "^29.1.0"
   },
   "peerDependencies": {
     "@sentry/webpack-plugin": "^2.7.1",
@@ -189,5 +189,8 @@
     "*.{md,yaml,yml,json}": [
       "prettier --write"
     ]
+  },
+  "overrides": {
+    "cosmiconfig-typescript-loader": "^5.0.0"
   }
 }