@tramvai/cli 2.10.2 → 2.20.1

package/lib/commands/update/updatePackageJson.js

@@ -5,37 +5,20 @@ const tslib_1 = require("tslib");
 const semver_1 = require("semver");
 const fs_1 = tslib_1.__importDefault(require("fs"));
 const p_map_1 = tslib_1.__importDefault(require("p-map"));
-const getLatestPackageVersion_1 = require("../../utils/commands/dependencies/getLatestPackageVersion");
 const packageHasVersion_1 = require("../../utils/commands/dependencies/packageHasVersion");
-// Список пакетов, не начинающихся с @tramvai,
-// которые мы также хотим обновить
-const packagesToUpdate = [
-    '@tinkoff/logger',
-    '@tinkoff/dippy',
-    '@tinkoff/router',
-    '@tinkoff/url',
-    '@tinkoff/errors',
-    '@tinkoff/roles',
-    '@tinkoff/pubsub',
-    '@tinkoff/hook-runner',
-    '@tinkoff/htmlpagebuilder',
-    '@tinkoff/browser-timings',
-    '@tinkoff/meta-tags-generate',
-    '@tinkoff/pack-polyfills',
-    '@tinkoff/browserslist-config',
-];
-const shouldUpdateDependency = (name) => {
-    return name.startsWith('@tramvai') || packagesToUpdate.includes(name);
+const dependantLibs_1 = require("./dependantLibs");
+const isUnifiedVersion = (name) => {
+    return name.startsWith('@tramvai');
 };
 const getVersionFromDep = (dep) => { var _a, _b; return ((_a = semver_1.parse(dep)) === null || _a === void 0 ? void 0 : _a.version) || ((_b = semver_1.minVersion(dep)) === null || _b === void 0 ? void 0 : _b.version); };
 const updateEntry = (deps, dep, { currentVersion, version }) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
     let nextVersion;
-    if (dep.startsWith('@tramvai') && getVersionFromDep(deps[dep]) === currentVersion) {
+    if (isUnifiedVersion(dep) && getVersionFromDep(deps[dep]) === currentVersion) {
         nextVersion = version;
     }
-    else if (shouldUpdateDependency(dep)) {
-        const latestPackageVersion = yield getLatestPackageVersion_1.getLatestPackageVersion(dep);
-        nextVersion = latestPackageVersion;
+    else if (dependantLibs_1.isDependantLib(dep)) {
+        const libVersion = yield dependantLibs_1.getLibPackageVersion(dep, version);
+        nextVersion = libVersion;
     }
     if (nextVersion) {
         const depHasVersion = yield packageHasVersion_1.packageHasVersion(dep, nextVersion);

package/lib/commands/update/updatePackageJson.js.map

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

package/lib/config/configManager.d.ts

@@ -24,6 +24,7 @@ export interface Settings<E extends Env> {
     showConfig?: boolean;
     onlyBundles?: string[];
     disableProdOptimization?: boolean;
+    fileCache?: boolean;
 }
 export declare class ConfigManager<T extends ConfigEntry = ConfigEntry, E extends Env = any> implements Required<Settings<E>> {
     private configEntry;
@@ -55,6 +56,7 @@ export declare class ConfigManager<T extends ConfigEntry = ConfigEntry, E extend
     hotRefresh: boolean;
     disableProdOptimization: boolean;
     target: Target;
+    fileCache: boolean;
     experiments: T['commands'][E extends 'development' ? 'serve' : 'build']['configurations']['experiments'];
     showConfig: boolean;
     constructor(configEntry: T, settings: Settings<E>);
@@ -84,6 +86,7 @@ export declare class ConfigManager<T extends ConfigEntry = ConfigEntry, E extend
             showConfig?: boolean;
             onlyBundles?: string[];
             disableProdOptimization?: boolean;
+            fileCache?: boolean;
         };
     };
     static rehydrate(state: ReturnType<ConfigManager['dehydrate']>): ConfigManager<ConfigEntry, any>;

package/lib/config/configManager.js

@@ -22,13 +22,13 @@ const getOption = (optionName, cfgs, dflt) => {
 class ConfigManager {
     // eslint-disable-next-line complexity,max-statements
     constructor(configEntry, settings) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p;
         this.configEntry = configEntry;
         this.name = configEntry.name;
         this.type = configEntry.type;
         this.root = configEntry.root;
         this.build = configEntry.commands.build || {};
-        this.serve = configEntry.commands.serve || configEntry.serve || {};
+        this.serve = configEntry.commands.serve || {};
         this.settings = settings;
         this.env = settings.env || 'development';
         this.rootDir = settings.rootDir || process.cwd();
@@ -56,7 +56,7 @@ class ConfigManager {
         this.modern = getOption('modern', [
             settings,
             this.env === 'development' ? this.serve.configurations : this.build.configurations,
-        ], false);
+        ], true);
         this.dedupe = (_c = this.build.configurations) === null || _c === void 0 ? void 0 : _c.dedupe;
         this.dedupeIgnore = (_e = (_d = this.build.configurations) === null || _d === void 0 ? void 0 : _d.dedupeIgnore) === null || _e === void 0 ? void 0 : _e.map((ignore) => new RegExp(`^${ignore}`));
         this.removeTypeofWindow = (_f = this.build.configurations) === null || _f === void 0 ? void 0 : _f.removeTypeofWindow;
@@ -65,11 +65,14 @@ class ConfigManager {
         this.disableProdOptimization = (_j = settings.disableProdOptimization) !== null && _j !== void 0 ? _j : false;
         this.onlyBundles = settings.onlyBundles;
         this.target = this.resolveTarget();
+        // according to measures fileCache in webpack doesn't affect
+        // performance much so enable it by default as it always was before
+        this.fileCache = (_k = settings.fileCache) !== null && _k !== void 0 ? _k : true;
         this.experiments =
-            (_m = (this.env === 'development'
-                ? (_k = this.serve.configurations) === null || _k === void 0 ? void 0 : _k.experiments
-                : (_l = this.build.configurations) === null || _l === void 0 ? void 0 : _l.experiments)) !== null && _m !== void 0 ? _m : {};
-        this.showConfig = (_o = settings.showConfig) !== null && _o !== void 0 ? _o : false;
+            (_o = (this.env === 'development'
+                ? (_l = this.serve.configurations) === null || _l === void 0 ? void 0 : _l.experiments
+                : (_m = this.build.configurations) === null || _m === void 0 ? void 0 : _m.experiments)) !== null && _o !== void 0 ? _o : {};
+        this.showConfig = (_p = settings.showConfig) !== null && _p !== void 0 ? _p : false;
         if (this.showConfig) {
             showConfig_1.showConfig(this);
         }

package/lib/config/configManager.js.map

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

package/lib/external/pages.d.ts

@@ -1,8 +1,6 @@
-export interface Page {
-    default?: any;
-}
+import type { LazyComponentWrapper, PageComponent } from '@tramvai/react';
 declare const _default: {
-    routes: Record<string, Page>;
-    pages: Record<string, Page>;
+    routes: Record<string, LazyComponentWrapper<PageComponent>>;
+    pages: Record<string, LazyComponentWrapper<PageComponent>>;
 };
 export default _default;

package/lib/external/pages.js.map

@@ -1 +1 @@
-{"version":3,"file":"pages.js","sourceRoot":"","sources":["../../src/external/pages.ts"],"names":[],"mappings":";;AAIA,oDAAoD;AACpD,kBAAe;IACb,MAAM,EAAE,EAAE;IACV,KAAK,EAAE,EAAE;CAIV,CAAC"}
+{"version":3,"file":"pages.js","sourceRoot":"","sources":["../../src/external/pages.ts"],"names":[],"mappings":";;AAEA,oDAAoD;AACpD,kBAAe;IACb,MAAM,EAAE,EAAE;IACV,KAAK,EAAE,EAAE;CAIV,CAAC"}

package/lib/library/webpack/application/client/common.js

@@ -17,7 +17,7 @@ const pagesResolve_1 = require("../../blocks/pagesResolve");
 const stats_1 = require("../../constants/stats");
 const configToEnv_1 = require("../../blocks/configToEnv");
 exports.default = (configManager) => (config) => {
-    const { options: { polyfill = '' } = {}, configurations: { experiments: { fileSystemPages }, }, } = configManager.build;
+    const { options: { polyfill = '' } = {}, configurations: { fileSystemPages }, } = configManager.build;
     config.name('client');
     config.batch(main_1.default(configManager));
     config.batch(common_1.commonApplication(configManager));

package/lib/library/webpack/application/client/common.js.map

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

package/lib/library/webpack/application/server/common.js

@@ -17,7 +17,7 @@ const common_1 = require("../common");
 const extractCssPlugin_1 = require("../../blocks/extractCssPlugin");
 // eslint-disable-next-line import/no-default-export
 exports.default = (configManager) => (config) => {
-    const { options: { server = '', outputServer = '' } = {}, configurations: { experiments: { fileSystemPages }, }, } = configManager.build;
+    const { options: { server = '', outputServer = '' } = {}, configurations: { fileSystemPages }, } = configManager.build;
     config.name('server');
     config.batch(main_1.default(configManager));
     config.batch(common_1.commonApplication(configManager));

package/lib/library/webpack/application/server/common.js.map

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

package/lib/library/webpack/blocks/configToEnv.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.configToEnv = void 0;
 const shouldUseReactRoot_1 = require("../../../utils/shouldUseReactRoot");
 const configToEnv = (configManager) => (config) => {
-    const { fileSystemPages } = configManager.build.configurations.experiments;
+    const { fileSystemPages } = configManager.build.configurations;
     config.plugin('define').tap((args) => [
         Object.assign(Object.assign({}, args[0]), { 'process.env.__TRAMVAI_EXPERIMENTAL_ENABLE_FILE_SYSTEM_PAGES': JSON.stringify(fileSystemPages.enable), 'process.env.__TRAMVAI_EXPERIMENTAL_FILE_SYSTEM_ROUTES_DIR': JSON.stringify(fileSystemPages.routesDir), 'process.env.__TRAMVAI_EXPERIMENTAL_FILE_SYSTEM_PAGES_DIR': JSON.stringify(fileSystemPages.pagesDir), 'process.env.__TRAMVAI_CONCURRENT_FEATURES': JSON.stringify(shouldUseReactRoot_1.shouldUseReactRoot()) }),
     ]);

package/lib/library/webpack/blocks/configToEnv.js.map

@@ -1 +1 @@
-{"version":3,"file":"configToEnv.js","sourceRoot":"","sources":["../../../../src/library/webpack/blocks/configToEnv.ts"],"names":[],"mappings":";;;AAGA,0EAAuE;AAEhE,MAAM,WAAW,GAAG,CAAC,aAAyC,EAAE,EAAE,CAAC,CAAC,MAAc,EAAE,EAAE;IAC3F,MAAM,EAAE,eAAe,EAAE,GAAG,aAAa,CAAC,KAAK,CAAC,cAAc,CAAC,WAAW,CAAC;IAE3E,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC;wCAE/B,IAAI,CAAC,CAAC,CAAC,KACV,6DAA6D,EAAE,IAAI,CAAC,SAAS,CAC3E,eAAe,CAAC,MAAM,CACvB,EACD,2DAA2D,EAAE,IAAI,CAAC,SAAS,CACzE,eAAe,CAAC,SAAS,CAC1B,EACD,0DAA0D,EAAE,IAAI,CAAC,SAAS,CACxE,eAAe,CAAC,QAAQ,CACzB,EACD,2CAA2C,EAAE,IAAI,CAAC,SAAS,CAAC,uCAAkB,EAAE,CAAC;KAEpF,CAAC,CAAC;AACL,CAAC,CAAC;AAlBW,QAAA,WAAW,eAkBtB"}
+{"version":3,"file":"configToEnv.js","sourceRoot":"","sources":["../../../../src/library/webpack/blocks/configToEnv.ts"],"names":[],"mappings":";;;AAGA,0EAAuE;AAEhE,MAAM,WAAW,GAAG,CAAC,aAAyC,EAAE,EAAE,CAAC,CAAC,MAAc,EAAE,EAAE;IAC3F,MAAM,EAAE,eAAe,EAAE,GAAG,aAAa,CAAC,KAAK,CAAC,cAAc,CAAC;IAE/D,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC;wCAE/B,IAAI,CAAC,CAAC,CAAC,KACV,6DAA6D,EAAE,IAAI,CAAC,SAAS,CAC3E,eAAe,CAAC,MAAM,CACvB,EACD,2DAA2D,EAAE,IAAI,CAAC,SAAS,CACzE,eAAe,CAAC,SAAS,CAC1B,EACD,0DAA0D,EAAE,IAAI,CAAC,SAAS,CACxE,eAAe,CAAC,QAAQ,CACzB,EACD,2CAA2C,EAAE,IAAI,CAAC,SAAS,CAAC,uCAAkB,EAAE,CAAC;KAEpF,CAAC,CAAC;AACL,CAAC,CAAC;AAlBW,QAAA,WAAW,eAkBtB"}

package/lib/library/webpack/blocks/filesClient.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.filesClientWebackRulesFactory = void 0;
 const tslib_1 = require("tslib");
+const path_1 = tslib_1.__importDefault(require("path"));
 const spark_md5_1 = tslib_1.__importDefault(require("spark-md5"));
 const filesClientWebackRulesFactory = (configManager) => (config) => {
     var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
@@ -33,9 +34,11 @@ const filesClientWebackRulesFactory = (configManager) => (config) => {
         ],
     });
     config.module
-        .rule('image')
+        .rule('tramvai-image')
         .test(/\.(png|jpe?g|gif|webp)$/)
-        .set('type', 'asset');
+        .use('file')
+        .loader(path_1.default.resolve(__dirname, '../loaders/image-loader'))
+        .end();
     config.module
         .rule('video')
         .test(/\.(mp4|webm|avif)$/)

package/lib/library/webpack/blocks/filesClient.js.map

@@ -1 +1 @@
-{"version":3,"file":"filesClient.js","sourceRoot":"","sources":["../../../../src/library/webpack/blocks/filesClient.ts"],"names":[],"mappings":";;;;AACA,kEAAiC;AAG1B,MAAM,6BAA6B,GAAG,CAAC,aAA4B,EAAE,EAAE,CAAC,CAAC,MAAc,EAAE,EAAE;;IAChG,MAAM,CAAC,MAAM;SACV,IAAI,CAAC,MAAM,CAAC;SACZ,IAAI,CAAC,WAAW,CAAC;SACjB,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAExB,MAAM,CAAC,MAAM;SACV,IAAI,CAAC,KAAK,CAAC;SACX,IAAI,CAAC,QAAQ,CAAC;SACd,GAAG,CAAC,MAAM,EAAE,gBAAgB,CAAC;SAC7B,GAAG,CAAC,WAAW,EAAE;QAChB,QAAQ,EAAE,CAAC,QAAQ,EAAE,EAAE;YACrB,6DAA6D;YAC7D,sFAAsF;YACtF,OAAO,GAAG,mBAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,cAAc,EAAE,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE,CAAC,MAAM,CAAC;QACtF,CAAC;KACF,CAAC;SACD,GAAG,CAAC,KAAK,CAAC;SACV,MAAM,CAAC,aAAa,CAAC;SACrB,OAAO,CAAC;QACP,OAAO,EAAE,MAAA,MAAA,MAAA,MAAA,aAAa,CAAC,KAAK,0CAAE,cAAc,0CAAE,IAAI,0CAAE,OAAO,mCAAI;YAC7D;gBACE,UAAU,EAAE,KAAK;aAClB;YACD;gBACE,cAAc,EAAE,KAAK;aACtB;SACF;KACF,CAAC,CAAC;IAEL,MAAM,CAAC,MAAM;SACV,IAAI,CAAC,OAAO,CAAC;SACb,IAAI,CAAC,yBAAyB,CAAC;SAC/B,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAExB,MAAM,CAAC,MAAM;SACV,IAAI,CAAC,OAAO,CAAC;SACb,IAAI,CAAC,oBAAoB,CAAC;SAC1B,GAAG,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC;IAEjC,IAAI,MAAA,MAAA,MAAA,aAAa,CAAC,KAAK,0CAAE,cAAc,0CAAE,iBAAiB,0CAAE,OAAO,EAAE;QACnE,MAAM,CAAC,MAAM;aACV,IAAI,CAAC,oBAAoB,CAAC;aAC1B,IAAI,CAAC,wBAAwB,CAAC;aAC9B,GAAG,CAAC,OAAO,CAAC;aACZ,MAAM,CAAC,sBAAsB,CAAC;aAC9B,OAAO,mBAAM,MAAA,MAAA,MAAA,aAAa,CAAC,KAAK,0CAAE,cAAc,0CAAE,iBAAiB,0CAAE,OAAO,EAAG;aAC/E,GAAG,EAAE;aACL,OAAO,CAAC,KAAK,CAAC,CAAC;KACnB;AACH,CAAC,CAAC;AAlDW,QAAA,6BAA6B,iCAkDxC;AAEF,kBAAe,qCAA6B,CAAC"}
+{"version":3,"file":"filesClient.js","sourceRoot":"","sources":["../../../../src/library/webpack/blocks/filesClient.ts"],"names":[],"mappings":";;;;AAAA,wDAAwB;AAExB,kEAAiC;AAG1B,MAAM,6BAA6B,GAAG,CAAC,aAA4B,EAAE,EAAE,CAAC,CAAC,MAAc,EAAE,EAAE;;IAChG,MAAM,CAAC,MAAM;SACV,IAAI,CAAC,MAAM,CAAC;SACZ,IAAI,CAAC,WAAW,CAAC;SACjB,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAExB,MAAM,CAAC,MAAM;SACV,IAAI,CAAC,KAAK,CAAC;SACX,IAAI,CAAC,QAAQ,CAAC;SACd,GAAG,CAAC,MAAM,EAAE,gBAAgB,CAAC;SAC7B,GAAG,CAAC,WAAW,EAAE;QAChB,QAAQ,EAAE,CAAC,QAAQ,EAAE,EAAE;YACrB,6DAA6D;YAC7D,sFAAsF;YACtF,OAAO,GAAG,mBAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,cAAc,EAAE,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE,CAAC,MAAM,CAAC;QACtF,CAAC;KACF,CAAC;SACD,GAAG,CAAC,KAAK,CAAC;SACV,MAAM,CAAC,aAAa,CAAC;SACrB,OAAO,CAAC;QACP,OAAO,EAAE,MAAA,MAAA,MAAA,MAAA,aAAa,CAAC,KAAK,0CAAE,cAAc,0CAAE,IAAI,0CAAE,OAAO,mCAAI;YAC7D;gBACE,UAAU,EAAE,KAAK;aAClB;YACD;gBACE,cAAc,EAAE,KAAK;aACtB;SACF;KACF,CAAC,CAAC;IAEL,MAAM,CAAC,MAAM;SACV,IAAI,CAAC,eAAe,CAAC;SACrB,IAAI,CAAC,yBAAyB,CAAC;SAC/B,GAAG,CAAC,MAAM,CAAC;SACX,MAAM,CAAC,cAAI,CAAC,OAAO,CAAC,SAAS,EAAE,yBAAyB,CAAC,CAAC;SAC1D,GAAG,EAAE,CAAC;IAET,MAAM,CAAC,MAAM;SACV,IAAI,CAAC,OAAO,CAAC;SACb,IAAI,CAAC,oBAAoB,CAAC;SAC1B,GAAG,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC;IAEjC,IAAI,MAAA,MAAA,MAAA,aAAa,CAAC,KAAK,0CAAE,cAAc,0CAAE,iBAAiB,0CAAE,OAAO,EAAE;QACnE,MAAM,CAAC,MAAM;aACV,IAAI,CAAC,oBAAoB,CAAC;aAC1B,IAAI,CAAC,wBAAwB,CAAC;aAC9B,GAAG,CAAC,OAAO,CAAC;aACZ,MAAM,CAAC,sBAAsB,CAAC;aAC9B,OAAO,mBAAM,MAAA,MAAA,MAAA,aAAa,CAAC,KAAK,0CAAE,cAAc,0CAAE,iBAAiB,0CAAE,OAAO,EAAG;aAC/E,GAAG,EAAE;aACL,OAAO,CAAC,KAAK,CAAC,CAAC;KACnB;AACH,CAAC,CAAC;AApDW,QAAA,6BAA6B,iCAoDxC;AAEF,kBAAe,qCAA6B,CAAC"}

package/lib/library/webpack/blocks/filesServer.js

@@ -1,5 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+const path_1 = tslib_1.__importDefault(require("path"));
 exports.default = (configManager) => (config) => {
     var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
     config.module
@@ -26,12 +28,14 @@ exports.default = (configManager) => (config) => {
         ],
     });
     config.module
-        .rule('image')
+        .rule('tramvai-image')
         .test(/\.(png|jpe?g|gif|webp)$/)
-        .set('type', 'asset')
-        .set('generator', {
-        emit: false,
-    });
+        .use('file')
+        .loader(path_1.default.resolve(__dirname, '../loaders/image-loader'))
+        .options({
+        emitFile: false,
+    })
+        .end();
     config.module
         .rule('video')
         .test(/\.(mp4|webm|avif)$/)

package/lib/library/webpack/blocks/filesServer.js.map

@@ -1 +1 @@
-{"version":3,"file":"filesServer.js","sourceRoot":"","sources":["../../../../src/library/webpack/blocks/filesServer.ts"],"names":[],"mappings":";;AAGA,kBAAe,CAAC,aAA4B,EAAE,EAAE,CAAC,CAAC,MAAc,EAAE,EAAE;;IAClE,MAAM,CAAC,MAAM;SACV,IAAI,CAAC,MAAM,CAAC;SACZ,IAAI,CAAC,WAAW,CAAC;SACjB,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC;SACpB,GAAG,CAAC,WAAW,EAAE;QAChB,IAAI,EAAE,KAAK;KACZ,CAAC,CAAC;IAEL,MAAM,CAAC,MAAM;SACV,IAAI,CAAC,KAAK,CAAC;SACX,IAAI,CAAC,QAAQ,CAAC;SACd,GAAG,CAAC,MAAM,EAAE,cAAc,CAAC;SAC3B,GAAG,CAAC,KAAK,CAAC;SACV,MAAM,CAAC,aAAa,CAAC;SACrB,OAAO,CAAC;QACP,OAAO,EAAE,MAAA,MAAA,MAAA,MAAA,aAAa,CAAC,KAAK,0CAAE,cAAc,0CAAE,IAAI,0CAAE,OAAO,mCAAI;YAC7D;gBACE,UAAU,EAAE,KAAK;aAClB;YACD;gBACE,cAAc,EAAE,KAAK;aACtB;SACF;KACF,CAAC,CAAC;IAEL,MAAM,CAAC,MAAM;SACV,IAAI,CAAC,OAAO,CAAC;SACb,IAAI,CAAC,yBAAyB,CAAC;SAC/B,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC;SACpB,GAAG,CAAC,WAAW,EAAE;QAChB,IAAI,EAAE,KAAK;KACZ,CAAC,CAAC;IAEL,MAAM,CAAC,MAAM;SACV,IAAI,CAAC,OAAO,CAAC;SACb,IAAI,CAAC,oBAAoB,CAAC;SAC1B,GAAG,CAAC,MAAM,EAAE,gBAAgB,CAAC;SAC7B,GAAG,CAAC,WAAW,EAAE;QAChB,IAAI,EAAE,KAAK;KACZ,CAAC,CAAC;IAEL,IAAI,MAAA,MAAA,MAAA,aAAa,CAAC,KAAK,0CAAE,cAAc,0CAAE,iBAAiB,0CAAE,OAAO,EAAE;QACnE,MAAM,CAAC,MAAM;aACV,IAAI,CAAC,oBAAoB,CAAC;aAC1B,IAAI,CAAC,wBAAwB,CAAC;aAC9B,GAAG,CAAC,OAAO,CAAC;aACZ,MAAM,CAAC,sBAAsB,CAAC;aAC9B,OAAO,mBAAM,MAAA,MAAA,MAAA,aAAa,CAAC,KAAK,0CAAE,cAAc,0CAAE,iBAAiB,0CAAE,OAAO,EAAG;aAC/E,GAAG,EAAE;aACL,OAAO,CAAC,KAAK,CAAC,CAAC;KACnB;AACH,CAAC,CAAC"}
+{"version":3,"file":"filesServer.js","sourceRoot":"","sources":["../../../../src/library/webpack/blocks/filesServer.ts"],"names":[],"mappings":";;;AAAA,wDAAwB;AAIxB,kBAAe,CAAC,aAA4B,EAAE,EAAE,CAAC,CAAC,MAAc,EAAE,EAAE;;IAClE,MAAM,CAAC,MAAM;SACV,IAAI,CAAC,MAAM,CAAC;SACZ,IAAI,CAAC,WAAW,CAAC;SACjB,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC;SACpB,GAAG,CAAC,WAAW,EAAE;QAChB,IAAI,EAAE,KAAK;KACZ,CAAC,CAAC;IAEL,MAAM,CAAC,MAAM;SACV,IAAI,CAAC,KAAK,CAAC;SACX,IAAI,CAAC,QAAQ,CAAC;SACd,GAAG,CAAC,MAAM,EAAE,cAAc,CAAC;SAC3B,GAAG,CAAC,KAAK,CAAC;SACV,MAAM,CAAC,aAAa,CAAC;SACrB,OAAO,CAAC;QACP,OAAO,EAAE,MAAA,MAAA,MAAA,MAAA,aAAa,CAAC,KAAK,0CAAE,cAAc,0CAAE,IAAI,0CAAE,OAAO,mCAAI;YAC7D;gBACE,UAAU,EAAE,KAAK;aAClB;YACD;gBACE,cAAc,EAAE,KAAK;aACtB;SACF;KACF,CAAC,CAAC;IAEL,MAAM,CAAC,MAAM;SACV,IAAI,CAAC,eAAe,CAAC;SACrB,IAAI,CAAC,yBAAyB,CAAC;SAC/B,GAAG,CAAC,MAAM,CAAC;SACX,MAAM,CAAC,cAAI,CAAC,OAAO,CAAC,SAAS,EAAE,yBAAyB,CAAC,CAAC;SAC1D,OAAO,CAAC;QACP,QAAQ,EAAE,KAAK;KAChB,CAAC;SACD,GAAG,EAAE,CAAC;IAET,MAAM,CAAC,MAAM;SACV,IAAI,CAAC,OAAO,CAAC;SACb,IAAI,CAAC,oBAAoB,CAAC;SAC1B,GAAG,CAAC,MAAM,EAAE,gBAAgB,CAAC;SAC7B,GAAG,CAAC,WAAW,EAAE;QAChB,IAAI,EAAE,KAAK;KACZ,CAAC,CAAC;IAEL,IAAI,MAAA,MAAA,MAAA,aAAa,CAAC,KAAK,0CAAE,cAAc,0CAAE,iBAAiB,0CAAE,OAAO,EAAE;QACnE,MAAM,CAAC,MAAM;aACV,IAAI,CAAC,oBAAoB,CAAC;aAC1B,IAAI,CAAC,wBAAwB,CAAC;aAC9B,GAAG,CAAC,OAAO,CAAC;aACZ,MAAM,CAAC,sBAAsB,CAAC;aAC9B,OAAO,mBAAM,MAAA,MAAA,MAAA,aAAa,CAAC,KAAK,0CAAE,cAAc,0CAAE,iBAAiB,0CAAE,OAAO,EAAG;aAC/E,GAAG,EAAE;aACL,OAAO,CAAC,KAAK,CAAC,CAAC;KACnB;AACH,CAAC,CAAC"}

package/lib/library/webpack/blocks/pagesResolve.js

@@ -4,7 +4,7 @@ exports.pagesResolve = void 0;
 const tslib_1 = require("tslib");
 const path_1 = tslib_1.__importDefault(require("path"));
 const pagesResolve = (configManager) => (config) => {
-    const { fileSystemPages } = configManager.build.configurations.experiments;
+    const { fileSystemPages } = configManager.build.configurations;
     config.module
         .rule('file-system-pages')
         // [\\/]cli вместо @tramvai[\\/]cli, т.к. после слияния репозиториев tramvai и tramvai-cli,

package/lib/library/webpack/blocks/pagesResolve.js.map

@@ -1 +1 @@
-{"version":3,"file":"pagesResolve.js","sourceRoot":"","sources":["../../../../src/library/webpack/blocks/pagesResolve.ts"],"names":[],"mappings":";;;;AAAA,wDAAwB;AAKjB,MAAM,YAAY,GAAG,CAAC,aAAoD,EAAE,EAAE,CAAC,CACpF,MAAc,EACd,EAAE;IACF,MAAM,EAAE,eAAe,EAAE,GAAG,aAAa,CAAC,KAAK,CAAC,cAAc,CAAC,WAAW,CAAC;IAE3E,MAAM,CAAC,MAAM;SACV,IAAI,CAAC,mBAAmB,CAAC;QAC1B,2FAA2F;QAC3F,+DAA+D;QAC/D,oGAAoG;SACnG,IAAI,CAAC,6CAA6C,CAAC;SACnD,GAAG,CAAC,SAAS,CAAC;SACd,MAAM,CAAC,cAAI,CAAC,OAAO,CAAC,SAAS,EAAE,yBAAyB,CAAC,CAAC;SAC1D,OAAO,CAAC;QACP,eAAe;QACf,OAAO,EAAE,aAAa,CAAC,OAAO;QAC9B,IAAI,EAAE,aAAa,CAAC,IAAI;QACxB,UAAU,EAAE,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,MAAM,EAAE;KAC/C,CAAC;SACD,GAAG,EAAE;QACN,gDAAgD;SAC/C,OAAO,CAAC,KAAK,CAAC,CAAC;AACpB,CAAC,CAAC;AAtBW,QAAA,YAAY,gBAsBvB"}
+{"version":3,"file":"pagesResolve.js","sourceRoot":"","sources":["../../../../src/library/webpack/blocks/pagesResolve.ts"],"names":[],"mappings":";;;;AAAA,wDAAwB;AAKjB,MAAM,YAAY,GAAG,CAAC,aAAoD,EAAE,EAAE,CAAC,CACpF,MAAc,EACd,EAAE;IACF,MAAM,EAAE,eAAe,EAAE,GAAG,aAAa,CAAC,KAAK,CAAC,cAAc,CAAC;IAE/D,MAAM,CAAC,MAAM;SACV,IAAI,CAAC,mBAAmB,CAAC;QAC1B,2FAA2F;QAC3F,+DAA+D;QAC/D,oGAAoG;SACnG,IAAI,CAAC,6CAA6C,CAAC;SACnD,GAAG,CAAC,SAAS,CAAC;SACd,MAAM,CAAC,cAAI,CAAC,OAAO,CAAC,SAAS,EAAE,yBAAyB,CAAC,CAAC;SAC1D,OAAO,CAAC;QACP,eAAe;QACf,OAAO,EAAE,aAAa,CAAC,OAAO;QAC9B,IAAI,EAAE,aAAa,CAAC,IAAI;QACxB,UAAU,EAAE,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,MAAM,EAAE;KAC/C,CAAC;SACD,GAAG,EAAE;QACN,gDAAgD;SAC/C,OAAO,CAAC,KAAK,CAAC,CAAC;AACpB,CAAC,CAAC;AAtBW,QAAA,YAAY,gBAsBvB"}

package/lib/library/webpack/common/main.js

@@ -34,22 +34,23 @@ exports.default = (configManager) => (config) => {
     config.output.set('strictModuleExceptionHandling', true);
     // https://webpack.js.org/configuration/output/#outputhashfunction . When release webpack 6 would need to remove
     config.output.set('hashFunction', 'xxhash64');
-    // TODO: отключать в CI
-    config.cache({
-        type: 'filesystem',
-        name: `${env}-${configManager.type}-${configManager.buildType}-${configManager.name}${configManager.buildType === 'client' && configManager.modern ? '-modern' : ''}`,
-        cacheDirectory: find_cache_dir_1.default({ cwd: configManager.rootDir, name: 'webpack' }),
-        buildDependencies: {
-            cli: ['@tramvai/cli'],
-            webpack: ['webpack/lib'],
-            // first check that config exists. If it is passed to webpack, but file is not exist the cache will not be created at all.
-            // It may be missing in cases when cli is running programmaticaly
-            config: filterNonExisted([path_1.default.resolve(configManager.rootDir, 'tramvai.json')]),
-            css: filterNonExisted([
-                postcssConfig && safeRequire_1.safeRequireResolve(path_1.default.resolve(configManager.rootDir, postcssConfig)),
-            ]),
-        },
-    });
+    if (configManager.fileCache) {
+        config.cache({
+            type: 'filesystem',
+            name: `${env}-${configManager.type}-${configManager.buildType}-${configManager.name}${configManager.buildType === 'client' && configManager.modern ? '-modern' : ''}`,
+            cacheDirectory: find_cache_dir_1.default({ cwd: configManager.rootDir, name: 'webpack' }),
+            buildDependencies: {
+                cli: ['@tramvai/cli'],
+                webpack: ['webpack/lib'],
+                // first check that config exists. If it is passed to webpack, but file is not exist the cache will not be created at all.
+                // It may be missing in cases when cli is running programmaticaly
+                config: filterNonExisted([path_1.default.resolve(configManager.rootDir, 'tramvai.json')]),
+                css: filterNonExisted([
+                    postcssConfig && safeRequire_1.safeRequireResolve(path_1.default.resolve(configManager.rootDir, postcssConfig)),
+                ]),
+            },
+        });
+    }
     config.set('snapshot', {
         // отключаем дефолты для managedPaths т.к. из-за них нельзя дебажить node_modules,
         // если же потребуется включить эту опцию, то надо будет выставить `path.resolve(configManager.rootDir, 'node_modules')` чтобы правильно работал tramvai-debug

package/lib/library/webpack/common/main.js.map

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

package/lib/library/webpack/loaders/image-loader/index.d.ts

@@ -0,0 +1,5 @@
+/**
+ * Reuse file-loader logic, but return a object with src and size of image
+ */
+export default function (content: any): any;
+export declare const raw = true;

package/lib/library/webpack/loaders/image-loader/index.js

@@ -0,0 +1,25 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.raw = void 0;
+const tslib_1 = require("tslib");
+const image_size_1 = tslib_1.__importDefault(require("image-size"));
+/**
+ * Reuse file-loader logic, but return a object with src and size of image
+ */
+function default_1(content) {
+    const result = require('file-loader').call(this, content);
+    const dimensions = image_size_1.default(this.resourcePath);
+    // @todo: image blur placeholder in Base64, sharp or imagemin or jimp?
+    return result.replace(/^export default (__webpack_public_path__ \+ .+);$/, `const path = $1;
+
+export default path;
+
+export const image = {
+  src: $1,
+  width: ${JSON.stringify(dimensions.width)},
+  height: ${JSON.stringify(dimensions.height)},
+};`);
+}
+exports.default = default_1;
+exports.raw = true;
+//# sourceMappingURL=index.js.map

package/lib/library/webpack/loaders/image-loader/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/library/webpack/loaders/image-loader/index.ts"],"names":[],"mappings":";;;;AAAA,oEAAgC;AAEhC;;GAEG;AACH,mBAAyB,OAAO;IAC9B,MAAM,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAE1D,MAAM,UAAU,GAAG,oBAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IAE7C,sEAAsE;IACtE,OAAO,MAAM,CAAC,OAAO,CACnB,mDAAmD,EACnD;;;;;;WAMO,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,KAAK,CAAC;YAC/B,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,MAAM,CAAC;GAC1C,CACA,CAAC;AACJ,CAAC;AAlBD,4BAkBC;AAEY,QAAA,GAAG,GAAG,IAAI,CAAC"}