@tramvai/cli 3.21.0 → 3.24.0

package/lib/di/providers/network.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"network.d.ts","sourceRoot":"","sources":["../../../src/di/providers/network.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAM/C,eAAO,MAAM,gBAAgB,EAAE,SAAS,QAAQ,EA2BtC,CAAC"}
+{"version":3,"file":"network.d.ts","sourceRoot":"","sources":["../../../src/di/providers/network.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAM/C,eAAO,MAAM,gBAAgB,EAAE,SAAS,QAAQ,EActC,CAAC"}

package/lib/di/providers/network.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.networkProviders = void 0;
-const tslib_1 = require("tslib");
 const dippy_1 = require("@tinkoff/dippy");
 const tokens_1 = require("../tokens");
 const port_manager_1 = require("../../models/port-manager");
@@ -14,17 +13,7 @@ exports.networkProviders = [
             logger: 'network logger',
         },
         provide: tokens_1.PORT_MANAGER_TOKEN,
-        useFactory: (deps) => {
-            // @ts-expect-error
-            const portManager = new port_manager_1.PortManager(deps);
-            ['SIGINT', 'SIGTERM'].forEach((signal) => {
-                process.on(signal, () => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
-                    yield portManager.cleanup();
-                    process.exit();
-                }));
-            });
-            return portManager;
-        },
+        useClass: port_manager_1.PortManager,
     }),
     (0, dippy_1.provide)({
         provide: 'network logger',

package/lib/di/providers/network.js.map

@@ -1 +1 @@
-{"version":3,"file":"network.js","sourceRoot":"","sources":["../../../src/di/providers/network.ts"],"names":[],"mappings":";;;;AAAA,0CAAyC;AAGzC,sCAA6F;AAC7F,4DAAwD;AACxD,gDAA6C;AAEhC,QAAA,gBAAgB,GAAwB;IACnD,IAAA,eAAO,EAAC;QACN,IAAI,EAAE;YACJ,WAAW,EAAE,2BAAkB;YAC/B,aAAa,EAAE,iCAAwB;YACvC,MAAM,EAAE,gBAAgB;SACzB;QACD,OAAO,EAAE,2BAAkB;QAC3B,UAAU,EAAE,CAAC,IAAI,EAAE,EAAE;YACnB,mBAAmB;YACnB,MAAM,WAAW,GAAG,IAAI,0BAAW,CAAC,IAAI,CAAC,CAAC;YAE1C,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;gBACvC,OAAO,CAAC,EAAE,CAAC,MAAM,EAAE,GAAS,EAAE;oBAC5B,MAAM,WAAW,CAAC,OAAO,EAAE,CAAC;oBAE5B,OAAO,CAAC,IAAI,EAAE,CAAC;gBACjB,CAAC,CAAA,CAAC,CAAC;YACL,CAAC,CAAC,CAAC;YAEH,OAAO,WAAW,CAAC;QACrB,CAAC;KACF,CAAC;IACF,IAAA,eAAO,EAAC;QACN,OAAO,EAAE,gBAAgB;QACzB,QAAQ,EAAE,eAAM;KACjB,CAAC;CACM,CAAC"}
+{"version":3,"file":"network.js","sourceRoot":"","sources":["../../../src/di/providers/network.ts"],"names":[],"mappings":";;;AAAA,0CAAyC;AAGzC,sCAA6F;AAC7F,4DAAwD;AACxD,gDAA6C;AAEhC,QAAA,gBAAgB,GAAwB;IACnD,IAAA,eAAO,EAAC;QACN,IAAI,EAAE;YACJ,WAAW,EAAE,2BAAkB;YAC/B,aAAa,EAAE,iCAAwB;YACvC,MAAM,EAAE,gBAAgB;SACzB;QACD,OAAO,EAAE,2BAAkB;QAC3B,QAAQ,EAAE,0BAAW;KACtB,CAAC;IACF,IAAA,eAAO,EAAC;QACN,OAAO,EAAE,gBAAgB;QACzB,QAAQ,EAAE,eAAM;KACjB,CAAC;CACM,CAAC"}

package/lib/models/port-manager.d.ts

@@ -12,13 +12,14 @@ export declare class PortManager {
     static readonly DEFAULT_MODULE_PORT = 3040;
     static readonly DEFAULT_STATIC_PORT = 4000;
     static readonly DEFAULT_MODULE_STATIC_PORT = 4040;
+    private static readonly cachePath;
     private readonly configEntry;
     private readonly commandParams;
-    private readonly cachePath;
     private readonly logger;
     port: number | null;
     staticPort: number | null;
     constructor({ configEntry, commandParams, logger }: NetworkConstructorPayload);
+    private handleConfigValues;
     /**
      * Try to detect port considering the fact, that if user requests
      * a port explicitly, we should not try to detect a free one.

package/lib/models/port-manager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"port-manager.d.ts","sourceRoot":"","sources":["../../src/models/port-manager.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAC;AACjE,OAAO,KAAK,EAAE,MAAM,IAAI,WAAW,EAAE,MAAM,cAAc,CAAC;AAC1D,OAAO,KAAK,EAAE,MAAM,IAAI,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACnE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAEvC,UAAU,yBAAyB;IACjC,WAAW,EAAE,WAAW,CAAC;IACzB,aAAa,EAAE,WAAW,GAAG,eAAe,CAAC;IAC7C,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,qBAAa,WAAW;IACtB,MAAM,CAAC,QAAQ,CAAC,YAAY,QAAQ;IACpC,MAAM,CAAC,QAAQ,CAAC,mBAAmB,QAAQ;IAC3C,MAAM,CAAC,QAAQ,CAAC,mBAAmB,QAAQ;IAC3C,MAAM,CAAC,QAAQ,CAAC,0BAA0B,QAAQ;IAElD,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAc;IAC1C,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAgC;IAC9D,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAS;IACnC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAS;IAEzB,IAAI,EAAE,MAAM,GAAG,IAAI,CAAQ;IAC3B,UAAU,EAAE,MAAM,GAAG,IAAI,CAAQ;gBAE5B,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,EAAE,EAAE,yBAAyB;IAW7E;;;;;;OAMG;IACU,qBAAqB;IA6ClC;;OAEG;IACU,OAAO;YAwBN,cAAc;YAMd,SAAS;YAMT,WAAW;IAMzB,OAAO,CAAC,aAAa;YAIP,eAAe;YAQf,aAAa;YAUb,cAAc;YAId,eAAe;YAIf,eAAe;CA4B9B"}
+{"version":3,"file":"port-manager.d.ts","sourceRoot":"","sources":["../../src/models/port-manager.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAC;AACjE,OAAO,KAAK,EAAE,MAAM,IAAI,WAAW,EAAE,MAAM,cAAc,CAAC;AAC1D,OAAO,KAAK,EAAE,MAAM,IAAI,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACnE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAEvC,UAAU,yBAAyB;IACjC,WAAW,EAAE,WAAW,CAAC;IACzB,aAAa,EAAE,WAAW,GAAG,eAAe,CAAC;IAC7C,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,qBAAa,WAAW;IACtB,MAAM,CAAC,QAAQ,CAAC,YAAY,QAAQ;IACpC,MAAM,CAAC,QAAQ,CAAC,mBAAmB,QAAQ;IAC3C,MAAM,CAAC,QAAQ,CAAC,mBAAmB,QAAQ;IAC3C,MAAM,CAAC,QAAQ,CAAC,0BAA0B,QAAQ;IAClD,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,SAAS,CAG/B;IAEF,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAc;IAC1C,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAgC;IAC9D,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAS;IAEzB,IAAI,EAAE,MAAM,GAAG,IAAI,CAAQ;IAC3B,UAAU,EAAE,MAAM,GAAG,IAAI,CAAQ;gBAE5B,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,EAAE,EAAE,yBAAyB;YAM/D,kBAAkB;IA6BhC;;;;;;OAMG;IACU,qBAAqB;IA0BlC;;OAEG;IACU,OAAO;YA8BN,cAAc;YAMd,SAAS;YAMT,WAAW;IAMzB,OAAO,CAAC,aAAa;YAIP,eAAe;YAQf,aAAa;YAUb,cAAc;YAId,eAAe;YAIf,eAAe;CAgC9B"}

package/lib/models/port-manager.js

@@ -7,6 +7,7 @@ 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");
+const noop_1 = tslib_1.__importDefault(require("@tinkoff/utils/function/noop"));
 class PortManager {
     constructor({ configEntry, commandParams, logger }) {
         this.port = null;
@@ -14,7 +15,31 @@ class PortManager {
         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');
+    }
+    handleConfigValues() {
+        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);
+            }
+            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;
+            }
+        });
     }
     /**
      * Try to detect port considering the fact, that if user requests
@@ -26,43 +51,27 @@ class PortManager {
     computeAvailablePorts() {
         var _a;
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            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 (process.env.USE_CONCURRENT_PORT_DETECTING === 'true') {
+                yield this.createCacheFile();
+                const release = yield this.lockCacheFile();
+                try {
+                    yield this.handleConfigValues();
+                    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();
                 }
-                yield this.appendCacheFile([this.port, this.staticPort].join(','));
-            }
-            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 : '',
-                });
-            }
-            finally {
-                yield release();
+                return;
             }
+            yield this.handleConfigValues();
         });
     }
     /**
@@ -71,25 +80,29 @@ class PortManager {
     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();
+            if (process.env.USE_CONCURRENT_PORT_DETECTING === 'true') {
+                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();
+                }
+                return;
             }
+            (0, noop_1.default)();
         });
     }
     forApplication() {
@@ -117,22 +130,22 @@ class PortManager {
         });
     }
     lockCacheFile() {
-        return (0, proper_lockfile_1.lock)(this.cachePath, { retries: 10 });
+        return (0, proper_lockfile_1.lock)(PortManager.cachePath, { retries: 10 });
     }
     createCacheFile() {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             try {
-                yield (0, fs_extra_1.access)(this.cachePath);
+                yield (0, fs_extra_1.access)(PortManager.cachePath);
             }
             catch (error) {
-                yield (0, fs_extra_1.outputFile)(this.cachePath, '');
+                yield (0, fs_extra_1.outputFile)(PortManager.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' });
+                const content = yield (0, fs_extra_1.readFile)(PortManager.cachePath, { encoding: 'utf-8' });
                 return content.split(',');
             }
             catch (error) {
@@ -142,29 +155,32 @@ class PortManager {
     }
     writeCacheFile(content) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            yield (0, fs_extra_1.outputFile)(this.cachePath, content);
+            yield (0, fs_extra_1.outputFile)(PortManager.cachePath, content);
         });
     }
     appendCacheFile(content) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            yield (0, fs_extra_1.appendFile)(this.cachePath, `,${content}`);
+            yield (0, fs_extra_1.appendFile)(PortManager.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})`);
+                if (process.env.USE_CONCURRENT_PORT_DETECTING === 'true') {
+                    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++;
                     }
-                    port = yield (0, detect_port_1.default)(0);
-                    attempts++;
+                    return port;
                 }
-                return port;
+                return (0, detect_port_1.default)(initial);
             }
             catch (error) {
                 this.logger.event({
@@ -183,4 +199,5 @@ PortManager.DEFAULT_PORT = 3000;
 PortManager.DEFAULT_MODULE_PORT = 3040;
 PortManager.DEFAULT_STATIC_PORT = 4000;
 PortManager.DEFAULT_MODULE_STATIC_PORT = 4040;
+PortManager.cachePath = (0, path_1.join)((0, find_cache_dir_1.default)({ cwd: __dirname, create: true, name: 'tramvai' }), 'used-ports');
 //# 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":"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"}
+{"version":3,"file":"port-manager.js","sourceRoot":"","sources":["../../src/models/port-manager.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tramvai/cli",
-  "version": "3.21.0",
+  "version": "3.24.0",
   "description": "Cli инструмент для сборки и запуска приложений",
   "files": [
     "src",
@@ -61,7 +61,7 @@
     "@sentry/node": "^6.2.5",
     "@svgr/webpack": "^8.1.0",
     "@tinkoff/browserslist-config": "0.3.2",
-    "@tinkoff/dippy": "0.9.1",
+    "@tinkoff/dippy": "0.9.2",
     "@tinkoff/is-modern-lib": "3.0.2",
     "@tinkoff/logger": "0.10.170",
     "@tinkoff/minicss-class-generator": "0.3.1",
@@ -71,7 +71,7 @@
     "@tinkoff/utils": "^2.1.3",
     "@tinkoff/webpack-dedupe-plugin": "2.0.2",
     "@tramvai/build": "4.1.0",
-    "@tramvai/react": "3.21.0",
+    "@tramvai/react": "3.24.0",
     "@tramvai/tools-check-versions": "0.5.3",
     "@tramvai/tools-migrate": "0.7.3",
     "ajv": "^8.12.0",
@@ -160,11 +160,11 @@
     "validate-npm-package-name": "^3.0.0",
     "wait-on": "^5.3.0",
     "webpack": "5.87.0",
-    "webpack-sources": "^3.2.3",
     "webpack-bundle-analyzer": "^4.9.0",
     "webpack-chain": "^6.5.1",
     "webpack-dev-middleware": "^6.1.1",
     "webpack-hot-middleware": "^2.25.4",
+    "webpack-sources": "^3.2.3",
     "webpack-stats-plugin": "^1.1.3",
     "webpackbar": "^5.0.2",
     "workbox-build": "^6.6.1",

package/src/di/providers/network.ts

@@ -13,20 +13,7 @@ export const networkProviders: readonly Provider[] = [
       logger: 'network logger',
     },
     provide: PORT_MANAGER_TOKEN,
-    useFactory: (deps) => {
-      // @ts-expect-error
-      const portManager = new PortManager(deps);
-
-      ['SIGINT', 'SIGTERM'].forEach((signal) => {
-        process.on(signal, async () => {
-          await portManager.cleanup();
-
-          process.exit();
-        });
-      });
-
-      return portManager;
-    },
+    useClass: PortManager,
   }),
   provide({
     provide: 'network logger',

package/src/models/port-manager.ts

@@ -3,6 +3,7 @@ import { join } from 'path';
 import findCacheDir from 'find-cache-dir';
 import detectPort from 'detect-port';
 import { lock } from 'proper-lockfile';
+import noop from '@tinkoff/utils/function/noop';
 
 import type { ConfigEntry } from '../typings/configEntry/common';
 import type { Params as StartParams } from '../api/start';
@@ -20,10 +21,13 @@ export class PortManager {
   static readonly DEFAULT_MODULE_PORT = 3040;
   static readonly DEFAULT_STATIC_PORT = 4000;
   static readonly DEFAULT_MODULE_STATIC_PORT = 4040;
+  private static readonly cachePath = join(
+    findCacheDir({ cwd: __dirname, create: true, name: 'tramvai' }),
+    'used-ports'
+  );
 
   private readonly configEntry: ConfigEntry;
   private readonly commandParams: StartParams | StartProdParams;
-  private readonly cachePath: string;
   private readonly logger: Logger;
 
   public port: number | null = null;
@@ -33,11 +37,35 @@ export class PortManager {
     this.configEntry = configEntry;
     this.commandParams = commandParams;
     this.logger = logger;
+  }
+
+  private async handleConfigValues() {
+    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);
+    }
 
-    this.cachePath = join(
-      findCacheDir({ cwd: __dirname, create: true, name: 'tramvai' }),
-      'used-ports'
-    );
+    switch (this.configEntry.type) {
+      case 'child-app':
+        await this.forChildApp();
+        break;
+
+      case 'module':
+        await this.forModule();
+        break;
+
+      case 'application':
+        await this.forApplication();
+        break;
+
+      default:
+        break;
+    }
   }
 
   /**
@@ -48,75 +76,62 @@ export class PortManager {
    * because we must pass a final number to the config manager.
    */
   public async computeAvailablePorts() {
-    await this.createCacheFile();
-    const release = await 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);
+    if (process.env.USE_CONCURRENT_PORT_DETECTING === 'true') {
+      await this.createCacheFile();
+      const release = await this.lockCacheFile();
+
+      try {
+        await this.handleConfigValues();
+
+        await this.appendCacheFile([this.port, this.staticPort].join(','));
+      } catch (error) {
+        this.logger.event({
+          type: 'warning',
+          event: 'PORT_MANAGER:GET_AVAILABLE_PORTS',
+          message: `Can't get free ports for ${this.configEntry.type}:`,
+          payload: error.message ?? '',
+        });
+      } finally {
+        await release();
       }
 
-      switch (this.configEntry.type) {
-        case 'child-app':
-          await this.forChildApp();
-          break;
-
-        case 'module':
-          await this.forModule();
-          break;
-
-        case 'application':
-          await this.forApplication();
-          break;
-
-        default:
-          break;
-      }
-
-      await this.appendCacheFile([this.port, this.staticPort].join(','));
-    } catch (error) {
-      this.logger.event({
-        type: 'warning',
-        event: 'PORT_MANAGER:GET_AVAILABLE_PORTS',
-        message: `Can't get free ports for ${this.configEntry.type}:`,
-        payload: error.message ?? '',
-      });
-    } finally {
-      await release();
+      return;
     }
+
+    await this.handleConfigValues();
   }
 
   /**
    * Cleanup a cache file by removing ports were written previously.
    */
   public async cleanup() {
-    const release = await this.lockCacheFile();
+    if (process.env.USE_CONCURRENT_PORT_DETECTING === 'true') {
+      const release = await this.lockCacheFile();
+
+      try {
+        const cache = await this.readCacheFile();
+
+        await 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: error.message ?? '',
+        });
+      } finally {
+        await release();
+      }
 
-    try {
-      const cache = await this.readCacheFile();
-
-      await 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: error.message ?? '',
-      });
-    } finally {
-      await release();
+      return;
     }
+
+    noop();
   }
 
   private async forApplication() {
@@ -138,20 +153,20 @@ export class PortManager {
   }
 
   private lockCacheFile() {
-    return lock(this.cachePath, { retries: 10 });
+    return lock(PortManager.cachePath, { retries: 10 });
   }
 
   private async createCacheFile() {
     try {
-      await access(this.cachePath);
+      await access(PortManager.cachePath);
     } catch (error) {
-      await outputFile(this.cachePath, '');
+      await outputFile(PortManager.cachePath, '');
     }
   }
 
   private async readCacheFile() {
     try {
-      const content = await readFile(this.cachePath, { encoding: 'utf-8' });
+      const content = await readFile(PortManager.cachePath, { encoding: 'utf-8' });
 
       return content.split(',');
     } catch (error) {
@@ -160,30 +175,34 @@ export class PortManager {
   }
 
   private async writeCacheFile(content: string) {
-    await outputFile(this.cachePath, content);
+    await outputFile(PortManager.cachePath, content);
   }
 
   private async appendCacheFile(content: string) {
-    await appendFile(this.cachePath, `,${content}`);
+    await appendFile(PortManager.cachePath, `,${content}`);
   }
 
   private async resolveFreePort(initial: number) {
     try {
-      const cache = await this.readCacheFile();
-      let port = await detectPort(initial);
-      let attempts = 1;
+      if (process.env.USE_CONCURRENT_PORT_DETECTING === 'true') {
+        const cache = await this.readCacheFile();
+        let port = await detectPort(initial);
+        let attempts = 1;
 
-      while (cache.includes(port.toString())) {
-        if (attempts >= 3) {
-          throw new Error(`Max attempts exceeded (${attempts})`);
-        }
+        while (cache.includes(port.toString())) {
+          if (attempts >= 3) {
+            throw new Error(`Max attempts exceeded (${attempts})`);
+          }
 
-        port = await detectPort(0);
+          port = await detectPort(0);
+
+          attempts++;
+        }
 
-        attempts++;
+        return port;
       }
 
-      return port;
+      return detectPort(initial);
     } catch (error) {
       this.logger.event({
         type: 'info',