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

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

@@ -10,21 +10,11 @@ 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, {
+compile({
     logger,
     outputPath: ${JSON.stringify(paths_1.default.appDist)},
     projectPath: ${JSON.stringify(paths_1.default.appServer)},

package/dist/commands/dev/server.js

@@ -61,22 +61,11 @@ watch(
 }
 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)},
@@ -84,7 +73,6 @@ watch(
         onAfterFilesEmitted: () => {
             process.send({type: 'Emitted'});
         },
-        enableSourceMap: true
     }
 );`;
 }

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

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

package/dist/common/swc/compile.js

@@ -2,31 +2,17 @@
 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 }) {
+// @ts-ignore @swc/cli is not typed
+const cli_1 = require("@swc/cli");
+const utils_1 = require("./utils");
+async function compile({ projectPath, outputPath, logger }) {
     const start = process.hrtime.bigint();
     logger.message('Start compilation');
-    const swcConfig = getSwcConfig(enableSourceMap);
+    const swcOptions = (0, utils_1.getSwcOptionsFromTsconfig)(projectPath);
     const cliOptions = {
         filenames: [projectPath],
         outDir: outputPath,
         watch: false,
-        sourceMaps: enableSourceMap,
         extensions: ['.js', '.ts', '.mjs', '.cjs'],
         stripLeadingPaths: true,
         sync: false,
@@ -49,9 +35,9 @@ swcDir, { projectPath, outputPath, logger, enableSourceMap = false }) {
             },
         };
         try {
-            swcDir({
+            (0, cli_1.swcDir)({
                 cliOptions,
-                swcOptions: swcConfig,
+                swcOptions,
                 callbacks,
             });
         }

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

@@ -0,0 +1 @@
+export declare function getSwcOptionsFromTsconfig(projectPath: string, filename?: string): import("@swc/types").Options;

package/dist/common/swc/utils.js

@@ -0,0 +1,7 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getSwcOptionsFromTsconfig = getSwcOptionsFromTsconfig;
+const tsconfig_to_swcconfig_1 = require("tsconfig-to-swcconfig");
+function getSwcOptionsFromTsconfig(projectPath, filename = 'tsconfig.json') {
+    return (0, tsconfig_to_swcconfig_1.convert)(filename, projectPath);
+}

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

@@ -3,7 +3,6 @@ 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 declare function watch(projectPath: string, { outputPath, logger, onAfterFilesEmitted }: SwcWatchOptions): Promise<void>;
 export {};

package/dist/common/swc/watch.js

@@ -1,30 +1,16 @@
 "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 }) {
+// @ts-ignore @swc/cli is not typed
+const cli_1 = require("@swc/cli");
+const utils_1 = require("./utils");
+async function watch(projectPath, { outputPath, logger, onAfterFilesEmitted }) {
     logger.message('Start compilation in watch mode');
-    const swcConfig = getSwcConfig(enableSourceMap);
+    const swcOptions = (0, utils_1.getSwcOptionsFromTsconfig)(projectPath);
     const cliOptions = {
         filenames: [projectPath],
         outDir: outputPath,
         watch: true,
-        sourceMaps: enableSourceMap,
         extensions: ['.js', '.ts', '.mjs', '.cjs'],
         stripLeadingPaths: true,
         sync: false,
@@ -52,9 +38,9 @@ swcDir, projectPath, { outputPath, logger, onAfterFilesEmitted, enableSourceMap
             logger.message('Watching for file changes');
         },
     };
-    swcDir({
+    (0, cli_1.swcDir)({
         cliOptions,
-        swcOptions: swcConfig,
+        swcOptions,
         callbacks,
     });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gravity-ui/app-builder",
-  "version": "0.28.1-beta.7",
+  "version": "0.28.1-beta.9",
   "description": "Develop and build your React client-server projects, powered by typescript and webpack",
   "license": "MIT",
   "type": "commonjs",
@@ -82,7 +82,7 @@
     "@svgr/core": "^8.1.0",
     "@svgr/plugin-jsx": "^8.1.0",
     "@svgr/webpack": "^8.1.0",
-    "@swc/cli": "^0.7.8",
+    "@swc/cli": "0.7.7",
     "@swc/core": "1.11.24",
     "@swc/plugin-transform-imports": "7.0.3",
     "babel-loader": "^9.2.1",
@@ -136,6 +136,7 @@
     "terser-webpack-plugin": "5.3.10",
     "ts-checker-rspack-plugin": "^1.1.1",
     "ts-node": "10.9.2",
+    "tsconfig-to-swcconfig": "^2.8.1",
     "tslib": "^2.6.2",
     "typescript": "~5.6.0",
     "webpack": "^5.95.0",