@tramvai/cli 2.64.0 → 2.65.9

package/src/library/webpack/loaders/pagesResolve.ts

@@ -1,14 +1,24 @@
 import path from 'path';
 import readDir from 'fs-readdir-recursive';
 import fs from 'fs';
+import type { LoaderDefinitionFunction } from 'webpack';
+import type { ApplicationConfigEntry } from '../../../api';
 
 const LAYOUT_FILENAME = '_layout.tsx';
 const ERROR_BOUNDARY_FILENAME = '_error.tsx';
 
-export default function () {
+interface Options {
+  rootDir: string;
+  root: string;
+  extensions: string[];
+  fileSystemPages: ApplicationConfigEntry['fileSystemPages'];
+}
+
+// eslint-disable-next-line func-style
+const pagesResolve: LoaderDefinitionFunction<Options> = function () {
   const { fileSystemPages, rootDir, root, extensions } = this.getOptions();
-  const fsLayouts = [];
-  const fsErrorBoundaries = [];
+  const fsLayouts: string[] = [];
+  const fsErrorBoundaries: string[] = [];
 
   this.cacheable(false);
 
@@ -24,7 +34,7 @@ export default function () {
     this.addContextDependency(pagesDir);
 
     // skip files whose name starts with dot or underscore symbols
-    const pagesFiles = readDir(pagesDir, (name) => name[0] !== '.' && name[0] !== '_');
+    const pagesFiles = readDir(pagesDir, (name: string) => name[0] !== '.' && name[0] !== '_');
     const fsPages = [];
 
     for (const file of pagesFiles) {
@@ -103,4 +113,6 @@ export default function () {
   }`;
 
   return code;
-}
+};
+
+export default pagesResolve;

package/src/library/webpack/loaders/replaceContent.ts

@@ -1,4 +1,11 @@
-export default function () {
+import type { LoaderDefinition } from 'webpack';
+
+interface Options {
+  code: string;
+}
+
+// eslint-disable-next-line func-style
+const replaceContent: LoaderDefinition<Options> = function () {
   const { code } = this.getOptions();
 
   // выставляем флаг, что данный модуль не кешируется т.к. в контенте могут быть данные которые будут меняться от сборки к сборке,
@@ -6,4 +13,6 @@ export default function () {
   this.cacheable(false);
 
   return code;
-}
+};
+
+export default replaceContent;

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

@@ -20,7 +20,7 @@ export default (configManager: ConfigManager<ModuleConfigEntry>) => (config: Con
   config.target(['web', 'es5']);
 
   config.output
-    .path(configManager.getBuildPath())
+    .path(configManager.buildPath)
     .publicPath('')
     .library(configManager.name)
     .libraryTarget('lazy')

package/src/library/webpack/module/externals.ts

@@ -14,4 +14,4 @@ export default modules.reduce((acc, name) => {
   };
 
   return acc;
-}, {});
+}, {} as Record<string, {}>);

package/src/library/webpack/module/resolveExternal.ts

@@ -1 +1 @@
-export default (name) => ['__externals', name];
+export default (name: string) => ['__externals', name];

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

@@ -15,7 +15,7 @@ export default (configManager: ConfigManager<ModuleConfigEntry>) => (config: Con
   config.target('node');
 
   config.output
-    .path(configManager.getBuildPath())
+    .path(configManager.buildPath)
     .publicPath('')
     .filename('[name]_server.js')
     .chunkFilename('[name]_server.chunk.js')

package/src/library/webpack/plugins/LazyModuleInitialization.ts

@@ -1,5 +1,6 @@
 import type { Compiler, LibraryOptions } from 'webpack';
 import { library, sources } from 'webpack';
+// @ts-ignore
 // eslint-disable-next-line no-restricted-imports
 import ExportPropertyLibraryPlugin from 'webpack/lib/library/ExportPropertyLibraryPlugin';
 
@@ -35,7 +36,11 @@ export default class LazyModuleInitialization extends library.AbstractLibraryPlu
     };
   }
 
-  render(source: sources.Source, context, { options: { name } }) {
+  render(
+    source: sources.Source,
+    context: unknown,
+    { options: { name } }: { options: { name: string } }
+  ) {
     // оборачиваем код модуля в lazy-обёртку
     return new sources.ConcatSource(
       'window.__externals = window.__externals || {};\n',

package/src/library/webpack/plugins/WebpackBar/utils/index.ts

@@ -1,35 +1,35 @@
 import { sep } from 'path';
 
-export function first(arr) {
+export function first<T>(arr: T[]): T {
   return arr[0];
 }
 
-export function last(arr) {
+export function last<T>(arr: T[]): T | null {
   return arr.length ? arr[arr.length - 1] : null;
 }
 
-export function startCase(str) {
+export function startCase(str: string) {
   return str[0].toUpperCase() + str.substr(1);
 }
 
-export function firstMatch(regex, str) {
+export function firstMatch(regex: RegExp, str: string) {
   const m = regex.exec(str);
   return m ? m[0] : null;
 }
 
-export function hasValue(s) {
+export function hasValue(s: any) {
   return s && s.length;
 }
 
-export function removeAfter(delimiter, str) {
+export function removeAfter(delimiter: string, str: string) {
   return first(str.split(delimiter)) || '';
 }
 
-export function removeBefore(delimiter, str) {
+export function removeBefore(delimiter: string, str: string) {
   return last(str.split(delimiter)) || '';
 }
 
-export function range(len) {
+export function range(len: number) {
   const arr = [];
   for (let i = 0; i < len; i++) {
     arr.push(i);

package/src/library/webpack/plugins/WebpackBar/utils/webpack.ts

@@ -4,7 +4,7 @@ import { nodeModules, NEXT } from './consts';
 
 import { removeAfter, removeBefore, hasValue, firstMatch } from '.';
 
-export const parseRequest = (requestStr) => {
+export const parseRequest = (requestStr: string) => {
   const parts = (requestStr || '').split('!');
 
   const file = path.relative(

package/src/library/webpack/types/webpack.ts

@@ -6,7 +6,7 @@ export type ModuleFederationPluginOptions = ConstructorParameters<
 
 export type ModuleFederationSharedObject = Record<
   string,
-  Exclude<Exclude<ModuleFederationPluginOptions['shared'], any[]>[string], string>
+  Exclude<Exclude<Required<ModuleFederationPluginOptions>['shared'], any[]>[string], string>
 >;
 
-export type SplitChunksOptions = Configuration['optimization']['splitChunks'];
+export type SplitChunksOptions = Required<Required<Configuration>['optimization']>['splitChunks'];

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

@@ -1,9 +1,10 @@
 import type Config from 'webpack-chain';
 import type { ConfigManager } from '../../../config/configManager';
+import type { CliConfigEntry } from '../../../typings/configEntry/cli';
 import { addTranspilerLoader, getTranspilerConfig } from './transpiler';
 
 export const addSvgrLoader = (
-  configManager: ConfigManager,
+  configManager: ConfigManager<CliConfigEntry>,
   config: Config,
   svgoOptions: Record<string, any>
 ) => {
@@ -23,9 +24,9 @@ export const addSvgrLoader = (
   svgrConfig.use('svgr').loader('@svgr/webpack').options({ babel: false, svgo: svgoOptions }).end();
 };
 
-export const getSvgoOptions = (configManager: ConfigManager) => {
+export const getSvgoOptions = (configManager: ConfigManager<CliConfigEntry>) => {
   return {
-    plugins: configManager.build?.configurations?.svgo?.plugins ?? [
+    plugins: configManager.svgo?.plugins ?? [
       {
         cleanupIDs: false,
       },

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

@@ -5,6 +5,7 @@ import { getSwcOptions } from '../../swc';
 import babelConfig from '../../babel';
 import type { Env } from '../../../typings/Env';
 import type { Target } from '../../../typings/target';
+import type { CliConfigEntry } from '../../../typings/configEntry/cli';
 
 export type TranspilerConfig = {
   env: Env;
@@ -25,7 +26,7 @@ export type TranspilerConfig = {
 };
 
 export const addTranspilerLoader = (
-  configManager: ConfigManager,
+  configManager: ConfigManager<CliConfigEntry>,
   rule: Config.Use,
   transpilerConfig: TranspilerConfig
 ) => {
@@ -49,16 +50,10 @@ Please run "tramvai add --dev @tramvai/swc-integration" to fix the problem
 };
 
 export const getTranspilerConfig = (
-  configManager: ConfigManager,
+  configManager: ConfigManager<CliConfigEntry>,
   overrideOptions: Partial<TranspilerConfig> = {}
 ): TranspilerConfig => {
-  const {
-    generateDataQaTag,
-    alias,
-    removeTypeofWindow,
-    enableFillActionNamePlugin,
-    excludesPresetEnv,
-  } = configManager.build.configurations;
+  const { generateDataQaTag, alias, enableFillActionNamePlugin, excludesPresetEnv } = configManager;
   const { env, modern } = configManager;
 
   return {
@@ -68,8 +63,8 @@ export const getTranspilerConfig = (
     modern,
     alias,
     tramvai: true,
-    removeTypeofWindow,
-    hot: configManager.hotRefresh,
+    removeTypeofWindow: true,
+    hot: !!configManager.hotRefresh.enabled,
     excludesPresetEnv,
     enableFillActionNamePlugin,
     rootDir: configManager.rootDir,

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

@@ -2,6 +2,7 @@ import * as threadLoader from 'thread-loader';
 import { getPool } from 'thread-loader/dist/workerPools';
 import os from 'os';
 import type { ConfigManager } from '../../../config/configManager';
+import type { CliConfigEntry } from '../../../typings/configEntry/cli';
 
 // fork https://github.com/webpack-contrib/thread-loader/blob/76535bfaafd70bd1ec50e66541d2ad8a64175880/src/workerPools.js#L6
 function getCpuNumber() {
@@ -15,17 +16,13 @@ function calculateNumberOfWorkers() {
   return Math.max(1, cpus / 2 - 1);
 }
 
-const getCustomConfig = (configManager: ConfigManager) => {
-  const {
-    build: {
-      configurations: { threadLoader: additionalConfig },
-    },
-  } = configManager;
+const getCustomConfig = (configManager: ConfigManager<CliConfigEntry>): any => {
+  const { threadLoader: additionalConfig } = configManager;
 
   return additionalConfig || {};
 };
 
-const createTranspilerConfig = (configManager: ConfigManager) => {
+const createTranspilerConfig = (configManager: ConfigManager<CliConfigEntry>) => {
   return {
     name: 'transpiler',
     poolTimeout: configManager.env === 'development' ? Infinity : undefined,
@@ -34,7 +31,7 @@ const createTranspilerConfig = (configManager: ConfigManager) => {
   };
 };
 
-export const createWorkerPoolTranspiler = (configManager: ConfigManager) => {
+export const createWorkerPoolTranspiler = (configManager: ConfigManager<CliConfigEntry>) => {
   const config = createTranspilerConfig(configManager);
 
   if (!(createWorkerPoolTranspiler as any).warmup) {
@@ -56,6 +53,6 @@ export const createWorkerPoolTranspiler = (configManager: ConfigManager) => {
   return config;
 };
 
-export const closeWorkerPoolTranspiler = (configManager: ConfigManager) => {
+export const closeWorkerPoolTranspiler = (configManager: ConfigManager<CliConfigEntry>) => {
   getPool(createTranspilerConfig(configManager))?.disposeWorkers();
 };

package/src/models/config.spec.ts

@@ -0,0 +1,352 @@
+import { ConfigManager } from './config';
+
+const syncConfigFile = jest.fn();
+
+it('should populate defaults for config', () => {
+  const config: any = {
+    projects: {
+      app: {
+        name: 'test-app',
+        root: 'src',
+        type: 'application',
+      },
+      'child-app': {
+        name: 'test-child-app',
+        root: 'packages/child-app',
+        type: 'child-app',
+      },
+    },
+  };
+
+  const configManager = new ConfigManager({ config, syncConfigFile });
+
+  expect(configManager.config).toMatchInlineSnapshot(`
+    {
+      "projects": {
+        "app": {
+          "checkAsyncTs": false,
+          "cssMinimize": "css-minimizer",
+          "dedupe": {
+            "enabled": true,
+            "strategy": "equality",
+          },
+          "define": {
+            "development": {},
+            "production": {},
+            "shared": {},
+          },
+          "enableFillActionNamePlugin": false,
+          "experiments": {
+            "minicss": {
+              "useImportModule": true,
+            },
+            "serverRunner": "process",
+            "transpilation": {
+              "loader": "babel",
+            },
+            "webpack": {
+              "backCompat": false,
+              "cacheUnaffected": true,
+            },
+          },
+          "externals": [],
+          "fileSystemPages": {
+            "enabled": false,
+            "pagesDir": "pages",
+            "routesDir": "routes",
+          },
+          "generateDataQaTag": false,
+          "hotRefresh": {
+            "enabled": true,
+          },
+          "modern": true,
+          "name": "test-app",
+          "notifications": {},
+          "output": {
+            "client": "dist/client",
+            "server": "dist/server",
+            "static": "dist/static",
+          },
+          "postcss": {},
+          "root": "src",
+          "serverApiDir": "src/api",
+          "sourceMap": false,
+          "splitChunks": {
+            "commonChunkSplitNumber": 3,
+            "granularChunksMinSize": 20000,
+            "granularChunksSplitNumber": 2,
+            "mode": "granularChunks",
+          },
+          "terser": {
+            "parallel": true,
+          },
+          "transpileOnlyModernLibs": true,
+          "type": "application",
+          "webpack": {},
+        },
+        "child-app": {
+          "cssMinimize": "css-minimizer",
+          "dedupe": {
+            "enabled": true,
+            "strategy": "equality",
+          },
+          "define": {
+            "development": {},
+            "production": {},
+            "shared": {},
+          },
+          "enableFillActionNamePlugin": false,
+          "experiments": {
+            "minicss": {
+              "useImportModule": true,
+            },
+            "transpilation": {
+              "loader": "babel",
+            },
+            "webpack": {
+              "backCompat": false,
+              "cacheUnaffected": true,
+            },
+          },
+          "generateDataQaTag": false,
+          "hotRefresh": {
+            "enabled": true,
+          },
+          "name": "test-child-app",
+          "notifications": {},
+          "output": "dist/child-app",
+          "postcss": {
+            "cssLocalIdentName": "[hash:base64:5]",
+          },
+          "root": "packages/child-app",
+          "sourceMap": false,
+          "terser": {
+            "parallel": true,
+          },
+          "transpileOnlyModernLibs": true,
+          "type": "child-app",
+          "webpack": {},
+        },
+      },
+    }
+  `);
+});
+
+it('should populate defaults for overridable options', () => {
+  const config: any = {
+    projects: {
+      app: {
+        name: 'test-app',
+        root: 'src',
+        type: 'application',
+        output: {
+          client: 'assets/compiled',
+        },
+        sourceMap: false,
+        externals: ['test'],
+        fileSystemPages: { enabled: true },
+        experiments: {
+          webpack: {
+            backCompat: true,
+          },
+          transpilation: {
+            loader: {
+              development: 'swc',
+            },
+          },
+        },
+        dedupe: {
+          strategy: 'semver',
+        },
+        define: {
+          shared: {
+            'process.env.APP_ID': 'app',
+          },
+        },
+        svgo: {
+          plugins: [
+            {
+              'test-plugin': true,
+            },
+          ],
+        },
+      },
+      'child-app': {
+        name: 'test-child-app',
+        root: 'packages/child-app',
+        type: 'child-app',
+        sourceMap: {
+          development: true,
+        },
+        experiments: {
+          transpilation: {
+            loader: {},
+          },
+        },
+        define: {
+          shared: {
+            commonProp: 'unknown',
+          },
+          production: {
+            'process.env.PROD': 'true',
+          },
+        },
+        webpack: {
+          resolveAlias: {
+            stream: 'browser-stream',
+          },
+          provide: {
+            Buffer: ['buffer', 'Buffer'],
+          },
+        },
+      },
+    },
+  };
+
+  const configManager = new ConfigManager({ config, syncConfigFile });
+
+  expect(configManager.config).toMatchInlineSnapshot(`
+    {
+      "projects": {
+        "app": {
+          "checkAsyncTs": false,
+          "cssMinimize": "css-minimizer",
+          "dedupe": {
+            "enabled": true,
+            "strategy": "semver",
+          },
+          "define": {
+            "development": {},
+            "production": {},
+            "shared": {
+              "process.env.APP_ID": "app",
+            },
+          },
+          "enableFillActionNamePlugin": false,
+          "experiments": {
+            "minicss": {
+              "useImportModule": true,
+            },
+            "serverRunner": "process",
+            "transpilation": {
+              "loader": {
+                "development": "swc",
+                "production": "babel",
+              },
+            },
+            "webpack": {
+              "backCompat": true,
+              "cacheUnaffected": true,
+            },
+          },
+          "externals": [
+            "test",
+          ],
+          "fileSystemPages": {
+            "enabled": true,
+            "pagesDir": "pages",
+            "routesDir": "routes",
+          },
+          "generateDataQaTag": false,
+          "hotRefresh": {
+            "enabled": true,
+          },
+          "modern": true,
+          "name": "test-app",
+          "notifications": {},
+          "output": {
+            "client": "assets/compiled",
+            "server": "dist/server",
+            "static": "dist/static",
+          },
+          "postcss": {},
+          "root": "src",
+          "serverApiDir": "src/api",
+          "sourceMap": false,
+          "splitChunks": {
+            "commonChunkSplitNumber": 3,
+            "granularChunksMinSize": 20000,
+            "granularChunksSplitNumber": 2,
+            "mode": "granularChunks",
+          },
+          "svgo": {
+            "plugins": [
+              {
+                "test-plugin": true,
+              },
+            ],
+          },
+          "terser": {
+            "parallel": true,
+          },
+          "transpileOnlyModernLibs": true,
+          "type": "application",
+          "webpack": {},
+        },
+        "child-app": {
+          "cssMinimize": "css-minimizer",
+          "dedupe": {
+            "enabled": true,
+            "strategy": "equality",
+          },
+          "define": {
+            "development": {},
+            "production": {
+              "process.env.PROD": "true",
+            },
+            "shared": {
+              "commonProp": "unknown",
+            },
+          },
+          "enableFillActionNamePlugin": false,
+          "experiments": {
+            "minicss": {
+              "useImportModule": true,
+            },
+            "transpilation": {
+              "loader": {
+                "development": "babel",
+                "production": "babel",
+              },
+            },
+            "webpack": {
+              "backCompat": false,
+              "cacheUnaffected": true,
+            },
+          },
+          "generateDataQaTag": false,
+          "hotRefresh": {
+            "enabled": true,
+          },
+          "name": "test-child-app",
+          "notifications": {},
+          "output": "dist/child-app",
+          "postcss": {
+            "cssLocalIdentName": "[hash:base64:5]",
+          },
+          "root": "packages/child-app",
+          "sourceMap": {
+            "development": true,
+            "production": false,
+          },
+          "terser": {
+            "parallel": true,
+          },
+          "transpileOnlyModernLibs": true,
+          "type": "child-app",
+          "webpack": {
+            "provide": {
+              "Buffer": [
+                "buffer",
+                "Buffer",
+              ],
+            },
+            "resolveAlias": {
+              "stream": "browser-stream",
+            },
+          },
+        },
+      },
+    }
+  `);
+});