@tramvai/cli 5.50.0 → 5.53.78

package/src/config/__integration__/validate.test.ts

@@ -0,0 +1,94 @@
+import path from 'node:path';
+import { validate } from '../validate';
+import { ApplicationConfigEntry, ConfigManager } from '../../api';
+
+const rootDir = path.resolve(__dirname, './__fixtures__/relative');
+const baseConfigManager = {
+  type: 'application',
+  root: 'src',
+  buildType: 'client',
+  rootDir,
+} as ConfigManager<ApplicationConfigEntry>;
+
+describe('validate config', () => {
+  it('should correctly resolve polyfill entry with path', () => {
+    const config = {
+      ...baseConfigManager,
+      polyfill: 'src/polyfill.ts',
+    };
+
+    expect(validate(config)).toBeUndefined();
+  });
+
+  it('should correctly resolve polyfill entry with relative path', () => {
+    const config = {
+      ...baseConfigManager,
+      polyfill: './src/polyfill.ts',
+    };
+
+    expect(validate(config)).toBeUndefined();
+  });
+
+  it('should correctly resolve polyfill entry with relative path without extension', () => {
+    const config = {
+      ...baseConfigManager,
+      polyfill: './src/polyfill',
+    };
+
+    expect(validate(config)).toBeUndefined();
+  });
+
+  it('should correctly resolve polyfill entry with absolute path', () => {
+    const config = {
+      ...baseConfigManager,
+      polyfill: path.join(rootDir, './src/polyfill'),
+    };
+
+    expect(validate(config)).toBeUndefined();
+  });
+
+  it('should throw error when resolve non-existent polyfill entry with relative path', () => {
+    const config = {
+      ...baseConfigManager,
+      polyfill: './src/polyfil',
+    };
+
+    expect(() => validate(config)).toThrow();
+  });
+
+  it('should correctly resolve polyfill entry from node_modules', () => {
+    const config = {
+      ...baseConfigManager,
+      polyfill: 'react',
+    };
+
+    expect(validate(config)).toBeUndefined();
+  });
+
+  it('should correctly resolve polyfill entry from node_modules with specific file path', () => {
+    const config = {
+      ...baseConfigManager,
+      polyfill: 'react/index',
+    };
+
+    expect(validate(config)).toBeUndefined();
+  });
+
+  it('should correctly resolve polyfill entry from node_modules with specific file path and extension', () => {
+    const config = {
+      ...baseConfigManager,
+      polyfill: 'react/index.js',
+    };
+
+    expect(validate(config)).toBeUndefined();
+  });
+
+  it('should throw error when resolve polyfill entry from node_modules with non-existent path', () => {
+    const config = {
+      ...baseConfigManager,
+      polyfill: 'react/index.ts',
+    };
+
+    expect(() => validate(config)).toThrow();
+  });
+});

package/src/config/configManager.ts

@@ -37,7 +37,6 @@ export interface Settings<E extends Env> {
   profile?: boolean;
   noServerRebuild?: boolean;
   noClientRebuild?: boolean;
-  modern?: boolean;
   resolveSymlinks?: boolean;
   showConfig?: boolean;
   onlyBundles?: string[];
@@ -45,7 +44,7 @@ export interface Settings<E extends Env> {
   fileCache?: boolean;
 }
 
-const getOption = <T>(optionName: string, cfgs: any[], dflt: T): T => {
+const getOption = <T>(optionName: string, cfgs: any[], defaultValue: T): T => {
   const getter = prop(optionName);
 
   for (let i = 0; i < cfgs.length; i++) {
@@ -56,7 +55,7 @@ const getOption = <T>(optionName: string, cfgs: any[], dflt: T): T => {
     }
   }
 
-  return dflt;
+  return defaultValue;
 };
 
 type OmitOverridable<T extends Record<string, any>> = {
@@ -112,26 +111,11 @@ export const createConfigManager = <C extends ConfigEntry = ConfigEntry, E exten
   const debug = settings.debug ?? false;
   const verboseWebpack = settings.verboseWebpack ?? false;
   const appEnv = settings.appEnv ?? {};
-  // First problem, modern build is not supported for CSR mode.
-  // Second, in development mode with enabled modern, only modern JS chunks will be generated.
-  // With PWA module, only sw.modern.js file exists - but in CSR mode application needs sw.js, which is not generated.
-  // In production mode with enabled modern, everything is ok - all type of chunks generated in parallel.
-  const disableModernForCsrInDevMode =
-    (process.env.TRAMVAI_FORCE_CLIENT_SIDE_RENDERING ||
-      appEnv.TRAMVAI_FORCE_CLIENT_SIDE_RENDERING) === 'true' && env === 'development';
-  // For Child Apps and dynamic modules legacy build always used
-  const disableModernForMicrofrontends = type === 'child-app' || type === 'module';
-  const modern =
-    disableModernForCsrInDevMode || disableModernForMicrofrontends
-      ? false
-      : getOption('modern', [settings, configEntry], true);
   const buildType = settings.buildType ?? 'client';
   let target: Target = 'defaults';
 
   if (buildType === 'server') {
     target = 'node';
-  } else if (modern) {
-    target = 'modern';
   }
 
   const config: ConfigManager<C, E> = {
@@ -170,7 +154,6 @@ export const createConfigManager = <C extends ConfigEntry = ConfigEntry, E exten
           ? PortManager.DEFAULT_MODULE_STATIC_PORT
           : PortManager.DEFAULT_STATIC_PORT)
     ),
-    modern,
     // eslint-disable-next-line no-nested-ternary
     sourceMap: debug
       ? // allow to disable sourcemaps with debug flag, when sourceMap passed to cli api

package/src/config/validate.ts

@@ -36,11 +36,18 @@ export const validate = (configManager: ConfigManager<any, any>) => {
 
   const isMissing = (path: string) => {
     try {
-      return !requireResolve(resolve(rootDir, path), {
+      return !requireResolve(path, {
         extensions,
         basedir: rootDir,
       });
     } catch (e) {
+      try {
+        return !requireResolve(resolve(rootDir, path), {
+          extensions,
+          basedir: rootDir,
+        });
+      } catch (_e) {}
+
       return true;
     }
   };

package/src/di/providers/index.ts

@@ -1,4 +1,3 @@
-export * from './analytics';
 export * from './std';
 export * from './config';
 export * from './commands';

package/src/di/tokens/index.ts

@@ -1,4 +1,3 @@
-export * from './analytics';
 export * from './logger';
 export * from './command';
 export * from './std';

package/src/library/babel/index.ts

@@ -53,7 +53,7 @@ export const babelConfigFactory = ({
 }: Partial<TranspilerConfig>) => {
   const cfg = envConfig[env] || {};
 
-  const babelConfig = {
+  const babelConfig: Record<string, any> = {
     // по умолчанию sourceType: 'module' и тогда бабель рассматривает все файлы как es-модули, что может
     // вызвать проблемы в некоторых случаях когда бабель обрабатывает уже скомпиленный в commonjs файл
     // как модуль добавляя в него es-импорты и вводя этим вебпак в ступор на счет типа файла
@@ -83,7 +83,7 @@ export const babelConfigFactory = ({
           loose,
           targets: browsersListTargets,
           browserslistEnv: actualTarget,
-          bugfixes: actualTarget === 'modern',
+          bugfixes: true,
           exclude: excludesPresetEnv,
         },
       ],
@@ -123,18 +123,6 @@ export const babelConfigFactory = ({
           legacy: true,
         },
       ],
-      [
-        '@babel/plugin-proposal-class-properties',
-        {
-          loose,
-        },
-      ],
-      isServer && [
-        '@babel/plugin-transform-private-methods',
-        {
-          loose,
-        },
-      ],
       '@babel/plugin-proposal-export-default-from',
       removeTypeofWindow && [
         'transform-define',
@@ -151,6 +139,12 @@ export const babelConfigFactory = ({
       .filter(Boolean),
   };
 
+  if (typeof browsersListTargets !== 'undefined') {
+    // to prevent from reading browserslist config for every processed module (sometimes it is not cached in browserslist),
+    // don't know why, but target from preset-env plugin options is ignored from this process
+    babelConfig.targets = browsersListTargets;
+  }
+
   const loaderConfig = loader
     ? {
         cwd: path.resolve(__dirname, '..', '..', '..'),

package/src/library/babel/plugins/__snapshots__/create-token-pure.spec.ts.snap

@@ -13,7 +13,7 @@ export const TOKEN = createToken('token');
 // @ts-ignore
 // eslint-disable-next-line import/no-unresolved
 import { createToken } from '@tinkoff/dippy';
-export var TOKEN = /*#__PURE__*/ createToken('token');
+export const TOKEN = /*#__PURE__*/ createToken('token');
 
 
 `;
@@ -31,7 +31,7 @@ export const TOKEN = createToken('token');
 // @ts-ignore
 // eslint-disable-next-line import/no-unresolved
 import { createToken } from '@tramvai/core';
-export var TOKEN = /*#__PURE__*/ createToken('token');
+export const TOKEN = /*#__PURE__*/ createToken('token');
 
 
 `;
@@ -49,7 +49,7 @@ export const TOKEN = /* #__PURE__*/ createToken('token');
 // @ts-ignore
 // eslint-disable-next-line import/no-unresolved
 import { createToken } from '@tinkoff/dippy';
-export var TOKEN = /* #__PURE__*/ createToken('token');
+export const TOKEN = /* #__PURE__*/ createToken('token');
 
 
 `;
@@ -72,8 +72,8 @@ const module = Module({
 // eslint-disable-next-line import/no-unresolved
 import { createToken } from '@tinkoff/dippy';
 import { Module } from '@tramvai/core';
-export var TOKEN = /*#__PURE__*/ createToken('token');
-var module = Module({
+export const TOKEN = /*#__PURE__*/ createToken('token');
+const module = Module({
   providers: [],
 });
 
@@ -99,7 +99,7 @@ createApp({
 // eslint-disable-next-line import/no-unresolved
 import { createApp } from '@tramvai/core';
 import { Container } from '@tinkoff/dippy';
-var di = new Container();
+const di = new Container();
 createApp({
   name: 'test',
 });

package/src/library/babel/plugins/__snapshots__/fill-declare-action-name.spec.ts.snap

@@ -34,15 +34,15 @@ export default declareAction({
       ↓ ↓ ↓ ↓ ↓ ↓
 
 import { declareAction } from '@tramvai/core';
-var action = declareAction({
+const action = declareAction({
   name: 'action',
-  fn: function fn() {
+  fn: () => {
     console.log('action');
   },
 });
-var secondAction = declareAction({
+const secondAction = declareAction({
   name: 'secondAction',
-  fn: function fn() {
+  fn: () => {
     console.log('second action');
   },
   conditions: {
@@ -51,7 +51,7 @@ var secondAction = declareAction({
 });
 export default declareAction({
   name: 'anonymousAction',
-  fn: function fn() {
+  fn: () => {
     console.log('anonymous action');
   },
   conditions: {
@@ -85,15 +85,15 @@ const secondAction = declareAction({
       ↓ ↓ ↓ ↓ ↓ ↓
 
 import { declareAction } from '@tramvai/core';
-var action = declareAction({
+const action = declareAction({
   name: 'action',
-  fn: function fn() {
+  fn: () => {
     console.log('action');
   },
 });
-var secondAction = declareAction({
+const secondAction = declareAction({
   name: 'secondAction__-5f0ssw',
-  fn: function fn() {
+  fn: () => {
     console.log('second action');
   },
   conditions: {
@@ -135,15 +135,15 @@ export default declareAction({
       ↓ ↓ ↓ ↓ ↓ ↓
 
 import { declareAction } from '@tramvai/core';
-var action = declareAction({
+const action = declareAction({
   name: 'action__n5c5ae',
-  fn: function fn() {
+  fn: () => {
     console.log('action');
   },
 });
-var secondAction = declareAction({
+const secondAction = declareAction({
   name: 'secondAction__n5fz8b',
-  fn: function fn() {
+  fn: () => {
     console.log('second action');
   },
   conditions: {
@@ -152,7 +152,7 @@ var secondAction = declareAction({
 });
 export default declareAction({
   name: 'import-without-name.ts__797bng',
-  fn: function fn() {
+  fn: () => {
     console.log('anonymous action');
   },
   conditions: {
@@ -190,21 +190,20 @@ const secondAction = declareAction({
       ↓ ↓ ↓ ↓ ↓ ↓
 
 // @ts-ignore
-var _require = require('@tramvai/core'),
-  declareAction = _require.declareAction;
+const { declareAction } = require('@tramvai/core');
 
 // @ts-ignore
-var action = declareAction({
+const action = declareAction({
   name: 'action',
-  fn: function fn() {
+  fn: () => {
     console.log('action');
   },
 });
 
 // @ts-ignore
-var secondAction = declareAction({
+const secondAction = declareAction({
   name: 'secondAction',
-  fn: function fn() {
+  fn: () => {
     console.log('second action');
   },
   conditions: {
@@ -240,21 +239,20 @@ const secondAction = declareAction({
       ↓ ↓ ↓ ↓ ↓ ↓
 
 // @ts-ignore
-var _require = require('@tramvai/core'),
-  declareAction = _require.declareAction;
+const { declareAction } = require('@tramvai/core');
 
 // @ts-ignore
-var action = declareAction({
+const action = declareAction({
   name: 'action__l6frq0',
-  fn: function fn() {
+  fn: () => {
     console.log('action');
   },
 });
 
 // @ts-ignore
-var secondAction = declareAction({
+const secondAction = declareAction({
   name: 'secondAction__h789zd',
-  fn: function fn() {
+  fn: () => {
     console.log('second action');
   },
   conditions: {

package/src/library/babel/plugins/__snapshots__/provider-stack.spec.ts.snap

@@ -31,7 +31,7 @@ var _ref, _ref2, _ref3;
 // @ts-ignore
 // eslint-disable-next-line import/no-unresolved
 import { Scope } from '@tramvai/core';
-export var providers = [
+export const providers = [
   ((_ref =
     /*__tramvai_stack_provider__*/
     {
@@ -49,7 +49,7 @@ export var providers = [
       provide: 'b',
       multi: true,
       deps: {},
-      useFactory: function useFactory() {},
+      useFactory: () => {},
     }),
   Object.defineProperty(_ref2, '__stack', {
     enumerable: false,
@@ -62,7 +62,7 @@ export var providers = [
       provide: 'c',
       scope: Scope.SINGLETON,
       // eslint-disable-next-line @typescript-eslint/no-extraneous-class
-      useClass: function useClass() {},
+      useClass: class {},
     }),
   Object.defineProperty(_ref3, '__stack', {
     enumerable: false,
@@ -107,7 +107,7 @@ var _ref, _ref2, _ref3;
 // @ts-ignore
 // eslint-disable-next-line import/no-unresolved
 import { Scope, Error as _Error } from '@tramvai/core';
-export var providers = [
+export const providers = [
   ((_ref =
     /*__tramvai_stack_provider__*/
     {
@@ -125,7 +125,7 @@ export var providers = [
       provide: 'b',
       multi: true,
       deps: {},
-      useFactory: function useFactory() {
+      useFactory: () => {
         console.log(_Error);
       },
     }),
@@ -140,7 +140,7 @@ export var providers = [
       provide: 'c',
       scope: Scope.SINGLETON,
       // eslint-disable-next-line @typescript-eslint/no-extraneous-class
-      useClass: function useClass() {},
+      useClass: class {},
     }),
   Object.defineProperty(_ref3, '__stack', {
     enumerable: false,
@@ -188,7 +188,7 @@ var _dec, _ref, _ref2, _ref3, _class;
 // @ts-ignore
 // eslint-disable-next-line import/no-unresolved
 import { module, Scope } from '@tramvai/core';
-export var ClassModule =
+export let ClassModule =
   ((_dec = module({
     providers: [
       ((_ref =
@@ -196,7 +196,7 @@ export var ClassModule =
         {
           provide: 'provide',
           // eslint-disable-next-line @typescript-eslint/no-extraneous-class
-          useClass: function useClass() {},
+          useClass: class {},
           multi: true,
           deps: {},
         }),
@@ -209,7 +209,7 @@ export var ClassModule =
         /*__tramvai_stack_provider__*/
         {
           provide: 'test',
-          useFactory: function useFactory() {},
+          useFactory: () => {},
           multi: false,
           scope: Scope.SINGLETON,
         }),
@@ -231,7 +231,7 @@ export var ClassModule =
       _ref3),
     ],
   })),
-  _dec((_class = function ClassModule() {})) || _class);
+  _dec((_class = class ClassModule {})) || _class);
 
 
 `;
@@ -255,12 +255,12 @@ var _ref;
 // @ts-ignore
 // eslint-disable-next-line import/no-unresolved
 
-export var providers = [
+export const providers = [
   ((_ref =
     /*__tramvai_stack_provider__*/
     {
       provide: 'a',
-      useFactory: function () {},
+      useFactory: () => {},
     }),
   Object.defineProperty(_ref, '__stack', {
     enumerable: false,
@@ -293,7 +293,7 @@ export const providers = [
 
       ↓ ↓ ↓ ↓ ↓ ↓
 
-export var providers = [
+export const providers = [
   {
     provide: 'test',
   },
@@ -330,52 +330,33 @@ export const func = async () => {
 
       ↓ ↓ ↓ ↓ ↓ ↓
 
-import _asyncToGenerator from '@babel/runtime/helpers/esm/asyncToGenerator';
-import _regeneratorRuntime from '@babel/runtime/regenerator';
-export var func = /*#__PURE__*/ (function () {
-  var _ref = _asyncToGenerator(
-    /*#__PURE__*/ _regeneratorRuntime.mark(function _callee() {
-      var _ref2, _ref3;
-      return _regeneratorRuntime.wrap(function _callee$(_context) {
-        while (1)
-          switch ((_context.prev = _context.next)) {
-            case 0:
-              _context.next = 2;
-              return Promise.resolve([
-                ((_ref2 =
-                  /*__tramvai_stack_provider__*/
-                  {
-                    provide: 'a',
-                    useValue: 'a',
-                  }),
-                Object.defineProperty(_ref2, '__stack', {
-                  enumerable: false,
-                  value: new Error().stack,
-                }),
-                _ref2),
-                ((_ref3 =
-                  /*__tramvai_stack_provider__*/
-                  {
-                    provide: 'b',
-                    useValue: 'b',
-                  }),
-                Object.defineProperty(_ref3, '__stack', {
-                  enumerable: false,
-                  value: new Error().stack,
-                }),
-                _ref3),
-              ]);
-            case 2:
-            case 'end':
-              return _context.stop();
-          }
-      }, _callee);
-    })
-  );
-  return function func() {
-    return _ref.apply(this, arguments);
-  };
-})();
+export const func = async () => {
+  var _ref, _ref2;
+  await Promise.resolve([
+    ((_ref =
+      /*__tramvai_stack_provider__*/
+      {
+        provide: 'a',
+        useValue: 'a',
+      }),
+    Object.defineProperty(_ref, '__stack', {
+      enumerable: false,
+      value: new Error().stack,
+    }),
+    _ref),
+    ((_ref2 =
+      /*__tramvai_stack_provider__*/
+      {
+        provide: 'b',
+        useValue: 'b',
+      }),
+    Object.defineProperty(_ref2, '__stack', {
+      enumerable: false,
+      value: new Error().stack,
+    }),
+    _ref2),
+  ]);
+};
 
 
 `;

package/src/library/babel/plugins/lazy-component/lazy-component.spec.ts

@@ -11,7 +11,6 @@ pluginTester({
     generateDataQaTag: false,
     loader: false,
     hot: true,
-    actualTarget: 'modern',
     browsersListTargets: ['defaults'],
   }),
   tests: {

package/src/library/babel/plugins/lazy-component/legacy-universal-replace.spec.ts

@@ -10,7 +10,6 @@ pluginTester({
     typescript: true,
     generateDataQaTag: false,
     loader: false,
-    actualTarget: 'modern',
     browsersListTargets: ['defaults'],
   }),
   tests: {