@tramvai/cli 2.123.3 → 2.124.0

package/lib/api/build/application.js

@@ -7,7 +7,7 @@ const shared_1 = require("./providers/shared");
 const di_1 = require("../../utils/di");
 const buildApplication = (di) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
     const options = di.get(tokens_1.COMMAND_PARAMETERS_TOKEN);
-    const { buildType = 'all' } = options;
+    const { buildType = 'all', onlyModern } = options;
     const shouldBuildClient = buildType === 'client' || buildType === 'all';
     const shouldBuildServer = buildType === 'server' || buildType === 'all';
     (0, di_1.registerProviders)(di, shared_1.sharedProviders);
@@ -17,6 +17,7 @@ const buildApplication = (di) => tslib_1.__awaiter(void 0, void 0, void 0, funct
         options: {
             shouldBuildClient,
             shouldBuildServer,
+            onlyModern,
         },
     });
     const builderBuild = yield builder.build({

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

@@ -1 +1 @@
-{"version":3,"file":"application.js","sourceRoot":"","sources":["../../../src/api/build/application.ts"],"names":[],"mappings":";;;;AAEA,4CAIyB;AACzB,+CAAqD;AACrD,uCAAmD;AAE5C,MAAM,gBAAgB,GAAG,CAAO,EAAa,EAAU,EAAE;IAC9D,MAAM,OAAO,GAAG,EAAE,CAAC,GAAG,CAAC,iCAAkC,CAAC,CAAC;IAC3D,MAAM,EAAE,SAAS,GAAG,KAAK,EAAE,GAAG,OAAO,CAAC;IAEtC,MAAM,iBAAiB,GAAG,SAAS,KAAK,QAAQ,IAAI,SAAS,KAAK,KAAK,CAAC;IACxE,MAAM,iBAAiB,GAAG,SAAS,KAAK,QAAQ,IAAI,SAAS,KAAK,KAAK,CAAC;IAExE,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;YACjB,iBAAiB;SAClB;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;AA3BW,QAAA,gBAAgB,oBA2B3B"}
+{"version":3,"file":"application.js","sourceRoot":"","sources":["../../../src/api/build/application.ts"],"names":[],"mappings":";;;;AAEA,4CAIyB;AACzB,+CAAqD;AACrD,uCAAmD;AAE5C,MAAM,gBAAgB,GAAG,CAAO,EAAa,EAAU,EAAE;IAC9D,MAAM,OAAO,GAAG,EAAE,CAAC,GAAG,CAAC,iCAAkC,CAAC,CAAC;IAC3D,MAAM,EAAE,SAAS,GAAG,KAAK,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC;IAElD,MAAM,iBAAiB,GAAG,SAAS,KAAK,QAAQ,IAAI,SAAS,KAAK,KAAK,CAAC;IACxE,MAAM,iBAAiB,GAAG,SAAS,KAAK,QAAQ,IAAI,SAAS,KAAK,KAAK,CAAC;IAExE,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;YACjB,iBAAiB;YACjB,UAAU;SACX;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;AA5BW,QAAA,gBAAgB,oBA4B3B"}

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

@@ -4,6 +4,7 @@ import type { WithConfig } from '../shared/types/withConfig';
 import type { Builder } from '../../typings/build/Builder';
 export type Params = WithConfig<{
     buildType?: 'server' | 'client' | 'all' | 'none';
+    onlyModern?: boolean;
     debug?: boolean;
     profile?: boolean;
     modern?: boolean;

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/api/build/index.ts"],"names":[],"mappings":";;AAEA,gEAA6D;AAE7D,+CAAiD;AACjD,qCAAuC;AACvC,4CAAqD;AACrD,uCAAyC;AACzC,2CAA4C;AA6B5C,kBAAe,IAAA,6BAAa,EAAC;IAC3B,IAAI,EAAE,OAAO;IACb,OAAO,EAAE,CAAC,EAAE,EAAU,EAAE;QACtB,MAAM,WAAW,GAAG,EAAE,CAAC,GAAG,CAAC,2BAAkB,CAAC,CAAC;QAE/C,QAAQ,WAAW,CAAC,IAAI,EAAE;YACxB,KAAK,aAAa;gBAChB,OAAO,IAAA,8BAAgB,EAAC,EAAE,CAAC,CAAC;YAC9B,KAAK,QAAQ;gBACX,OAAO,IAAA,oBAAW,EAAC,EAAE,CAAC,CAAC;YACzB,KAAK,WAAW;gBACd,OAAO,IAAA,yBAAa,EAAC,EAAE,CAAC,CAAC;YAC3B,KAAK,SAAS;gBACZ,OAAO,IAAA,sBAAY,EAAC,EAAE,CAAC,CAAC;SAC3B;IACH,CAAC;CACF,CAAC,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/api/build/index.ts"],"names":[],"mappings":";;AAEA,gEAA6D;AAE7D,+CAAiD;AACjD,qCAAuC;AACvC,4CAAqD;AACrD,uCAAyC;AACzC,2CAA4C;AA8B5C,kBAAe,IAAA,6BAAa,EAAC;IAC3B,IAAI,EAAE,OAAO;IACb,OAAO,EAAE,CAAC,EAAE,EAAU,EAAE;QACtB,MAAM,WAAW,GAAG,EAAE,CAAC,GAAG,CAAC,2BAAkB,CAAC,CAAC;QAE/C,QAAQ,WAAW,CAAC,IAAI,EAAE;YACxB,KAAK,aAAa;gBAChB,OAAO,IAAA,8BAAgB,EAAC,EAAE,CAAC,CAAC;YAC9B,KAAK,QAAQ;gBACX,OAAO,IAAA,oBAAW,EAAC,EAAE,CAAC,CAAC;YACzB,KAAK,WAAW;gBACd,OAAO,IAAA,yBAAa,EAAC,EAAE,CAAC,CAAC;YAC3B,KAAK,SAAS;gBACZ,OAAO,IAAA,sBAAY,EAAC,EAAE,CAAC,CAAC;SAC3B;IACH,CAAC;CACF,CAAC,CAAC"}

package/lib/builder/webpack/index.js

@@ -15,6 +15,7 @@ const server_2 = require("./providers/start/server");
 const tokens_1 = require("./tokens");
 const resolveDone_1 = require("./utils/resolveDone");
 const di_1 = require("../../utils/di");
+const clientShared_1 = require("./providers/build/clientShared");
 const client_3 = require("./providers/build/client");
 const clientModern_1 = require("./providers/build/clientModern");
 const server_3 = require("./providers/build/server");
@@ -28,7 +29,7 @@ exports.webpackProviders = [
         useFactory: ({ di }) => {
             return {
                 name: BUILDER_NAME,
-                createBuilder({ options: { shouldBuildClient, shouldBuildServer } }) {
+                createBuilder({ options: { shouldBuildClient, shouldBuildServer, onlyModern } }) {
                     (0, di_1.registerProviders)(di, [
                         ...shared_1.sharedProviders,
                         ...(shouldBuildClient ? client_1.clientProviders : []),
@@ -68,7 +69,8 @@ exports.webpackProviders = [
                         build({ modern }) {
                             return tslib_1.__awaiter(this, void 0, void 0, function* () {
                                 (0, di_1.registerProviders)(di, [
-                                    ...(shouldBuildClient ? client_3.buildClientProviders : []),
+                                    ...(shouldBuildClient ? clientShared_1.buildClientSharedProviders : []),
+                                    ...(shouldBuildClient && !onlyModern ? client_3.buildClientProviders : []),
                                     ...(shouldBuildClient && modern ? clientModern_1.buildClientModernProviders : []),
                                     ...(shouldBuildServer ? server_3.buildServerProviders : []),
                                 ]);

package/lib/builder/webpack/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/builder/webpack/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/builder/webpack/index.ts"],"names":[],"mappings":";;;;AAAA,+BAAiC;AAEjC,0CAAmD;AACnD,qDAAgE;AAEhE,yDAAsD;AACtD,+CAAqD;AACrD,+CAAqD;AACrD,+CAAqD;AACrD,qDAAgE;AAChE,qDAAgE;AAChE,qDAAgE;AAChE,qCASkB;AAClB,qDAAkD;AAClD,uCAAmD;AACnD,iEAA4E;AAC5E,qDAAgE;AAChE,iEAA4E;AAC5E,qDAAgE;AAChE,4CAAuD;AACvD,iEAAuF;AACvF,uDAAoE;AAEpE,MAAM,YAAY,GAAG,SAAS,CAAC;AAElB,QAAA,gBAAgB,GAAe;IAC1C,IAAA,eAAO,EAAC;QACN,OAAO,EAAE,+BAAqB;QAC9B,UAAU,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE;YACrB,OAAO;gBACL,IAAI,EAAE,YAAY;gBAClB,aAAa,CAAC,EAAE,OAAO,EAAE,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,UAAU,EAAE,EAAE;oBAC7E,IAAA,sBAAiB,EAAC,EAAE,EAAE;wBACpB,GAAG,wBAAe;wBAClB,GAAG,CAAC,iBAAiB,CAAC,CAAC,CAAC,wBAAe,CAAC,CAAC,CAAC,EAAE,CAAC;wBAC7C,GAAG,CAAC,iBAAiB,CAAC,CAAC,CAAC,wBAAe,CAAC,CAAC,CAAC,EAAE,CAAC;qBAC9C,CAAC,CAAC;oBAEH,OAAO;wBACL,IAAI,EAAE,YAAY;wBACZ,KAAK,CAAC,EAAE,WAAW,EAAE;;gCACzB,IAAA,sBAAiB,EAAC,EAAE,EAAE;oCACpB,GAAG,6BAAoB;oCACvB,GAAG,CAAC,iBAAiB,CAAC,CAAC,CAAC,6BAAoB,CAAC,CAAC,CAAC,EAAE,CAAC;oCAClD,GAAG,CAAC,iBAAiB,CAAC,CAAC,CAAC,6BAAoB,CAAC,CAAC,CAAC,EAAE,CAAC;iCACnD,CAAC,CAAC;gCAEH,MAAM,IAAA,yBAAW,EAAC,EAAE,CAAC,GAAG,CAAC,EAAE,KAAK,EAAE,2BAAkB,EAAE,QAAQ,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;gCAEtF,MAAM,aAAa,GAAG,EAAE,CAAC,GAAG,CAAC,8BAAqB,CAAC,CAAC;gCAEpD,MAAM,IAAA,yBAAW,EACf,EAAE,CAAC,GAAG,CAAC,EAAE,KAAK,EAAE,8BAAqB,EAAE,QAAQ,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CACtE,CAAC;gCAEF,MAAM,QAAQ,GAAG,EAAE,CAAC,GAAG,CAAC,+BAAsB,CAAC,CAAC;gCAChD,MAAM,QAAQ,GAAG,EAAE,CAAC,GAAG,CAAC,+BAAsB,CAAC,CAAC;gCAEhD,IAAI;oCACF,MAAM,IAAA,yBAAW,EAAC,QAAQ,CAAC,CAAC;iCAC7B;gCAAC,OAAO,KAAK,EAAE;oCACd,IAAI,WAAW,EAAE;wCACf,MAAM,KAAK,CAAC;qCACb;iCACF;gCAED,OAAO;oCACL,KAAK,EAAE,GAAS,EAAE;wCAChB,MAAM,IAAA,yBAAW,EACf,EAAE,CAAC,GAAG,CAAC,EAAE,KAAK,EAAE,4BAAmB,EAAE,QAAQ,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CACpE,CAAC;oCACJ,CAAC,CAAA;oCACD,UAAU,EAAE,IAAA,gBAAS,EAAC,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;oCACzD,aAAa;iCACd,CAAC;4BACJ,CAAC;yBAAA;wBACK,KAAK,CAAC,EAAE,MAAM,EAAE;;gCACpB,IAAA,sBAAiB,EAAC,EAAE,EAAE;oCACpB,GAAG,CAAC,iBAAiB,CAAC,CAAC,CAAC,yCAA0B,CAAC,CAAC,CAAC,EAAE,CAAC;oCACxD,GAAG,CAAC,iBAAiB,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,6BAAoB,CAAC,CAAC,CAAC,EAAE,CAAC;oCACjE,GAAG,CAAC,iBAAiB,IAAI,MAAM,CAAC,CAAC,CAAC,yCAA0B,CAAC,CAAC,CAAC,EAAE,CAAC;oCAClE,GAAG,CAAC,iBAAiB,CAAC,CAAC,CAAC,6BAAoB,CAAC,CAAC,CAAC,EAAE,CAAC;iCACnD,CAAC,CAAC;gCAEH,MAAM,IAAA,yBAAW,EAAC,EAAE,CAAC,GAAG,CAAC,EAAE,KAAK,EAAE,2BAAkB,EAAE,QAAQ,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;gCAEtF,MAAM,aAAa,GAAG,EAAE,CAAC,GAAG,CAAC,6BAAoB,CAAC,CAAC;gCAEnD,IAAI,aAAa,CAAC,IAAI,KAAK,aAAa,EAAE;oCACxC,IAAA,sBAAiB,EAAC,EAAE,EAAE;wCACpB,GAAG,CAAC,iBAAiB,CAAC,CAAC,CAAC,wCAA+B,CAAC,CAAC,CAAC,EAAE,CAAC;qCAC9D,CAAC,CAAC;iCACJ;gCAED,MAAM,aAAa,GAAG,EAAE,CAAC,GAAG,CAAC,8BAAqB,CAAC,CAAC;gCAEpD,MAAM,IAAA,yBAAW,EACf,EAAE,CAAC,GAAG,CAAC,EAAE,KAAK,EAAE,8BAAqB,EAAE,QAAQ,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CACtE,CAAC;gCAEF,MAAM,IAAA,yBAAW,EACf,EAAE,CAAC,GAAG,CAAC,EAAE,KAAK,EAAE,4BAAmB,EAAE,QAAQ,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CACpE,CAAC;gCAEF,OAAO;oCACL,aAAa;iCACd,CAAC;4BACJ,CAAC;yBAAA;wBACK,OAAO,CAAC,EAAE,MAAM,EAAE;;gCACtB,EAAE,CAAC,QAAQ,CAAC;oCACV,OAAO,EAAE,0CAAiC;oCAC1C,QAAQ,EAAE,MAAM,IAAI,QAAQ;iCAC7B,CAAC,CAAC;gCAEH,IAAA,sBAAiB,EAAC,EAAE,EAAE,+BAAsB,CAAC,CAAC;gCAE9C,MAAM,IAAA,yBAAW,EAAC,EAAE,CAAC,GAAG,CAAC,EAAE,KAAK,EAAE,2BAAkB,EAAE,QAAQ,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;gCAEtF,MAAM,IAAA,yBAAW,EACf,EAAE,CAAC,GAAG,CAAC,EAAE,KAAK,EAAE,8BAAqB,EAAE,QAAQ,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CACtE,CAAC;gCAEF,MAAM,IAAA,yBAAW,EACf,EAAE,CAAC,GAAG,CAAC,EAAE,KAAK,EAAE,4BAAmB,EAAE,QAAQ,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CACpE,CAAC;4BACJ,CAAC;yBAAA;wBACD,EAAE,CAAC,KAAK,EAAE,QAAQ;4BAChB,EAAE,CAAC,GAAG,CAAC,4BAAmB,CAAC,CAAC,EAAE,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;wBAClD,CAAC;qBACF,CAAC;gBACJ,CAAC;aACqC,CAAC;QAC3C,CAAC;QACD,IAAI,EAAE;YACJ,EAAE,EAAE,gBAAQ;SACb;KACF,CAAC;CACH,CAAC"}

package/lib/builder/webpack/providers/build/client.js

@@ -3,11 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.buildClientProviders = void 0;
 const tslib_1 = require("tslib");
 const dippy_1 = require("@tinkoff/dippy");
-const rimraf_1 = tslib_1.__importDefault(require("rimraf"));
 const webpack_1 = tslib_1.__importDefault(require("webpack"));
 const tokens_1 = require("../../../../di/tokens");
 const toWebpackConfig_1 = require("../../../../library/webpack/utils/toWebpackConfig");
-const npmRequire_1 = require("../../../../utils/npmRequire");
 const tokens_2 = require("../../tokens");
 const closeWebpack_1 = require("../../utils/closeWebpack");
 const runWebpack_1 = require("../../utils/runWebpack");
@@ -33,42 +31,6 @@ exports.buildClientProviders = [
             webpackConfig: tokens_2.WEBPACK_CLIENT_CONFIG_TOKEN,
         },
     }),
-    (0, dippy_1.provide)({
-        provide: tokens_2.INIT_HANDLER_TOKEN,
-        multi: true,
-        useFactory: ({ configManager }) => {
-            return function clearBuildDir() {
-                return rimraf_1.default.sync(`${configManager.buildPath}/**`, {});
-            };
-        },
-        deps: {
-            configManager: tokens_2.CLIENT_CONFIG_MANAGER_TOKEN,
-        },
-    }),
-    (0, dippy_1.provide)({
-        provide: tokens_2.INIT_HANDLER_TOKEN,
-        multi: true,
-        useFactory: ({ configManager, rootDir, packageManager }) => {
-            return function prepareImageOptimization() {
-                var _a;
-                return tslib_1.__awaiter(this, void 0, void 0, function* () {
-                    if ((_a = configManager.imageOptimization) === null || _a === void 0 ? void 0 : _a.enabled) {
-                        yield (0, npmRequire_1.npmRequire)({
-                            cliRootDir: rootDir,
-                            packageManager,
-                            packageName: 'image-webpack-loader',
-                            description: 'Устанавливаем зависимости для опции imageOptimization',
-                        });
-                    }
-                });
-            };
-        },
-        deps: {
-            configManager: tokens_2.CLIENT_CONFIG_MANAGER_TOKEN,
-            rootDir: tokens_1.CLI_ROOT_DIR_TOKEN,
-            packageManager: tokens_1.CLI_PACKAGE_MANAGER,
-        },
-    }),
     (0, dippy_1.provide)({
         provide: tokens_2.PROCESS_HANDLER_TOKEN,
         multi: true,

package/lib/builder/webpack/providers/build/client.js.map

@@ -1 +1 @@
-{"version":3,"file":"client.js","sourceRoot":"","sources":["../../../../../src/builder/webpack/providers/build/client.ts"],"names":[],"mappings":";;;;AACA,0CAAyC;AACzC,4DAA4B;AAC5B,8DAA8B;AAC9B,kDAI+B;AAC/B,uFAAoF;AACpF,6DAA0D;AAC1D,yCAOsB;AACtB,2DAAwD;AACxD,uDAAoD;AAEvC,QAAA,oBAAoB,GAAe;IAC9C,IAAA,eAAO,EAAC;QACN,OAAO,EAAE,oCAA2B;QACpC,UAAU,EAAE,CAAC,EAAE,aAAa,EAAE,EAAE,EAAE;YAChC,OAAO,aAAa,CAAC,YAAY,CAAC;gBAChC,SAAS,EAAE,QAAQ;gBACnB,MAAM,EAAE,KAAK;aACd,CAAC,CAAC;QACL,CAAC;QACD,IAAI,EAAE;YACJ,aAAa,EAAE,6BAAoB;SACpC;KACF,CAAC;IACF,IAAA,eAAO,EAAC;QACN,OAAO,EAAE,sCAA6B;QACtC,UAAU,EAAE,CAAC,EAAE,aAAa,EAAE,EAAE,EAAE;YAChC,OAAO,IAAA,iBAAO,EAAC,IAAA,iCAAe,EAAC,aAAa,CAAC,CAAC,CAAC;QACjD,CAAC;QACD,IAAI,EAAE;YACJ,aAAa,EAAE,oCAA2B;SAC3C;KACF,CAAC;IACF,IAAA,eAAO,EAAC;QACN,OAAO,EAAE,2BAAkB;QAC3B,KAAK,EAAE,IAAI;QACX,UAAU,EAAE,CAAC,EAAE,aAAa,EAAE,EAAE,EAAE;YAChC,OAAO,SAAS,aAAa;gBAC3B,OAAO,gBAAM,CAAC,IAAI,CAAC,GAAG,aAAa,CAAC,SAAS,KAAK,EAAE,EAAE,CAAC,CAAC;YAC1D,CAAC,CAAC;QACJ,CAAC;QACD,IAAI,EAAE;YACJ,aAAa,EAAE,oCAA2B;SAC3C;KACF,CAAC;IACF,IAAA,eAAO,EAAC;QACN,OAAO,EAAE,2BAAkB;QAC3B,KAAK,EAAE,IAAI;QACX,UAAU,EAAE,CAAC,EAAE,aAAa,EAAE,OAAO,EAAE,cAAc,EAAE,EAAE,EAAE;YACzD,OAAO,SAAe,wBAAwB;;;oBAC5C,IAAI,MAAA,aAAa,CAAC,iBAAiB,0CAAE,OAAO,EAAE;wBAC5C,MAAM,IAAA,uBAAU,EAAC;4BACf,UAAU,EAAE,OAAO;4BACnB,cAAc;4BACd,WAAW,EAAE,sBAAsB;4BACnC,WAAW,EAAE,uDAAuD;yBACrE,CAAC,CAAC;qBACJ;;aACF,CAAC;QACJ,CAAC;QACD,IAAI,EAAE;YACJ,aAAa,EAAE,oCAA2B;YAC1C,OAAO,EAAE,2BAAkB;YAC3B,cAAc,EAAE,4BAAmB;SACpC;KACF,CAAC;IACF,IAAA,eAAO,EAAC;QACN,OAAO,EAAE,8BAAqB;QAC9B,KAAK,EAAE,IAAI;QACX,UAAU,EAAE,CAAC,EAAE,eAAe,EAAE,EAAE,EAAE;YAClC,OAAO,SAAS,YAAY;gBAC1B,OAAO,IAAA,uBAAU,EAAC,eAAe,CAAC,CAAC;YACrC,CAAC,CAAC;QACJ,CAAC;QACD,IAAI,EAAE;YACJ,eAAe,EAAE,sCAA6B;SAC/C;KACF,CAAC;IACF,IAAA,eAAO,EAAC;QACN,OAAO,EAAE,4BAAmB;QAC5B,KAAK,EAAE,IAAI;QACX,UAAU,EAAE,CAAC,EAAE,eAAe,EAAE,EAAE,EAAE;YAClC,OAAO,SAAS,YAAY;gBAC1B,OAAO,IAAA,2BAAY,EAAC,eAAe,CAAC,CAAC;YACvC,CAAC,CAAC;QACJ,CAAC;QACD,IAAI,EAAE;YACJ,eAAe,EAAE,sCAA6B;SAC/C;KACF,CAAC;CACH,CAAC"}
+{"version":3,"file":"client.js","sourceRoot":"","sources":["../../../../../src/builder/webpack/providers/build/client.ts"],"names":[],"mappings":";;;;AACA,0CAAyC;AACzC,8DAA8B;AAC9B,kDAA6D;AAC7D,uFAAoF;AACpF,yCAMsB;AACtB,2DAAwD;AACxD,uDAAoD;AAEvC,QAAA,oBAAoB,GAAe;IAC9C,IAAA,eAAO,EAAC;QACN,OAAO,EAAE,oCAA2B;QACpC,UAAU,EAAE,CAAC,EAAE,aAAa,EAAE,EAAE,EAAE;YAChC,OAAO,aAAa,CAAC,YAAY,CAAC;gBAChC,SAAS,EAAE,QAAQ;gBACnB,MAAM,EAAE,KAAK;aACd,CAAC,CAAC;QACL,CAAC;QACD,IAAI,EAAE;YACJ,aAAa,EAAE,6BAAoB;SACpC;KACF,CAAC;IACF,IAAA,eAAO,EAAC;QACN,OAAO,EAAE,sCAA6B;QACtC,UAAU,EAAE,CAAC,EAAE,aAAa,EAAE,EAAE,EAAE;YAChC,OAAO,IAAA,iBAAO,EAAC,IAAA,iCAAe,EAAC,aAAa,CAAC,CAAC,CAAC;QACjD,CAAC;QACD,IAAI,EAAE;YACJ,aAAa,EAAE,oCAA2B;SAC3C;KACF,CAAC;IACF,IAAA,eAAO,EAAC;QACN,OAAO,EAAE,8BAAqB;QAC9B,KAAK,EAAE,IAAI;QACX,UAAU,EAAE,CAAC,EAAE,eAAe,EAAE,EAAE,EAAE;YAClC,OAAO,SAAS,YAAY;gBAC1B,OAAO,IAAA,uBAAU,EAAC,eAAe,CAAC,CAAC;YACrC,CAAC,CAAC;QACJ,CAAC;QACD,IAAI,EAAE;YACJ,eAAe,EAAE,sCAA6B;SAC/C;KACF,CAAC;IACF,IAAA,eAAO,EAAC;QACN,OAAO,EAAE,4BAAmB;QAC5B,KAAK,EAAE,IAAI;QACX,UAAU,EAAE,CAAC,EAAE,eAAe,EAAE,EAAE,EAAE;YAClC,OAAO,SAAS,YAAY;gBAC1B,OAAO,IAAA,2BAAY,EAAC,eAAe,CAAC,CAAC;YACvC,CAAC,CAAC;QACJ,CAAC;QACD,IAAI,EAAE;YACJ,eAAe,EAAE,sCAA6B;SAC/C;KACF,CAAC;CACH,CAAC"}

package/lib/builder/webpack/providers/build/clientShared.d.ts

@@ -0,0 +1,2 @@
+import type { Provider } from '@tinkoff/dippy';
+export declare const buildClientSharedProviders: Provider[];

package/lib/builder/webpack/providers/build/clientShared.js

@@ -0,0 +1,51 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.buildClientSharedProviders = void 0;
+const tslib_1 = require("tslib");
+const dippy_1 = require("@tinkoff/dippy");
+const dippy_2 = require("@tinkoff/dippy");
+const rimraf_1 = tslib_1.__importDefault(require("rimraf"));
+const tokens_1 = require("../../../../di/tokens");
+const npmRequire_1 = require("../../../../utils/npmRequire");
+const tokens_2 = require("../../tokens");
+exports.buildClientSharedProviders = [
+    (0, dippy_2.provide)({
+        provide: tokens_2.INIT_HANDLER_TOKEN,
+        multi: true,
+        useFactory: ({ configManager, modernConfigManager }) => {
+            return function clearBuildDir() {
+                return rimraf_1.default.sync(`${(configManager || modernConfigManager).buildPath}/**`, {});
+            };
+        },
+        deps: {
+            configManager: (0, dippy_1.optional)(tokens_2.CLIENT_CONFIG_MANAGER_TOKEN),
+            modernConfigManager: (0, dippy_1.optional)(tokens_2.CLIENT_MODERN_CONFIG_MANAGER_TOKEN),
+        },
+    }),
+    (0, dippy_2.provide)({
+        provide: tokens_2.INIT_HANDLER_TOKEN,
+        multi: true,
+        useFactory: ({ configManager, modernConfigManager, rootDir, packageManager }) => {
+            return function prepareImageOptimization() {
+                var _a;
+                return tslib_1.__awaiter(this, void 0, void 0, function* () {
+                    if ((_a = (configManager || modernConfigManager).imageOptimization) === null || _a === void 0 ? void 0 : _a.enabled) {
+                        yield (0, npmRequire_1.npmRequire)({
+                            cliRootDir: rootDir,
+                            packageManager,
+                            packageName: 'image-webpack-loader',
+                            description: 'Устанавливаем зависимости для опции imageOptimization',
+                        });
+                    }
+                });
+            };
+        },
+        deps: {
+            configManager: (0, dippy_1.optional)(tokens_2.CLIENT_CONFIG_MANAGER_TOKEN),
+            modernConfigManager: (0, dippy_1.optional)(tokens_2.CLIENT_MODERN_CONFIG_MANAGER_TOKEN),
+            rootDir: tokens_1.CLI_ROOT_DIR_TOKEN,
+            packageManager: tokens_1.CLI_PACKAGE_MANAGER,
+        },
+    }),
+];
+//# sourceMappingURL=clientShared.js.map

package/lib/builder/webpack/providers/build/clientShared.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"clientShared.js","sourceRoot":"","sources":["../../../../../src/builder/webpack/providers/build/clientShared.ts"],"names":[],"mappings":";;;;AACA,0CAA0C;AAC1C,0CAAyC;AACzC,4DAA4B;AAC5B,kDAAgF;AAChF,6DAA0D;AAC1D,yCAIsB;AAET,QAAA,0BAA0B,GAAe;IACpD,IAAA,eAAO,EAAC;QACN,OAAO,EAAE,2BAAkB;QAC3B,KAAK,EAAE,IAAI;QACX,UAAU,EAAE,CAAC,EAAE,aAAa,EAAE,mBAAmB,EAAE,EAAE,EAAE;YACrD,OAAO,SAAS,aAAa;gBAC3B,OAAO,gBAAM,CAAC,IAAI,CAAC,GAAG,CAAC,aAAa,IAAI,mBAAmB,CAAC,CAAC,SAAS,KAAK,EAAE,EAAE,CAAC,CAAC;YACnF,CAAC,CAAC;QACJ,CAAC;QACD,IAAI,EAAE;YACJ,aAAa,EAAE,IAAA,gBAAQ,EAAC,oCAA2B,CAAC;YACpD,mBAAmB,EAAE,IAAA,gBAAQ,EAAC,2CAAkC,CAAC;SAClE;KACF,CAAC;IACF,IAAA,eAAO,EAAC;QACN,OAAO,EAAE,2BAAkB;QAC3B,KAAK,EAAE,IAAI;QACX,UAAU,EAAE,CAAC,EAAE,aAAa,EAAE,mBAAmB,EAAE,OAAO,EAAE,cAAc,EAAE,EAAE,EAAE;YAC9E,OAAO,SAAe,wBAAwB;;;oBAC5C,IAAI,MAAA,CAAC,aAAa,IAAI,mBAAmB,CAAC,CAAC,iBAAiB,0CAAE,OAAO,EAAE;wBACrE,MAAM,IAAA,uBAAU,EAAC;4BACf,UAAU,EAAE,OAAO;4BACnB,cAAc;4BACd,WAAW,EAAE,sBAAsB;4BACnC,WAAW,EAAE,uDAAuD;yBACrE,CAAC,CAAC;qBACJ;;aACF,CAAC;QACJ,CAAC;QACD,IAAI,EAAE;YACJ,aAAa,EAAE,IAAA,gBAAQ,EAAC,oCAA2B,CAAC;YACpD,mBAAmB,EAAE,IAAA,gBAAQ,EAAC,2CAAkC,CAAC;YACjE,OAAO,EAAE,2BAAkB;YAC3B,cAAc,EAAE,4BAAmB;SACpC;KACF,CAAC;CACH,CAAC"}

package/lib/commands/build/command.js

@@ -51,6 +51,17 @@ class BuildCommand extends command_1.CLICommand {
                 transformer: (value) => value !== 'false',
                 description: 'Enable/disable persistent file cache for used cli builder',
             },
+            {
+                name: '--modern',
+                value: '[modern]',
+                description: 'modern compilation code with es2015+',
+            },
+            {
+                name: '--onlyModern',
+                value: '[onlyModern]',
+                transformer: (value) => value !== 'false',
+                description: 'Emit only modern build from client compilation',
+            },
         ];
         this.alias = 'b';
         this.validators = [

package/lib/commands/build/command.js.map

@@ -1 +1 @@
-{"version":3,"file":"command.js","sourceRoot":"","sources":["../../../src/commands/build/command.ts"],"names":[],"mappings":";;AAAA,kDAAkD;AAClD,qEAAwE;AACxE,mFAAgF;AAChF,mFAAgF;AAChF,2GAAwG;AAExG,yFAAsF;AAMtF,MAAM,YAAa,SAAQ,oBAAkB;IAA7C;;QACE,SAAI,GAAG,OAAO,CAAC;QAEf,gBAAW,GAAG,uEAAuE,CAAC;QAEtF,YAAO,GAAG,gBAAgB,CAAC;QAE3B,YAAO,GAAG;YACR;gBACE,IAAI,EAAE,iBAAiB;gBACvB,KAAK,EAAE,QAAQ;gBACf,WAAW,EAAE,gCAAgC;gBAC7C,YAAY,EAAE,KAAK;aACpB;YACD;gBACE,IAAI,EAAE,yBAAyB;gBAC/B,KAAK,EAAE,mBAAmB;gBAC1B,WAAW,EAAE,CAAC,KAAa,EAAE,EAAE,CAAC,KAAK,KAAK,OAAO;gBACjD,WAAW,EACT,+GAA+G;aAClH;YACD;gBACE,IAAI,EAAE,2BAA2B;gBACjC,KAAK,EAAE,2BAA2B;gBAClC,WAAW,EAAE,0EAA0E;aACxF;YACD;gBACE,IAAI,EAAE,cAAc;gBACpB,KAAK,EAAE,cAAc;gBACrB,WAAW,EAAE,yCAAyC;aACvD;YACD;gBACE,IAAI,EAAE,aAAa;gBACnB,KAAK,EAAE,aAAa;gBACpB,WAAW,EAAE,uCAAuC;aACrD;YACD;gBACE,IAAI,EAAE,cAAc;gBACpB,KAAK,EAAE,cAAc;gBACrB,WAAW,EAAE,wDAAwD;aACtE;YACD;gBACE,IAAI,EAAE,aAAa;gBACnB,KAAK,EAAE,aAAa;gBACpB,WAAW,EAAE,CAAC,KAAa,EAAE,EAAE,CAAC,KAAK,KAAK,OAAO;gBACjD,WAAW,EAAE,2DAA2D;aACzE;SACF,CAAC;QAEF,UAAK,GAAG,GAAG,CAAC;QAEZ,eAAU,GAAG;YACX,qCAAiB;YACjB,6BAAgB;YAChB,6DAA6B;YAC7B,qCAAiB;YACjB,2CAAoB;SACrB,CAAC;IAMJ,CAAC;IAJC,MAAM,CAAC,UAAkB;QACvB,uCAAuC;QACvC,OAAO,OAAO,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;IAC9D,CAAC;CACF;AAED,kBAAe,YAAY,CAAC"}
+{"version":3,"file":"command.js","sourceRoot":"","sources":["../../../src/commands/build/command.ts"],"names":[],"mappings":";;AAAA,kDAAkD;AAClD,qEAAwE;AACxE,mFAAgF;AAChF,mFAAgF;AAChF,2GAAwG;AAExG,yFAAsF;AAMtF,MAAM,YAAa,SAAQ,oBAAkB;IAA7C;;QACE,SAAI,GAAG,OAAO,CAAC;QAEf,gBAAW,GAAG,uEAAuE,CAAC;QAEtF,YAAO,GAAG,gBAAgB,CAAC;QAE3B,YAAO,GAAG;YACR;gBACE,IAAI,EAAE,iBAAiB;gBACvB,KAAK,EAAE,QAAQ;gBACf,WAAW,EAAE,gCAAgC;gBAC7C,YAAY,EAAE,KAAK;aACpB;YACD;gBACE,IAAI,EAAE,yBAAyB;gBAC/B,KAAK,EAAE,mBAAmB;gBAC1B,WAAW,EAAE,CAAC,KAAa,EAAE,EAAE,CAAC,KAAK,KAAK,OAAO;gBACjD,WAAW,EACT,+GAA+G;aAClH;YACD;gBACE,IAAI,EAAE,2BAA2B;gBACjC,KAAK,EAAE,2BAA2B;gBAClC,WAAW,EAAE,0EAA0E;aACxF;YACD;gBACE,IAAI,EAAE,cAAc;gBACpB,KAAK,EAAE,cAAc;gBACrB,WAAW,EAAE,yCAAyC;aACvD;YACD;gBACE,IAAI,EAAE,aAAa;gBACnB,KAAK,EAAE,aAAa;gBACpB,WAAW,EAAE,uCAAuC;aACrD;YACD;gBACE,IAAI,EAAE,cAAc;gBACpB,KAAK,EAAE,cAAc;gBACrB,WAAW,EAAE,wDAAwD;aACtE;YACD;gBACE,IAAI,EAAE,aAAa;gBACnB,KAAK,EAAE,aAAa;gBACpB,WAAW,EAAE,CAAC,KAAa,EAAE,EAAE,CAAC,KAAK,KAAK,OAAO;gBACjD,WAAW,EAAE,2DAA2D;aACzE;YACD;gBACE,IAAI,EAAE,UAAU;gBAChB,KAAK,EAAE,UAAU;gBACjB,WAAW,EAAE,sCAAsC;aACpD;YACD;gBACE,IAAI,EAAE,cAAc;gBACpB,KAAK,EAAE,cAAc;gBACrB,WAAW,EAAE,CAAC,KAAa,EAAE,EAAE,CAAC,KAAK,KAAK,OAAO;gBACjD,WAAW,EAAE,gDAAgD;aAC9D;SACF,CAAC;QAEF,UAAK,GAAG,GAAG,CAAC;QAEZ,eAAU,GAAG;YACX,qCAAiB;YACjB,6BAAgB;YAChB,6DAA6B;YAC7B,qCAAiB;YACjB,2CAAoB;SACrB,CAAC;IAMJ,CAAC;IAJC,MAAM,CAAC,UAAkB;QACvB,uCAAuC;QACvC,OAAO,OAAO,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;IAC9D,CAAC;CACF;AAED,kBAAe,YAAY,CAAC"}

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

@@ -3,6 +3,7 @@ export interface BuilderCustomOptions {
 }
 export interface BuilderOptions {
     shouldBuildClient: boolean;
+    onlyModern?: boolean;
     shouldBuildServer: boolean;
 }
 export interface BuilderFactoryOptions<Name extends string> {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tramvai/cli",
-  "version": "2.123.3",
+  "version": "2.124.0",
   "description": "Cli инструмент для сборки и запуска приложений",
   "files": [
     "src",
@@ -71,7 +71,7 @@
     "@tinkoff/utils": "^2.1.3",
     "@tinkoff/webpack-dedupe-plugin": "1.0.5",
     "@tramvai/build": "3.1.3",
-    "@tramvai/react": "2.123.3",
+    "@tramvai/react": "2.124.0",
     "@tramvai/tools-check-versions": "0.4.15",
     "@tramvai/tools-migrate": "0.6.19",
     "ajv": "^6.12.6",

package/src/api/build/application.ts

@@ -10,7 +10,7 @@ import { registerProviders } from '../../utils/di';
 
 export const buildApplication = async (di: Container): Result => {
   const options = di.get(COMMAND_PARAMETERS_TOKEN as Params);
-  const { buildType = 'all' } = options;
+  const { buildType = 'all', onlyModern } = options;
 
   const shouldBuildClient = buildType === 'client' || buildType === 'all';
   const shouldBuildServer = buildType === 'server' || buildType === 'all';
@@ -24,6 +24,7 @@ export const buildApplication = async (di: Container): Result => {
     options: {
       shouldBuildClient,
       shouldBuildServer,
+      onlyModern,
     },
   });
 

package/src/api/build/index.ts

@@ -11,6 +11,7 @@ import type { Builder } from '../../typings/build/Builder';
 
 export type Params = WithConfig<{
   buildType?: 'server' | 'client' | 'all' | 'none';
+  onlyModern?: boolean;
   debug?: boolean;
   profile?: boolean;
   modern?: boolean;

package/src/builder/webpack/index.ts

@@ -22,6 +22,7 @@ import {
 } from './tokens';
 import { resolveDone } from './utils/resolveDone';
 import { registerProviders } from '../../utils/di';
+import { buildClientSharedProviders } from './providers/build/clientShared';
 import { buildClientProviders } from './providers/build/client';
 import { buildClientModernProviders } from './providers/build/clientModern';
 import { buildServerProviders } from './providers/build/server';
@@ -37,7 +38,7 @@ export const webpackProviders: Provider[] = [
     useFactory: ({ di }) => {
       return {
         name: BUILDER_NAME,
-        createBuilder({ options: { shouldBuildClient, shouldBuildServer } }) {
+        createBuilder({ options: { shouldBuildClient, shouldBuildServer, onlyModern } }) {
           registerProviders(di, [
             ...sharedProviders,
             ...(shouldBuildClient ? clientProviders : []),
@@ -84,7 +85,8 @@ export const webpackProviders: Provider[] = [
             },
             async build({ modern }) {
               registerProviders(di, [
-                ...(shouldBuildClient ? buildClientProviders : []),
+                ...(shouldBuildClient ? buildClientSharedProviders : []),
+                ...(shouldBuildClient && !onlyModern ? buildClientProviders : []),
                 ...(shouldBuildClient && modern ? buildClientModernProviders : []),
                 ...(shouldBuildServer ? buildServerProviders : []),
               ]);

package/src/builder/webpack/providers/build/client.ts

@@ -1,18 +1,11 @@
 import type { Provider } from '@tinkoff/dippy';
 import { provide } from '@tinkoff/dippy';
-import rimraf from 'rimraf';
 import webpack from 'webpack';
-import {
-  CLI_PACKAGE_MANAGER,
-  CLI_ROOT_DIR_TOKEN,
-  CONFIG_MANAGER_TOKEN,
-} from '../../../../di/tokens';
+import { CONFIG_MANAGER_TOKEN } from '../../../../di/tokens';
 import { toWebpackConfig } from '../../../../library/webpack/utils/toWebpackConfig';
-import { npmRequire } from '../../../../utils/npmRequire';
 import {
   CLIENT_CONFIG_MANAGER_TOKEN,
   CLOSE_HANDLER_TOKEN,
-  INIT_HANDLER_TOKEN,
   PROCESS_HANDLER_TOKEN,
   WEBPACK_CLIENT_COMPILER_TOKEN,
   WEBPACK_CLIENT_CONFIG_TOKEN,
@@ -42,39 +35,6 @@ export const buildClientProviders: Provider[] = [
       webpackConfig: WEBPACK_CLIENT_CONFIG_TOKEN,
     },
   }),
-  provide({
-    provide: INIT_HANDLER_TOKEN,
-    multi: true,
-    useFactory: ({ configManager }) => {
-      return function clearBuildDir() {
-        return rimraf.sync(`${configManager.buildPath}/**`, {});
-      };
-    },
-    deps: {
-      configManager: CLIENT_CONFIG_MANAGER_TOKEN,
-    },
-  }),
-  provide({
-    provide: INIT_HANDLER_TOKEN,
-    multi: true,
-    useFactory: ({ configManager, rootDir, packageManager }) => {
-      return async function prepareImageOptimization() {
-        if (configManager.imageOptimization?.enabled) {
-          await npmRequire({
-            cliRootDir: rootDir,
-            packageManager,
-            packageName: 'image-webpack-loader',
-            description: 'Устанавливаем зависимости для опции imageOptimization',
-          });
-        }
-      };
-    },
-    deps: {
-      configManager: CLIENT_CONFIG_MANAGER_TOKEN,
-      rootDir: CLI_ROOT_DIR_TOKEN,
-      packageManager: CLI_PACKAGE_MANAGER,
-    },
-  }),
   provide({
     provide: PROCESS_HANDLER_TOKEN,
     multi: true,

package/src/builder/webpack/providers/build/clientShared.ts

@@ -0,0 +1,49 @@
+import type { Provider } from '@tinkoff/dippy';
+import { optional } from '@tinkoff/dippy';
+import { provide } from '@tinkoff/dippy';
+import rimraf from 'rimraf';
+import { CLI_PACKAGE_MANAGER, CLI_ROOT_DIR_TOKEN } from '../../../../di/tokens';
+import { npmRequire } from '../../../../utils/npmRequire';
+import {
+  CLIENT_CONFIG_MANAGER_TOKEN,
+  CLIENT_MODERN_CONFIG_MANAGER_TOKEN,
+  INIT_HANDLER_TOKEN,
+} from '../../tokens';
+
+export const buildClientSharedProviders: Provider[] = [
+  provide({
+    provide: INIT_HANDLER_TOKEN,
+    multi: true,
+    useFactory: ({ configManager, modernConfigManager }) => {
+      return function clearBuildDir() {
+        return rimraf.sync(`${(configManager || modernConfigManager).buildPath}/**`, {});
+      };
+    },
+    deps: {
+      configManager: optional(CLIENT_CONFIG_MANAGER_TOKEN),
+      modernConfigManager: optional(CLIENT_MODERN_CONFIG_MANAGER_TOKEN),
+    },
+  }),
+  provide({
+    provide: INIT_HANDLER_TOKEN,
+    multi: true,
+    useFactory: ({ configManager, modernConfigManager, rootDir, packageManager }) => {
+      return async function prepareImageOptimization() {
+        if ((configManager || modernConfigManager).imageOptimization?.enabled) {
+          await npmRequire({
+            cliRootDir: rootDir,
+            packageManager,
+            packageName: 'image-webpack-loader',
+            description: 'Устанавливаем зависимости для опции imageOptimization',
+          });
+        }
+      };
+    },
+    deps: {
+      configManager: optional(CLIENT_CONFIG_MANAGER_TOKEN),
+      modernConfigManager: optional(CLIENT_MODERN_CONFIG_MANAGER_TOKEN),
+      rootDir: CLI_ROOT_DIR_TOKEN,
+      packageManager: CLI_PACKAGE_MANAGER,
+    },
+  }),
+];

package/src/commands/build/command.ts

@@ -57,6 +57,17 @@ class BuildCommand extends CLICommand<Params> {
       transformer: (value: string) => value !== 'false',
       description: 'Enable/disable persistent file cache for used cli builder',
     },
+    {
+      name: '--modern',
+      value: '[modern]',
+      description: 'modern compilation code with es2015+',
+    },
+    {
+      name: '--onlyModern',
+      value: '[onlyModern]',
+      transformer: (value: string) => value !== 'false',
+      description: 'Emit only modern build from client compilation',
+    },
   ];
 
   alias = 'b';

package/src/typings/build/Builder.ts

@@ -4,6 +4,7 @@ export interface BuilderCustomOptions {
 
 export interface BuilderOptions {
   shouldBuildClient: boolean;
+  onlyModern?: boolean;
   shouldBuildServer: boolean;
 }