@tramvai/cli 2.40.0 → 2.45.0

package/lib/api/analyze/index.d.ts

@@ -6,6 +6,6 @@ export interface Params {
     showConfig?: boolean;
     fileCache?: boolean;
 }
-export declare type AnalyzeCommand = (params: Params, providers?: Provider[]) => Promise<void>;
+export type AnalyzeCommand = (params: Params, providers?: Provider[]) => Promise<void>;
 declare const _default: import("../../typings/commands").Command;
 export default _default;

package/lib/api/benchmark/index.d.ts

@@ -10,6 +10,6 @@ export interface Params {
 export interface Result {
     [key: string]: RunStats;
 }
-export declare type BenchmarkCommand = (params: StartParams | BuildParams, providers?: Provider[]) => Promise<StartResult | BuildResult>;
+export type BenchmarkCommand = (params: StartParams | BuildParams, providers?: Provider[]) => Promise<StartResult | BuildResult>;
 declare const _default: import("../../typings/commands").Command;
 export default _default;

package/lib/api/benchmark/types.d.ts

@@ -4,11 +4,11 @@ export interface Stats {
     std: number;
     variance: number;
 }
-export declare type Samples = {
+export type Samples = {
     clientSamples: Stats['samples'];
     serverSamples: Stats['samples'];
 };
-export declare type RunStats = {
+export type RunStats = {
     client: Stats;
     server: Stats;
 };

package/lib/api/build/index.d.ts

@@ -2,7 +2,7 @@ import type { PromiseType } from 'utility-types';
 import type { Provider } from '@tinkoff/dippy';
 import type { WithConfig } from '../shared/types/withConfig';
 import type { Builder } from '../../typings/build/Builder';
-export declare type Params = WithConfig<{
+export type Params = WithConfig<{
     buildType?: 'server' | 'client' | 'all' | 'none';
     debug?: boolean;
     profile?: boolean;
@@ -16,9 +16,9 @@ export declare type Params = WithConfig<{
     watchMode?: boolean;
     forPublish?: boolean;
 }>;
-export declare type Result<T extends string = any> = Promise<PromiseType<ReturnType<Builder<T>['build']>> & {
+export type Result<T extends string = any> = Promise<PromiseType<ReturnType<Builder<T>['build']>> & {
     builder?: Builder<T>;
 }>;
-export declare type BuildCommand = (params: Params, providers?: Provider[]) => Result;
+export type BuildCommand = (params: Params, providers?: Provider[]) => Result;
 declare const _default: import("../../typings/commands").Command;
 export default _default;

package/lib/api/shared/types/withConfig.d.ts

@@ -3,7 +3,7 @@ import type { ModuleConfigEntry } from '../../../typings/configEntry/module';
 import type { WithRootDir } from './withRootDir';
 import type { PackageConfigEntry } from '../../../typings/configEntry/package';
 import type { ChildAppConfigEntry } from '../../../typings/configEntry/child-app';
-export declare type WithConfig<T> = WithRootDir<T> & ({
+export type WithConfig<T> = WithRootDir<T> & ({
     target: string;
 } | {
     config: ApplicationConfigEntry | ModuleConfigEntry | PackageConfigEntry | ChildAppConfigEntry;

package/lib/api/shared/types/withRootDir.d.ts

@@ -1,4 +1,4 @@
 import type { BaseParams } from './base';
-export declare type WithRootDir<T> = T & BaseParams & {
+export type WithRootDir<T> = T & BaseParams & {
     rootDir?: string;
 };

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

@@ -4,7 +4,7 @@ import type { PromiseType } from 'utility-types';
 import type { Provider } from '@tinkoff/dippy';
 import type { WithConfig } from '../shared/types/withConfig';
 import type { Builder } from '../../typings/build/Builder';
-export declare type Params = WithConfig<{
+export type Params = WithConfig<{
     buildType?: 'server' | 'client' | 'all';
     host?: string;
     port?: number;
@@ -24,12 +24,12 @@ export declare type Params = WithConfig<{
     strictErrorHandle?: boolean;
     fileCache?: boolean;
 }>;
-export declare type Result<T extends string = any> = Promise<PromiseType<ReturnType<Builder<T>['start']>> & {
+export type Result<T extends string = any> = Promise<PromiseType<ReturnType<Builder<T>['start']>> & {
     close: () => Promise<void>;
     staticServer?: Server;
     server?: Server;
     builder: Builder<T>;
 }>;
-export declare type StartCommand = (params: Params, providers?: Provider[]) => Result;
+export type StartCommand = (params: Params, providers?: Provider[]) => Result;
 declare const _default: import("../../typings/commands").Command;
 export default _default;

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

@@ -6,7 +6,7 @@ import type { ChildProcess } from 'child_process';
 import type { Provider } from '@tinkoff/dippy';
 import type { WithConfig } from '../shared/types/withConfig';
 import type { Builder } from '../../typings/build/Builder';
-export declare type Params = WithConfig<{
+export type Params = WithConfig<{
     buildType?: 'server' | 'client' | 'all' | 'none';
     host?: string;
     port?: number;
@@ -19,12 +19,12 @@ export declare type Params = WithConfig<{
     env?: Record<string, string>;
     fileCache?: boolean;
 }>;
-export declare type Result<T extends string = any> = Promise<PromiseType<ReturnType<Builder<T>['build']>> & {
+export type Result<T extends string = any> = Promise<PromiseType<ReturnType<Builder<T>['build']>> & {
     close: () => Promise<void>;
     staticServer?: Server;
     serverProcess?: ChildProcess;
     builder: Builder<T>;
 }>;
-export declare type StartProdCommand = (params: Params, providers?: Provider[]) => Result;
+export type StartProdCommand = (params: Params, providers?: Provider[]) => Result;
 declare const _default: import("../../typings/commands").Command;
 export default _default;

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

@@ -1,6 +1,6 @@
 import type Config from 'webpack-chain';
 import type { ConfigManager } from '../../config/configManager';
-export declare type ConfigGenerator = (arg: {
+export type ConfigGenerator = (arg: {
     configManager: ConfigManager;
     showProgress?: boolean;
 }) => Config;

package/lib/commands/add/add.d.ts

@@ -1,6 +1,6 @@
 import type { Context } from '../../models/context';
 import type { CommandResult } from '../../models/command';
-export declare type Params = {
+export type Params = {
     packageName: string;
     dev?: boolean;
 };

package/lib/commands/analyze/command.d.ts

@@ -1,5 +1,5 @@
 import { CLICommand } from '../../models/command';
-export declare type Params = {
+export type Params = {
     target: string;
     plugin?: 'bundle' | 'whybundled' | 'statoscope';
     showConfig?: boolean;

package/lib/commands/benchmark/command.d.ts

@@ -1,6 +1,6 @@
 import { CLICommand } from '../../models/command';
 import type { Params as StartParams } from '../start/command';
-export declare type Params = StartParams & {
+export type Params = StartParams & {
     times?: number;
 };
 export declare class BenchmarkCommand extends CLICommand<Params> {

package/lib/commands/build/command.d.ts

@@ -1,6 +1,6 @@
 import { CLICommand } from '../../models/command';
 import type { BuildCommand as BuildCommandType } from '../../api/build';
-export declare type Params = Parameters<BuildCommandType>[0] & {
+export type Params = Parameters<BuildCommandType>[0] & {
     target: string;
 };
 declare class BuildCommand extends CLICommand<Params> {

package/lib/commands/generate/command.d.ts

@@ -1,6 +1,6 @@
 import { CLICommand } from '../../models/command';
-export declare type GeneratorName = 'action' | 'reducer' | 'component' | 'page' | 'bundle' | 'module';
-export declare type Params = {
+export type GeneratorName = 'action' | 'reducer' | 'component' | 'page' | 'bundle' | 'module';
+export type Params = {
     generator?: GeneratorName;
     target?: string;
 };

package/lib/commands/generate/generators/typings.d.ts

@@ -1,6 +1,6 @@
 import type { PlopGeneratorConfig } from 'node-plop';
 import type { ConfigEntry } from '../../../typings/configEntry/common';
-export declare type GeneratorFactoryArgs = {
+export type GeneratorFactoryArgs = {
     configEntry: ConfigEntry;
 };
-export declare type GeneratorFactory = (args: GeneratorFactoryArgs) => PlopGeneratorConfig;
+export type GeneratorFactory = (args: GeneratorFactoryArgs) => PlopGeneratorConfig;

package/lib/commands/generate/utils/withAutocomplete.d.ts

@@ -1,4 +1,4 @@
-declare type QuestionWithAutoComplete = {
+type QuestionWithAutoComplete = {
     message: string;
     name: string;
     choices: string[];

package/lib/commands/new/questions/packageManager.d.ts

@@ -1,4 +1,4 @@
-declare type PackageManagers = 'npm' | 'yarn';
+type PackageManagers = 'npm' | 'yarn';
 declare const packageManagerQuestion: (answer: any) => {
     type: "list";
     name: "packageManager";

package/lib/commands/new/questions/template.d.ts

@@ -1,4 +1,4 @@
-declare type Templates = 'multirepo' | 'monorepo';
+type Templates = 'multirepo' | 'monorepo';
 declare const templateQuestion: (answer: any) => {
     type: "list";
     name: "template";

package/lib/commands/new/questions/testingFramework.d.ts

@@ -1,4 +1,4 @@
-declare type TestingFrameworks = 'none' | 'jest';
+type TestingFrameworks = 'none' | 'jest';
 declare const testingFrameworkQuestion: (answer: any) => {
     type: "list";
     name: "testingFramework";

package/lib/commands/new/questions/type.d.ts

@@ -1,4 +1,4 @@
-declare type Type = 'app' | 'child-app';
+type Type = 'app' | 'child-app';
 declare const typeQuestion: (answer: any) => {
     type: "list";
     name: "type";

package/lib/commands/new/typings.d.ts

@@ -2,8 +2,8 @@ import type { Type } from './questions/type';
 import type { Templates } from './questions/template';
 import type { PackageManagers } from './questions/packageManager';
 import type { TestingFrameworks } from './questions/testingFramework';
-export declare type GeneratingType = 'application' | 'module' | 'package';
-export declare type Params = {
+export type GeneratingType = 'application' | 'module' | 'package';
+export type Params = {
     name: string;
     target: GeneratingType;
     type: Type;

package/lib/commands/start/command.d.ts

@@ -1,6 +1,6 @@
 import { CLICommand } from '../../models/command';
 import type { StartCommand as StartCommandType } from '../../api/start';
-export declare type Params = Parameters<StartCommandType>[0] & {
+export type Params = Parameters<StartCommandType>[0] & {
     target: string;
 };
 export declare class StartCommand extends CLICommand<Params> {

package/lib/commands/static/command.d.ts

@@ -1,5 +1,5 @@
 import { CLICommand } from '../../models/command';
-export declare type Params = {
+export type Params = {
     target: string;
     showConfig?: boolean;
     serve?: boolean;

package/lib/commands/update/checkVersionValidator.d.ts

@@ -1,5 +1,5 @@
 import type { Params } from './update';
-export declare const checkVersion: (_: any, { to }: Params) => Promise<{
+export declare const checkVersion: (_: any, { to: version }: Params) => Promise<{
     name: string;
     status: string;
 }>;

package/lib/commands/update/command.d.ts

@@ -6,7 +6,7 @@ declare class UpdateCommand extends CLICommand {
     command: string;
     options: any[];
     alias: string;
-    validators: ((_: any, { to }: Params) => Promise<{
+    validators: ((_: any, { to: version }: Params) => Promise<{
         name: string;
         status: string;
     }>)[];

package/lib/commands/update/update.d.ts

@@ -1,7 +1,7 @@
 import type { Context } from '../../models/context';
 import type { CommandResult } from '../../models/command';
-export declare type Params = {
+export type Params = {
     to: string;
 };
-declare const _default: (context: Context, { to }: Params) => Promise<CommandResult>;
+declare const _default: (context: Context, { to: version }: Params) => Promise<CommandResult>;
 export default _default;

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

@@ -1,7 +1,7 @@
 import type { Provider } from '@tinkoff/dippy';
 import { DI_TOKEN } from '@tinkoff/dippy';
 import { COMMAND_RUNNER_TOKEN, COMMAND_MAP_TOKEN } from '../tokens';
-declare type Interface = typeof COMMAND_RUNNER_TOKEN;
+type Interface = typeof COMMAND_RUNNER_TOKEN;
 export declare class CommandRunner implements Interface {
     commands: typeof COMMAND_MAP_TOKEN;
     rootContainer: typeof DI_TOKEN;

package/lib/external/pages.d.ts

@@ -1,6 +1,7 @@
-import type { LazyComponentWrapper, PageComponent } from '@tramvai/react';
+import type { LazyComponentWrapper, NestedLayoutComponent, PageComponent } from '@tramvai/react';
 declare const _default: {
     routes: Record<string, LazyComponentWrapper<PageComponent>>;
     pages: Record<string, LazyComponentWrapper<PageComponent>>;
+    layouts: Record<string, LazyComponentWrapper<NestedLayoutComponent>>;
 };
 export default _default;

package/lib/external/pages.js

@@ -4,5 +4,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = {
     routes: {},
     pages: {},
+    layouts: {},
 };
 //# sourceMappingURL=pages.js.map

package/lib/external/pages.js.map

@@ -1 +1 @@
-{"version":3,"file":"pages.js","sourceRoot":"","sources":["../../src/external/pages.ts"],"names":[],"mappings":";;AAEA,oDAAoD;AACpD,kBAAe;IACb,MAAM,EAAE,EAAE;IACV,KAAK,EAAE,EAAE;CAIV,CAAC"}
+{"version":3,"file":"pages.js","sourceRoot":"","sources":["../../src/external/pages.ts"],"names":[],"mappings":";;AAEA,oDAAoD;AACpD,kBAAe;IACb,MAAM,EAAE,EAAE;IACV,KAAK,EAAE,EAAE;IACT,OAAO,EAAE,EAAE;CAKZ,CAAC"}

package/lib/library/babel/index.d.ts

@@ -8,7 +8,7 @@ interface BabelConfig {
     generateDataQaTag?: boolean;
     enableFillActionNamePlugin?: boolean;
     typescript?: boolean;
-    modules?: string | boolean;
+    modules?: string | false;
     loader?: boolean;
     useESModules?: boolean;
     removeTypeofWindow?: boolean;
@@ -23,7 +23,7 @@ export declare const babelConfigFactory: ({ env, target, modern, isServer, modul
     compact: boolean;
     sourceType: "unambiguous";
     presets: (string | (string | {
-        modules: string | boolean;
+        modules: string | false;
         useBuiltIns: string;
         corejs: string;
         loose: boolean;
@@ -58,7 +58,7 @@ export declare const babelConfigFactory: ({ env, target, modern, isServer, modul
     compact?: undefined;
     sourceType: "unambiguous";
     presets: (string | (string | {
-        modules: string | boolean;
+        modules: string | false;
         useBuiltIns: string;
         corejs: string;
         loose: boolean;

package/lib/library/babel/plugins/lazy-component/properties/types.d.ts

@@ -1,9 +1,9 @@
 import type { types, template, NodePath } from '@babel/core';
 import type { FunctionExpression, CallExpression, ObjectMember, ArrowFunctionExpression } from '@babel/types';
-export declare type LazyCallPath = NodePath<CallExpression>;
-export declare type FuncPath = NodePath<FunctionExpression | ArrowFunctionExpression>;
-export declare type ImportPath = NodePath<CallExpression>;
-export declare type PropertyFactory = (arg: {
+export type LazyCallPath = NodePath<CallExpression>;
+export type FuncPath = NodePath<FunctionExpression | ArrowFunctionExpression>;
+export type ImportPath = NodePath<CallExpression>;
+export type PropertyFactory = (arg: {
     types: typeof types;
     template: typeof template;
 }) => (arg: {

package/lib/library/babel/plugins/types.h.d.ts

@@ -3,4 +3,4 @@ export interface Babel {
     types: typeof types;
     template: typeof template;
 }
-export declare type Plugin<PluginOptions = void> = (babel: Babel) => PluginObj<PluginOptions>;
+export type Plugin<PluginOptions = void> = (babel: Babel) => PluginObj<PluginOptions>;

package/lib/library/generate/printResultInfo.d.ts

@@ -1,4 +1,4 @@
 import type { PlopGenerator } from 'node-plop';
-declare type RunActionsResult = ReturnType<PlopGenerator['runActions']> extends Promise<infer Result> ? Result : any;
+type RunActionsResult = ReturnType<PlopGenerator['runActions']> extends Promise<infer Result> ? Result : any;
 export declare function printActionsResult({ changes, failures }: RunActionsResult): void;
 export {};

package/lib/library/generate/runGenerator.d.ts

@@ -1,5 +1,5 @@
 import type { PlopGenerator } from 'node-plop';
-declare type RunOptions = {
+type RunOptions = {
     dataForActions?: Record<string, any>;
     promptsAnswers?: any[];
 };

package/lib/library/swc/index.d.ts

@@ -1,3 +1,4 @@
+import type { Config } from '@swc/core';
 import type { Env } from '../../typings/Env';
 import type { Target } from '../../typings/target';
 interface SWCConfig {
@@ -6,7 +7,7 @@ interface SWCConfig {
     modern?: boolean;
     isServer?: boolean;
     typescript?: boolean;
-    modules?: string | boolean;
+    modules?: Config['module']['type'] | false;
     removeTypeofWindow?: boolean;
     alias?: Record<string, any>;
     bugfixes?: boolean;
@@ -14,37 +15,5 @@ interface SWCConfig {
     hot?: boolean;
     rootDir?: string;
 }
-export declare const getSwcOptions: ({ env, target, modern, isServer, modules, typescript, hot, rootDir, }: SWCConfig) => {
-    env: {
-        targets: string[];
-        corejs: string;
-        loose: boolean;
-        mode: string;
-    };
-    module: {
-        type: string | true;
-    };
-    jsc: {
-        parser: {
-            syntax: string;
-            decorators: boolean;
-        };
-        transform: {
-            legacyDecorator: boolean;
-            react: {
-                runtime: string;
-                useSpread: boolean;
-                development: boolean;
-                refresh: boolean;
-            };
-            optimizer: {
-                globals: {
-                    typeofs: {
-                        window: string;
-                    };
-                };
-            };
-        };
-    };
-};
+export declare const getSwcOptions: ({ env, target, modern, isServer, modules, typescript, hot, rootDir, }: SWCConfig) => Config;
 export {};

package/lib/library/swc/index.js

@@ -5,17 +5,37 @@ const tslib_1 = require("tslib");
 const browserslist_1 = tslib_1.__importDefault(require("browserslist"));
 const browserslist_config_1 = tslib_1.__importDefault(require("@tinkoff/browserslist-config"));
 const resolve_1 = require("resolve");
-function hasJsxRuntime() {
-    try {
-        (0, resolve_1.sync)('react/jsx-runtime', { basedir: process.cwd() });
-        return true;
-    }
-    catch (e) {
-        return false;
-    }
-}
+const find_cache_dir_1 = tslib_1.__importDefault(require("find-cache-dir"));
+const TRAMVAI_SWC_TARGET_PATH = '@tramvai/swc-integration/target/wasm32-wasi';
 const getSwcOptions = ({ env = 'development', target, modern, isServer = false, modules = false, typescript = false, hot = false, rootDir = process.cwd(), }) => {
     var _a, _b;
+    const resolveWasmFile = (pluginName, type) => {
+        return (0, resolve_1.sync)(`${TRAMVAI_SWC_TARGET_PATH}/${type}/${pluginName}.wasm`, {
+            basedir: rootDir,
+        });
+    };
+    const resolveTramvaiSwcPlugin = (pluginName) => {
+        try {
+            return resolveWasmFile(pluginName, 'debug');
+        }
+        catch (_) {
+            try {
+                return resolveWasmFile(pluginName, 'release');
+            }
+            catch (__) {
+                throw new Error(`Cannot find tramvai swc-plugin "${pluginName}" related to the "${rootDir}" directory`);
+            }
+        }
+    };
+    function hasJsxRuntime() {
+        try {
+            (0, resolve_1.sync)('react/jsx-runtime', { basedir: rootDir });
+            return true;
+        }
+        catch (e) {
+            return false;
+        }
+    }
     let resultTarget = target;
     if (!target) {
         if (isServer) {
@@ -35,7 +55,7 @@ const getSwcOptions = ({ env = 'development', target, modern, isServer = false,
     return {
         env: {
             targets,
-            corejs: '3',
+            coreJs: '3',
             loose: true,
             mode: 'entry',
         },
@@ -53,18 +73,26 @@ const getSwcOptions = ({ env = 'development', target, modern, isServer = false,
                 legacyDecorator: true,
                 react: {
                     runtime: hasJsxRuntime() ? 'automatic' : 'classic',
-                    useSpread: true,
                     development: env === 'development',
                     refresh: hot && !isServer,
                 },
                 optimizer: {
                     globals: {
+                        // @ts-ignore
+                        // TODO: there is not typings for typeofs, but the field is mentioned in docs
                         typeofs: {
                             window: isServer ? 'undefined' : 'object',
                         },
                     },
                 },
             },
+            experimental: {
+                cacheRoot: (0, find_cache_dir_1.default)({ cwd: rootDir, name: 'swc' }),
+                plugins: [
+                    [resolveTramvaiSwcPlugin('create_token_pure'), {}],
+                    [resolveTramvaiSwcPlugin('lazy_component'), {}],
+                ],
+            },
         },
     };
 };

package/lib/library/swc/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/library/swc/index.ts"],"names":[],"mappings":";;;;AAAA,wEAAwC;AACxC,+FAAsD;AACtD,qCAA0C;AAmB1C,SAAS,aAAa;IACpB,IAAI;QACF,IAAA,cAAO,EAAC,mBAAmB,EAAE,EAAE,OAAO,EAAE,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;QACzD,OAAO,IAAI,CAAC;KACb;IAAC,OAAO,CAAC,EAAE;QACV,OAAO,KAAK,CAAC;KACd;AACH,CAAC;AACM,MAAM,aAAa,GAAG,CAAC,EAC5B,GAAG,GAAG,aAAa,EACnB,MAAM,EACN,MAAM,EACN,QAAQ,GAAG,KAAK,EAChB,OAAO,GAAG,KAAK,EACf,UAAU,GAAG,KAAK,EAClB,GAAG,GAAG,KAAK,EACX,OAAO,GAAG,OAAO,CAAC,GAAG,EAAE,GACb,EAAE,EAAE;;IACd,IAAI,YAAY,GAAG,MAAM,CAAC;IAE1B,IAAI,CAAC,MAAM,EAAE;QACX,IAAI,QAAQ,EAAE;YACZ,YAAY,GAAG,MAAM,CAAC;SACvB;aAAM,IAAI,MAAM,EAAE;YACjB,YAAY,GAAG,QAAQ,CAAC;SACzB;KACF;IAED,MAAM,qBAAqB,GAAG,sBAAY,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;IAE/D,oGAAoG;IACpG,MAAM,iBAAiB,GACrB,MAAA,MAAA,qBAAqB,aAArB,qBAAqB,uBAArB,qBAAqB,CAAG,YAAY,CAAC,mCAAI,6BAAU,CAAC,YAAY,CAAC,mCAAI,6BAAU,CAAC,QAAQ,CAAC;IAE3F,MAAM,OAAO,GAAG,IAAA,sBAAY,EAAC,iBAAiB,EAAE;QAC9C,eAAe,EAAE,IAAI;QACrB,GAAG,EAAE,YAAY;KAClB,CAAC,CAAC;IAEH,OAAO;QACL,GAAG,EAAE;YACH,OAAO;YACP,MAAM,EAAE,GAAG;YACX,KAAK,EAAE,IAAI;YACX,IAAI,EAAE,OAAO;SACd;QACD,MAAM,EAAE;YACN,IAAI,EAAE,OAAO,IAAI,KAAK;SACvB;QACD,GAAG,EAAE;YACH,sEAAsE;YACtE,yBAAyB;YACzB,MAAM,EAAE;gBACN,MAAM,EAAE,UAAU,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,YAAY;gBAChD,UAAU,EAAE,IAAI;aACjB;YACD,SAAS,EAAE;gBACT,eAAe,EAAE,IAAI;gBACrB,KAAK,EAAE;oBACL,OAAO,EAAE,aAAa,EAAE,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,SAAS;oBAClD,SAAS,EAAE,IAAI;oBACf,WAAW,EAAE,GAAG,KAAK,aAAa;oBAClC,OAAO,EAAE,GAAG,IAAI,CAAC,QAAQ;iBAC1B;gBACD,SAAS,EAAE;oBACT,OAAO,EAAE;wBACP,OAAO,EAAE;4BACP,MAAM,EAAE,QAAQ,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,QAAQ;yBAC1C;qBACF;iBACF;aACF;SACF;KACF,CAAC;AACJ,CAAC,CAAC;AAlEW,QAAA,aAAa,iBAkExB"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/library/swc/index.ts"],"names":[],"mappings":"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"}

package/lib/library/typescript/index.d.ts

@@ -33,7 +33,7 @@ declare const _default: (options: Options) => {
         sourceType: "unambiguous";
         compact?: boolean;
         presets: (string | (string | {
-            modules: string | boolean;
+            modules: string | false;
             useBuiltIns: string;
             corejs: string;
             loose: boolean;

package/lib/library/webpack/blocks/js.js

@@ -17,7 +17,7 @@ exports.default = (configManager) => (config) => {
             .loader('thread-loader')
             .options((0, workersPool_1.createWorkerPoolBabel)(configManager))
             .end())
-            .use('babel');
+            .use('transpiler');
         return (0, transpiler_1.addTranspilerLoader)(configManager, cfg, babelCfg);
     };
     if (transpileOnlyModernLibs) {

package/lib/library/webpack/blocks/js.js.map

@@ -1 +1 @@
-{"version":3,"file":"js.js","sourceRoot":"","sources":["../../../../src/library/webpack/blocks/js.ts"],"names":[],"mappings":";;AACA,0DAA0D;AAE1D,sDAA6D;AAE7D,oDAA+E;AAE/E,oDAAoD;AACpD,kBAAe,CAAC,aAA4B,EAAE,EAAE,CAAC,CAAC,MAAc,EAAE,EAAE;IAClE,MAAM,gBAAgB,GAAG,IAAA,gCAAmB,EAAC,aAAa,CAAC,CAAC;IAC5D,MAAM,EAAE,uBAAuB,EAAE,GAAG,aAAa,CAAC,KAAK,CAAC,cAAc,CAAC;IAEvE,MAAM,MAAM,GAAG,CAAC,QAA2C,EAAE,EAAE,CAAC,CAAC,IAAiB,EAAE,EAAE;QACpF,MAAM,GAAG,GAAG,IAAI;aACb,IAAI,CAAC,gBAAgB,CAAC;aACtB,KAAK,CAAC,SAAS,CAAC;YACjB,6DAA6D;aAC5D,IAAI,CAAC,OAAO,CAAC,QAAQ,KAAK,OAAO,IAAI,CAAC,aAAa,CAAC,KAAK,EAAE,CAAC,GAAG,EAAE,EAAE,CAClE,GAAG;aACA,GAAG,CAAC,QAAQ,CAAC;aACb,MAAM,CAAC,eAAe,CAAC;aACvB,OAAO,CAAC,IAAA,mCAAqB,EAAC,aAAa,CAAC,CAAC;aAC7C,GAAG,EAAE,CACT;aACA,GAAG,CAAC,OAAO,CAAC,CAAC;QAEhB,OAAO,IAAA,gCAAmB,EAAC,aAAa,EAAE,GAAG,EAAE,QAAQ,CAAC,CAAC;IAC3D,CAAC,CAAC;IAEF,IAAI,uBAAuB,EAAE;QAC3B,MAAM,CAAC,MAAM;aACV,IAAI,CAAC,YAAY,CAAC;aAClB,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC;aAC3B,GAAG,EAAE;aACL,KAAK,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC,CAAC;QAEnC,MAAM,CAAC,MAAM;aACV,IAAI,CAAC,iBAAiB,CAAC;aACvB,OAAO,CAAC,GAAG,CAAC,gCAAgB,CAAC;aAC7B,GAAG,EAAE;aACL,KAAK,CAAC,MAAM,iCAAM,gBAAgB,KAAE,GAAG,EAAE,KAAK,IAAG,CAAC;aAClD,KAAK,CAAC;YACL,sEAAsE;YACtE,8CAA8C;YAC9C,OAAO,EAAE,EAAE,cAAc,EAAE,KAAK,EAAE;SACnC,CAAC,CAAC;KACN;SAAM;QACL,MAAM,CAAC,MAAM;aACV,IAAI,CAAC,YAAY,CAAC;aAClB,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC;aAC3B,GAAG,EAAE;aACL,KAAK,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC,CAAC;QAEnC,MAAM,CAAC,MAAM;aACV,IAAI,CAAC,iBAAiB,CAAC;aACvB,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC;aAC3B,GAAG,EAAE;aACL,KAAK,CAAC,MAAM,iCAAM,gBAAgB,KAAE,GAAG,EAAE,KAAK,IAAG,CAAC;aAClD,KAAK,CAAC;YACL,sEAAsE;YACtE,8CAA8C;YAC9C,OAAO,EAAE,EAAE,cAAc,EAAE,KAAK,EAAE;SACnC,CAAC,CAAC;KACN;AACH,CAAC,CAAC"}
+{"version":3,"file":"js.js","sourceRoot":"","sources":["../../../../src/library/webpack/blocks/js.ts"],"names":[],"mappings":";;AACA,0DAA0D;AAE1D,sDAA6D;AAE7D,oDAA+E;AAE/E,oDAAoD;AACpD,kBAAe,CAAC,aAA4B,EAAE,EAAE,CAAC,CAAC,MAAc,EAAE,EAAE;IAClE,MAAM,gBAAgB,GAAG,IAAA,gCAAmB,EAAC,aAAa,CAAC,CAAC;IAC5D,MAAM,EAAE,uBAAuB,EAAE,GAAG,aAAa,CAAC,KAAK,CAAC,cAAc,CAAC;IAEvE,MAAM,MAAM,GAAG,CAAC,QAA2C,EAAE,EAAE,CAAC,CAAC,IAAiB,EAAE,EAAE;QACpF,MAAM,GAAG,GAAG,IAAI;aACb,IAAI,CAAC,gBAAgB,CAAC;aACtB,KAAK,CAAC,SAAS,CAAC;YACjB,6DAA6D;aAC5D,IAAI,CAAC,OAAO,CAAC,QAAQ,KAAK,OAAO,IAAI,CAAC,aAAa,CAAC,KAAK,EAAE,CAAC,GAAG,EAAE,EAAE,CAClE,GAAG;aACA,GAAG,CAAC,QAAQ,CAAC;aACb,MAAM,CAAC,eAAe,CAAC;aACvB,OAAO,CAAC,IAAA,mCAAqB,EAAC,aAAa,CAAC,CAAC;aAC7C,GAAG,EAAE,CACT;aACA,GAAG,CAAC,YAAY,CAAC,CAAC;QAErB,OAAO,IAAA,gCAAmB,EAAC,aAAa,EAAE,GAAG,EAAE,QAAQ,CAAC,CAAC;IAC3D,CAAC,CAAC;IAEF,IAAI,uBAAuB,EAAE;QAC3B,MAAM,CAAC,MAAM;aACV,IAAI,CAAC,YAAY,CAAC;aAClB,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC;aAC3B,GAAG,EAAE;aACL,KAAK,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC,CAAC;QAEnC,MAAM,CAAC,MAAM;aACV,IAAI,CAAC,iBAAiB,CAAC;aACvB,OAAO,CAAC,GAAG,CAAC,gCAAgB,CAAC;aAC7B,GAAG,EAAE;aACL,KAAK,CAAC,MAAM,iCAAM,gBAAgB,KAAE,GAAG,EAAE,KAAK,IAAG,CAAC;aAClD,KAAK,CAAC;YACL,sEAAsE;YACtE,8CAA8C;YAC9C,OAAO,EAAE,EAAE,cAAc,EAAE,KAAK,EAAE;SACnC,CAAC,CAAC;KACN;SAAM;QACL,MAAM,CAAC,MAAM;aACV,IAAI,CAAC,YAAY,CAAC;aAClB,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC;aAC3B,GAAG,EAAE;aACL,KAAK,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC,CAAC;QAEnC,MAAM,CAAC,MAAM;aACV,IAAI,CAAC,iBAAiB,CAAC;aACvB,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC;aAC3B,GAAG,EAAE;aACL,KAAK,CAAC,MAAM,iCAAM,gBAAgB,KAAE,GAAG,EAAE,KAAK,IAAG,CAAC;aAClD,KAAK,CAAC;YACL,sEAAsE;YACtE,8CAA8C;YAC9C,OAAO,EAAE,EAAE,cAAc,EAAE,KAAK,EAAE;SACnC,CAAC,CAAC;KACN;AACH,CAAC,CAAC"}

package/lib/library/webpack/blocks/ts.js

@@ -12,7 +12,7 @@ exports.default = (configManager) => (config) => {
         .oneOf('default')
         // TODO разобраться почему на винде все плохо с thread-loader
         .when(process.platform !== 'win32', (cfg) => cfg.use('thread').loader('thread-loader').options((0, workersPool_1.createWorkerPoolBabel)(configManager)).end())
-        .use('babel');
+        .use('transpiler');
     return (0, transpiler_1.addTranspilerLoader)(configManager, cfg, transpilerConfig);
 };
 //# sourceMappingURL=ts.js.map

package/lib/library/webpack/blocks/ts.js.map

@@ -1 +1 @@
-{"version":3,"file":"ts.js","sourceRoot":"","sources":["../../../../src/library/webpack/blocks/ts.ts"],"names":[],"mappings":";;AACA,sDAA6D;AAE7D,oDAA+E;AAE/E,kBAAe,CAAC,aAA4B,EAAE,EAAE,CAAC,CAAC,MAAc,EAAE,EAAE;IAClE,MAAM,gBAAgB,mCAAQ,IAAA,gCAAmB,EAAC,aAAa,CAAC,KAAE,UAAU,EAAE,IAAI,GAAE,CAAC;IAErF,MAAM,GAAG,GAAG,MAAM,CAAC,MAAM;SACtB,IAAI,CAAC,YAAY,CAAC;SAClB,IAAI,CAAC,WAAW,CAAC;SACjB,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC;SAC3B,GAAG,EAAE;SACL,KAAK,CAAC,SAAS,CAAC;QACjB,6DAA6D;SAC5D,IAAI,CAAC,OAAO,CAAC,QAAQ,KAAK,OAAO,EAAE,CAAC,GAAG,EAAE,EAAE,CAC1C,GAAG,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC,OAAO,CAAC,IAAA,mCAAqB,EAAC,aAAa,CAAC,CAAC,CAAC,GAAG,EAAE,CAC9F;SACA,GAAG,CAAC,OAAO,CAAC,CAAC;IAEhB,OAAO,IAAA,gCAAmB,EAAC,aAAa,EAAE,GAAG,EAAE,gBAAgB,CAAC,CAAC;AACnE,CAAC,CAAC"}
+{"version":3,"file":"ts.js","sourceRoot":"","sources":["../../../../src/library/webpack/blocks/ts.ts"],"names":[],"mappings":";;AACA,sDAA6D;AAE7D,oDAA+E;AAE/E,kBAAe,CAAC,aAA4B,EAAE,EAAE,CAAC,CAAC,MAAc,EAAE,EAAE;IAClE,MAAM,gBAAgB,mCAAQ,IAAA,gCAAmB,EAAC,aAAa,CAAC,KAAE,UAAU,EAAE,IAAI,GAAE,CAAC;IAErF,MAAM,GAAG,GAAG,MAAM,CAAC,MAAM;SACtB,IAAI,CAAC,YAAY,CAAC;SAClB,IAAI,CAAC,WAAW,CAAC;SACjB,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC;SAC3B,GAAG,EAAE;SACL,KAAK,CAAC,SAAS,CAAC;QACjB,6DAA6D;SAC5D,IAAI,CAAC,OAAO,CAAC,QAAQ,KAAK,OAAO,EAAE,CAAC,GAAG,EAAE,EAAE,CAC1C,GAAG,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC,OAAO,CAAC,IAAA,mCAAqB,EAAC,aAAa,CAAC,CAAC,CAAC,GAAG,EAAE,CAC9F;SACA,GAAG,CAAC,YAAY,CAAC,CAAC;IAErB,OAAO,IAAA,gCAAmB,EAAC,aAAa,EAAE,GAAG,EAAE,gBAAgB,CAAC,CAAC;AACnE,CAAC,CAAC"}

package/lib/library/webpack/loaders/pagesResolve.js

@@ -3,10 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const path_1 = tslib_1.__importDefault(require("path"));
 const fs_readdir_recursive_1 = tslib_1.__importDefault(require("fs-readdir-recursive"));
+const fs_1 = tslib_1.__importDefault(require("fs"));
+const LAYOUT_FILENAME = '_layout.tsx';
 function default_1() {
     const { fileSystemPages, rootDir, root, extensions } = this.getOptions();
+    const fsLayouts = [];
     this.cacheable(false);
-    const filesToPages = ({ pagesRootDirectory }) => {
+    const filesToPages = ({ pagesRootDirectory, isRoutes = false, }) => {
         const pagesDir = path_1.default.resolve(rootDir, root, pagesRootDirectory);
         this.addContextDependency(pagesDir);
         // skip files whose name starts with dot or underscore symbols
@@ -21,6 +24,13 @@ function default_1() {
                 const pageComponentChunkName = pageComponentName.replace(/\//g, '_');
                 // @example '@/pages/MainPage': lazy(() => import(/* webpackChunkName: "@_pages_MainPage" */ '/tramvai-app/src/pages/MainPage'))
                 fsPages.push(`'${pageComponentName}': lazy(() => import(/* webpackChunkName: "${pageComponentChunkName}" */ '${pageComponentPath}'))`);
+                if (isRoutes) {
+                    const layoutPath = path_1.default.join(path_1.default.dirname(pageComponentPath), LAYOUT_FILENAME);
+                    if (fs_1.default.existsSync(layoutPath)) {
+                        // @example '@/pages/MainPage': lazy(() => import(/* webpackChunkName: "@_pages_MainPage_layout" */ '/tramvai-app/src/pages/MainPage_layout'))
+                        fsLayouts.push(`'${pageComponentName}': lazy(() => import(/* webpackChunkName: "${pageComponentChunkName}__layout" */ '${layoutPath.replace('.tsx', '')}'))`);
+                    }
+                }
             }
         }
         return fsPages;
@@ -28,6 +38,7 @@ function default_1() {
     const fsRoutes = fileSystemPages.routesDir
         ? filesToPages({
             pagesRootDirectory: fileSystemPages.routesDir,
+            isRoutes: true,
         })
         : [];
     const fsPages = fileSystemPages.pagesDir
@@ -44,6 +55,9 @@ export default {
   pages: {
     ${fsPages.join(',\n')}
   },
+  layouts: {
+    ${fsLayouts.join(',\n')}
+  },
 }`;
     return code;
 }

package/lib/library/webpack/loaders/pagesResolve.js.map

@@ -1 +1 @@
-{"version":3,"file":"pagesResolve.js","sourceRoot":"","sources":["../../../../src/library/webpack/loaders/pagesResolve.ts"],"names":[],"mappings":";;;AAAA,wDAAwB;AACxB,wFAA2C;AAE3C;IACE,MAAM,EAAE,eAAe,EAAE,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC;IAEzE,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;IAEtB,MAAM,YAAY,GAAG,CAAC,EAAE,kBAAkB,EAAkC,EAAE,EAAE;QAC9E,MAAM,QAAQ,GAAG,cAAI,CAAC,OAAO,CAAC,OAAO,EAAE,IAAI,EAAE,kBAAkB,CAAC,CAAC;QAEjE,IAAI,CAAC,oBAAoB,CAAC,QAAQ,CAAC,CAAC;QAEpC,8DAA8D;QAC9D,MAAM,UAAU,GAAG,IAAA,8BAAO,EAAC,QAAQ,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,GAAG,IAAI,IAAI,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC;QACnF,MAAM,OAAO,GAAG,EAAE,CAAC;QAEnB,KAAK,MAAM,IAAI,IAAI,UAAU,EAAE;YAC7B,MAAM,OAAO,GAAG,cAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;YACnC,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,MAAM,CAAC,KAAK,OAAO,GAAG,CAAC,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;YAE/E,IAAI,UAAU,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE;gBACtC,MAAM,iBAAiB,GAAG,KAAK,kBAAkB,IAAI,IAAI,EAAE,CAAC;gBAC5D,MAAM,iBAAiB,GAAG,cAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;gBAC9E,MAAM,sBAAsB,GAAG,iBAAiB,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;gBAErE,gIAAgI;gBAChI,OAAO,CAAC,IAAI,CACV,IAAI,iBAAiB,8CAA8C,sBAAsB,SAAS,iBAAiB,KAAK,CACzH,CAAC;aACH;SACF;QAED,OAAO,OAAO,CAAC;IACjB,CAAC,CAAC;IAEF,MAAM,QAAQ,GAAG,eAAe,CAAC,SAAS;QACxC,CAAC,CAAC,YAAY,CAAC;YACX,kBAAkB,EAAE,eAAe,CAAC,SAAS;SAC9C,CAAC;QACJ,CAAC,CAAC,EAAE,CAAC;IACP,MAAM,OAAO,GAAG,eAAe,CAAC,QAAQ;QACtC,CAAC,CAAC,YAAY,CAAC;YACX,kBAAkB,EAAE,eAAe,CAAC,QAAQ;SAC7C,CAAC;QACJ,CAAC,CAAC,EAAE,CAAC;IAEP,MAAM,IAAI,GAAG;;;;MAIT,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC;;;MAGpB,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC;;EAEvB,CAAC;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AAxDD,4BAwDC"}
+{"version":3,"file":"pagesResolve.js","sourceRoot":"","sources":["../../../../src/library/webpack/loaders/pagesResolve.ts"],"names":[],"mappings":"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"}

package/lib/library/webpack/plugins/DedupePlugin/DedupePlugin.d.ts

@@ -14,7 +14,7 @@ export interface NMFResult {
         relativePath?: string;
     };
 }
-export declare type DeduplicateStrategy = 'equality' | 'semver';
+export type DeduplicateStrategy = 'equality' | 'semver';
 export declare class DedupePlugin {
     private readonly strategy;
     private readonly ignorePackages?;

package/lib/library/webpack/types/webpack.d.ts

@@ -1,4 +1,4 @@
 import type { container, Configuration } from 'webpack';
-export declare type ModuleFederationPluginOptions = ConstructorParameters<typeof container.ModuleFederationPlugin>[0];
-export declare type ModuleFederationSharedObject = Record<string, Exclude<Exclude<ModuleFederationPluginOptions['shared'], any[]>[string], string>>;
-export declare type SplitChunksOptions = Configuration['optimization']['splitChunks'];
+export type ModuleFederationPluginOptions = ConstructorParameters<typeof container.ModuleFederationPlugin>[0];
+export type ModuleFederationSharedObject = Record<string, Exclude<Exclude<ModuleFederationPluginOptions['shared'], any[]>[string], string>>;
+export type SplitChunksOptions = Configuration['optimization']['splitChunks'];

package/lib/library/webpack/utils/transpiler.js

@@ -2,11 +2,20 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getTranspilerConfig = exports.addTranspilerLoader = void 0;
 const tslib_1 = require("tslib");
+const resolve_1 = require("resolve");
 const swc_1 = require("../../swc");
 const babel_1 = tslib_1.__importDefault(require("../../babel"));
 const addTranspilerLoader = (configManager, rule, transpilerConfig) => {
     const { loader } = configManager.experiments.transpilation;
     if (loader === 'swc') {
+        try {
+            (0, resolve_1.sync)('@tramvai/swc-integration/package.json', { basedir: configManager.rootDir });
+        }
+        catch (error) {
+            throw new Error(`You are using swc loader for the transpilation, but required module is not installed.
+Please run "tramvai add --dev @tramvai/swc-integration" to fix the problem
+      `);
+        }
         return rule.loader('swc-loader').options((0, swc_1.getSwcOptions)(transpilerConfig)).end();
     }
     if (loader === 'babel') {

package/lib/library/webpack/utils/transpiler.js.map

@@ -1 +1 @@
-{"version":3,"file":"transpiler.js","sourceRoot":"","sources":["../../../../src/library/webpack/utils/transpiler.ts"],"names":[],"mappings":";;;;AAEA,mCAA0C;AAC1C,gEAAsC;AAE/B,MAAM,mBAAmB,GAAG,CACjC,aAA4B,EAC5B,IAAgB,EAChB,gBAAqC,EACrC,EAAE;IACF,MAAM,EAAE,MAAM,EAAE,GAAG,aAAa,CAAC,WAAW,CAAC,aAAa,CAAC;IAE3D,IAAI,MAAM,KAAK,KAAK,EAAE;QACpB,OAAO,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,OAAO,CAAC,IAAA,mBAAa,EAAC,gBAAgB,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC;KACjF;IAED,IAAI,MAAM,KAAK,OAAO,EAAE;QACtB,OAAO,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC,OAAO,CAAC,IAAA,eAAW,EAAC,gBAAgB,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC;KACjF;AACH,CAAC,CAAC;AAdW,QAAA,mBAAmB,uBAc9B;AAEK,MAAM,mBAAmB,GAAG,CAAC,aAA4B,EAAE,EAAE;IAClE,MAAM,EAAE,iBAAiB,EAAE,KAAK,EAAE,kBAAkB,EAAE,0BAA0B,EAAE,GAChF,aAAa,CAAC,KAAK,CAAC,cAAc,CAAC;IACrC,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,aAAa,CAAC;IAEtC,OAAO;QACL,QAAQ,EAAE,aAAa,CAAC,SAAS,KAAK,QAAQ;QAC9C,GAAG;QACH,iBAAiB;QACjB,MAAM;QACN,KAAK;QACL,OAAO,EAAE,IAAI;QACb,kBAAkB;QAClB,GAAG,EAAE,aAAa,CAAC,UAAU;QAC7B,iBAAiB,EAAE,aAAa,CAAC,KAAK,CAAC,cAAc,CAAC,iBAAiB;QACvE,0BAA0B;QAC1B,OAAO,EAAE,aAAa,CAAC,OAAO;QAC9B,MAAM,EAAE,aAAa,CAAC,MAAM;KAC7B,CAAC;AACJ,CAAC,CAAC;AAnBW,QAAA,mBAAmB,uBAmB9B"}
+{"version":3,"file":"transpiler.js","sourceRoot":"","sources":["../../../../src/library/webpack/utils/transpiler.ts"],"names":[],"mappings":";;;;AACA,qCAA0C;AAE1C,mCAA0C;AAC1C,gEAAsC;AAE/B,MAAM,mBAAmB,GAAG,CACjC,aAA4B,EAC5B,IAAgB,EAChB,gBAAqC,EACrC,EAAE;IACF,MAAM,EAAE,MAAM,EAAE,GAAG,aAAa,CAAC,WAAW,CAAC,aAAa,CAAC;IAE3D,IAAI,MAAM,KAAK,KAAK,EAAE;QACpB,IAAI;YACF,IAAA,cAAO,EAAC,uCAAuC,EAAE,EAAE,OAAO,EAAE,aAAa,CAAC,OAAO,EAAE,CAAC,CAAC;SACtF;QAAC,OAAO,KAAK,EAAE;YACd,MAAM,IAAI,KAAK,CAAC;;OAEf,CAAC,CAAC;SACJ;QAED,OAAO,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,OAAO,CAAC,IAAA,mBAAa,EAAC,gBAAgB,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC;KACjF;IAED,IAAI,MAAM,KAAK,OAAO,EAAE;QACtB,OAAO,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC,OAAO,CAAC,IAAA,eAAW,EAAC,gBAAgB,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC;KACjF;AACH,CAAC,CAAC;AAtBW,QAAA,mBAAmB,uBAsB9B;AAEK,MAAM,mBAAmB,GAAG,CAAC,aAA4B,EAAE,EAAE;IAClE,MAAM,EAAE,iBAAiB,EAAE,KAAK,EAAE,kBAAkB,EAAE,0BAA0B,EAAE,GAChF,aAAa,CAAC,KAAK,CAAC,cAAc,CAAC;IACrC,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,aAAa,CAAC;IAEtC,OAAO;QACL,QAAQ,EAAE,aAAa,CAAC,SAAS,KAAK,QAAQ;QAC9C,GAAG;QACH,iBAAiB;QACjB,MAAM;QACN,KAAK;QACL,OAAO,EAAE,IAAI;QACb,kBAAkB;QAClB,GAAG,EAAE,aAAa,CAAC,UAAU;QAC7B,iBAAiB,EAAE,aAAa,CAAC,KAAK,CAAC,cAAc,CAAC,iBAAiB;QACvE,0BAA0B;QAC1B,OAAO,EAAE,aAAa,CAAC,OAAO;QAC9B,MAAM,EAAE,aAAa,CAAC,MAAM;KAC7B,CAAC;AACJ,CAAC,CAAC;AAnBW,QAAA,mBAAmB,uBAmB9B"}

package/lib/models/command.d.ts

@@ -1,6 +1,6 @@
 import type { Context } from './context';
-export declare type CommandConstructor = new (context: Context) => CLICommand;
-export declare type CommandMap = CommandConstructor[];
+export type CommandConstructor = new (context: Context) => CLICommand;
+export type CommandMap = CommandConstructor[];
 export interface CommandResult {
     status: string;
     message?: string;
@@ -12,7 +12,7 @@ export interface Option {
     readonly defaultValue?: any;
     readonly transformer?: (...arg: any[]) => any;
 }
-declare type validator<TParams> = (context: Context, parameters: TParams) => Promise<{
+type validator<TParams> = (context: Context, parameters: TParams) => Promise<{
     name: string;
     status: string;
     message?: string;

package/lib/models/task.d.ts

@@ -1,8 +1,8 @@
 import type { CommonOptions } from 'execa';
 import execa from 'execa';
 import type { Context } from './context';
-export declare type TaskConstructor = new (context: Context) => Task;
-export declare type TaskMap = TaskConstructor[];
+export type TaskConstructor = new (context: Context) => Task;
+export type TaskMap = TaskConstructor[];
 export interface TaskResult {
     status: string;
     code: number;

package/lib/schema/ConfigSchema.d.ts

@@ -12,7 +12,7 @@ import type { ChildAppConfigEntry } from '../typings/configEntry/child-app';
  * поэтому генерируем параллельно конфиги для разных типов приложений,
  * которые можно использовать как угодно, в том числе внутри conditional веток с ключевыми словами `if`, `then`, `else`
  */
-export declare type ConfigSchema = {
+export type ConfigSchema = {
     application: ApplicationConfigEntry;
     module: ModuleConfigEntry;
     'child-app': ChildAppConfigEntry;

package/lib/typings/Env.d.ts

@@ -1 +1 @@
-export declare type Env = 'development' | 'production';
+export type Env = 'development' | 'production';

package/lib/typings/build/Builder.d.ts

@@ -26,12 +26,12 @@ interface BuilderAnalyzeOptions {
     modern?: boolean;
     plugin?: string;
 }
-export declare type GetBuildStats = () => {
+export type GetBuildStats = () => {
     clientBuildTime?: number;
     clientModernBuildTime?: number;
     serverBuildTime?: number;
 };
-export declare type BuildType = 'client' | 'server' | 'clientModern';
+export type BuildType = 'client' | 'server' | 'clientModern';
 export interface BuilderEvents {
     invalid: [];
     done: [];

package/lib/typings/configEntry/application.d.ts

@@ -86,7 +86,7 @@ export interface ApplicationBuild {
         postcss?: ConfigEntry['commands']['build']['configurations']['postcss'];
     };
 }
-export declare type ApplicationServe = ConfigEntry['commands']['serve'] & {
+export type ApplicationServe = ConfigEntry['commands']['serve'] & {
     /**
      * @default {}
      */

package/lib/typings/configEntry/common.d.ts

@@ -1,7 +1,7 @@
 import type { Configuration } from 'webpack';
 import type { ProjectType } from '../projectType';
 import type { DeduplicateStrategy } from '../../library/webpack/plugins/DedupePlugin';
-declare type ServeNotifications = {
+type ServeNotifications = {
     /**
      * @title Defines when success notifications are shown
      */

package/lib/typings/projectType.d.ts

@@ -1,11 +1,11 @@
 import type { ConfigEntry } from './configEntry/common';
-export declare type ProjectType = 'application' | 'module' | 'package' | 'child-app';
-export declare type BuildType = 'server' | 'client';
-export declare type SyncJsonFile = ({ path, newContent, }: {
+export type ProjectType = 'application' | 'module' | 'package' | 'child-app';
+export type BuildType = 'server' | 'client';
+export type SyncJsonFile = ({ path, newContent, }: {
     path: string;
     newContent: any;
 }) => Promise<void>;
-export declare type Config = {
+export type Config = {
     projectsConfig?: any;
     $schema?: string;
     projects: {

package/lib/typings/public.d.ts

@@ -4,4 +4,4 @@ export interface ImageObject {
     width: number;
     height: number;
 }
-export declare type SvgComponent = ComponentType<SVGProps<SVGElement>>;
+export type SvgComponent = ComponentType<SVGProps<SVGElement>>;

package/lib/typings/target.d.ts

@@ -1 +1 @@
-export declare type Target = 'modern' | 'node' | 'defaults';
+export type Target = 'modern' | 'node' | 'defaults';

package/lib/validators/commands/validator.h.d.ts

@@ -1,5 +1,5 @@
 import type { Context } from '../../models/context';
-export declare type Validator = (context: Context, parameters: any) => Promise<{
+export type Validator = (context: Context, parameters: any) => Promise<{
     name: string;
     status: 'ok' | 'warning' | 'error';
     message?: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tramvai/cli",
-  "version": "2.40.0",
+  "version": "2.45.0",
   "description": "Cli инструмент для сборки и запуска приложений",
   "files": [
     "src",
@@ -69,7 +69,7 @@
     "@tinkoff/request-plugin-protocol-http": "^0.11.6",
     "@tinkoff/utils": "^2.1.3",
     "@tramvai/build": "3.0.6",
-    "@tramvai/react": "2.40.0",
+    "@tramvai/react": "2.45.0",
     "@tramvai/tools-check-versions": "0.4.5",
     "@tramvai/tools-migrate": "0.6.6",
     "ajv": "^6.12.6",
@@ -148,7 +148,7 @@
     "v8-compile-cache": "^2.3.0",
     "validate-npm-package-name": "^3.0.0",
     "wait-on": "^5.3.0",
-    "webpack": "5.74.0",
+    "webpack": "5.75.0",
     "webpack-build-notifier": "^2.3.0",
     "webpack-bundle-analyzer": "^4.6.1",
     "webpack-chain": "^6.5.1",
@@ -159,6 +159,7 @@
     "wrap-ansi": "^7.0.0"
   },
   "devDependencies": {
+    "@swc/core": "^1.3.16",
     "@tramvai/tools-generate-schema": "0.1.3",
     "@types/compression": "^1.7.2",
     "@types/express": "^4.17.13",
@@ -180,10 +181,7 @@
     "react": "18.2.0"
   },
   "hiddenDependencies": {
-    "@swc/core": "^1.2.124",
-    "@swc/helpers": "^0.3.2",
-    "image-webpack-loader": "^6.0.0",
-    "swc-loader": "^0.1.15"
+    "image-webpack-loader": "^6.0.0"
   },
   "license": "Apache-2.0",
   "engines": {

package/src/api/start/__integration__/start.test.ts

@@ -122,6 +122,7 @@ describe('@tramvai/cli start command', () => {
             '@/routes/home': {},
           },
           pages: {},
+          layouts: {},
         });
       });
 

package/src/external/pages.ts

@@ -1,10 +1,12 @@
-import type { LazyComponentWrapper, PageComponent } from '@tramvai/react';
+import type { LazyComponentWrapper, NestedLayoutComponent, PageComponent } from '@tramvai/react';
 
 // eslint-disable-next-line import/no-default-export
 export default {
   routes: {},
   pages: {},
+  layouts: {},
 } as {
   routes: Record<string, LazyComponentWrapper<PageComponent>>;
   pages: Record<string, LazyComponentWrapper<PageComponent>>;
+  layouts: Record<string, LazyComponentWrapper<NestedLayoutComponent>>;
 };

package/src/library/babel/index.ts

@@ -27,7 +27,7 @@ interface BabelConfig {
   generateDataQaTag?: boolean;
   enableFillActionNamePlugin?: boolean;
   typescript?: boolean;
-  modules?: string | boolean;
+  modules?: string | false;
   loader?: boolean;
   useESModules?: boolean;
   removeTypeofWindow?: boolean;

package/src/library/swc/index.ts

@@ -1,6 +1,8 @@
 import browserslist from 'browserslist';
 import envTargets from '@tinkoff/browserslist-config';
 import { sync as resolve } from 'resolve';
+import findCacheDir from 'find-cache-dir';
+import type { Config } from '@swc/core';
 import type { Env } from '../../typings/Env';
 import type { Target } from '../../typings/target';
 
@@ -10,7 +12,7 @@ interface SWCConfig {
   modern?: boolean;
   isServer?: boolean;
   typescript?: boolean;
-  modules?: string | boolean;
+  modules?: Config['module']['type'] | false;
   removeTypeofWindow?: boolean;
   alias?: Record<string, any>;
   bugfixes?: boolean; // https://babeljs.io/docs/en/babel-preset-env#bugfixes
@@ -19,14 +21,8 @@ interface SWCConfig {
   rootDir?: string;
 }
 
-function hasJsxRuntime() {
-  try {
-    resolve('react/jsx-runtime', { basedir: process.cwd() });
-    return true;
-  } catch (e) {
-    return false;
-  }
-}
+const TRAMVAI_SWC_TARGET_PATH = '@tramvai/swc-integration/target/wasm32-wasi';
+
 export const getSwcOptions = ({
   env = 'development',
   target,
@@ -36,7 +32,35 @@ export const getSwcOptions = ({
   typescript = false,
   hot = false,
   rootDir = process.cwd(),
-}: SWCConfig) => {
+}: SWCConfig): Config => {
+  const resolveWasmFile = (pluginName: string, type: 'debug' | 'release') => {
+    return resolve(`${TRAMVAI_SWC_TARGET_PATH}/${type}/${pluginName}.wasm`, {
+      basedir: rootDir,
+    });
+  };
+
+  const resolveTramvaiSwcPlugin = (pluginName: string) => {
+    try {
+      return resolveWasmFile(pluginName, 'debug');
+    } catch (_) {
+      try {
+        return resolveWasmFile(pluginName, 'release');
+      } catch (__) {
+        throw new Error(
+          `Cannot find tramvai swc-plugin "${pluginName}" related to the "${rootDir}" directory`
+        );
+      }
+    }
+  };
+  function hasJsxRuntime() {
+    try {
+      resolve('react/jsx-runtime', { basedir: rootDir });
+      return true;
+    } catch (e) {
+      return false;
+    }
+  }
+
   let resultTarget = target;
 
   if (!target) {
@@ -61,7 +85,7 @@ export const getSwcOptions = ({
   return {
     env: {
       targets,
-      corejs: '3',
+      coreJs: '3',
       loose: true,
       mode: 'entry',
     },
@@ -79,18 +103,26 @@ export const getSwcOptions = ({
         legacyDecorator: true,
         react: {
           runtime: hasJsxRuntime() ? 'automatic' : 'classic',
-          useSpread: true,
           development: env === 'development',
           refresh: hot && !isServer,
         },
         optimizer: {
           globals: {
+            // @ts-ignore
+            // TODO: there is not typings for typeofs, but the field is mentioned in docs
             typeofs: {
               window: isServer ? 'undefined' : 'object',
             },
           },
         },
       },
+      experimental: {
+        cacheRoot: findCacheDir({ cwd: rootDir, name: 'swc' }),
+        plugins: [
+          [resolveTramvaiSwcPlugin('create_token_pure'), {}],
+          [resolveTramvaiSwcPlugin('lazy_component'), {}],
+        ],
+      },
     },
   };
 };

package/src/library/webpack/blocks/js.ts

@@ -22,7 +22,7 @@ export default (configManager: ConfigManager) => (config: Config) => {
           .options(createWorkerPoolBabel(configManager))
           .end()
       )
-      .use('babel');
+      .use('transpiler');
 
     return addTranspilerLoader(configManager, cfg, babelCfg);
   };

package/src/library/webpack/blocks/ts.ts

@@ -16,7 +16,7 @@ export default (configManager: ConfigManager) => (config: Config) => {
     .when(process.platform !== 'win32', (cfg) =>
       cfg.use('thread').loader('thread-loader').options(createWorkerPoolBabel(configManager)).end()
     )
-    .use('babel');
+    .use('transpiler');
 
   return addTranspilerLoader(configManager, cfg, transpilerConfig);
 };

package/src/library/webpack/loaders/pagesResolve.ts

@@ -1,12 +1,22 @@
 import path from 'path';
 import readDir from 'fs-readdir-recursive';
+import fs from 'fs';
+
+const LAYOUT_FILENAME = '_layout.tsx';
 
 export default function () {
   const { fileSystemPages, rootDir, root, extensions } = this.getOptions();
+  const fsLayouts = [];
 
   this.cacheable(false);
 
-  const filesToPages = ({ pagesRootDirectory }: { pagesRootDirectory: string }) => {
+  const filesToPages = ({
+    pagesRootDirectory,
+    isRoutes = false,
+  }: {
+    pagesRootDirectory: string;
+    isRoutes?: boolean;
+  }) => {
     const pagesDir = path.resolve(rootDir, root, pagesRootDirectory);
 
     this.addContextDependency(pagesDir);
@@ -28,6 +38,20 @@ export default function () {
         fsPages.push(
           `'${pageComponentName}': lazy(() => import(/* webpackChunkName: "${pageComponentChunkName}" */ '${pageComponentPath}'))`
         );
+
+        if (isRoutes) {
+          const layoutPath = path.join(path.dirname(pageComponentPath), LAYOUT_FILENAME);
+
+          if (fs.existsSync(layoutPath)) {
+            // @example '@/pages/MainPage': lazy(() => import(/* webpackChunkName: "@_pages_MainPage_layout" */ '/tramvai-app/src/pages/MainPage_layout'))
+            fsLayouts.push(
+              `'${pageComponentName}': lazy(() => import(/* webpackChunkName: "${pageComponentChunkName}__layout" */ '${layoutPath.replace(
+                '.tsx',
+                ''
+              )}'))`
+            );
+          }
+        }
       }
     }
 
@@ -37,6 +61,7 @@ export default function () {
   const fsRoutes = fileSystemPages.routesDir
     ? filesToPages({
         pagesRootDirectory: fileSystemPages.routesDir,
+        isRoutes: true,
       })
     : [];
   const fsPages = fileSystemPages.pagesDir
@@ -54,6 +79,9 @@ export default {
   pages: {
     ${fsPages.join(',\n')}
   },
+  layouts: {
+    ${fsLayouts.join(',\n')}
+  },
 }`;
 
   return code;

package/src/library/webpack/utils/transpiler.ts

@@ -1,4 +1,5 @@
 import type Config from 'webpack-chain';
+import { sync as resolve } from 'resolve';
 import type { ConfigManager } from '../../../config/configManager';
 import { getSwcOptions } from '../../swc';
 import babelConfig from '../../babel';
@@ -11,6 +12,14 @@ export const addTranspilerLoader = (
   const { loader } = configManager.experiments.transpilation;
 
   if (loader === 'swc') {
+    try {
+      resolve('@tramvai/swc-integration/package.json', { basedir: configManager.rootDir });
+    } catch (error) {
+      throw new Error(`You are using swc loader for the transpilation, but required module is not installed.
+Please run "tramvai add --dev @tramvai/swc-integration" to fix the problem
+      `);
+    }
+
     return rule.loader('swc-loader').options(getSwcOptions(transpilerConfig)).end();
   }