@gravity-ui/app-builder 0.36.0 → 0.38.0

package/README.md

@@ -156,7 +156,7 @@ All server settings are used only in dev mode:
 
 - `port` (`number | true`) — specify port that server listens. The port will be used to
   pass through requests from the client to the server. If set to `true`, the port will be selected automatically.
-  The server is started with the command `APP_PORT=${port} node dist/server/index.js --port ${port}`.
+  The server is started with the command `APP_PORT=${port} node dist/${outputPath}/index.js --port ${port}`.
 - `watch` (`string[]`) — by default `app-builder` monitors only `src/server` directory.
   If you need to watch other directories, specify them here.
 - `watchThrottle` (`number`) — use to add an extra throttle, or delay restarting.
@@ -164,6 +164,8 @@ All server settings are used only in dev mode:
   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.
+- `outputPath` (`string`) — custom output path for compiled server code relative to `dist` directory.
+  Default: `server`. Use this when your `server` entrypoint changed from `dist/server` to a different location (e.g., `package/src/server` for path `dist/package/src/server` in monorepo setups).
 
 ### Client
 
@@ -233,6 +235,7 @@ With this `{rootDir}/src/ui/tsconfig.json`:
   - `ipc` (`string`) — the Unix socket to listen to. If `ipc` and `port` are not defined, then the socket `{rootDir}/dist/run/client.sock` is used.
   - `port` (`number | true`) — specify a port number to listen for requests on. If `true`, the free port will be selected automatically.
   - `webSocketPath` (`string`) — tells clients connected to devServer to use the provided path to connect. Default is `${publicPathPrefix}/build/sockjs-node`.
+  - `webSocketClientPort` (`number`) - tells clients to connect to devServer using this port from a browser. Default is `${devServer.port}`
   - `type` (`'https'`) — allow to serve over HTTPS.
   - `options` (`import('https').ServerOptions`) — allow to provide your own certificate.
 - `watchOptions` — a set of options used to customize watch mode, [more](https://webpack.js.org/configuration/watch/#watchoptions)

package/dist/commands/dev/client.js

@@ -50,7 +50,7 @@ async function buildDevServer(config) {
     const bundler = config.client.bundler;
     const logger = new logger_1.Logger('client', config.verbose);
     const { publicPath } = config.client;
-    const { webSocketPath = path.normalize(`/${publicPath}/sockjs-node`), writeToDisk, ...devServer } = config.client.devServer || {};
+    const { webSocketPath = path.normalize(`/${publicPath}/sockjs-node`), webSocketClientPort, writeToDisk, ...devServer } = config.client.devServer || {};
     const normalizedConfig = { ...config.client, devServer: { ...devServer, webSocketPath } };
     const isSsr = Boolean(normalizedConfig.ssr);
     let webpackConfigs = [];
@@ -130,7 +130,7 @@ async function buildDevServer(config) {
         hot: true,
         client: {
             logging: config.verbose ? 'log' : 'error',
-            webSocketURL: { pathname: webSocketPath },
+            webSocketURL: { pathname: webSocketPath, port: webSocketClientPort },
             overlay: {
                 runtimeErrors: config.verbose,
                 warnings: config.verbose,

package/dist/commands/dev/index.js

@@ -27,14 +27,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = default_1;
-const path = __importStar(require("node:path"));
 const fs = __importStar(require("node:fs"));
 const nodemon_1 = __importDefault(require("nodemon"));
 const signal_exit_1 = require("signal-exit");
 const rimraf_1 = require("rimraf");
 const utils_1 = require("../../common/utils");
 const logger_1 = __importDefault(require("../../common/logger"));
-const paths_1 = __importDefault(require("../../common/paths"));
 async function default_1(config) {
     process.env.NODE_ENV = 'development';
     const shouldCompileClient = (0, utils_1.shouldCompileTarget)(config.target, 'client');
@@ -55,7 +53,7 @@ async function default_1(config) {
     let clientCompiled = !shouldCompileClient;
     let serverCompiled = !shouldCompileServer;
     let needToStartNodemon = shouldCompileServer;
-    const serverPath = path.resolve(paths_1.default.appDist, 'server');
+    const serverPath = config.server.outputPath;
     const { inspect, inspectBrk } = config.server;
     const startNodemon = () => {
         if (needToStartNodemon && serverCompiled && clientCompiled) {

package/dist/commands/dev/server.js

@@ -1,33 +1,9 @@
 "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.watchServerCompilation = watchServerCompilation;
-const path = __importStar(require("node:path"));
 const rimraf_1 = require("rimraf");
 const controllable_script_1 = require("../../common/child-process/controllable-script");
 const paths_1 = __importDefault(require("../../common/paths"));
@@ -79,7 +55,7 @@ watch(
 );`;
 }
 async function watchServerCompilation(config) {
-    const serverPath = path.resolve(paths_1.default.appDist, 'server');
+    const serverPath = config.server.outputPath;
     rimraf_1.rimraf.sync(serverPath);
     const build = new controllable_script_1.ControllableScript(config.server.compiler === 'swc'
         ? createSWCBuildScript(config)

package/dist/common/config.js

@@ -33,6 +33,7 @@ const cosmiconfig_1 = require("cosmiconfig");
 const cosmiconfig_typescript_loader_1 = require("cosmiconfig-typescript-loader");
 const common_tags_1 = require("common-tags");
 const models_1 = require("./models");
+const paths_1 = __importDefault(require("./paths"));
 const utils_1 = require("./utils");
 const logger_1 = __importDefault(require("./logger"));
 function splitPaths(paths) {
@@ -163,6 +164,7 @@ async function normalizeConfig(userConfig, mode) {
             inspect: undefined,
             inspectBrk: undefined,
             compiler: serverConfig.compiler || 'typescript',
+            outputPath: path.resolve(paths_1.default.appDist, serverConfig.outputPath ? serverConfig.outputPath : 'server'),
         };
         if (mode === 'dev') {
             if (serverConfig.port === true) {

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

@@ -29,6 +29,7 @@ interface DevServerConfig {
     ipc?: string;
     port?: number | true;
     webSocketPath?: string;
+    webSocketClientPort?: number;
     type?: 'https';
     options?: import('https').ServerOptions;
     writeToDisk?: boolean | ((targetPath: string) => boolean);
@@ -367,6 +368,13 @@ export interface ServerConfig {
         additionalPaths?: string[];
         exclude?: string | string[];
     };
+    /**
+     * Custom output path for compiled server code.
+     * Can be only relative to dist path.
+     * @default 'server'
+     * @example 'package/src/server'
+     */
+    outputPath?: string;
 }
 export interface ServiceConfig {
     target?: 'client' | 'server';
@@ -424,12 +432,13 @@ export type NormalizedClientConfig = Omit<ClientConfig, 'publicPathPrefix' | 'pu
     }) => SwcConfig | Promise<SwcConfig>;
     reactRefresh: NonNullable<ClientConfig['reactRefresh']>;
 };
-export type NormalizedServerConfig = Omit<ServerConfig, 'port' | 'inspect' | 'inspectBrk' | 'compiler'> & {
+export type NormalizedServerConfig = Omit<ServerConfig, 'port' | 'inspect' | 'inspectBrk' | 'compiler' | 'outputPath'> & {
     port?: number;
     verbose?: boolean;
     inspect?: number;
     inspectBrk?: number;
     compiler: ServerCompiler;
+    outputPath: string;
 };
 export type NormalizedServiceConfig = Omit<ServiceConfig, 'client' | 'server'> & {
     client: NormalizedClientConfig;

package/package.json

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