@tramvai/cli 2.64.0 → 2.65.9

package/src/api/analyze/providers/shared.ts

@@ -5,13 +5,14 @@ import {
   COMMAND_PARAMETERS_TOKEN,
   CONFIG_ENTRY_TOKEN,
 } from '../../../di/tokens';
-import { ConfigManager } from '../../../config/configManager';
+import { createConfigManager } from '../../../config/configManager';
+import type { CliConfigEntry } from '../../../typings/configEntry/cli';
 
 export const sharedProviders: readonly Provider[] = [
   provide({
     provide: CONFIG_MANAGER_TOKEN,
     useFactory: ({ configEntry, parameters }) => {
-      return new ConfigManager(configEntry, {
+      return createConfigManager(configEntry as CliConfigEntry, {
         ...parameters,
         env: 'production',
         buildType: 'client',

package/src/api/benchmark/__integration__/__fixtures__/tramvai.json

@@ -4,14 +4,7 @@
     "app": {
       "name": "app",
       "root": "app",
-      "type": "application",
-      "commands": {
-        "build": {
-          "options": {
-            "server": "app/server.tsx"
-          }
-        }
-      }
+      "type": "application"
     }
   }
 }

package/src/api/benchmark/index.ts

@@ -15,7 +15,7 @@ export interface Params {
 }
 
 export interface Result {
-  [key: string]: RunStats;
+  [key: string]: RunStats | undefined;
 }
 
 export type BenchmarkCommand = (

package/src/api/build/__integration__/__fixtures__/app/App.tsx

@@ -1,4 +1,3 @@
-import React from 'react';
 import styles from './styles.css';
 
 export default () => {

package/src/api/build/__integration__/__fixtures__/app/index.tsx

@@ -1,4 +1,3 @@
-import React from 'react';
 import ReactDOM from 'react-dom';
 import App from './App';
 
@@ -9,12 +8,19 @@ const bundlesMap = {
   third: () => import('./bundles/third'),
 };
 
-const url = new URL(window.location.href);
-
-if (url.searchParams.has('bundle')) {
-  bundlesMap[url.searchParams.get('bundle')]().then(({ default: name }) =>
-    console.log(`loaded bundle ${name}`)
-  );
+if (typeof window === 'undefined') {
+  require('./server.tsx')
 }
 
-ReactDOM.hydrate(<App />, document.getElementById('root'));
+if (typeof window !== 'undefined') {
+  const url = new URL(window.location.href);
+
+  if (url.searchParams.has('bundle')) {
+    bundlesMap[url.searchParams.get('bundle')]().then(({ default: name }) =>
+      console.log(`loaded bundle ${name}`)
+    );
+  }
+
+  ReactDOM.hydrate(<App />, document.getElementById('root'));
+
+}

package/src/api/build/__integration__/__fixtures__/app/server.tsx

@@ -1,5 +1,4 @@
 import express from 'express';
-import React from 'react';
 import { createServer } from 'http';
 import { renderToString } from 'react-dom/server';
 import { appConfig } from '@tramvai/cli/lib/external/config';

package/src/api/build/__integration__/__fixtures__/tramvai.json

@@ -5,16 +5,7 @@
       "name": "app",
       "root": "app",
       "type": "application",
-      "commands": {
-        "build": {
-          "options": {
-            "server": "app/server.tsx"
-          },
-          "configurations": {
-            "modern": false
-          }
-        }
-      }
+      "modern": false
     },
     "module": {
       "name": "module",

package/src/api/build/__integration__/build.test.ts

@@ -55,19 +55,10 @@ describe('@tramvai/cli build command', () => {
           name: 'app',
           type: 'application',
           root: resolve(FIXTURES_DIR, 'app'),
-          commands: {
-            build: {
-              options: {
-                server: resolve(FIXTURES_DIR, 'app/server'),
-              },
-              configurations: {
-                modern: false,
-                definePlugin: {
-                  dev: {
-                    IS_REACT_APP: true,
-                  },
-                },
-              },
+          modern: false,
+          define: {
+            development: {
+              IS_REACT_APP: 'true',
             },
           },
         },

package/src/api/build/child-app.ts

@@ -2,13 +2,11 @@ import type { Container } from '@tinkoff/dippy';
 import type { Result } from './index';
 import { sharedProviders } from './providers/shared';
 import { registerProviders } from '../../utils/di';
-import { ABSTRACT_BUILDER_FACTORY_TOKEN, CONFIG_MANAGER_TOKEN } from '../../di/tokens';
+import { ABSTRACT_BUILDER_FACTORY_TOKEN } from '../../di/tokens';
 
 export const buildChildApp = async (di: Container): Result => {
   registerProviders(di, sharedProviders);
 
-  const configManager = di.get(CONFIG_MANAGER_TOKEN);
-
   const builderFactory = di.get(ABSTRACT_BUILDER_FACTORY_TOKEN);
   const builder = await builderFactory.createBuilder('webpack', {
     options: {
@@ -18,7 +16,9 @@ export const buildChildApp = async (di: Container): Result => {
   });
 
   const builderBuild = await builder.build({
-    modern: configManager.modern,
+    // child-app either should be built for legacy code always
+    // or should be smart loaded depending on browser capabilities
+    modern: false,
   });
 
   return {

package/src/api/build/module.ts

@@ -2,13 +2,11 @@ import type { Container } from '@tinkoff/dippy';
 import type { Result } from './index';
 import { sharedProviders } from './providers/shared';
 import { registerProviders } from '../../utils/di';
-import { ABSTRACT_BUILDER_FACTORY_TOKEN, CONFIG_MANAGER_TOKEN } from '../../di/tokens';
+import { ABSTRACT_BUILDER_FACTORY_TOKEN } from '../../di/tokens';
 
 export const buildModule = async (di: Container): Result => {
   registerProviders(di, [...sharedProviders]);
 
-  const configManager = di.get(CONFIG_MANAGER_TOKEN);
-
   const builderFactory = di.get(ABSTRACT_BUILDER_FACTORY_TOKEN);
   const builder = await builderFactory.createBuilder('webpack', {
     options: {
@@ -18,7 +16,7 @@ export const buildModule = async (di: Container): Result => {
   });
 
   const builderBuild = await builder.build({
-    modern: configManager.modern,
+    modern: false,
   });
 
   return {

package/src/api/build/providers/shared.ts

@@ -4,7 +4,7 @@ import {
   COMMAND_PARAMETERS_TOKEN,
   CONFIG_ENTRY_TOKEN,
 } from '../../../di/tokens';
-import { ConfigManager } from '../../../config/configManager';
+import { createConfigManager } from '../../../config/configManager';
 import type { ApplicationConfigEntry } from '../../../typings/configEntry/application';
 import type { Params } from '../index';
 
@@ -18,7 +18,7 @@ export const sharedProviders: readonly Provider[] = [
       configEntry: ApplicationConfigEntry;
       parameters: Params;
     }) => {
-      return new ConfigManager(configEntry, {
+      return createConfigManager(configEntry, {
         ...parameters,
         env: 'production',
         buildType: 'client',

package/src/api/index.ts

@@ -14,12 +14,16 @@ import type { AnalyzeCommand } from './analyze';
 import type { StartProdCommand } from './start-prod';
 
 export * from '../di/tokens';
-export { ConfigManager } from '../config/configManager';
+export { ConfigManager, createConfigManager } from '../config/configManager';
+export { CliConfigEntry } from '../typings/configEntry/cli';
+export { ApplicationConfigEntry } from '../typings/configEntry/application';
+export { ChildAppConfigEntry } from '../typings/configEntry/child-app';
+export { ConvertToSchema } from '../schema/ConfigSchema';
 export { ConfigManager as ConfigManagerValidator } from '../models/config';
 export { getTramvaiConfig } from '../utils/getTramvaiConfig';
 export { syncJsonFile } from '../utils/syncJsonFile';
 export { babelConfigFactory } from '../library/babel';
-export { filesClientWebackRulesFactory } from '../library/webpack/blocks/filesClient';
+export { filesClientWebpackRulesFactory } from '../library/webpack/blocks/filesClient';
 export { cssWebpackRulesFactory } from '../library/webpack/blocks/css';
 export { lessWebpackRulesFactory } from '../library/webpack/blocks/less';
 export { postcssAssetsWebpackRulesFactory } from '../library/webpack/blocks/postcssAssets';

package/src/api/shared/types/withConfig.ts

@@ -1,17 +1,16 @@
+import type { WithRootDir } from './withRootDir';
 import type { ApplicationConfigEntry } from '../../../typings/configEntry/application';
 import type { ModuleConfigEntry } from '../../../typings/configEntry/module';
-import type { WithRootDir } from './withRootDir';
 import type { PackageConfigEntry } from '../../../typings/configEntry/package';
 import type { ChildAppConfigEntry } from '../../../typings/configEntry/child-app';
+import type { ConvertToSchema } from '../../../schema/ConfigSchema';
 
 export type WithConfig<T> = WithRootDir<T> &
   (
     | { target: string }
     | {
-        config:
-          | ApplicationConfigEntry
-          | ModuleConfigEntry
-          | PackageConfigEntry
-          | ChildAppConfigEntry;
+        config: ConvertToSchema<
+          ApplicationConfigEntry | ModuleConfigEntry | PackageConfigEntry | ChildAppConfigEntry
+        >;
       }
   );

package/src/api/start/__integration__/__fixtures__/app/index.tsx

@@ -8,12 +8,16 @@ const bundlesMap = {
   third: () => import('./bundles/third'),
 };
 
-const url = new URL(window.location.href);
+if (typeof window === 'undefined') {
+  require('./server')
+} else {
+  const url = new URL(window.location.href);
 
-if (url.searchParams.has('bundle')) {
-  bundlesMap[
-    url.searchParams.get('bundle') as keyof typeof bundlesMap
-  ]().then(({ default: name }: { default: string }) => console.log(`loaded bundle ${name}`));
-}
+  if (url.searchParams.has('bundle')) {
+    bundlesMap[
+      url.searchParams.get('bundle') as keyof typeof bundlesMap
+    ]().then(({ default: name }: { default: string }) => console.log(`loaded bundle ${name}`));
+  }
 
-ReactDOM.hydrate(<App />, document.getElementById('root'));
+  ReactDOM.hydrate(<App />, document.getElementById('root'));
+}

package/src/api/start/__integration__/__fixtures__/tramvai.json

@@ -5,23 +5,12 @@
       "name": "app",
       "root": "app",
       "type": "application",
-      "commands": {
-        "build": {
-          "options": {
-            "server": "app/server.tsx",
-            "serverApiDir": "app/api"
-          },
-          "configurations": {
-            "fileSystemPages": {
-              "enable": true
-            }
-          }
-        },
-        "serve": {
-          "configurations": {
-            "hotRefresh": true
-          }
-        }
+      "serverApiDir": "app/api",
+      "fileSystemPages": {
+        "enabled": true
+      },
+      "hotRefresh": {
+        "enabled": true
       }
     },
     "module": {

package/src/api/start/__integration__/start.test.ts

@@ -93,9 +93,7 @@ describe('@tramvai/cli start command', () => {
           port: serverPort,
           staticPort: staticServerPort,
           type: 'application',
-          configEntry: expect.objectContaining({
-            name: 'app',
-          }),
+          name: 'app',
         });
 
         const { body: browserslistConfig } = await request
@@ -136,8 +134,6 @@ describe('@tramvai/cli start command', () => {
 
         await page.goto(serverUrl);
 
-        console.log(await page.$eval('body', (node) => node.innerHTML));
-
         expect(
           await page.$eval('#cmp', (node) => (node as HTMLElement).innerText)
         ).toMatchInlineSnapshot(`"Cmp test: start"`);
@@ -173,13 +169,6 @@ describe('@tramvai/cli start command', () => {
           name: 'app',
           type: 'application',
           root,
-          commands: {
-            build: {
-              options: {
-                server: resolve(root, 'server.tsx'),
-              },
-            },
-          },
         },
       });
 

package/src/api/start/providers/application/shared.ts

@@ -10,7 +10,7 @@ import {
 import { stopServer } from '../../utils/stopServer';
 import type { ApplicationConfigEntry } from '../../../../typings/configEntry/application';
 import type { Params } from '../../index';
-import { ConfigManager } from '../../../../config/configManager';
+import { createConfigManager } from '../../../../config/configManager';
 import { createServer } from '../../utils/createServer';
 import { listenServer } from '../../utils/listenServer';
 import { getListeningPort } from '../../utils/getListeningPort';
@@ -29,7 +29,7 @@ export const sharedProviders: readonly Provider[] = [
       server: typeof SERVER_TOKEN;
       staticServer: typeof STATIC_SERVER_TOKEN;
     }) => {
-      return new ConfigManager(configEntry, {
+      return createConfigManager(configEntry, {
         ...parameters,
         env: 'development',
         buildType: 'client',

package/src/api/start/providers/child-app/shared.ts

@@ -1,4 +1,5 @@
 import type { Provider } from '@tinkoff/dippy';
+import { provide } from '@tinkoff/dippy';
 import { CLOSE_HANDLER_TOKEN, INIT_HANDLER_TOKEN } from '../../tokens';
 import {
   CONFIG_MANAGER_TOKEN,
@@ -8,23 +9,17 @@ import {
 } from '../../../../di/tokens';
 import type { ChildAppConfigEntry } from '../../../../typings/configEntry/child-app';
 import type { Params } from '../../index';
-import { ConfigManager } from '../../../../config/configManager';
 import { closeWorkerPoolTranspiler } from '../../../../library/webpack/utils/workersPool';
 import { stopServer } from '../../utils/stopServer';
 import { createServer } from '../../utils/createServer';
 import { listenServer } from '../../utils/listenServer';
+import { createConfigManager } from '../../../../config/configManager';
 
 export const sharedProviders: readonly Provider[] = [
-  {
+  provide({
     provide: CONFIG_MANAGER_TOKEN,
-    useFactory: ({
-      configEntry,
-      parameters,
-    }: {
-      configEntry: ChildAppConfigEntry;
-      parameters: Params;
-    }) => {
-      return new ConfigManager(configEntry, {
+    useFactory: ({ configEntry, parameters }) => {
+      return createConfigManager(configEntry as ChildAppConfigEntry, {
         ...parameters,
         env: 'development',
         port: parameters.port ?? 4040,
@@ -35,7 +30,7 @@ export const sharedProviders: readonly Provider[] = [
       configEntry: CONFIG_ENTRY_TOKEN,
       parameters: COMMAND_PARAMETERS_TOKEN,
     },
-  },
+  }),
   {
     provide: STATIC_SERVER_TOKEN,
     useFactory: createServer,
@@ -83,10 +78,10 @@ export const sharedProviders: readonly Provider[] = [
       staticServer: STATIC_SERVER_TOKEN,
     },
   },
-  {
+  provide({
     provide: CLOSE_HANDLER_TOKEN,
     multi: true,
-    useFactory: ({ configManager }: { configManager: typeof CONFIG_MANAGER_TOKEN }) => {
+    useFactory: ({ configManager }) => {
       return async () => {
         await closeWorkerPoolTranspiler(configManager);
       };
@@ -94,5 +89,5 @@ export const sharedProviders: readonly Provider[] = [
     deps: {
       configManager: CONFIG_MANAGER_TOKEN,
     },
-  },
+  }),
 ] as const;

package/src/api/start/providers/module/shared.ts

@@ -1,4 +1,5 @@
 import type { Provider } from '@tinkoff/dippy';
+import { provide } from '@tinkoff/dippy';
 import { CLOSE_HANDLER_TOKEN, INIT_HANDLER_TOKEN } from '../../tokens';
 import {
   CONFIG_MANAGER_TOKEN,
@@ -6,25 +7,19 @@ import {
   COMMAND_PARAMETERS_TOKEN,
   STATIC_SERVER_TOKEN,
 } from '../../../../di/tokens';
-import type { ModuleConfigEntry } from '../../../../typings/configEntry/module';
-import type { Params } from '../../index';
-import { ConfigManager } from '../../../../config/configManager';
+import type { ConfigManager } from '../../../../config/configManager';
+import { createConfigManager } from '../../../../config/configManager';
 import { closeWorkerPoolTranspiler } from '../../../../library/webpack/utils/workersPool';
 import { stopServer } from '../../utils/stopServer';
 import { createServer } from '../../utils/createServer';
 import { listenServer } from '../../utils/listenServer';
+import type { ModuleConfigEntry } from '../../../../typings/configEntry/module';
 
 export const sharedProviders: readonly Provider[] = [
-  {
+  provide({
     provide: CONFIG_MANAGER_TOKEN,
-    useFactory: ({
-      configEntry,
-      parameters,
-    }: {
-      configEntry: ModuleConfigEntry;
-      parameters: Params;
-    }) => {
-      return new ConfigManager(configEntry, {
+    useFactory: ({ configEntry, parameters }) => {
+      return createConfigManager(configEntry as ModuleConfigEntry, {
         ...parameters,
         env: 'development',
         port: parameters.port ?? 4040,
@@ -35,21 +30,15 @@ export const sharedProviders: readonly Provider[] = [
       configEntry: CONFIG_ENTRY_TOKEN,
       parameters: COMMAND_PARAMETERS_TOKEN,
     },
-  },
-  {
+  }),
+  provide({
     provide: STATIC_SERVER_TOKEN,
     useFactory: createServer,
-  },
-  {
+  }),
+  provide({
     provide: INIT_HANDLER_TOKEN,
     multi: true,
-    useFactory: ({
-      staticServer,
-      parameters,
-    }: {
-      staticServer: typeof STATIC_SERVER_TOKEN;
-      parameters: Params;
-    }) => {
+    useFactory: ({ staticServer, parameters }) => {
       return async function staticServerListen() {
         const { host = 'localhost', port = 4040 } = parameters;
 
@@ -70,11 +59,11 @@ export const sharedProviders: readonly Provider[] = [
       staticServer: STATIC_SERVER_TOKEN,
       parameters: COMMAND_PARAMETERS_TOKEN,
     },
-  },
-  {
+  }),
+  provide({
     provide: CLOSE_HANDLER_TOKEN,
     multi: true,
-    useFactory: ({ staticServer }: { staticServer: typeof STATIC_SERVER_TOKEN }) => {
+    useFactory: ({ staticServer }) => {
       return () => {
         return stopServer(staticServer);
       };
@@ -82,11 +71,11 @@ export const sharedProviders: readonly Provider[] = [
     deps: {
       staticServer: STATIC_SERVER_TOKEN,
     },
-  },
-  {
+  }),
+  provide({
     provide: CLOSE_HANDLER_TOKEN,
     multi: true,
-    useFactory: ({ configManager }: { configManager: typeof CONFIG_MANAGER_TOKEN }) => {
+    useFactory: ({ configManager }) => {
       return async () => {
         closeWorkerPoolTranspiler(configManager);
       };
@@ -94,5 +83,5 @@ export const sharedProviders: readonly Provider[] = [
     deps: {
       configManager: CONFIG_MANAGER_TOKEN,
     },
-  },
+  }),
 ] as const;

package/src/api/start/utils/banner.ts

@@ -3,6 +3,7 @@ import type { Container } from '@tinkoff/dippy';
 import { successBox } from '../../../utils/formatting';
 import { UI_SHOW_BANNER_TOKEN, CONFIG_MANAGER_TOKEN, STDOUT_TOKEN } from '../../../di/tokens';
 import { getDocUrl, getTip } from './tips';
+import { isApplication } from '../../../config/validate';
 
 const label = (name) => chalk.bold.cyan(`▸ ${name}:`);
 const link = (url) => chalk.underline.blue(url);
@@ -24,9 +25,9 @@ export function showBanner(di: Container) {
     titleLines.push(`${label('Type')}             ${config.type}`);
   }
   titleLines.push(`${label('Modern')}           ${config.modern}`);
-  titleLines.push(`${label('ReactRefresh')}     ${config.hotRefresh}`);
+  titleLines.push(`${label('ReactRefresh')}     ${config.hotRefresh.enabled}`);
 
-  if (config.build.configurations.fileSystemPages.enable) {
+  if (isApplication(config) && config.fileSystemPages.enabled) {
     titleLines.push(`${label('FileSystemPages')}  true`);
   }
 

package/src/api/start/utils/tips/tips.ts

@@ -3,6 +3,7 @@ import { existsSync } from 'fs-extra';
 import { sync as resolveSync } from 'resolve';
 import { CONFIG_MANAGER_TOKEN } from '../../../../di/tokens';
 import type { TramvaiTip } from './types';
+import { isApplication } from '../../../../config/validate';
 
 const DEFAULT_ROOT_DIR = process.cwd();
 
@@ -22,10 +23,7 @@ Consider to test out swc support.`,
     isApplicable(di) {
       const configManager = di.get(CONFIG_MANAGER_TOKEN);
 
-      return (
-        configManager.serve.configurations?.experiments?.transpilation?.loader !== 'swc' &&
-        configManager.build.configurations?.experiments?.transpilation?.loader !== 'swc'
-      );
+      return configManager.experiments?.transpilation?.loader !== 'swc';
     },
   },
   {
@@ -43,7 +41,7 @@ Consider to test out swc support.`,
     isApplicable(di) {
       const configManager = di.get(CONFIG_MANAGER_TOKEN);
 
-      return configManager.hotRefresh !== true;
+      return configManager.hotRefresh.enabled !== true;
     },
   },
   {
@@ -53,9 +51,14 @@ It may reduce the boilerplate code required with bundles`,
     isApplicable(di) {
       const configManager = di.get(CONFIG_MANAGER_TOKEN);
       const { rootDir, root } = configManager;
-      const { fileSystemPages } = configManager.build.configurations;
 
-      if (!fileSystemPages.enable) {
+      if (!isApplication(configManager)) {
+        return false;
+      }
+
+      const { fileSystemPages } = configManager;
+
+      if (!fileSystemPages.enabled) {
         return true;
       }
 
@@ -107,7 +110,7 @@ So you can remove alias config from tramvai.json`,
     isApplicable(di) {
       const configManager = di.get(CONFIG_MANAGER_TOKEN);
 
-      return !!configManager.build.configurations?.alias;
+      return !!configManager.alias;
     },
   },
   {

package/src/api/start-prod/providers/application.ts

@@ -8,17 +8,19 @@ import {
   CONFIG_MANAGER_TOKEN,
 } from '../../../di/tokens';
 import type { Params } from '../index';
-import { ConfigManager } from '../../index';
 import type { ConfigEntry } from '../../../typings/configEntry/common';
 import { CLOSE_HANDLER_TOKEN, SERVER_PROCESS_TOKEN } from '../tokens';
 import { DEBUG_ARGV } from '../../../config/constants';
 import { safeRequire } from '../../../utils/safeRequire';
+import type { ConfigManager } from '../../../config/configManager';
+import { createConfigManager } from '../../../config/configManager';
+import type { ApplicationConfigEntry } from '../../../typings/configEntry/application';
 
 export const applicationsProviders: readonly Provider[] = [
   provide({
     provide: CONFIG_MANAGER_TOKEN,
     useFactory: ({ configEntry, parameters }: { configEntry: ConfigEntry; parameters: Params }) => {
-      return new ConfigManager(configEntry, {
+      return createConfigManager(configEntry, {
         ...parameters,
         env: 'production',
         port: parameters.port ?? 3000,
@@ -35,19 +37,13 @@ export const applicationsProviders: readonly Provider[] = [
     provide: SERVER_PROCESS_TOKEN,
     useFactory: ({ configManager, parameters }) => {
       const { env } = parameters;
-      const serverConfigManager = configManager.withSettings({
+      const serverConfigManager = (
+        configManager as ConfigManager<ApplicationConfigEntry>
+      ).withSettings({
         buildType: 'server',
       });
-      const {
-        debug,
-        port,
-        staticPort,
-        staticHost,
-        build: {
-          options: { outputClient },
-        },
-      } = serverConfigManager;
-      const root = serverConfigManager.getBuildPath();
+      const { debug, port, staticPort, staticHost, output } = serverConfigManager;
+      const root = serverConfigManager.buildPath;
 
       return fork(path.resolve(root, 'server.js'), [], {
         execArgv: debug ? DEBUG_ARGV : [],
@@ -62,7 +58,7 @@ export const applicationsProviders: readonly Provider[] = [
           PORT_SERVER: `${port}`,
           ASSETS_PREFIX:
             process.env.ASSETS_PREFIX ??
-            `http://${staticHost}:${staticPort}/${outputClient.replace(/\/$/, '')}/`,
+            `http://${staticHost}:${staticPort}/${output.client.replace(/\/$/, '')}/`,
         },
       });
     },