@tramvai/cli 3.12.0 → 3.14.0

package/lib/models/port-manager.js

@@ -2,13 +2,19 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PortManager = void 0;
 const tslib_1 = require("tslib");
+const fs_extra_1 = require("fs-extra");
+const path_1 = require("path");
+const find_cache_dir_1 = tslib_1.__importDefault(require("find-cache-dir"));
 const detect_port_1 = tslib_1.__importDefault(require("detect-port"));
+const proper_lockfile_1 = require("proper-lockfile");
 class PortManager {
-    constructor({ configEntry, commandParams }) {
+    constructor({ configEntry, commandParams, logger }) {
         this.port = null;
         this.staticPort = null;
         this.configEntry = configEntry;
         this.commandParams = commandParams;
+        this.logger = logger;
+        this.cachePath = (0, path_1.join)((0, find_cache_dir_1.default)({ cwd: __dirname, create: true, name: 'tramvai' }), 'used-ports');
     }
     /**
      * Try to detect port considering the fact, that if user requests
@@ -18,55 +24,163 @@ class PortManager {
      * because we must pass a final number to the config manager.
      */
     computeAvailablePorts() {
+        var _a;
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            if (this.commandParams.port !== undefined && this.commandParams.port !== 0) {
-                // @ts-expect-error There is a string actually
-                this.port = parseInt(this.commandParams.port, 10);
+            yield this.createCacheFile();
+            const release = yield this.lockCacheFile();
+            try {
+                if (this.commandParams.port !== undefined && this.commandParams.port !== 0) {
+                    // @ts-expect-error There is a string actually
+                    this.port = parseInt(this.commandParams.port, 10);
+                }
+                if (this.commandParams.staticPort !== undefined && this.commandParams.staticPort !== 0) {
+                    // @ts-expect-error There is a string actually
+                    this.staticPort = parseInt(this.commandParams.staticPort, 10);
+                }
+                switch (this.configEntry.type) {
+                    case 'child-app':
+                        yield this.forChildApp();
+                        break;
+                    case 'module':
+                        yield this.forModule();
+                        break;
+                    case 'application':
+                        yield this.forApplication();
+                        break;
+                    default:
+                        break;
+                }
+                yield this.appendCacheFile([this.port, this.staticPort].join(','));
             }
-            if (this.commandParams.staticPort !== undefined && this.commandParams.staticPort !== 0) {
-                // @ts-expect-error There is a string actually
-                this.staticPort = parseInt(this.commandParams.staticPort, 10);
+            catch (error) {
+                this.logger.event({
+                    type: 'warning',
+                    event: 'PORT_MANAGER:GET_AVAILABLE_PORTS',
+                    message: `Can't get free ports for ${this.configEntry.type}:`,
+                    payload: (_a = error.message) !== null && _a !== void 0 ? _a : '',
+                });
             }
-            switch (this.configEntry.type) {
-                case 'child-app':
-                    yield this.forChildApp();
-                    break;
-                case 'module':
-                    yield this.forModule();
-                    break;
-                case 'application':
-                    yield this.forApplication();
-                    break;
-                default:
-                    break;
+            finally {
+                yield release();
+            }
+        });
+    }
+    /**
+     * Cleanup a cache file by removing ports were written previously.
+     */
+    cleanup() {
+        var _a;
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            const release = yield this.lockCacheFile();
+            try {
+                const cache = yield this.readCacheFile();
+                yield this.writeCacheFile(cache
+                    .filter(Boolean)
+                    .filter((port) => port !== this.port.toString() && port !== this.staticPort.toString())
+                    .join(','));
+            }
+            catch (error) {
+                this.logger.event({
+                    type: 'warning',
+                    event: 'PORT_MANAGER:CLEANUP',
+                    message: "Can't perform a cleanup of previously used ports:",
+                    payload: (_a = error.message) !== null && _a !== void 0 ? _a : '',
+                });
+            }
+            finally {
+                yield release();
             }
         });
     }
     forApplication() {
         var _a, _b;
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            this.port = (_a = this.port) !== null && _a !== void 0 ? _a : (yield (0, detect_port_1.default)(PortManager.DEFAULT_PORT));
-            this.staticPort = (_b = this.staticPort) !== null && _b !== void 0 ? _b : (yield (0, detect_port_1.default)(PortManager.DEFAULT_STATIC_PORT));
+            this.port = (_a = this.port) !== null && _a !== void 0 ? _a : (yield this.resolveFreePort(PortManager.DEFAULT_PORT));
+            this.staticPort =
+                (_b = this.staticPort) !== null && _b !== void 0 ? _b : (yield this.resolveFreePort(PortManager.DEFAULT_STATIC_PORT));
         });
     }
     forModule() {
         var _a, _b;
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            this.port = (_a = this.port) !== null && _a !== void 0 ? _a : (yield (0, detect_port_1.default)(PortManager.DEFAULT_MODULE_PORT));
-            this.staticPort = (_b = this.staticPort) !== null && _b !== void 0 ? _b : (yield (0, detect_port_1.default)(PortManager.DEFAULT_MODULE_STATIC_PORT));
+            this.port = (_a = this.port) !== null && _a !== void 0 ? _a : (yield this.resolveFreePort(PortManager.DEFAULT_MODULE_PORT));
+            this.staticPort =
+                (_b = this.staticPort) !== null && _b !== void 0 ? _b : (yield this.resolveFreePort(PortManager.DEFAULT_MODULE_STATIC_PORT));
         });
     }
     forChildApp() {
         var _a, _b;
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            this.port = (_a = this.port) !== null && _a !== void 0 ? _a : (yield (0, detect_port_1.default)(PortManager.DEFAULT_MODULE_PORT));
-            this.staticPort = (_b = this.staticPort) !== null && _b !== void 0 ? _b : (yield (0, detect_port_1.default)(PortManager.DEFAULT_MODULE_STATIC_PORT));
+            this.port = (_a = this.port) !== null && _a !== void 0 ? _a : (yield this.resolveFreePort(PortManager.DEFAULT_MODULE_PORT));
+            this.staticPort =
+                (_b = this.staticPort) !== null && _b !== void 0 ? _b : (yield this.resolveFreePort(PortManager.DEFAULT_MODULE_STATIC_PORT));
+        });
+    }
+    lockCacheFile() {
+        return (0, proper_lockfile_1.lock)(this.cachePath, { retries: 10 });
+    }
+    createCacheFile() {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            try {
+                yield (0, fs_extra_1.access)(this.cachePath);
+            }
+            catch (error) {
+                yield (0, fs_extra_1.outputFile)(this.cachePath, '');
+            }
+        });
+    }
+    readCacheFile() {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            try {
+                const content = yield (0, fs_extra_1.readFile)(this.cachePath, { encoding: 'utf-8' });
+                return content.split(',');
+            }
+            catch (error) {
+                return [];
+            }
+        });
+    }
+    writeCacheFile(content) {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            yield (0, fs_extra_1.outputFile)(this.cachePath, content);
+        });
+    }
+    appendCacheFile(content) {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            yield (0, fs_extra_1.appendFile)(this.cachePath, `,${content}`);
+        });
+    }
+    resolveFreePort(initial) {
+        var _a;
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            try {
+                const cache = yield this.readCacheFile();
+                let port = yield (0, detect_port_1.default)(initial);
+                let attempts = 1;
+                while (cache.includes(port.toString())) {
+                    if (attempts >= 3) {
+                        throw new Error(`Max attempts exceeded (${attempts})`);
+                    }
+                    port = yield (0, detect_port_1.default)(0);
+                    attempts++;
+                }
+                return port;
+            }
+            catch (error) {
+                this.logger.event({
+                    type: 'info',
+                    event: 'PORT_MANAGER:RESOLVE_FREE_PORT',
+                    message: "Can't resolve a free port, fallback to an initial one:",
+                    payload: (_a = error.message) !== null && _a !== void 0 ? _a : '',
+                });
+                return initial;
+            }
         });
     }
 }
 exports.PortManager = PortManager;
 PortManager.DEFAULT_PORT = 3000;
-PortManager.DEFAULT_MODULE_PORT = 4040;
+PortManager.DEFAULT_MODULE_PORT = 3040;
 PortManager.DEFAULT_STATIC_PORT = 4000;
 PortManager.DEFAULT_MODULE_STATIC_PORT = 4040;
 //# sourceMappingURL=port-manager.js.map

package/lib/models/port-manager.js.map

@@ -1 +1 @@
-{"version":3,"file":"port-manager.js","sourceRoot":"","sources":["../../src/models/port-manager.ts"],"names":[],"mappings":";;;;AAAA,sEAAqC;AAWrC,MAAa,WAAW;IAYtB,YAAY,EAAE,WAAW,EAAE,aAAa,EAA6B;QAH9D,SAAI,GAAkB,IAAI,CAAC;QAC3B,eAAU,GAAkB,IAAI,CAAC;QAGtC,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;QAC/B,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;IACrC,CAAC;IAED;;;;;;OAMG;IACU,qBAAqB;;YAChC,IAAI,IAAI,CAAC,aAAa,CAAC,IAAI,KAAK,SAAS,IAAI,IAAI,CAAC,aAAa,CAAC,IAAI,KAAK,CAAC,EAAE;gBAC1E,8CAA8C;gBAC9C,IAAI,CAAC,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAC,aAAa,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;aACnD;YAED,IAAI,IAAI,CAAC,aAAa,CAAC,UAAU,KAAK,SAAS,IAAI,IAAI,CAAC,aAAa,CAAC,UAAU,KAAK,CAAC,EAAE;gBACtF,8CAA8C;gBAC9C,IAAI,CAAC,UAAU,GAAG,QAAQ,CAAC,IAAI,CAAC,aAAa,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;aAC/D;YAED,QAAQ,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE;gBAC7B,KAAK,WAAW;oBACd,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC;oBACzB,MAAM;gBAER,KAAK,QAAQ;oBACX,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC;oBACvB,MAAM;gBAER,KAAK,aAAa;oBAChB,MAAM,IAAI,CAAC,cAAc,EAAE,CAAC;oBAC5B,MAAM;gBAER;oBACE,MAAM;aACT;QACH,CAAC;KAAA;IAEa,cAAc;;;YAC1B,IAAI,CAAC,IAAI,GAAG,MAAA,IAAI,CAAC,IAAI,mCAAI,CAAC,MAAM,IAAA,qBAAU,EAAC,WAAW,CAAC,YAAY,CAAC,CAAC,CAAC;YACtE,IAAI,CAAC,UAAU,GAAG,MAAA,IAAI,CAAC,UAAU,mCAAI,CAAC,MAAM,IAAA,qBAAU,EAAC,WAAW,CAAC,mBAAmB,CAAC,CAAC,CAAC;;KAC1F;IAEa,SAAS;;;YACrB,IAAI,CAAC,IAAI,GAAG,MAAA,IAAI,CAAC,IAAI,mCAAI,CAAC,MAAM,IAAA,qBAAU,EAAC,WAAW,CAAC,mBAAmB,CAAC,CAAC,CAAC;YAC7E,IAAI,CAAC,UAAU,GAAG,MAAA,IAAI,CAAC,UAAU,mCAAI,CAAC,MAAM,IAAA,qBAAU,EAAC,WAAW,CAAC,0BAA0B,CAAC,CAAC,CAAC;;KACjG;IAEa,WAAW;;;YACvB,IAAI,CAAC,IAAI,GAAG,MAAA,IAAI,CAAC,IAAI,mCAAI,CAAC,MAAM,IAAA,qBAAU,EAAC,WAAW,CAAC,mBAAmB,CAAC,CAAC,CAAC;YAC7E,IAAI,CAAC,UAAU,GAAG,MAAA,IAAI,CAAC,UAAU,mCAAI,CAAC,MAAM,IAAA,qBAAU,EAAC,WAAW,CAAC,0BAA0B,CAAC,CAAC,CAAC;;KACjG;;AAlEH,kCAmEC;AAlEQ,wBAAY,GAAG,IAAI,AAAP,CAAQ;AACpB,+BAAmB,GAAG,IAAI,AAAP,CAAQ;AAC3B,+BAAmB,GAAG,IAAI,AAAP,CAAQ;AAC3B,sCAA0B,GAAG,IAAI,AAAP,CAAQ"}
+{"version":3,"file":"port-manager.js","sourceRoot":"","sources":["../../src/models/port-manager.ts"],"names":[],"mappings":"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"}

package/lib/schema/autogeneratedSchema.json

@@ -1144,23 +1144,23 @@
                                                 "dotAll": {
                                                     "type": "boolean"
                                                 },
-                                                "__@match@6838": {
+                                                "__@match@6850": {
                                                     "type": "object",
                                                     "additionalProperties": false
                                                 },
-                                                "__@replace@6840": {
+                                                "__@replace@6852": {
                                                     "type": "object",
                                                     "additionalProperties": false
                                                 },
-                                                "__@search@6843": {
+                                                "__@search@6855": {
                                                     "type": "object",
                                                     "additionalProperties": false
                                                 },
-                                                "__@split@6845": {
+                                                "__@split@6857": {
                                                     "type": "object",
                                                     "additionalProperties": false
                                                 },
-                                                "__@matchAll@6847": {
+                                                "__@matchAll@6859": {
                                                     "type": "object",
                                                     "additionalProperties": false
                                                 }
@@ -1814,23 +1814,23 @@
                                                 "dotAll": {
                                                     "type": "boolean"
                                                 },
-                                                "__@match@6838": {
+                                                "__@match@6850": {
                                                     "type": "object",
                                                     "additionalProperties": false
                                                 },
-                                                "__@replace@6840": {
+                                                "__@replace@6852": {
                                                     "type": "object",
                                                     "additionalProperties": false
                                                 },
-                                                "__@search@6843": {
+                                                "__@search@6855": {
                                                     "type": "object",
                                                     "additionalProperties": false
                                                 },
-                                                "__@split@6845": {
+                                                "__@split@6857": {
                                                     "type": "object",
                                                     "additionalProperties": false
                                                 },
-                                                "__@matchAll@6847": {
+                                                "__@matchAll@6859": {
                                                     "type": "object",
                                                     "additionalProperties": false
                                                 }
@@ -2484,23 +2484,23 @@
                                                 "dotAll": {
                                                     "type": "boolean"
                                                 },
-                                                "__@match@6838": {
+                                                "__@match@6850": {
                                                     "type": "object",
                                                     "additionalProperties": false
                                                 },
-                                                "__@replace@6840": {
+                                                "__@replace@6852": {
                                                     "type": "object",
                                                     "additionalProperties": false
                                                 },
-                                                "__@search@6843": {
+                                                "__@search@6855": {
                                                     "type": "object",
                                                     "additionalProperties": false
                                                 },
-                                                "__@split@6845": {
+                                                "__@split@6857": {
                                                     "type": "object",
                                                     "additionalProperties": false
                                                 },
-                                                "__@matchAll@6847": {
+                                                "__@matchAll@6859": {
                                                     "type": "object",
                                                     "additionalProperties": false
                                                 }

package/lib/validators/commands/checkSwcDependencies.d.ts

@@ -0,0 +1,3 @@
+import type { Validator } from './validator.h';
+export declare const checkSwcDependencies: Validator;
+//# sourceMappingURL=checkSwcDependencies.d.ts.map

package/lib/validators/commands/checkSwcDependencies.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"checkSwcDependencies.d.ts","sourceRoot":"","sources":["../../../src/validators/commands/checkSwcDependencies.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAE/C,eAAO,MAAM,oBAAoB,EAAE,SAoClC,CAAC"}

package/lib/validators/commands/checkSwcDependencies.js

@@ -0,0 +1,40 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.checkSwcDependencies = void 0;
+const tslib_1 = require("tslib");
+const resolve_1 = require("resolve");
+const checkSwcDependencies = () => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
+    const rootDir = process.cwd();
+    const packagePath = `@swc/core/package.json`;
+    const pathFromCli = (0, resolve_1.sync)(packagePath);
+    const pathFromRoot = (0, resolve_1.sync)(packagePath, { basedir: rootDir });
+    const pathFromRootToIntegration = (0, resolve_1.sync)(`@tramvai/swc-integration/package.json`, {
+        basedir: rootDir,
+    });
+    let versionFromIntegration = '';
+    let versionFromRoot = '_from_root_version_';
+    let versionFromCli = '_from_cli_version_';
+    try {
+        versionFromIntegration = require(pathFromRootToIntegration).dependencies['@swc/core'];
+        versionFromRoot = require(pathFromRoot).version;
+        versionFromCli = require(pathFromCli).version;
+    }
+    catch (e) { }
+    const allVersionsAreCorrect = versionFromRoot === versionFromCli && versionFromCli === versionFromIntegration;
+    if (!versionFromIntegration || allVersionsAreCorrect) {
+        return {
+            name: 'checkSwcDependencies',
+            status: 'ok',
+        };
+    }
+    return {
+        name: 'checkSwcDependencies',
+        status: 'error',
+        message: `Version of @swc/core mismatch between
+@tramvai/swc-integration (version: ${versionFromIntegration}),
+@tramvai/cli (version: ${versionFromCli}) and
+process.cwd() (version: ${versionFromRoot})`,
+    };
+});
+exports.checkSwcDependencies = checkSwcDependencies;
+//# sourceMappingURL=checkSwcDependencies.js.map

package/lib/validators/commands/checkSwcDependencies.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"checkSwcDependencies.js","sourceRoot":"","sources":["../../../src/validators/commands/checkSwcDependencies.ts"],"names":[],"mappings":";;;;AAAA,qCAA0C;AAGnC,MAAM,oBAAoB,GAAc,GAAS,EAAE;IACxD,MAAM,OAAO,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;IAC9B,MAAM,WAAW,GAAG,wBAAwB,CAAC;IAC7C,MAAM,WAAW,GAAG,IAAA,cAAO,EAAC,WAAW,CAAC,CAAC;IACzC,MAAM,YAAY,GAAG,IAAA,cAAO,EAAC,WAAW,EAAE,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,CAAC;IAChE,MAAM,yBAAyB,GAAG,IAAA,cAAO,EAAC,uCAAuC,EAAE;QACjF,OAAO,EAAE,OAAO;KACjB,CAAC,CAAC;IAEH,IAAI,sBAAsB,GAAG,EAAE,CAAC;IAChC,IAAI,eAAe,GAAG,qBAAqB,CAAC;IAC5C,IAAI,cAAc,GAAG,oBAAoB,CAAC;IAC1C,IAAI;QACF,sBAAsB,GAAG,OAAO,CAAC,yBAAyB,CAAC,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC;QACtF,eAAe,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC,OAAO,CAAC;QAChD,cAAc,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC,OAAO,CAAC;KAC/C;IAAC,OAAO,CAAC,EAAE,GAAE;IAEd,MAAM,qBAAqB,GACzB,eAAe,KAAK,cAAc,IAAI,cAAc,KAAK,sBAAsB,CAAC;IAElF,IAAI,CAAC,sBAAsB,IAAI,qBAAqB,EAAE;QACpD,OAAO;YACL,IAAI,EAAE,sBAAsB;YAC5B,MAAM,EAAE,IAAI;SACb,CAAC;KACH;IAED,OAAO;QACL,IAAI,EAAE,sBAAsB;QAC5B,MAAM,EAAE,OAAO;QACf,OAAO,EAAE;qCACwB,sBAAsB;yBAClC,cAAc;0BACb,eAAe,GAAG;KACzC,CAAC;AACJ,CAAC,CAAA,CAAC;AApCW,QAAA,oBAAoB,wBAoC/B"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tramvai/cli",
-  "version": "3.12.0",
+  "version": "3.14.0",
   "description": "Cli инструмент для сборки и запуска приложений",
   "files": [
     "src",
@@ -71,7 +71,7 @@
     "@tinkoff/utils": "^2.1.3",
     "@tinkoff/webpack-dedupe-plugin": "2.0.2",
     "@tramvai/build": "4.0.1",
-    "@tramvai/react": "3.12.0",
+    "@tramvai/react": "3.14.0",
     "@tramvai/tools-check-versions": "0.5.3",
     "@tramvai/tools-migrate": "0.7.3",
     "ajv": "^8.12.0",
@@ -139,6 +139,7 @@
     "prettyoutput": "^1.2.0",
     "process": "^0.11.10",
     "promise-queue": "^2.2.5",
+    "proper-lockfile": "^4.1.2",
     "react-refresh": "^0.14.0",
     "resolve": "^1.22.4",
     "rimraf": "^3.0.2",
@@ -174,6 +175,7 @@
     "@swc/core": "1.3.62",
     "@tramvai/tools-generate-schema": "0.2.1",
     "@types/compression": "^1.7.2",
+    "@types/detect-port": "^1.3.5",
     "@types/express": "^4.17.13",
     "@types/find-cache-dir": "^3.2.1",
     "@types/fs-extra": "^9.0.13",
@@ -181,6 +183,7 @@
     "@types/glob": "^7.2.0",
     "@types/http-proxy": "^1.17.9",
     "@types/inquirer": "^7.3.3",
+    "@types/proper-lockfile": "^4.1.4",
     "@types/resolve": "^1.20.2",
     "@types/rimraf": "^3.0.2",
     "@types/semver": "^7.3.12",

package/schema.json

@@ -1166,23 +1166,23 @@
                               "dotAll": {
                                 "type": "boolean"
                               },
-                              "__@match@6838": {
+                              "__@match@6850": {
                                 "type": "object",
                                 "additionalProperties": false
                               },
-                              "__@replace@6840": {
+                              "__@replace@6852": {
                                 "type": "object",
                                 "additionalProperties": false
                               },
-                              "__@search@6843": {
+                              "__@search@6855": {
                                 "type": "object",
                                 "additionalProperties": false
                               },
-                              "__@split@6845": {
+                              "__@split@6857": {
                                 "type": "object",
                                 "additionalProperties": false
                               },
-                              "__@matchAll@6847": {
+                              "__@matchAll@6859": {
                                 "type": "object",
                                 "additionalProperties": false
                               }
@@ -1845,23 +1845,23 @@
                                 "dotAll": {
                                   "type": "boolean"
                                 },
-                                "__@match@6838": {
+                                "__@match@6850": {
                                   "type": "object",
                                   "additionalProperties": false
                                 },
-                                "__@replace@6840": {
+                                "__@replace@6852": {
                                   "type": "object",
                                   "additionalProperties": false
                                 },
-                                "__@search@6843": {
+                                "__@search@6855": {
                                   "type": "object",
                                   "additionalProperties": false
                                 },
-                                "__@split@6845": {
+                                "__@split@6857": {
                                   "type": "object",
                                   "additionalProperties": false
                                 },
-                                "__@matchAll@6847": {
+                                "__@matchAll@6859": {
                                   "type": "object",
                                   "additionalProperties": false
                                 }
@@ -2524,23 +2524,23 @@
                                   "dotAll": {
                                     "type": "boolean"
                                   },
-                                  "__@match@6838": {
+                                  "__@match@6850": {
                                     "type": "object",
                                     "additionalProperties": false
                                   },
-                                  "__@replace@6840": {
+                                  "__@replace@6852": {
                                     "type": "object",
                                     "additionalProperties": false
                                   },
-                                  "__@search@6843": {
+                                  "__@search@6855": {
                                     "type": "object",
                                     "additionalProperties": false
                                   },
-                                  "__@split@6845": {
+                                  "__@split@6857": {
                                     "type": "object",
                                     "additionalProperties": false
                                   },
-                                  "__@matchAll@6847": {
+                                  "__@matchAll@6859": {
                                     "type": "object",
                                     "additionalProperties": false
                                   }

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

@@ -26,8 +26,6 @@ describe('@tramvai/cli benchmark command', () => {
           rootDir: FIXTURES_DIR,
           target: 'app',
           resolveSymlinks: false,
-          port: 0,
-          staticPort: 0,
         },
         times: 2,
       });