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

package/README.md

@@ -81,7 +81,6 @@ export default defineConfig(
       },
       server: {
         // server settings
-        tsconfigFileName: 'custom-tsconfig.json',
       },
     };
   },
@@ -144,8 +143,8 @@ All server settings are used only in dev mode:
 - `watchThrottle` (`number`) — use to add an extra throttle, or delay restarting.
 - `inspect/inspectBrk` (`number | true`) — listen for a debugging client on specified port.
   If specified `true`, try to listen on `9229`.
-- `tsconfig` (`string`) — name of the tsconfig file for server build.
-  Default: `tsconfig.json`.
+- `compiler` (`'typescript' | 'swc'`) — choose TypeScript compiler for server code compilation.
+  Default is `'typescript'`. Set to `'swc'` for faster compilation with SWC.
 
 ### Client
 

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

@@ -1,17 +1,56 @@
 "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 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 tsconfigFileName = config.server.tsconfigFileName || 'tsconfig.json';
         const build = new controllable_script_1.ControllableScript(`
         let ts;
         try {
@@ -26,11 +65,7 @@ function buildServer(config) {
         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)},
-            configFileName: ${JSON.stringify(tsconfigFileName)}
-        });
+        compile(ts, {logger, projectPath: ${JSON.stringify(paths_1.default.appServer)}});
     `, null);
         build.start().then(() => {
             build.onExit((code) => {

package/dist/commands/dev/server.js

@@ -32,38 +32,68 @@ const rimraf_1 = require("rimraf");
 const controllable_script_1 = require("../../common/child-process/controllable-script");
 const utils_1 = require("../../common/utils");
 const paths_1 = __importDefault(require("../../common/paths"));
+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 {watch} = require(${JSON.stringify(require.resolve('../../common/typescript/watch'))});
+
+const logger = new Logger('server', ${config.verbose});
+watch(
+    ts,
+    ${JSON.stringify(paths_1.default.appServer)},
+    {
+        logger,
+        onAfterFilesEmitted: () => {
+            process.send({type: 'Emitted'});
+        },
+        enableSourceMap: true
+    }
+);`;
+}
+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 {watch} = require(${JSON.stringify(require.resolve('../../common/swc/watch'))});
+
+const logger = new Logger('server', ${config.verbose});
+watch(
+    swcDir,
+    ${JSON.stringify(paths_1.default.appServer)},
+    {
+        logger,
+        onAfterFilesEmitted: () => {
+            process.send({type: 'Emitted'});
+        },
+        enableSourceMap: true
+    }
+);`;
+}
 async function watchServerCompilation(config) {
     const serverPath = path.resolve(paths_1.default.appDist, 'server');
     rimraf_1.rimraf.sync(serverPath);
     (0, utils_1.createRunFolder)();
-    const tsconfigFileName = config.server.tsconfigFileName || 'tsconfig.json';
-    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 {watch} = require(${JSON.stringify(require.resolve('../../common/typescript/watch'))});
-
-        const logger = new Logger('server', ${config.verbose});
-        watch(
-            ts,
-            ${JSON.stringify(paths_1.default.appServer)},
-            {
-                logger,
-                onAfterFilesEmitted: () => {
-                    process.send({type: 'Emitted'});
-                },
-                enableSourceMap: true,
-                tsconfigFileName: ${JSON.stringify(tsconfigFileName)}
-            }
-        );
-        `, null);
+    const build = new controllable_script_1.ControllableScript(config.server.compiler === 'swc'
+        ? createSWCBuildScript(config)
+        : createTypescriptBuildScript(config), null);
     await build.start();
     return build;
 }

package/dist/common/config.js

@@ -154,6 +154,7 @@ async function normalizeConfig(userConfig, mode) {
             port: undefined,
             inspect: undefined,
             inspectBrk: undefined,
+            compiler: serverConfig.compiler || 'typescript',
         };
         if (mode === 'dev') {
             if (serverConfig.port === true) {

package/dist/common/models/index.d.ts

@@ -18,6 +18,7 @@ import type { TerserOptions } from 'terser-webpack-plugin';
 import type { ReactRefreshPluginOptions } from '@pmmmwh/react-refresh-webpack-plugin/types/lib/types';
 type Bundler = 'webpack' | 'rspack';
 type JavaScriptLoader = 'babel' | 'swc';
+type ServerCompiler = 'typescript' | 'swc';
 export type SwcConfig = Swc.Config & Pick<Swc.Options, 'isModule'>;
 export interface Entities<T> {
     data: Record<string, T>;
@@ -267,10 +268,10 @@ export interface ServerConfig {
     inspect?: number | true;
     inspectBrk?: number | true;
     /**
-     * Name of the tsconfig file for server build
-     * Default: 'tsconfig.json'
+     * Compiler for server code compilation
+     * @default 'typescript'
      */
-    tsconfigFileName?: string;
+    compiler?: ServerCompiler;
 }
 export interface ServiceConfig {
     target?: 'client' | 'server';
@@ -311,11 +312,12 @@ export type NormalizedClientConfig = Omit<ClientConfig, 'publicPathPrefix' | 'pu
     }) => SwcConfig | Promise<SwcConfig>;
     reactRefresh: NonNullable<ClientConfig['reactRefresh']>;
 };
-export type NormalizedServerConfig = Omit<ServerConfig, 'port' | 'inspect' | 'inspectBrk'> & {
+export type NormalizedServerConfig = Omit<ServerConfig, 'port' | 'inspect' | 'inspectBrk' | 'compiler'> & {
     port?: number;
     verbose?: boolean;
     inspect?: number;
     inspectBrk?: number;
+    compiler: ServerCompiler;
 };
 export type NormalizedServiceConfig = Omit<ServiceConfig, 'client' | 'server'> & {
     client: NormalizedClientConfig;

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

@@ -0,0 +1,9 @@
+import type { Logger } from '../logger';
+interface SwcCompileOptions {
+    projectPath: string;
+    outputPath: string;
+    logger: Logger;
+    enableSourceMap?: boolean;
+}
+export declare function compile({ projectPath, outputPath, logger, enableSourceMap, }: SwcCompileOptions): Promise<void>;
+export {};

package/dist/common/swc/compile.js

@@ -0,0 +1,73 @@
+"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 = {
+        module: {
+            type: 'commonjs',
+        },
+        jsc: {
+            parser: {
+                syntax: 'typescript',
+                tsx: true,
+            },
+            target: 'es2020',
+            transform: {
+                decoratorMetadata: true,
+            },
+            externalHelpers: false,
+        },
+        sourceMaps: enableSourceMap,
+    };
+    const cliOptions = {
+        filenames: [projectPath],
+        outDir: outputPath,
+        watch: false,
+        quiet: false,
+        sourceMaps: enableSourceMap,
+        extensions: ['.js', '.jsx', '.ts', '.tsx', '.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)}`);
+                resolve();
+            },
+            onFail: (result) => {
+                logger.error(`SWC 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'));
+            },
+        };
+        try {
+            (0, cli_1.swcDir)({
+                cliOptions,
+                swcOptions: swcConfig,
+                callbacks,
+            });
+        }
+        catch (error) {
+            logger.error(`Failed to start SWC compilation: ${error}`);
+            reject(error);
+        }
+    });
+}

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

@@ -0,0 +1,2 @@
+export { compile } from './compile';
+export { watch } from './watch';

package/dist/common/swc/index.js

@@ -0,0 +1,7 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.watch = exports.compile = void 0;
+var compile_1 = require("./compile");
+Object.defineProperty(exports, "compile", { enumerable: true, get: function () { return compile_1.compile; } });
+var watch_1 = require("./watch");
+Object.defineProperty(exports, "watch", { enumerable: true, get: function () { return watch_1.watch; } });

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

@@ -0,0 +1,10 @@
+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 {};

package/dist/common/swc/watch.js

@@ -0,0 +1,68 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.watch = watch;
+const rimraf_1 = require("rimraf");
+const getSwcConfig = () => {
+    return {
+        jsc: {
+            target: 'es2020',
+            parser: {
+                syntax: 'typescript',
+                decorators: false,
+                dynamicImport: false,
+            },
+        },
+        sourceMaps: true,
+    };
+};
+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();
+    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`);
+            }
+            else {
+                logger.message(`Successfully compiled ${result.compiled || 0} files in ${result.duration}ms`);
+            }
+            onAfterFilesEmitted?.();
+        },
+        onFail: (result) => {
+            logger.error(`SWC compilation failed in ${result.duration}ms`);
+            if (result.reasons) {
+                for (const [filename, error] of result.reasons) {
+                    logger.error(`${filename}: ${error}`);
+                }
+            }
+        },
+        onWatchReady: () => {
+            logger.message('SWC watching for file changes');
+        },
+    };
+    // Запускаем swcDir
+    await swcDir({
+        cliOptions,
+        swcOptions: swcConfig,
+        callbacks,
+    });
+}

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

@@ -1,8 +1,7 @@
 import type Typescript from 'typescript';
 import type { Logger } from '../logger';
-export declare function watch(ts: typeof Typescript, projectPath: string, { logger, onAfterFilesEmitted, enableSourceMap, tsconfigFileName, }: {
+export declare function watch(ts: typeof Typescript, projectPath: string, { logger, onAfterFilesEmitted, enableSourceMap, }: {
     logger: Logger;
     onAfterFilesEmitted?: () => void;
     enableSourceMap?: boolean;
-    tsconfigFileName: string;
 }): void;

package/dist/common/typescript/watch.js

@@ -4,10 +4,10 @@ exports.watch = watch;
 const transformers_1 = require("./transformers");
 const utils_1 = require("./utils");
 const diagnostic_1 = require("./diagnostic");
-function watch(ts, projectPath, { logger, onAfterFilesEmitted, enableSourceMap, tsconfigFileName, }) {
+function watch(ts, projectPath, { logger, onAfterFilesEmitted, enableSourceMap, }) {
     logger.message('Start compilation in watch mode');
     logger.message(`Typescript v${ts.version}`);
-    const configPath = (0, utils_1.getTsProjectConfigPath)(ts, projectPath, tsconfigFileName);
+    const configPath = (0, utils_1.getTsProjectConfigPath)(ts, projectPath);
     const createProgram = ts.createEmitAndSemanticDiagnosticsBuilderProgram;
     const host = ts.createWatchCompilerHost(configPath, {
         noEmit: false,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gravity-ui/app-builder",
-  "version": "0.28.1-beta.2",
+  "version": "0.28.1-beta.5",
   "description": "Develop and build your React client-server projects, powered by typescript and webpack",
   "license": "MIT",
   "type": "commonjs",
@@ -75,13 +75,14 @@
     "@rspack/core": "1.3.9",
     "@rspack/dev-server": "^1.1.1",
     "@rspack/plugin-react-refresh": "^1.4.1",
-    "@statoscope/webpack-plugin": "^5.29.0",
     "@statoscope/stats": "^5.28.1",
     "@statoscope/stats-extension-compressed": "^5.28.1",
     "@statoscope/webpack-model": "^5.29.0",
+    "@statoscope/webpack-plugin": "^5.29.0",
     "@svgr/core": "^8.1.0",
     "@svgr/plugin-jsx": "^8.1.0",
     "@svgr/webpack": "^8.1.0",
+    "@swc/cli": "^0.7.8",
     "@swc/core": "1.11.24",
     "@swc/plugin-transform-imports": "7.0.3",
     "babel-loader": "^9.2.1",