@gravity-ui/app-builder 0.10.0 → 0.11.1

package/dist/common/webpack/config.js

@@ -26,12 +26,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.configureOptimization = exports.configureResolve = exports.configureModuleRules = exports.webpackConfigFactory = void 0;
+exports.webpackConfigFactory = webpackConfigFactory;
+exports.configureModuleRules = configureModuleRules;
+exports.configureResolve = configureResolve;
+exports.configureOptimization = configureOptimization;
 /* eslint-disable complexity */
 const path = __importStar(require("node:path"));
 const fs = __importStar(require("node:fs"));
 const webpack = __importStar(require("webpack"));
-const lodash_1 = __importDefault(require("lodash"));
 const clean_webpack_plugin_1 = require("clean-webpack-plugin");
 const webpack_manifest_plugin_1 = require("webpack-manifest-plugin");
 const fork_ts_checker_webpack_plugin_1 = __importDefault(require("fork-ts-checker-webpack-plugin"));
@@ -43,25 +45,22 @@ const moment_timezone_data_webpack_plugin_1 = __importDefault(require("moment-ti
 const webpack_plugin_1 = __importDefault(require("@statoscope/webpack-plugin"));
 const circular_dependency_plugin_1 = __importDefault(require("circular-dependency-plugin"));
 const paths_1 = __importDefault(require("../paths"));
-const tempData_1 = __importDefault(require("../tempData"));
 const babel_1 = require("../babel");
 const progress_plugin_1 = require("./progress-plugin");
 const utils_1 = require("./utils");
 const s3_upload_1 = require("../s3-upload");
 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 } = {}) {
     const isEnvDevelopment = webpackMode === "development" /* WebpackMode.Dev */;
     const isEnvProduction = webpackMode === "production" /* WebpackMode.Prod */;
-    const { updateIncludes, tsLinkedPackages } = updateIncludesFactory();
     const helperOptions = {
         config,
         logger,
         isEnvDevelopment,
         isEnvProduction,
-        updateIncludes,
-        tsLinkedPackages,
         configType: webpackMode,
     };
     let webpackConfig = {
@@ -99,7 +98,6 @@ async function webpackConfigFactory(webpackMode, config, { logger } = {}) {
     }
     return webpackConfig;
 }
-exports.webpackConfigFactory = webpackConfigFactory;
 function configureModuleRules(helperOptions, additionalRules = []) {
     const jsLoader = createJavaScriptLoader(helperOptions);
     return [
@@ -119,36 +117,6 @@ function configureModuleRules(helperOptions, additionalRules = []) {
         },
     ];
 }
-exports.configureModuleRules = configureModuleRules;
-function updateIncludesFactory() {
-    const { linkedPackages } = tempData_1.default.getSettings();
-    const linkedPackagesArr = linkedPackages
-        ? linkedPackages.keys.map((key) => linkedPackages.data[key])
-        : [];
-    if (linkedPackagesArr.length === 0) {
-        return {};
-    }
-    const tsLinkedPackages = linkedPackagesArr.filter(({ typescript }) => typescript);
-    const linkedPackagesJsIncludes = linkedPackagesArr.map((data) => `${data.package}/src`);
-    const linkedPackagesRootAssetsIncludes = linkedPackagesArr.map((data) => `${data.package}/assets`);
-    const linkedPackagesRootStylesIncludes = linkedPackagesArr.map((data) => `${data.package}/styles`);
-    return {
-        updateIncludes: (includes, options) => {
-            let result = includes.filter((pathname) => lodash_1.default.every(linkedPackagesArr, (linkedPackage) => 
-            // eslint-disable-next-line security/detect-non-literal-regexp
-            !new RegExp(linkedPackage.name).test(pathname)));
-            result = [...result, ...linkedPackagesJsIncludes];
-            if (options?.includeRootAssets) {
-                result = [...result, ...linkedPackagesRootAssetsIncludes];
-            }
-            if (options?.includeRootStyles) {
-                result = [...result, ...linkedPackagesRootStylesIncludes];
-            }
-            return result;
-        },
-        tsLinkedPackages,
-    };
-}
 function configureDevTool({ isEnvProduction, config }) {
     let format = 'cheap-module-source-map';
     if (isEnvProduction) {
@@ -197,7 +165,7 @@ function configureExperiments({ config, isEnvProduction, }) {
         lazyCompilation,
     };
 }
-function configureResolve({ isEnvProduction, config, tsLinkedPackages, }) {
+function configureResolve({ isEnvProduction, config }) {
     const alias = { ...config.alias };
     for (const [key, value] of Object.entries(alias)) {
         alias[key] = path.resolve(paths_1.default.app, value);
@@ -206,11 +174,6 @@ function configureResolve({ isEnvProduction, config, tsLinkedPackages, }) {
         alias['react-dom$'] = 'react-dom/profiling';
         alias['scheduler/tracing'] = 'scheduler/tracing-profiling';
     }
-    if (tsLinkedPackages) {
-        tsLinkedPackages.forEach(({ name }) => {
-            alias[`${name}$`] = `${name}/src`;
-        });
-    }
     const { aliases, modules = [] } = (0, utils_1.resolveTsconfigPathsToAlias)(path.resolve(paths_1.default.appClient, 'tsconfig.json')) || {};
     return {
         alias: {
@@ -223,7 +186,6 @@ function configureResolve({ isEnvProduction, config, tsLinkedPackages, }) {
         fallback: config.fallback,
     };
 }
-exports.configureResolve = configureResolve;
 function createEntryArray(entry) {
     return [require.resolve('./public-path'), entry];
 }
@@ -297,14 +259,14 @@ function createJavaScriptLoader({ isEnvProduction, isEnvDevelopment, configType,
         },
     };
 }
-function createJavaScriptRule({ updateIncludes = lodash_1.default.identity, config, isEnvProduction }, jsLoader) {
-    const include = updateIncludes([
+function createJavaScriptRule({ config, isEnvProduction }, jsLoader) {
+    const include = [
         paths_1.default.appClient,
         ...(config.monaco && isEnvProduction
             ? [path.resolve(paths_1.default.appNodeModules, 'monaco-editor/esm/vs')]
             : []),
         ...(config.includes || []),
-    ]);
+    ];
     return {
         test: [/\.[jt]sx?$/, /\.[cm]js$/],
         include,
@@ -456,12 +418,10 @@ function createIconsRule({ isEnvProduction, config }, jsLoader) {
             }),
     };
 }
-function createAssetsRules({ updateIncludes = lodash_1.default.identity, isEnvProduction, config, }) {
+function createAssetsRules({ isEnvProduction, config }) {
     const imagesRule = {
         test: /\.(ico|bmp|gif|jpe?g|png|svg)$/,
-        include: updateIncludes([paths_1.default.appClient, ...(config.images || [])], {
-            includeRootAssets: true,
-        }),
+        include: [paths_1.default.appClient, ...(config.images || [])],
         type: 'asset',
         parser: {
             dataUrlCondition: {
@@ -492,9 +452,7 @@ function createAssetsRules({ updateIncludes = lodash_1.default.identity, isEnvPr
         rules.unshift({
             test: /\.(ico|bmp|gif|jpe?g|png|svg)$/,
             issuer: /\.s?css$/,
-            include: updateIncludes([paths_1.default.appClient, ...(config.images || [])], {
-                includeRootAssets: true,
-            }),
+            include: [paths_1.default.appClient, ...(config.images || [])],
             type: 'asset',
             parser: {
                 dataUrlCondition: {
@@ -623,11 +581,11 @@ function configurePlugins(options) {
         }
         plugins.push(new circular_dependency_plugin_1.default(circularPluginOptions));
     }
-    if (!config.disableForkTsChecker && config.forkTsChecker !== false) {
+    if (config.forkTsChecker !== false) {
         plugins.push(new fork_ts_checker_webpack_plugin_1.default({
             ...config.forkTsChecker,
             typescript: {
-                typescriptPath: require.resolve(path.resolve(paths_1.default.appNodeModules, 'typescript')),
+                typescriptPath: (0, utils_2.resolveTypescript)(),
                 configFile: path.resolve(paths_1.default.app, 'src/ui/tsconfig.json'),
                 diagnosticOptions: {
                     syntactic: true,
@@ -647,7 +605,7 @@ function configurePlugins(options) {
             ignoreOrder: true,
         }));
         if (config.sentryConfig) {
-            const sentryPlugin = require('@sentry/webpack-plugin');
+            const sentryPlugin = require('@sentry/webpack-plugin').sentryWebpackPlugin;
             plugins.push(sentryPlugin({ ...config.sentryConfig }));
         }
         if (config.analyzeBundle === 'true') {
@@ -817,4 +775,3 @@ function configureOptimization({ config }) {
     };
     return optimization;
 }
-exports.configureOptimization = configureOptimization;

package/dist/common/webpack/lazy-client.js

@@ -1,7 +1,6 @@
 /* eslint-env browser */
 /* global __resourceQuery */
 'use strict';
-Object.defineProperty(exports, "__esModule", { value: true });
 if (typeof EventSource !== 'function') {
     throw new Error("Environment doesn't support lazy compilation (requires EventSource)");
 }
@@ -45,18 +44,19 @@ exports.keepAlive = function (options) {
         updateEventSource();
     }
     if (!active && !module.hot) {
+        // eslint-disable-next-line no-console
         console.log('Hot Module Replacement is not enabled. Waiting for process restart...');
     }
     return function () {
         errorHandlers.delete(onError);
         setTimeout(function () {
-            const value = activeKeys.get(data);
-            if (value === 1) {
+            const valueToReduce = activeKeys.get(data);
+            if (valueToReduce === 1) {
                 activeKeys.delete(data);
                 updateEventSource();
             }
             else {
-                activeKeys.set(data, value - 1);
+                activeKeys.set(data, valueToReduce - 1);
             }
         }, 1000);
     };

package/dist/common/webpack/progress-plugin.js

@@ -61,5 +61,6 @@ class ProgressPlugin extends webpack.ProgressPlugin {
 }
 exports.ProgressPlugin = ProgressPlugin;
 function hook(compiler, hookName, callback) {
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     compiler.hooks[hookName].tap(`app-builder: ${hookName}`, callback);
 }

package/dist/common/webpack/storybook.js

@@ -26,7 +26,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.configureWebpackConfigForStorybook = exports.configureServiceWebpackConfig = void 0;
+exports.configureServiceWebpackConfig = configureServiceWebpackConfig;
+exports.configureWebpackConfigForStorybook = configureWebpackConfigForStorybook;
 const path = __importStar(require("node:path"));
 const react_refresh_webpack_plugin_1 = __importDefault(require("@pmmmwh/react-refresh-webpack-plugin"));
 const mini_css_extract_plugin_1 = __importDefault(require("mini-css-extract-plugin"));
@@ -82,7 +83,6 @@ async function configureServiceWebpackConfig(mode, storybookConfig) {
         },
     };
 }
-exports.configureServiceWebpackConfig = configureServiceWebpackConfig;
 async function configureWebpackConfigForStorybook(mode, userConfig = {}, storybookModuleRules = []) {
     const isEnvDevelopment = mode === "development" /* WebpackMode.Dev */;
     const isEnvProduction = mode === "production" /* WebpackMode.Prod */;
@@ -109,7 +109,6 @@ async function configureWebpackConfigForStorybook(mode, userConfig = {}, storybo
         },
     };
 }
-exports.configureWebpackConfigForStorybook = configureWebpackConfigForStorybook;
 function configurePlugins({ isEnvDevelopment, isEnvProduction, config }) {
     const plugins = [];
     if (config.definitions) {

package/dist/common/webpack/utils.js

@@ -23,7 +23,8 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.resolveTsconfigPathsToAlias = exports.webpackCompilerHandlerFactory = void 0;
+exports.webpackCompilerHandlerFactory = webpackCompilerHandlerFactory;
+exports.resolveTsconfigPathsToAlias = resolveTsconfigPathsToAlias;
 const path = __importStar(require("node:path"));
 const fs = __importStar(require("node:fs"));
 const pretty_time_1 = require("../logger/pretty-time");
@@ -51,14 +52,13 @@ 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(1000000))}`);
+            logger.success(`Client was successfully compiled in ${(0, pretty_time_1.prettyTime)(BigInt(time) * BigInt(1_000_000))}`);
         }
         else {
             logger.success(`Client was successfully compiled`);
         }
     };
 }
-exports.webpackCompilerHandlerFactory = webpackCompilerHandlerFactory;
 const endStarRe = /\/?\*$/;
 function resolveTsconfigPathsToAlias(tsConfigPath) {
     if (!fs.existsSync(tsConfigPath) || !fs.statSync(tsConfigPath).isFile) {
@@ -84,7 +84,6 @@ function resolveTsconfigPathsToAlias(tsConfigPath) {
     }
     return { aliases, modules };
 }
-exports.resolveTsconfigPathsToAlias = resolveTsconfigPathsToAlias;
 function readJsonConfig(pathname) {
     try {
         const json = fs.readFileSync(pathname, 'utf-8');

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?: string | WorkerOptions);
+    constructor(url: string | URL, options?: WorkerOptions);
 }
 export { WebWorker as Worker, SharedWebWorker as SharedWorker };

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

@@ -1,4 +1,3 @@
-// @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/common/webpack/worker/worker-loader.js

@@ -93,7 +93,11 @@ const pitch = function (request) {
         }
         const cache = workerCompiler.getCache(pluginId);
         const cacheIdent = request;
-        const cacheETag = cache.getLazyHashedEtag(compilation.assets[filename]);
+        const objectToHash = compilation.assets[filename];
+        if (!objectToHash) {
+            throw new Error(`Asset ${filename} not found in compilation`);
+        }
+        const cacheETag = cache.getLazyHashedEtag(objectToHash);
         return cache.get(cacheIdent, cacheETag, (getCacheError, cacheContent) => {
             if (getCacheError) {
                 return cb(getCacheError);

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/dist/create-cli.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.createCli = void 0;
+exports.createCli = createCli;
 const yargs_1 = __importDefault(require("yargs"));
 const helpers_1 = require("yargs/helpers");
 const path = __importStar(require("node:path"));
@@ -34,7 +34,7 @@ const logger_1 = __importDefault(require("./common/logger"));
 const config_1 = require("./common/config");
 const models_1 = require("./common/models");
 function createCli(argv) {
-    const cli = (0, yargs_1.default)(argv).parserConfiguration({
+    const cli = (0, yargs_1.default)().parserConfiguration({
         'boolean-negation': false,
     });
     cli.scriptName('app-builder')
@@ -59,38 +59,39 @@ function createCli(argv) {
         describe: 'Configuration file to use',
     })
         .option('env', {
-        describe: 'Environment passed to the configuration when it is a function.',
+        describe: 'Environment passed to the configuration when it is a function. Ex. --env foo.bar=1 --env foo.baz=2 ',
         type: 'array',
         string: true,
         coerce: (args) => {
             if (!args) {
                 return {};
             }
+            // [foo.bar=1, foo.baz, bar=2, baz=] => {foo: {bar: 1, baz: true}, bar: 2, baz: undefined}
             return args.reduce((values, value) => {
-                if (value.endsWith('=')) {
-                    value = value.concat('""');
-                }
                 // This ensures we're only splitting by the first `=`
                 const [allKeys, val] = value.split(/[=](.+)/, 2);
                 if (typeof allKeys === 'string') {
                     const splitKeys = allKeys.split(/\.(?!$)/);
                     let prevRef = values;
                     splitKeys.forEach((someKey, index) => {
-                        if (!prevRef[someKey]) {
-                            prevRef[someKey] = {};
-                        }
-                        if (typeof prevRef[someKey] === 'string') {
-                            prevRef[someKey] = {};
-                        }
                         if (index === splitKeys.length - 1) {
                             if (typeof val === 'string') {
                                 prevRef[someKey] = val;
                             }
+                            else if (someKey.endsWith('=')) {
+                                prevRef[someKey.slice(0, -1)] = undefined;
+                            }
                             else {
                                 prevRef[someKey] = true;
                             }
                         }
-                        prevRef = prevRef[someKey];
+                        else {
+                            let nextRef = prevRef[someKey];
+                            if (!nextRef || typeof nextRef !== 'object') {
+                                nextRef = prevRef[someKey] = {};
+                            }
+                            prevRef = nextRef;
+                        }
                     });
                 }
                 return values;
@@ -108,13 +109,13 @@ function createCli(argv) {
             group: 'Server',
             type: 'number',
             describe: 'Opens a port for debugging',
-            coerce: (arg) => (arg === undefined ? null : arg),
+            coerce: (arg) => (arg === undefined ? true : arg),
         })
             .option('inspect-brk', {
             group: 'Server',
             type: 'number',
             describe: 'Opens a port for debugging. Will block until debugger is attached',
-            coerce: (arg) => (arg === undefined ? null : arg),
+            coerce: (arg) => (arg === undefined ? true : arg),
         })
             .option('entry-filter', {
             group: 'Client',
@@ -147,14 +148,6 @@ function createCli(argv) {
                 throw new Error('dev command can be used only for services, but got the library config');
             }
             process.env.NODE_ENV = process.env.NODE_ENV || 'development';
-            if (args.server) {
-                if (args.server.inspect !== undefined) {
-                    args.server.inspect = args.server.inspect || 9229;
-                }
-                if (args.server.inspectBrk !== undefined) {
-                    args.server.inspectBrk = args.server.inspectBrk || 9229;
-                }
-            }
             cmd(args);
             // Return an empty promise to prevent handlerP from exiting early.
             // The development server shouldn't ever exit until the user directly
@@ -213,7 +206,6 @@ function createCli(argv) {
         .recommendCommands()
         .parse((0, helpers_1.hideBin)(argv));
 }
-exports.createCli = createCli;
 function getVersionInfo() {
     const { version } = require('../package.json');
     return `app-builder CLI version: ${version}`;
@@ -244,7 +236,7 @@ function resolveLocalCommand(command) {
         if (cmd.__esModule) {
             cmd = cmd.default;
         }
-        if (cmd instanceof Function) {
+        if (typeof cmd === 'function') {
             return cmd;
         }
         return logger_1.default.panic(`Handler for command "${command}" is not a function.`);