@tramvai/cli 2.111.1 → 2.117.0

package/src/builder/webpack/utils/maxMemoryRss.ts

@@ -0,0 +1,12 @@
+export const maxMemoryRss = () => {
+  let maxMemory = process.memoryUsage.rss();
+
+  const interval = setInterval(() => {
+    maxMemory = Math.max(maxMemory, process.memoryUsage.rss());
+  }, 5000);
+
+  return () => {
+    clearInterval(interval);
+    return maxMemory;
+  };
+};

package/src/builder/webpack/utils/runWebpack.ts

@@ -3,6 +3,15 @@ import type { Compiler, MultiCompiler } from 'webpack';
 export const runWebpack = (compiler: Compiler | MultiCompiler) => {
   return new Promise<void>((resolve, reject) => {
     compiler.run((err, stats) => {
+      console.warn(
+        stats.toString({
+          all: false,
+          colors: true,
+          warnings: true,
+          errors: true,
+        })
+      );
+
       if (err || stats.hasErrors()) {
         return reject(
           err ||

package/src/commands/benchmark/benchmark.ts

@@ -1,4 +1,5 @@
 import mdtable from 'mdtable';
+import prettyBytes from 'pretty-bytes';
 import type { Context } from '../../models/context';
 import type { CommandResult } from '../../models/command';
 import type { Result } from '../../api/benchmark';
@@ -7,29 +8,38 @@ import { app } from '../index';
 
 const roundStats = (n: number) => Math.round(100 * n) / 100;
 
-const formatStats = (stats: Result[string]['client']) => {
+const formatTimeStats = (stats: Result[string]['client']) => {
   return `${roundStats(stats.mean)}ms ± ${roundStats(stats.variance)}%`;
 };
 
+const formatMemoryStats = (stats: Result[string]['client']) => {
+  const value = prettyBytes(stats.mean, {
+    maximumFractionDigits: 2,
+  });
+
+  return `${value} ± ${roundStats(stats.variance)}%`;
+};
+
 const formatStatsTable = (stats: Result) => {
-  const header = [] as string[];
-  const alignment = [] as string[];
-  const row = [] as string[];
+  const header = [''] as string[];
+  const alignment = ['C'] as string[];
+  const rows = [['time'], ['mem']] as string[][];
 
   for (const key in stats) {
     header.push(key);
     alignment.push('C');
 
-    const { client, server } = stats[key];
+    const { client, server, maxMemoryRss } = stats[key];
 
-    row.push(`${formatStats(client)} / ${formatStats(server)}`);
+    rows[0].push(`${formatTimeStats(client)} / ${formatTimeStats(server)}`);
+    rows[1].push(formatMemoryStats(maxMemoryRss));
   }
 
   return mdtable(
     {
       header,
       alignment,
-      rows: [row],
+      rows,
     },
     {
       borders: true,

package/src/config/constants.ts

@@ -1,4 +1,4 @@
-export const extensions = ['.js', '.jsx', '.ts', '.tsx'];
+export const extensions = ['.mjs', '.js', '.jsx', '.ts', '.tsx'];
 
 export const DEBUG_ARGV = ['--inspect', '-r', 'source-map-support/register'];
 

package/src/di/providers/builder.ts

@@ -7,6 +7,7 @@ import {
   ABSTRACT_BUILDER_FACTORY_TOKEN,
   BUILDER_FACTORY_TOKEN,
 } from '../tokens/builder';
+import { COMMAND_PARAMETERS_TOKEN, WITH_BUILD_STATS_TOKEN } from '../tokens';
 
 export const builderProviders: Provider[] = [
   provide({
@@ -61,4 +62,13 @@ next builders are available: "${[...builderMap.keys()]}"`);
       builderFactories: BUILDER_MODULE_TOKEN as any as typeof BUILDER_MODULE_TOKEN[],
     },
   }),
+  {
+    provide: WITH_BUILD_STATS_TOKEN,
+    useFactory: ({ params }) => {
+      return !!params.withBuildStats;
+    },
+    deps: {
+      params: COMMAND_PARAMETERS_TOKEN,
+    },
+  },
 ];

package/src/di/tokens/builder.ts

@@ -15,3 +15,5 @@ export const BUILDER_MODULE_TOKEN = createToken<BuilderModule<any>>('builder mod
 
 export const ABSTRACT_BUILDER_FACTORY_TOKEN =
   createToken<AbstractBuilderFactory>('builder abstractFactory');
+
+export const WITH_BUILD_STATS_TOKEN = createToken<boolean>('builder withBuildStats');

package/src/library/babel/plugins/fill-action-name.ts

@@ -4,8 +4,7 @@ const contextRe = /[\\/](Client)?Context.[jt]s$/;
 /** @deprecated */
 module.exports = function plugin({ types }) {
   function getAssignStatement(node) {
-    // eslint-disable-line max-params
-    if (!node.name) {
+    if (!node || !node.name) {
       return;
     }
 

package/src/library/swc/__integration__/__snapshots__/swc.build.test.ts.snap

@@ -13,20 +13,11 @@ exports[`client-legacy: create-token-pure.ts 1`] = `
 `;
 
 exports[`client-legacy: images/logo.svg\\?react 1`] = `
-"              /* harmony import */ var react_jsx_runtime__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("webpack/sharing/consume/default/react/jsx-runtime/react/jsx-runtime");
-              /* harmony import */              function _extends() {
-                  return _extends = Object.assign || function(target) {
-                      for (var i = 1; i < arguments.length; i++) {
-                          var source = arguments[i];
-                          for (var key in source) Object.prototype.hasOwnProperty.call(source, key) && (target[key] = source[key]);
-                      }
-                      return target;
-                  }, _extends.apply(this, arguments);
-              }
-              __webpack_require__("webpack/sharing/consume/default/react/react"), 
+"              /* harmony import */ var _swc_helpers_extends__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/@swc/helpers/esm/_extends.js"), react_jsx_runtime__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("webpack/sharing/consume/default/react/jsx-runtime/react/jsx-runtime");
+              /* harmony import */              __webpack_require__("webpack/sharing/consume/default/react/react"), 
               /* harmony default export */ __webpack_exports__.Z = function(props) {
                   /*#__PURE__*/
-                  return (0, react_jsx_runtime__WEBPACK_IMPORTED_MODULE_0__.jsxs)("svg", _extends({
+                  return (0, react_jsx_runtime__WEBPACK_IMPORTED_MODULE_0__.jsxs)("svg", (0, _swc_helpers_extends__WEBPACK_IMPORTED_MODULE_2__._)({
                       xmlns: "http://www.w3.org/2000/svg",
                       viewBox: "0 0 80.9 72.2"
                   }, props, {
@@ -202,18 +193,10 @@ exports[`client-modern: images/logo.svg\\?react 1`] = `
                       return __WEBPACK_DEFAULT_EXPORT__;
                   }
                   /* harmony export */              });
-              /* harmony import */ var react_jsx_runtime__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("webpack/sharing/consume/default/react/jsx-runtime/react/jsx-runtime");
-              /* harmony import */              function _extends() {
-                  return _extends = Object.assign || function(target) {
-                      for (var i = 1; i < arguments.length; i++) {
-                          var source = arguments[i];
-                          for (var key in source) Object.prototype.hasOwnProperty.call(source, key) && (target[key] = source[key]);
-                      }
-                      return target;
-                  }, _extends.apply(this, arguments);
-              }
-              __webpack_require__("webpack/sharing/consume/default/react/react");
-              const __WEBPACK_DEFAULT_EXPORT__ = props => /*#__PURE__*/ (0, react_jsx_runtime__WEBPACK_IMPORTED_MODULE_0__.jsxs)("svg", _extends({
+              /* harmony import */ var _swc_helpers_extends__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/@swc/helpers/esm/_extends.js"), react_jsx_runtime__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("webpack/sharing/consume/default/react/jsx-runtime/react/jsx-runtime");
+              /* harmony import */              __webpack_require__("webpack/sharing/consume/default/react/react");
+              const __WEBPACK_DEFAULT_EXPORT__ = props => /*#__PURE__*/ (0, react_jsx_runtime__WEBPACK_IMPORTED_MODULE_0__.jsxs)("svg", (0, 
+              _swc_helpers_extends__WEBPACK_IMPORTED_MODULE_2__._)({
                   xmlns: "http://www.w3.org/2000/svg",
                   viewBox: "0 0 80.9 72.2"
               }, props, {

package/src/library/swc/__integration__/__snapshots__/swc.start.test.ts.snap

@@ -52,27 +52,15 @@ exports[`client: images/logo.svg\\?react 1`] = `
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   "default": function() { return __WEBPACK_DEFAULT_EXPORT__; }
 /* harmony export */ });
+/* harmony import */ var _swc_helpers_extends__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/@swc/helpers/esm/_extends.js");
 /* harmony import */ var react_jsx_dev_runtime__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("webpack/sharing/consume/default/react/jsx-dev-runtime/react/jsx-dev-runtime");
 /* harmony import */ var react_jsx_dev_runtime__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(react_jsx_dev_runtime__WEBPACK_IMPORTED_MODULE_0__);
 /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("webpack/sharing/consume/default/react/react");
 /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_1__);
-function _extends() {
-    _extends = Object.assign || function(target) {
-        for(var i = 1; i < arguments.length; i++){
-            var source = arguments[i];
-            for(var key in source){
-                if (Object.prototype.hasOwnProperty.call(source, key)) {
-                    target[key] = source[key];
-                }
-            }
-        }
-        return target;
-    };
-    return _extends.apply(this, arguments);
-}
 
 
-const SvgLogo = (props)=>/*#__PURE__*/ (0,react_jsx_dev_runtime__WEBPACK_IMPORTED_MODULE_0__.jsxDEV)("svg", _extends({
+
+const SvgLogo = (props)=>/*#__PURE__*/ (0,react_jsx_dev_runtime__WEBPACK_IMPORTED_MODULE_0__.jsxDEV)("svg", (0,_swc_helpers_extends__WEBPACK_IMPORTED_MODULE_2__._)({
         xmlns: "http://www.w3.org/2000/svg",
         viewBox: "0 0 80.9 72.2"
     }, props, {
@@ -301,17 +289,17 @@ exports[`client: provider-stack.ts 1`] = `
 /* provided dependency */ var __react_refresh_utils__ = __webpack_require__("../../node_modules/@pmmmwh/react-refresh-webpack-plugin/lib/runtime/RefreshUtils.js");
 __webpack_require__.$Refresh$.runtime = __webpack_require__("../../node_modules/react-refresh/runtime.js");
 
-var _ref0;
+var _ref;
 
 
 const providers = [
-    (0,_tramvai_core__WEBPACK_IMPORTED_MODULE_0__.provide)((_ref0 = {
+    (0,_tramvai_core__WEBPACK_IMPORTED_MODULE_0__.provide)((_ref = {
         provide: _create_token_pure__WEBPACK_IMPORTED_MODULE_1__.TEST_TOKEN,
         useValue: "test"
-    }, Object.defineProperty(_ref0, "__stack", {
+    }, Object.defineProperty(_ref, "__stack", {
         enumerable: false,
         value: new globalThis.Error().stack
-    }), _ref0))
+    }), _ref))
 ];
 
 
@@ -692,17 +680,17 @@ exports[`server: provider-stack.ts 1`] = `
 /* harmony export */ });
 /* harmony import */ var _tramvai_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("./src/library/swc/__integration__/mocks/tramvai-core.ts");
 /* harmony import */ var _create_token_pure__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("./src/library/swc/__integration__/create-token-pure.ts");
-var _ref0;
+var _ref;
 
 
 const providers = [
-    (0,_tramvai_core__WEBPACK_IMPORTED_MODULE_0__.provide)((_ref0 = {
+    (0,_tramvai_core__WEBPACK_IMPORTED_MODULE_0__.provide)((_ref = {
         provide: _create_token_pure__WEBPACK_IMPORTED_MODULE_1__.TEST_TOKEN,
         useValue: "test"
-    }, Object.defineProperty(_ref0, "__stack", {
+    }, Object.defineProperty(_ref, "__stack", {
         enumerable: false,
         value: new globalThis.Error().stack
-    }), _ref0))
+    }), _ref))
 ];
 
 

package/src/library/swc/index.ts

@@ -5,7 +5,7 @@ import browserslist from 'browserslist';
 import envTargets from '@tinkoff/browserslist-config';
 import { sync as resolve } from 'resolve';
 import findCacheDir from 'find-cache-dir';
-import type { Config } from '@swc/core';
+import type { Options as SwcOptions } from '@swc/core';
 import type { TranspilerConfig } from '../webpack/utils/transpiler';
 
 const TRAMVAI_SWC_TARGET_PATH = '@tramvai/swc-integration/target/wasm32-wasi';
@@ -13,7 +13,7 @@ const TRAMVAI_SWC_TARGET_PATH = '@tramvai/swc-integration/target/wasm32-wasi';
 const NOT_SUPPORTED_FIELDS = ['alias', 'generateDataQaTag', 'enableFillActionNamePlugin'];
 let warningWasShown = false;
 
-export const getSwcOptions = (config: TranspilerConfig): Config => {
+export const getSwcOptions = (config: TranspilerConfig): SwcOptions => {
   const {
     env = 'development',
     target,
@@ -109,9 +109,9 @@ Having swc config may conflict with @tramvai/cli configuration`
     module: {
       type: modules || 'es6',
     },
+    isModule: 'unknown',
     jsc: {
-      // TODO: should trim output size, but doesn't work well with some libs
-      // externalHelpers: true,
+      externalHelpers: true,
       parser: {
         syntax: typescript ? 'typescript' : 'ecmascript',
         decorators: true,
@@ -129,8 +129,6 @@ Having swc config may conflict with @tramvai/cli configuration`
           globals: {
             // let the webpack replace NODE_ENV as replacement with swc may mess up with tests
             envs: [],
-            // @ts-ignore
-            // TODO: there is not typings for typeofs, but the field is mentioned in docs
             typeofs: removeTypeofWindow
               ? {
                   window: isServer ? 'undefined' : 'object',

package/src/library/webpack/blocks/js.ts

@@ -2,7 +2,6 @@ import type Config from 'webpack-chain';
 import { modernLibsFilter } from '@tinkoff/is-modern-lib';
 import { createWorkerPoolTranspiler } from '../utils/workersPool';
 import type { ConfigManager } from '../../../config/configManager';
-import type { TranspilerConfig } from '../utils/transpiler';
 import { getTranspilerConfig, addTranspilerLoader } from '../utils/transpiler';
 import type { CliConfigEntry } from '../../../typings/configEntry/cli';
 
@@ -10,56 +9,33 @@ import type { CliConfigEntry } from '../../../typings/configEntry/cli';
 export default (configManager: ConfigManager<CliConfigEntry>) => (config: Config) => {
   const { transpileOnlyModernLibs } = configManager;
 
-  const jsRule = (transpilerConfig: TranspilerConfig) => (rule: Config.Rule) => {
-    const cfg = rule
-      .test(/\.[cm]?js[x]?$/)
-      .oneOf('default')
-      // TODO разобраться почему на винде все плохо с thread-loader
-      .when(process.platform !== 'win32' && !configManager.debug, (cfg) =>
-        cfg
-          .use('thread')
-          .loader('thread-loader')
-          .options(createWorkerPoolTranspiler(configManager))
-          .end()
-      )
-      .use('transpiler');
+  const rule = config.module
+    .rule('js')
+    .test(/\.[cm]?js[x]?$/)
+    // TODO: разобраться почему на винде все плохо с thread-loader
+    .when(process.platform !== 'win32' && !configManager.debug, (cfg) =>
+      cfg
+        .use('thread')
+        .loader('thread-loader')
+        .options(createWorkerPoolTranspiler(configManager))
+        .end()
+    );
 
-    return addTranspilerLoader(configManager, cfg, transpilerConfig);
-  };
+  rule
+    .oneOf('project')
+    .exclude.add(/node_modules/)
+    .end()
+    .use('transpiler')
+    .batch(addTranspilerLoader(configManager, getTranspilerConfig(configManager)));
 
-  if (transpileOnlyModernLibs) {
-    config.module
-      .rule('js:project')
-      .exclude.add(/node_modules/)
-      .end()
-      .batch(jsRule(getTranspilerConfig(configManager)));
-
-    config.module
-      .rule('js:node_modules')
-      .include.add(modernLibsFilter)
-      .end()
-      .batch(jsRule(getTranspilerConfig(configManager, { hot: false })))
-      .merge({
-        // TODO: некоторые пакеты неправильно описывают импорты для es модулей
-        // https://github.com/babel/babel/issues/12058
-        resolve: { fullySpecified: false },
-      });
-  } else {
-    config.module
-      .rule('js:project')
-      .exclude.add(/node_modules/)
-      .end()
-      .batch(jsRule(getTranspilerConfig(configManager)));
-
-    config.module
-      .rule('js:node_modules')
-      .include.add(/node_modules/)
-      .end()
-      .batch(jsRule(getTranspilerConfig(configManager, { hot: false })))
-      .merge({
-        // TODO: некоторые пакеты неправильно описывают импорты для es модулей
-        // https://github.com/babel/babel/issues/12058
-        resolve: { fullySpecified: false },
-      });
-  }
+  rule
+    .oneOf('node_module')
+    .when(transpileOnlyModernLibs, (cfg) => cfg.include.add(modernLibsFilter))
+    .merge({
+      // true value forces to use file extensions for importing mjs modules
+      // but we want to use mjs if it exists anyway
+      resolve: { fullySpecified: false },
+    })
+    .use('transpiler')
+    .batch(addTranspilerLoader(configManager, getTranspilerConfig(configManager, { hot: false })));
 };

package/src/library/webpack/blocks/pagesResolve.ts

@@ -1,5 +1,6 @@
 import path from 'path';
 import type Config from 'webpack-chain';
+import type { PagesResolveOptions } from '../loaders/pagesResolve';
 import type { ConfigManager } from '../../../config/configManager';
 import type { ApplicationConfigEntry } from '../../../typings/configEntry/application';
 
@@ -20,7 +21,7 @@ export const pagesResolve =
         rootDir: configManager.rootDir,
         root: configManager.root,
         extensions: config.resolve.extensions.values(),
-      })
+      } as PagesResolveOptions)
       .end()
       // babel-loader is required to process this file
       .enforce('pre');

package/src/library/webpack/blocks/pwa/client.ts

@@ -26,7 +26,7 @@ export const pwaBlock =
     config.batch(pwaSharedBlock(configManager));
 
     if (
-      !safeRequireResolve('@tramvai/module-progressive-web-app') &&
+      !safeRequireResolve('@tramvai/module-progressive-web-app', true) &&
       (pwa.workbox?.enabled || pwa.webmanifest?.enabled)
     ) {
       throw Error('PWA functional requires @tramvai/module-progressive-web-app installed');

package/src/library/webpack/blocks/serverInline.ts

@@ -1,25 +1,27 @@
-import Config from 'webpack-chain';
+import type Config from 'webpack-chain';
 import type { ConfigManager } from '../../../config/configManager';
 import type { CliConfigEntry } from '../../../typings/configEntry/cli';
-import js from './js';
-import ts from './ts';
+import { addTranspilerLoader, getTranspilerConfig } from '../utils/transpiler';
 
 export const serverInline = (configManager: ConfigManager<CliConfigEntry>) => (config: Config) => {
   // создаём клиентский конфиг и отключаем modern режим
   const clientConfigManager = configManager.withSettings({ buildType: 'client', modern: false });
 
-  const clientConfig = new Config().batch(js(clientConfigManager)).batch(ts(clientConfigManager));
-
-  const addInlineHandler = (type: string, extension: string) => {
+  const addInlineHandler = (type: string) => {
     config.module
       .rule(type)
       .oneOf('inline')
-      .before('default')
-      .test(new RegExp(`\\.inline(\\.es)?\\.${extension}$`))
-      .uses.merge(clientConfig.module.rule(type).oneOfs.get('default').uses.entries());
+      .before('project')
+      .test(new RegExp(`\\.inline(\\.es)?\\.${type}$`))
+      .use('transpiler')
+      .batch(
+        addTranspilerLoader(
+          clientConfigManager,
+          getTranspilerConfig(clientConfigManager, { typescript: type === 'ts' })
+        )
+      );
   };
 
-  addInlineHandler('js:project', 'js');
-  addInlineHandler('js:node_modules', 'js');
-  addInlineHandler('ts:project', 'ts');
+  addInlineHandler('js');
+  addInlineHandler('ts');
 };

package/src/library/webpack/blocks/ts.ts

@@ -7,13 +7,12 @@ import type { CliConfigEntry } from '../../../typings/configEntry/cli';
 export default (configManager: ConfigManager<CliConfigEntry>) => (config: Config) => {
   const transpilerConfig = getTranspilerConfig(configManager, { typescript: true });
 
-  const cfg = config.module
-    .rule('ts:project')
+  config.module
+    .rule('ts')
     .test(/\.ts[x]?$/)
     .exclude.add(/node_modules/)
     .end()
-    .oneOf('default')
-    // TODO разобраться почему на винде все плохо с thread-loader
+    // TODO: разобраться почему на винде все плохо с thread-loader
     .when(process.platform !== 'win32', (cfg) =>
       cfg
         .use('thread')
@@ -21,7 +20,7 @@ export default (configManager: ConfigManager<CliConfigEntry>) => (config: Config
         .options(createWorkerPoolTranspiler(configManager))
         .end()
     )
-    .use('transpiler');
-
-  return addTranspilerLoader(configManager, cfg, transpilerConfig);
+    .oneOf('project')
+    .use('transpiler')
+    .batch(addTranspilerLoader(configManager, transpilerConfig));
 };

package/src/library/webpack/loaders/pagesResolve.ts

@@ -8,7 +8,7 @@ const LAYOUT_FILENAME = '_layout.tsx';
 const ERROR_BOUNDARY_FILENAME = '_error.tsx';
 const WILDCARD_TOKEN = '[...';
 
-interface Options {
+export interface PagesResolveOptions {
   rootDir: string;
   root: string;
   extensions: string[];
@@ -22,8 +22,9 @@ const removeExtension = (filename: string): string => {
 };
 
 // eslint-disable-next-line func-style
-const pagesResolve: LoaderDefinitionFunction<Options> = function () {
+const pagesResolve: LoaderDefinitionFunction<PagesResolveOptions> = function () {
   const { fileSystemPages, rootDir, root, extensions } = this.getOptions();
+  const extensionsRegexp = new RegExp(`\\.(${extensions.map((ext) => ext.slice(1)).join('|')})$`);
   const fsLayouts: string[] = [];
   const fsErrorBoundaries: string[] = [];
   const fsWildcards: string[] = [];
@@ -34,9 +35,11 @@ const pagesResolve: LoaderDefinitionFunction<Options> = function () {
   const filesToPages = ({
     pagesRootDirectory,
     isRoutes = false,
+    test,
   }: {
     pagesRootDirectory: string;
     isRoutes?: boolean;
+    test: RegExp;
   }) => {
     const pagesDir = path.resolve(rootDir, root, pagesRootDirectory);
 
@@ -51,9 +54,10 @@ const pagesResolve: LoaderDefinitionFunction<Options> = function () {
 
     for (const file of pagesFiles) {
       const extname = path.extname(file);
-      const name = file.replace(new RegExp(`\\${extname}$`), '').replace(/\\/g, '/');
+      const normalizedFile = file.replace(/\\/g, '/');
 
-      if (extensions.indexOf(extname) !== -1) {
+      if (test.test(normalizedFile)) {
+        const name = normalizedFile.replace(new RegExp(`\\${extname}$`), '');
         const pageComponentName = `@/${pagesRootDirectory}/${name}`;
         const pageComponentPath = path.resolve(pagesDir, name).replace(/\\/g, '\\\\');
         const chunkname = pageComponentName.replace(/\//g, '_');
@@ -112,11 +116,15 @@ const pagesResolve: LoaderDefinitionFunction<Options> = function () {
     ? filesToPages({
         pagesRootDirectory: fileSystemPages.routesDir,
         isRoutes: true,
+        test: new RegExp(`index${extensionsRegexp.source}`),
       })
     : [];
   const fsPages = fileSystemPages.pagesDir
     ? filesToPages({
         pagesRootDirectory: fileSystemPages.pagesDir,
+        test: fileSystemPages.componentsPattern
+          ? new RegExp(fileSystemPages.componentsPattern)
+          : extensionsRegexp,
       })
     : [];