@tramvai/cli 5.22.0 → 5.40.0

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

@@ -65,6 +65,50 @@ export const resolveFrameworksPaths = (rootDir: string, frameworksList: string[]
   return topLevelFrameworkPaths;
 };
 
+const tramvaiScopes = ['@tramvai/', '@tramvai-tinkoff/'];
+const tinkoffPackages = [
+  '@tinkoff/router',
+  '@tinkoff/logger',
+  '@tinkoff/dippy',
+  '@tinkoff/user-agent',
+  '@tinkoff/module-loader-client',
+  '@tinkoff/meta-tags-generate',
+  '@tinkoff/browser-cookies',
+  '@tinkoff/errors',
+  '@tinkoff/layout-factory',
+  '@tinkoff/url',
+  '@tinkoff/roles',
+  '@tinkoff/hook-runner',
+  '@tinkoff/pubsub',
+  '@tinkoff/browser-timings',
+];
+const tinkoffPackagesSet = new Set(tinkoffPackages);
+
+function isTramvaiPackage(packageName: string | undefined) {
+  if (!packageName) return false;
+
+  return (
+    tramvaiScopes.some((scope) => packageName.startsWith(scope)) ||
+    tinkoffPackagesSet.has(packageName)
+  );
+}
+
+function normalizePath(packagePath: string) {
+  return packagePath.endsWith('/') ? packagePath : `${packagePath}/`;
+}
+
+const tramvaiPackagesPaths = [...tramvaiScopes, ...tinkoffPackages].map((packageName) =>
+  normalizePath(`/node_modules/${packageName}`)
+);
+
+function isTramvaiResource(resource: string | undefined) {
+  if (!resource) return false;
+
+  return tramvaiPackagesPaths.some((tramvaiPackagePath) => resource.includes(tramvaiPackagePath));
+}
+
+type CacheGroup = Exclude<Required<SplitChunksOptions>, boolean>['cacheGroups'][string];
+
 // eslint-disable-next-line max-statements
 export const splitChunksConfig =
   (configManager: ConfigManager<ApplicationConfigEntry>) => (config: Config) => {
@@ -72,13 +116,13 @@ export const splitChunksConfig =
 
     const topLevelFrameworkPaths = resolveFrameworksPaths(rootDir, ['react', 'react-dom']);
 
-    const reactCacheGroup: Exclude<Required<SplitChunksOptions>, boolean>['cacheGroups'][string] = {
+    const reactCacheGroup: CacheGroup = {
       chunks: 'all',
       name: 'react',
       // This regex ignores nested copies of framework libraries so they're bundled with their issuer.
       // test: /(?<!node_modules.*)[\\/]node_modules[\\/](react|react-dom|scheduler|prop-types|use-subscription)[\\/]/,
       test(module: webpack.Module) {
-        const resource = module.nameForCondition && module.nameForCondition();
+        const resource = module.nameForCondition?.();
 
         if (!resource) {
           return false;
@@ -93,6 +137,24 @@ export const splitChunksConfig =
       // Don't let webpack eliminate this chunk (prevents this chunk from becoming a part of the commons chunk)
       enforce: true,
     };
+
+    const tramvaiCacheGroup: CacheGroup = splitChunks.frameworkChunk
+      ? {
+          chunks: 'initial',
+          name: 'tramvai',
+          test(module: webpack.Module) {
+            const resource = module.nameForCondition?.();
+            const packageName = (module as webpack.NormalModule).resourceResolveData
+              ?.descriptionFileData?.name as string | undefined;
+
+            return isTramvaiPackage(packageName) || isTramvaiResource(resource);
+          },
+          priority: 35,
+          // Don't let webpack eliminate this chunk (prevents this chunk from becoming a part of the commons chunk)
+          enforce: true,
+        }
+      : false;
+
     let webpackSplitChunks: SplitChunksOptions = false;
 
     switch (splitChunks.mode) {
@@ -130,6 +192,7 @@ export const splitChunksConfig =
             default: false,
             defaultVendors: false,
             reactCacheGroup,
+            tramvaiCacheGroup,
             shared,
           },
         };
@@ -141,6 +204,7 @@ export const splitChunksConfig =
             default: false,
             defaultVendors: false,
             reactCacheGroup,
+            tramvaiCacheGroup,
             commons: {
               name: 'common-chunk',
               minChunks: splitChunks.commonChunkSplitNumber,

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

@@ -36,7 +36,7 @@ export const webpackServerConfig = ({
 
   config.mode('development');
 
-  config.devtool(configManager.webpack.devtool);
+  config.devtool(configManager.webpack.devtool ?? false);
 
   if (configManager.sourceMap) {
     config.batch(sourcemaps(configManager));

package/src/library/webpack/utils/threadLoader.ts

@@ -25,6 +25,7 @@ const isApplicable = (configManager: ConfigManager<CliConfigEntry>) => {
   return (
     // thread-loader uses child_process.fork under the hood, and sometimes (50/50) work in these processes does not get into inspector.Session profile
     !process.env.TRAMVAI_CPU_PROFILE &&
+    !process.env.TRAMVAI_DEBUG_BUILD &&
     // TODO: check that there is still issue with windows systems and thread-loader
     process.platform !== 'win32' &&
     // swc has inbuilt threads support, see https://swc.rs/blog/perf-swc-vs-babel#real-world-benchmark

package/src/models/config.spec.ts

@@ -116,6 +116,7 @@ it('should populate defaults for config', () => {
           "sourceMap": false,
           "splitChunks": {
             "commonChunkSplitNumber": 3,
+            "frameworkChunk": false,
             "granularChunksMinSize": 20000,
             "granularChunksSplitNumber": 2,
             "mode": "granularChunks",
@@ -366,6 +367,7 @@ it('should populate defaults for overridable options', () => {
           "sourceMap": false,
           "splitChunks": {
             "commonChunkSplitNumber": 3,
+            "frameworkChunk": false,
             "granularChunksMinSize": 20000,
             "granularChunksSplitNumber": 2,
             "mode": "granularChunks",

package/src/models/context.ts

@@ -1,4 +1,4 @@
-import type { PackageManager } from '@tinkoff/package-manager-wrapper';
+import { resolvePackageManager, type PackageManager } from '@tinkoff/package-manager-wrapper';
 import type { Logger } from './logger';
 import type { Command, CommandResult } from './command';
 import type { Task, TaskResult } from './task';
@@ -6,13 +6,14 @@ import type { ConfigManager } from './config';
 import type { Analytics } from './analytics';
 
 export class Context {
+  public packageManager: PackageManager;
+
   constructor(
     public config: ConfigManager,
     public logger: Logger,
     public analytics: Analytics,
     public cliRootDir: string,
     public cliPackageManager: PackageManager,
-    public packageManager: PackageManager,
     public runTask: (name, params?) => Promise<TaskResult>,
     public runCommand: (name, params?) => Promise<CommandResult>,
     public getTasks: () => Task[],

package/src/schema/autogeneratedSchema.json

@@ -116,6 +116,11 @@
                 "granularChunks"
               ]
             },
+            "frameworkChunk": {
+              "title": "Move tramvai packages into a separate chunk",
+              "default": false,
+              "type": "boolean"
+            },
             "granularChunksSplitNumber": {
               "title": "Move module to shared chunk if used at least as many times in other chunks",
               "default": 2,
@@ -1227,23 +1232,23 @@
                         "dotAll": {
                           "type": "boolean"
                         },
-                        "__@match@7341": {
+                        "__@match@7842": {
                           "type": "object",
                           "additionalProperties": false
                         },
-                        "__@replace@7343": {
+                        "__@replace@7844": {
                           "type": "object",
                           "additionalProperties": false
                         },
-                        "__@search@7346": {
+                        "__@search@7847": {
                           "type": "object",
                           "additionalProperties": false
                         },
-                        "__@split@7348": {
+                        "__@split@7849": {
                           "type": "object",
                           "additionalProperties": false
                         },
-                        "__@matchAll@7350": {
+                        "__@matchAll@7851": {
                           "type": "object",
                           "additionalProperties": false
                         }
@@ -1275,9 +1280,9 @@
                 "eval",
                 "eval-cheap-module-source-map",
                 "eval-cheap-source-map",
-                "eval-source-map"
-              ],
-              "type": "string"
+                "eval-source-map",
+                false
+              ]
             }
           },
           "additionalProperties": false
@@ -1979,23 +1984,23 @@
                         "dotAll": {
                           "type": "boolean"
                         },
-                        "__@match@7341": {
+                        "__@match@7842": {
                           "type": "object",
                           "additionalProperties": false
                         },
-                        "__@replace@7343": {
+                        "__@replace@7844": {
                           "type": "object",
                           "additionalProperties": false
                         },
-                        "__@search@7346": {
+                        "__@search@7847": {
                           "type": "object",
                           "additionalProperties": false
                         },
-                        "__@split@7348": {
+                        "__@split@7849": {
                           "type": "object",
                           "additionalProperties": false
                         },
-                        "__@matchAll@7350": {
+                        "__@matchAll@7851": {
                           "type": "object",
                           "additionalProperties": false
                         }
@@ -2027,9 +2032,9 @@
                 "eval",
                 "eval-cheap-module-source-map",
                 "eval-cheap-source-map",
-                "eval-source-map"
-              ],
-              "type": "string"
+                "eval-source-map",
+                false
+              ]
             }
           },
           "additionalProperties": false
@@ -2731,23 +2736,23 @@
                         "dotAll": {
                           "type": "boolean"
                         },
-                        "__@match@7341": {
+                        "__@match@7842": {
                           "type": "object",
                           "additionalProperties": false
                         },
-                        "__@replace@7343": {
+                        "__@replace@7844": {
                           "type": "object",
                           "additionalProperties": false
                         },
-                        "__@search@7346": {
+                        "__@search@7847": {
                           "type": "object",
                           "additionalProperties": false
                         },
-                        "__@split@7348": {
+                        "__@split@7849": {
                           "type": "object",
                           "additionalProperties": false
                         },
-                        "__@matchAll@7350": {
+                        "__@matchAll@7851": {
                           "type": "object",
                           "additionalProperties": false
                         }
@@ -2779,9 +2784,9 @@
                 "eval",
                 "eval-cheap-module-source-map",
                 "eval-cheap-source-map",
-                "eval-source-map"
-              ],
-              "type": "string"
+                "eval-source-map",
+                false
+              ]
             }
           },
           "additionalProperties": false

package/src/schema/tramvai.spec.ts

@@ -145,6 +145,7 @@ describe('JSON schema для tramvai.json', () => {
             "sourceMap": false,
             "splitChunks": {
               "commonChunkSplitNumber": 3,
+              "frameworkChunk": false,
               "granularChunksMinSize": 20000,
               "granularChunksSplitNumber": 2,
               "mode": "granularChunks",

package/src/typings/configEntry/application.ts

@@ -189,6 +189,11 @@ export interface ApplicationConfigEntry extends CliConfigEntry {
      * @default "granularChunks"
      */
     mode: 'granularChunks' | 'commonChunk' | false;
+    /**
+     * @title Move tramvai packages into a separate chunk
+     * @default false
+     */
+    frameworkChunk: boolean;
     /**
      * @title Move module to shared chunk if used at least as many times in other chunks
      * @default 2

package/src/typings/configEntry/cli.ts

@@ -251,7 +251,12 @@ export interface CliConfigEntry extends ConfigEntry {
     /**
      * @title Use the specified type of source maps for building in development mode
      */
-    devtool: 'eval' | 'eval-cheap-source-map' | 'eval-cheap-module-source-map' | 'eval-source-map';
+    devtool:
+      | false
+      | 'eval'
+      | 'eval-cheap-source-map'
+      | 'eval-cheap-module-source-map'
+      | 'eval-source-map';
   };
 
   // options that affect only production builds

package/src/typings/webpack-chain/index.d.ts

@@ -434,6 +434,7 @@ declare module 'webpack-chain' {
     }
 
     type DevTool =
+      | boolean
       | 'eval'
       | 'eval-cheap-source-map'
       | 'eval-cheap-module-source-map'

package/src/utils/commands/dependencies/findTramvaiVersion.ts

@@ -10,7 +10,7 @@ const getVersionFromDep = (dep?: string) => {
 export const findTramvaiVersion = async () => {
   const file = fs.readFileSync('package.json');
   const content = JSON.parse(file.toString());
-  const currentVersion = getVersionFromDep(content.dependencies['@tramvai/core']);
+  const currentVersion = getVersionFromDep(content.devDependencies['@tramvai/cli']);
 
   return currentVersion;
 };

package/src/utils/commands/dependencies/getWorkspaceRootByAppName.ts

@@ -0,0 +1,5 @@
+import type { Context } from '../../../models/context';
+
+export const getWorkspaceRootByAppName = (context: Context, appName: string) => {
+  return context.config.getProject(appName).root;
+};

package/src/utils/npmRequire.ts

@@ -28,7 +28,7 @@ async function runtimeInstallPackage({
 
   try {
     await packageManager.install({
-      name: packageName,
+      packageNames: packageName,
       version: packageVersion,
       registry,
       noSave,