@tramvai/cli 2.64.0 → 2.65.9

package/src/config/validate.ts

@@ -3,24 +3,25 @@ import { sync as requireResolve } from 'resolve';
 import type { ConfigManager } from './configManager';
 import type { ApplicationConfigEntry } from '../typings/configEntry/application';
 import type { ModuleConfigEntry } from '../typings/configEntry/module';
-import { extensions } from './constants';
 import type { ChildAppConfigEntry } from '../typings/configEntry/child-app';
+import { extensions } from './constants';
+import type { Env } from '../typings/Env';
 
-export const isApplication = (
-  configManager: ConfigManager
-): configManager is ConfigManager<ApplicationConfigEntry> => {
+export const isApplication = <E extends Env>(
+  configManager: ConfigManager<any, E>
+): configManager is ConfigManager<ApplicationConfigEntry, E> => {
   return configManager.type === 'application';
 };
 
-export const isModule = (
-  configManager: ConfigManager
-): configManager is ConfigManager<ModuleConfigEntry> => {
+export const isModule = <E extends Env>(
+  configManager: ConfigManager<any, E>
+): configManager is ConfigManager<ModuleConfigEntry, E> => {
   return configManager.type === 'module';
 };
 
-export const isChildApp = (
-  configManager: ConfigManager
-): configManager is ConfigManager<ChildAppConfigEntry> => {
+export const isChildApp = <E extends Env>(
+  configManager: ConfigManager<any, E>
+): configManager is ConfigManager<ChildAppConfigEntry, E> => {
   return configManager.type === 'child-app';
 };
 
@@ -28,7 +29,7 @@ const throwErrorMissing = (config: string, path: string) => {
   throw new Error(`Can not resolve '${path}', check your configuration: '${config}'`);
 };
 
-export const validate = (configManager: ConfigManager) => {
+export const validate = (configManager: ConfigManager<any, any>) => {
   const { rootDir } = configManager;
 
   const isMissing = (path: string) => {
@@ -43,27 +44,15 @@ export const validate = (configManager: ConfigManager) => {
   };
 
   if (isApplication(configManager)) {
-    const {
-      root,
-      buildType,
-      build: { options },
-    } = configManager;
+    const { root, buildType, polyfill } = configManager;
 
     if (buildType === 'client') {
-      const { polyfill } = options;
-
       if (isMissing(root)) {
         throwErrorMissing('root', `${root}/index`);
       }
 
       if (polyfill && isMissing(polyfill)) {
-        throwErrorMissing('commands.build.options.polyfill', polyfill);
-      }
-    } else {
-      const { server } = options;
-
-      if (isMissing(server)) {
-        throwErrorMissing('commands.build.options.server', server);
+        throwErrorMissing('polyfill', polyfill);
       }
     }
   } else if (isModule(configManager)) {

package/src/di/tokens/config.ts

@@ -2,10 +2,11 @@ import { createToken } from '@tinkoff/dippy';
 import type { ConfigEntry } from '../../typings/configEntry/common';
 import type { ConfigManager } from '../../config/configManager';
 import type { Env } from '../../typings/Env';
+import type { CliConfigEntry } from '../../typings/configEntry/cli';
 
 export const CLI_ROOT_DIR_TOKEN = createToken<string>('cli rootDir');
 export const CONFIG_ROOT_DIR_TOKEN = createToken<string>('config rootDir');
 
 export const CONFIG_ENV_TOKEN = createToken<Env>('config env');
 export const CONFIG_ENTRY_TOKEN = createToken<ConfigEntry>('config entry');
-export const CONFIG_MANAGER_TOKEN = createToken<ConfigManager>('config manager');
+export const CONFIG_MANAGER_TOKEN = createToken<ConfigManager<CliConfigEntry>>('config manager');

package/src/library/babel/index.ts

@@ -144,6 +144,7 @@ export const babelConfigFactory = ({
       ],
       tramvai && env === 'development' && path.resolve(__dirname, './plugins/provider-stack'),
       !isServer &&
+        env === 'development' &&
         hot && ['react-refresh/babel', { skipEnvCheck: process.env.NODE_ENV === 'test' }],
     ]
       .concat(cfg.plugins || [])

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

@@ -26,27 +26,9 @@ beforeAll(async () => {
       name: 'swc-app',
       type: 'application',
       root: './',
-      commands: {
-        build: {
-          options: {
-            server: 'index.ts',
-          },
-          configurations: {
-            experiments: {
-              transpilation: {
-                loader: 'swc',
-              },
-            },
-          },
-        },
-        serve: {
-          configurations: {
-            experiments: {
-              transpilation: {
-                loader: 'swc',
-              },
-            },
-          },
+      experiments: {
+        transpilation: {
+          loader: 'swc',
         },
       },
     },

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

@@ -37,27 +37,9 @@ beforeAll(async () => {
       name: 'swc-app',
       type: 'application',
       root: './',
-      commands: {
-        build: {
-          options: {
-            server: 'index.ts',
-          },
-          configurations: {
-            experiments: {
-              transpilation: {
-                loader: 'swc',
-              },
-            },
-          },
-        },
-        serve: {
-          configurations: {
-            experiments: {
-              transpilation: {
-                loader: 'swc',
-              },
-            },
-          },
+      experiments: {
+        transpilation: {
+          loader: 'swc',
         },
       },
     },

package/src/library/swc/index.ts

@@ -123,7 +123,7 @@ Having swc config may conflict with @tramvai/cli configuration`
         react: {
           runtime: hasJsxRuntime() ? 'automatic' : 'classic',
           development: env === 'development',
-          refresh: hot && !isServer,
+          refresh: hot && env === 'development' && !isServer,
         },
         optimizer: {
           globals: {

package/src/library/webpack/application/client/common.ts

@@ -18,12 +18,10 @@ import nodeClient from '../../blocks/nodeClient';
 import { pagesResolve } from '../../blocks/pagesResolve';
 import { DEFAULT_STATS_OPTIONS, DEFAULT_STATS_FIELDS } from '../../constants/stats';
 import { configToEnv } from '../../blocks/configToEnv';
+import { safeRequireResolve } from '../../../../utils/safeRequire';
 
 export default (configManager: ConfigManager<ApplicationConfigEntry>) => (config: Config) => {
-  const {
-    options: { polyfill = '' } = {},
-    configurations: { fileSystemPages },
-  } = configManager.build;
+  const { polyfill, fileSystemPages } = configManager;
 
   config.name('client');
 
@@ -31,7 +29,7 @@ export default (configManager: ConfigManager<ApplicationConfigEntry>) => (config
   config.batch(commonApplication(configManager));
   config.batch(files(configManager));
 
-  if (fileSystemPages.enable) {
+  if (fileSystemPages.enabled) {
     config.batch(pagesResolve(configManager));
   }
 
@@ -56,8 +54,10 @@ export default (configManager: ConfigManager<ApplicationConfigEntry>) => (config
     ])
     .end();
 
-  if (polyfill) {
-    config.entry('polyfill').add(path.resolve(configManager.rootDir, polyfill));
+  const polyfillPath = path.resolve(configManager.rootDir, polyfill ?? 'src/polyfill');
+
+  if (safeRequireResolve(polyfillPath, typeof polyfill === 'undefined')) {
+    config.entry('polyfill').add(polyfillPath);
   }
 
   const statsFileName = configManager.modern ? 'stats.modern.json' : 'stats.json';

package/src/library/webpack/application/client/dev.ts

@@ -57,11 +57,11 @@ export const webpackClientConfig = ({
   }
 
   config.output
-    .path(configManager.getBuildPath())
+    .path(configManager.buildPath)
     .publicPath(
       `http://${configManager.staticHost}:${
         configManager.staticPort
-      }/${configManager.build.options.outputClient.replace(/\/$/, '')}/`
+      }/${configManager.output.client.replace(/\/$/, '')}/`
     )
     .filename('[name].js')
     .chunkFilename('[name].chunk.js')
@@ -88,7 +88,7 @@ export const webpackClientConfig = ({
     }
   }
 
-  const { checkAsyncTs } = configManager.build.configurations;
+  const { checkAsyncTs } = configManager;
 
   if (checkAsyncTs) {
     const additionalOptions = isObject(checkAsyncTs) ? checkAsyncTs.pluginOptions || {} : {};
@@ -129,9 +129,9 @@ export const webpackClientConfig = ({
     },
   ]);
 
-  if (configManager.hotRefresh) {
-    const { configurations: { hotRefreshOptions = {} } = {} } = configManager.serve;
+  const { hotRefresh } = configManager;
 
+  if (hotRefresh?.enabled) {
     const splitChunks: SplitChunksOptions = {
       cacheGroups: {
         default: false,
@@ -156,12 +156,12 @@ export const webpackClientConfig = ({
     config.plugin('hot-module').use(webpack.HotModuleReplacementPlugin);
     config.plugin('react-refresh').use(ReactRefreshPlugin, [
       {
-        ...hotRefreshOptions,
+        ...hotRefresh.options,
         overlay:
-          typeof hotRefreshOptions.overlay === 'boolean'
-            ? hotRefreshOptions.overlay
+          typeof hotRefresh.options?.overlay === 'boolean'
+            ? hotRefresh.options.overlay
             : {
-                ...hotRefreshOptions.overlay,
+                ...hotRefresh.options?.overlay,
               },
       },
     ]);

package/src/library/webpack/application/client/prod/optimization/splitChunks.ts

@@ -57,14 +57,11 @@ const resolveFrameworksPaths = (rootDir: string, frameworksList: string[]) => {
 // eslint-disable-next-line max-statements
 export const splitChunksConfig =
   (configManager: ConfigManager<ApplicationConfigEntry>) => (config: Config) => {
-    const {
-      rootDir,
-      build: { configurations },
-    } = configManager;
+    const { rootDir, splitChunks } = configManager;
 
     const topLevelFrameworkPaths = resolveFrameworksPaths(rootDir, ['react', 'react-dom']);
 
-    const reachCacheGroup: Exclude<SplitChunksOptions, boolean>['cacheGroups'][string] = {
+    const reactCacheGroup: Exclude<Required<SplitChunksOptions>, boolean>['cacheGroups'][string] = {
       chunks: 'all',
       name: 'react',
       // This regex ignores nested copies of framework libraries so they're bundled with their issuer.
@@ -82,51 +79,53 @@ export const splitChunksConfig =
       // Don't let webpack eliminate this chunk (prevents this chunk from becoming a part of the commons chunk)
       enforce: true,
     };
-    let splitChunks: SplitChunksOptions = false;
-
-    if (configurations.granularChunks) {
-      splitChunks = {
-        chunks: 'all',
-        maxInitialRequests: 10,
-        maxAsyncRequests: 20,
-        cacheGroups: {
-          default: false,
-          defaultVendors: false,
-          reachCacheGroup,
-          shared: {
-            chunks: 'async',
-            minChunks: configurations.granularChunksSplitNumber,
-            minSize: configurations.granularChunksMinSize,
-            reuseExistingChunk: true,
-            name(module, chunks) {
-              return crypto
-                .createHash('sha1')
-                .update(
-                  chunks.reduce((acc: string, chunk: webpack.Chunk) => {
-                    return acc + chunk.name;
-                  }, '')
-                )
-                .digest('hex');
+    let webpackSplitChunks: SplitChunksOptions = false;
+
+    switch (splitChunks.mode) {
+      case 'granularChunks':
+        webpackSplitChunks = {
+          chunks: 'all',
+          maxInitialRequests: 10,
+          maxAsyncRequests: 20,
+          cacheGroups: {
+            default: false,
+            defaultVendors: false,
+            reactCacheGroup,
+            shared: {
+              chunks: 'async',
+              minChunks: splitChunks.granularChunksSplitNumber,
+              minSize: splitChunks.granularChunksMinSize,
+              reuseExistingChunk: true,
+              name(module: any, chunks: webpack.Chunk[]) {
+                return crypto
+                  .createHash('sha1')
+                  .update(
+                    chunks.reduce((acc: string, chunk: webpack.Chunk) => {
+                      return acc + chunk.name;
+                    }, '')
+                  )
+                  .digest('hex');
+              },
             },
           },
-        },
-      };
-    } else if (configurations.commonChunk) {
-      splitChunks = {
-        cacheGroups: {
-          default: false,
-          defaultVendors: false,
-          reachCacheGroup,
-          commons: {
-            name: 'common-chunk',
-            minChunks: configurations.commonChunkSplitNumber,
+        };
+      // eslint-disable-next-line no-fallthrough
+      case 'commonChunk':
+        webpackSplitChunks = {
+          cacheGroups: {
+            default: false,
+            defaultVendors: false,
+            reactCacheGroup,
+            commons: {
+              name: 'common-chunk',
+              minChunks: splitChunks.commonChunkSplitNumber,
+            },
           },
-        },
-      };
+        };
     }
 
     config.optimization
-      .splitChunks(splitChunks)
+      .splitChunks(webpackSplitChunks)
       // namedChunks должно быть включено, чтобы webpack-flush-chunks смог определить имена чанков от которых зависит чанк бандла после обработчки через splitChunks
       .set('chunkIds', 'named');
 

package/src/library/webpack/application/client/prod.ts

@@ -27,15 +27,13 @@ export const webpackClientConfig = ({
 }) => {
   const config = new Config();
 
-  const { configurations } = configManager.build;
-
   config.batch(common(configManager));
   config.batch(commonProd(configManager));
 
   config.bail(true);
 
   config.output
-    .path(configManager.getBuildPath())
+    .path(configManager.buildPath)
     .publicPath('')
     .filename('[name].[contenthash].js')
     .chunkFilename('[name].[contenthash].chunk.js')
@@ -73,7 +71,7 @@ export const webpackClientConfig = ({
 
   config.batch(optimize(configManager));
 
-  const { checkAsyncTs } = configManager.build.configurations;
+  const { checkAsyncTs, debug, sourceMap } = configManager;
 
   if (isObject(checkAsyncTs) && checkAsyncTs.failOnBuild) {
     const additionalOptions = isObject(checkAsyncTs) ? checkAsyncTs.pluginOptions || {} : {};
@@ -96,7 +94,7 @@ export const webpackClientConfig = ({
     config.plugin('fork-ts-checker').use(require('fork-ts-checker-webpack-plugin'), [options]);
   }
 
-  if (configurations.sourceMap || configManager.debug) {
+  if (sourceMap || debug) {
     config.batch(sourcemaps(configManager));
   }
 

package/src/library/webpack/application/server/common.ts

@@ -20,10 +20,7 @@ import { extractCssPluginFactory } from '../../blocks/extractCssPlugin';
 
 // eslint-disable-next-line import/no-default-export
 export default (configManager: ConfigManager<ApplicationConfigEntry>) => (config: Config) => {
-  const {
-    options: { server = '', outputServer = '' } = {},
-    configurations: { fileSystemPages },
-  } = configManager.build;
+  const { output, fileSystemPages } = configManager;
 
   config.name('server');
 
@@ -32,7 +29,7 @@ export default (configManager: ConfigManager<ApplicationConfigEntry>) => (config
   config.batch(files(configManager));
   config.batch(apiResolve(configManager));
 
-  if (fileSystemPages.enable) {
+  if (fileSystemPages.enabled) {
     config.batch(pagesResolve(configManager));
   }
 
@@ -43,13 +40,13 @@ export default (configManager: ConfigManager<ApplicationConfigEntry>) => (config
 
   config
     .entry('server')
-    .add(path.resolve(configManager.rootDir, server))
+    .add(path.resolve(configManager.rootDir, `${configManager.root}/index`))
     .end()
     .resolve.extensions.merge(['.node']);
 
   config.output
-    .path(configManager.getBuildPath())
-    .publicPath(path.posix.join('/', outputServer))
+    .path(configManager.buildPath)
+    .publicPath(path.posix.join('/', output.server))
     .filename('server.js');
 
   config.optimization.splitChunks(false).removeAvailableModules(false);

package/src/library/webpack/application/server/dev.ts

@@ -21,14 +21,13 @@ export const webpackServerConfig = ({
   configManager: ConfigManager<ApplicationConfigEntry>;
   showProgress: typeof UI_SHOW_PROGRESS_TOKEN | null;
 }) => {
-  const { options: { server = '' } = {} } = configManager.build;
   const config = new Config();
 
   config.batch(common(configManager));
   config.batch(commonDev());
   config.batch(
     commonApplicationDev({
-      entry: path.resolve(configManager.rootDir, server),
+      entry: path.resolve(configManager.rootDir, `${configManager.root}/index`),
       onlyBundles: configManager.onlyBundles,
     })
   );
@@ -47,9 +46,9 @@ export const webpackServerConfig = ({
   }
 
   config.externals(
-    (configManager.build.configurations.externals || [])
-      .concat(configManager.serve.configurations.externals || [])
-      .map((s) => new RegExp(`^${s}`))
+    ['react$', 'react-dom', 'prop-types', 'fastify', 'core-js', ...configManager.externals].map(
+      (s) => new RegExp(`^${s}`)
+    )
   );
 
   config.optimization.set('emitOnErrors', false);
@@ -85,7 +84,7 @@ export const webpackServerConfig = ({
         process.env.ASSETS_PREFIX ??
         `"http://${configManager.staticHost}:${
           configManager.staticPort
-        }/${configManager.build.options.outputClient.replace(/\/$/, '')}/"`,
+        }/${configManager.output.client.replace(/\/$/, '')}/"`,
     },
   ]);
 

package/src/library/webpack/application/server/prod.ts

@@ -15,20 +15,14 @@ export const webpackServerConfig = ({
   configManager: ConfigManager<ApplicationConfigEntry>;
 }) => {
   const config = new Config();
-  const { debug } = configManager;
-
-  const {
-    configurations: { sourceMapServer },
-  } = configManager.build;
+  const { debug, sourceMap } = configManager;
 
   config.batch(common(configManager));
   config.batch(commonProd(configManager));
 
   config.bail(true);
 
-  config.externals(
-    (configManager.build.configurations.externals || []).map((s) => new RegExp(`^${s}`))
-  );
+  config.externals(configManager.externals.map((s) => new RegExp(`^${s}`)));
 
   if (configManager.disableProdOptimization) {
     // with this option for id of module path to file will be used
@@ -63,7 +57,7 @@ export const webpackServerConfig = ({
     },
   ]);
 
-  if (sourceMapServer || debug) {
+  if (sourceMap || debug) {
     config.batch(sourcemaps(configManager));
   }
 

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

@@ -6,7 +6,7 @@ import type { ApplicationConfigEntry } from '../../../typings/configEntry/applic
 
 // eslint-disable-next-line import/no-default-export
 export default (configManager: ConfigManager<ApplicationConfigEntry>) => (config: Config) => {
-  const dir = path.resolve(configManager.rootDir, configManager.build.options.serverApiDir);
+  const dir = path.resolve(configManager.rootDir, configManager.serverApiDir);
   const files = readDir(dir);
 
   if (!files.length) {

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

@@ -14,9 +14,9 @@ export default (configManager: ConfigManager) => (config: Config) => {
     .loader(path.resolve(__dirname, '../loaders/replaceContent'))
     .options({
       code: `
-  import { ConfigManager } from '@tramvai/cli/lib/config/configManager';
+  import { createConfigManager } from '@tramvai/cli/lib/config/configManager';
 
-  const appConfig = ConfigManager.rehydrate(${JSON.stringify(configManager.dehydrate())});
+  const appConfig = createConfigManager(...${JSON.stringify(configManager.dehydrate())});
   const moduleConfig = appConfig;
 
   export { appConfig, moduleConfig };

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

@@ -1,16 +1,19 @@
 import type Config from 'webpack-chain';
 import type { ConfigManager } from '../../../config/configManager';
+import { isApplication } from '../../../config/validate';
 import type { ConfigEntry } from '../../../typings/configEntry/common';
 import { shouldUseReactRoot } from '../../../utils/shouldUseReactRoot';
 
 export const configToEnv = (configManager: ConfigManager<ConfigEntry>) => (config: Config) => {
-  const { fileSystemPages } = configManager.build.configurations;
+  const { fileSystemPages } = isApplication(configManager)
+    ? configManager
+    : { fileSystemPages: { enabled: false, routesDir: false, pagesDir: false } };
 
   config.plugin('define').tap((args) => [
     {
       ...args[0],
       'process.env.__TRAMVAI_EXPERIMENTAL_ENABLE_FILE_SYSTEM_PAGES': JSON.stringify(
-        fileSystemPages.enable
+        fileSystemPages.enabled
       ),
       'process.env.__TRAMVAI_EXPERIMENTAL_FILE_SYSTEM_ROUTES_DIR': JSON.stringify(
         fileSystemPages.routesDir

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

@@ -5,29 +5,33 @@ import ExtractCssChunks from 'mini-css-extract-plugin';
 import { createGenerator } from '@tinkoff/minicss-class-generator';
 import { safeRequire } from '../../../utils/safeRequire';
 import type { ConfigManager } from '../../../config/configManager';
+import type { CliConfigEntry } from '../../../typings/configEntry/cli';
 
 const cssLocalIdentNameDevDefault = '[name]__[local]_[minicss]';
 const cssLocalIdentNameProdDefault = '[minicss]';
 
+export const getPostcssConfigPath = (configManager: ConfigManager<CliConfigEntry>) => {
+  return configManager.postcss.config ?? 'postcss.config';
+};
+
 interface Options {
   localIdentName?: string;
 }
 
 export const cssWebpackRulesFactory =
-  (configManager: ConfigManager, options: Options = {}) =>
+  (configManager: ConfigManager<CliConfigEntry>, options: Options = {}) =>
   (config: Config) => {
+    const { env, sourceMap } = configManager;
     const {
       postcss: {
-        config: postcssConfig = '',
-        cssLocalIdentName = null,
-        cssLocalIdentNameDev = cssLocalIdentName ?? cssLocalIdentNameDevDefault,
-        cssLocalIdentNameProd = cssLocalIdentName ?? cssLocalIdentNameProdDefault,
-      } = {},
-    } = configManager.build.configurations;
-    const { env, sourceMap } = configManager;
-    const localIdentName =
-      options.localIdentName ??
-      (env === 'production' ? cssLocalIdentNameProd : cssLocalIdentNameDev);
+        config: postcssConfig,
+        cssLocalIdentName = env === 'production'
+          ? cssLocalIdentNameProdDefault
+          : cssLocalIdentNameDevDefault,
+        cssModulePattern,
+      },
+    } = configManager;
+    const localIdentName = options.localIdentName ?? cssLocalIdentName;
 
     const configCssLoader = (cfg) => {
       cfg.use('extract-css').loader(ExtractCssChunks.loader).options({ esModule: false });
@@ -36,6 +40,10 @@ export const cssWebpackRulesFactory =
         localIdentName,
       };
 
+      if (cssModulePattern) {
+        cssModulesOptions.auto = new RegExp(cssModulePattern);
+      }
+
       // TODO: можно будет избавиться от проверки и сотавить всё в minicss-плагине, когда зарелизят эти изменения
       // https://github.com/webpack-contrib/css-loader/blob/master/src/utils.js#L310
       if (/\[minicss]/.test(localIdentName)) {
@@ -50,12 +58,13 @@ export const cssWebpackRulesFactory =
       });
     };
 
-    const postcssCfg = postcssConfig
-      ? safeRequire(
-          path.resolve(configManager.rootDir, postcssConfig),
-          process.env.NODE_ENV === 'test'
-        ) ?? {}
-      : {};
+    const postcssCfg =
+      safeRequire(
+        path.resolve(configManager.rootDir, getPostcssConfigPath(configManager)),
+        // ignore missed file if users haven't provided any value
+        // in case the path was provided it should exist
+        typeof postcssConfig === 'undefined'
+      ) ?? {};
 
     config.module
       .rule('css')