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

package/README.md

@@ -143,6 +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`.
+- `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

@@ -8,25 +8,52 @@ const signal_exit_1 = require("signal-exit");
 const controllable_script_1 = require("../../../common/child-process/controllable-script");
 const paths_1 = __importDefault(require("../../../common/paths"));
 const utils_1 = require("../../../common/utils");
+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)();
+    // Используем 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

@@ -32,36 +32,69 @@ 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)},
+    {
+        outputPath: ${JSON.stringify(paths_1.default.appDist)},
+        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 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
-            }
-        );
-        `, 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>;
@@ -266,6 +267,11 @@ export interface ServerConfig {
     watchThrottle?: number;
     inspect?: number | true;
     inspectBrk?: number | true;
+    /**
+     * Compiler for server code compilation
+     * @default 'typescript'
+     */
+    compiler?: ServerCompiler;
 }
 export interface ServiceConfig {
     target?: 'client' | 'server';
@@ -306,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(swcDir: any, { projectPath, outputPath, logger, enableSourceMap }: SwcCompileOptions): Promise<void>;
+export {};

package/dist/common/swc/compile.js

@@ -0,0 +1,63 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.compile = compile;
+const pretty_time_1 = require("../logger/pretty-time");
+const getSwcConfig = (enableSourceMap = false) => {
+    return {
+        module: {
+            type: 'commonjs',
+        },
+        jsc: {
+            target: 'es2020',
+            parser: {
+                syntax: 'typescript',
+            },
+        },
+        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,
+        sourceMaps: enableSourceMap,
+        extensions: ['.js', '.ts', '.mjs', '.cjs'],
+        stripLeadingPaths: true,
+        sync: false,
+    };
+    return new Promise((resolve, reject) => {
+        const callbacks = {
+            onSuccess: (_result) => {
+                logger.success(`Compiled successfully in ${(0, pretty_time_1.elapsedTime)(start)}`);
+                resolve();
+            },
+            onFail: (result) => {
+                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('Compilation failed'));
+            },
+        };
+        try {
+            swcDir({
+                cliOptions,
+                swcOptions: swcConfig,
+                callbacks,
+            });
+        }
+        catch (error) {
+            logger.error(`Failed to start 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,9 @@
+import type { Logger } from '../logger';
+interface SwcWatchOptions {
+    outputPath: string;
+    logger: Logger;
+    onAfterFilesEmitted?: () => void;
+    enableSourceMap?: boolean;
+}
+export declare function watch(swcDir: any, projectPath: string, { outputPath, logger, onAfterFilesEmitted, enableSourceMap }: SwcWatchOptions): Promise<void>;
+export {};

package/dist/common/swc/watch.js

@@ -0,0 +1,60 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.watch = watch;
+const getSwcConfig = (enableSourceMap = false) => {
+    return {
+        module: {
+            type: 'commonjs',
+        },
+        jsc: {
+            target: 'es2020',
+            parser: {
+                syntax: 'typescript',
+            },
+        },
+        sourceMaps: enableSourceMap,
+    };
+};
+async function watch(
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+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,
+        sourceMaps: enableSourceMap,
+        extensions: ['.js', '.ts', '.mjs', '.cjs'],
+        stripLeadingPaths: true,
+        sync: false,
+        logWatchCompilation: true,
+    };
+    const callbacks = {
+        onSuccess: (result) => {
+            if (result.filename) {
+                logger.message(`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(`Compilation failed in ${result.duration}ms`);
+            if (result.reasons) {
+                for (const [filename, error] of result.reasons) {
+                    logger.error(`${filename}: ${error}`);
+                }
+            }
+        },
+        onWatchReady: () => {
+            logger.message('Watching for file changes');
+        },
+    };
+    swcDir({
+        cliOptions,
+        swcOptions: swcConfig,
+        callbacks,
+    });
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gravity-ui/app-builder",
-  "version": "0.28.1-beta.6",
+  "version": "0.28.1-beta.7",
   "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",