@tramvai/cli 2.64.0 → 2.66.0

package/README.md

@@ -44,21 +44,19 @@ After any command you can pass `--help` string, e.g. `tramvai --help` or `tramva
 
 ### Notifications settings
 
-Inside `tramvai.json` the settings for the notification can be specified at path `commands.serve.notifications`. Parameters are passed to [webpack-build-notifier](https://github.com/RoccoC/webpack-build-notifier#config-options). You can specify global configuration or a specific configuration either for client or server build.
+Inside `tramvai.json` the settings for the notification can be specified at path `notifications`. Parameters are passed to [webpack-build-notifier](https://github.com/RoccoC/webpack-build-notifier#config-options). You can specify global configuration or a specific configuration either for client or server build.
 
 ```json
-"commands": {
-    "serve": {
-      "notifications": {
-        "suppressSuccess": "always",
-        "server": {
-          "suppressWarning": true
-        },
-        "client": {
-          "activateTerminalOnError": true
-        }
-      }
+{
+  "notifications": {
+    "suppressSuccess": "always",
+    "server": {
+      "suppressWarning": true
+    },
+    "client": {
+      "activateTerminalOnError": true
     }
+  }
 }
 ```
 
@@ -67,17 +65,39 @@ Inside `tramvai.json` the settings for the notification can be specified at path
 Name generation is configured via the options `cssLocalIdentNameDev` and `cssLocalIdentNameProd` (common option `cssLocalIdentName` might be used to specify settings for both prod and dev).
 
 ```json
-"commands": {
-  "build": {
-    "configurations": {
-      "postcss": {
-        "cssLocalIdentName": "[hash:base64:5]", // default value (deprecated)
-        "cssLocalIdentNameDev": "[name]__[local]_[minicss]", // available values see in the docs to [css-loader](https://github.com/webpack-contrib/css-loader)
-        "cssLocalIdentNameProd": "[minicss]", // additionally new tag `minicss` can be used for the generating minimal css names. Based on [article](https://dev.to/denisx/reduce-bundle-size-via-one-letter-css-classname-hash-strategy-10g6)
-      };
-    };
-  };
-};
+{
+  "postcss": {
+    "cssLocalIdentName": "[hash:base64:5]", // default value (deprecated)
+  }
+}
+```
+
+or
+
+```json
+{
+  "postcss": {
+    "cssLocalIdentName": {
+      "development": "[name]__[local]_[minicss]", // available values see in the docs to [css-loader](https://github.com/webpack-contrib/css-loader)
+      "production": "[minicss]", // additionally new tag `minicss` can be used for the generating minimal css names. Based on [article](https://dev.to/denisx/reduce-bundle-size-via-one-letter-css-classname-hash-strategy-10g6)
+    }
+  }
+}
+```
+
+### CSS modules processing
+
+By default, all `*.css` imports will be processed as CSS Modules.
+
+IF you want to disable Modules for some files, for example with global styles, you can do it by adding `cssModulePattern` regexp to the config:
+
+```json
+{
+  "postcss": {
+    // CSS Modules processing will be skipped for *.global.css files
+    "cssModulePattern": "/^(?!.global.css$).$/"
+  }
+}
 ```
 
 ### Polyfills for the standard NodeJS modules
@@ -109,11 +129,10 @@ If you want to override path to tsconfig through **pluginOptions.tsconfig** the
 
 ### Deduplication of modules
 
-Option `commands.build.configurations.dedupe` controls the settings of plugin for the deduplication process. Available options are:
+Option `dedupe` controls the settings of plugin for the deduplication process. Available options are:
 
 - `"equality"` - uses strict version comparison. Dedupes modules in `node_modules` with equal package version that are imported from different sources. E.g. imports for `node_modules/package/index.js` and `node_modules/nested-package/node_modules/package/index.js` are deduped into a single `node_modules/package/index.js` import whilst without dedupe it will bundle two files as separate modules.
 - `"semver"` - compares version of packages based on semver. It can dedupe all of the imports with the same major version and any of the minor and patch versions. E.g. next versions will be deduped: from `1.14.0` and `1.16.2` to `1.16.2`, from `0.14.1` and `0.16.5` to `0.16.5`, whilst versions `0.0.2` and `0.0.5` will be left without deduplication.
-- `false` - disable deduplication, by default
 
 ### Debug an app
 
@@ -142,7 +161,7 @@ By default, for browser is used the fastest sourcemaps, while for server no sour
 
 Flag `--debug` enables sourcemap generation for the server bundle.
 
-Option `commands.serve.configurations.sourceMap` enables sourcemap generation both for browser and server code.
+Option `sourceMap` enables sourcemap generation both for browser and server code.
 
 ##### Production
 
@@ -150,23 +169,12 @@ By default, sourcemaps are disabled both for the client and server code.
 
 Flag `--debug` enables sourcemaps generation for the client and server bundles.
 
-Option `commands.build.configurations.sourceMap` enables sourcemap generation for the client bundle.
-
-Option `commands.build.configurations.sourceMapServer` enables sourcemap generation for the server bundle.
+Option `sourceMap` enables sourcemap generation for bundle.
 
 ## Configuration
 
 Configuration is provided through json-file with the name `tramvai.json` in the root of the single-application/monorepo
 
-### build or serve config?
-
-When you are deciding where to put specific settings in `tramvai.json` consider next statements:
-
-- `serve` config is only for development builds (using `tramvai start`)
-- `build` config mostly focused on production builds (`tramvai build`, `tramvai analyze`, `tramvai start-prod`) but may affect development builds as well (is this case this configs are merged)
-
-In conclusion: put most of the settings in the `build` config and put settings in the `serve` config only if they are specific to development builds or you need to override `build` settings to the development process.
-
 ## How to
 
 ### Code generation

package/lib/api/analyze/providers/shared.js

@@ -8,7 +8,7 @@ exports.sharedProviders = [
     (0, dippy_1.provide)({
         provide: tokens_1.CONFIG_MANAGER_TOKEN,
         useFactory: ({ configEntry, parameters }) => {
-            return new configManager_1.ConfigManager(configEntry, Object.assign(Object.assign({}, parameters), { env: 'production', buildType: 'client' }));
+            return (0, configManager_1.createConfigManager)(configEntry, Object.assign(Object.assign({}, parameters), { env: 'production', buildType: 'client' }));
         },
         deps: {
             configEntry: tokens_1.CONFIG_ENTRY_TOKEN,

package/lib/api/analyze/providers/shared.js.map

@@ -1 +1 @@
-{"version":3,"file":"shared.js","sourceRoot":"","sources":["../../../../src/api/analyze/providers/shared.ts"],"names":[],"mappings":";;;AACA,0CAAyC;AACzC,+CAI4B;AAC5B,iEAA8D;AAEjD,QAAA,eAAe,GAAwB;IAClD,IAAA,eAAO,EAAC;QACN,OAAO,EAAE,6BAAoB;QAC7B,UAAU,EAAE,CAAC,EAAE,WAAW,EAAE,UAAU,EAAE,EAAE,EAAE;YAC1C,OAAO,IAAI,6BAAa,CAAC,WAAW,kCAC/B,UAAU,KACb,GAAG,EAAE,YAAY,EACjB,SAAS,EAAE,QAAQ,IACnB,CAAC;QACL,CAAC;QACD,IAAI,EAAE;YACJ,WAAW,EAAE,2BAAkB;YAC/B,UAAU,EAAE,iCAAwB;SACrC;KACF,CAAC;CACH,CAAC"}
+{"version":3,"file":"shared.js","sourceRoot":"","sources":["../../../../src/api/analyze/providers/shared.ts"],"names":[],"mappings":";;;AACA,0CAAyC;AACzC,+CAI4B;AAC5B,iEAAoE;AAGvD,QAAA,eAAe,GAAwB;IAClD,IAAA,eAAO,EAAC;QACN,OAAO,EAAE,6BAAoB;QAC7B,UAAU,EAAE,CAAC,EAAE,WAAW,EAAE,UAAU,EAAE,EAAE,EAAE;YAC1C,OAAO,IAAA,mCAAmB,EAAC,WAA6B,kCACnD,UAAU,KACb,GAAG,EAAE,YAAY,EACjB,SAAS,EAAE,QAAQ,IACnB,CAAC;QACL,CAAC;QACD,IAAI,EAAE;YACJ,WAAW,EAAE,2BAAkB;YAC/B,UAAU,EAAE,iCAAwB;SACrC;KACF,CAAC;CACH,CAAC"}

package/lib/api/benchmark/index.d.ts

@@ -8,7 +8,7 @@ export interface Params {
     times?: number;
 }
 export interface Result {
-    [key: string]: RunStats;
+    [key: string]: RunStats | undefined;
 }
 export type BenchmarkCommand = (params: StartParams | BuildParams, providers?: Provider[]) => Promise<StartResult | BuildResult>;
 declare const _default: import("../../typings/commands").Command;

package/lib/api/build/child-app.js

@@ -7,7 +7,6 @@ const di_1 = require("../../utils/di");
 const tokens_1 = require("../../di/tokens");
 const buildChildApp = (di) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
     (0, di_1.registerProviders)(di, shared_1.sharedProviders);
-    const configManager = di.get(tokens_1.CONFIG_MANAGER_TOKEN);
     const builderFactory = di.get(tokens_1.ABSTRACT_BUILDER_FACTORY_TOKEN);
     const builder = yield builderFactory.createBuilder('webpack', {
         options: {
@@ -16,7 +15,9 @@ const buildChildApp = (di) => tslib_1.__awaiter(void 0, void 0, void 0, function
         },
     });
     const builderBuild = yield builder.build({
-        modern: configManager.modern,
+        // child-app either should be built for legacy code always
+        // or should be smart loaded depending on browser capabilities
+        modern: false,
     });
     return Object.assign({ builder }, builderBuild);
 });

package/lib/api/build/child-app.js.map

@@ -1 +1 @@
-{"version":3,"file":"child-app.js","sourceRoot":"","sources":["../../../src/api/build/child-app.ts"],"names":[],"mappings":";;;;AAEA,+CAAqD;AACrD,uCAAmD;AACnD,4CAAuF;AAEhF,MAAM,aAAa,GAAG,CAAO,EAAa,EAAU,EAAE;IAC3D,IAAA,sBAAiB,EAAC,EAAE,EAAE,wBAAe,CAAC,CAAC;IAEvC,MAAM,aAAa,GAAG,EAAE,CAAC,GAAG,CAAC,6BAAoB,CAAC,CAAC;IAEnD,MAAM,cAAc,GAAG,EAAE,CAAC,GAAG,CAAC,uCAA8B,CAAC,CAAC;IAC9D,MAAM,OAAO,GAAG,MAAM,cAAc,CAAC,aAAa,CAAC,SAAS,EAAE;QAC5D,OAAO,EAAE;YACP,iBAAiB,EAAE,IAAI;YACvB,iBAAiB,EAAE,IAAI;SACxB;KACF,CAAC,CAAC;IAEH,MAAM,YAAY,GAAG,MAAM,OAAO,CAAC,KAAK,CAAC;QACvC,MAAM,EAAE,aAAa,CAAC,MAAM;KAC7B,CAAC,CAAC;IAEH,uBACE,OAAO,IACJ,YAAY,EACf;AACJ,CAAC,CAAA,CAAC;AArBW,QAAA,aAAa,iBAqBxB"}
+{"version":3,"file":"child-app.js","sourceRoot":"","sources":["../../../src/api/build/child-app.ts"],"names":[],"mappings":";;;;AAEA,+CAAqD;AACrD,uCAAmD;AACnD,4CAAiE;AAE1D,MAAM,aAAa,GAAG,CAAO,EAAa,EAAU,EAAE;IAC3D,IAAA,sBAAiB,EAAC,EAAE,EAAE,wBAAe,CAAC,CAAC;IAEvC,MAAM,cAAc,GAAG,EAAE,CAAC,GAAG,CAAC,uCAA8B,CAAC,CAAC;IAC9D,MAAM,OAAO,GAAG,MAAM,cAAc,CAAC,aAAa,CAAC,SAAS,EAAE;QAC5D,OAAO,EAAE;YACP,iBAAiB,EAAE,IAAI;YACvB,iBAAiB,EAAE,IAAI;SACxB;KACF,CAAC,CAAC;IAEH,MAAM,YAAY,GAAG,MAAM,OAAO,CAAC,KAAK,CAAC;QACvC,0DAA0D;QAC1D,8DAA8D;QAC9D,MAAM,EAAE,KAAK;KACd,CAAC,CAAC;IAEH,uBACE,OAAO,IACJ,YAAY,EACf;AACJ,CAAC,CAAA,CAAC;AArBW,QAAA,aAAa,iBAqBxB"}

package/lib/api/build/module.js

@@ -7,7 +7,6 @@ const di_1 = require("../../utils/di");
 const tokens_1 = require("../../di/tokens");
 const buildModule = (di) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
     (0, di_1.registerProviders)(di, [...shared_1.sharedProviders]);
-    const configManager = di.get(tokens_1.CONFIG_MANAGER_TOKEN);
     const builderFactory = di.get(tokens_1.ABSTRACT_BUILDER_FACTORY_TOKEN);
     const builder = yield builderFactory.createBuilder('webpack', {
         options: {
@@ -16,7 +15,7 @@ const buildModule = (di) => tslib_1.__awaiter(void 0, void 0, void 0, function*
         },
     });
     const builderBuild = yield builder.build({
-        modern: configManager.modern,
+        modern: false,
     });
     return Object.assign({ builder }, builderBuild);
 });

package/lib/api/build/module.js.map

@@ -1 +1 @@
-{"version":3,"file":"module.js","sourceRoot":"","sources":["../../../src/api/build/module.ts"],"names":[],"mappings":";;;;AAEA,+CAAqD;AACrD,uCAAmD;AACnD,4CAAuF;AAEhF,MAAM,WAAW,GAAG,CAAO,EAAa,EAAU,EAAE;IACzD,IAAA,sBAAiB,EAAC,EAAE,EAAE,CAAC,GAAG,wBAAe,CAAC,CAAC,CAAC;IAE5C,MAAM,aAAa,GAAG,EAAE,CAAC,GAAG,CAAC,6BAAoB,CAAC,CAAC;IAEnD,MAAM,cAAc,GAAG,EAAE,CAAC,GAAG,CAAC,uCAA8B,CAAC,CAAC;IAC9D,MAAM,OAAO,GAAG,MAAM,cAAc,CAAC,aAAa,CAAC,SAAS,EAAE;QAC5D,OAAO,EAAE;YACP,iBAAiB,EAAE,IAAI;YACvB,iBAAiB,EAAE,IAAI;SACxB;KACF,CAAC,CAAC;IAEH,MAAM,YAAY,GAAG,MAAM,OAAO,CAAC,KAAK,CAAC;QACvC,MAAM,EAAE,aAAa,CAAC,MAAM;KAC7B,CAAC,CAAC;IAEH,uBACE,OAAO,IACJ,YAAY,EACf;AACJ,CAAC,CAAA,CAAC;AArBW,QAAA,WAAW,eAqBtB"}
+{"version":3,"file":"module.js","sourceRoot":"","sources":["../../../src/api/build/module.ts"],"names":[],"mappings":";;;;AAEA,+CAAqD;AACrD,uCAAmD;AACnD,4CAAiE;AAE1D,MAAM,WAAW,GAAG,CAAO,EAAa,EAAU,EAAE;IACzD,IAAA,sBAAiB,EAAC,EAAE,EAAE,CAAC,GAAG,wBAAe,CAAC,CAAC,CAAC;IAE5C,MAAM,cAAc,GAAG,EAAE,CAAC,GAAG,CAAC,uCAA8B,CAAC,CAAC;IAC9D,MAAM,OAAO,GAAG,MAAM,cAAc,CAAC,aAAa,CAAC,SAAS,EAAE;QAC5D,OAAO,EAAE;YACP,iBAAiB,EAAE,IAAI;YACvB,iBAAiB,EAAE,IAAI;SACxB;KACF,CAAC,CAAC;IAEH,MAAM,YAAY,GAAG,MAAM,OAAO,CAAC,KAAK,CAAC;QACvC,MAAM,EAAE,KAAK;KACd,CAAC,CAAC;IAEH,uBACE,OAAO,IACJ,YAAY,EACf;AACJ,CAAC,CAAA,CAAC;AAnBW,QAAA,WAAW,eAmBtB"}

package/lib/api/build/providers/shared.js

@@ -7,7 +7,7 @@ exports.sharedProviders = [
     {
         provide: tokens_1.CONFIG_MANAGER_TOKEN,
         useFactory: ({ configEntry, parameters, }) => {
-            return new configManager_1.ConfigManager(configEntry, Object.assign(Object.assign({}, parameters), { env: 'production', buildType: 'client' }));
+            return (0, configManager_1.createConfigManager)(configEntry, Object.assign(Object.assign({}, parameters), { env: 'production', buildType: 'client' }));
         },
         deps: {
             configEntry: tokens_1.CONFIG_ENTRY_TOKEN,

package/lib/api/build/providers/shared.js.map

@@ -1 +1 @@
-{"version":3,"file":"shared.js","sourceRoot":"","sources":["../../../../src/api/build/providers/shared.ts"],"names":[],"mappings":";;;AACA,+CAI4B;AAC5B,iEAA8D;AAIjD,QAAA,eAAe,GAAwB;IAClD;QACE,OAAO,EAAE,6BAAoB;QAC7B,UAAU,EAAE,CAAC,EACX,WAAW,EACX,UAAU,GAIX,EAAE,EAAE;YACH,OAAO,IAAI,6BAAa,CAAC,WAAW,kCAC/B,UAAU,KACb,GAAG,EAAE,YAAY,EACjB,SAAS,EAAE,QAAQ,IACnB,CAAC;QACL,CAAC;QACD,IAAI,EAAE;YACJ,WAAW,EAAE,2BAAkB;YAC/B,UAAU,EAAE,iCAAwB;SACrC;KACF;CACF,CAAC"}
+{"version":3,"file":"shared.js","sourceRoot":"","sources":["../../../../src/api/build/providers/shared.ts"],"names":[],"mappings":";;;AACA,+CAI4B;AAC5B,iEAAoE;AAIvD,QAAA,eAAe,GAAwB;IAClD;QACE,OAAO,EAAE,6BAAoB;QAC7B,UAAU,EAAE,CAAC,EACX,WAAW,EACX,UAAU,GAIX,EAAE,EAAE;YACH,OAAO,IAAA,mCAAmB,EAAC,WAAW,kCACjC,UAAU,KACb,GAAG,EAAE,YAAY,EACjB,SAAS,EAAE,QAAQ,IACnB,CAAC;QACL,CAAC;QACD,IAAI,EAAE;YACJ,WAAW,EAAE,2BAAkB;YAC/B,UAAU,EAAE,iCAAwB;SACrC;KACF;CACF,CAAC"}

package/lib/api/index.d.ts

@@ -4,12 +4,16 @@ import type { BenchmarkCommand } from './benchmark';
 import type { AnalyzeCommand } from './analyze';
 import type { StartProdCommand } from './start-prod';
 export * from '../di/tokens';
-export { ConfigManager } from '../config/configManager';
+export { ConfigManager, createConfigManager } from '../config/configManager';
+export { CliConfigEntry } from '../typings/configEntry/cli';
+export { ApplicationConfigEntry } from '../typings/configEntry/application';
+export { ChildAppConfigEntry } from '../typings/configEntry/child-app';
+export { ConvertToSchema } from '../schema/ConfigSchema';
 export { ConfigManager as ConfigManagerValidator } from '../models/config';
 export { getTramvaiConfig } from '../utils/getTramvaiConfig';
 export { syncJsonFile } from '../utils/syncJsonFile';
 export { babelConfigFactory } from '../library/babel';
-export { filesClientWebackRulesFactory } from '../library/webpack/blocks/filesClient';
+export { filesClientWebpackRulesFactory } from '../library/webpack/blocks/filesClient';
 export { cssWebpackRulesFactory } from '../library/webpack/blocks/css';
 export { lessWebpackRulesFactory } from '../library/webpack/blocks/less';
 export { postcssAssetsWebpackRulesFactory } from '../library/webpack/blocks/postcssAssets';

package/lib/api/index.js

@@ -1,13 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.startProd = exports.analyze = exports.benchmark = exports.build = exports.start = exports.configToEnv = exports.extractCssPluginFactory = exports.postcssAssetsWebpackRulesFactory = exports.lessWebpackRulesFactory = exports.cssWebpackRulesFactory = exports.filesClientWebackRulesFactory = exports.babelConfigFactory = exports.syncJsonFile = exports.getTramvaiConfig = exports.ConfigManagerValidator = exports.ConfigManager = void 0;
+exports.startProd = exports.analyze = exports.benchmark = exports.build = exports.start = exports.configToEnv = exports.extractCssPluginFactory = exports.postcssAssetsWebpackRulesFactory = exports.lessWebpackRulesFactory = exports.cssWebpackRulesFactory = exports.filesClientWebpackRulesFactory = exports.babelConfigFactory = exports.syncJsonFile = exports.getTramvaiConfig = exports.ConfigManagerValidator = exports.createConfigManager = void 0;
 const tslib_1 = require("tslib");
 const noop_stream_1 = require("noop-stream");
 const tokens_1 = require("../di/tokens");
 const createApp_1 = require("../commands/createApp");
 tslib_1.__exportStar(require("../di/tokens"), exports);
 var configManager_1 = require("../config/configManager");
-Object.defineProperty(exports, "ConfigManager", { enumerable: true, get: function () { return configManager_1.ConfigManager; } });
+Object.defineProperty(exports, "createConfigManager", { enumerable: true, get: function () { return configManager_1.createConfigManager; } });
 var config_1 = require("../models/config");
 Object.defineProperty(exports, "ConfigManagerValidator", { enumerable: true, get: function () { return config_1.ConfigManager; } });
 var getTramvaiConfig_1 = require("../utils/getTramvaiConfig");
@@ -17,7 +17,7 @@ Object.defineProperty(exports, "syncJsonFile", { enumerable: true, get: function
 var babel_1 = require("../library/babel");
 Object.defineProperty(exports, "babelConfigFactory", { enumerable: true, get: function () { return babel_1.babelConfigFactory; } });
 var filesClient_1 = require("../library/webpack/blocks/filesClient");
-Object.defineProperty(exports, "filesClientWebackRulesFactory", { enumerable: true, get: function () { return filesClient_1.filesClientWebackRulesFactory; } });
+Object.defineProperty(exports, "filesClientWebpackRulesFactory", { enumerable: true, get: function () { return filesClient_1.filesClientWebpackRulesFactory; } });
 var css_1 = require("../library/webpack/blocks/css");
 Object.defineProperty(exports, "cssWebpackRulesFactory", { enumerable: true, get: function () { return css_1.cssWebpackRulesFactory; } });
 var less_1 = require("../library/webpack/blocks/less");

package/lib/api/index.js.map

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

package/lib/api/shared/types/withConfig.d.ts

@@ -1,10 +1,11 @@
+import type { WithRootDir } from './withRootDir';
 import type { ApplicationConfigEntry } from '../../../typings/configEntry/application';
 import type { ModuleConfigEntry } from '../../../typings/configEntry/module';
-import type { WithRootDir } from './withRootDir';
 import type { PackageConfigEntry } from '../../../typings/configEntry/package';
 import type { ChildAppConfigEntry } from '../../../typings/configEntry/child-app';
+import type { ConvertToSchema } from '../../../schema/ConfigSchema';
 export type WithConfig<T> = WithRootDir<T> & ({
     target: string;
 } | {
-    config: ApplicationConfigEntry | ModuleConfigEntry | PackageConfigEntry | ChildAppConfigEntry;
+    config: ConvertToSchema<ApplicationConfigEntry | ModuleConfigEntry | PackageConfigEntry | ChildAppConfigEntry>;
 });

package/lib/api/start/providers/application/server.js

@@ -2,41 +2,34 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.serverProviders = void 0;
 const tslib_1 = require("tslib");
+const dippy_1 = require("@tinkoff/dippy");
 const tokens_1 = require("../../tokens");
 const tokens_2 = require("../../../../di/tokens");
 const stopServer_1 = require("../../utils/stopServer");
 const createServer_1 = require("../../utils/createServer");
 const listenServer_1 = require("../../utils/listenServer");
 exports.serverProviders = [
-    {
+    (0, dippy_1.provide)({
         provide: tokens_2.SERVER_TOKEN,
         useFactory: createServer_1.createServer,
-    },
-    {
+    }),
+    (0, dippy_1.provide)({
         provide: tokens_1.INIT_HANDLER_TOKEN,
         multi: true,
-        useFactory: ({ server, parameters }) => {
+        useFactory: ({ server, configManager }) => {
             return function staticServerListen() {
                 return tslib_1.__awaiter(this, void 0, void 0, function* () {
-                    const { host = '0.0.0.0', port = 3000 } = parameters;
-                    try {
-                        yield (0, listenServer_1.listenServer)(server, host, port);
-                    }
-                    catch (error) {
-                        if (error.code === 'EADDRINUSE') {
-                            throw new Error(`Address '${host}:${port}' in use, either release this port or use options --port --host`);
-                        }
-                        throw error;
-                    }
+                    const { host, port } = configManager;
+                    yield (0, listenServer_1.listenServer)(server, host, port);
                 });
             };
         },
         deps: {
             server: tokens_2.SERVER_TOKEN,
-            parameters: tokens_2.COMMAND_PARAMETERS_TOKEN,
+            configManager: tokens_2.CONFIG_MANAGER_TOKEN,
         },
-    },
-    {
+    }),
+    (0, dippy_1.provide)({
         provide: tokens_1.CLOSE_HANDLER_TOKEN,
         multi: true,
         useFactory: ({ server }) => {
@@ -47,6 +40,6 @@ exports.serverProviders = [
         deps: {
             server: tokens_2.SERVER_TOKEN,
         },
-    },
+    }),
 ];
 //# sourceMappingURL=server.js.map

package/lib/api/start/providers/application/server.js.map

@@ -1 +1 @@
-{"version":3,"file":"server.js","sourceRoot":"","sources":["../../../../../src/api/start/providers/application/server.ts"],"names":[],"mappings":";;;;AACA,yCAAuE;AACvE,kDAA+E;AAC/E,uDAAoD;AACpD,2DAAwD;AACxD,2DAAwD;AAG3C,QAAA,eAAe,GAAwB;IAClD;QACE,OAAO,EAAE,qBAAY;QACrB,UAAU,EAAE,2BAAY;KACzB;IACD;QACE,OAAO,EAAE,2BAAkB;QAC3B,KAAK,EAAE,IAAI;QACX,UAAU,EAAE,CAAC,EAAE,MAAM,EAAE,UAAU,EAAuD,EAAE,EAAE;YAC1F,OAAO,SAAe,kBAAkB;;oBACtC,MAAM,EAAE,IAAI,GAAG,SAAS,EAAE,IAAI,GAAG,IAAI,EAAE,GAAG,UAAU,CAAC;oBAErD,IAAI;wBACF,MAAM,IAAA,2BAAY,EAAC,MAAM,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;qBACxC;oBAAC,OAAO,KAAK,EAAE;wBACd,IAAK,KAAa,CAAC,IAAI,KAAK,YAAY,EAAE;4BACxC,MAAM,IAAI,KAAK,CACb,YAAY,IAAI,IAAI,IAAI,iEAAiE,CAC1F,CAAC;yBACH;wBAED,MAAM,KAAK,CAAC;qBACb;gBACH,CAAC;aAAA,CAAC;QACJ,CAAC;QACD,IAAI,EAAE;YACJ,MAAM,EAAE,qBAAY;YACpB,UAAU,EAAE,iCAAwB;SACrC;KACF;IACD;QACE,OAAO,EAAE,4BAAmB;QAC5B,KAAK,EAAE,IAAI;QACX,UAAU,EAAE,CAAC,EAAE,MAAM,EAAmC,EAAE,EAAE;YAC1D,OAAO,GAAG,EAAE;gBACV,OAAO,IAAA,uBAAU,EAAC,MAAM,CAAC,CAAC;YAC5B,CAAC,CAAC;QACJ,CAAC;QACD,IAAI,EAAE;YACJ,MAAM,EAAE,qBAAY;SACrB;KACF;CACO,CAAC"}
+{"version":3,"file":"server.js","sourceRoot":"","sources":["../../../../../src/api/start/providers/application/server.ts"],"names":[],"mappings":";;;;AACA,0CAAyC;AAEzC,yCAAuE;AACvE,kDAA2E;AAC3E,uDAAoD;AACpD,2DAAwD;AACxD,2DAAwD;AAE3C,QAAA,eAAe,GAAwB;IAClD,IAAA,eAAO,EAAC;QACN,OAAO,EAAE,qBAAY;QACrB,UAAU,EAAE,2BAAY;KACzB,CAAC;IACF,IAAA,eAAO,EAAC;QACN,OAAO,EAAE,2BAAkB;QAC3B,KAAK,EAAE,IAAI;QACX,UAAU,EAAE,CAAC,EAAE,MAAM,EAAE,aAAa,EAAE,EAAE,EAAE;YACxC,OAAO,SAAe,kBAAkB;;oBACtC,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,aAAa,CAAC;oBAErC,MAAM,IAAA,2BAAY,EAAC,MAAM,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;gBACzC,CAAC;aAAA,CAAC;QACJ,CAAC;QACD,IAAI,EAAE;YACJ,MAAM,EAAE,qBAAY;YACpB,aAAa,EAAE,6BAAoB;SACpC;KACF,CAAC;IACF,IAAA,eAAO,EAAC;QACN,OAAO,EAAE,4BAAmB;QAC5B,KAAK,EAAE,IAAI;QACX,UAAU,EAAE,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE;YACzB,OAAO,GAAG,EAAE;gBACV,OAAO,IAAA,uBAAU,EAAC,MAAM,CAAC,CAAC;YAC5B,CAAC,CAAC;QACJ,CAAC;QACD,IAAI,EAAE;YACJ,MAAM,EAAE,qBAAY;SACrB;KACF,CAAC;CACM,CAAC"}

package/lib/api/start/providers/application/shared.js

@@ -2,55 +2,47 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.sharedProviders = void 0;
 const tslib_1 = require("tslib");
+const dippy_1 = require("@tinkoff/dippy");
 const tokens_1 = require("../../tokens");
 const tokens_2 = require("../../../../di/tokens");
 const stopServer_1 = require("../../utils/stopServer");
 const configManager_1 = require("../../../../config/configManager");
 const createServer_1 = require("../../utils/createServer");
 const listenServer_1 = require("../../utils/listenServer");
-const getListeningPort_1 = require("../../utils/getListeningPort");
+const detectPortSync_1 = require("../../../../utils/detectPortSync");
 exports.sharedProviders = [
-    {
+    (0, dippy_1.provide)({
         provide: tokens_2.CONFIG_MANAGER_TOKEN,
-        useFactory: ({ configEntry, parameters, server, staticServer, }) => {
-            return new configManager_1.ConfigManager(configEntry, Object.assign(Object.assign({}, parameters), { env: 'development', buildType: 'client', port: server ? (0, getListeningPort_1.getListeningPort)(server) : parameters.port, staticPort: (0, getListeningPort_1.getListeningPort)(staticServer) }));
+        useFactory: ({ configEntry, parameters }) => {
+            var _a, _b;
+            return (0, configManager_1.createConfigManager)(configEntry, Object.assign(Object.assign({}, parameters), { env: 'development', port: (0, detectPortSync_1.detectPortSync)((_a = parameters.port) !== null && _a !== void 0 ? _a : configManager_1.DEFAULT_PORT), staticPort: (0, detectPortSync_1.detectPortSync)((_b = parameters.staticPort) !== null && _b !== void 0 ? _b : configManager_1.DEFAULT_STATIC_PORT) }));
         },
         deps: {
             configEntry: tokens_2.CONFIG_ENTRY_TOKEN,
             parameters: tokens_2.COMMAND_PARAMETERS_TOKEN,
-            staticServer: tokens_2.STATIC_SERVER_TOKEN,
-            server: { token: tokens_2.SERVER_TOKEN, optional: true },
         },
-    },
-    {
+    }),
+    (0, dippy_1.provide)({
         provide: tokens_2.STATIC_SERVER_TOKEN,
         useFactory: createServer_1.createServer,
-    },
-    {
+    }),
+    (0, dippy_1.provide)({
         provide: tokens_1.INIT_HANDLER_TOKEN,
         multi: true,
-        useFactory: ({ staticServer, parameters, }) => {
+        useFactory: ({ configManager, staticServer }) => {
             return function staticServerListen() {
                 return tslib_1.__awaiter(this, void 0, void 0, function* () {
-                    const { staticHost = 'localhost', staticPort = 4000 } = parameters;
-                    try {
-                        yield (0, listenServer_1.listenServer)(staticServer, staticHost.replace('localhost', '0.0.0.0'), staticPort);
-                    }
-                    catch (error) {
-                        if (error.code === 'EADDRINUSE') {
-                            throw new Error(`Address '${staticHost}:${staticPort}' in use, either release this port or use options --staticPort --staticHost`);
-                        }
-                        throw error;
-                    }
+                    const { staticHost, staticPort } = configManager;
+                    yield (0, listenServer_1.listenServer)(staticServer, staticHost.replace('localhost', '0.0.0.0'), staticPort);
                 });
             };
         },
         deps: {
             staticServer: tokens_2.STATIC_SERVER_TOKEN,
-            parameters: tokens_2.COMMAND_PARAMETERS_TOKEN,
+            configManager: tokens_2.CONFIG_MANAGER_TOKEN,
         },
-    },
-    {
+    }),
+    (0, dippy_1.provide)({
         provide: tokens_1.CLOSE_HANDLER_TOKEN,
         multi: true,
         useFactory: ({ staticServer }) => {
@@ -61,6 +53,6 @@ exports.sharedProviders = [
         deps: {
             staticServer: tokens_2.STATIC_SERVER_TOKEN,
         },
-    },
+    }),
 ];
 //# sourceMappingURL=shared.js.map

package/lib/api/start/providers/application/shared.js.map

@@ -1 +1 @@
-{"version":3,"file":"shared.js","sourceRoot":"","sources":["../../../../../src/api/start/providers/application/shared.ts"],"names":[],"mappings":";;;;AACA,yCAAuE;AACvE,kDAM+B;AAC/B,uDAAoD;AAGpD,oEAAiE;AACjE,2DAAwD;AACxD,2DAAwD;AACxD,mEAAgE;AAEnD,QAAA,eAAe,GAAwB;IAClD;QACE,OAAO,EAAE,6BAAoB;QAC7B,UAAU,EAAE,CAAC,EACX,WAAW,EACX,UAAU,EACV,MAAM,EACN,YAAY,GAMb,EAAE,EAAE;YACH,OAAO,IAAI,6BAAa,CAAC,WAAW,kCAC/B,UAAU,KACb,GAAG,EAAE,aAAa,EAClB,SAAS,EAAE,QAAQ,EACnB,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC,IAAA,mCAAgB,EAAC,MAAM,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,IAAI,EACzD,UAAU,EAAE,IAAA,mCAAgB,EAAC,YAAY,CAAC,IAC1C,CAAC;QACL,CAAC;QACD,IAAI,EAAE;YACJ,WAAW,EAAE,2BAAkB;YAC/B,UAAU,EAAE,iCAAwB;YACpC,YAAY,EAAE,4BAAmB;YACjC,MAAM,EAAE,EAAE,KAAK,EAAE,qBAAY,EAAE,QAAQ,EAAE,IAAI,EAAE;SAChD;KACF;IACD;QACE,OAAO,EAAE,4BAAmB;QAC5B,UAAU,EAAE,2BAAY;KACzB;IACD;QACE,OAAO,EAAE,2BAAkB;QAC3B,KAAK,EAAE,IAAI;QACX,UAAU,EAAE,CAAC,EACX,YAAY,EACZ,UAAU,GAIX,EAAE,EAAE;YACH,OAAO,SAAe,kBAAkB;;oBACtC,MAAM,EAAE,UAAU,GAAG,WAAW,EAAE,UAAU,GAAG,IAAI,EAAE,GAAG,UAAU,CAAC;oBAEnE,IAAI;wBACF,MAAM,IAAA,2BAAY,EAAC,YAAY,EAAE,UAAU,CAAC,OAAO,CAAC,WAAW,EAAE,SAAS,CAAC,EAAE,UAAU,CAAC,CAAC;qBAC1F;oBAAC,OAAO,KAAK,EAAE;wBACd,IAAK,KAAa,CAAC,IAAI,KAAK,YAAY,EAAE;4BACxC,MAAM,IAAI,KAAK,CACb,YAAY,UAAU,IAAI,UAAU,6EAA6E,CAClH,CAAC;yBACH;wBAED,MAAM,KAAK,CAAC;qBACb;gBACH,CAAC;aAAA,CAAC;QACJ,CAAC;QACD,IAAI,EAAE;YACJ,YAAY,EAAE,4BAAmB;YACjC,UAAU,EAAE,iCAAwB;SACrC;KACF;IACD;QACE,OAAO,EAAE,4BAAmB;QAC5B,KAAK,EAAE,IAAI;QACX,UAAU,EAAE,CAAC,EAAE,YAAY,EAAgD,EAAE,EAAE;YAC7E,OAAO,GAAG,EAAE;gBACV,OAAO,IAAA,uBAAU,EAAC,YAAY,CAAC,CAAC;YAClC,CAAC,CAAC;QACJ,CAAC;QACD,IAAI,EAAE;YACJ,YAAY,EAAE,4BAAmB;SAClC;KACF;CACO,CAAC"}
+{"version":3,"file":"shared.js","sourceRoot":"","sources":["../../../../../src/api/start/providers/application/shared.ts"],"names":[],"mappings":";;;;AACA,0CAAyC;AAEzC,yCAAuE;AACvE,kDAK+B;AAC/B,uDAAoD;AAEpD,oEAI0C;AAC1C,2DAAwD;AACxD,2DAAwD;AACxD,qEAAkE;AAErD,QAAA,eAAe,GAAwB;IAClD,IAAA,eAAO,EAAC;QACN,OAAO,EAAE,6BAAoB;QAC7B,UAAU,EAAE,CAAC,EAAE,WAAW,EAAE,UAAU,EAAE,EAAE,EAAE;;YAC1C,OAAA,IAAA,mCAAmB,EAAC,WAAqC,kCACpD,UAAU,KACb,GAAG,EAAE,aAAa,EAClB,IAAI,EAAE,IAAA,+BAAc,EAAC,MAAA,UAAU,CAAC,IAAI,mCAAI,4BAAY,CAAC,EACrD,UAAU,EAAE,IAAA,+BAAc,EAAC,MAAA,UAAU,CAAC,UAAU,mCAAI,mCAAmB,CAAC,IACxE,CAAA;SAAA;QACJ,IAAI,EAAE;YACJ,WAAW,EAAE,2BAAkB;YAC/B,UAAU,EAAE,iCAAwB;SACrC;KACF,CAAC;IACF,IAAA,eAAO,EAAC;QACN,OAAO,EAAE,4BAAmB;QAC5B,UAAU,EAAE,2BAAY;KACzB,CAAC;IACF,IAAA,eAAO,EAAC;QACN,OAAO,EAAE,2BAAkB;QAC3B,KAAK,EAAE,IAAI;QACX,UAAU,EAAE,CAAC,EAAE,aAAa,EAAE,YAAY,EAAE,EAAE,EAAE;YAC9C,OAAO,SAAe,kBAAkB;;oBACtC,MAAM,EAAE,UAAU,EAAE,UAAU,EAAE,GAAG,aAAa,CAAC;oBAEjD,MAAM,IAAA,2BAAY,EAAC,YAAY,EAAE,UAAU,CAAC,OAAO,CAAC,WAAW,EAAE,SAAS,CAAC,EAAE,UAAU,CAAC,CAAC;gBAC3F,CAAC;aAAA,CAAC;QACJ,CAAC;QACD,IAAI,EAAE;YACJ,YAAY,EAAE,4BAAmB;YACjC,aAAa,EAAE,6BAAoB;SACpC;KACF,CAAC;IACF,IAAA,eAAO,EAAC;QACN,OAAO,EAAE,4BAAmB;QAC5B,KAAK,EAAE,IAAI;QACX,UAAU,EAAE,CAAC,EAAE,YAAY,EAAE,EAAE,EAAE;YAC/B,OAAO,GAAG,EAAE;gBACV,OAAO,IAAA,uBAAU,EAAC,YAAY,CAAC,CAAC;YAClC,CAAC,CAAC;QACJ,CAAC;QACD,IAAI,EAAE;YACJ,YAAY,EAAE,4BAAmB;SAClC;KACF,CAAC;CACM,CAAC"}

package/lib/api/start/providers/child-app/shared.js

@@ -2,54 +2,48 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.sharedProviders = void 0;
 const tslib_1 = require("tslib");
+const dippy_1 = require("@tinkoff/dippy");
 const tokens_1 = require("../../tokens");
 const tokens_2 = require("../../../../di/tokens");
-const configManager_1 = require("../../../../config/configManager");
 const workersPool_1 = require("../../../../library/webpack/utils/workersPool");
 const stopServer_1 = require("../../utils/stopServer");
 const createServer_1 = require("../../utils/createServer");
 const listenServer_1 = require("../../utils/listenServer");
+const configManager_1 = require("../../../../config/configManager");
+const detectPortSync_1 = require("../../../../utils/detectPortSync");
 exports.sharedProviders = [
-    {
+    (0, dippy_1.provide)({
         provide: tokens_2.CONFIG_MANAGER_TOKEN,
-        useFactory: ({ configEntry, parameters, }) => {
+        useFactory: ({ configEntry, parameters }) => {
             var _a;
-            return new configManager_1.ConfigManager(configEntry, Object.assign(Object.assign({}, parameters), { env: 'development', port: (_a = parameters.port) !== null && _a !== void 0 ? _a : 4040, buildType: 'client' }));
+            return (0, configManager_1.createConfigManager)(configEntry, Object.assign(Object.assign({}, parameters), { env: 'development', port: (0, detectPortSync_1.detectPortSync)((_a = parameters.port) !== null && _a !== void 0 ? _a : configManager_1.DEFAULT_STATIC_MODULE_PORT) }));
         },
         deps: {
             configEntry: tokens_2.CONFIG_ENTRY_TOKEN,
             parameters: tokens_2.COMMAND_PARAMETERS_TOKEN,
         },
-    },
-    {
+    }),
+    (0, dippy_1.provide)({
         provide: tokens_2.STATIC_SERVER_TOKEN,
         useFactory: createServer_1.createServer,
-    },
-    {
+    }),
+    (0, dippy_1.provide)({
         provide: tokens_1.INIT_HANDLER_TOKEN,
         multi: true,
-        useFactory: ({ staticServer, parameters, }) => {
+        useFactory: ({ staticServer, configManager }) => {
             return function staticServerListen() {
                 return tslib_1.__awaiter(this, void 0, void 0, function* () {
-                    const { host = 'localhost', port = 4040 } = parameters;
-                    try {
-                        yield (0, listenServer_1.listenServer)(staticServer, host, port);
-                    }
-                    catch (error) {
-                        if (error.code === 'EADDRINUSE') {
-                            throw new Error(`Address '${host}:${port}' in use, either release this port or use options --port --host`);
-                        }
-                        throw error;
-                    }
+                    const { host, port } = configManager;
+                    yield (0, listenServer_1.listenServer)(staticServer, host, port);
                 });
             };
         },
         deps: {
             staticServer: tokens_2.STATIC_SERVER_TOKEN,
-            parameters: tokens_2.COMMAND_PARAMETERS_TOKEN,
+            configManager: tokens_2.CONFIG_MANAGER_TOKEN,
         },
-    },
-    {
+    }),
+    (0, dippy_1.provide)({
         provide: tokens_1.CLOSE_HANDLER_TOKEN,
         multi: true,
         useFactory: ({ staticServer }) => {
@@ -60,8 +54,8 @@ exports.sharedProviders = [
         deps: {
             staticServer: tokens_2.STATIC_SERVER_TOKEN,
         },
-    },
-    {
+    }),
+    (0, dippy_1.provide)({
         provide: tokens_1.CLOSE_HANDLER_TOKEN,
         multi: true,
         useFactory: ({ configManager }) => {
@@ -72,6 +66,6 @@ exports.sharedProviders = [
         deps: {
             configManager: tokens_2.CONFIG_MANAGER_TOKEN,
         },
-    },
+    }),
 ];
 //# sourceMappingURL=shared.js.map

package/lib/api/start/providers/child-app/shared.js.map

@@ -1 +1 @@
-{"version":3,"file":"shared.js","sourceRoot":"","sources":["../../../../../src/api/start/providers/child-app/shared.ts"],"names":[],"mappings":";;;;AACA,yCAAuE;AACvE,kDAK+B;AAG/B,oEAAiE;AACjE,+EAA0F;AAC1F,uDAAoD;AACpD,2DAAwD;AACxD,2DAAwD;AAE3C,QAAA,eAAe,GAAwB;IAClD;QACE,OAAO,EAAE,6BAAoB;QAC7B,UAAU,EAAE,CAAC,EACX,WAAW,EACX,UAAU,GAIX,EAAE,EAAE;;YACH,OAAO,IAAI,6BAAa,CAAC,WAAW,kCAC/B,UAAU,KACb,GAAG,EAAE,aAAa,EAClB,IAAI,EAAE,MAAA,UAAU,CAAC,IAAI,mCAAI,IAAI,EAC7B,SAAS,EAAE,QAAQ,IACnB,CAAC;QACL,CAAC;QACD,IAAI,EAAE;YACJ,WAAW,EAAE,2BAAkB;YAC/B,UAAU,EAAE,iCAAwB;SACrC;KACF;IACD;QACE,OAAO,EAAE,4BAAmB;QAC5B,UAAU,EAAE,2BAAY;KACzB;IACD;QACE,OAAO,EAAE,2BAAkB;QAC3B,KAAK,EAAE,IAAI;QACX,UAAU,EAAE,CAAC,EACX,YAAY,EACZ,UAAU,GAIX,EAAE,EAAE;YACH,OAAO,SAAe,kBAAkB;;oBACtC,MAAM,EAAE,IAAI,GAAG,WAAW,EAAE,IAAI,GAAG,IAAI,EAAE,GAAG,UAAU,CAAC;oBAEvD,IAAI;wBACF,MAAM,IAAA,2BAAY,EAAC,YAAY,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;qBAC9C;oBAAC,OAAO,KAAK,EAAE;wBACd,IAAK,KAAa,CAAC,IAAI,KAAK,YAAY,EAAE;4BACxC,MAAM,IAAI,KAAK,CACb,YAAY,IAAI,IAAI,IAAI,iEAAiE,CAC1F,CAAC;yBACH;wBAED,MAAM,KAAK,CAAC;qBACb;gBACH,CAAC;aAAA,CAAC;QACJ,CAAC;QACD,IAAI,EAAE;YACJ,YAAY,EAAE,4BAAmB;YACjC,UAAU,EAAE,iCAAwB;SACrC;KACF;IACD;QACE,OAAO,EAAE,4BAAmB;QAC5B,KAAK,EAAE,IAAI;QACX,UAAU,EAAE,CAAC,EAAE,YAAY,EAAgD,EAAE,EAAE;YAC7E,OAAO,GAAG,EAAE;gBACV,OAAO,IAAA,uBAAU,EAAC,YAAY,CAAC,CAAC;YAClC,CAAC,CAAC;QACJ,CAAC;QACD,IAAI,EAAE;YACJ,YAAY,EAAE,4BAAmB;SAClC;KACF;IACD;QACE,OAAO,EAAE,4BAAmB;QAC5B,KAAK,EAAE,IAAI;QACX,UAAU,EAAE,CAAC,EAAE,aAAa,EAAkD,EAAE,EAAE;YAChF,OAAO,GAAS,EAAE;gBAChB,MAAM,IAAA,uCAAyB,EAAC,aAAa,CAAC,CAAC;YACjD,CAAC,CAAA,CAAC;QACJ,CAAC;QACD,IAAI,EAAE;YACJ,aAAa,EAAE,6BAAoB;SACpC;KACF;CACO,CAAC"}
+{"version":3,"file":"shared.js","sourceRoot":"","sources":["../../../../../src/api/start/providers/child-app/shared.ts"],"names":[],"mappings":";;;;AACA,0CAAyC;AACzC,yCAAuE;AACvE,kDAK+B;AAE/B,+EAA0F;AAC1F,uDAAoD;AACpD,2DAAwD;AACxD,2DAAwD;AACxD,oEAAmG;AACnG,qEAAkE;AAErD,QAAA,eAAe,GAAwB;IAClD,IAAA,eAAO,EAAC;QACN,OAAO,EAAE,6BAAoB;QAC7B,UAAU,EAAE,CAAC,EAAE,WAAW,EAAE,UAAU,EAAE,EAAE,EAAE;;YAC1C,OAAA,IAAA,mCAAmB,EAAC,WAAkC,kCACjD,UAAU,KACb,GAAG,EAAE,aAAa,EAClB,IAAI,EAAE,IAAA,+BAAc,EAAC,MAAA,UAAU,CAAC,IAAI,mCAAI,0CAA0B,CAAC,IACnE,CAAA;SAAA;QACJ,IAAI,EAAE;YACJ,WAAW,EAAE,2BAAkB;YAC/B,UAAU,EAAE,iCAAwB;SACrC;KACF,CAAC;IACF,IAAA,eAAO,EAAC;QACN,OAAO,EAAE,4BAAmB;QAC5B,UAAU,EAAE,2BAAY;KACzB,CAAC;IACF,IAAA,eAAO,EAAC;QACN,OAAO,EAAE,2BAAkB;QAC3B,KAAK,EAAE,IAAI;QACX,UAAU,EAAE,CAAC,EAAE,YAAY,EAAE,aAAa,EAAE,EAAE,EAAE;YAC9C,OAAO,SAAe,kBAAkB;;oBACtC,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,aAAa,CAAC;oBAErC,MAAM,IAAA,2BAAY,EAAC,YAAY,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;gBAC/C,CAAC;aAAA,CAAC;QACJ,CAAC;QACD,IAAI,EAAE;YACJ,YAAY,EAAE,4BAAmB;YACjC,aAAa,EAAE,6BAAoB;SACpC;KACF,CAAC;IACF,IAAA,eAAO,EAAC;QACN,OAAO,EAAE,4BAAmB;QAC5B,KAAK,EAAE,IAAI;QACX,UAAU,EAAE,CAAC,EAAE,YAAY,EAAE,EAAE,EAAE;YAC/B,OAAO,GAAG,EAAE;gBACV,OAAO,IAAA,uBAAU,EAAC,YAAY,CAAC,CAAC;YAClC,CAAC,CAAC;QACJ,CAAC;QACD,IAAI,EAAE;YACJ,YAAY,EAAE,4BAAmB;SAClC;KACF,CAAC;IACF,IAAA,eAAO,EAAC;QACN,OAAO,EAAE,4BAAmB;QAC5B,KAAK,EAAE,IAAI;QACX,UAAU,EAAE,CAAC,EAAE,aAAa,EAAE,EAAE,EAAE;YAChC,OAAO,GAAS,EAAE;gBAChB,MAAM,IAAA,uCAAyB,EAAC,aAAa,CAAC,CAAC;YACjD,CAAC,CAAA,CAAC;QACJ,CAAC;QACD,IAAI,EAAE;YACJ,aAAa,EAAE,6BAAoB;SACpC;KACF,CAAC;CACM,CAAC"}