@tramvai/cli 2.111.1 → 2.117.0

package/lib/library/webpack/plugins/ModuleFederationFixRange.js.map

@@ -1 +1 @@
-{"version":3,"file":"ModuleFederationFixRange.js","sourceRoot":"","sources":["../../../../src/library/webpack/plugins/ModuleFederationFixRange.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ModuleFederationFixRange.js","sourceRoot":"","sources":["../../../../src/library/webpack/plugins/ModuleFederationFixRange.ts"],"names":[],"mappings":"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"}

package/lib/library/webpack/plugins/WebpackBar/utils/log-update.js

@@ -55,6 +55,7 @@ class LogUpdate {
                     return stream.write(data, ...args);
                 }
                 this._onData(data);
+                return stream.write[originalWrite].call(stream, data, ...args);
             };
             // Backup original write fn
             write[originalWrite] = stream.write;
@@ -73,7 +74,12 @@ class LogUpdate {
         this.listening = false;
     }
     _onData(data) {
-        this.extraLines += data;
+        const str = String(data);
+        const lines = str.split('\n').length - 1;
+        if (lines > 0) {
+            this.prevLineCount += lines;
+            this.extraLines += data;
+        }
     }
     render(lines) {
         if (this.finished) {

package/lib/library/webpack/plugins/WebpackBar/utils/log-update.js.map

@@ -1 +1 @@
-{"version":3,"file":"log-update.js","sourceRoot":"","sources":["../../../../../../src/library/webpack/plugins/WebpackBar/utils/log-update.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"log-update.js","sourceRoot":"","sources":["../../../../../../src/library/webpack/plugins/WebpackBar/utils/log-update.ts"],"names":[],"mappings":"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"}

package/lib/library/webpack/utils/files.js

@@ -9,8 +9,10 @@ const addSvgrLoader = (configManager, config, svgoOptions) => {
         .rule('svgr')
         .test(/\.svg$/)
         // @todo: `issuer: /\.tsx?$/` нужен или нет?
-        .set('resourceQuery', /react/);
-    (0, transpiler_1.addTranspilerLoader)(configManager, svgrConfig.use('svgr-transpiler'), Object.assign(Object.assign({}, transpilerConfig), { typescript: true }));
+        .set('resourceQuery', /react/)
+        .use('svgr-transpiler')
+        .batch((0, transpiler_1.addTranspilerLoader)(configManager, Object.assign(Object.assign({}, transpilerConfig), { typescript: true })))
+        .end();
     svgrConfig.use('svgr').loader('@svgr/webpack').options({ babel: false, svgo: svgoOptions }).end();
 };
 exports.addSvgrLoader = addSvgrLoader;

package/lib/library/webpack/utils/files.js.map

@@ -1 +1 @@
-{"version":3,"file":"files.js","sourceRoot":"","sources":["../../../../src/library/webpack/utils/files.ts"],"names":[],"mappings":";;;AAGA,6CAAwE;AAEjE,MAAM,aAAa,GAAG,CAC3B,aAA4C,EAC5C,MAAc,EACd,WAAgC,EAChC,EAAE;IACF,MAAM,gBAAgB,GAAG,IAAA,gCAAmB,EAAC,aAAa,CAAC,CAAC;IAC5D,4FAA4F;IAC5F,MAAM,UAAU,GAAG,MAAM,CAAC,MAAM;SAC7B,IAAI,CAAC,MAAM,CAAC;SACZ,IAAI,CAAC,QAAQ,CAAC;QACf,4CAA4C;SAC3C,GAAG,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC;IAEjC,IAAA,gCAAmB,EAAC,aAAa,EAAE,UAAU,CAAC,GAAG,CAAC,iBAAiB,CAAC,kCAC/D,gBAAgB,KACnB,UAAU,EAAE,IAAI,IAChB,CAAC;IAEH,UAAU,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC,CAAC,GAAG,EAAE,CAAC;AACpG,CAAC,CAAC;AAnBW,QAAA,aAAa,iBAmBxB;AAEK,MAAM,cAAc,GAAG,CAAC,aAA4C,EAAE,EAAE;;IAC7E,OAAO;QACL,OAAO,EAAE,MAAA,MAAA,aAAa,CAAC,IAAI,0CAAE,OAAO,mCAAI;YACtC;gBACE,UAAU,EAAE,KAAK;aAClB;YACD;gBACE,cAAc,EAAE,KAAK;aACtB;SACF;KACF,CAAC;AACJ,CAAC,CAAC;AAXW,QAAA,cAAc,kBAWzB"}
+{"version":3,"file":"files.js","sourceRoot":"","sources":["../../../../src/library/webpack/utils/files.ts"],"names":[],"mappings":";;;AAGA,6CAAwE;AAEjE,MAAM,aAAa,GAAG,CAC3B,aAA4C,EAC5C,MAAc,EACd,WAAgC,EAChC,EAAE;IACF,MAAM,gBAAgB,GAAG,IAAA,gCAAmB,EAAC,aAAa,CAAC,CAAC;IAC5D,4FAA4F;IAC5F,MAAM,UAAU,GAAG,MAAM,CAAC,MAAM;SAC7B,IAAI,CAAC,MAAM,CAAC;SACZ,IAAI,CAAC,QAAQ,CAAC;QACf,4CAA4C;SAC3C,GAAG,CAAC,eAAe,EAAE,OAAO,CAAC;SAC7B,GAAG,CAAC,iBAAiB,CAAC;SACtB,KAAK,CACJ,IAAA,gCAAmB,EAAC,aAAa,kCAC5B,gBAAgB,KACnB,UAAU,EAAE,IAAI,IAChB,CACH;SACA,GAAG,EAAE,CAAC;IAET,UAAU,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC,CAAC,GAAG,EAAE,CAAC;AACpG,CAAC,CAAC;AAtBW,QAAA,aAAa,iBAsBxB;AAEK,MAAM,cAAc,GAAG,CAAC,aAA4C,EAAE,EAAE;;IAC7E,OAAO;QACL,OAAO,EAAE,MAAA,MAAA,aAAa,CAAC,IAAI,0CAAE,OAAO,mCAAI;YACtC;gBACE,UAAU,EAAE,KAAK;aAClB;YACD;gBACE,cAAc,EAAE,KAAK;aACtB;SACF;KACF,CAAC;AACJ,CAAC,CAAC;AAXW,QAAA,cAAc,kBAWzB"}

package/lib/library/webpack/utils/transpiler.d.ts

@@ -20,5 +20,5 @@ export type TranspilerConfig = {
     excludesPresetEnv: string[];
     rootDir: string;
 };
-export declare const addTranspilerLoader: (configManager: ConfigManager<CliConfigEntry>, rule: Config.Use, transpilerConfig: TranspilerConfig) => Config.Rule;
+export declare const addTranspilerLoader: (configManager: ConfigManager<CliConfigEntry>, transpilerConfig: TranspilerConfig) => (rule: Config.Use) => Config.Rule;
 export declare const getTranspilerConfig: (configManager: ConfigManager<CliConfigEntry>, overrideOptions?: Partial<TranspilerConfig>) => TranspilerConfig;

package/lib/library/webpack/utils/transpiler.js

@@ -5,7 +5,7 @@ const tslib_1 = require("tslib");
 const resolve_1 = require("resolve");
 const swc_1 = require("../../swc");
 const babel_1 = tslib_1.__importDefault(require("../../babel"));
-const addTranspilerLoader = (configManager, rule, transpilerConfig) => {
+const addTranspilerLoader = (configManager, transpilerConfig) => (rule) => {
     const { loader } = configManager.experiments.transpilation;
     if (loader === 'swc') {
         try {

package/lib/library/webpack/utils/transpiler.js.map

@@ -1 +1 @@
-{"version":3,"file":"transpiler.js","sourceRoot":"","sources":["../../../../src/library/webpack/utils/transpiler.ts"],"names":[],"mappings":";;;;AACA,qCAA0C;AAE1C,mCAA0C;AAC1C,gEAAsC;AAuB/B,MAAM,mBAAmB,GAAG,CACjC,aAA4C,EAC5C,IAAgB,EAChB,gBAAkC,EAClC,EAAE;IACF,MAAM,EAAE,MAAM,EAAE,GAAG,aAAa,CAAC,WAAW,CAAC,aAAa,CAAC;IAE3D,IAAI,MAAM,KAAK,KAAK,EAAE;QACpB,IAAI;YACF,IAAA,cAAO,EAAC,uCAAuC,EAAE,EAAE,OAAO,EAAE,aAAa,CAAC,OAAO,EAAE,CAAC,CAAC;SACtF;QAAC,OAAO,KAAK,EAAE;YACd,MAAM,IAAI,KAAK,CAAC;;OAEf,CAAC,CAAC;SACJ;QAED,OAAO,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,OAAO,CAAC,IAAA,mBAAa,EAAC,gBAAgB,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC;KACjF;IAED,IAAI,MAAM,KAAK,OAAO,EAAE;QACtB,OAAO,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC,OAAO,CAAC,IAAA,eAAW,EAAC,gBAAgB,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC;KACjF;AACH,CAAC,CAAC;AAtBW,QAAA,mBAAmB,uBAsB9B;AAEK,MAAM,mBAAmB,GAAG,CACjC,aAA4C,EAC5C,kBAA6C,EAAE,EAC7B,EAAE;IACpB,MAAM,EAAE,iBAAiB,EAAE,KAAK,EAAE,0BAA0B,EAAE,iBAAiB,EAAE,GAAG,aAAa,CAAC;IAClG,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,aAAa,CAAC;IAEtC,uBACE,QAAQ,EAAE,aAAa,CAAC,SAAS,KAAK,QAAQ,EAC9C,GAAG;QACH,iBAAiB;QACjB,MAAM;QACN,KAAK,EACL,OAAO,EAAE,IAAI,EACb,kBAAkB,EAAE,IAAI,EACxB,GAAG,EAAE,CAAC,CAAC,aAAa,CAAC,UAAU,CAAC,OAAO,EACvC,iBAAiB;QACjB,0BAA0B,EAC1B,OAAO,EAAE,aAAa,CAAC,OAAO,EAC9B,MAAM,EAAE,aAAa,CAAC,MAAM,EAC5B,MAAM,EAAE,IAAI,EACZ,OAAO,EAAE,KAAK,EACd,UAAU,EAAE,KAAK,IACd,eAAe,EAClB;AACJ,CAAC,CAAC;AAzBW,QAAA,mBAAmB,uBAyB9B"}
+{"version":3,"file":"transpiler.js","sourceRoot":"","sources":["../../../../src/library/webpack/utils/transpiler.ts"],"names":[],"mappings":";;;;AACA,qCAA0C;AAE1C,mCAA0C;AAC1C,gEAAsC;AAuB/B,MAAM,mBAAmB,GAC9B,CAAC,aAA4C,EAAE,gBAAkC,EAAE,EAAE,CACrF,CAAC,IAAgB,EAAE,EAAE;IACnB,MAAM,EAAE,MAAM,EAAE,GAAG,aAAa,CAAC,WAAW,CAAC,aAAa,CAAC;IAE3D,IAAI,MAAM,KAAK,KAAK,EAAE;QACpB,IAAI;YACF,IAAA,cAAO,EAAC,uCAAuC,EAAE,EAAE,OAAO,EAAE,aAAa,CAAC,OAAO,EAAE,CAAC,CAAC;SACtF;QAAC,OAAO,KAAK,EAAE;YACd,MAAM,IAAI,KAAK,CAAC;;OAEjB,CAAC,CAAC;SACF;QAED,OAAO,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,OAAO,CAAC,IAAA,mBAAa,EAAC,gBAAgB,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC;KACjF;IAED,IAAI,MAAM,KAAK,OAAO,EAAE;QACtB,OAAO,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC,OAAO,CAAC,IAAA,eAAW,EAAC,gBAAgB,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC;KACjF;AACH,CAAC,CAAC;AApBS,QAAA,mBAAmB,uBAoB5B;AAEG,MAAM,mBAAmB,GAAG,CACjC,aAA4C,EAC5C,kBAA6C,EAAE,EAC7B,EAAE;IACpB,MAAM,EAAE,iBAAiB,EAAE,KAAK,EAAE,0BAA0B,EAAE,iBAAiB,EAAE,GAAG,aAAa,CAAC;IAClG,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,aAAa,CAAC;IAEtC,uBACE,QAAQ,EAAE,aAAa,CAAC,SAAS,KAAK,QAAQ,EAC9C,GAAG;QACH,iBAAiB;QACjB,MAAM;QACN,KAAK,EACL,OAAO,EAAE,IAAI,EACb,kBAAkB,EAAE,IAAI,EACxB,GAAG,EAAE,CAAC,CAAC,aAAa,CAAC,UAAU,CAAC,OAAO,EACvC,iBAAiB;QACjB,0BAA0B,EAC1B,OAAO,EAAE,aAAa,CAAC,OAAO,EAC9B,MAAM,EAAE,aAAa,CAAC,MAAM,EAC5B,MAAM,EAAE,IAAI,EACZ,OAAO,EAAE,KAAK,EACd,UAAU,EAAE,KAAK,IACd,eAAe,EAClB;AACJ,CAAC,CAAC;AAzBW,QAAA,mBAAmB,uBAyB9B"}

package/lib/schema/autogeneratedSchema.json

@@ -96,6 +96,10 @@
                                     "type": "string"
                                 }
                             ]
+                        },
+                        "componentsPattern": {
+                            "title": "Test Regexp to add only files with specific name to list of FS Components",
+                            "type": "string"
                         }
                     },
                     "additionalProperties": false

package/lib/typings/build/Builder.d.ts

@@ -30,6 +30,7 @@ export type GetBuildStats = () => {
     clientBuildTime?: number;
     clientModernBuildTime?: number;
     serverBuildTime?: number;
+    maxMemoryRss?: number;
 };
 export type BuildType = 'client' | 'server' | 'clientModern';
 export interface BuilderEvents {

package/lib/typings/configEntry/application.d.ts

@@ -152,6 +152,10 @@ export interface ApplicationConfigEntry extends CliConfigEntry {
          * @default "pages"
          */
         pagesDir: string | false;
+        /**
+         * @title Test Regexp to add only files with specific name to list of FS Components
+         */
+        componentsPattern: string;
     };
     /**
      * @title Configure the options on webpack splitChunks

package/lib/utils/detectPortSync.d.ts

@@ -1 +1,13 @@
-export declare const detectPortSync: (port: number) => number;
+interface Payload {
+    request?: number;
+    fallback: number;
+}
+/**
+ * Try to detect port synchronously considering the fact, that if user requests
+ * a port explicitly, we should not try to detect a free one.
+ *
+ * Also, handle zero port (it means any random port) as the edge case,
+ * because we must pass a final number to the config manager.
+ */
+export declare const detectPortSync: ({ request, fallback }: Payload) => number;
+export {};

package/lib/utils/detectPortSync.js

@@ -2,8 +2,18 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.detectPortSync = void 0;
 const child_process_1 = require("child_process");
-const detectPortSync = (port) => {
-    const commandResult = (0, child_process_1.execSync)(`npx detect-port ${port}`);
+/**
+ * Try to detect port synchronously considering the fact, that if user requests
+ * a port explicitly, we should not try to detect a free one.
+ *
+ * Also, handle zero port (it means any random port) as the edge case,
+ * because we must pass a final number to the config manager.
+ */
+const detectPortSync = ({ request, fallback }) => {
+    if (request !== undefined && request !== 0) {
+        return request;
+    }
+    const commandResult = (0, child_process_1.execSync)(`npx detect-port ${request !== null && request !== void 0 ? request : fallback}`);
     return parseInt(commandResult.toString('utf-8'), 10);
 };
 exports.detectPortSync = detectPortSync;

package/lib/utils/detectPortSync.js.map

@@ -1 +1 @@
-{"version":3,"file":"detectPortSync.js","sourceRoot":"","sources":["../../src/utils/detectPortSync.ts"],"names":[],"mappings":";;;AAAA,iDAAyC;AAElC,MAAM,cAAc,GAAG,CAAC,IAAY,EAAU,EAAE;IACrD,MAAM,aAAa,GAAG,IAAA,wBAAQ,EAAC,mBAAmB,IAAI,EAAE,CAAC,CAAC;IAE1D,OAAO,QAAQ,CAAC,aAAa,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC;AACvD,CAAC,CAAC;AAJW,QAAA,cAAc,kBAIzB"}
+{"version":3,"file":"detectPortSync.js","sourceRoot":"","sources":["../../src/utils/detectPortSync.ts"],"names":[],"mappings":";;;AAAA,iDAAyC;AAOzC;;;;;;GAMG;AACI,MAAM,cAAc,GAAG,CAAC,EAAE,OAAO,EAAE,QAAQ,EAAW,EAAU,EAAE;IACvE,IAAI,OAAO,KAAK,SAAS,IAAI,OAAO,KAAK,CAAC,EAAE;QAC1C,OAAO,OAAO,CAAC;KAChB;IAED,MAAM,aAAa,GAAG,IAAA,wBAAQ,EAAC,mBAAmB,OAAO,aAAP,OAAO,cAAP,OAAO,GAAI,QAAQ,EAAE,CAAC,CAAC;IAEzE,OAAO,QAAQ,CAAC,aAAa,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC;AACvD,CAAC,CAAC;AARW,QAAA,cAAc,kBAQzB"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tramvai/cli",
-  "version": "2.111.1",
+  "version": "2.117.0",
   "description": "Cli инструмент для сборки и запуска приложений",
   "files": [
     "src",
@@ -62,7 +62,7 @@
     "@svgr/webpack": "^6.5.1",
     "@tinkoff/browserslist-config": "0.2.5",
     "@tinkoff/dippy": "0.8.15",
-    "@tinkoff/is-modern-lib": "2.0.9",
+    "@tinkoff/is-modern-lib": "2.0.10",
     "@tinkoff/logger": "0.10.63",
     "@tinkoff/minicss-class-generator": "0.2.5",
     "@tinkoff/package-manager-wrapper": "0.1.9",
@@ -71,7 +71,7 @@
     "@tinkoff/utils": "^2.1.3",
     "@tinkoff/webpack-dedupe-plugin": "1.0.5",
     "@tramvai/build": "3.1.3",
-    "@tramvai/react": "2.111.1",
+    "@tramvai/react": "2.117.0",
     "@tramvai/tools-check-versions": "0.4.14",
     "@tramvai/tools-migrate": "0.6.18",
     "ajv": "^6.12.6",
@@ -136,6 +136,7 @@
     "postcss-loader": "^7.0.1",
     "postcss-modules-tilda": "^2.0.0",
     "postcss-modules-values-replace": "^4.0.0",
+    "pretty-bytes": "^5.6.0",
     "prettyoutput": "^1.2.0",
     "process": "^0.11.10",
     "promise-queue": "^2.2.5",
@@ -157,15 +158,16 @@
     "v8-compile-cache": "^2.3.0",
     "validate-npm-package-name": "^3.0.0",
     "wait-on": "^5.3.0",
-    "webpack": "5.85.0",
+    "webpack": "5.87.0",
     "webpack-build-notifier": "^2.3.0",
     "webpack-bundle-analyzer": "^4.9.0",
     "webpack-chain": "^6.5.1",
     "webpack-dev-middleware": "^6.1.1",
-    "webpack-hot-middleware": "^2.25.3",
-    "webpack-stats-plugin": "^1.1.1",
+    "webpack-hot-middleware": "^2.25.4",
+    "webpack-stats-plugin": "^1.1.3",
     "webpackbar": "^5.0.2",
-    "workbox-webpack-plugin": "^6.5.4",
+    "workbox-build": "^6.6.1",
+    "workbox-webpack-plugin": "^6.6.1",
     "wrap-ansi": "^7.0.0"
   },
   "devDependencies": {

package/schema.json

@@ -117,6 +117,10 @@
                         "type": "string"
                       }
                     ]
+                  },
+                  "componentsPattern": {
+                    "title": "Test Regexp to add only files with specific name to list of FS Components",
+                    "type": "string"
                   }
                 },
                 "additionalProperties": false

package/src/api/benchmark/build.ts

@@ -3,27 +3,14 @@ import type { Params as OriginalBuildParams, Result as OriginalBuildResult } fro
 import { COMMAND_PARAMETERS_TOKEN, COMMAND_RUNNER_TOKEN } from '../../di/tokens';
 import type { Params, Result } from './index';
 import type { Samples, RunStats } from './types';
-import { getSamplesStats } from './utils/stats';
 import { clearCacheDirectory } from './utils/clearCache';
+import { getResultStats } from './utils/stats';
 
 export interface BuildParams extends Params {
   command: 'build';
   commandOptions: OriginalBuildParams;
 }
 
-const getResultStats = ({
-  clientSamples,
-  serverSamples,
-}: {
-  clientSamples: number[];
-  serverSamples: number[];
-}): RunStats => {
-  return {
-    client: getSamplesStats(clientSamples),
-    server: getSamplesStats(serverSamples),
-  };
-};
-
 export interface BuildResult extends Result {
   noCache?: RunStats;
   cache?: RunStats;
@@ -41,6 +28,7 @@ const runBuildCommand = async (
 ): Promise<Samples> => {
   const clientSamples: number[] = Array(times);
   const serverSamples: number[] = Array(times);
+  const maxMemoryRssSamples: number[] = Array(times);
 
   const { commandOptions } = di.get(COMMAND_PARAMETERS_TOKEN) as BuildParams;
 
@@ -56,11 +44,13 @@ const runBuildCommand = async (
 
     clientSamples[i] = stats.clientBuildTime;
     serverSamples[i] = stats.serverBuildTime;
+    maxMemoryRssSamples[i] = stats.maxMemoryRss;
   }
 
   return {
     clientSamples,
     serverSamples,
+    maxMemoryRssSamples,
   };
 };
 

package/src/api/benchmark/index.ts

@@ -1,7 +1,11 @@
 import type { Provider } from '@tinkoff/dippy';
 import { provide } from '@tinkoff/dippy';
 import { createCommand } from '../../commands/createCommand';
-import { COMMAND_PARAMETERS_TOKEN, UI_OS_NOTIFY_TOKEN } from '../../di/tokens';
+import {
+  COMMAND_PARAMETERS_TOKEN,
+  UI_OS_NOTIFY_TOKEN,
+  WITH_BUILD_STATS_TOKEN,
+} from '../../di/tokens';
 import type { BuildParams, BuildResult } from './build';
 import { benchmarkBuild } from './build';
 import type { StartParams, StartResult } from './start';
@@ -41,5 +45,9 @@ export default createCommand({
       // disable notification in benchmark as it is annoying and not needed actually
       useValue: false,
     }),
+    {
+      provide: WITH_BUILD_STATS_TOKEN,
+      useValue: true,
+    },
   ],
 });

package/src/api/benchmark/start.ts

@@ -3,8 +3,8 @@ import type { Params as OriginalStartParams, Result as OriginalStartResult } fro
 import { COMMAND_PARAMETERS_TOKEN, COMMAND_RUNNER_TOKEN } from '../../di/tokens';
 import type { Params, Result } from './index';
 import type { Samples, RunStats } from './types';
-import { getSamplesStats } from './utils/stats';
 import { clearCacheDirectory } from './utils/clearCache';
+import { getResultStats } from './utils/stats';
 
 const REBUILD_WARMUP_TIMES = 3;
 
@@ -13,19 +13,6 @@ export interface StartParams extends Params {
   commandOptions: OriginalStartParams;
 }
 
-const getResultStats = ({
-  clientSamples,
-  serverSamples,
-}: {
-  clientSamples: number[];
-  serverSamples: number[];
-}): RunStats => {
-  return {
-    client: getSamplesStats(clientSamples),
-    server: getSamplesStats(serverSamples),
-  };
-};
-
 export interface StartResult extends Result {
   noCache?: RunStats;
   cache?: RunStats;
@@ -44,6 +31,7 @@ const runStartCommand = async (
 ): Promise<Samples> => {
   const clientSamples: number[] = Array(times);
   const serverSamples: number[] = Array(times);
+  const maxMemoryRssSamples: number[] = Array(times);
 
   const { commandOptions } = di.get(COMMAND_PARAMETERS_TOKEN) as StartParams;
 
@@ -61,17 +49,20 @@ const runStartCommand = async (
 
     clientSamples[i] = stats.clientBuildTime;
     serverSamples[i] = stats.serverBuildTime;
+    maxMemoryRssSamples[i] = stats.maxMemoryRss;
   }
 
   return {
     clientSamples,
     serverSamples,
+    maxMemoryRssSamples,
   };
 };
 
 const runRebuild = async (di: Container, { times }: { times: number }): Promise<Samples> => {
   const clientSamples: number[] = Array(times);
   const serverSamples: number[] = Array(times);
+  const maxMemoryRssSamples: number[] = Array(times);
   const { commandOptions } = di.get(COMMAND_PARAMETERS_TOKEN) as StartParams;
 
   const { close, invalidate, getBuildStats } = await (di
@@ -90,6 +81,7 @@ const runRebuild = async (di: Container, { times }: { times: number }): Promise<
 
     clientSamples[i] = stats.clientBuildTime;
     serverSamples[i] = stats.serverBuildTime;
+    maxMemoryRssSamples[i] = stats.maxMemoryRss;
   }
 
   await close();
@@ -97,6 +89,7 @@ const runRebuild = async (di: Container, { times }: { times: number }): Promise<
   return {
     clientSamples,
     serverSamples,
+    maxMemoryRssSamples,
   };
 };
 

package/src/api/benchmark/types.ts

@@ -6,9 +6,14 @@ export interface Stats {
   variance: number;
 }
 
-export type Samples = { clientSamples: Stats['samples']; serverSamples: Stats['samples'] };
+export type Samples = {
+  clientSamples: Stats['samples'];
+  serverSamples: Stats['samples'];
+  maxMemoryRssSamples: Stats['samples'];
+};
 
 export type RunStats = {
   client: Stats;
   server: Stats;
+  maxMemoryRss: Stats;
 };

package/src/api/benchmark/utils/stats.ts

@@ -1,4 +1,4 @@
-import type { Stats } from '../types';
+import type { RunStats, Stats } from '../types';
 
 export const getSamplesStats = (samples: number[]): Stats => {
   const n = samples.length;
@@ -27,3 +27,19 @@ export const getSamplesStats = (samples: number[]): Stats => {
     variance,
   };
 };
+
+export const getResultStats = ({
+  clientSamples,
+  serverSamples,
+  maxMemoryRssSamples,
+}: {
+  clientSamples: number[];
+  serverSamples: number[];
+  maxMemoryRssSamples: number[];
+}): RunStats => {
+  return {
+    client: getSamplesStats(clientSamples),
+    server: getSamplesStats(serverSamples),
+    maxMemoryRss: getSamplesStats(maxMemoryRssSamples),
+  };
+};

package/src/api/build/index.ts

@@ -20,6 +20,7 @@ export type Params = WithConfig<{
   showConfig?: boolean;
   env?: Record<string, string>;
   fileCache?: boolean;
+  withBuildStats?: boolean;
 
   // `package` target parameters
   watchMode?: boolean;

package/src/api/start/__integration__/start.test.ts

@@ -10,6 +10,7 @@ import { createServer } from '../utils/createServer';
 import { listenServer } from '../utils/listenServer';
 import { getListeningPort } from '../utils/getListeningPort';
 import { stopServer } from '../utils/stopServer';
+import { DEFAULT_PORT, DEFAULT_STATIC_PORT } from '../../../config/configManager';
 
 const FIXTURES_DIR = resolve(__dirname, '__fixtures__');
 
@@ -119,8 +120,8 @@ describe('@tramvai/cli start command', () => {
 
         expect(pagesConfig).toEqual({
           routes: {
-            '@/routes/about': {},
-            '@/routes/home': {},
+            '@/routes/about/index': {},
+            '@/routes/home/index': {},
           },
           pages: {},
           layouts: {},
@@ -261,7 +262,7 @@ describe('@tramvai/cli start command', () => {
       return close();
     });
 
-    it('should start the app on the next available port, if default port is busy', async () => {
+    it('should NOT try to launch app on the next available port if it was provided via config', async () => {
       const testServerStub = createServer();
       const testStaticServerStub = createServer();
 
@@ -270,12 +271,30 @@ describe('@tramvai/cli start command', () => {
       await listenServer(testServerStub, '0.0.0.0', getPort() + 50);
       await listenServer(testStaticServerStub, '0.0.0.0', getPort());
 
+      await expect(
+        start({
+          rootDir: FIXTURES_DIR,
+          target: 'app',
+          resolveSymlinks: false,
+          port: getListeningPort(testServerStub),
+          staticPort: getListeningPort(testStaticServerStub),
+        })
+      ).rejects.toThrow('listen EADDRINUSE: address already in use');
+
+      return Promise.all([stopServer(testServerStub), stopServer(testStaticServerStub)]);
+    });
+
+    it('should try to launch app on the next available port if it was NOT provided via config', async () => {
+      const testServerStub = createServer();
+      const testStaticServerStub = createServer();
+
+      await listenServer(testServerStub, '0.0.0.0', DEFAULT_PORT);
+      await listenServer(testStaticServerStub, '0.0.0.0', DEFAULT_STATIC_PORT);
+
       const { server, staticServer, close } = await start({
         rootDir: FIXTURES_DIR,
         target: 'app',
         resolveSymlinks: false,
-        port: getListeningPort(testServerStub),
-        staticPort: getListeningPort(testStaticServerStub),
       });
 
       const testServer = supertestByPort(getListeningPort(server));

package/src/api/start/index.ts

@@ -24,6 +24,7 @@ export type Params = WithConfig<{
   noClientRebuild?: boolean;
   resolveSymlinks?: boolean;
   showConfig?: boolean;
+  withBuildStats?: boolean;
   // @todo: not working?
   env?: Record<string, string>;
   onlyBundles?: string[];

package/src/api/start/providers/application/shared.ts

@@ -27,8 +27,11 @@ export const sharedProviders: readonly Provider[] = [
         ...parameters,
         appEnv: parameters.env,
         env: 'development',
-        port: detectPortSync(parameters.port ?? DEFAULT_PORT),
-        staticPort: detectPortSync(parameters.staticPort ?? DEFAULT_STATIC_PORT),
+        port: detectPortSync({ request: parameters.port, fallback: DEFAULT_PORT }),
+        staticPort: detectPortSync({
+          request: parameters.staticPort,
+          fallback: DEFAULT_STATIC_PORT,
+        }),
       }),
     deps: {
       configEntry: CONFIG_ENTRY_TOKEN,

package/src/api/start/providers/child-app/shared.ts

@@ -23,7 +23,7 @@ export const sharedProviders: readonly Provider[] = [
         ...parameters,
         appEnv: parameters.env,
         env: 'development',
-        port: detectPortSync(parameters.port ?? DEFAULT_STATIC_MODULE_PORT),
+        port: detectPortSync({ request: parameters.port, fallback: DEFAULT_STATIC_MODULE_PORT }),
       }),
     deps: {
       configEntry: CONFIG_ENTRY_TOKEN,

package/src/api/start/providers/module/shared.ts

@@ -23,7 +23,7 @@ export const sharedProviders: readonly Provider[] = [
         ...parameters,
         appEnv: parameters.env,
         env: 'development',
-        port: detectPortSync(parameters.port ?? DEFAULT_STATIC_MODULE_PORT),
+        port: detectPortSync({ request: parameters.port, fallback: DEFAULT_STATIC_MODULE_PORT }),
       }),
     deps: {
       configEntry: CONFIG_ENTRY_TOKEN,

package/src/api/start-prod/providers/application.ts

@@ -30,8 +30,11 @@ export const applicationsProviders: readonly Provider[] = [
         appEnv: parameters.env,
         env: 'production',
         buildType: 'client',
-        port: detectPortSync(parameters.port ?? DEFAULT_PORT),
-        staticPort: detectPortSync(parameters.staticPort ?? DEFAULT_STATIC_PORT),
+        port: detectPortSync({ request: parameters.port, fallback: DEFAULT_PORT }),
+        staticPort: detectPortSync({
+          request: parameters.staticPort,
+          fallback: DEFAULT_STATIC_PORT,
+        }),
       }),
     deps: {
       configEntry: CONFIG_ENTRY_TOKEN,

package/src/api/start-prod/providers/child-app.ts

@@ -17,8 +17,11 @@ export const childAppProviders: readonly Provider[] = [
         ...parameters,
         appEnv: parameters.env,
         env: 'production',
-        staticPort: detectPortSync(parameters.staticPort ?? DEFAULT_STATIC_MODULE_PORT),
         buildType: 'client',
+        staticPort: detectPortSync({
+          request: parameters.staticPort,
+          fallback: DEFAULT_STATIC_MODULE_PORT,
+        }),
       }),
     deps: {
       configEntry: CONFIG_ENTRY_TOKEN,

package/src/builder/webpack/providers/shared.ts

@@ -1,7 +1,7 @@
 import type { Provider } from '@tinkoff/dippy';
 import { provide } from '@tinkoff/dippy';
 import { EventEmitter } from 'events';
-import { CONFIG_MANAGER_TOKEN } from '../../../di/tokens';
+import { CONFIG_MANAGER_TOKEN, WITH_BUILD_STATS_TOKEN } from '../../../di/tokens';
 import { closeWorkerPoolTranspiler } from '../../../library/webpack/utils/workersPool';
 import {
   CLOSE_HANDLER_TOKEN,
@@ -14,23 +14,34 @@ import {
 } from '../tokens';
 import { calculateBuildTime } from '../utils/calculateBuildTime';
 import { emitWebpackEvents } from '../utils/webpackEvents';
+import { maxMemoryRss } from '../utils/maxMemoryRss';
 
 export const sharedProviders: Provider[] = [
   provide({
     provide: GET_BUILD_STATS_TOKEN,
-    useFactory: ({ clientCompiler, clientModernCompiler, serverCompiler }) => {
+    useFactory: ({ withBuildStats, clientCompiler, clientModernCompiler, serverCompiler }) => {
+      if (!withBuildStats) {
+        return () => {
+          return {};
+        };
+      }
+
       const getClientTime = clientCompiler && calculateBuildTime(clientCompiler);
       const getClientModernTime = clientModernCompiler && calculateBuildTime(clientModernCompiler);
       const getServerTime = serverCompiler && calculateBuildTime(serverCompiler);
-      return (() => {
+
+      const getMaxMemoryRss = maxMemoryRss();
+      return () => {
         return {
           clientBuildTime: getClientTime?.(),
           clientModernBuildTime: getClientModernTime?.(),
           serverBuildTime: getServerTime?.(),
+          maxMemoryRss: getMaxMemoryRss?.(),
         };
-      }) as typeof GET_BUILD_STATS_TOKEN;
+      };
     },
     deps: {
+      withBuildStats: { token: WITH_BUILD_STATS_TOKEN, optional: true },
       clientCompiler: { token: WEBPACK_CLIENT_COMPILER_TOKEN, optional: true },
       clientModernCompiler: { token: WEBPACK_CLIENT_MODERN_COMPILER_TOKEN, optional: true },
       serverCompiler: { token: WEBPACK_SERVER_COMPILER_TOKEN, optional: true },