@tramvai/cli 2.7.0 → 2.11.0

package/lib/api/start/tokens.d.ts

@@ -1,4 +1,4 @@
-export declare const INIT_HANDLER_TOKEN: import("@tinkoff/dippy/lib/createToken/createToken").MultiTokenInterface<() => Promise<void> | void>;
-export declare const PROCESS_HANDLER_TOKEN: import("@tinkoff/dippy/lib/createToken/createToken").MultiTokenInterface<() => Promise<void> | void>;
-export declare const CLOSE_HANDLER_TOKEN: import("@tinkoff/dippy/lib/createToken/createToken").MultiTokenInterface<() => Promise<void> | void>;
-export declare const STRICT_ERROR_HANDLE: import("@tinkoff/dippy/lib/createToken/createToken").BaseTokenInterface<boolean>;
+export declare const INIT_HANDLER_TOKEN: import("@tinkoff/dippy").MultiTokenInterface<() => Promise<void> | void>;
+export declare const PROCESS_HANDLER_TOKEN: import("@tinkoff/dippy").MultiTokenInterface<() => Promise<void> | void>;
+export declare const CLOSE_HANDLER_TOKEN: import("@tinkoff/dippy").MultiTokenInterface<() => Promise<void> | void>;
+export declare const STRICT_ERROR_HANDLE: import("@tinkoff/dippy").BaseTokenInterface<boolean>;

package/lib/api/start-prod/tokens.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="node" />
 import type { ChildProcess } from 'child_process';
-export declare const INIT_HANDLER_TOKEN: import("@tinkoff/dippy/lib/createToken/createToken").MultiTokenInterface<() => Promise<void> | void>;
-export declare const PROCESS_HANDLER_TOKEN: import("@tinkoff/dippy/lib/createToken/createToken").MultiTokenInterface<() => Promise<void> | void>;
-export declare const CLOSE_HANDLER_TOKEN: import("@tinkoff/dippy/lib/createToken/createToken").MultiTokenInterface<() => Promise<void> | void>;
-export declare const SERVER_PROCESS_TOKEN: import("@tinkoff/dippy/lib/createToken/createToken").BaseTokenInterface<ChildProcess>;
+export declare const INIT_HANDLER_TOKEN: import("@tinkoff/dippy").MultiTokenInterface<() => Promise<void> | void>;
+export declare const PROCESS_HANDLER_TOKEN: import("@tinkoff/dippy").MultiTokenInterface<() => Promise<void> | void>;
+export declare const CLOSE_HANDLER_TOKEN: import("@tinkoff/dippy").MultiTokenInterface<() => Promise<void> | void>;
+export declare const SERVER_PROCESS_TOKEN: import("@tinkoff/dippy").BaseTokenInterface<ChildProcess>;

package/lib/builder/webpack/tokens.d.ts

@@ -5,24 +5,24 @@ import type { EventEmitter } from 'events';
 import type { ConfigManager } from '../../config/configManager';
 import type { GetBuildStats } from '../../typings/build/Builder';
 import type { AnalyzePlugin } from './types';
-export declare const CLIENT_CONFIG_MANAGER_TOKEN: import("@tinkoff/dippy/lib/createToken/createToken").BaseTokenInterface<ConfigManager<import("../../typings/configEntry/common").ConfigEntry, any>>;
-export declare const CLIENT_MODERN_CONFIG_MANAGER_TOKEN: import("@tinkoff/dippy/lib/createToken/createToken").BaseTokenInterface<ConfigManager<import("../../typings/configEntry/common").ConfigEntry, any>>;
-export declare const SERVER_CONFIG_MANAGER_TOKEN: import("@tinkoff/dippy/lib/createToken/createToken").BaseTokenInterface<ConfigManager<import("../../typings/configEntry/common").ConfigEntry, any>>;
-export declare const WEBPACK_CLIENT_CONFIG_TOKEN: import("@tinkoff/dippy/lib/createToken/createToken").BaseTokenInterface<Config>;
-export declare const WEBPACK_CLIENT_MODERN_CONFIG_TOKEN: import("@tinkoff/dippy/lib/createToken/createToken").BaseTokenInterface<Config>;
-export declare const WEBPACK_SERVER_CONFIG_TOKEN: import("@tinkoff/dippy/lib/createToken/createToken").BaseTokenInterface<Config>;
-export declare const WEBPACK_COMPILER_TOKEN: import("@tinkoff/dippy/lib/createToken/createToken").BaseTokenInterface<MultiCompiler>;
-export declare const WEBPACK_CLIENT_COMPILER_TOKEN: import("@tinkoff/dippy/lib/createToken/createToken").BaseTokenInterface<Compiler>;
-export declare const WEBPACK_CLIENT_MODERN_COMPILER_TOKEN: import("@tinkoff/dippy/lib/createToken/createToken").BaseTokenInterface<Compiler>;
-export declare const WEBPACK_SERVER_COMPILER_TOKEN: import("@tinkoff/dippy/lib/createToken/createToken").BaseTokenInterface<Compiler>;
-export declare const WEBPACK_WATCHING_TOKEN: import("@tinkoff/dippy/lib/createToken/createToken").BaseTokenInterface<Watching>;
+export declare const CLIENT_CONFIG_MANAGER_TOKEN: import("@tinkoff/dippy").BaseTokenInterface<ConfigManager<import("../../typings/configEntry/common").ConfigEntry, any>>;
+export declare const CLIENT_MODERN_CONFIG_MANAGER_TOKEN: import("@tinkoff/dippy").BaseTokenInterface<ConfigManager<import("../../typings/configEntry/common").ConfigEntry, any>>;
+export declare const SERVER_CONFIG_MANAGER_TOKEN: import("@tinkoff/dippy").BaseTokenInterface<ConfigManager<import("../../typings/configEntry/common").ConfigEntry, any>>;
+export declare const WEBPACK_CLIENT_CONFIG_TOKEN: import("@tinkoff/dippy").BaseTokenInterface<Config>;
+export declare const WEBPACK_CLIENT_MODERN_CONFIG_TOKEN: import("@tinkoff/dippy").BaseTokenInterface<Config>;
+export declare const WEBPACK_SERVER_CONFIG_TOKEN: import("@tinkoff/dippy").BaseTokenInterface<Config>;
+export declare const WEBPACK_COMPILER_TOKEN: import("@tinkoff/dippy").BaseTokenInterface<MultiCompiler>;
+export declare const WEBPACK_CLIENT_COMPILER_TOKEN: import("@tinkoff/dippy").BaseTokenInterface<Compiler>;
+export declare const WEBPACK_CLIENT_MODERN_COMPILER_TOKEN: import("@tinkoff/dippy").BaseTokenInterface<Compiler>;
+export declare const WEBPACK_SERVER_COMPILER_TOKEN: import("@tinkoff/dippy").BaseTokenInterface<Compiler>;
+export declare const WEBPACK_WATCHING_TOKEN: import("@tinkoff/dippy").BaseTokenInterface<Watching>;
 /**
  * Statistics about compilation - timing of the build etc.
  */
-export declare const GET_BUILD_STATS_TOKEN: import("@tinkoff/dippy/lib/createToken/createToken").BaseTokenInterface<GetBuildStats>;
-export declare const EVENT_EMITTER_TOKEN: import("@tinkoff/dippy/lib/createToken/createToken").BaseTokenInterface<EventEmitter>;
-export declare const WEBPACK_ANALYZE_PLUGIN_NAME_TOKEN: import("@tinkoff/dippy/lib/createToken/createToken").BaseTokenInterface<string>;
-export declare const WEBPACK_ANALYZE_PLUGIN_TOKEN: import("@tinkoff/dippy/lib/createToken/createToken").BaseTokenInterface<AnalyzePlugin>;
-export declare const INIT_HANDLER_TOKEN: import("@tinkoff/dippy/lib/createToken/createToken").MultiTokenInterface<() => Promise<void> | void>;
-export declare const PROCESS_HANDLER_TOKEN: import("@tinkoff/dippy/lib/createToken/createToken").MultiTokenInterface<() => Promise<void> | void>;
-export declare const CLOSE_HANDLER_TOKEN: import("@tinkoff/dippy/lib/createToken/createToken").MultiTokenInterface<() => Promise<void> | void>;
+export declare const GET_BUILD_STATS_TOKEN: import("@tinkoff/dippy").BaseTokenInterface<GetBuildStats>;
+export declare const EVENT_EMITTER_TOKEN: import("@tinkoff/dippy").BaseTokenInterface<EventEmitter>;
+export declare const WEBPACK_ANALYZE_PLUGIN_NAME_TOKEN: import("@tinkoff/dippy").BaseTokenInterface<string>;
+export declare const WEBPACK_ANALYZE_PLUGIN_TOKEN: import("@tinkoff/dippy").BaseTokenInterface<AnalyzePlugin>;
+export declare const INIT_HANDLER_TOKEN: import("@tinkoff/dippy").MultiTokenInterface<() => Promise<void> | void>;
+export declare const PROCESS_HANDLER_TOKEN: import("@tinkoff/dippy").MultiTokenInterface<() => Promise<void> | void>;
+export declare const CLOSE_HANDLER_TOKEN: import("@tinkoff/dippy").MultiTokenInterface<() => Promise<void> | void>;

package/lib/commands/index.d.ts

@@ -1 +1 @@
-export declare const app: import("@tinkoff/dippy/lib/createToken/createToken").BaseTokenInterface<import("../di/tokens").CommandRunner>;
+export declare const app: import("@tinkoff/dippy").BaseTokenInterface<import("../di/tokens").CommandRunner>;

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

@@ -1,7 +1,7 @@
 import type { Analytics } from '../../models/analytics';
-export declare const ANALYTICS_TOKEN: import("@tinkoff/dippy/lib/createToken/createToken").BaseTokenInterface<Analytics>;
-export declare const ANALYTICS_TRACKING_CODE_TOKEN: import("@tinkoff/dippy/lib/createToken/createToken").BaseTokenInterface<string>;
-export declare const ANALYTICS_PACKAGE_INFO_TOKEN: import("@tinkoff/dippy/lib/createToken/createToken").BaseTokenInterface<{
+export declare const ANALYTICS_TOKEN: import("@tinkoff/dippy").BaseTokenInterface<Analytics>;
+export declare const ANALYTICS_TRACKING_CODE_TOKEN: import("@tinkoff/dippy").BaseTokenInterface<string>;
+export declare const ANALYTICS_PACKAGE_INFO_TOKEN: import("@tinkoff/dippy").BaseTokenInterface<{
     name: string;
     version: string;
 }>;

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

@@ -1,11 +1,11 @@
 import type { Provider } from '@tinkoff/dippy';
 import type { AbstractBuilderFactory, Builder, BuilderFactory } from '../../typings/build/Builder';
-export declare const BUILDER_TOKEN: import("@tinkoff/dippy/lib/createToken/createToken").BaseTokenInterface<Builder<any>>;
-export declare const BUILDER_FACTORY_TOKEN: import("@tinkoff/dippy/lib/createToken/createToken").BaseTokenInterface<BuilderFactory<any>>;
+export declare const BUILDER_TOKEN: import("@tinkoff/dippy").BaseTokenInterface<Builder<any>>;
+export declare const BUILDER_FACTORY_TOKEN: import("@tinkoff/dippy").BaseTokenInterface<BuilderFactory<any>>;
 interface BuilderModule<Name extends string> {
     name: Name;
     resolveProviders: () => Promise<Provider[]>;
 }
-export declare const BUILDER_MODULE_TOKEN: import("@tinkoff/dippy/lib/createToken/createToken").BaseTokenInterface<BuilderModule<any>>;
-export declare const ABSTRACT_BUILDER_FACTORY_TOKEN: import("@tinkoff/dippy/lib/createToken/createToken").BaseTokenInterface<AbstractBuilderFactory>;
+export declare const BUILDER_MODULE_TOKEN: import("@tinkoff/dippy").BaseTokenInterface<BuilderModule<any>>;
+export declare const ABSTRACT_BUILDER_FACTORY_TOKEN: import("@tinkoff/dippy").BaseTokenInterface<AbstractBuilderFactory>;
 export {};

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

@@ -2,12 +2,12 @@ import type { Command } from '../../typings/commands';
 export interface CommandRunner {
     run(commandName: string, parameters: Record<string, any>): Promise<any>;
 }
-export declare const COMMAND_NAME_TOKEN: import("@tinkoff/dippy/lib/createToken/createToken").BaseTokenInterface<string>;
-export declare const COMMAND_EXECUTION_TOKEN: import("@tinkoff/dippy/lib/createToken/createToken").BaseTokenInterface<Promise<any>>;
-export declare const COMMAND_PARAMETERS_TOKEN: import("@tinkoff/dippy/lib/createToken/createToken").BaseTokenInterface<Record<string, any>>;
-export declare const COMMAND_MAP_TOKEN: import("@tinkoff/dippy/lib/createToken/createToken").BaseTokenInterface<{
+export declare const COMMAND_NAME_TOKEN: import("@tinkoff/dippy").BaseTokenInterface<string>;
+export declare const COMMAND_EXECUTION_TOKEN: import("@tinkoff/dippy").BaseTokenInterface<Promise<any>>;
+export declare const COMMAND_PARAMETERS_TOKEN: import("@tinkoff/dippy").BaseTokenInterface<Record<string, any>>;
+export declare const COMMAND_MAP_TOKEN: import("@tinkoff/dippy").BaseTokenInterface<{
     [name: string]: () => Promise<{
         default: Command;
     }>;
 }>;
-export declare const COMMAND_RUNNER_TOKEN: import("@tinkoff/dippy/lib/createToken/createToken").BaseTokenInterface<CommandRunner>;
+export declare const COMMAND_RUNNER_TOKEN: import("@tinkoff/dippy").BaseTokenInterface<CommandRunner>;

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

@@ -1,8 +1,8 @@
 import type { ConfigEntry } from '../../typings/configEntry/common';
 import type { ConfigManager } from '../../config/configManager';
 import type { Env } from '../../typings/Env';
-export declare const CLI_ROOT_DIR_TOKEN: import("@tinkoff/dippy/lib/createToken/createToken").BaseTokenInterface<string>;
-export declare const CONFIG_ROOT_DIR_TOKEN: import("@tinkoff/dippy/lib/createToken/createToken").BaseTokenInterface<string>;
-export declare const CONFIG_ENV_TOKEN: import("@tinkoff/dippy/lib/createToken/createToken").BaseTokenInterface<Env>;
-export declare const CONFIG_ENTRY_TOKEN: import("@tinkoff/dippy/lib/createToken/createToken").BaseTokenInterface<ConfigEntry>;
-export declare const CONFIG_MANAGER_TOKEN: import("@tinkoff/dippy/lib/createToken/createToken").BaseTokenInterface<ConfigManager<ConfigEntry, any>>;
+export declare const CLI_ROOT_DIR_TOKEN: import("@tinkoff/dippy").BaseTokenInterface<string>;
+export declare const CONFIG_ROOT_DIR_TOKEN: import("@tinkoff/dippy").BaseTokenInterface<string>;
+export declare const CONFIG_ENV_TOKEN: import("@tinkoff/dippy").BaseTokenInterface<Env>;
+export declare const CONFIG_ENTRY_TOKEN: import("@tinkoff/dippy").BaseTokenInterface<ConfigEntry>;
+export declare const CONFIG_MANAGER_TOKEN: import("@tinkoff/dippy").BaseTokenInterface<ConfigManager<ConfigEntry, any>>;

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

@@ -1,2 +1,2 @@
 import type { Logger } from '@tinkoff/logger';
-export declare const LOGGER_TOKEN: import("@tinkoff/dippy/lib/createToken/createToken").BaseTokenInterface<Logger>;
+export declare const LOGGER_TOKEN: import("@tinkoff/dippy").BaseTokenInterface<Logger>;

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

@@ -2,8 +2,8 @@ import type { PackageManager } from '@tinkoff/package-manager-wrapper';
 /**
  * Сервис для работы с зависимостями внутри CLI
  */
-export declare const CLI_PACKAGE_MANAGER: import("@tinkoff/dippy/lib/createToken/createToken").BaseTokenInterface<PackageManager>;
+export declare const CLI_PACKAGE_MANAGER: import("@tinkoff/dippy").BaseTokenInterface<PackageManager>;
 /**
  * Сервис для работы с зависимостями внутри приложения
  */
-export declare const APPLICATION_PACKAGE_MANAGER: import("@tinkoff/dippy/lib/createToken/createToken").BaseTokenInterface<PackageManager>;
+export declare const APPLICATION_PACKAGE_MANAGER: import("@tinkoff/dippy").BaseTokenInterface<PackageManager>;

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

@@ -1,3 +1,3 @@
 import type { StoppableServer } from 'stoppable';
-export declare const SERVER_TOKEN: import("@tinkoff/dippy/lib/createToken/createToken").BaseTokenInterface<StoppableServer>;
-export declare const STATIC_SERVER_TOKEN: import("@tinkoff/dippy/lib/createToken/createToken").BaseTokenInterface<StoppableServer>;
+export declare const SERVER_TOKEN: import("@tinkoff/dippy").BaseTokenInterface<StoppableServer>;
+export declare const STATIC_SERVER_TOKEN: import("@tinkoff/dippy").BaseTokenInterface<StoppableServer>;

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

@@ -1,3 +1,3 @@
 /// <reference types="node" />
-export declare const STDOUT_TOKEN: import("@tinkoff/dippy/lib/createToken/createToken").BaseTokenInterface<NodeJS.WritableStream>;
-export declare const STDERR_TOKEN: import("@tinkoff/dippy/lib/createToken/createToken").BaseTokenInterface<NodeJS.WritableStream>;
+export declare const STDOUT_TOKEN: import("@tinkoff/dippy").BaseTokenInterface<NodeJS.WritableStream>;
+export declare const STDERR_TOKEN: import("@tinkoff/dippy").BaseTokenInterface<NodeJS.WritableStream>;

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

@@ -1,3 +1,3 @@
-export declare const UI_SHOW_BANNER_TOKEN: import("@tinkoff/dippy/lib/createToken/createToken").BaseTokenInterface<boolean>;
-export declare const UI_SHOW_PROGRESS_TOKEN: import("@tinkoff/dippy/lib/createToken/createToken").BaseTokenInterface<boolean>;
-export declare const UI_OS_NOTIFY_TOKEN: import("@tinkoff/dippy/lib/createToken/createToken").BaseTokenInterface<boolean>;
+export declare const UI_SHOW_BANNER_TOKEN: import("@tinkoff/dippy").BaseTokenInterface<boolean>;
+export declare const UI_SHOW_PROGRESS_TOKEN: import("@tinkoff/dippy").BaseTokenInterface<boolean>;
+export declare const UI_OS_NOTIFY_TOKEN: import("@tinkoff/dippy").BaseTokenInterface<boolean>;

package/lib/library/babel/plugins/create-token-pure.d.ts

@@ -1,3 +1,6 @@
 import type { Plugin } from './types.h';
-export declare const createTokenPurePlugin: Plugin;
+interface InnerState {
+    hasCreateToken: boolean;
+}
+export declare const createTokenPurePlugin: Plugin<InnerState>;
 export default createTokenPurePlugin;

package/lib/library/babel/plugins/create-token-pure.js

@@ -4,19 +4,21 @@ exports.createTokenPurePlugin = void 0;
 const tslib_1 = require("tslib");
 const helper_annotate_as_pure_1 = tslib_1.__importDefault(require("@babel/helper-annotate-as-pure"));
 const createTokenPurePlugin = ({ types: t }) => {
-    let hasCreateToken = false;
     return {
+        pre() {
+            this.hasCreateToken = false;
+        },
         visitor: {
             ImportDeclaration(path) {
                 const { node } = path;
                 const sourceValue = node.source.value;
                 if (sourceValue === '@tramvai/core' || sourceValue === '@tinkoff/dippy') {
-                    hasCreateToken = node.specifiers.some((s) => { var _a; return s.type === 'ImportSpecifier' && ((_a = s.local) === null || _a === void 0 ? void 0 : _a.name) === 'createToken'; });
+                    this.hasCreateToken = node.specifiers.some((s) => { var _a; return s.type === 'ImportSpecifier' && ((_a = s.local) === null || _a === void 0 ? void 0 : _a.name) === 'createToken'; });
                 }
             },
             CallExpression(path) {
                 const { node } = path;
-                if (!hasCreateToken) {
+                if (!this.hasCreateToken) {
                     return;
                 }
                 const { callee } = node;

package/lib/library/babel/plugins/create-token-pure.js.map

@@ -1 +1 @@
-{"version":3,"file":"create-token-pure.js","sourceRoot":"","sources":["../../../../src/library/babel/plugins/create-token-pure.ts"],"names":[],"mappings":";;;;AAAA,qGAA4D;AAGrD,MAAM,qBAAqB,GAAW,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE,EAAE;IAC5D,IAAI,cAAc,GAAG,KAAK,CAAC;IAE3B,OAAO;QACL,OAAO,EAAE;YACP,iBAAiB,CAAC,IAAI;gBACpB,MAAM,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC;gBACtB,MAAM,WAAW,GAAG,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC;gBAEtC,IAAI,WAAW,KAAK,eAAe,IAAI,WAAW,KAAK,gBAAgB,EAAE;oBACvE,cAAc,GAAG,IAAI,CAAC,UAAU,CAAC,IAAI,CACnC,CAAC,CAAC,EAAE,EAAE,WAAC,OAAA,CAAC,CAAC,IAAI,KAAK,iBAAiB,IAAI,CAAA,MAAA,CAAC,CAAC,KAAK,0CAAE,IAAI,MAAK,aAAa,CAAA,EAAA,CACvE,CAAC;iBACH;YACH,CAAC;YACD,cAAc,CAAC,IAAI;gBACjB,MAAM,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC;gBAEtB,IAAI,CAAC,cAAc,EAAE;oBACnB,OAAO;iBACR;gBAED,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;gBAExB,IAAI,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,IAAI,MAAK,YAAY,EAAE;oBACjC,IAAI,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,IAAI,MAAK,aAAa,EAAE;wBAClC,iCAAc,CAAC,IAAI,CAAC,CAAC;qBACtB;iBACF;YACH,CAAC;SACF;KACF,CAAC;AACJ,CAAC,CAAC;AAhCW,QAAA,qBAAqB,yBAgChC;AAEF,kBAAe,6BAAqB,CAAC"}
+{"version":3,"file":"create-token-pure.js","sourceRoot":"","sources":["../../../../src/library/babel/plugins/create-token-pure.ts"],"names":[],"mappings":";;;;AAAA,qGAA4D;AAOrD,MAAM,qBAAqB,GAAuB,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE,EAAE;IACxE,OAAO;QACL,GAAG;YACD,IAAI,CAAC,cAAc,GAAG,KAAK,CAAC;QAC9B,CAAC;QACD,OAAO,EAAE;YACP,iBAAiB,CAAC,IAAI;gBACpB,MAAM,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC;gBACtB,MAAM,WAAW,GAAG,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC;gBAEtC,IAAI,WAAW,KAAK,eAAe,IAAI,WAAW,KAAK,gBAAgB,EAAE;oBACvE,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC,UAAU,CAAC,IAAI,CACxC,CAAC,CAAC,EAAE,EAAE,WAAC,OAAA,CAAC,CAAC,IAAI,KAAK,iBAAiB,IAAI,CAAA,MAAA,CAAC,CAAC,KAAK,0CAAE,IAAI,MAAK,aAAa,CAAA,EAAA,CACvE,CAAC;iBACH;YACH,CAAC;YACD,cAAc,CAAC,IAAI;gBACjB,MAAM,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC;gBAEtB,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE;oBACxB,OAAO;iBACR;gBAED,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;gBAExB,IAAI,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,IAAI,MAAK,YAAY,EAAE;oBACjC,IAAI,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,IAAI,MAAK,aAAa,EAAE;wBAClC,iCAAc,CAAC,IAAI,CAAC,CAAC;qBACtB;iBACF;YACH,CAAC;SACF;KACF,CAAC;AACJ,CAAC,CAAC;AAjCW,QAAA,qBAAqB,yBAiChC;AAEF,kBAAe,6BAAqB,CAAC"}

package/lib/utils/shouldUseReactRoot.js

@@ -9,9 +9,9 @@ exports.shouldUseReactRoot = once_1.default(() => {
     var _a;
     // eslint-disable-next-line import/no-extraneous-dependencies
     const reactVersion = require('react').version;
-    const isReactExperimental = Boolean(reactVersion && /0\.0\.0-experimental/.test(reactVersion));
-    const hasReact18 = Boolean(reactVersion) &&
+    const isReactExperimental = reactVersion && /0\.0\.0-experimental/.test(reactVersion);
+    const hasReact18 = reactVersion &&
         (semver_1.default.gte(reactVersion, '18.0.0') || ((_a = semver_1.default.coerce(reactVersion)) === null || _a === void 0 ? void 0 : _a.version) === '18.0.0');
-    return hasReact18 || isReactExperimental;
+    return Boolean(hasReact18 || isReactExperimental);
 });
 //# sourceMappingURL=shouldUseReactRoot.js.map

package/lib/utils/shouldUseReactRoot.js.map

@@ -1 +1 @@
-{"version":3,"file":"shouldUseReactRoot.js","sourceRoot":"","sources":["../../src/utils/shouldUseReactRoot.ts"],"names":[],"mappings":";;;;AAAA,gFAAgD;AAChD,4DAA4B;AAE5B,8FAA8F;AACjF,QAAA,kBAAkB,GAAG,cAAI,CAAC,GAAG,EAAE;;IAC1C,6DAA6D;IAC7D,MAAM,YAAY,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC;IAC9C,MAAM,mBAAmB,GAAG,OAAO,CAAC,YAAY,IAAI,sBAAsB,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC;IAC/F,MAAM,UAAU,GACd,OAAO,CAAC,YAAY,CAAC;QACrB,CAAC,gBAAM,CAAC,GAAG,CAAC,YAAY,EAAE,QAAQ,CAAC,IAAI,CAAA,MAAA,gBAAM,CAAC,MAAM,CAAC,YAAY,CAAC,0CAAE,OAAO,MAAK,QAAQ,CAAC,CAAC;IAE5F,OAAO,UAAU,IAAI,mBAAmB,CAAC;AAC3C,CAAC,CAAC,CAAC"}
+{"version":3,"file":"shouldUseReactRoot.js","sourceRoot":"","sources":["../../src/utils/shouldUseReactRoot.ts"],"names":[],"mappings":";;;;AAAA,gFAAgD;AAChD,4DAA4B;AAE5B,8FAA8F;AACjF,QAAA,kBAAkB,GAAG,cAAI,CAAC,GAAG,EAAE;;IAC1C,6DAA6D;IAC7D,MAAM,YAAY,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC;IAC9C,MAAM,mBAAmB,GAAG,YAAY,IAAI,sBAAsB,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IACtF,MAAM,UAAU,GACd,YAAY;QACZ,CAAC,gBAAM,CAAC,GAAG,CAAC,YAAY,EAAE,QAAQ,CAAC,IAAI,CAAA,MAAA,gBAAM,CAAC,MAAM,CAAC,YAAY,CAAC,0CAAE,OAAO,MAAK,QAAQ,CAAC,CAAC;IAE5F,OAAO,OAAO,CAAC,UAAU,IAAI,mBAAmB,CAAC,CAAC;AACpD,CAAC,CAAC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tramvai/cli",
-  "version": "2.7.0",
+  "version": "2.11.0",
   "description": "Cli инструмент для сборки и запуска приложений",
   "files": [
     "src",
@@ -58,17 +58,17 @@
     "@pmmmwh/react-refresh-webpack-plugin": "^0.5.5",
     "@sentry/node": "^6.2.5",
     "@tinkoff/browserslist-config": "0.1.14",
-    "@tinkoff/dippy": "0.7.44",
+    "@tinkoff/dippy": "0.7.45",
     "@tinkoff/is-modern-lib": "1.2.13",
-    "@tinkoff/logger": "0.10.18",
+    "@tinkoff/logger": "0.10.19",
     "@tinkoff/minicss-class-generator": "0.1.15",
     "@tinkoff/package-manager-wrapper": "0.0.5",
     "@tinkoff/request-core": "^0.9.2",
-    "@tinkoff/request-plugin-protocol-http": "^0.11.4",
+    "@tinkoff/request-plugin-protocol-http": "^0.11.6",
     "@tinkoff/utils": "^2.1.3",
     "@tramvai/build": "2.6.11",
-    "@tramvai/tools-check-versions": "0.3.23",
-    "@tramvai/tools-migrate": "0.5.138",
+    "@tramvai/tools-check-versions": "0.3.24",
+    "@tramvai/tools-migrate": "0.5.139",
     "ajv": "^6.12.6",
     "ansi-escapes": "^4.3.1",
     "autoprefixer": "^10.3.6",

package/src/commands/generate/generators/action/action.ts.hbs

@@ -1,9 +1,9 @@
-import { createAction } from '@tramvai/core';
+import { declareAction } from '@tramvai/core';
 
-export const {{ camelCase name }}Action = createAction({
+export const {{ camelCase name }}Action = declareAction({
   name: '{{ dashCase name }}-action',
-  fn: (context, payload) => {
-    return context.dispatch({ type: 'FAKE_ACTION', payload });
+  fn(payload) {
+    return this.dispatch({ type: 'FAKE_ACTION', payload });
   },
   conditions: {},
 });

package/src/library/babel/plugins/__fixtures__/create-token-pure/already-has-comment.ts

@@ -0,0 +1,5 @@
+// @ts-ignore
+// eslint-disable-next-line import/no-unresolved
+import { createToken } from '@tinkoff/dippy';
+
+export const TOKEN = /* #__PURE__*/ createToken('token');

package/src/library/babel/plugins/__snapshots__/create-token-pure.spec.ts.snap

@@ -34,6 +34,24 @@ import { createToken } from '@tramvai/core';
 export var TOKEN = /*#__PURE__*/ createToken('token');
 
 
+`;
+
+exports[`create-token-pure do not annotate more again: do not annotate more again 1`] = `
+
+// @ts-ignore
+// eslint-disable-next-line import/no-unresolved
+import { createToken } from '@tinkoff/dippy';
+
+export const TOKEN = /* #__PURE__*/ createToken('token');
+
+      ↓ ↓ ↓ ↓ ↓ ↓
+
+// @ts-ignore
+// eslint-disable-next-line import/no-unresolved
+import { createToken } from '@tinkoff/dippy';
+export var TOKEN = /* #__PURE__*/ createToken('token');
+
+
 `;
 
 exports[`create-token-pure do nothing: do nothing 1`] = `

package/src/library/babel/plugins/create-token-pure.spec.ts

@@ -27,5 +27,9 @@ pluginTester({
       fixture: 'from-dippy.ts',
       snapshot: true,
     },
+    'do not annotate more again': {
+      fixture: 'already-has-comment.ts',
+      snapshot: true,
+    },
   },
 });

package/src/library/babel/plugins/create-token-pure.ts

@@ -1,17 +1,22 @@
 import annotateAsPure from '@babel/helper-annotate-as-pure';
 import type { Plugin } from './types.h';
 
-export const createTokenPurePlugin: Plugin = ({ types: t }) => {
-  let hasCreateToken = false;
+interface InnerState {
+  hasCreateToken: boolean;
+}
 
+export const createTokenPurePlugin: Plugin<InnerState> = ({ types: t }) => {
   return {
+    pre() {
+      this.hasCreateToken = false;
+    },
     visitor: {
       ImportDeclaration(path) {
         const { node } = path;
         const sourceValue = node.source.value;
 
         if (sourceValue === '@tramvai/core' || sourceValue === '@tinkoff/dippy') {
-          hasCreateToken = node.specifiers.some(
+          this.hasCreateToken = node.specifiers.some(
             (s) => s.type === 'ImportSpecifier' && s.local?.name === 'createToken'
           );
         }
@@ -19,7 +24,7 @@ export const createTokenPurePlugin: Plugin = ({ types: t }) => {
       CallExpression(path) {
         const { node } = path;
 
-        if (!hasCreateToken) {
+        if (!this.hasCreateToken) {
           return;
         }
 

package/src/utils/shouldUseReactRoot.ts

@@ -5,10 +5,10 @@ import semver from 'semver';
 export const shouldUseReactRoot = once(() => {
   // eslint-disable-next-line import/no-extraneous-dependencies
   const reactVersion = require('react').version;
-  const isReactExperimental = Boolean(reactVersion && /0\.0\.0-experimental/.test(reactVersion));
-  const hasReact18: boolean =
-    Boolean(reactVersion) &&
+  const isReactExperimental = reactVersion && /0\.0\.0-experimental/.test(reactVersion);
+  const hasReact18 =
+    reactVersion &&
     (semver.gte(reactVersion, '18.0.0') || semver.coerce(reactVersion)?.version === '18.0.0');
 
-  return hasReact18 || isReactExperimental;
+  return Boolean(hasReact18 || isReactExperimental);
 });