@gravity-ui/app-builder 0.28.1-beta.5 → 0.28.1-beta.7

package/dist/commands/build/build-service/server.js

@@ -1,72 +1,59 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.buildServer = buildServer;
-const path = __importStar(require("node:path"));
 const signal_exit_1 = require("signal-exit");
 const controllable_script_1 = require("../../../common/child-process/controllable-script");
-const logger_1 = require("../../../common/logger");
 const paths_1 = __importDefault(require("../../../common/paths"));
 const utils_1 = require("../../../common/utils");
-const swc = __importStar(require("../../../common/swc"));
+function createSWCBuildScript(config) {
+    return `
+let swcCli;
+try {
+    swcCli = require('@swc/cli');
+} catch (e) {
+    if (e.code !== 'MODULE_NOT_FOUND') {
+        throw e;
+    }
+    swcCli = require(${JSON.stringify(require.resolve('@swc/cli'))});
+}
+const {swcDir} = swcCli;
+const {Logger} = require(${JSON.stringify(require.resolve('../../../common/logger'))});
+const {compile} = require(${JSON.stringify(require.resolve('../../../common/swc/compile'))});
+
+const logger = new Logger('server', ${config.verbose});
+compile(swcDir, {
+    logger,
+    outputPath: ${JSON.stringify(paths_1.default.appDist)},
+    projectPath: ${JSON.stringify(paths_1.default.appServer)},
+});`;
+}
+function createTypescriptBuildScript(config) {
+    return `
+let ts;
+try {
+    ts = require('typescript');
+} catch (e) {
+    if (e.code !== 'MODULE_NOT_FOUND') {
+        throw e;
+    }
+    ts = require(${JSON.stringify(require.resolve('typescript'))});
+}
+const {Logger} = require(${JSON.stringify(require.resolve('../../../common/logger'))});
+const {compile} = require(${JSON.stringify(require.resolve('../../../common/typescript/compile'))});
+
+const logger = new Logger('server', ${config.verbose});
+compile(ts, {logger, projectPath: ${JSON.stringify(paths_1.default.appServer)}});`;
+}
 function buildServer(config) {
     (0, utils_1.createRunFolder)();
-    if (config.server.compiler === 'swc') {
-        // Используем SWC для компиляции
-        return new Promise((resolve, reject) => {
-            const logger = new logger_1.Logger('server', config.verbose);
-            const serverPath = path.resolve(paths_1.default.appDist, 'server');
-            swc.compile({
-                projectPath: paths_1.default.appServer,
-                outputPath: serverPath,
-                logger,
-                enableSourceMap: false,
-            }).then(() => resolve(), (error) => reject(new Error(`SWC compilation failed: ${error}`)));
-        });
-    }
     // Используем TypeScript для компиляции (по умолчанию)
     return new Promise((resolve, reject) => {
-        const build = new controllable_script_1.ControllableScript(`
-        let ts;
-        try {
-            ts = require('typescript');
-        } catch (e) {
-            if (e.code !== 'MODULE_NOT_FOUND') {
-                throw e;
-            }
-            ts = require(${JSON.stringify(require.resolve('typescript'))});
-        }
-        const {Logger} = require(${JSON.stringify(require.resolve('../../../common/logger'))});
-        const {compile} = require(${JSON.stringify(require.resolve('../../../common/typescript/compile'))});
-
-        const logger = new Logger('server', ${config.verbose});
-        compile(ts, {logger, projectPath: ${JSON.stringify(paths_1.default.appServer)}});
-    `, null);
+        const build = new controllable_script_1.ControllableScript(config.server.compiler === 'swc'
+            ? createSWCBuildScript(config)
+            : createTypescriptBuildScript(config), null);
         build.start().then(() => {
             build.onExit((code) => {
                 if (code) {

package/dist/commands/dev/server.js

@@ -79,6 +79,7 @@ watch(
     swcDir,
     ${JSON.stringify(paths_1.default.appServer)},
     {
+        outputPath: ${JSON.stringify(paths_1.default.appDist)},
         logger,
         onAfterFilesEmitted: () => {
             process.send({type: 'Emitted'});

package/dist/common/swc/compile.d.ts

@@ -5,5 +5,5 @@ interface SwcCompileOptions {
     logger: Logger;
     enableSourceMap?: boolean;
 }
-export declare function compile({ projectPath, outputPath, logger, enableSourceMap, }: SwcCompileOptions): Promise<void>;
+export declare function compile(swcDir: any, { projectPath, outputPath, logger, enableSourceMap }: SwcCompileOptions): Promise<void>;
 export {};

package/dist/common/swc/compile.js

@@ -1,72 +1,62 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.compile = compile;
-const rimraf_1 = require("rimraf");
-// @ts-ignore - @swc/cli не имеет типов
-const cli_1 = require("@swc/cli");
 const pretty_time_1 = require("../logger/pretty-time");
-async function compile({ projectPath, outputPath, logger, enableSourceMap = false, }) {
-    const start = process.hrtime.bigint();
-    logger.message('Start SWC compilation');
-    // Очищаем выходную директорию
-    rimraf_1.rimraf.sync(outputPath);
-    const swcConfig = {
+const getSwcConfig = (enableSourceMap = false) => {
+    return {
         module: {
             type: 'commonjs',
         },
         jsc: {
+            target: 'es2020',
             parser: {
                 syntax: 'typescript',
-                tsx: true,
             },
-            target: 'es2020',
-            transform: {
-                decoratorMetadata: true,
-            },
-            externalHelpers: false,
         },
         sourceMaps: enableSourceMap,
     };
+};
+async function compile(
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+swcDir, { projectPath, outputPath, logger, enableSourceMap = false }) {
+    const start = process.hrtime.bigint();
+    logger.message('Start compilation');
+    const swcConfig = getSwcConfig(enableSourceMap);
     const cliOptions = {
         filenames: [projectPath],
         outDir: outputPath,
         watch: false,
-        quiet: false,
         sourceMaps: enableSourceMap,
-        extensions: ['.js', '.jsx', '.ts', '.tsx', '.mjs', '.cjs'],
+        extensions: ['.js', '.ts', '.mjs', '.cjs'],
         stripLeadingPaths: true,
-        deleteDirOnStart: false,
-        copyFiles: false,
-        includeDotfiles: false,
         sync: false,
-        workers: 1,
     };
     return new Promise((resolve, reject) => {
         const callbacks = {
             onSuccess: (_result) => {
-                logger.success(`SWC compiled successfully in ${(0, pretty_time_1.elapsedTime)(start)}`);
+                logger.success(`Compiled successfully in ${(0, pretty_time_1.elapsedTime)(start)}`);
                 resolve();
             },
             onFail: (result) => {
-                logger.error(`SWC compilation failed in ${result.duration}ms`);
+                logger.error(`Compilation failed in ${result.duration}ms`);
                 if (result.reasons) {
                     for (const [filename, error] of result.reasons) {
                         logger.error(`${filename}: ${error}`);
                     }
                 }
                 logger.error(`Error compile, elapsed time ${(0, pretty_time_1.elapsedTime)(start)}`);
-                reject(new Error('SWC compilation failed'));
+                reject(new Error('Compilation failed'));
             },
         };
         try {
-            (0, cli_1.swcDir)({
+            swcDir({
                 cliOptions,
                 swcOptions: swcConfig,
                 callbacks,
             });
         }
         catch (error) {
-            logger.error(`Failed to start SWC compilation: ${error}`);
+            logger.error(`Failed to start compilation: ${error}`);
             reject(error);
         }
     });

package/dist/common/swc/watch.d.ts

@@ -1,10 +1,9 @@
 import type { Logger } from '../logger';
 interface SwcWatchOptions {
-    projectPath: string;
     outputPath: string;
     logger: Logger;
     onAfterFilesEmitted?: () => void;
     enableSourceMap?: boolean;
 }
-export declare function watch(swcDir: any, { projectPath, outputPath, logger, onAfterFilesEmitted, enableSourceMap, }: SwcWatchOptions): Promise<void>;
+export declare function watch(swcDir: any, projectPath: string, { outputPath, logger, onAfterFilesEmitted, enableSourceMap }: SwcWatchOptions): Promise<void>;
 export {};

package/dist/common/swc/watch.js

@@ -1,46 +1,39 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.watch = watch;
-const rimraf_1 = require("rimraf");
-const getSwcConfig = () => {
+const getSwcConfig = (enableSourceMap = false) => {
     return {
+        module: {
+            type: 'commonjs',
+        },
         jsc: {
             target: 'es2020',
             parser: {
                 syntax: 'typescript',
-                decorators: false,
-                dynamicImport: false,
             },
         },
-        sourceMaps: true,
+        sourceMaps: enableSourceMap,
     };
 };
 async function watch(
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-swcDir, { projectPath, outputPath, logger, onAfterFilesEmitted, enableSourceMap = false, }) {
-    logger.message('Start SWC compilation in watch mode');
-    // Очищаем выходную директорию
-    rimraf_1.rimraf.sync(outputPath);
-    const swcConfig = getSwcConfig();
+swcDir, projectPath, { outputPath, logger, onAfterFilesEmitted, enableSourceMap = false }) {
+    logger.message('Start compilation in watch mode');
+    const swcConfig = getSwcConfig(enableSourceMap);
     const cliOptions = {
         filenames: [projectPath],
         outDir: outputPath,
         watch: true,
-        quiet: false,
         sourceMaps: enableSourceMap,
         extensions: ['.js', '.ts', '.mjs', '.cjs'],
         stripLeadingPaths: true,
-        deleteDirOnStart: false,
-        copyFiles: false,
-        includeDotfiles: false,
         sync: false,
-        workers: 1,
         logWatchCompilation: true,
     };
     const callbacks = {
         onSuccess: (result) => {
             if (result.filename) {
-                logger.verbose(`Successfully compiled ${result.filename} in ${result.duration}ms`);
+                logger.message(`Successfully compiled ${result.filename} in ${result.duration}ms`);
             }
             else {
                 logger.message(`Successfully compiled ${result.compiled || 0} files in ${result.duration}ms`);
@@ -48,7 +41,7 @@ swcDir, { projectPath, outputPath, logger, onAfterFilesEmitted, enableSourceMap
             onAfterFilesEmitted?.();
         },
         onFail: (result) => {
-            logger.error(`SWC compilation failed in ${result.duration}ms`);
+            logger.error(`Compilation failed in ${result.duration}ms`);
             if (result.reasons) {
                 for (const [filename, error] of result.reasons) {
                     logger.error(`${filename}: ${error}`);
@@ -56,11 +49,10 @@ swcDir, { projectPath, outputPath, logger, onAfterFilesEmitted, enableSourceMap
             }
         },
         onWatchReady: () => {
-            logger.message('SWC watching for file changes');
+            logger.message('Watching for file changes');
         },
     };
-    // Запускаем swcDir
-    await swcDir({
+    swcDir({
         cliOptions,
         swcOptions: swcConfig,
         callbacks,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gravity-ui/app-builder",
-  "version": "0.28.1-beta.5",
+  "version": "0.28.1-beta.7",
   "description": "Develop and build your React client-server projects, powered by typescript and webpack",
   "license": "MIT",
   "type": "commonjs",