@gravity-ui/app-builder 0.10.0 → 0.11.0

package/dist/common/logger/index.js

@@ -88,12 +88,15 @@ class Logger {
     };
     logError = (errorMeta, error) => {
         this.error(errorMeta);
-        if (error) {
-            const { name, message, stack } = error;
-            this.error(name);
-            this.error(message);
-            if (stack) {
-                this.error(stack);
+        if (error && typeof error === 'object') {
+            if ('name' in error && typeof error.name === 'string') {
+                this.error(error.name);
+            }
+            if ('message' in error && typeof error.message === 'string') {
+                this.error(error.message);
+            }
+            if ('stack' in error && typeof error.stack === 'string') {
+                this.error(error.stack);
             }
         }
     };

package/dist/common/logger/log-config.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.logConfig = void 0;
+exports.logConfig = logConfig;
+/* eslint-disable no-console */
 const colors_1 = require("./colors");
 function logConfig(caption, config) {
     console.log(colors_1.colors.cyan(caption));
     console.dir(config, { depth: Infinity });
 }
-exports.logConfig = logConfig;

package/dist/common/logger/pretty-time.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.prettyTime = exports.elapsedTime = void 0;
+exports.elapsedTime = elapsedTime;
+exports.prettyTime = prettyTime;
 const scale = {
     w: BigInt(6048e11),
     d: BigInt(864e11),
@@ -15,7 +16,6 @@ function elapsedTime(time, smallest = 'ms') {
     const elapsed = process.hrtime.bigint() - time;
     return prettyTime(elapsed, smallest);
 }
-exports.elapsedTime = elapsedTime;
 function prettyTime(time, smallest = 'ms') {
     let elapsed = time;
     let res = '';
@@ -48,4 +48,3 @@ function prettyTime(time, smallest = 'ms') {
     }
     return res || '0ms';
 }
-exports.prettyTime = prettyTime;

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

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import type { EditorLanguage } from 'monaco-editor-webpack-plugin/out/languages';
 import type { EditorFeature } from 'monaco-editor-webpack-plugin/out/features';
 import type { IFeatureDefinition } from 'monaco-editor-webpack-plugin/out/types';
@@ -18,20 +17,13 @@ export interface Entities<T> {
     data: Record<string, T>;
     keys: string[];
 }
-export interface LinkedPackage {
-    name: string;
-    location: string;
-    nodeModules: string[];
-    package?: string;
-    restorePackageFrom?: string;
-    typescript?: boolean;
-}
 interface DevServerConfig {
     ipc?: string;
     port?: number | true;
     webSocketPath?: string;
     type?: 'https';
     options?: import('https').ServerOptions;
+    writeToDisk?: boolean | ((targetPath: string) => boolean);
 }
 interface ContextReplacement {
     'highlight.js'?: string[];
@@ -211,8 +203,8 @@ export interface ServerConfig {
     port?: number | true;
     watch?: string[];
     watchThrottle?: number;
-    inspect?: number;
-    inspectBrk?: number;
+    inspect?: number | true;
+    inspectBrk?: number | true;
 }
 export interface ServiceConfig {
     target?: 'client' | 'server';
@@ -221,14 +213,14 @@ export interface ServiceConfig {
     lib?: never;
     verbose?: boolean;
 }
-export type NormalizedClientConfig = Omit<ClientConfig, 'publicPathPrefix' | 'hiddenSourceMap' | 'svgr' | 'lazyCompilation' | 'devServer'> & {
+export type NormalizedClientConfig = Omit<ClientConfig, 'publicPathPrefix' | 'hiddenSourceMap' | 'svgr' | 'lazyCompilation' | 'devServer' | 'disableForkTsChecker'> & {
     publicPathPrefix: string;
     hiddenSourceMap: boolean;
     svgr: NonNullable<ClientConfig['svgr']>;
     lazyCompilation?: LazyCompilationConfig;
-    devServer: Omit<DevServerConfig, 'port' | 'type' | 'options'> & {
+    devServer?: Omit<DevServerConfig, 'port' | 'type' | 'options'> & {
         port?: number;
-        server: ServerConfiguration;
+        server?: ServerConfiguration;
     };
     verbose?: boolean;
     webpack: (config: Configuration, options: {
@@ -239,17 +231,20 @@ export type NormalizedClientConfig = Omit<ClientConfig, 'publicPathPrefix' | 'hi
         configType: `${WebpackMode}`;
     }) => Babel.TransformOptions | Promise<Babel.TransformOptions>;
 };
-export type NormalizedServerConfig = Omit<ServerConfig, 'serverPort'> & {
-    serverPort?: number;
+export type NormalizedServerConfig = Omit<ServerConfig, 'port' | 'inspect' | 'inspectBrk'> & {
+    port?: number;
     verbose?: boolean;
+    inspect?: number;
+    inspectBrk?: number;
 };
 export type NormalizedServiceConfig = Omit<ServiceConfig, 'client' | 'server'> & {
     client: NormalizedClientConfig;
     server: NormalizedServerConfig;
 };
-export type ProjectConfig = {} & (ServiceConfig | LibraryConfig);
+export type ProjectConfig = ServiceConfig | LibraryConfig;
+export type NormalizedConfig = NormalizedServiceConfig | LibraryConfig;
 export type AppBuilderConfigPackage = (options?: unknown) => ProjectConfig;
-export type ProjectFileConfig = ProjectConfig | ((mode: 'dev' | 'build', env?: Record<string, any>) => ProjectConfig | Promise<ProjectConfig>);
+export type ProjectFileConfig = ProjectConfig | ((mode: 'dev' | 'build', env?: Record<string, string | boolean | {} | undefined>) => ProjectConfig | Promise<ProjectConfig>);
 export declare function isServiceConfig(config: ProjectConfig): config is ServiceConfig;
 export declare function isLibraryConfig(config: ProjectConfig): config is LibraryConfig;
 export declare function defineConfig(config: ProjectFileConfig): ProjectFileConfig;

package/dist/common/models/index.js

@@ -1,15 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.defineConfig = exports.isLibraryConfig = exports.isServiceConfig = void 0;
+exports.isServiceConfig = isServiceConfig;
+exports.isLibraryConfig = isLibraryConfig;
+exports.defineConfig = defineConfig;
 function isServiceConfig(config) {
     return !('lib' in config);
 }
-exports.isServiceConfig = isServiceConfig;
 function isLibraryConfig(config) {
     return 'lib' in config;
 }
-exports.isLibraryConfig = isLibraryConfig;
 function defineConfig(config) {
     return config;
 }
-exports.defineConfig = defineConfig;

package/dist/common/s3-upload/compress.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.brotli = exports.gzip = void 0;
+exports.gzip = gzip;
+exports.brotli = brotli;
 const node_fs_1 = require("node:fs");
 const zlib_1 = require("zlib");
 function compressor(sourcePath, destinationPath, transformer) {
@@ -16,8 +17,6 @@ function compressor(sourcePath, destinationPath, transformer) {
 function gzip(sourcePath) {
     return compressor(sourcePath, `${sourcePath}.gz`, (0, zlib_1.createGzip)({}));
 }
-exports.gzip = gzip;
 function brotli(sourcePath) {
     return compressor(sourcePath, `${sourcePath}.br`, (0, zlib_1.createBrotliCompress)());
 }
-exports.brotli = brotli;

package/dist/common/s3-upload/s3-client.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import type { PutObjectCommandInput, S3ClientConfig } from '@aws-sdk/client-s3';
 export type S3ClientOptions = S3ClientConfig;
 export declare function getS3Client(options: S3ClientOptions): {

package/dist/common/s3-upload/s3-client.js

@@ -22,17 +22,12 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getS3Client = void 0;
+exports.getS3Client = getS3Client;
 const fs = __importStar(require("fs/promises"));
 const path = __importStar(require("node:path"));
 const client_s3_1 = require("@aws-sdk/client-s3");
-const file_type_1 = require("file-type");
 const mime = __importStar(require("mime-types"));
-const p_map_1 = __importDefault(require("p-map"));
 const fast_glob_1 = require("fast-glob");
 function getS3Client(options) {
     const s3Client = new client_s3_1.S3Client(options);
@@ -69,9 +64,10 @@ function getS3Client(options) {
             }
             return s3Client.send(new client_s3_1.PutObjectCommand(params));
         },
-        uploadDir(bucket, dirPath, keyPrefix = '', { concurrency = 512, ...opts } = {}) {
+        async uploadDir(bucket, dirPath, keyPrefix = '', { concurrency = 512, ...opts } = {}) {
             const files = (0, fast_glob_1.globSync)('**', { cwd: dirPath });
-            return (0, p_map_1.default)(files, (filePath) => {
+            const { default: pMap } = await import('p-map');
+            return pMap(files, (filePath) => {
                 const sourcePath = path.join(dirPath, filePath);
                 return this.uploadFile(bucket, sourcePath, keyPrefix + filePath, opts);
             }, { concurrency });
@@ -81,9 +77,9 @@ function getS3Client(options) {
         },
     };
 }
-exports.getS3Client = getS3Client;
 async function detectContentTypeFromBuffer(buffer) {
-    const type = await (0, file_type_1.fromBuffer)(buffer);
+    const { fileTypeFromBuffer } = await import('file-type');
+    const type = await fileTypeFromBuffer(buffer);
     if (!type) {
         throw Error('Cannot detect content type for buffer');
     }
@@ -97,10 +93,8 @@ async function detectContentTypeFromBuffer(buffer) {
 }
 function detectContentTypeFromExt(filePath) {
     // Compressed file Content-type must be the same as original file Content-type
-    if (filePath.endsWith('.br') || filePath.endsWith('.gz')) {
-        filePath = filePath.slice(0, -3);
-    }
-    let contentType = mime.lookup(filePath);
+    const filename = filePath.endsWith('.br') || filePath.endsWith('.gz') ? filePath.slice(0, -3) : filePath;
+    let contentType = mime.lookup(filename);
     if (!contentType) {
         throw Error(`Cannot detect content type for file ${filePath}`);
     }

package/dist/common/s3-upload/upload.js

@@ -26,16 +26,16 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.uploadFiles = void 0;
+exports.uploadFiles = uploadFiles;
 const path = __importStar(require("node:path"));
-const p_queue_1 = __importDefault(require("p-queue"));
 const index_js_1 = __importDefault(require("../logger/index.js"));
 const s3_client_js_1 = require("./s3-client.js");
 const compress_js_1 = require("./compress.js");
-function uploadFiles(files, config) {
+async function uploadFiles(files, config) {
     const s3Client = (0, s3_client_js_1.getS3Client)(config.s3);
     const log = config.logger ?? index_js_1.default;
-    const queue = new p_queue_1.default({
+    const { default: PQueue } = await import('p-queue');
+    const queue = new PQueue({
         concurrency: config.concurrency ?? 512,
     });
     const processFile = fileProcessor(config.options);
@@ -95,7 +95,11 @@ function uploadFiles(files, config) {
         };
     }
     function compress(sourcePath) {
-        return [queue.add(() => (0, compress_js_1.gzip)(sourcePath)), queue.add(() => (0, compress_js_1.brotli)(sourcePath))];
+        // throwOnTimeout is only used to get the correct type and does not change behavior since we are not setting a timeout.
+        return [
+            queue.add(() => (0, compress_js_1.gzip)(sourcePath), { throwOnTimeout: true }),
+            queue.add(() => (0, compress_js_1.brotli)(sourcePath), { throwOnTimeout: true }),
+        ];
     }
     function fileProcessor(options) {
         return (relativeFilePath) => {
@@ -114,7 +118,6 @@ function uploadFiles(files, config) {
         };
     }
 }
-exports.uploadFiles = uploadFiles;
 const NOT_COMPRESS = ['png', 'zip', 'gz', 'br'];
 function shouldCompress(filePath) {
     const fileName = path.basename(filePath);

package/dist/common/typescript/compile.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.compile = void 0;
+exports.compile = compile;
 const utils_1 = require("./utils");
 const transformers_1 = require("./transformers");
 const pretty_time_1 = require("../logger/pretty-time");
@@ -24,7 +24,7 @@ function compile(ts, { projectPath, configFileName = 'tsconfig.json', optionsToE
         readFile: ts.sys.readFile,
         onUnRecoverableConfigFileDiagnostic: reportDiagnostic,
     };
-    const parsedConfig = ts.getParsedCommandLineOfConfigFile(configPath, { noEmitOnError: true, ...optionsToExtend }, parseConfigFileHost);
+    const parsedConfig = ts.getParsedCommandLineOfConfigFile(configPath, { noEmit: false, noEmitOnError: true, ...optionsToExtend }, parseConfigFileHost);
     if (!parsedConfig) {
         throw new Error(`Invalid '${configFileName}'`);
     }
@@ -69,4 +69,3 @@ function compile(ts, { projectPath, configFileName = 'tsconfig.json', optionsToE
         return diagnostics.some(({ category }) => category === ts.DiagnosticCategory.Error);
     }
 }
-exports.compile = compile;

package/dist/common/typescript/diagnostic.js

@@ -23,7 +23,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.formatDiagnosticBrief = void 0;
+exports.formatDiagnosticBrief = formatDiagnosticBrief;
 const path = __importStar(require("node:path"));
 const colors_1 = require("../logger/colors");
 function formatDiagnosticBrief(ts, diagnostic, host) {
@@ -63,4 +63,3 @@ function formatDiagnosticBrief(ts, diagnostic, host) {
         }
     }
 }
-exports.formatDiagnosticBrief = formatDiagnosticBrief;

package/dist/common/typescript/transformers.js

@@ -23,7 +23,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createTransformPathsToLocalModules = void 0;
+exports.createTransformPathsToLocalModules = createTransformPathsToLocalModules;
 const path = __importStar(require("node:path"));
 const semver = __importStar(require("semver"));
 function createTransformPathsToLocalModules(ts) {
@@ -112,7 +112,6 @@ function createTransformPathsToLocalModules(ts) {
         };
     };
 }
-exports.createTransformPathsToLocalModules = createTransformPathsToLocalModules;
 function updateImportDeclaration(ts, node, context, resolvedPath) {
     if (semver.lt(ts.version, '5.0.0')) {
         // for versions before 5.0.0
@@ -142,5 +141,7 @@ function updateImportTypeNode(ts, node, context, resolvedPath) {
         // @ts-expect-error
         node.qualifier, node.typeArguments, node.isTypeOf);
     }
-    return context.factory.updateImportTypeNode(node, context.factory.createLiteralTypeNode(context.factory.createStringLiteral(resolvedPath)), node.attributes || node.assertions, node.qualifier, node.typeArguments, node.isTypeOf);
+    return context.factory.updateImportTypeNode(node, context.factory.createLiteralTypeNode(context.factory.createStringLiteral(resolvedPath)), 
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    node.attributes || node.assertions, node.qualifier, node.typeArguments, node.isTypeOf);
 }

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

@@ -7,4 +7,7 @@ export declare function displayFilename(originalFunc: (path: string, encoding?:
     enableDisplay(): void;
     disableDisplay(): number;
 };
-export declare function onHostEvent(host: any, functionName: any, before?: (...args: any[]) => void, after?: (...args: any[]) => void): void;
+export declare function onHostEvent<F extends string, T extends {
+    [key in F]?: (...args: any[]) => any;
+}>(host: T, functionName: F, before?: (...args: Parameters<NonNullable<T[F]>>) => void, after?: (res: ReturnType<NonNullable<T[F]>>) => void): void;
+export declare function resolveTypescript(): string;

package/dist/common/typescript/utils.js

@@ -1,6 +1,14 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.onHostEvent = exports.displayFilename = exports.getProjectConfig = void 0;
+exports.getProjectConfig = getProjectConfig;
+exports.displayFilename = displayFilename;
+exports.onHostEvent = onHostEvent;
+exports.resolveTypescript = resolveTypescript;
+const node_path_1 = __importDefault(require("node:path"));
+const paths_1 = __importDefault(require("../paths"));
 function getProjectConfig(ts, projectPath, filename = 'tsconfig.json') {
     const configPath = ts.findConfigFile(projectPath, ts.sys.fileExists, filename);
     if (!configPath) {
@@ -8,7 +16,6 @@ function getProjectConfig(ts, projectPath, filename = 'tsconfig.json') {
     }
     return configPath;
 }
-exports.getProjectConfig = getProjectConfig;
 function displayFilename(originalFunc, operationName, logger) {
     let displayEnabled = false;
     let count = 0;
@@ -36,18 +43,35 @@ function displayFilename(originalFunc, operationName, logger) {
     };
     return displayFunction;
 }
-exports.displayFilename = displayFilename;
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
 function onHostEvent(host, functionName, before, after) {
     const originalFunction = host[functionName];
-    host[functionName] = (...args) => {
+    // eslint-disable-next-line no-param-reassign
+    host[functionName] = ((...args) => {
         if (before) {
             before(...args);
         }
-        const result = originalFunction && originalFunction(...args);
+        let result;
+        if (typeof originalFunction === 'function') {
+            result = originalFunction(...args);
+        }
         if (after) {
             after(result);
         }
         return result;
-    };
+    });
+}
+function resolveTypescript() {
+    try {
+        return require.resolve(node_path_1.default.resolve(paths_1.default.appNodeModules, 'typescript'));
+    }
+    catch (err) {
+        if (!err ||
+            typeof err !== 'object' ||
+            !('code' in err) ||
+            err.code !== 'MODULE_NOT_FOUND') {
+            throw err;
+        }
+        return require.resolve('typescript');
+    }
 }
-exports.onHostEvent = onHostEvent;

package/dist/common/typescript/watch.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.watch = void 0;
+exports.watch = watch;
 const transformers_1 = require("./transformers");
 const utils_1 = require("./utils");
 const diagnostic_1 = require("./diagnostic");
@@ -15,6 +15,7 @@ function watch(ts, projectPath, { logger, onAfterFilesEmitted, enableSourceMap,
         getNewLine: () => ts.sys.newLine,
     };
     const host = ts.createWatchCompilerHost(configPath, {
+        noEmit: false,
         noEmitOnError: false,
         inlineSourceMap: enableSourceMap,
         inlineSources: enableSourceMap,
@@ -62,4 +63,3 @@ function watch(ts, projectPath, { logger, onAfterFilesEmitted, enableSourceMap,
         }
     }
 }
-exports.watch = watch;

package/dist/common/utils.d.ts

@@ -1,6 +1,6 @@
 export declare function createRunFolder(): void;
 export declare function shouldCompileTarget(target: 'client' | 'server' | undefined, targetName: string): boolean;
-export declare function getCacheDir(): string;
+export declare function getCacheDir(): Promise<string>;
 export declare function getPort({ port }: {
     port: number;
 }): Promise<number>;

package/dist/common/utils.js

@@ -3,10 +3,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getPort = exports.getCacheDir = exports.shouldCompileTarget = exports.createRunFolder = void 0;
+exports.createRunFolder = createRunFolder;
+exports.shouldCompileTarget = shouldCompileTarget;
+exports.getCacheDir = getCacheDir;
+exports.getPort = getPort;
 const node_fs_1 = __importDefault(require("node:fs"));
 const node_os_1 = __importDefault(require("node:os"));
-const find_cache_dir_1 = __importDefault(require("find-cache-dir"));
 const paths_1 = __importDefault(require("./paths"));
 function createRunFolder() {
     const runPath = paths_1.default.appRun;
@@ -14,17 +16,14 @@ function createRunFolder() {
         node_fs_1.default.mkdirSync(runPath, { recursive: true });
     }
 }
-exports.createRunFolder = createRunFolder;
 function shouldCompileTarget(target, targetName) {
     return target === undefined || target === targetName;
 }
-exports.shouldCompileTarget = shouldCompileTarget;
-function getCacheDir() {
-    return (0, find_cache_dir_1.default)({ name: '@gravity-ui/app-builder', create: true }) || node_os_1.default.tmpdir();
+async function getCacheDir() {
+    const { default: findCacheDirectory } = await import('find-cache-dir');
+    return findCacheDirectory({ name: '@gravity-ui/app-builder', create: true }) || node_os_1.default.tmpdir();
 }
-exports.getCacheDir = getCacheDir;
 async function getPort({ port }) {
     const { default: getPortDefault, portNumbers } = await import('get-port');
     return getPortDefault({ port: portNumbers(port, port + 100) });
 }
-exports.getPort = getPort;

package/dist/common/webpack/compile.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.webpackCompile = void 0;
+exports.webpackCompile = webpackCompile;
 const webpack_1 = __importDefault(require("webpack"));
 const logger_1 = require("../logger");
 const config_1 = require("./config");
@@ -28,4 +28,3 @@ async function webpackCompile(config) {
         });
     });
 }
-exports.webpackCompile = webpackCompile;

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

@@ -1,5 +1,5 @@
 import * as webpack from 'webpack';
-import type { LinkedPackage, NormalizedClientConfig } from '../models';
+import type { NormalizedClientConfig } from '../models';
 import type { Logger } from '../logger';
 export interface HelperOptions {
     config: NormalizedClientConfig;
@@ -7,11 +7,6 @@ export interface HelperOptions {
     isEnvDevelopment: boolean;
     isEnvProduction: boolean;
     configType: `${WebpackMode}`;
-    updateIncludes?: (values: string[], options?: {
-        includeRootAssets?: boolean;
-        includeRootStyles?: boolean;
-    }) => string[];
-    tsLinkedPackages?: LinkedPackage[];
 }
 export declare const enum WebpackMode {
     Prod = "production",
@@ -21,7 +16,7 @@ export declare function webpackConfigFactory(webpackMode: WebpackMode, config: N
     logger?: Logger;
 }): Promise<webpack.Configuration>;
 export declare function configureModuleRules(helperOptions: HelperOptions, additionalRules?: NonNullable<webpack.RuleSetRule['oneOf']>): webpack.RuleSetRule[];
-export declare function configureResolve({ isEnvProduction, config, tsLinkedPackages, }: HelperOptions): webpack.ResolveOptions;
+export declare function configureResolve({ isEnvProduction, config }: HelperOptions): webpack.ResolveOptions;
 type Optimization = NonNullable<webpack.Configuration['optimization']>;
 export declare function configureOptimization({ config }: HelperOptions): Optimization;
 export {};