@tramvai/cli 3.33.0 → 3.34.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -9,7 +9,6 @@ interface NetworkConstructorPayload {
9
9
  }
10
10
  export declare class PortManager {
11
11
  static readonly DEFAULT_PORT = 3000;
12
- static readonly DEFAULT_MODULE_PORT = 3040;
13
12
  static readonly DEFAULT_STATIC_PORT = 4000;
14
13
  static readonly DEFAULT_MODULE_STATIC_PORT = 4040;
15
14
  private static readonly cachePath;
@@ -1 +1 @@
1
- {"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"}
1
+ {"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;IAE3C,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"}
@@ -116,7 +116,7 @@ class PortManager {
116
116
  forModule() {
117
117
  var _a, _b;
118
118
  return tslib_1.__awaiter(this, void 0, void 0, function* () {
119
- this.port = (_a = this.port) !== null && _a !== void 0 ? _a : (yield this.resolveFreePort(PortManager.DEFAULT_MODULE_PORT));
119
+ this.port = (_a = this.port) !== null && _a !== void 0 ? _a : (yield this.resolveFreePort(PortManager.DEFAULT_MODULE_STATIC_PORT));
120
120
  this.staticPort =
121
121
  (_b = this.staticPort) !== null && _b !== void 0 ? _b : (yield this.resolveFreePort(PortManager.DEFAULT_MODULE_STATIC_PORT));
122
122
  });
@@ -124,7 +124,7 @@ class PortManager {
124
124
  forChildApp() {
125
125
  var _a, _b;
126
126
  return tslib_1.__awaiter(this, void 0, void 0, function* () {
127
- this.port = (_a = this.port) !== null && _a !== void 0 ? _a : (yield this.resolveFreePort(PortManager.DEFAULT_MODULE_PORT));
127
+ this.port = (_a = this.port) !== null && _a !== void 0 ? _a : (yield this.resolveFreePort(PortManager.DEFAULT_MODULE_STATIC_PORT));
128
128
  this.staticPort =
129
129
  (_b = this.staticPort) !== null && _b !== void 0 ? _b : (yield this.resolveFreePort(PortManager.DEFAULT_MODULE_STATIC_PORT));
130
130
  });
@@ -196,8 +196,8 @@ class PortManager {
196
196
  }
197
197
  exports.PortManager = PortManager;
198
198
  PortManager.DEFAULT_PORT = 3000;
199
- PortManager.DEFAULT_MODULE_PORT = 3040;
200
199
  PortManager.DEFAULT_STATIC_PORT = 4000;
200
+ // Child Apps and modules use only static port
201
201
  PortManager.DEFAULT_MODULE_STATIC_PORT = 4040;
202
202
  PortManager.cachePath = (0, path_1.join)((0, find_cache_dir_1.default)({ cwd: __dirname, create: true, name: 'tramvai' }), 'used-ports');
203
203
  //# sourceMappingURL=port-manager.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"port-manager.js","sourceRoot":"","sources":["../../src/models/port-manager.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"port-manager.js","sourceRoot":"","sources":["../../src/models/port-manager.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@tramvai/cli",
3
- "version": "3.33.0",
3
+ "version": "3.34.0",
4
4
  "description": "Cli инструмент для сборки и запуска приложений",
5
5
  "files": [
6
6
  "src",
@@ -72,7 +72,7 @@
72
72
  "@tinkoff/utils": "^2.1.3",
73
73
  "@tinkoff/webpack-dedupe-plugin": "2.0.2",
74
74
  "@tramvai/build": "4.1.1",
75
- "@tramvai/react": "3.33.0",
75
+ "@tramvai/react": "3.34.0",
76
76
  "@tramvai/tools-check-versions": "0.5.3",
77
77
  "@tramvai/tools-migrate": "0.7.3",
78
78
  "ajv": "^8.12.0",
@@ -18,8 +18,8 @@ interface NetworkConstructorPayload {
18
18
 
19
19
  export class PortManager {
20
20
  static readonly DEFAULT_PORT = 3000;
21
- static readonly DEFAULT_MODULE_PORT = 3040;
22
21
  static readonly DEFAULT_STATIC_PORT = 4000;
22
+ // Child Apps and modules use only static port
23
23
  static readonly DEFAULT_MODULE_STATIC_PORT = 4040;
24
24
  private static readonly cachePath = join(
25
25
  findCacheDir({ cwd: __dirname, create: true, name: 'tramvai' }),
@@ -141,13 +141,13 @@ export class PortManager {
141
141
  }
142
142
 
143
143
  private async forModule() {
144
- this.port = this.port ?? (await this.resolveFreePort(PortManager.DEFAULT_MODULE_PORT));
144
+ this.port = this.port ?? (await this.resolveFreePort(PortManager.DEFAULT_MODULE_STATIC_PORT));
145
145
  this.staticPort =
146
146
  this.staticPort ?? (await this.resolveFreePort(PortManager.DEFAULT_MODULE_STATIC_PORT));
147
147
  }
148
148
 
149
149
  private async forChildApp() {
150
- this.port = this.port ?? (await this.resolveFreePort(PortManager.DEFAULT_MODULE_PORT));
150
+ this.port = this.port ?? (await this.resolveFreePort(PortManager.DEFAULT_MODULE_STATIC_PORT));
151
151
  this.staticPort =
152
152
  this.staticPort ?? (await this.resolveFreePort(PortManager.DEFAULT_MODULE_STATIC_PORT));
153
153
  }