@tramvai/cli 5.49.1 → 6.59.0

package/src/commands/update/updatePackageJson.ts

@@ -1,4 +1,3 @@
-import { parse, minVersion } from 'semver';
 import fs from 'fs';
 import pMap from 'p-map';
 import type { Ora } from 'ora';
@@ -8,17 +7,12 @@ import { packageHasVersion } from '../../utils/commands/dependencies/packageHasV
 import { getLibPackageVersion } from './dependantLibs';
 import { isDependantLib, isUnifiedVersion } from '../../utils/tramvaiVersions';
 
-const getVersionFromDep = (dep?: string) => {
-  if (dep) {
-    return parse(dep)?.version || minVersion(dep)?.version;
-  }
-};
-
 const updateDependencies = (
   dependencies: Record<string, string> = {},
-  targetVersion: string,
-  prerelease: boolean,
+  version: string,
+  resolvedVersion: string,
   currentVersion: string,
+  tag: boolean,
   spinner: Ora
 ) => {
   return pMap<string, void>(
@@ -26,10 +20,12 @@ const updateDependencies = (
     async (dep) => {
       let nextVersion: string | undefined;
 
-      if (isUnifiedVersion(dep) && getVersionFromDep(dependencies[dep]) === currentVersion) {
-        nextVersion = targetVersion;
+      if (isUnifiedVersion(dep) && dependencies[dep] === currentVersion) {
+        nextVersion = resolvedVersion;
       } else if (isDependantLib(dep)) {
-        const libVersion = await getLibPackageVersion(dep, targetVersion, prerelease);
+        const libVersion = tag
+          ? resolvedVersion
+          : await getLibPackageVersion(dep, version, resolvedVersion, spinner);
         nextVersion = libVersion;
       }
 
@@ -64,8 +60,9 @@ const updateDependencies = (
 
 export const updatePackageJson = async (
   version: string,
+  resolvedVersion: string,
   currentVersion: string,
-  prerelease?: boolean,
+  tag?: boolean,
   path = '.'
 ) => {
   const packageJsonPath = resolve(path, 'package.json');
@@ -75,13 +72,28 @@ export const updatePackageJson = async (
   const spinner = ora(`Updating package.json versions`).start();
 
   try {
-    await updateDependencies(content.dependencies, version, prerelease, currentVersion, spinner);
-    await updateDependencies(content.devDependencies, version, prerelease, currentVersion, spinner);
+    await updateDependencies(
+      content.dependencies,
+      version,
+      resolvedVersion,
+      currentVersion,
+      tag,
+      spinner
+    );
+    await updateDependencies(
+      content.devDependencies,
+      version,
+      resolvedVersion,
+      currentVersion,
+      tag,
+      spinner
+    );
     await updateDependencies(
       content.peerDependencies,
       version,
-      prerelease,
+      resolvedVersion,
       currentVersion,
+      tag,
       spinner
     );
 

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/external/config.ts

@@ -1,3 +1,4 @@
+// This configuration is virtual and generated in packages/cli/src/library/webpack/blocks/configResolve.ts
 import type { ConfigManager } from '../config/configManager';
 import type { ApplicationConfigEntry } from '../typings/configEntry/application';
 import type { ModuleConfigEntry } from '../typings/configEntry/module';

package/src/library/babel/index.ts

@@ -1,167 +1,4 @@
-import path from 'path';
-import { sync as resolve } from 'resolve';
-import type { TransformOptions } from '@babel/core';
+import { configFactory } from '@tramvai/plugin-babel-transpiler/lib/config-factory';
 
-import { getReactCompilerPlugin } from './plugins/react-compiler';
-import type { TranspilerConfig } from '../webpack/utils/transpiler';
-
-const envConfig = {
-  production: {
-    plugins: [
-      '@babel/plugin-transform-react-constant-elements',
-      [
-        'transform-react-remove-prop-types',
-        {
-          removeImport: true,
-        },
-      ],
-    ],
-  },
-};
-
-function hasJsxRuntime() {
-  try {
-    resolve('react/jsx-runtime', { basedir: process.cwd() });
-    return true;
-  } catch (e) {
-    return false;
-  }
-}
-
-// eslint-disable-next-line complexity
-export const babelConfigFactory = ({
-  env = 'development',
-  isServer = false,
-  modules = false,
-  actualTarget,
-  generateDataQaTag = true,
-  enableFillActionNamePlugin = false,
-  enableFillDeclareActionNamePlugin = false,
-  // for testing only!
-  // @ts-expect-error
-  markCreateTokenAsPure = true,
-  typescript = false,
-  loader = true,
-  removeTypeofWindow,
-  tramvai = false,
-  hot = false,
-  excludesPresetEnv,
-  browsersListTargets,
-  reactCompiler = false,
-  loose = true,
-  externalHelpers = true,
-}: Partial<TranspilerConfig>) => {
-  const cfg = envConfig[env] || {};
-
-  const babelConfig = {
-    // по умолчанию sourceType: 'module' и тогда бабель рассматривает все файлы как es-модули, что может
-    // вызвать проблемы в некоторых случаях когда бабель обрабатывает уже скомпиленный в commonjs файл
-    // как модуль добавляя в него es-импорты и вводя этим вебпак в ступор на счет типа файла
-    // unambiguos - режим когда бабель попытается предугадать тип компилируемого файла и уже на этой
-    // основе добавлять соответствующие импорты
-    sourceType: 'unambiguous' as const,
-
-    // Это необходимо для того, чтобы деструктуризация array-like сущностей, например, Set
-    // не приводила к невалидному коду при сборке для старых браузеров:
-    // [...new Set()] => [].concat(new Set())
-    // https://babeljs.io/docs/assumptions#arraylikeisiterable
-    assumptions: {
-      arrayLikeIsIterable: true,
-      iterableIsArray: false,
-    },
-
-    presets: [
-      [
-        '@babel/preset-env',
-        {
-          modules,
-          useBuiltIns: 'entry',
-          // from core-js version depends on what polyfills will be included with `useBuiltIns: 'entry'` option
-          // this logic is here - https://github.com/zloirock/core-js/blob/master/packages/core-js-compat/src/modules-by-versions.mjs
-          corejs: require('core-js/package.json').version,
-          // TODO: will be deprecated in babel@8 - https://babeljs.io/docs/babel-preset-env#loose
-          loose,
-          targets: browsersListTargets,
-          browserslistEnv: actualTarget,
-          bugfixes: actualTarget === 'modern',
-          exclude: excludesPresetEnv,
-        },
-      ],
-      [
-        '@babel/preset-react',
-        {
-          runtime: hasJsxRuntime() ? 'automatic' : 'classic',
-          useSpread: true,
-          development: env === 'development',
-        },
-      ],
-      typescript && '@babel/preset-typescript',
-    ]
-      .concat(cfg.presets || [])
-      .filter(Boolean) as TransformOptions['presets'],
-
-    plugins: [
-      // React compiler must be the first plugin in the chain
-      getReactCompilerPlugin({ isServer, options: reactCompiler }),
-      // TODO: useESModules is deprecated and should work automatically - https://babeljs.io/docs/en/babel-plugin-transform-runtime#useesmodules
-      externalHelpers && [
-        '@babel/transform-runtime',
-        { useESModules: !(isServer && env === 'development') },
-      ],
-      path.resolve(__dirname, './plugins/lazy-component/legacy-universal-replace'), // TODO: удалить плагин после того как отпадёт необходимость поддерживать легаси
-      path.resolve(__dirname, './plugins/lazy-component/lazy-component'),
-      enableFillDeclareActionNamePlugin &&
-        path.resolve(__dirname, './plugins/fill-declare-action-name'),
-      generateDataQaTag && path.resolve(__dirname, './plugins/react-element-info-unique'), // Собственный плагин. Необходимо удалить в будущем
-      enableFillActionNamePlugin && path.resolve(__dirname, './plugins/fill-action-name'), // Собственный плагин. Необходимо удалить в будущем
-      markCreateTokenAsPure && path.resolve(__dirname, './plugins/create-token-pure'),
-      '@tinkoff/babel-plugin-lodash/cjs',
-      isServer && 'babel-plugin-dynamic-import-node',
-      [
-        '@babel/plugin-proposal-decorators',
-        {
-          legacy: true,
-        },
-      ],
-      [
-        '@babel/plugin-proposal-class-properties',
-        {
-          loose,
-        },
-      ],
-      isServer && [
-        '@babel/plugin-transform-private-methods',
-        {
-          loose,
-        },
-      ],
-      '@babel/plugin-proposal-export-default-from',
-      removeTypeofWindow && [
-        'transform-define',
-        {
-          'typeof window': isServer ? 'undefined' : 'object',
-        },
-      ],
-      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 || [])
-      .filter(Boolean),
-  };
-
-  const loaderConfig = loader
-    ? {
-        cwd: path.resolve(__dirname, '..', '..', '..'),
-        compact: false,
-      }
-    : {};
-
-  return {
-    ...babelConfig,
-    ...loaderConfig,
-  };
-};
-
-export default babelConfigFactory;
+export { configFactory as babelConfigFactory };
+export default configFactory;