@tramvai/cli 5.9.2 → 5.14.9

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

@@ -4,7 +4,10 @@ const dedupe_1 = require("../../blocks/dedupe");
 exports.default = (configManager) => (config) => {
     config.mode('production');
     config.plugin('define').tap((args) => [
-        Object.assign(Object.assign({}, args[0]), { 'process.env.NODE_ENV': JSON.stringify('production') }),
+        {
+            ...args[0],
+            'process.env.NODE_ENV': JSON.stringify('production'),
+        },
     ]);
     if (configManager.dedupe.enabled) {
         config.batch((0, dedupe_1.dedupe)(configManager));

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

@@ -1 +1 @@
-{"version":3,"file":"prod.js","sourceRoot":"","sources":["../../../../../src/library/webpack/common/server/prod.ts"],"names":[],"mappings":";;AAGA,gDAA6C;AAE7C,kBAAe,CAAC,aAA4C,EAAE,EAAE,CAAC,CAAC,MAAc,EAAE,EAAE;IAClF,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IAE1B,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC;wCAE/B,IAAI,CAAC,CAAC,CAAC,KACV,sBAAsB,EAAE,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC;KAEvD,CAAC,CAAC;IAEH,IAAI,aAAa,CAAC,MAAM,CAAC,OAAO,EAAE;QAChC,MAAM,CAAC,KAAK,CAAC,IAAA,eAAM,EAAC,aAAa,CAAC,CAAC,CAAC;KACrC;AACH,CAAC,CAAC"}
+{"version":3,"file":"prod.js","sourceRoot":"","sources":["../../../../../src/library/webpack/common/server/prod.ts"],"names":[],"mappings":";;AAGA,gDAA6C;AAE7C,kBAAe,CAAC,aAA4C,EAAE,EAAE,CAAC,CAAC,MAAc,EAAE,EAAE;IAClF,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IAE1B,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC;QACpC;YACE,GAAG,IAAI,CAAC,CAAC,CAAC;YACV,sBAAsB,EAAE,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC;SACrD;KACF,CAAC,CAAC;IAEH,IAAI,aAAa,CAAC,MAAM,CAAC,OAAO,EAAE;QAChC,MAAM,CAAC,KAAK,CAAC,IAAA,eAAM,EAAC,aAAa,CAAC,CAAC,CAAC;KACrC;AACH,CAAC,CAAC"}

package/lib/library/webpack/constants/stats.js

@@ -17,7 +17,10 @@ exports.DEFAULT_STATS_FIELDS = [
     'namedChunkGroups',
     'entrypoints',
 ];
-exports.DEV_STATS_OPTIONS = Object.assign(Object.assign({}, exports.DEFAULT_STATS_OPTIONS), { chunks: true });
+exports.DEV_STATS_OPTIONS = {
+    ...exports.DEFAULT_STATS_OPTIONS,
+    chunks: true, // нужно, чтобы получить название файлов для shared чанков в development режиме
+};
 exports.DEV_STATS_FIELDS = [...exports.DEFAULT_STATS_FIELDS, 'chunks'];
 exports.WEBPACK_DEBUG_STATS_OPTIONS = {
     logging: 'verbose',

package/lib/library/webpack/constants/stats.js.map

@@ -1 +1 @@
-{"version":3,"file":"stats.js","sourceRoot":"","sources":["../../../../src/library/webpack/constants/stats.ts"],"names":[],"mappings":";;;AAEa,QAAA,qBAAqB,GAAiB;IACjD,GAAG,EAAE,KAAK;IAEV,UAAU,EAAE,IAAI;IAChB,MAAM,EAAE,IAAI;IACZ,UAAU,EAAE,IAAI;IAChB,WAAW,EAAE,IAAI;IACjB,GAAG,EAAE,IAAI;IACT,WAAW,EAAE,IAAI,EAAE,mDAAmD;CACvE,CAAC;AAEW,QAAA,oBAAoB,GAAa;IAC5C,YAAY;IACZ,YAAY;IACZ,mBAAmB;IACnB,kBAAkB;IAClB,aAAa;CACd,CAAC;AAEW,QAAA,iBAAiB,mCACzB,6BAAqB,KACxB,MAAM,EAAE,IAAI,IACZ;AAEW,QAAA,gBAAgB,GAAG,CAAC,GAAG,4BAAoB,EAAE,QAAQ,CAAC,CAAC;AAEvD,QAAA,2BAA2B,GAAiB;IACvD,OAAO,EAAE,SAAS;CACnB,CAAC;AAEW,QAAA,0BAA0B,GAAG,MAAM,CAAC,IAAI,CAAC,mCAA2B,CAAC,CAAC"}
+{"version":3,"file":"stats.js","sourceRoot":"","sources":["../../../../src/library/webpack/constants/stats.ts"],"names":[],"mappings":";;;AAEa,QAAA,qBAAqB,GAAiB;IACjD,GAAG,EAAE,KAAK;IAEV,UAAU,EAAE,IAAI;IAChB,MAAM,EAAE,IAAI;IACZ,UAAU,EAAE,IAAI;IAChB,WAAW,EAAE,IAAI;IACjB,GAAG,EAAE,IAAI;IACT,WAAW,EAAE,IAAI,EAAE,mDAAmD;CACvE,CAAC;AAEW,QAAA,oBAAoB,GAAa;IAC5C,YAAY;IACZ,YAAY;IACZ,mBAAmB;IACnB,kBAAkB;IAClB,aAAa;CACd,CAAC;AAEW,QAAA,iBAAiB,GAAiB;IAC7C,GAAG,6BAAqB;IACxB,MAAM,EAAE,IAAI,EAAE,+EAA+E;CAC9F,CAAC;AAEW,QAAA,gBAAgB,GAAG,CAAC,GAAG,4BAAoB,EAAE,QAAQ,CAAC,CAAC;AAEvD,QAAA,2BAA2B,GAAiB;IACvD,OAAO,EAAE,SAAS;CACnB,CAAC;AAEW,QAAA,0BAA0B,GAAG,MAAM,CAAC,IAAI,CAAC,mCAA2B,CAAC,CAAC"}

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

@@ -1,11 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getImageMiniatureDataURL = void 0;
-const tslib_1 = require("tslib");
 const safeRequire_1 = require("../../../../utils/safeRequire");
 const BLUR_WIDTH = 10;
 const BLUR_HEIGHT = 10;
-const getImageMiniatureDataURL = (content, extension) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
+const getImageMiniatureDataURL = async (content, extension) => {
     const isSharpInstalled = Boolean((0, safeRequire_1.safeRequireResolve)('sharp'));
     if (!isSharpInstalled) {
         return null;
@@ -22,7 +21,7 @@ const getImageMiniatureDataURL = (content, extension) => tslib_1.__awaiter(void
                 progressive: true,
             });
         }
-        const optimizedBuffer = yield image.toBuffer();
+        const optimizedBuffer = await image.toBuffer();
         const dataURL = `data:image/${extension};base64,${optimizedBuffer.toString('base64')}`;
         return dataURL;
     }
@@ -30,6 +29,6 @@ const getImageMiniatureDataURL = (content, extension) => tslib_1.__awaiter(void
         console.error('image placeholder generation error: ', e);
         return null;
     }
-});
+};
 exports.getImageMiniatureDataURL = getImageMiniatureDataURL;
 //# sourceMappingURL=getImageMiniatureURL.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"getImageMiniatureURL.js","sourceRoot":"","sources":["../../../../../src/library/webpack/loaders/image-loader/getImageMiniatureURL.ts"],"names":[],"mappings":";;;;AAAA,+DAAmE;AAEnE,MAAM,UAAU,GAAG,EAAE,CAAC;AACtB,MAAM,WAAW,GAAG,EAAE,CAAC;AAEhB,MAAM,wBAAwB,GAAG,CAAO,OAAe,EAAE,SAAiB,EAAE,EAAE;IACnF,MAAM,gBAAgB,GAAG,OAAO,CAAC,IAAA,gCAAkB,EAAC,OAAO,CAAC,CAAC,CAAC;IAC9D,IAAI,CAAC,gBAAgB,EAAE;QACrB,OAAO,IAAI,CAAC;KACb;IAED,IAAI;QACF,MAAM,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;QAE/B,MAAM,KAAK,GAAG,KAAK,CAAC,OAAO,EAAE,EAAE,cAAc,EAAE,IAAI,EAAE,CAAC,CAAC;QACvD,oDAAoD;QACpD,KAAK,CAAC,MAAM,CAAC,UAAU,EAAE,WAAW,EAAE;YACpC,GAAG,EAAE,QAAQ;SACd,CAAC,CAAC;QACH,IAAI,SAAS,KAAK,MAAM,IAAI,SAAS,KAAK,KAAK,EAAE;YAC/C,KAAK,CAAC,IAAI,CAAC;gBACT,WAAW,EAAE,IAAI;aAClB,CAAC,CAAC;SACJ;QAED,MAAM,eAAe,GAAG,MAAM,KAAK,CAAC,QAAQ,EAAE,CAAC;QAE/C,MAAM,OAAO,GAAG,cAAc,SAAS,WAAW,eAAe,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC;QAEvF,OAAO,OAAO,CAAC;KAChB;IAAC,OAAO,CAAC,EAAE;QACV,OAAO,CAAC,KAAK,CAAC,sCAAsC,EAAE,CAAC,CAAC,CAAC;QACzD,OAAO,IAAI,CAAC;KACb;AACH,CAAC,CAAA,CAAC;AA7BW,QAAA,wBAAwB,4BA6BnC"}
+{"version":3,"file":"getImageMiniatureURL.js","sourceRoot":"","sources":["../../../../../src/library/webpack/loaders/image-loader/getImageMiniatureURL.ts"],"names":[],"mappings":";;;AAAA,+DAAmE;AAEnE,MAAM,UAAU,GAAG,EAAE,CAAC;AACtB,MAAM,WAAW,GAAG,EAAE,CAAC;AAEhB,MAAM,wBAAwB,GAAG,KAAK,EAAE,OAAe,EAAE,SAAiB,EAAE,EAAE;IACnF,MAAM,gBAAgB,GAAG,OAAO,CAAC,IAAA,gCAAkB,EAAC,OAAO,CAAC,CAAC,CAAC;IAC9D,IAAI,CAAC,gBAAgB,EAAE;QACrB,OAAO,IAAI,CAAC;KACb;IAED,IAAI;QACF,MAAM,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;QAE/B,MAAM,KAAK,GAAG,KAAK,CAAC,OAAO,EAAE,EAAE,cAAc,EAAE,IAAI,EAAE,CAAC,CAAC;QACvD,oDAAoD;QACpD,KAAK,CAAC,MAAM,CAAC,UAAU,EAAE,WAAW,EAAE;YACpC,GAAG,EAAE,QAAQ;SACd,CAAC,CAAC;QACH,IAAI,SAAS,KAAK,MAAM,IAAI,SAAS,KAAK,KAAK,EAAE;YAC/C,KAAK,CAAC,IAAI,CAAC;gBACT,WAAW,EAAE,IAAI;aAClB,CAAC,CAAC;SACJ;QAED,MAAM,eAAe,GAAG,MAAM,KAAK,CAAC,QAAQ,EAAE,CAAC;QAE/C,MAAM,OAAO,GAAG,cAAc,SAAS,WAAW,eAAe,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC;QAEvF,OAAO,OAAO,CAAC;KAChB;IAAC,OAAO,CAAC,EAAE;QACV,OAAO,CAAC,KAAK,CAAC,sCAAsC,EAAE,CAAC,CAAC,CAAC;QACzD,OAAO,IAAI,CAAC;KACb;AACH,CAAC,CAAC;AA7BW,QAAA,wBAAwB,4BA6BnC"}

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

@@ -8,14 +8,13 @@ const getImageMiniatureURL_1 = require("./getImageMiniatureURL");
 /**
  * Reuse file-loader logic, but return a object with src and size of image
  */
-function default_1(content) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const result = require('file-loader').call(this, content);
-        const dimensions = (0, image_size_1.default)(this.resourcePath);
-        const options = this.getOptions();
-        const extension = (0, loader_utils_1.interpolateName)(this, '[ext]', options);
-        const dataURL = yield (0, getImageMiniatureURL_1.getImageMiniatureDataURL)(content, extension);
-        return result.replace(/^export default (__webpack_public_path__ \+ .+);$/, `const path = $1;
+async function default_1(content) {
+    const result = require('file-loader').call(this, content);
+    const dimensions = (0, image_size_1.default)(this.resourcePath);
+    const options = this.getOptions();
+    const extension = (0, loader_utils_1.interpolateName)(this, '[ext]', options);
+    const dataURL = await (0, getImageMiniatureURL_1.getImageMiniatureDataURL)(content, extension);
+    return result.replace(/^export default (__webpack_public_path__ \+ .+);$/, `const path = $1;
 
 export default path;
 
@@ -25,7 +24,6 @@ export const image = {
   height: ${JSON.stringify(dimensions.height)},
   blurDataURL: ${JSON.stringify(dataURL)},
 };`);
-    });
 }
 exports.default = default_1;
 exports.raw = true;

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/library/webpack/loaders/image-loader/index.ts"],"names":[],"mappings":";;;;AAAA,oEAAgC;AAEhC,+CAA+C;AAC/C,iEAAkE;AAElE;;GAEG;AACH,mBAAwD,OAAe;;QACrE,MAAM,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAC1D,MAAM,UAAU,GAAG,IAAA,oBAAM,EAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QAC7C,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC;QAElC,MAAM,SAAS,GAAG,IAAA,8BAAe,EAAC,IAAI,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;QAE1D,MAAM,OAAO,GAAG,MAAM,IAAA,+CAAwB,EAAC,OAAO,EAAE,SAAS,CAAC,CAAC;QAEnE,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;iBAC5B,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC;GACrC,CACA,CAAC;IACJ,CAAC;CAAA;AAtBD,4BAsBC;AAEY,QAAA,GAAG,GAAG,IAAI,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/library/webpack/loaders/image-loader/index.ts"],"names":[],"mappings":";;;;AAAA,oEAAgC;AAEhC,+CAA+C;AAC/C,iEAAkE;AAElE;;GAEG;AACY,KAAK,oBAAoC,OAAe;IACrE,MAAM,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAC1D,MAAM,UAAU,GAAG,IAAA,oBAAM,EAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IAC7C,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC;IAElC,MAAM,SAAS,GAAG,IAAA,8BAAe,EAAC,IAAI,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;IAE1D,MAAM,OAAO,GAAG,MAAM,IAAA,+CAAwB,EAAC,OAAO,EAAE,SAAS,CAAC,CAAC;IAEnE,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;iBAC5B,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC;GACrC,CACA,CAAC;AACJ,CAAC;AAtBD,4BAsBC;AAEY,QAAA,GAAG,GAAG,IAAI,CAAC"}

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

@@ -14,92 +14,91 @@ const removeExtension = (filename) => {
 const normalizePath = (pathToNormalize) => {
     return pathToNormalize.replace(/\\/g, '\\\\');
 };
-const readdirAsync = (dir, prefix = '', filelist = [], filter = (file) => true) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
-    const files = yield fs_1.default.promises.readdir(dir).catch(() => []);
+const readdirAsync = async (dir, prefix = '', filelist = [], filter = (file) => true) => {
+    const files = await fs_1.default.promises.readdir(dir).catch(() => []);
     for (const file of files) {
         const filepath = path_1.default.join(dir, file);
-        const stat = yield fs_1.default.promises.stat(filepath);
+        const stat = await fs_1.default.promises.stat(filepath);
         if (stat.isDirectory()) {
             // eslint-disable-next-line no-param-reassign
-            filelist = yield readdirAsync(filepath, path_1.default.join(prefix, file), filelist, filter);
+            filelist = await readdirAsync(filepath, path_1.default.join(prefix, file), filelist, filter);
         }
         else if (filter(file)) {
             filelist.push(path_1.default.join(prefix, file));
         }
     }
     return filelist;
-});
+};
 // eslint-disable-next-line func-style
-const pagesResolve = function () {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const { fileSystemPages, rootDir, root, extensions } = this.getOptions();
-        const extensionsRegexp = new RegExp(`\\.(${extensions.map((ext) => ext.slice(1)).join('|')})$`);
-        const fsLayouts = [];
-        const fsErrorBoundaries = [];
-        const fsWildcards = [];
-        this.cacheable(false);
-        // eslint-disable-next-line max-statements
-        const filesToPages = ({ pagesRootDirectory, isRoutes = false, test, }) => tslib_1.__awaiter(this, void 0, void 0, function* () {
-            const pagesDir = path_1.default.resolve(rootDir, root, pagesRootDirectory);
-            this.addContextDependency(pagesDir);
-            // skip service files
-            const pagesFiles = yield readdirAsync(pagesDir, '', [], (name) => name[0] !== '.' && name[0] !== '_' && !name.startsWith(WILDCARD_TOKEN));
-            const fsPages = [];
-            for (const file of pagesFiles) {
-                const extname = path_1.default.extname(file);
-                const normalizedFile = file.replace(/\\/g, '/');
-                if (test.test(normalizedFile)) {
-                    const name = normalizedFile.replace(new RegExp(`\\${extname}$`), '');
-                    const pageComponentName = `@/${pagesRootDirectory}/${name}`;
-                    const pageComponentPath = normalizePath(path_1.default.resolve(pagesDir, name));
-                    const chunkname = pageComponentName.replace(/\//g, '_');
-                    // @example '@/pages/MainPage': lazy(() => import(/* webpackChunkName: "@_pages_MainPage" */ '/tramvai-app/src/pages/MainPage'))
-                    fsPages.push(`'${pageComponentName}': lazy(() => import(/* webpackChunkName: "${chunkname}" */ '${pageComponentPath}'))`);
-                    if (isRoutes) {
-                        const pageDirname = path_1.default.dirname(pageComponentPath);
-                        const layoutPath = path_1.default.join(pageDirname, LAYOUT_FILENAME);
-                        const errorBoundaryPath = path_1.default.join(pageDirname, ERROR_BOUNDARY_FILENAME);
-                        const routeContent = (yield fs_1.default.promises.readdir(pageDirname, { withFileTypes: true }))
-                            .filter((item) => item.isFile())
-                            .map((item) => item.name);
-                        const wildcardPath = routeContent.find((item) => item.includes(WILDCARD_TOKEN));
-                        if (fs_1.default.existsSync(layoutPath)) {
-                            const filename = normalizePath(removeExtension(layoutPath));
-                            // @example '@/pages/MainPage': lazy(() => import(/* webpackChunkName: "@_pages_MainPage__layout" */ '/tramvai-app/src/pages/MainPage_layout'))
-                            fsLayouts.push(`'${pageComponentName}': lazy(() => import(/* webpackChunkName: "${chunkname}__layout" */ '${filename}'))`);
-                        }
-                        if (fs_1.default.existsSync(errorBoundaryPath)) {
-                            const filename = normalizePath(removeExtension(errorBoundaryPath));
-                            // @example '@/pages/MainPage': lazy(() => import(/* webpackChunkName: "@_pages_MainPage__errorBoundary" */ '/tramvai-app/src/pages/MainPage_errorBoundary'))
-                            fsErrorBoundaries.push(`'${pageComponentName}': lazy(() => import(/* webpackChunkName: "${chunkname}__errorBoundary" */ '${filename}'))`);
-                        }
-                        if (wildcardPath !== undefined) {
-                            const componentName = `${pageComponentName}__wildcard`;
-                            const filename = normalizePath(removeExtension(path_1.default.join(pageDirname, wildcardPath)));
-                            // @example '@/pages/MainPage': lazy(() => import(/* webpackChunkName: "@_pages_MainPage__wildcard" */ '/tramvai-app/src/pages/MainPage_wildcard'))
-                            fsWildcards.push(`'${componentName}': lazy(() => import(/* webpackChunkName: "${chunkname}__wildcard" */ '${filename}'))`);
-                        }
+const pagesResolve = async function () {
+    const { fileSystemPages, rootDir, root, extensions } = this.getOptions();
+    const extensionsRegexp = new RegExp(`\\.(${extensions.map((ext) => ext.slice(1)).join('|')})$`);
+    const fsLayouts = [];
+    const fsErrorBoundaries = [];
+    const fsWildcards = [];
+    this.cacheable(false);
+    // eslint-disable-next-line max-statements
+    const filesToPages = async ({ pagesRootDirectory, isRoutes = false, test, }) => {
+        const pagesDir = path_1.default.resolve(rootDir, root, pagesRootDirectory);
+        this.addContextDependency(pagesDir);
+        // skip service files
+        const pagesFiles = await readdirAsync(pagesDir, '', [], (name) => name[0] !== '.' && name[0] !== '_' && !name.startsWith(WILDCARD_TOKEN));
+        const fsPages = [];
+        for (const file of pagesFiles) {
+            const extname = path_1.default.extname(file);
+            const normalizedFile = file.replace(/\\/g, '/');
+            if (test.test(normalizedFile)) {
+                const name = normalizedFile.replace(new RegExp(`\\${extname}$`), '');
+                const pageComponentName = `@/${pagesRootDirectory}/${name}`;
+                const pageComponentPath = normalizePath(path_1.default.resolve(pagesDir, name));
+                const chunkname = pageComponentName.replace(/\//g, '_');
+                // @example '@/pages/MainPage': lazy(() => import(/* webpackChunkName: "@_pages_MainPage" */ '/tramvai-app/src/pages/MainPage'))
+                fsPages.push(`'${pageComponentName}': lazy(() => import(/* webpackChunkName: "${chunkname}" */ '${pageComponentPath}'))`);
+                if (isRoutes) {
+                    const pageDirname = path_1.default.dirname(pageComponentPath);
+                    const layoutPath = path_1.default.join(pageDirname, LAYOUT_FILENAME);
+                    const errorBoundaryPath = path_1.default.join(pageDirname, ERROR_BOUNDARY_FILENAME);
+                    const routeContent = (await fs_1.default.promises.readdir(pageDirname, { withFileTypes: true }))
+                        .filter((item) => item.isFile())
+                        .map((item) => item.name);
+                    const wildcardPath = routeContent.find((item) => item.includes(WILDCARD_TOKEN));
+                    if (fs_1.default.existsSync(layoutPath)) {
+                        const filename = normalizePath(removeExtension(layoutPath));
+                        // @example '@/pages/MainPage': lazy(() => import(/* webpackChunkName: "@_pages_MainPage__layout" */ '/tramvai-app/src/pages/MainPage_layout'))
+                        fsLayouts.push(`'${pageComponentName}': lazy(() => import(/* webpackChunkName: "${chunkname}__layout" */ '${filename}'))`);
+                    }
+                    if (fs_1.default.existsSync(errorBoundaryPath)) {
+                        const filename = normalizePath(removeExtension(errorBoundaryPath));
+                        // @example '@/pages/MainPage': lazy(() => import(/* webpackChunkName: "@_pages_MainPage__errorBoundary" */ '/tramvai-app/src/pages/MainPage_errorBoundary'))
+                        fsErrorBoundaries.push(`'${pageComponentName}': lazy(() => import(/* webpackChunkName: "${chunkname}__errorBoundary" */ '${filename}'))`);
+                    }
+                    if (wildcardPath !== undefined) {
+                        const componentName = `${pageComponentName}__wildcard`;
+                        const filename = normalizePath(removeExtension(path_1.default.join(pageDirname, wildcardPath)));
+                        // @example '@/pages/MainPage': lazy(() => import(/* webpackChunkName: "@_pages_MainPage__wildcard" */ '/tramvai-app/src/pages/MainPage_wildcard'))
+                        fsWildcards.push(`'${componentName}': lazy(() => import(/* webpackChunkName: "${chunkname}__wildcard" */ '${filename}'))`);
                     }
                 }
             }
-            return fsPages;
-        });
-        const fsRoutes = fileSystemPages.routesDir
-            ? yield filesToPages({
-                pagesRootDirectory: fileSystemPages.routesDir,
-                isRoutes: true,
-                test: new RegExp(`index${extensionsRegexp.source}`),
-            })
-            : [];
-        const fsPages = fileSystemPages.pagesDir
-            ? yield filesToPages({
-                pagesRootDirectory: fileSystemPages.pagesDir,
-                test: fileSystemPages.componentsPattern
-                    ? new RegExp(fileSystemPages.componentsPattern)
-                    : extensionsRegexp,
-            })
-            : [];
-        const code = `import { lazy } from '@tramvai/react';
+        }
+        return fsPages;
+    };
+    const fsRoutes = fileSystemPages.routesDir
+        ? await filesToPages({
+            pagesRootDirectory: fileSystemPages.routesDir,
+            isRoutes: true,
+            test: new RegExp(`index${extensionsRegexp.source}`),
+        })
+        : [];
+    const fsPages = fileSystemPages.pagesDir
+        ? await filesToPages({
+            pagesRootDirectory: fileSystemPages.pagesDir,
+            test: fileSystemPages.componentsPattern
+                ? new RegExp(fileSystemPages.componentsPattern)
+                : extensionsRegexp,
+        })
+        : [];
+    const code = `import { lazy } from '@tramvai/react';
 
   export default {
     routes: {
@@ -118,8 +117,7 @@ const pagesResolve = function () {
       ${fsWildcards.join(',\n')}
     },
   }`;
-        return code;
-    });
+    return code;
 };
 exports.default = pagesResolve;
 //# sourceMappingURL=pagesResolve.js.map

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

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

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

@@ -28,7 +28,11 @@ exports.default = (configManager) => (config) => {
         },
     ]);
     config.plugin('define').tap((args) => [
-        Object.assign(Object.assign({}, args[0]), { 'process.env.BROWSER': true, 'process.env.SERVER': false }),
+        {
+            ...args[0],
+            'process.env.BROWSER': true,
+            'process.env.SERVER': false,
+        },
     ]);
     config.plugin('stats-plugin').use(webpack_stats_plugin_1.StatsWriterPlugin, [
         {

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

@@ -1 +1 @@
-{"version":3,"file":"common.js","sourceRoot":"","sources":["../../../../../src/library/webpack/module/client/common.ts"],"names":[],"mappings":";;;AAEA,+DAAyD;AAIzD,+DAA+B;AAC/B,mFAA6C;AAC7C,iFAAiD;AACjD,uFAAuD;AACvD,8GAAoF;AACpF,iDAAoF;AACpF,oEAAwE;AAExE,kBAAe,CAAC,aAA+C,EAAE,EAAE,CAAC,CAAC,MAAc,EAAE,EAAE;IACrF,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IAEtB,MAAM,CAAC,KAAK,CAAC,IAAA,gBAAM,EAAC,aAAa,CAAC,CAAC,CAAC;IAEpC,MAAM,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC;IAE9B,MAAM,CAAC,MAAM;SACV,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC;SAC7B,UAAU,CAAC,EAAE,CAAC;SACd,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC;SAC3B,aAAa,CAAC,MAAM,CAAC;SACrB,QAAQ,CAAC,kBAAkB,CAAC;SAC5B,aAAa,CAAC,wBAAwB,CAAC,CAAC;IAE3C,MAAM,CAAC,KAAK,CAAC,IAAA,0CAAuB,EAAC,aAAa,CAAC,CAAC,CAAC;IAErD,MAAM,CAAC,KAAK,CAAC,IAAA,uBAAa,EAAC,aAAa,CAAC,CAAC,CAAC;IAE3C,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,GAAG,CAAC,kCAA8B,EAAE;QAC/D;YACE,IAAI,EAAE,aAAa,CAAC,IAAI;SACzB;KACF,CAAC,CAAC;IAEH,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC;wCAE/B,IAAI,CAAC,CAAC,CAAC,KACV,qBAAqB,EAAE,IAAI,EAC3B,oBAAoB,EAAE,KAAK;KAE9B,CAAC,CAAC;IAEH,MAAM,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC,GAAG,CAAC,wCAAiB,EAAE;QACnD;YACE,QAAQ,EAAE,YAAY;YACtB,KAAK,EAAE,6BAAqB;YAC5B,MAAM,EAAE,4BAAoB;SAC7B;KACF,CAAC,CAAC;IAEH,MAAM,CAAC,KAAK,CAAC,IAAA,qBAAK,EAAC,aAAa,CAAC,CAAC,CAAC,KAAK,CAAC,IAAA,oBAAU,EAAC,aAAa,CAAC,CAAC,CAAC;AACtE,CAAC,CAAC"}
+{"version":3,"file":"common.js","sourceRoot":"","sources":["../../../../../src/library/webpack/module/client/common.ts"],"names":[],"mappings":";;;AAEA,+DAAyD;AAIzD,+DAA+B;AAC/B,mFAA6C;AAC7C,iFAAiD;AACjD,uFAAuD;AACvD,8GAAoF;AACpF,iDAAoF;AACpF,oEAAwE;AAExE,kBAAe,CAAC,aAA+C,EAAE,EAAE,CAAC,CAAC,MAAc,EAAE,EAAE;IACrF,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IAEtB,MAAM,CAAC,KAAK,CAAC,IAAA,gBAAM,EAAC,aAAa,CAAC,CAAC,CAAC;IAEpC,MAAM,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC;IAE9B,MAAM,CAAC,MAAM;SACV,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC;SAC7B,UAAU,CAAC,EAAE,CAAC;SACd,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC;SAC3B,aAAa,CAAC,MAAM,CAAC;SACrB,QAAQ,CAAC,kBAAkB,CAAC;SAC5B,aAAa,CAAC,wBAAwB,CAAC,CAAC;IAE3C,MAAM,CAAC,KAAK,CAAC,IAAA,0CAAuB,EAAC,aAAa,CAAC,CAAC,CAAC;IAErD,MAAM,CAAC,KAAK,CAAC,IAAA,uBAAa,EAAC,aAAa,CAAC,CAAC,CAAC;IAE3C,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,GAAG,CAAC,kCAA8B,EAAE;QAC/D;YACE,IAAI,EAAE,aAAa,CAAC,IAAI;SACzB;KACF,CAAC,CAAC;IAEH,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC;QACpC;YACE,GAAG,IAAI,CAAC,CAAC,CAAC;YACV,qBAAqB,EAAE,IAAI;YAC3B,oBAAoB,EAAE,KAAK;SAC5B;KACF,CAAC,CAAC;IAEH,MAAM,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC,GAAG,CAAC,wCAAiB,EAAE;QACnD;YACE,QAAQ,EAAE,YAAY;YACtB,KAAK,EAAE,6BAAqB;YAC5B,MAAM,EAAE,4BAAoB;SAC7B;KACF,CAAC,CAAC;IAEH,MAAM,CAAC,KAAK,CAAC,IAAA,qBAAK,EAAC,aAAa,CAAC,CAAC,CAAC,KAAK,CAAC,IAAA,oBAAU,EAAC,aAAa,CAAC,CAAC,CAAC;AACtE,CAAC,CAAC"}

package/lib/library/webpack/module/client/dev.js

@@ -19,7 +19,10 @@ const webpackClientConfig = ({ configManager, showProgress, }) => {
         ]);
     }
     config.plugin('define').tap((args) => [
-        Object.assign(Object.assign({}, args[0]), { 'process.env.NODE_ENV': '"development"' }),
+        {
+            ...args[0],
+            'process.env.NODE_ENV': '"development"',
+        },
     ]);
     return config;
 };

package/lib/library/webpack/module/client/dev.js.map

@@ -1 +1 @@
-{"version":3,"file":"dev.js","sourceRoot":"","sources":["../../../../../src/library/webpack/module/client/dev.ts"],"names":[],"mappings":";;;;AAAA,0EAAmC;AACnC,oEAAoC;AAGpC,8DAA8B;AAC9B,mEAAyC;AAGlC,MAAM,mBAAmB,GAAG,CAAC,EAClC,aAAa,EACb,YAAY,GAIb,EAAE,EAAE;IACH,MAAM,MAAM,GAAG,IAAI,uBAAM,EAAE,CAAC;IAE5B,MAAM,CAAC,KAAK,CAAC,IAAA,gBAAM,EAAC,aAAa,CAAC,CAAC,CAAC;IACpC,MAAM,CAAC,KAAK,CAAC,IAAA,aAAS,EAAC,aAAa,CAAC,CAAC,CAAC;IAEvC,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;IAE3B,IAAI,YAAY,EAAE;QAChB,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,GAAG,CAAC,oBAAU,EAAE;YACxC;gBACE,IAAI,EAAE,eAAe;aACtB;SACF,CAAC,CAAC;KACJ;IAED,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC;wCAE/B,IAAI,CAAC,CAAC,CAAC,KACV,sBAAsB,EAAE,eAAe;KAE1C,CAAC,CAAC;IAEH,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AA9BW,QAAA,mBAAmB,uBA8B9B"}
+{"version":3,"file":"dev.js","sourceRoot":"","sources":["../../../../../src/library/webpack/module/client/dev.ts"],"names":[],"mappings":";;;;AAAA,0EAAmC;AACnC,oEAAoC;AAGpC,8DAA8B;AAC9B,mEAAyC;AAGlC,MAAM,mBAAmB,GAAG,CAAC,EAClC,aAAa,EACb,YAAY,GAIb,EAAE,EAAE;IACH,MAAM,MAAM,GAAG,IAAI,uBAAM,EAAE,CAAC;IAE5B,MAAM,CAAC,KAAK,CAAC,IAAA,gBAAM,EAAC,aAAa,CAAC,CAAC,CAAC;IACpC,MAAM,CAAC,KAAK,CAAC,IAAA,aAAS,EAAC,aAAa,CAAC,CAAC,CAAC;IAEvC,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;IAE3B,IAAI,YAAY,EAAE;QAChB,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,GAAG,CAAC,oBAAU,EAAE;YACxC;gBACE,IAAI,EAAE,eAAe;aACtB;SACF,CAAC,CAAC;KACJ;IAED,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC;QACpC;YACE,GAAG,IAAI,CAAC,CAAC,CAAC;YACV,sBAAsB,EAAE,eAAe;SACxC;KACF,CAAC,CAAC;IAEH,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AA9BW,QAAA,mBAAmB,uBA8B9B"}

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

@@ -33,7 +33,10 @@ exports.default = (configManager) => (config) => {
         },
     ]);
     config.plugin('define').tap((args) => [
-        Object.assign(Object.assign({}, args[0]), { 'process.env.MODULE': true }),
+        {
+            ...args[0],
+            'process.env.MODULE': true,
+        },
     ]);
     config
         .batch((0, js_1.default)(configManager))

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

@@ -1 +1 @@
-{"version":3,"file":"common.js","sourceRoot":"","sources":["../../../../src/library/webpack/module/common.ts"],"names":[],"mappings":";;;AACA,8DAA8B;AAC9B,wDAAwB;AACxB,oEAAoC;AACpC,kEAAoC;AACpC,6FAA6D;AAK7D,8DAA8B;AAC9B,8DAA8B;AAC9B,gEAAgC;AAChC,8EAA8C;AAC9C,uDAAoD;AAEpD,kBAAe,CAAC,aAA+C,EAAE,EAAE,CAAC,CAAC,MAAc,EAAE,EAAE;IACrF,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,GAAG,aAAa,CAAC;IAE9C,MAAM,iBAAiB,GACrB,aAAa,CAAC,GAAG,KAAK,YAAY;QAChC,CAAC,CAAC,GAAG,IAAI,aAAa;QACtB,CAAC,CAAC,GAAG,IAAI,mCAAmC,CAAC;IACjD,MAAM,UAAU,GAAG,oCAAoC,IAAI,WAAW,IAAI,IAAI,OAAO,IAAI,CAAC;IAE1F,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,cAAI,CAAC,OAAO,CAAC,aAAa,CAAC,OAAO,EAAE,GAAG,IAAI,QAAQ,CAAC,CAAC,CAAC;IAE7E,MAAM,CAAC,SAAS,CAAC,mBAAS,CAAC,CAAC;IAE5B,MAAM,CAAC,KAAK,CAAC,IAAA,oBAAU,EAAC,aAAa,CAAC,CAAC,CAAC;IAExC,MAAM,CAAC,KAAK,CAAC,IAAA,cAAM,EAAC,aAAa,CAAC,CAAC,CAAC;IAEpC,MAAM,CAAC,KAAK,CAAC,IAAA,yBAAW,EAAC,aAAa,CAAC,CAAC,CAAC;IAEzC,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,GAAG,CAAC,iBAAO,CAAC,QAAQ,CAAC,qBAAqB,EAAE;QACvE;YACE,SAAS,EAAE,CAAC;SACb;KACF,CAAC,CAAC;IAEH,MAAM,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC,GAAG,CAAC,2BAAiB,EAAE;QACnD;YACE,UAAU;SACX;KACF,CAAC,CAAC;IAEH,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC;wCAE/B,IAAI,CAAC,CAAC,CAAC,KACV,oBAAoB,EAAE,IAAI;KAE7B,CAAC,CAAC;IAEH,MAAM;SACH,KAAK,CAAC,IAAA,YAAE,EAAC,aAAa,CAAC,CAAC;SACxB,KAAK,CAAC,IAAA,YAAE,EAAC,aAAa,CAAC,CAAC;SACxB,KAAK,CACJ,IAAA,aAAG,EAAC,aAAa,EAAE;QACjB,cAAc,EAAE,iBAAiB;KAClC,CAAC,CACH,CAAC;AACN,CAAC,CAAC"}
+{"version":3,"file":"common.js","sourceRoot":"","sources":["../../../../src/library/webpack/module/common.ts"],"names":[],"mappings":";;;AACA,8DAA8B;AAC9B,wDAAwB;AACxB,oEAAoC;AACpC,kEAAoC;AACpC,6FAA6D;AAK7D,8DAA8B;AAC9B,8DAA8B;AAC9B,gEAAgC;AAChC,8EAA8C;AAC9C,uDAAoD;AAEpD,kBAAe,CAAC,aAA+C,EAAE,EAAE,CAAC,CAAC,MAAc,EAAE,EAAE;IACrF,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,GAAG,aAAa,CAAC;IAE9C,MAAM,iBAAiB,GACrB,aAAa,CAAC,GAAG,KAAK,YAAY;QAChC,CAAC,CAAC,GAAG,IAAI,aAAa;QACtB,CAAC,CAAC,GAAG,IAAI,mCAAmC,CAAC;IACjD,MAAM,UAAU,GAAG,oCAAoC,IAAI,WAAW,IAAI,IAAI,OAAO,IAAI,CAAC;IAE1F,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,cAAI,CAAC,OAAO,CAAC,aAAa,CAAC,OAAO,EAAE,GAAG,IAAI,QAAQ,CAAC,CAAC,CAAC;IAE7E,MAAM,CAAC,SAAS,CAAC,mBAAS,CAAC,CAAC;IAE5B,MAAM,CAAC,KAAK,CAAC,IAAA,oBAAU,EAAC,aAAa,CAAC,CAAC,CAAC;IAExC,MAAM,CAAC,KAAK,CAAC,IAAA,cAAM,EAAC,aAAa,CAAC,CAAC,CAAC;IAEpC,MAAM,CAAC,KAAK,CAAC,IAAA,yBAAW,EAAC,aAAa,CAAC,CAAC,CAAC;IAEzC,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,GAAG,CAAC,iBAAO,CAAC,QAAQ,CAAC,qBAAqB,EAAE;QACvE;YACE,SAAS,EAAE,CAAC;SACb;KACF,CAAC,CAAC;IAEH,MAAM,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC,GAAG,CAAC,2BAAiB,EAAE;QACnD;YACE,UAAU;SACX;KACF,CAAC,CAAC;IAEH,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC;QACpC;YACE,GAAG,IAAI,CAAC,CAAC,CAAC;YACV,oBAAoB,EAAE,IAAI;SAC3B;KACF,CAAC,CAAC;IAEH,MAAM;SACH,KAAK,CAAC,IAAA,YAAE,EAAC,aAAa,CAAC,CAAC;SACxB,KAAK,CAAC,IAAA,YAAE,EAAC,aAAa,CAAC,CAAC;SACxB,KAAK,CACJ,IAAA,aAAG,EAAC,aAAa,EAAE;QACjB,cAAc,EAAE,iBAAiB;KAClC,CAAC,CACH,CAAC;AACN,CAAC,CAAC"}

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

@@ -20,7 +20,12 @@ exports.default = (configManager) => (config) => {
         chunkFilename: null,
     }));
     config.plugin('define').tap((args) => [
-        Object.assign(Object.assign({}, args[0]), { 'process.env.BROWSER': false, 'process.env.SERVER': true, 'global.GENTLY': false }),
+        {
+            ...args[0],
+            'process.env.BROWSER': false,
+            'process.env.SERVER': true,
+            'global.GENTLY': false,
+        },
     ]);
     config.batch((0, filesServer_1.default)(configManager));
 };

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

@@ -1 +1 @@
-{"version":3,"file":"common.js","sourceRoot":"","sources":["../../../../../src/library/webpack/module/server/common.ts"],"names":[],"mappings":";;;AAKA,+DAA+B;AAC/B,mFAA6C;AAC7C,oEAAwE;AAExE,kBAAe,CAAC,aAA+C,EAAE,EAAE,CAAC,CAAC,MAAc,EAAE,EAAE;IACrF,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IAEtB,MAAM,CAAC,KAAK,CAAC,IAAA,gBAAM,EAAC,aAAa,CAAC,CAAC,CAAC;IAEpC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IAEtB,MAAM,CAAC,MAAM;SACV,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC;SAC7B,UAAU,CAAC,EAAE,CAAC;SACd,QAAQ,CAAC,kBAAkB,CAAC;SAC5B,aAAa,CAAC,wBAAwB,CAAC;SACvC,aAAa,CAAC,WAAW,CAAC,CAAC;IAE9B,MAAM,CAAC,KAAK,CACV,IAAA,0CAAuB,EAAC,aAAa,EAAE;QACrC,uFAAuF;QACvF,QAAQ,EAAE,mBAAmB;QAC7B,aAAa,EAAE,IAAI;KACpB,CAAC,CACH,CAAC;IAEF,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC;wCAE/B,IAAI,CAAC,CAAC,CAAC,KACV,qBAAqB,EAAE,KAAK,EAC5B,oBAAoB,EAAE,IAAI,EAC1B,eAAe,EAAE,KAAK;KAEzB,CAAC,CAAC;IAEH,MAAM,CAAC,KAAK,CAAC,IAAA,qBAAK,EAAC,aAAa,CAAC,CAAC,CAAC;AACrC,CAAC,CAAC"}
+{"version":3,"file":"common.js","sourceRoot":"","sources":["../../../../../src/library/webpack/module/server/common.ts"],"names":[],"mappings":";;;AAKA,+DAA+B;AAC/B,mFAA6C;AAC7C,oEAAwE;AAExE,kBAAe,CAAC,aAA+C,EAAE,EAAE,CAAC,CAAC,MAAc,EAAE,EAAE;IACrF,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IAEtB,MAAM,CAAC,KAAK,CAAC,IAAA,gBAAM,EAAC,aAAa,CAAC,CAAC,CAAC;IAEpC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IAEtB,MAAM,CAAC,MAAM;SACV,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC;SAC7B,UAAU,CAAC,EAAE,CAAC;SACd,QAAQ,CAAC,kBAAkB,CAAC;SAC5B,aAAa,CAAC,wBAAwB,CAAC;SACvC,aAAa,CAAC,WAAW,CAAC,CAAC;IAE9B,MAAM,CAAC,KAAK,CACV,IAAA,0CAAuB,EAAC,aAAa,EAAE;QACrC,uFAAuF;QACvF,QAAQ,EAAE,mBAAmB;QAC7B,aAAa,EAAE,IAAI;KACpB,CAAC,CACH,CAAC;IAEF,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC;QACpC;YACE,GAAG,IAAI,CAAC,CAAC,CAAC;YACV,qBAAqB,EAAE,KAAK;YAC5B,oBAAoB,EAAE,IAAI;YAC1B,eAAe,EAAE,KAAK;SACvB;KACF,CAAC,CAAC;IAEH,MAAM,CAAC,KAAK,CAAC,IAAA,qBAAK,EAAC,aAAa,CAAC,CAAC,CAAC;AACrC,CAAC,CAAC"}

package/lib/library/webpack/module/server/dev.js

@@ -19,7 +19,10 @@ const webpackServerConfig = ({ configManager, showProgress, }) => {
         ]);
     }
     config.plugin('define').tap((args) => [
-        Object.assign(Object.assign({}, args[0]), { 'process.env.NODE_ENV': '"development"' }),
+        {
+            ...args[0],
+            'process.env.NODE_ENV': '"development"',
+        },
     ]);
     return config;
 };

package/lib/library/webpack/module/server/dev.js.map

@@ -1 +1 @@
-{"version":3,"file":"dev.js","sourceRoot":"","sources":["../../../../../src/library/webpack/module/server/dev.ts"],"names":[],"mappings":";;;;AAAA,0EAAmC;AACnC,oEAAoC;AAGpC,8DAA8B;AAC9B,mEAAyC;AAGlC,MAAM,mBAAmB,GAAG,CAAC,EAClC,aAAa,EACb,YAAY,GAIb,EAAE,EAAE;IACH,MAAM,MAAM,GAAG,IAAI,uBAAM,EAAE,CAAC;IAE5B,MAAM,CAAC,KAAK,CAAC,IAAA,gBAAM,EAAC,aAAa,CAAC,CAAC,CAAC;IACpC,MAAM,CAAC,KAAK,CAAC,IAAA,aAAS,EAAC,aAAa,CAAC,CAAC,CAAC;IAEvC,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;IAE3B,IAAI,YAAY,EAAE;QAChB,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,GAAG,CAAC,oBAAU,EAAE;YACxC;gBACE,IAAI,EAAE,eAAe;aACtB;SACF,CAAC,CAAC;KACJ;IAED,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC;wCAE/B,IAAI,CAAC,CAAC,CAAC,KACV,sBAAsB,EAAE,eAAe;KAE1C,CAAC,CAAC;IAEH,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AA9BW,QAAA,mBAAmB,uBA8B9B"}
+{"version":3,"file":"dev.js","sourceRoot":"","sources":["../../../../../src/library/webpack/module/server/dev.ts"],"names":[],"mappings":";;;;AAAA,0EAAmC;AACnC,oEAAoC;AAGpC,8DAA8B;AAC9B,mEAAyC;AAGlC,MAAM,mBAAmB,GAAG,CAAC,EAClC,aAAa,EACb,YAAY,GAIb,EAAE,EAAE;IACH,MAAM,MAAM,GAAG,IAAI,uBAAM,EAAE,CAAC;IAE5B,MAAM,CAAC,KAAK,CAAC,IAAA,gBAAM,EAAC,aAAa,CAAC,CAAC,CAAC;IACpC,MAAM,CAAC,KAAK,CAAC,IAAA,aAAS,EAAC,aAAa,CAAC,CAAC,CAAC;IAEvC,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;IAE3B,IAAI,YAAY,EAAE;QAChB,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,GAAG,CAAC,oBAAU,EAAE;YACxC;gBACE,IAAI,EAAE,eAAe;aACtB;SACF,CAAC,CAAC;KACJ;IAED,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC;QACpC;YACE,GAAG,IAAI,CAAC,CAAC,CAAC;YACV,sBAAsB,EAAE,eAAe;SACxC;KACF,CAAC,CAAC;IAEH,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AA9BW,QAAA,mBAAmB,uBA8B9B"}

package/lib/library/webpack/plugins/ModuleFederationFixRange.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ModuleFederationFixRange = void 0;
-const tslib_1 = require("tslib");
 const webpack_1 = require("webpack");
 // eslint-disable-next-line no-restricted-imports
 const semver_1 = require("webpack/lib/util/semver");
@@ -11,7 +10,7 @@ class ModuleFederationFixRange {
     constructor({ flexibleTramvaiVersions }) {
         // { name: { importResolved: { number }} }
         this.sharedModules = new Map();
-        this.flexibleTramvaiVersions = flexibleTramvaiVersions !== null && flexibleTramvaiVersions !== void 0 ? flexibleTramvaiVersions : false;
+        this.flexibleTramvaiVersions = flexibleTramvaiVersions ?? false;
     }
     apply(compiler) {
         compiler.hooks.thisCompilation.tap(PLUGIN_NAME, (compilation, { normalModuleFactory }) => {
@@ -20,9 +19,9 @@ class ModuleFederationFixRange {
                     if (tap.name === 'ConsumeSharedPlugin') {
                         const originalFn = tap.fn;
                         // eslint-disable-next-line no-param-reassign
-                        tap.fn = (...args) => tslib_1.__awaiter(this, void 0, void 0, function* () {
-                            const module = yield originalFn(...args);
-                            if (module === null || module === void 0 ? void 0 : module.options) {
+                        tap.fn = async (...args) => {
+                            const module = await originalFn(...args);
+                            if (module?.options) {
                                 const { shareKey: name, importResolved } = module.options;
                                 let shared = this.sharedModules.get(name);
                                 if (!shared) {
@@ -38,14 +37,13 @@ class ModuleFederationFixRange {
                                 modules.add(module);
                             }
                             return module;
-                        });
+                        };
                     }
                     return tap;
                 },
             });
             // eslint-disable-next-line max-statements
             compilation.hooks.optimizeDependencies.tap(PLUGIN_NAME, () => {
-                var _a, _b, _c;
                 for (const [name, sharedModulesByName] of this.sharedModules.entries()) {
                     const hasDuplicates = sharedModulesByName.size > 1;
                     for (const [importResolved, sharedModulesByPath] of sharedModulesByName.entries()) {
@@ -60,9 +58,9 @@ class ModuleFederationFixRange {
                         for (const sharedModule of sharedModulesByPath) {
                             const connections = compilation.moduleGraph.getOutgoingConnections(sharedModule);
                             for (const { module } of connections) {
-                                const resolvedVersion = (_b = (_a = module.resourceResolveData) === null || _a === void 0 ? void 0 : _a.descriptionFileData) === null || _b === void 0 ? void 0 : _b.version;
+                                const resolvedVersion = module.resourceResolveData?.descriptionFileData?.version;
                                 this.fixVersionRange(sharedModule, resolvedVersion);
-                                const requiredVersion = (_c = sharedModule === null || sharedModule === void 0 ? void 0 : sharedModule.options) === null || _c === void 0 ? void 0 : _c.requiredVersion;
+                                const requiredVersion = sharedModule?.options?.requiredVersion;
                                 if (requiredVersion && resolvedVersion) {
                                     if ((0, semver_1.satisfy)(requiredVersion, resolvedVersion)) {
                                         validModule = sharedModule;

package/lib/library/webpack/plugins/ModuleFederationFixRange.js.map

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

package/lib/library/webpack/plugins/PwaIconsPlugin.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PwaIconsPlugin = void 0;
-const tslib_1 = require("tslib");
 const pluginName = 'PwaIconsPlugin';
 class PwaIconsPlugin {
     constructor(options) {
@@ -22,11 +21,11 @@ class PwaIconsPlugin {
                 name: pluginName,
                 // to work before WebManifestPlugin
                 stage: Compilation.PROCESS_ASSETS_STAGE_ADDITIONS - 1,
-            }, () => tslib_1.__awaiter(this, void 0, void 0, function* () {
+            }, async () => {
                 try {
                     const sharp = require('sharp');
                     // check icon source file updates
-                    const nextHash = yield new Promise((resolve) => {
+                    const nextHash = await new Promise((resolve) => {
                         compilation.fileSystemInfo.getFileHash(src, (_, hash) => {
                             resolve(hash);
                         });
@@ -55,7 +54,7 @@ class PwaIconsPlugin {
                             content,
                         }));
                     });
-                    const results = yield Promise.all(promises);
+                    const results = await Promise.all(promises);
                     results.forEach(({ filename, content }, i) => {
                         const source = new RawSource(content);
                         const asset = compilation.getAsset(filename);
@@ -71,7 +70,7 @@ class PwaIconsPlugin {
                     // @todo: throw error?
                     console.error('PWA icons processing error:', e);
                 }
-            }));
+            });
         });
     }
 }

package/lib/library/webpack/plugins/PwaIconsPlugin.js.map

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

package/lib/library/webpack/plugins/RuntimePathPlugin.js

@@ -10,9 +10,8 @@ class RuntimePathPlugin {
         this.options = options;
     }
     apply(compiler) {
-        var _a;
         const publicPathEval = this.options.publicPath;
-        const compilerPublicPath = (_a = compiler.options.output.publicPath) !== null && _a !== void 0 ? _a : '';
+        const compilerPublicPath = compiler.options.output.publicPath ?? '';
         const defaultPublicPath = compilerPublicPath === 'auto' ? compilerPublicPath : `"${compilerPublicPath}"`;
         compiler.hooks.thisCompilation.tap(PLUGIN_NAME, (compilation) => {
             compilation.hooks.runtimeRequirementInTree

package/lib/library/webpack/plugins/RuntimePathPlugin.js.map

@@ -1 +1 @@
-{"version":3,"file":"RuntimePathPlugin.js","sourceRoot":"","sources":["../../../../src/library/webpack/plugins/RuntimePathPlugin.ts"],"names":[],"mappings":";;AAAA,qCAAwD;AAIxD,MAAM,WAAW,GAAG,mBAAmB,CAAC;AAMxC;;GAEG;AACH,MAAqB,iBAAiB;IAGpC,YAAY,OAAgB;QAC1B,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IACzB,CAAC;IAED,KAAK,CAAC,QAAkB;;QACtB,MAAM,cAAc,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC;QAC/C,MAAM,kBAAkB,GAAG,MAAA,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,UAAU,mCAAI,EAAE,CAAC;QACpE,MAAM,iBAAiB,GACrB,kBAAkB,KAAK,MAAM,CAAC,CAAC,CAAC,kBAAkB,CAAC,CAAC,CAAC,IAAI,kBAAkB,GAAG,CAAC;QAEjF,QAAQ,CAAC,KAAK,CAAC,eAAe,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC,WAAW,EAAE,EAAE;YAC9D,WAAW,CAAC,KAAK,CAAC,wBAAwB;iBACvC,GAAG,CAAC,wBAAc,CAAC,UAAU,CAAC;iBAC9B,GAAG,CAAC,WAAW,EAAE,CAAC,KAAK,EAAE,EAAE;gBAC1B,gGAAgG;gBAChG,qJAAqJ;gBACrJ,wHAAwH;gBACxH,wDAAwD;gBACxD,MAAM,OAAO,GAAG,WAAW,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;gBAE/D,WAAW,CAAC,gBAAgB,CAC1B,KAAK,EACL,IAAK,KAAM,SAAQ,uBAAa;oBAC9B,QAAQ;wBACN,6BAA6B;wBAC7B,OAAO,GAAG,wBAAc,CAAC,UAAU,MACjC,OAAO,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,iBAC7B,GAAG,CAAC;oBACN,CAAC;iBACM,CAAC,qBAAqB,CAAC,CACjC,CAAC;gBAEF,uDAAuD;gBACvD,OAAO,IAAI,CAAC;YACd,CAAC,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;IACL,CAAC;CACF;AAxCD,oCAwCC"}
+{"version":3,"file":"RuntimePathPlugin.js","sourceRoot":"","sources":["../../../../src/library/webpack/plugins/RuntimePathPlugin.ts"],"names":[],"mappings":";;AAAA,qCAAwD;AAIxD,MAAM,WAAW,GAAG,mBAAmB,CAAC;AAMxC;;GAEG;AACH,MAAqB,iBAAiB;IAGpC,YAAY,OAAgB;QAC1B,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IACzB,CAAC;IAED,KAAK,CAAC,QAAkB;QACtB,MAAM,cAAc,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC;QAC/C,MAAM,kBAAkB,GAAG,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,UAAU,IAAI,EAAE,CAAC;QACpE,MAAM,iBAAiB,GACrB,kBAAkB,KAAK,MAAM,CAAC,CAAC,CAAC,kBAAkB,CAAC,CAAC,CAAC,IAAI,kBAAkB,GAAG,CAAC;QAEjF,QAAQ,CAAC,KAAK,CAAC,eAAe,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC,WAAW,EAAE,EAAE;YAC9D,WAAW,CAAC,KAAK,CAAC,wBAAwB;iBACvC,GAAG,CAAC,wBAAc,CAAC,UAAU,CAAC;iBAC9B,GAAG,CAAC,WAAW,EAAE,CAAC,KAAK,EAAE,EAAE;gBAC1B,gGAAgG;gBAChG,qJAAqJ;gBACrJ,wHAAwH;gBACxH,wDAAwD;gBACxD,MAAM,OAAO,GAAG,WAAW,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;gBAE/D,WAAW,CAAC,gBAAgB,CAC1B,KAAK,EACL,IAAK,KAAM,SAAQ,uBAAa;oBAC9B,QAAQ;wBACN,6BAA6B;wBAC7B,OAAO,GAAG,wBAAc,CAAC,UAAU,MACjC,OAAO,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,iBAC7B,GAAG,CAAC;oBACN,CAAC;iBACM,CAAC,qBAAqB,CAAC,CACjC,CAAC;gBAEF,uDAAuD;gBACvD,OAAO,IAAI,CAAC;YACd,CAAC,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;IACL,CAAC;CACF;AAxCD,oCAwCC"}