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

package/README.md

@@ -7,7 +7,7 @@
 Выполните этот код в командной строке:
 
 ```cmd
-$ npm i @emailmaker/emailmaker@1.0.107-dev.3 -save
+$ npm i @emailmaker/emailmaker@1.0.107-dev.4 -save
 ```
 
 Добавьте EmailMaker plugin в ваш App config.

package/cli/dist/lib/cli/project.js

@@ -12,11 +12,10 @@ exports.runProjectCommand = runProjectCommand;
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const child_process_1 = require("child_process");
-const module_1 = require("module");
 const prompts_1 = __importDefault(require("prompts"));
 const config_1 = require("../config");
-const requireNode = (0, module_1.createRequire)(__filename);
 const local_test_1 = require("../local-test");
+const resolveNpmSpawn_1 = require("../resolveNpmSpawn");
 const template_engine_1 = require("../template-engine");
 const runtimeMessages_1 = require("./runtimeMessages");
 const shared_1 = require("./shared");
@@ -35,19 +34,6 @@ function writeFiles(targetDir, files) {
         }
     }
 }
-function resolveCommand(command) {
-    if (process.platform === 'win32' && command === 'npm') {
-        const npmPackageJson = requireNode.resolve('npm/package.json');
-        return {
-            executable: process.execPath,
-            argsPrefix: [path_1.default.join(path_1.default.dirname(npmPackageJson), 'bin', 'npm-cli.js')],
-        };
-    }
-    return {
-        executable: command,
-        argsPrefix: [],
-    };
-}
 function createProjectCommandEnv() {
     const env = { ...process.env };
     for (const key of Object.keys(env)) {
@@ -79,7 +65,7 @@ function createProjectCommandEnv() {
 }
 function runProjectCommand(targetDir, command, args = []) {
     const runtimeMessages = (0, runtimeMessages_1.getRuntimeCliMessages)();
-    const { executable, argsPrefix } = resolveCommand(command);
+    const { executable, argsPrefix } = (0, resolveNpmSpawn_1.resolveSpawnCommand)(command);
     const result = (0, child_process_1.spawnSync)(executable, [...argsPrefix, ...args], {
         cwd: targetDir,
         stdio: 'inherit',

package/cli/dist/lib/config.js

@@ -17,11 +17,10 @@ const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const dotenv_1 = __importDefault(require("dotenv"));
 const child_process_1 = require("child_process");
-const module_1 = require("module");
 const paths_1 = require("./paths");
+const resolveNpmSpawn_1 = require("./resolveNpmSpawn");
 const runtimeMessages_1 = require("./cli/runtimeMessages");
 const json_1 = require("./types/json");
-const requireNode = (0, module_1.createRequire)(__filename);
 const MODE_TO_FILE = {
     dev: '.env.dev',
     prod: '.env.prod',
@@ -38,19 +37,18 @@ const VERSIONS_CONFIG_PATH = path_1.default.resolve((0, paths_1.getBuildToolsRoo
 const DEFAULT_APP_NAME = 'emailmaker';
 const DEFAULT_ENV_MODE = 'dev';
 const DEFAULT_PACKAGE_NAME = '@emailmaker/emailmaker';
-const DEFAULT_RUNTIME_PACKAGE = '@emailmaker/runtime';
 const DEFAULT_UI_KIT_PACKAGE = '@emailmaker/ui-kit';
 const DEFAULT_EXTENSIONS_API_PACKAGE = '@emailmaker/extensions-app';
 const DEFAULT_EXTENSIONS_REACT_PACKAGE = '@emailmaker/extensions-react';
 const DEFAULT_EXTENSIONS_SANDBOX_PACKAGE = '@emailmaker/extensions-sandbox';
 const DEFAULT_CLI_PACKAGE = '@emailmaker/cli';
-const DEFAULT_VERSION = '1.0.107-dev.3';
-const DEFAULT_RUNTIME_VERSION = '0.9.0-dev.1';
-const DEFAULT_UI_KIT_VERSION = '0.1.0-dev.1';
+const DEFAULT_VERSION = '1.0.107-dev.4';
+const DEFAULT_UI_KIT_VERSION = '0.1.0-dev.2';
 const DEFAULT_OPENAPI_BASE_URL = 'https://app.emailmaker.ru/api/';
 const TOOL_VERSIONS = {
     vite: '^7',
     typescript: '^5',
+    tsx: '^4.21.0',
     webpack: '^5',
     webpackCli: '^6',
     webpackDevServer: '^5',
@@ -66,6 +64,13 @@ function resolveEmbeddedValue(value) {
     }
     return value;
 }
+function getRuntimePackageName(mainPackageName) {
+    const normalized = String(mainPackageName || '').replace(/\/+$/, '');
+    if (!normalized) {
+        throw new Error('[runtime-package] mainPackageName is empty');
+    }
+    return `${normalized}/runtime`;
+}
 function loadEnvFile(filePath, override) {
     if (!fs_1.default.existsSync(filePath)) {
         return;
@@ -133,7 +138,7 @@ function applyVersionsOverlay(envMode) {
         return;
     }
     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;
@@ -142,19 +147,6 @@ function applyVersionsOverlay(envMode) {
     process.env.REACT_APP_RELEASE_CHANNEL = releaseChannel;
     process.env.RELEASE_CHANNEL = releaseChannel;
 }
-function resolveCommand(command) {
-    if (process.platform === 'win32' && (command === 'npm' || command === 'npx')) {
-        const npmPackageJson = requireNode.resolve('npm/package.json');
-        return {
-            executable: process.execPath,
-            argsPrefix: [path_1.default.join(path_1.default.dirname(npmPackageJson), 'bin', `${command}-cli.js`)],
-        };
-    }
-    return {
-        executable: command,
-        argsPrefix: [],
-    };
-}
 function resolveEnvDir(cwd, appName) {
     if (!appName) {
         return cwd;
@@ -214,14 +206,12 @@ function loadLocalEnvironment(options = {}) {
 function getMissingConfigNames(config) {
     const requiredFields = [
         ['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],
     ];
     return requiredFields
@@ -229,16 +219,18 @@ function getMissingConfigNames(config) {
         .map(([name]) => name);
 }
 function resolvePackageConfig(options = {}) {
+    const packageName = readEmbeddedProductIdentity('REACT_APP_PACKAGE_NAME', DEFAULT_PACKAGE_NAME);
+    const version = readConfiguredValue('REACT_APP_VERSION', DEFAULT_VERSION);
     const config = {
-        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', DEFAULT_EXTENSIONS_API_PACKAGE),
         extensionsReactPackageName: readEmbeddedProductIdentity('REACT_APP_EXTENSIONS_REACT_PACKAGE', DEFAULT_EXTENSIONS_REACT_PACKAGE),
         extensionsSandboxPackageName: readEmbeddedProductIdentity('REACT_APP_EXTENSIONS_SANDBOX_PACKAGE', 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),
@@ -272,7 +264,7 @@ function npmViewVersionToString(parsed) {
     return '';
 }
 function readLatestRegistryVersion(packageName, distTag = 'latest') {
-    const { executable, argsPrefix } = resolveCommand('npm');
+    const { executable, argsPrefix } = (0, resolveNpmSpawn_1.resolveSpawnCommand)('npm');
     const packageSpec = distTag && distTag !== 'latest'
         ? `${packageName}@${distTag}`
         : packageName;
@@ -312,7 +304,6 @@ function resolveLatestPackageConfig(config, options = {}) {
         return fallbackVersion;
     };
     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);
@@ -321,7 +312,7 @@ function resolveLatestPackageConfig(config, options = {}) {
     return {
         ...config,
         version: latestPackageVersion,
-        runtimeVersion: latestRuntimeVersion,
+        runtimeVersion: latestPackageVersion,
         uiKitVersion: latestUiKitVersion,
         extensionsApiVersion: latestExtensionsApiVersion,
         extensionsReactVersion: latestExtensionsReactVersion,

package/cli/dist/lib/local-test.js

@@ -7,32 +7,18 @@ exports.createLocalPackageTarballs = createLocalPackageTarballs;
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const child_process_1 = require("child_process");
-const module_1 = require("module");
 const paths_1 = require("./paths");
+const resolveNpmSpawn_1 = require("./resolveNpmSpawn");
 const runtimeMessages_1 = require("./cli/runtimeMessages");
 const types_1 = require("./types");
-const requireNode = (0, module_1.createRequire)(__filename);
 const PROJECT_ROOT = (0, paths_1.getMonorepoRoot)();
 const DEFAULT_BUILD_DIR = path_1.default.resolve(PROJECT_ROOT, 'build');
 function ensureDirectory(dirPath) {
     fs_1.default.mkdirSync(dirPath, { recursive: true });
 }
-function resolveCommand(command) {
-    if (process.platform === 'win32' && (command === 'npm' || command === 'npx')) {
-        const npmPackageJson = requireNode.resolve('npm/package.json');
-        return {
-            executable: process.execPath,
-            argsPrefix: [path_1.default.join(path_1.default.dirname(npmPackageJson), 'bin', `${command}-cli.js`)],
-        };
-    }
-    return {
-        executable: command,
-        argsPrefix: [],
-    };
-}
 function packPackage(packageDir, destinationDir) {
     const runtimeMessages = (0, runtimeMessages_1.getRuntimeCliMessages)();
-    const { executable, argsPrefix } = resolveCommand('npm');
+    const { executable, argsPrefix } = (0, resolveNpmSpawn_1.resolveNpmSpawnCommand)('npm');
     const result = (0, child_process_1.spawnSync)(executable, [...argsPrefix, 'pack', '--pack-destination', destinationDir], {
         cwd: packageDir,
         encoding: 'utf8',
@@ -60,7 +46,7 @@ function buildLocalTestPackages(normalizedBuildDir, options = {}) {
     }
     const targets = includeUmdBundle ? 'esm,react-adapter,umd' : 'esm,react-adapter';
     console.log(`[cli] ${runtimeMessages.localTestBuildStarting(targets)}`);
-    const { executable, argsPrefix } = resolveCommand('npx');
+    const { executable, argsPrefix } = (0, resolveNpmSpawn_1.resolveNpmSpawnCommand)('npx');
     const result = (0, child_process_1.spawnSync)(executable, [...argsPrefix, 'tsx', 'build-tools/pipeline.ts', '--targets', targets, '--mode', 'production', '--lint=false', '--type-check=false'], {
         cwd: PROJECT_ROOT,
         stdio: 'inherit',
@@ -101,11 +87,9 @@ function createLocalPackageTarballs(options) {
     const packageDirs = standOnlyPackages
         ? {
             packageName: normalizedBuildDir,
-            runtimePackageName: path_1.default.resolve(normalizedBuildDir, 'runtime'),
         }
         : {
             packageName: normalizedBuildDir,
-            runtimePackageName: path_1.default.resolve(normalizedBuildDir, 'runtime'),
             uiKitPackageName: path_1.default.resolve(normalizedBuildDir, 'ui-kit'),
             extensionsApiPackageName: path_1.default.resolve(normalizedBuildDir, 'extensions/api'),
             extensionsReactPackageName: path_1.default.resolve(normalizedBuildDir, 'extensions/react'),

package/cli/dist/lib/paths.js

@@ -6,11 +6,22 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getCliPackageRoot = getCliPackageRoot;
 exports.getBuildToolsRoot = getBuildToolsRoot;
 exports.getMonorepoRoot = getMonorepoRoot;
+const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 /**
  * Корень npm-пакета `build-tools/cli` (корректно и из исходников `lib/…`, и из `dist/lib/…` после tsc).
  */
 function getCliPackageRoot() {
+    const candidates = [
+        path_1.default.resolve(__dirname, '..'),
+        path_1.default.resolve(__dirname, '..', '..'),
+    ];
+    for (const candidate of candidates) {
+        if (fs_1.default.existsSync(path_1.default.join(candidate, 'package.json'))
+            && fs_1.default.existsSync(path_1.default.join(candidate, 'project-templates'))) {
+            return candidate;
+        }
+    }
     return path_1.default.resolve(__dirname, '..', '..');
 }
 /** Корень `build-tools/` */

package/cli/dist/lib/resolveNpmSpawn.d.ts

@@ -0,0 +1,20 @@
+/**
+ * Путь к npm-cli.js / npx-cli.js для spawn через node.exe (нужно на Windows без shell).
+ * `require.resolve('npm/package.json')` работает только если пакет `npm` в дереве зависимостей;
+ * у типичной установки Node он лежит рядом с node.exe (см. fallback).
+ */
+export declare function findNpmCliJs(command: 'npm' | 'npx'): string | null;
+export type NpmSpawnArgs = {
+    executable: string;
+    argsPrefix: string[];
+};
+/**
+ * Запуск npm/npx на Windows без shell: через node.exe и *-cli.js из установки Node.
+ * Если путь не найден — откат на имя команды в PATH.
+ */
+export declare function resolveNpmSpawnCommand(command: 'npm' | 'npx'): NpmSpawnArgs;
+/**
+ * Только `npm` / `npx` нормализуются на Windows; остальные команды — как есть.
+ */
+export declare function resolveSpawnCommand(command: string): NpmSpawnArgs;
+//# sourceMappingURL=resolveNpmSpawn.d.ts.map

package/cli/dist/lib/resolveNpmSpawn.js

@@ -0,0 +1,71 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.findNpmCliJs = findNpmCliJs;
+exports.resolveNpmSpawnCommand = resolveNpmSpawnCommand;
+exports.resolveSpawnCommand = resolveSpawnCommand;
+const fs_1 = __importDefault(require("fs"));
+const path_1 = __importDefault(require("path"));
+const module_1 = require("module");
+const requireNode = (0, module_1.createRequire)(__filename);
+/**
+ * Путь к npm-cli.js / npx-cli.js для spawn через node.exe (нужно на Windows без shell).
+ * `require.resolve('npm/package.json')` работает только если пакет `npm` в дереве зависимостей;
+ * у типичной установки Node он лежит рядом с node.exe (см. fallback).
+ */
+function findNpmCliJs(command) {
+    const binaryName = `${command}-cli.js`;
+    try {
+        const npmPackageJson = requireNode.resolve('npm/package.json');
+        const p = path_1.default.join(path_1.default.dirname(npmPackageJson), 'bin', binaryName);
+        if (fs_1.default.existsSync(p)) {
+            return p;
+        }
+    }
+    catch {
+        /* npm не в node_modules CLI-пакета — ищем рядом с текущим node */
+    }
+    const binDir = path_1.default.dirname(process.execPath);
+    const npmRootCandidates = [
+        path_1.default.join(binDir, 'node_modules', 'npm'),
+        path_1.default.join(binDir, '..', 'lib', 'node_modules', 'npm'),
+    ];
+    for (const npmRoot of npmRootCandidates) {
+        const p = path_1.default.join(npmRoot, 'bin', binaryName);
+        if (fs_1.default.existsSync(p)) {
+            return p;
+        }
+    }
+    return null;
+}
+/**
+ * Запуск npm/npx на Windows без shell: через node.exe и *-cli.js из установки Node.
+ * Если путь не найден — откат на имя команды в PATH.
+ */
+function resolveNpmSpawnCommand(command) {
+    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; остальные команды — как есть.
+ */
+function resolveSpawnCommand(command) {
+    if (command === 'npm' || command === 'npx') {
+        return resolveNpmSpawnCommand(command);
+    }
+    return { executable: command, argsPrefix: [] };
+}
+//# sourceMappingURL=resolveNpmSpawn.js.map

package/cli/dist/lib/template-engine/context/pluginPackageJsonData.js

@@ -12,20 +12,19 @@ function buildPluginPackageJsonData(options) {
     const generatedPaths = (0, paths_1.getGeneratedPaths)(options);
     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 = (0, utils_1.resolveLocalPublishedPackageKey)(localPublishedNames, 'packageName', packageConfig.packageName);
-    const runtimePkgKey = (0, utils_1.resolveLocalPublishedPackageKey)(localPublishedNames, 'runtimePackageName', packageConfig.runtimePackageName);
     const extApiKey = (0, utils_1.resolveLocalPublishedPackageKey)(localPublishedNames, 'extensionsApiPackageName', packageConfig.extensionsApiPackageName);
     const extReactKey = (0, utils_1.resolveLocalPublishedPackageKey)(localPublishedNames, 'extensionsReactPackageName', packageConfig.extensionsReactPackageName);
     const extSandboxKey = (0, utils_1.resolveLocalPublishedPackageKey)(localPublishedNames, 'extensionsSandboxPackageName', packageConfig.extensionsSandboxPackageName);
     const uiKitKey = (0, utils_1.resolveLocalPublishedPackageKey)(localPublishedNames, 'uiKitPackageName', packageConfig.uiKitPackageName);
-    const peerDependencies = {
+    const dependencies = {
         [mainPkgKey]: appPackageVersion,
-        [runtimePkgKey]: runtimePackageVersion,
+    };
+    const peerDependencies = {
         [extApiKey]: extensionsApiVersion,
         [extReactKey]: extensionsReactVersion,
         [extSandboxKey]: extensionsSandboxVersion,
@@ -34,12 +33,11 @@ function buildPluginPackageJsonData(options) {
         peerDependencies[uiKitKey] = packageConfig.uiKitVersion;
     }
     const devDependencies = {
-        [mainPkgKey]: appPackageVersion,
-        [runtimePkgKey]: runtimePackageVersion,
         [extApiKey]: extensionsApiVersion,
         [extReactKey]: extensionsReactVersion,
         [extSandboxKey]: extensionsSandboxVersion,
         typescript: String(packageConfig.versions.typescript),
+        tsx: packageConfig.versions.tsx,
         ...utils_1.LEGACY_REACT_DEPENDENCIES,
     };
     if (includesUiPreset || localTarballs?.uiKitPackageName) {
@@ -57,6 +55,7 @@ function buildPluginPackageJsonData(options) {
         devDependencies['webpack-dev-server'] = packageConfig.versions.webpackDevServer;
         devDependencies['ts-loader'] = packageConfig.versions.tsLoader;
     }
+    const webpackCliCommand = 'tsx ./node_modules/webpack-cli/bin/cli.js';
     return {
         name: pluginPackageName,
         version: '0.1.0',
@@ -68,25 +67,28 @@ function buildPluginPackageJsonData(options) {
         files: ['dist', 'README.md'],
         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/dist/lib/template-engine/context/standVitePackageJsonData.js

@@ -18,13 +18,11 @@ function buildStandVitePackageJsonData(options) {
     const advancedProfile = (0, utils_1.getAdvancedStandProfile)(options);
     const isMemoryUsageStand = standMode === 'advanced' && advancedProfile === 'memory-usage';
     const appPackageVersion = localTarballs?.packageName || packageConfig.version;
-    const runtimePackageVersion = localTarballs?.runtimePackageName || packageConfig.runtimeVersion;
     const mainPkgKey = (0, utils_1.resolveLocalPublishedPackageKey)(localPublishedNames, 'packageName', packageConfig.packageName);
-    const runtimePkgKey = (0, utils_1.resolveLocalPublishedPackageKey)(localPublishedNames, 'runtimePackageName', packageConfig.runtimePackageName);
     const devDependencies = {
         [mainPkgKey]: appPackageVersion,
-        [runtimePkgKey]: runtimePackageVersion,
         typescript: String(packageConfig.versions.typescript),
+        tsx: packageConfig.versions.tsx,
         formidable: '^3.5.2',
         ...utils_1.LEGACY_REACT_DEPENDENCIES,
     };
@@ -45,12 +43,13 @@ function buildStandVitePackageJsonData(options) {
         devDependencies['webpack-dev-server'] = packageConfig.versions.webpackDevServer;
         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}`,
@@ -58,8 +57,8 @@ function buildStandVitePackageJsonData(options) {
                 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 {
         ...BASE_STAND_PACKAGE_JSON,

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

@@ -35,16 +35,20 @@ declare function resolveStandWebpackBaseLayerDir(cliRoot?: string): string;
 /** Слои: общая статика stand+webpack, затем вариант (oauth / closed-loop). */
 declare function getStandWebpackEtaLayerRoots(templateOptions: StandEtaRoutingInput, cliRoot?: string): string[] | null;
 declare function resolveStandReactAdapterViteVariantDir(cliRoot?: string): string;
+declare function resolveStandReactAdapterWebpackVariantDir(cliRoot?: string): string;
 declare function resolveStandAdvancedUmdWebpackVariantDir(cliRoot?: string): string;
 declare function resolveStandAdvancedShadowDomWebpackVariantDir(cliRoot?: string): string;
 /** demo-stand react-adapter + vite */
 declare function shouldUseEtaStandReactAdapterVite(options: StandEtaRoutingInput): boolean;
+/** demo-stand react-adapter + webpack */
+declare function shouldUseEtaStandReactAdapterWebpack(options: StandEtaRoutingInput): boolean;
 /** advanced + vite (shadow-dom | umd | memory-usage | subpath) */
 declare function getStandAdvancedViteEtaLayerRoots(templateOptions: StandEtaRoutingInput, cliRoot?: string): string[] | null;
 /** advanced + webpack (subpath | umd | shadow-dom) */
 declare function getStandAdvancedWebpackEtaLayerRoots(templateOptions: StandEtaRoutingInput, cliRoot?: string): string[] | null;
 declare function getStandReactAdapterViteEtaLayerRoots(templateOptions: StandEtaRoutingInput, cliRoot?: string): string[] | null;
+declare function getStandReactAdapterWebpackEtaLayerRoots(templateOptions: StandEtaRoutingInput, cliRoot?: string): string[] | null;
 /** Stand + Eta: простые slug, react-adapter, advanced-ветки. */
 declare function getStandEtaLayerRoots(templateOptions: StandEtaRoutingInput, cliRoot?: string): string[] | null;
-export { getCliPackageRoot, getEtaPartialsDir, shouldUseEtaStandOauthVite, shouldUseEtaStandClosedLoopVite, shouldUseEtaStandOauthWebpack, shouldUseEtaStandClosedLoopWebpack, resolveStandOauthViteVariantDir, resolveStandClosedLoopViteVariantDir, resolveStandOauthWebpackVariantDir, resolveStandClosedLoopWebpackVariantDir, resolveEtaStandViteVariantRoot, resolveEtaStandWebpackVariantRoot, resolveStandViteBaseLayerDir, resolveStandWebpackBaseLayerDir, getStandViteEtaLayerRoots, getStandWebpackEtaLayerRoots, getStandReactAdapterViteEtaLayerRoots, getStandAdvancedViteEtaLayerRoots, getStandAdvancedWebpackEtaLayerRoots, shouldUseEtaStandReactAdapterVite, resolveStandReactAdapterViteVariantDir, resolveStandAdvancedUmdWebpackVariantDir, resolveStandAdvancedShadowDomWebpackVariantDir, getStandEtaLayerRoots, };
+export { getCliPackageRoot, getEtaPartialsDir, shouldUseEtaStandOauthVite, shouldUseEtaStandClosedLoopVite, shouldUseEtaStandOauthWebpack, shouldUseEtaStandClosedLoopWebpack, resolveStandOauthViteVariantDir, resolveStandClosedLoopViteVariantDir, resolveStandOauthWebpackVariantDir, resolveStandClosedLoopWebpackVariantDir, resolveEtaStandViteVariantRoot, resolveEtaStandWebpackVariantRoot, resolveStandViteBaseLayerDir, resolveStandWebpackBaseLayerDir, getStandViteEtaLayerRoots, getStandWebpackEtaLayerRoots, getStandReactAdapterViteEtaLayerRoots, getStandReactAdapterWebpackEtaLayerRoots, getStandAdvancedViteEtaLayerRoots, getStandAdvancedWebpackEtaLayerRoots, shouldUseEtaStandReactAdapterVite, shouldUseEtaStandReactAdapterWebpack, resolveStandReactAdapterViteVariantDir, resolveStandReactAdapterWebpackVariantDir, resolveStandAdvancedUmdWebpackVariantDir, resolveStandAdvancedShadowDomWebpackVariantDir, getStandEtaLayerRoots, };
 //# sourceMappingURL=resolveVariantDir.d.ts.map

package/cli/dist/lib/template-engine/resolveVariantDir.js

@@ -20,10 +20,13 @@ exports.resolveStandWebpackBaseLayerDir = resolveStandWebpackBaseLayerDir;
 exports.getStandViteEtaLayerRoots = getStandViteEtaLayerRoots;
 exports.getStandWebpackEtaLayerRoots = getStandWebpackEtaLayerRoots;
 exports.getStandReactAdapterViteEtaLayerRoots = getStandReactAdapterViteEtaLayerRoots;
+exports.getStandReactAdapterWebpackEtaLayerRoots = getStandReactAdapterWebpackEtaLayerRoots;
 exports.getStandAdvancedViteEtaLayerRoots = getStandAdvancedViteEtaLayerRoots;
 exports.getStandAdvancedWebpackEtaLayerRoots = getStandAdvancedWebpackEtaLayerRoots;
 exports.shouldUseEtaStandReactAdapterVite = shouldUseEtaStandReactAdapterVite;
+exports.shouldUseEtaStandReactAdapterWebpack = shouldUseEtaStandReactAdapterWebpack;
 exports.resolveStandReactAdapterViteVariantDir = resolveStandReactAdapterViteVariantDir;
+exports.resolveStandReactAdapterWebpackVariantDir = resolveStandReactAdapterWebpackVariantDir;
 exports.resolveStandAdvancedUmdWebpackVariantDir = resolveStandAdvancedUmdWebpackVariantDir;
 exports.resolveStandAdvancedShadowDomWebpackVariantDir = resolveStandAdvancedShadowDomWebpackVariantDir;
 exports.getStandEtaLayerRoots = getStandEtaLayerRoots;
@@ -148,6 +151,9 @@ function getStandWebpackEtaLayerRoots(templateOptions, cliRoot = (0, paths_1.get
 function resolveStandReactAdapterViteVariantDir(cliRoot = (0, paths_1.getCliPackageRoot)()) {
     return path_1.default.join(cliRoot, 'project-templates', 'stand', 'react-adapter', 'vite');
 }
+function resolveStandReactAdapterWebpackVariantDir(cliRoot = (0, paths_1.getCliPackageRoot)()) {
+    return path_1.default.join(cliRoot, 'project-templates', 'stand', 'react-adapter', 'webpack');
+}
 function resolveStandAdvancedViteVariantDir(profile, cliRoot = (0, paths_1.getCliPackageRoot)()) {
     return path_1.default.join(cliRoot, 'project-templates', 'stand', 'advanced', profile, 'vite');
 }
@@ -168,6 +174,14 @@ function shouldUseEtaStandReactAdapterVite(options) {
         return false;
     return (0, utils_1.getDemoStandMode)(options) === 'react-adapter';
 }
+/** demo-stand react-adapter + webpack */
+function shouldUseEtaStandReactAdapterWebpack(options) {
+    if (!(0, utils_1.isDemoStandKind)(options.kind))
+        return false;
+    if (options.bundler !== 'webpack')
+        return false;
+    return (0, utils_1.getDemoStandMode)(options) === 'react-adapter';
+}
 /** advanced + vite (shadow-dom | umd | memory-usage | subpath) */
 function getStandAdvancedViteEtaLayerRoots(templateOptions, cliRoot = (0, paths_1.getCliPackageRoot)()) {
     if (templateOptions.bundler !== 'vite')
@@ -216,6 +230,11 @@ function getStandReactAdapterViteEtaLayerRoots(templateOptions, cliRoot = (0, pa
         return null;
     return [resolveStandViteBaseLayerDir(cliRoot), resolveStandReactAdapterViteVariantDir(cliRoot)];
 }
+function getStandReactAdapterWebpackEtaLayerRoots(templateOptions, cliRoot = (0, paths_1.getCliPackageRoot)()) {
+    if (!shouldUseEtaStandReactAdapterWebpack(templateOptions))
+        return null;
+    return [resolveStandWebpackBaseLayerDir(cliRoot), resolveStandReactAdapterWebpackVariantDir(cliRoot)];
+}
 /** Stand + Eta: простые slug, react-adapter, advanced-ветки. */
 function getStandEtaLayerRoots(templateOptions, cliRoot = (0, paths_1.getCliPackageRoot)()) {
     const simpleVite = getStandViteEtaLayerRoots(templateOptions, cliRoot);
@@ -227,6 +246,9 @@ function getStandEtaLayerRoots(templateOptions, cliRoot = (0, paths_1.getCliPack
     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;

package/cli/dist/lib/templates/shared/i18n.js

@@ -118,7 +118,7 @@ const MESSAGES = {
         'readmeStand.emailTemplate': '- `src/dev/email.html` - base email template',
         'readmeStand.editorConfigFile': '- `src/dev/editorConfig.ts` - base config passed to `init(...)` (editor API)',
         'readmeStand.storageProviderFile': '- `src/dev/storageProvider.ts` - StorageProvider (`pathMode`, `./storage`)',
-        'readmeStand.storageMiddleware': '- `scripts/devStorageMiddleware.cjs` - middleware for `/dev-storage`',
+        'readmeStand.storageMiddleware': '- `scripts/devStorageMiddleware.ts` - middleware for `/dev-storage`',
         'readmeStand.storageFolder': '- `storage/` - folder for uploaded files',
         'readmeStand.configDir': '- `config/` - bundler config used by `npm run start` and `npm run build`',
         'readmeStand.oauthCredentialsFile': '- `src/dev/oauthCredentials.ts` - OAuth credentials',
@@ -239,7 +239,7 @@ const MESSAGES = {
         'readmeStand.emailTemplate': '- `src/dev/email.html` - базовый шаблон письма',
         'readmeStand.editorConfigFile': '- `src/dev/editorConfig.ts` - базовый config для вызова `init(...)` редактора',
         'readmeStand.storageProviderFile': '- `src/dev/storageProvider.ts` - StorageProvider (`pathMode`, `./storage`)',
-        'readmeStand.storageMiddleware': '- `scripts/devStorageMiddleware.cjs` - middleware для `/dev-storage`',
+        'readmeStand.storageMiddleware': '- `scripts/devStorageMiddleware.ts` - middleware для `/dev-storage`',
         'readmeStand.storageFolder': '- `storage/` - папка для загруженных файлов',
         'readmeStand.configDir': '- `config/` - bundler-конфиг для `npm run start` и `npm run build`',
         'readmeStand.oauthCredentialsFile': '- `src/dev/oauthCredentials.ts` - OAuth credentials',

package/cli/dist/lib/templates/shared/paths.js

@@ -8,14 +8,13 @@ function getGeneratedPaths(options) {
     const isSubpathAdvancedStand = isStand
         && (0, utils_1.getDemoStandMode)(options) === 'advanced'
         && (0, utils_1.getAdvancedStandProfile)(options) === 'subpath';
-    const ext = bundler === 'vite' ? 'mjs' : 'cjs';
     return {
         indexHtml: bundler === 'vite'
             ? (isSubpathAdvancedStand ? 'advanced/subpath/index.html' : 'index.html')
             : (isSubpathAdvancedStand ? 'public/advanced/subpath/index.html' : 'public/index.html'),
-        devConfig: `config/dev-host.${ext}`,
-        pluginBuildConfig: isStand ? undefined : `config/plugin-build.${ext}`,
-        sandboxBuildConfig: isStand ? undefined : `config/sandbox-build.${ext}`,
+        devConfig: 'config/dev-host.ts',
+        pluginBuildConfig: isStand ? undefined : 'config/plugin-build.ts',
+        sandboxBuildConfig: isStand ? undefined : 'config/sandbox-build.ts',
     };
 }
 //# sourceMappingURL=paths.js.map

package/cli/dist/lib/types/package-config.d.ts

@@ -2,6 +2,7 @@
 export interface ToolVersions {
     vite: string;
     typescript: string;
+    tsx: string;
     webpack: string;
     webpackCli: string;
     webpackDevServer: string;