@emailmaker/emailmaker 1.0.107-dev.3 → 1.0.107-dev.4

package/cli/lib/cli/project.ts

@@ -1,7 +1,6 @@
 import fs from 'fs';
 import path from 'path';
 import { spawnSync } from 'child_process';
-import { createRequire } from 'module';
 import prompts from 'prompts';
 import {
   loadLocalEnvironment,
@@ -18,8 +17,8 @@ import type {
   ValidatedProjectOptions,
 } from '../types';
 
-const requireNode = createRequire(__filename);
 import { createLocalPackageTarballs } from '../local-test';
+import { resolveSpawnCommand } from '../resolveNpmSpawn';
 import { generateFiles } from '../template-engine';
 import { getRuntimeCliMessages } from './runtimeMessages';
 import { normalizeLegacyKind, resolveTargetDir, isStandaloneDemoStand } from './shared';
@@ -40,21 +39,6 @@ function writeFiles(targetDir: string, files: GeneratedFilesMap): void {
   }
 }
 
-function resolveCommand(command: string): { executable: string; argsPrefix: string[] } {
-  if (process.platform === 'win32' && command === 'npm') {
-    const npmPackageJson = requireNode.resolve('npm/package.json');
-    return {
-      executable: process.execPath,
-      argsPrefix: [path.join(path.dirname(npmPackageJson), 'bin', 'npm-cli.js')],
-    };
-  }
-
-  return {
-    executable: command,
-    argsPrefix: [],
-  };
-}
-
 function createProjectCommandEnv(): NodeJS.ProcessEnv {
   const env: NodeJS.ProcessEnv = { ...process.env };
   for (const key of Object.keys(env)) {
@@ -87,7 +71,7 @@ function createProjectCommandEnv(): NodeJS.ProcessEnv {
 
 function runProjectCommand(targetDir: string, command: string, args: string[] = []): void {
   const runtimeMessages = getRuntimeCliMessages();
-  const { executable, argsPrefix } = resolveCommand(command);
+  const { executable, argsPrefix } = resolveSpawnCommand(command);
 
   const result = spawnSync(executable, [...argsPrefix, ...args], {
     cwd: targetDir,

package/cli/lib/config.ts

@@ -2,14 +2,12 @@ import fs from 'fs';
 import path from 'path';
 import dotenv from 'dotenv';
 import { spawnSync } from 'child_process';
-import { createRequire } from 'module';
 import { getBuildToolsRoot } from './paths';
+import { resolveSpawnCommand } from './resolveNpmSpawn';
 import { getRuntimeCliMessages } from './cli/runtimeMessages';
 import type { LocalPublishedNames, PackageConfig, ToolVersions } from './types';
 import { isJsonArray, isJsonObject, parseJsonValue, type JsonValue } from './types/json';
 
-const requireNode = createRequire(__filename);
-
 const MODE_TO_FILE: Record<string, string> = {
   dev: '.env.dev',
   prod: '.env.prod',
@@ -27,20 +25,19 @@ const VERSIONS_CONFIG_PATH = path.resolve(getBuildToolsRoot(), 'versions.json');
 const DEFAULT_APP_NAME = '$$APP_NAME$$';
 const DEFAULT_ENV_MODE = '$$ENV_MODE$$';
 const DEFAULT_PACKAGE_NAME = '$$PACKAGE_NAME$$';
-const DEFAULT_RUNTIME_PACKAGE = '$$RUNTIME_PACKAGE$$';
 const DEFAULT_UI_KIT_PACKAGE = '$$UIKIT_PACKAGE$$';
 const DEFAULT_EXTENSIONS_API_PACKAGE = '$$EXTENSIONS_API_PACKAGE$$';
 const DEFAULT_EXTENSIONS_REACT_PACKAGE = '$$EXTENSIONS_REACT_PACKAGE$$';
 const DEFAULT_EXTENSIONS_SANDBOX_PACKAGE = '$$EXTENSIONS_SANDBOX_PACKAGE$$';
 const DEFAULT_CLI_PACKAGE = '$$CLI_PACKAGE$$';
 const DEFAULT_VERSION = '$$APP_VERSION$$';
-const DEFAULT_RUNTIME_VERSION = '$$RUNTIME_VERSION$$';
 const DEFAULT_UI_KIT_VERSION = '$$UIKIT_VERSION$$';
 const DEFAULT_OPENAPI_BASE_URL = '$$OPENAPI_BASE_URL$$';
 
 const TOOL_VERSIONS: ToolVersions = {
   vite: '^7',
   typescript: '^5',
+  tsx: '^4.21.0',
   webpack: '^5',
   webpackCli: '^6',
   webpackDevServer: '^5',
@@ -59,6 +56,14 @@ function resolveEmbeddedValue(value: string): string {
   return value;
 }
 
+function getRuntimePackageName(mainPackageName: string): string {
+  const normalized = String(mainPackageName || '').replace(/\/+$/, '');
+  if (!normalized) {
+    throw new Error('[runtime-package] mainPackageName is empty');
+  }
+  return `${normalized}/runtime`;
+}
+
 function loadEnvFile(filePath: string, override: boolean): void {
   if (!fs.existsSync(filePath)) {
     return;
@@ -144,7 +149,7 @@ function applyVersionsOverlay(envMode: string): void {
   }
 
   process.env.REACT_APP_VERSION = channelVersions.host;
-  process.env.REACT_APP_RUNTIME_VERSION = channelVersions.runtime;
+  process.env.REACT_APP_RUNTIME_VERSION = channelVersions.host;
   process.env.REACT_APP_UI_KIT_VERSION = channelVersions.uiKit;
   process.env.REACT_APP_EXTENSIONS_API_VERSION = channelVersions.extensionsApi;
   process.env.REACT_APP_EXTENSIONS_REACT_VERSION = channelVersions.extensionsReact;
@@ -154,21 +159,6 @@ function applyVersionsOverlay(envMode: string): void {
   process.env.RELEASE_CHANNEL = releaseChannel;
 }
 
-function resolveCommand(command: string): { executable: string; argsPrefix: string[] } {
-  if (process.platform === 'win32' && (command === 'npm' || command === 'npx')) {
-    const npmPackageJson = requireNode.resolve('npm/package.json');
-    return {
-      executable: process.execPath,
-      argsPrefix: [path.join(path.dirname(npmPackageJson), 'bin', `${command}-cli.js`)],
-    };
-  }
-
-  return {
-    executable: command,
-    argsPrefix: [],
-  };
-}
-
 function resolveEnvDir(cwd: string, appName: string): string {
   if (!appName) {
     return cwd;
@@ -248,14 +238,12 @@ function loadLocalEnvironment(options: LoadLocalEnvironmentOptions = {}): void {
 function getMissingConfigNames(config: PackageConfig): string[] {
   const requiredFields: [string, string][] = [
     ['REACT_APP_PACKAGE_NAME', config.packageName],
-    ['REACT_APP_RUNTIME_PACKAGE', config.runtimePackageName],
     ['REACT_APP_UI_KIT_PACKAGE', config.uiKitPackageName],
     ['REACT_APP_EXTENSIONS_API_PACKAGE', config.extensionsApiPackageName],
     ['REACT_APP_EXTENSIONS_REACT_PACKAGE', config.extensionsReactPackageName],
     ['REACT_APP_EXTENSIONS_SANDBOX_PACKAGE', config.extensionsSandboxPackageName],
     ['REACT_APP_CLI_PACKAGE', config.cliPackageName],
     ['REACT_APP_VERSION', config.version],
-    ['REACT_APP_RUNTIME_VERSION', config.runtimeVersion],
     ['REACT_APP_UI_KIT_VERSION', config.uiKitVersion],
   ];
 
@@ -269,9 +257,11 @@ export interface ResolvePackageConfigOptions {
 }
 
 function resolvePackageConfig(options: ResolvePackageConfigOptions = {}): PackageConfig {
+  const packageName = readEmbeddedProductIdentity('REACT_APP_PACKAGE_NAME', DEFAULT_PACKAGE_NAME);
+  const version = readConfiguredValue('REACT_APP_VERSION', DEFAULT_VERSION);
   const config: PackageConfig = {
-    packageName: readEmbeddedProductIdentity('REACT_APP_PACKAGE_NAME', DEFAULT_PACKAGE_NAME),
-    runtimePackageName: readEmbeddedProductIdentity('REACT_APP_RUNTIME_PACKAGE', DEFAULT_RUNTIME_PACKAGE),
+    packageName,
+    runtimePackageName: getRuntimePackageName(packageName),
     uiKitPackageName: readEmbeddedProductIdentity('REACT_APP_UI_KIT_PACKAGE', DEFAULT_UI_KIT_PACKAGE),
     extensionsApiPackageName: readEmbeddedProductIdentity(
       'REACT_APP_EXTENSIONS_API_PACKAGE',
@@ -286,8 +276,8 @@ function resolvePackageConfig(options: ResolvePackageConfigOptions = {}): Packag
       DEFAULT_EXTENSIONS_SANDBOX_PACKAGE,
     ),
     cliPackageName: readEmbeddedProductIdentity('REACT_APP_CLI_PACKAGE', DEFAULT_CLI_PACKAGE),
-    version: readConfiguredValue('REACT_APP_VERSION', DEFAULT_VERSION),
-    runtimeVersion: readConfiguredValue('REACT_APP_RUNTIME_VERSION', DEFAULT_RUNTIME_VERSION),
+    version,
+    runtimeVersion: version,
     uiKitVersion: readConfiguredValue('REACT_APP_UI_KIT_VERSION', DEFAULT_UI_KIT_VERSION),
     extensionsApiVersion: process.env.REACT_APP_EXTENSIONS_API_VERSION || readConfiguredValue('REACT_APP_VERSION', DEFAULT_VERSION),
     extensionsReactVersion: process.env.REACT_APP_EXTENSIONS_REACT_VERSION || readConfiguredValue('REACT_APP_VERSION', DEFAULT_VERSION),
@@ -327,7 +317,7 @@ function npmViewVersionToString(parsed: JsonValue): string {
 }
 
 function readLatestRegistryVersion(packageName: string, distTag = 'latest'): string {
-  const { executable, argsPrefix } = resolveCommand('npm');
+  const { executable, argsPrefix } = resolveSpawnCommand('npm');
   const packageSpec = distTag && distTag !== 'latest'
     ? `${packageName}@${distTag}`
     : packageName;
@@ -382,7 +372,6 @@ function resolveLatestPackageConfig(
   };
 
   const latestPackageVersion = resolveOrFallback(config.packageName, config.version);
-  const latestRuntimeVersion = resolveOrFallback(config.runtimePackageName, config.runtimeVersion);
   const latestUiKitVersion = resolveOrFallback(config.uiKitPackageName, config.uiKitVersion);
   const latestExtensionsApiVersion = resolveOrFallback(config.extensionsApiPackageName, config.version);
   const latestExtensionsReactVersion = resolveOrFallback(config.extensionsReactPackageName, config.version);
@@ -392,7 +381,7 @@ function resolveLatestPackageConfig(
   return {
     ...config,
     version: latestPackageVersion,
-    runtimeVersion: latestRuntimeVersion,
+    runtimeVersion: latestPackageVersion,
     uiKitVersion: latestUiKitVersion,
     extensionsApiVersion: latestExtensionsApiVersion,
     extensionsReactVersion: latestExtensionsReactVersion,

package/cli/lib/local-test.ts

@@ -1,8 +1,8 @@
 import fs from 'fs';
 import path from 'path';
 import { spawnSync } from 'child_process';
-import { createRequire } from 'module';
 import { getMonorepoRoot } from './paths';
+import { resolveNpmSpawnCommand } from './resolveNpmSpawn';
 import { getRuntimeCliMessages } from './cli/runtimeMessages';
 import type {
   BuildLocalTestPackagesOptions,
@@ -14,8 +14,6 @@ import type {
 } from './types';
 import { isJsonObject, parseJsonValue } from './types';
 
-const requireNode = createRequire(__filename);
-
 const PROJECT_ROOT = getMonorepoRoot();
 const DEFAULT_BUILD_DIR = path.resolve(PROJECT_ROOT, 'build');
 
@@ -23,24 +21,9 @@ function ensureDirectory(dirPath: string): void {
   fs.mkdirSync(dirPath, { recursive: true });
 }
 
-function resolveCommand(command: 'npm' | 'npx'): { executable: string; argsPrefix: string[] } {
-  if (process.platform === 'win32' && (command === 'npm' || command === 'npx')) {
-    const npmPackageJson = requireNode.resolve('npm/package.json');
-    return {
-      executable: process.execPath,
-      argsPrefix: [path.join(path.dirname(npmPackageJson), 'bin', `${command}-cli.js`)],
-    };
-  }
-
-  return {
-    executable: command,
-    argsPrefix: [],
-  };
-}
-
 function packPackage(packageDir: string, destinationDir: string): string {
   const runtimeMessages = getRuntimeCliMessages();
-  const { executable, argsPrefix } = resolveCommand('npm');
+  const { executable, argsPrefix } = resolveNpmSpawnCommand('npm');
   const result = spawnSync(executable, [...argsPrefix, 'pack', '--pack-destination', destinationDir], {
     cwd: packageDir,
     encoding: 'utf8',
@@ -75,7 +58,7 @@ function buildLocalTestPackages(normalizedBuildDir: string, options: BuildLocalT
 
   const targets = includeUmdBundle ? 'esm,react-adapter,umd' : 'esm,react-adapter';
   console.log(`[cli] ${runtimeMessages.localTestBuildStarting(targets)}`);
-  const { executable, argsPrefix } = resolveCommand('npx');
+  const { executable, argsPrefix } = resolveNpmSpawnCommand('npx');
   const result = spawnSync(
     executable,
     [...argsPrefix, 'tsx', 'build-tools/pipeline.ts', '--targets', targets, '--mode', 'production', '--lint=false', '--type-check=false'],
@@ -135,11 +118,9 @@ function createLocalPackageTarballs(options: CreateLocalTarballsOptions): LocalP
   const packageDirs: Record<string, string> = standOnlyPackages
     ? {
         packageName: normalizedBuildDir,
-        runtimePackageName: path.resolve(normalizedBuildDir, 'runtime'),
       }
     : {
         packageName: normalizedBuildDir,
-        runtimePackageName: path.resolve(normalizedBuildDir, 'runtime'),
         uiKitPackageName: path.resolve(normalizedBuildDir, 'ui-kit'),
         extensionsApiPackageName: path.resolve(normalizedBuildDir, 'extensions/api'),
         extensionsReactPackageName: path.resolve(normalizedBuildDir, 'extensions/react'),

package/cli/lib/paths.ts

@@ -1,9 +1,24 @@
+import fs from 'fs';
 import path from 'path';
 
 /**
  * Корень npm-пакета `build-tools/cli` (корректно и из исходников `lib/…`, и из `dist/lib/…` после tsc).
  */
 export function getCliPackageRoot(): string {
+  const candidates = [
+    path.resolve(__dirname, '..'),
+    path.resolve(__dirname, '..', '..'),
+  ];
+
+  for (const candidate of candidates) {
+    if (
+      fs.existsSync(path.join(candidate, 'package.json'))
+      && fs.existsSync(path.join(candidate, 'project-templates'))
+    ) {
+      return candidate;
+    }
+  }
+
   return path.resolve(__dirname, '..', '..');
 }
 

package/cli/lib/resolveNpmSpawn.ts

@@ -0,0 +1,72 @@
+import fs from 'fs';
+import path from 'path';
+import { createRequire } from 'module';
+
+const requireNode = createRequire(__filename);
+
+/**
+ * Путь к npm-cli.js / npx-cli.js для spawn через node.exe (нужно на Windows без shell).
+ * `require.resolve('npm/package.json')` работает только если пакет `npm` в дереве зависимостей;
+ * у типичной установки Node он лежит рядом с node.exe (см. fallback).
+ */
+export function findNpmCliJs(command: 'npm' | 'npx'): string | null {
+  const binaryName = `${command}-cli.js`;
+
+  try {
+    const npmPackageJson = requireNode.resolve('npm/package.json');
+    const p = path.join(path.dirname(npmPackageJson), 'bin', binaryName);
+    if (fs.existsSync(p)) {
+      return p;
+    }
+  } catch {
+    /* npm не в node_modules CLI-пакета — ищем рядом с текущим node */
+  }
+
+  const binDir = path.dirname(process.execPath);
+  const npmRootCandidates = [
+    path.join(binDir, 'node_modules', 'npm'),
+    path.join(binDir, '..', 'lib', 'node_modules', 'npm'),
+  ];
+
+  for (const npmRoot of npmRootCandidates) {
+    const p = path.join(npmRoot, 'bin', binaryName);
+    if (fs.existsSync(p)) {
+      return p;
+    }
+  }
+
+  return null;
+}
+
+export type NpmSpawnArgs = { executable: string; argsPrefix: string[] };
+
+/**
+ * Запуск npm/npx на Windows без shell: через node.exe и *-cli.js из установки Node.
+ * Если путь не найден — откат на имя команды в PATH.
+ */
+export function resolveNpmSpawnCommand(command: 'npm' | 'npx'): NpmSpawnArgs {
+  if (process.platform === 'win32' && (command === 'npm' || command === 'npx')) {
+    const cliJs = findNpmCliJs(command);
+    if (cliJs) {
+      return {
+        executable: process.execPath,
+        argsPrefix: [cliJs],
+      };
+    }
+  }
+
+  return {
+    executable: command,
+    argsPrefix: [],
+  };
+}
+
+/**
+ * Только `npm` / `npx` нормализуются на Windows; остальные команды — как есть.
+ */
+export function resolveSpawnCommand(command: string): NpmSpawnArgs {
+  if (command === 'npm' || command === 'npx') {
+    return resolveNpmSpawnCommand(command);
+  }
+  return { executable: command, argsPrefix: [] };
+}

package/cli/lib/template-engine/buildStandIndexHtml.test.ts

@@ -31,6 +31,7 @@ function mockPackageConfig(appName = 'verifyapp'): PackageConfig {
     uiLanguage: 'en',
     versions: {
       typescript: '5.0.0',
+      tsx: '4.21.0',
       vite: '5.0.0',
       webpack: '5.0.0',
       webpackCli: '5.0.0',

package/cli/lib/template-engine/context/pluginPackageJsonData.ts

@@ -20,18 +20,12 @@ function buildPluginPackageJsonData(options: TemplateOptions): Record<string, un
   const usesModuleType = pluginFormat !== 'umd';
 
   const appPackageVersion = localTarballs ? localTarballs.packageName : packageConfig.version;
-  const runtimePackageVersion = localTarballs ? localTarballs.runtimePackageName : packageConfig.runtimeVersion;
   const extensionsApiVersion = localTarballs ? localTarballs.extensionsApiPackageName : packageConfig.extensionsApiVersion;
   const extensionsSandboxVersion = localTarballs ? localTarballs.extensionsSandboxPackageName : packageConfig.extensionsSandboxVersion;
   const extensionsReactVersion = localTarballs?.extensionsReactPackageName || packageConfig.extensionsReactVersion;
   const uiKitVersion = localTarballs?.uiKitPackageName || packageConfig.uiKitVersion;
 
   const mainPkgKey = resolveLocalPublishedPackageKey(localPublishedNames, 'packageName', packageConfig.packageName);
-  const runtimePkgKey = resolveLocalPublishedPackageKey(
-    localPublishedNames,
-    'runtimePackageName',
-    packageConfig.runtimePackageName,
-  );
   const extApiKey = resolveLocalPublishedPackageKey(
     localPublishedNames,
     'extensionsApiPackageName',
@@ -49,9 +43,11 @@ function buildPluginPackageJsonData(options: TemplateOptions): Record<string, un
   );
   const uiKitKey = resolveLocalPublishedPackageKey(localPublishedNames, 'uiKitPackageName', packageConfig.uiKitPackageName);
 
-  const peerDependencies = {
+  const dependencies = {
     [mainPkgKey]: appPackageVersion,
-    [runtimePkgKey]: runtimePackageVersion,
+  };
+
+  const peerDependencies = {
     [extApiKey]: extensionsApiVersion,
     [extReactKey]: extensionsReactVersion,
     [extSandboxKey]: extensionsSandboxVersion,
@@ -62,12 +58,11 @@ function buildPluginPackageJsonData(options: TemplateOptions): Record<string, un
   }
 
   const devDependencies: Record<string, string> = {
-    [mainPkgKey]: appPackageVersion,
-    [runtimePkgKey]: runtimePackageVersion,
     [extApiKey]: extensionsApiVersion,
     [extReactKey]: extensionsReactVersion,
     [extSandboxKey]: extensionsSandboxVersion,
     typescript: String(packageConfig.versions.typescript),
+    tsx: packageConfig.versions.tsx,
     ...LEGACY_REACT_DEPENDENCIES,
   };
 
@@ -88,6 +83,8 @@ function buildPluginPackageJsonData(options: TemplateOptions): Record<string, un
     devDependencies['ts-loader'] = packageConfig.versions.tsLoader;
   }
 
+  const webpackCliCommand = 'tsx ./node_modules/webpack-cli/bin/cli.js';
+
   return {
     name: pluginPackageName,
     version: '0.1.0',
@@ -100,25 +97,28 @@ function buildPluginPackageJsonData(options: TemplateOptions): Record<string, un
     scripts:
       bundler === 'vite'
         ? {
-            start: 'node ./scripts/dev-runner.cjs',
-            'start:release': 'node ./scripts/release-runner.cjs',
-            'dev:app': `vite --config ./${generatedPaths.devConfig}`,
+            start: 'npm run dev:app',
+            'start:release': 'tsx ./scripts/release-runner.ts',
+            'dev:app': 'tsx ./scripts/dev-runner.ts',
+            'dev:host': `vite --config ./${generatedPaths.devConfig}`,
             'dev:sandbox': `vite build --config ./${generatedPaths.sandboxBuildConfig} --watch --mode development`,
-            build: 'node ./scripts/clean.cjs && npm run build:types && npm run build:app && npm run build:sandbox',
-            'build:types': 'node ./scripts/build-types.cjs',
+            build: 'tsx ./scripts/build-runner.ts',
+            'build:types': 'tsx ./scripts/build-types.ts',
             'build:app': `vite build --config ./${generatedPaths.pluginBuildConfig}`,
             'build:sandbox': `vite build --config ./${generatedPaths.sandboxBuildConfig} --mode production`,
           }
         : {
-            start: 'node ./scripts/dev-runner.cjs',
-            'start:release': 'node ./scripts/release-runner.cjs',
-            'dev:app': `webpack serve --config ./${generatedPaths.devConfig} --mode development`,
-            'dev:sandbox': `webpack --config ./${generatedPaths.sandboxBuildConfig} --mode development --watch`,
-            build: 'node ./scripts/clean.cjs && npm run build:types && npm run build:app && npm run build:sandbox',
-            'build:types': 'node ./scripts/build-types.cjs',
-            'build:app': `webpack --config ./${generatedPaths.pluginBuildConfig} --mode production`,
-            'build:sandbox': `webpack --config ./${generatedPaths.sandboxBuildConfig} --mode production`,
+            start: 'npm run dev:app',
+            'start:release': 'tsx ./scripts/release-runner.ts',
+            'dev:app': 'tsx ./scripts/dev-runner.ts',
+            'dev:host': `${webpackCliCommand} serve --config ./${generatedPaths.devConfig} --mode development`,
+            'dev:sandbox': `${webpackCliCommand} --config ./${generatedPaths.sandboxBuildConfig} --mode development --watch`,
+            build: 'tsx ./scripts/build-runner.ts',
+            'build:types': 'tsx ./scripts/build-types.ts',
+            'build:app': `${webpackCliCommand} --config ./${generatedPaths.pluginBuildConfig} --mode production`,
+            'build:sandbox': `${webpackCliCommand} --config ./${generatedPaths.sandboxBuildConfig} --mode production`,
           },
+    dependencies,
     peerDependencies,
     devDependencies,
   };

package/cli/lib/template-engine/context/standVitePackageJsonData.ts

@@ -25,19 +25,13 @@ function buildStandVitePackageJsonData(options: TemplateOptions): Record<string,
   const isMemoryUsageStand = standMode === 'advanced' && advancedProfile === 'memory-usage';
 
   const appPackageVersion = localTarballs?.packageName || packageConfig.version;
-  const runtimePackageVersion = localTarballs?.runtimePackageName || packageConfig.runtimeVersion;
 
   const mainPkgKey = resolveLocalPublishedPackageKey(localPublishedNames, 'packageName', packageConfig.packageName);
-  const runtimePkgKey = resolveLocalPublishedPackageKey(
-    localPublishedNames,
-    'runtimePackageName',
-    packageConfig.runtimePackageName,
-  );
 
   const devDependencies: Record<string, string> = {
     [mainPkgKey]: appPackageVersion,
-    [runtimePkgKey]: runtimePackageVersion,
     typescript: String(packageConfig.versions.typescript),
+    tsx: packageConfig.versions.tsx,
     formidable: '^3.5.2',
     ...LEGACY_REACT_DEPENDENCIES,
   };
@@ -59,12 +53,13 @@ function buildStandVitePackageJsonData(options: TemplateOptions): Record<string,
     devDependencies['ts-loader'] = packageConfig.versions.tsLoader;
   }
 
+  const webpackCliCommand = 'tsx ./node_modules/webpack-cli/bin/cli.js';
   const scripts = bundler === 'vite'
     ? isMemoryUsageStand
       ? {
-          start: `cross-env NODE_OPTIONS=--max-old-space-size=256 vite --config ./${generatedPaths.devConfig}`,
-          build: `cross-env NODE_OPTIONS=--max-old-space-size=256 vite build --config ./${generatedPaths.devConfig}`,
-          preview: `cross-env NODE_OPTIONS=--max-old-space-size=256 vite preview --config ./${generatedPaths.devConfig}`,
+          start: `cross-env NODE_OPTIONS=--max-old-space-size=512 vite --config ./${generatedPaths.devConfig}`,
+          build: `cross-env NODE_OPTIONS=--max-old-space-size=512 vite build --config ./${generatedPaths.devConfig}`,
+          preview: `cross-env NODE_OPTIONS=--max-old-space-size=512 vite preview --config ./${generatedPaths.devConfig}`,
         }
       : {
           start: `vite --config ./${generatedPaths.devConfig}`,
@@ -72,8 +67,8 @@ function buildStandVitePackageJsonData(options: TemplateOptions): Record<string,
           preview: `vite preview --config ./${generatedPaths.devConfig}`,
         }
     : {
-        start: `webpack serve --config ./${generatedPaths.devConfig} --mode development`,
-        build: `webpack --config ./${generatedPaths.devConfig} --mode production`,
+        start: `${webpackCliCommand} serve --config ./${generatedPaths.devConfig} --mode development`,
+        build: `${webpackCliCommand} --config ./${generatedPaths.devConfig} --mode production`,
       };
 
   return {

package/cli/lib/template-engine/pluginEtaParity.test.ts

@@ -36,6 +36,7 @@ function mockPackageConfig(): PackageConfig {
     uiLanguage: 'en',
     versions: {
       typescript: '^5',
+      tsx: '^4.21.0',
       vite: '^7',
       webpack: '^5',
       webpackCli: '^6',

package/cli/lib/template-engine/resolveVariantDir.ts

@@ -123,6 +123,10 @@ function resolveStandReactAdapterViteVariantDir(cliRoot = getCliPackageRoot()) {
   return path.join(cliRoot, 'project-templates', 'stand', 'react-adapter', 'vite');
 }
 
+function resolveStandReactAdapterWebpackVariantDir(cliRoot = getCliPackageRoot()) {
+  return path.join(cliRoot, 'project-templates', 'stand', 'react-adapter', 'webpack');
+}
+
 function resolveStandAdvancedViteVariantDir(profile: AdvancedProfile, cliRoot: string = getCliPackageRoot()): string {
   return path.join(cliRoot, 'project-templates', 'stand', 'advanced', profile, 'vite');
 }
@@ -146,6 +150,13 @@ function shouldUseEtaStandReactAdapterVite(options: StandEtaRoutingInput) {
   return getDemoStandMode(options) === 'react-adapter';
 }
 
+/** demo-stand react-adapter + webpack */
+function shouldUseEtaStandReactAdapterWebpack(options: StandEtaRoutingInput) {
+  if (!isDemoStandKind(options.kind)) return false;
+  if (options.bundler !== 'webpack') return false;
+  return getDemoStandMode(options) === 'react-adapter';
+}
+
 /** advanced + vite (shadow-dom | umd | memory-usage | subpath) */
 function getStandAdvancedViteEtaLayerRoots(templateOptions: StandEtaRoutingInput, cliRoot: string = getCliPackageRoot()): string[] | null {
   if (templateOptions.bundler !== 'vite') return null;
@@ -191,6 +202,11 @@ function getStandReactAdapterViteEtaLayerRoots(templateOptions: StandEtaRoutingI
   return [resolveStandViteBaseLayerDir(cliRoot), resolveStandReactAdapterViteVariantDir(cliRoot)];
 }
 
+function getStandReactAdapterWebpackEtaLayerRoots(templateOptions: StandEtaRoutingInput, cliRoot: string = getCliPackageRoot()): string[] | null {
+  if (!shouldUseEtaStandReactAdapterWebpack(templateOptions)) return null;
+  return [resolveStandWebpackBaseLayerDir(cliRoot), resolveStandReactAdapterWebpackVariantDir(cliRoot)];
+}
+
 /** Stand + Eta: простые slug, react-adapter, advanced-ветки. */
 function getStandEtaLayerRoots(templateOptions: StandEtaRoutingInput, cliRoot: string = getCliPackageRoot()): string[] | null {
   const simpleVite = getStandViteEtaLayerRoots(templateOptions, cliRoot);
@@ -202,6 +218,9 @@ function getStandEtaLayerRoots(templateOptions: StandEtaRoutingInput, cliRoot: s
   const reactVite = getStandReactAdapterViteEtaLayerRoots(templateOptions, cliRoot);
   if (reactVite) return reactVite;
 
+  const reactWebpack = getStandReactAdapterWebpackEtaLayerRoots(templateOptions, cliRoot);
+  if (reactWebpack) return reactWebpack;
+
   const advVite = getStandAdvancedViteEtaLayerRoots(templateOptions, cliRoot);
   if (advVite) return advVite;
 
@@ -229,10 +248,13 @@ export {
   getStandViteEtaLayerRoots,
   getStandWebpackEtaLayerRoots,
   getStandReactAdapterViteEtaLayerRoots,
+  getStandReactAdapterWebpackEtaLayerRoots,
   getStandAdvancedViteEtaLayerRoots,
   getStandAdvancedWebpackEtaLayerRoots,
   shouldUseEtaStandReactAdapterVite,
+  shouldUseEtaStandReactAdapterWebpack,
   resolveStandReactAdapterViteVariantDir,
+  resolveStandReactAdapterWebpackVariantDir,
   resolveStandAdvancedUmdWebpackVariantDir,
   resolveStandAdvancedShadowDomWebpackVariantDir,
   getStandEtaLayerRoots,

package/cli/lib/template-engine/standAdvancedViteDevHostEta.test.ts

@@ -31,6 +31,7 @@ function mockPackageConfig(): PackageConfig {
     uiLanguage: 'en',
     versions: {
       typescript: '5.0.0',
+      tsx: '4.21.0',
       vite: '5.0.0',
       webpack: '5.0.0',
       webpackCli: '5.0.0',
@@ -65,7 +66,7 @@ test('advanced memory-usage vite dev-host uses literal api values', () => {
     advancedProfile: 'memory-usage',
   });
   const { files } = generateFiles(options);
-  const devHost = utf8(files['config/dev-host.mjs']);
+  const devHost = utf8(files['config/dev-host.ts']);
   assert.match(devHost, /apiBaseUrl: "http:\/\/localhost:3000"/);
   assert.match(devHost, /apiOrigin: "http:\/\/localhost:3000"/);
   assert.match(devHost, /createMemoryUsageStandConfig/);
@@ -77,7 +78,7 @@ test('advanced umd vite dev-host uses eta middleware setup', () => {
     advancedProfile: 'umd',
   });
   const { files } = generateFiles(options);
-  const devHost = utf8(files['config/dev-host.mjs']);
+  const devHost = utf8(files['config/dev-host.ts']);
   assert.match(devHost, /createUmdServeMiddleware/);
   assert.match(devHost, /publicPath: "\/MyApp\/"/);
   assert.match(devHost, /apiBaseUrl: "http:\/\/localhost:3000"/);
@@ -89,7 +90,7 @@ test('advanced subpath vite dev-host contains outputFolder and literal api value
     advancedProfile: 'subpath',
   });
   const { files } = generateFiles(options);
-  const devHost = utf8(files['config/dev-host.mjs']);
+  const devHost = utf8(files['config/dev-host.ts']);
   assert.match(devHost, /outputFolder: "\/advanced\/subpath\/editor"/);
   assert.match(devHost, /apiBaseUrl: "http:\/\/localhost:3000"/);
   assert.match(devHost, /apiOrigin: "http:\/\/localhost:3000"/);