@tramvai/cli 5.50.0 → 5.53.78

package/src/utils/errors.ts

@@ -0,0 +1,39 @@
+/**
+ * @description By default, `Error` properties are not enumerable.
+ * So when you use `Object.keys()`, `JSON.stringify()`, or `postMessage()`,
+ * the `message`, `stack`, and `cause` properties are not included.
+ */
+export function enumerateErrorProperties(error: Error) {
+  Object.defineProperties(error, {
+    message: {
+      configurable: true,
+      enumerable: true,
+      writable: true,
+    },
+    stack: {
+      configurable: true,
+      enumerable: true,
+      // stack is getter
+    },
+    cause: {
+      configurable: true,
+      enumerable: true,
+      writable: true,
+    },
+  });
+
+  if ('cause' in error && typeof error.cause === 'object') {
+    Object.defineProperties(error.cause, {
+      message: {
+        configurable: true,
+        enumerable: true,
+        writable: true,
+      },
+      stack: {
+        configurable: true,
+        enumerable: true,
+        // stack is getter
+      },
+    });
+  }
+}

package/src/utils/memoryUsage.ts

@@ -0,0 +1,58 @@
+export type MemoryStats = {
+  maxHeapTotal: number;
+  maxHeapUsed: number;
+  maxRss: number;
+};
+
+/**
+ * Creates a memory monitor that tracks maximum memory consumption
+ *
+ * @param options Configuration options
+ * @param options.sampleInterval Interval between memory samples in milliseconds (default: 1000)
+ * @returns An object with start and stop methods
+ */
+export function createMemoryMonitor(options: { sampleInterval?: number } = {}) {
+  const { sampleInterval = 1000 } = options;
+
+  let maxHeapTotal = 0;
+  let maxHeapUsed = 0;
+  let maxRss = 0;
+  let intervalId: NodeJS.Timeout | null = null;
+
+  return {
+    start() {
+      intervalId = setInterval(() => {
+        const memoryUsage = process.memoryUsage();
+
+        maxHeapTotal = Math.max(maxHeapTotal, memoryUsage.heapTotal);
+        maxHeapUsed = Math.max(maxHeapUsed, memoryUsage.heapUsed);
+        maxRss = Math.max(maxRss, memoryUsage.rss);
+      }, sampleInterval);
+
+      // Make sure the interval doesn't prevent the process from exiting
+      if (intervalId.unref) {
+        intervalId.unref();
+      }
+    },
+    read(): MemoryStats {
+      // Take one final sample to capture the latest memory usage
+      const memoryUsage = process.memoryUsage();
+
+      maxHeapTotal = Math.max(maxHeapTotal, memoryUsage.heapTotal);
+      maxHeapUsed = Math.max(maxHeapUsed, memoryUsage.heapUsed);
+      maxRss = Math.max(maxRss, memoryUsage.rss);
+
+      return {
+        maxHeapTotal,
+        maxHeapUsed,
+        maxRss,
+      };
+    },
+    stop() {
+      if (intervalId) {
+        clearInterval(intervalId);
+        intervalId = null;
+      }
+    },
+  };
+}

package/src/utils/safeRequire.spec.ts

@@ -0,0 +1,36 @@
+import path from 'node:path';
+
+import { safeRequireResolve } from './safeRequire';
+
+const expectedResolvePath = path.join(__dirname, 'safeRequire.ts');
+const reactPath = require.resolve('react');
+
+describe('safe require/resolve', () => {
+  it('should correctly resolve relative path with extension and custom root', () => {
+    expect(safeRequireResolve('./safeRequire.ts', __dirname)).toBe(expectedResolvePath);
+  });
+
+  it('should correctly resolve relative path without extension and custom root', () => {
+    expect(safeRequireResolve('./safeRequire', __dirname)).toBe(expectedResolvePath);
+  });
+
+  it('should correctly resolve path without extension and custom root', () => {
+    expect(safeRequireResolve('safeRequire', __dirname)).toBe(expectedResolvePath);
+  });
+
+  it('should correctly resolve path from node_modules', () => {
+    expect(safeRequireResolve('react', __dirname)).toBe(reactPath);
+  });
+
+  it('should correctly resolve path from node_modules with specific path', () => {
+    expect(safeRequireResolve('react/index', __dirname)).toBe(reactPath);
+  });
+
+  it('should correctly resolve path from node_modules with specific path and extension', () => {
+    expect(safeRequireResolve('react/index.js', __dirname)).toBe(reactPath);
+  });
+
+  it('should throw error when resolve path from node_modules with specific path', () => {
+    expect(safeRequireResolve('react/index.ts', __dirname, true)).toBe('');
+  });
+});

package/src/utils/safeRequire.ts

@@ -1,4 +1,5 @@
 import { sync as resolve } from 'resolve';
+import path from 'node:path';
 import { extensions } from '../config/constants';
 
 export const safeRequire = (path: string, silent?: boolean) => {
@@ -12,15 +13,23 @@ export const safeRequire = (path: string, silent?: boolean) => {
   }
 };
 
-export const safeRequireResolve = (path: string, silent?: boolean) => {
+export const safeRequireResolve = (targetPath: string, basedir: string, silent?: boolean) => {
   try {
-    return resolve(path, {
+    return resolve(targetPath, {
       extensions,
+      basedir,
     });
   } catch (error) {
+    try {
+      return resolve(path.resolve(basedir, targetPath), {
+        extensions,
+        basedir,
+      });
+    } catch (_e) {}
+
     if (!silent) {
       // TODO: replace with logger from di
-      console.error(`Require for path ${path} failed`, error);
+      console.error(`Require for path ${targetPath} failed`, error);
     }
 
     return '';

package/lib/builder/webpack/providers/build/clientModern.d.ts

@@ -1,3 +0,0 @@
-import type { Provider } from '@tinkoff/dippy';
-export declare const buildClientModernProviders: Provider[];
-//# sourceMappingURL=clientModern.d.ts.map

package/lib/builder/webpack/providers/build/clientModern.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"clientModern.d.ts","sourceRoot":"","sources":["../../../../../src/builder/webpack/providers/build/clientModern.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAe/C,eAAO,MAAM,0BAA0B,EAAE,QAAQ,EAgDhD,CAAC"}

package/lib/builder/webpack/providers/build/clientModern.js

@@ -1,60 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.buildClientModernProviders = void 0;
-const dippy_1 = require("@tinkoff/dippy");
-const tokens_1 = require("../../../../di/tokens");
-const toWebpackConfig_1 = require("../../../../library/webpack/utils/toWebpackConfig");
-const tokens_2 = require("../../tokens");
-const closeWebpack_1 = require("../../utils/closeWebpack");
-const runWebpack_1 = require("../../utils/runWebpack");
-const compiler_1 = require("../../utils/compiler");
-exports.buildClientModernProviders = [
-    (0, dippy_1.provide)({
-        provide: tokens_2.CLIENT_MODERN_CONFIG_MANAGER_TOKEN,
-        useFactory: ({ configManager }) => {
-            return configManager.withSettings({
-                buildType: 'client',
-                modern: true,
-            });
-        },
-        deps: {
-            configManager: tokens_1.CONFIG_MANAGER_TOKEN,
-        },
-    }),
-    (0, dippy_1.provide)({
-        provide: tokens_2.WEBPACK_CLIENT_MODERN_COMPILER_TOKEN,
-        useFactory: ({ webpackConfig, di }) => {
-            return (0, compiler_1.createCompiler)((0, toWebpackConfig_1.toWebpackConfig)(webpackConfig), di);
-        },
-        deps: {
-            webpackConfig: tokens_2.WEBPACK_CLIENT_MODERN_CONFIG_TOKEN,
-            di: dippy_1.DI_TOKEN,
-        },
-    }),
-    (0, dippy_1.provide)({
-        provide: tokens_2.PROCESS_HANDLER_TOKEN,
-        multi: true,
-        useFactory: ({ webpackCompiler, configManager }) => {
-            return function webpackBuild() {
-                return (0, runWebpack_1.runWebpack)(webpackCompiler, { verboseWebpack: configManager.verboseWebpack });
-            };
-        },
-        deps: {
-            webpackCompiler: tokens_2.WEBPACK_CLIENT_MODERN_COMPILER_TOKEN,
-            configManager: tokens_1.CONFIG_MANAGER_TOKEN,
-        },
-    }),
-    (0, dippy_1.provide)({
-        provide: tokens_2.CLOSE_HANDLER_TOKEN,
-        multi: true,
-        useFactory: ({ webpackCompiler }) => {
-            return function webpackClose() {
-                return (0, closeWebpack_1.closeWebpack)(webpackCompiler);
-            };
-        },
-        deps: {
-            webpackCompiler: tokens_2.WEBPACK_CLIENT_MODERN_COMPILER_TOKEN,
-        },
-    }),
-];
-//# sourceMappingURL=clientModern.js.map

package/lib/builder/webpack/providers/build/clientModern.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"clientModern.js","sourceRoot":"","sources":["../../../../../src/builder/webpack/providers/build/clientModern.ts"],"names":[],"mappings":";;;AACA,0CAAmD;AACnD,kDAA6D;AAC7D,uFAAoF;AACpF,yCAMsB;AACtB,2DAAwD;AACxD,uDAAoD;AACpD,mDAAsD;AAEzC,QAAA,0BAA0B,GAAe;IACpD,IAAA,eAAO,EAAC;QACN,OAAO,EAAE,2CAAkC;QAC3C,UAAU,EAAE,CAAC,EAAE,aAAa,EAAE,EAAE,EAAE;YAChC,OAAO,aAAa,CAAC,YAAY,CAAC;gBAChC,SAAS,EAAE,QAAQ;gBACnB,MAAM,EAAE,IAAI;aACb,CAAC,CAAC;QACL,CAAC;QACD,IAAI,EAAE;YACJ,aAAa,EAAE,6BAAoB;SACpC;KACF,CAAC;IACF,IAAA,eAAO,EAAC;QACN,OAAO,EAAE,6CAAoC;QAC7C,UAAU,EAAE,CAAC,EAAE,aAAa,EAAE,EAAE,EAAE,EAAE,EAAE;YACpC,OAAO,IAAA,yBAAc,EAAC,IAAA,iCAAe,EAAC,aAAa,CAAC,EAAE,EAAE,CAAC,CAAC;QAC5D,CAAC;QACD,IAAI,EAAE;YACJ,aAAa,EAAE,2CAAkC;YACjD,EAAE,EAAE,gBAAQ;SACb;KACF,CAAC;IACF,IAAA,eAAO,EAAC;QACN,OAAO,EAAE,8BAAqB;QAC9B,KAAK,EAAE,IAAI;QACX,UAAU,EAAE,CAAC,EAAE,eAAe,EAAE,aAAa,EAAE,EAAE,EAAE;YACjD,OAAO,SAAS,YAAY;gBAC1B,OAAO,IAAA,uBAAU,EAAC,eAAe,EAAE,EAAE,cAAc,EAAE,aAAa,CAAC,cAAc,EAAE,CAAC,CAAC;YACvF,CAAC,CAAC;QACJ,CAAC;QACD,IAAI,EAAE;YACJ,eAAe,EAAE,6CAAoC;YACrD,aAAa,EAAE,6BAAoB;SACpC;KACF,CAAC;IACF,IAAA,eAAO,EAAC;QACN,OAAO,EAAE,4BAAmB;QAC5B,KAAK,EAAE,IAAI;QACX,UAAU,EAAE,CAAC,EAAE,eAAe,EAAE,EAAE,EAAE;YAClC,OAAO,SAAS,YAAY;gBAC1B,OAAO,IAAA,2BAAY,EAAC,eAAe,CAAC,CAAC;YACvC,CAAC,CAAC;QACJ,CAAC;QACD,IAAI,EAAE;YACJ,eAAe,EAAE,6CAAoC;SACtD;KACF,CAAC;CACH,CAAC"}

package/lib/di/providers/analytics.d.ts

@@ -1,3 +0,0 @@
-import type { Provider } from '@tinkoff/dippy';
-export declare const analyticsProviders: readonly Provider[];
-//# sourceMappingURL=analytics.d.ts.map

package/lib/di/providers/analytics.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"analytics.d.ts","sourceRoot":"","sources":["../../../src/di/providers/analytics.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAQ/C,eAAO,MAAM,kBAAkB,EAAE,SAAS,QAAQ,EAaxC,CAAC"}

package/lib/di/providers/analytics.js

@@ -1,20 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.analyticsProviders = void 0;
-const tokens_1 = require("../tokens");
-const analytics_1 = require("../../models/analytics");
-exports.analyticsProviders = [
-    {
-        provide: tokens_1.ANALYTICS_TOKEN,
-        useClass: analytics_1.Analytics,
-        deps: {
-            trackingCode: tokens_1.ANALYTICS_TRACKING_CODE_TOKEN,
-            packageInfo: tokens_1.ANALYTICS_PACKAGE_INFO_TOKEN,
-        },
-    },
-    {
-        provide: tokens_1.ANALYTICS_TRACKING_CODE_TOKEN,
-        useValue: 'UA-122261674-1',
-    },
-];
-//# sourceMappingURL=analytics.js.map

package/lib/di/providers/analytics.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"analytics.js","sourceRoot":"","sources":["../../../src/di/providers/analytics.ts"],"names":[],"mappings":";;;AACA,sCAImB;AACnB,sDAAmD;AAEtC,QAAA,kBAAkB,GAAwB;IACrD;QACE,OAAO,EAAE,wBAAe;QACxB,QAAQ,EAAE,qBAAS;QACnB,IAAI,EAAE;YACJ,YAAY,EAAE,sCAA6B;YAC3C,WAAW,EAAE,qCAA4B;SAC1C;KACF;IACD;QACE,OAAO,EAAE,sCAA6B;QACtC,QAAQ,EAAE,gBAAgB;KAC3B;CACO,CAAC"}

package/lib/di/tokens/analytics.d.ts

@@ -1,14 +0,0 @@
-import type { Analytics } from '../../models/analytics';
-export declare const ANALYTICS_TOKEN: Analytics & {
-    __type?: "base token";
-};
-export declare const ANALYTICS_TRACKING_CODE_TOKEN: string & {
-    __type?: "base token";
-};
-export declare const ANALYTICS_PACKAGE_INFO_TOKEN: {
-    name: string;
-    version: string;
-} & {
-    __type?: "base token";
-};
-//# sourceMappingURL=analytics.d.ts.map

package/lib/di/tokens/analytics.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"analytics.d.ts","sourceRoot":"","sources":["../../../src/di/tokens/analytics.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAExD,eAAO,MAAM,eAAe;;CAAsC,CAAC;AACnE,eAAO,MAAM,6BAA6B;;CAAgD,CAAC;AAC3F,eAAO,MAAM,4BAA4B;UAAuB,MAAM;aAAW,MAAM;;;CAEtF,CAAC"}

package/lib/di/tokens/analytics.js

@@ -1,8 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ANALYTICS_PACKAGE_INFO_TOKEN = exports.ANALYTICS_TRACKING_CODE_TOKEN = exports.ANALYTICS_TOKEN = void 0;
-const dippy_1 = require("@tinkoff/dippy");
-exports.ANALYTICS_TOKEN = (0, dippy_1.createToken)('analytics');
-exports.ANALYTICS_TRACKING_CODE_TOKEN = (0, dippy_1.createToken)('analytics trackingCode');
-exports.ANALYTICS_PACKAGE_INFO_TOKEN = (0, dippy_1.createToken)('analytics packageVersion');
-//# sourceMappingURL=analytics.js.map

package/lib/di/tokens/analytics.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"analytics.js","sourceRoot":"","sources":["../../../src/di/tokens/analytics.ts"],"names":[],"mappings":";;;AAAA,0CAA6C;AAGhC,QAAA,eAAe,GAAG,IAAA,mBAAW,EAAY,WAAW,CAAC,CAAC;AACtD,QAAA,6BAA6B,GAAG,IAAA,mBAAW,EAAS,wBAAwB,CAAC,CAAC;AAC9E,QAAA,4BAA4B,GAAG,IAAA,mBAAW,EACrD,0BAA0B,CAC3B,CAAC"}

package/lib/models/analytics.d.ts

@@ -1,31 +0,0 @@
-interface Event {
-    name: string;
-}
-interface ActionEvent extends Event {
-    category: 'command' | 'task';
-    executionTime?: number;
-    label?: string;
-    parameters?: any;
-}
-export declare class Analytics {
-    private readonly enabled;
-    private visitor;
-    private trackErrorInternal;
-    private trackCommandInternal;
-    private trackTimingInternal;
-    private readonly trackError;
-    private readonly track;
-    private readonly trackTiming;
-    constructor({ trackingCode, packageInfo: { name, version }, enabled }: {
-        trackingCode: any;
-        packageInfo: {
-            name: any;
-            version: any;
-        };
-        enabled: any;
-    });
-    trackAfter(actionEvent: ActionEvent): <TResult>(promise: Promise<TResult>) => Promise<TResult>;
-    private promisify;
-}
-export {};
-//# sourceMappingURL=analytics.d.ts.map

package/lib/models/analytics.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"analytics.d.ts","sourceRoot":"","sources":["../../src/models/analytics.ts"],"names":[],"mappings":"AAKA,UAAU,KAAK;IACb,IAAI,EAAE,MAAM,CAAC;CACd;AAED,UAAU,WAAY,SAAQ,KAAK;IACjC,QAAQ,EAAE,SAAS,GAAG,MAAM,CAAC;IAC7B,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,UAAU,CAAC,EAAE,GAAG,CAAC;CAClB;AAOD,qBAAa,SAAS;IACpB,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAU;IAElC,OAAO,CAAC,OAAO,CAAU;IAEzB,OAAO,CAAC,kBAAkB,CAQxB;IAEF,OAAO,CAAC,oBAAoB,CAmB1B;IAEF,OAAO,CAAC,mBAAmB,CAQzB;IAEF,OAAO,CAAC,QAAQ,CAAC,UAAU,CAA2C;IAEtE,OAAO,CAAC,QAAQ,CAAC,KAAK,CAA6C;IAEnE,OAAO,CAAC,QAAQ,CAAC,WAAW,CAA4C;gBAE5D,EAAE,YAAY,EAAE,WAAW,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,OAAO,EAAE;;;;;;;KAAA;IAarE,UAAU,CAAC,WAAW,EAAE,WAAW;IAsBnC,OAAO,CAAC,SAAS;CAOlB"}

package/lib/models/analytics.js

@@ -1,79 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Analytics = void 0;
-const tslib_1 = require("tslib");
-const universal_analytics_1 = tslib_1.__importDefault(require("universal-analytics"));
-const string_1 = tslib_1.__importDefault(require("@tinkoff/utils/is/string"));
-const perf_hooks_1 = require("perf_hooks");
-class Analytics {
-    constructor({ trackingCode, packageInfo: { name, version }, enabled }) {
-        this.trackErrorInternal = ({ name, errorMessage, errorStatus }, resolve) => {
-            if (!this.enabled) {
-                resolve();
-                return;
-            }
-            this.visitor.event('error', name, errorMessage, errorStatus).send(resolve);
-        };
-        this.trackCommandInternal = ({ name, executionTime, label, parameters, category }, resolve) => {
-            if (!this.enabled) {
-                resolve();
-                return;
-            }
-            const path = [category, name, label].join('/');
-            const event = this.visitor
-                .screenview({ cd: path })
-                .event(category, name, (0, string_1.default)(parameters) ? parameters : JSON.stringify(parameters));
-            if (executionTime) {
-                event.timing(category, name, Math.floor(executionTime));
-            }
-            event.send(resolve);
-        };
-        this.trackTimingInternal = ({ name, executionTime, category }, resolve) => {
-            if (!this.enabled) {
-                resolve();
-                return;
-            }
-            this.visitor.timing(category, name, Math.floor(executionTime)).send(resolve);
-        };
-        this.trackError = this.promisify(this.trackErrorInternal);
-        this.track = this.promisify(this.trackCommandInternal);
-        this.trackTiming = this.promisify(this.trackTimingInternal);
-        this.enabled = enabled ?? false;
-        if (this.enabled) {
-            this.visitor = (0, universal_analytics_1.default)(trackingCode);
-            this.visitor.set('ds', 'app');
-            this.visitor.set('an', name);
-            this.visitor.set('av', version);
-            this.visitor.set('aid', 'tramvai-cli');
-        }
-    }
-    trackAfter(actionEvent) {
-        const startedAt = perf_hooks_1.performance.now();
-        const trackingPromise = this.track(actionEvent);
-        return async (promise) => {
-            try {
-                const result = await promise;
-                return Promise.all([
-                    trackingPromise,
-                    this.trackTiming({ ...actionEvent, executionTime: perf_hooks_1.performance.now() - startedAt }),
-                ]).then(() => result);
-            }
-            catch (e) {
-                return this.trackError({
-                    name: actionEvent.name,
-                    errorMessage: e.name,
-                    errorStatus: e.status,
-                }).then(() => {
-                    throw e;
-                });
-            }
-        };
-    }
-    promisify(func) {
-        return function promisified(event, ...args) {
-            return new Promise((resolve) => func(event, resolve, ...args));
-        };
-    }
-}
-exports.Analytics = Analytics;
-//# sourceMappingURL=analytics.js.map

package/lib/models/analytics.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"analytics.js","sourceRoot":"","sources":["../../src/models/analytics.ts"],"names":[],"mappings":"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"}

package/src/builder/webpack/providers/build/clientModern.ts

@@ -1,64 +0,0 @@
-import type { Provider } from '@tinkoff/dippy';
-import { DI_TOKEN, provide } from '@tinkoff/dippy';
-import { CONFIG_MANAGER_TOKEN } from '../../../../di/tokens';
-import { toWebpackConfig } from '../../../../library/webpack/utils/toWebpackConfig';
-import {
-  CLIENT_MODERN_CONFIG_MANAGER_TOKEN,
-  CLOSE_HANDLER_TOKEN,
-  PROCESS_HANDLER_TOKEN,
-  WEBPACK_CLIENT_MODERN_COMPILER_TOKEN,
-  WEBPACK_CLIENT_MODERN_CONFIG_TOKEN,
-} from '../../tokens';
-import { closeWebpack } from '../../utils/closeWebpack';
-import { runWebpack } from '../../utils/runWebpack';
-import { createCompiler } from '../../utils/compiler';
-
-export const buildClientModernProviders: Provider[] = [
-  provide({
-    provide: CLIENT_MODERN_CONFIG_MANAGER_TOKEN,
-    useFactory: ({ configManager }) => {
-      return configManager.withSettings({
-        buildType: 'client',
-        modern: true,
-      });
-    },
-    deps: {
-      configManager: CONFIG_MANAGER_TOKEN,
-    },
-  }),
-  provide({
-    provide: WEBPACK_CLIENT_MODERN_COMPILER_TOKEN,
-    useFactory: ({ webpackConfig, di }) => {
-      return createCompiler(toWebpackConfig(webpackConfig), di);
-    },
-    deps: {
-      webpackConfig: WEBPACK_CLIENT_MODERN_CONFIG_TOKEN,
-      di: DI_TOKEN,
-    },
-  }),
-  provide({
-    provide: PROCESS_HANDLER_TOKEN,
-    multi: true,
-    useFactory: ({ webpackCompiler, configManager }) => {
-      return function webpackBuild() {
-        return runWebpack(webpackCompiler, { verboseWebpack: configManager.verboseWebpack });
-      };
-    },
-    deps: {
-      webpackCompiler: WEBPACK_CLIENT_MODERN_COMPILER_TOKEN,
-      configManager: CONFIG_MANAGER_TOKEN,
-    },
-  }),
-  provide({
-    provide: CLOSE_HANDLER_TOKEN,
-    multi: true,
-    useFactory: ({ webpackCompiler }) => {
-      return function webpackClose() {
-        return closeWebpack(webpackCompiler);
-      };
-    },
-    deps: {
-      webpackCompiler: WEBPACK_CLIENT_MODERN_COMPILER_TOKEN,
-    },
-  }),
-];

package/src/di/providers/analytics.ts

@@ -1,22 +0,0 @@
-import type { Provider } from '@tinkoff/dippy';
-import {
-  ANALYTICS_TOKEN,
-  ANALYTICS_TRACKING_CODE_TOKEN,
-  ANALYTICS_PACKAGE_INFO_TOKEN,
-} from '../tokens';
-import { Analytics } from '../../models/analytics';
-
-export const analyticsProviders: readonly Provider[] = [
-  {
-    provide: ANALYTICS_TOKEN,
-    useClass: Analytics,
-    deps: {
-      trackingCode: ANALYTICS_TRACKING_CODE_TOKEN,
-      packageInfo: ANALYTICS_PACKAGE_INFO_TOKEN,
-    },
-  },
-  {
-    provide: ANALYTICS_TRACKING_CODE_TOKEN,
-    useValue: 'UA-122261674-1',
-  },
-] as const;

package/src/di/tokens/analytics.ts

@@ -1,8 +0,0 @@
-import { createToken } from '@tinkoff/dippy';
-import type { Analytics } from '../../models/analytics';
-
-export const ANALYTICS_TOKEN = createToken<Analytics>('analytics');
-export const ANALYTICS_TRACKING_CODE_TOKEN = createToken<string>('analytics trackingCode');
-export const ANALYTICS_PACKAGE_INFO_TOKEN = createToken<{ name: string; version: string }>(
-  'analytics packageVersion'
-);

package/src/models/analytics.ts

@@ -1,116 +0,0 @@
-import type { Visitor } from 'universal-analytics';
-import ua from 'universal-analytics';
-import isString from '@tinkoff/utils/is/string';
-import { performance } from 'perf_hooks';
-
-interface Event {
-  name: string;
-}
-
-interface ActionEvent extends Event {
-  category: 'command' | 'task';
-  executionTime?: number;
-  label?: string;
-  parameters?: any;
-}
-
-interface ErrorEvent extends Event {
-  errorMessage?: string;
-  errorStatus?: number;
-}
-
-export class Analytics {
-  private readonly enabled: boolean;
-
-  private visitor: Visitor;
-
-  private trackErrorInternal = ({ name, errorMessage, errorStatus }: ErrorEvent, resolve) => {
-    if (!this.enabled) {
-      resolve();
-
-      return;
-    }
-
-    this.visitor.event('error', name, errorMessage, errorStatus).send(resolve);
-  };
-
-  private trackCommandInternal = (
-    { name, executionTime, label, parameters, category }: ActionEvent,
-    resolve
-  ) => {
-    if (!this.enabled) {
-      resolve();
-
-      return;
-    }
-
-    const path = [category, name, label].join('/');
-    const event = this.visitor
-      .screenview({ cd: path })
-      .event(category, name, isString(parameters) ? parameters : JSON.stringify(parameters));
-    if (executionTime) {
-      event.timing(category, name, Math.floor(executionTime));
-    }
-
-    event.send(resolve);
-  };
-
-  private trackTimingInternal = ({ name, executionTime, category }: ActionEvent, resolve) => {
-    if (!this.enabled) {
-      resolve();
-
-      return;
-    }
-
-    this.visitor.timing(category, name, Math.floor(executionTime)).send(resolve);
-  };
-
-  private readonly trackError = this.promisify(this.trackErrorInternal);
-
-  private readonly track = this.promisify(this.trackCommandInternal);
-
-  private readonly trackTiming = this.promisify(this.trackTimingInternal);
-
-  constructor({ trackingCode, packageInfo: { name, version }, enabled }) {
-    this.enabled = enabled ?? false;
-
-    if (this.enabled) {
-      this.visitor = ua(trackingCode);
-
-      this.visitor.set('ds', 'app');
-      this.visitor.set('an', name);
-      this.visitor.set('av', version);
-      this.visitor.set('aid', 'tramvai-cli');
-    }
-  }
-
-  trackAfter(actionEvent: ActionEvent) {
-    const startedAt = performance.now();
-    const trackingPromise = this.track(actionEvent);
-    return async <TResult>(promise: Promise<TResult>): Promise<TResult> => {
-      try {
-        const result = await promise;
-        return Promise.all([
-          trackingPromise,
-          this.trackTiming({ ...actionEvent, executionTime: performance.now() - startedAt }),
-        ]).then(() => result);
-      } catch (e) {
-        return this.trackError({
-          name: actionEvent.name,
-          errorMessage: e.name,
-          errorStatus: e.status,
-        }).then(() => {
-          throw e;
-        });
-      }
-    };
-  }
-
-  private promisify<TEvent>(func: (event: TEvent, resolve: any, ...args) => void) {
-    return function promisified(event: TEvent, ...args): Promise<void> {
-      return new Promise((resolve) => func(event, resolve, ...args));
-    };
-  }
-
-  // tslint:disable-line member-ordering
-}