@tramvai/cli 4.41.56 → 4.41.90

package/src/library/swc/__integration__/__snapshots__/swc.build.test.ts.snap

@@ -13,14 +13,15 @@ exports[`client-legacy: create-token-pure.ts 1`] = `
 `;
 
 exports[`client-legacy: images/logo.svg\\?react 1`] = `
-"              /* harmony import */ var _swc_helpers_extends__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/@swc/helpers/esm/_extends.js"), react_jsx_runtime__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("webpack/sharing/consume/default/react/jsx-runtime/react/jsx-runtime");
+"              /* harmony import */ var _swc_helpers_object_spread__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__("../../node_modules/@swc/helpers/esm/_object_spread.js"), _swc_helpers_object_spread_props__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/@swc/helpers/esm/_object_spread_props.js"), react_jsx_runtime__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("webpack/sharing/consume/default/react/jsx-runtime/react/jsx-runtime");
               /* harmony import */              __webpack_require__("webpack/sharing/consume/default/react/react"), 
               /* harmony default export */ __webpack_exports__.Z = function(props) {
                   /*#__PURE__*/
-                  return (0, react_jsx_runtime__WEBPACK_IMPORTED_MODULE_0__.jsxs)("svg", (0, _swc_helpers_extends__WEBPACK_IMPORTED_MODULE_2__._)({
+                  return (0, react_jsx_runtime__WEBPACK_IMPORTED_MODULE_0__.jsxs)("svg", (0, _swc_helpers_object_spread_props__WEBPACK_IMPORTED_MODULE_2__._)((0, 
+                  _swc_helpers_object_spread__WEBPACK_IMPORTED_MODULE_3__._)({
                       xmlns: "http://www.w3.org/2000/svg",
                       viewBox: "0 0 80.9 72.2"
-                  }, props, {
+                  }, props), {
                       children: [ 
                       /*#__PURE__*/ (0, react_jsx_runtime__WEBPACK_IMPORTED_MODULE_0__.jsx)("path", {
                           fill: "#fff",
@@ -152,13 +153,21 @@ exports[`client-legacy: server.inline.ts 1`] = `
                       /* binding */ return ForBrowser;
                   }
                   /* harmony export */              });
-              var ForBrowser = /*#__PURE__*/ function() {
-                  function ForBrowser() {}
-                  return ForBrowser.prototype.test = function() {
-                      console.log("Ok");
-                  }, ForBrowser;
+              /* harmony import */ var _swc_helpers_class_call_check__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/@swc/helpers/esm/_class_call_check.js"), _swc_helpers_create_class__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/@swc/helpers/esm/_create_class.js"), _swc_helpers_define_property__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/@swc/helpers/esm/_define_property.js"), ForBrowser = /*#__PURE__*/ function() {
+                  function ForBrowser() {
+                      (0, _swc_helpers_class_call_check__WEBPACK_IMPORTED_MODULE_0__._)(this, ForBrowser), 
+                      (0, _swc_helpers_define_property__WEBPACK_IMPORTED_MODULE_1__._)(this, "property", (function() {
+                          console.log("Ok");
+                      }));
+                  }
+                  return (0, _swc_helpers_create_class__WEBPACK_IMPORTED_MODULE_2__._)(ForBrowser, [ {
+                      key: "test",
+                      value: function() {
+                          console.log("Ok");
+                      }
+                  } ]), ForBrowser;
               }();
-              ForBrowser.prop = "static";
+              /* harmony import */              (0, _swc_helpers_define_property__WEBPACK_IMPORTED_MODULE_1__._)(ForBrowser, "prop", "static");
           },
           "
 `;
@@ -313,12 +322,18 @@ exports[`client-modern: server.inline.ts 1`] = `
                       /* binding */ return ForBrowser;
                   }
                   /* harmony export */              });
+              /* harmony import */ var _swc_helpers_define_property__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/@swc/helpers/esm/_define_property.js");
               class ForBrowser {
                   test() {
                       console.log("Ok");
                   }
+                  constructor() {
+                      (0, _swc_helpers_define_property__WEBPACK_IMPORTED_MODULE_0__._)(this, "property", (() => {
+                          console.log("Ok");
+                      }));
+                  }
               }
-              ForBrowser.prop = "static";
+              (0, _swc_helpers_define_property__WEBPACK_IMPORTED_MODULE_0__._)(ForBrowser, "prop", "static");
           },
           "
 `;
@@ -478,7 +493,11 @@ exports[`server: server.inline.ts 1`] = `
                   }
                   /* harmony export */              });
               var ForBrowser = /*#__PURE__*/ function() {
-                  function ForBrowser() {}
+                  function ForBrowser() {
+                      this.property = function() {
+                          console.log("Ok");
+                      };
+                  }
                   return ForBrowser.prototype.test = function test() {
                       console.log("Ok");
                   }, ForBrowser;

package/src/library/swc/__integration__/__snapshots__/swc.start.test.ts.snap

@@ -405,15 +405,22 @@ exports[`client: server.inline.ts 1`] = `
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   ForBrowser: function() { return /* binding */ ForBrowser; }
 /* harmony export */ });
+/* harmony import */ var _swc_helpers_define_property__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/@swc/helpers/esm/_define_property.js");
 /* provided dependency */ var __react_refresh_utils__ = __webpack_require__("../../node_modules/@pmmmwh/react-refresh-webpack-plugin/lib/runtime/RefreshUtils.js");
 __webpack_require__.$Refresh$.runtime = __webpack_require__("../../node_modules/react-refresh/runtime.js");
 
+
 class ForBrowser {
     test() {
         console.log("Ok");
     }
+    constructor(){
+        (0,_swc_helpers_define_property__WEBPACK_IMPORTED_MODULE_0__._)(this, "property", ()=>{
+            console.log("Ok");
+        });
+    }
 }
-ForBrowser.prop = "static";
+(0,_swc_helpers_define_property__WEBPACK_IMPORTED_MODULE_0__._)(ForBrowser, "prop", "static");
 
 
 const $ReactRefreshModuleId$ = __webpack_require__.$Refresh$.moduleId;
@@ -730,7 +737,11 @@ exports[`server: server.inline.ts 1`] = `
 /* harmony export */ });
 var ForBrowser = /*#__PURE__*/ function() {
     "use strict";
-    function ForBrowser() {}
+    function ForBrowser() {
+        this.property = function() {
+            console.log("Ok");
+        };
+    }
     var _proto = ForBrowser.prototype;
     _proto.test = function test() {
         console.log("Ok");

package/src/library/swc/__integration__/server.inline.ts

@@ -1,6 +1,10 @@
 export class ForBrowser {
   static prop = 'static';
 
+  property = () => {
+    console.log('Ok');
+  };
+
   test() {
     console.log('Ok');
   }

package/src/library/swc/index.ts

@@ -26,6 +26,11 @@ export const getSwcOptions = (config: TranspilerConfig): SwcOptions => {
     tramvai = false,
     rootDir = process.cwd(),
     generateDataQaTag = false,
+    // disabled because `arrayLikeIsIterable` and `iterableIsArray` assumtions is not supported yet in swc,
+    // this can leads to incorrect code generation e.g. when Set with spread is used - `[...new Set()] => [].concat(new Set())`
+    // TCORE-4904
+    loose = false,
+    externalHelpers = true,
   } = config;
 
   if (!warningWasShown) {
@@ -104,7 +109,7 @@ Having swc config may conflict with @tramvai/cli configuration`
       // Use relevant core-js version, because it affects which polyfills are included
       // https://github.com/swc-project/swc/blob/main/crates/swc_ecma_preset_env/data/core-js-compat/modules-by-versions.json
       coreJs: require('core-js/package.json').version,
-      loose: true,
+      loose,
       mode: 'entry',
     },
     module: {
@@ -112,7 +117,7 @@ Having swc config may conflict with @tramvai/cli configuration`
     },
     isModule: 'unknown',
     jsc: {
-      externalHelpers: true,
+      externalHelpers,
       parser: {
         syntax: typescript ? 'typescript' : 'ecmascript',
         decorators: true,

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/blocks/serverInline.ts

@@ -17,7 +17,13 @@ export const serverInline = (configManager: ConfigManager<CliConfigEntry>) => (c
       .batch(
         addTranspilerLoader(
           clientConfigManager,
-          getTranspilerConfig(clientConfigManager, { typescript: type === 'ts' })
+          getTranspilerConfig(clientConfigManager, {
+            typescript: type === 'ts',
+            // inline transpiler runtime helpers to prevent webpack imports in generated inline scripts
+            externalHelpers: false,
+            // minimize swc helpers usage to prevent inline scripts bloat, risks is minimal for rarely used inline scripts
+            loose: true,
+          })
         )
       );
   };

package/src/library/webpack/child-app/common.ts

@@ -20,6 +20,7 @@ import { extractCssPluginFactory } from '../blocks/extractCssPlugin';
 import type { ModuleFederationFixRangeOptions } from '../plugins/ModuleFederationFixRange';
 import { ModuleFederationFixRange } from '../plugins/ModuleFederationFixRange';
 import { resolveFrameworksPaths } from '../application/client/prod/optimization/splitChunks';
+import { PatchAutoPublicPathPlugin } from '../plugins/AutoPublicPathPlugin';
 
 // eslint-disable-next-line max-statements
 export default (configManager: ConfigManager<ChildAppConfigEntry>) => (config: Config) => {
@@ -164,6 +165,8 @@ export default (configManager: ConfigManager<ChildAppConfigEntry>) => (config: C
     } as UniversalFederationPluginOptions,
   ]);
 
+  config.plugin('patch-auto-public-path').use(PatchAutoPublicPathPlugin);
+
   config.plugin('module-federation-validate-duplicates').use(ModuleFederationFixRange, [
     {
       flexibleTramvaiVersions: shared.flexibleTramvaiVersions,

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

@@ -0,0 +1,23 @@
+// Fixes webpack AutoPublicPathPlugin error when fallback load of shared microfrontend chunk
+// this happens because currentScript.src is not defined for an inline script
+export class PatchAutoPublicPathPlugin {
+  apply(compiler) {
+    compiler.hooks.compilation.tap('PatchAutoPublicPathPlugin', (compilation) => {
+      compilation.hooks.runtimeModule.tap('PatchAutoPublicPathPlugin', (module) => {
+        if (module.constructor.name === 'AutoPublicPathRuntimeModule') {
+          const base = module.generate.bind(module);
+
+          // eslint-disable-next-line no-param-reassign
+          module.generate = function (...args) {
+            const result = base(...args);
+
+            return result.replace(
+              'document.currentScript.src',
+              'document.currentScript.src || document.currentScript.dataset.src'
+            );
+          };
+        }
+      });
+    });
+  }
+}

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

@@ -23,6 +23,18 @@ export type TranspilerConfig = {
   hot: boolean;
   excludesPresetEnv: string[];
   rootDir: string;
+  /**
+   * Enable or disable `loose` transformations:
+   * with swc loader - https://swc.rs/docs/configuration/compilation#jscloose
+   * with babel loader - https://babeljs.io/docs/babel-preset-env#loose
+   */
+  loose?: boolean;
+  /**
+   * Enable or disable external transpiler runtime helpers:
+   * with swc loader, pass value directly to `jsc.externalHelpers` option - https://swc.rs/docs/configuration/compilation#jscexternalhelpers
+   * with babel loader, when `false`, disable `@babel/plugin-transform-runtime` - https://babeljs.io/docs/babel-plugin-transform-runtime
+   */
+  externalHelpers?: boolean;
 };
 
 export const addTranspilerLoader =

package/src/models/config.spec.ts

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

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,
@@ -1188,23 +1193,23 @@
                         "dotAll": {
                           "type": "boolean"
                         },
-                        "__@match@7335": {
+                        "__@match@7837": {
                           "type": "object",
                           "additionalProperties": false
                         },
-                        "__@replace@7337": {
+                        "__@replace@7839": {
                           "type": "object",
                           "additionalProperties": false
                         },
-                        "__@search@7340": {
+                        "__@search@7842": {
                           "type": "object",
                           "additionalProperties": false
                         },
-                        "__@split@7342": {
+                        "__@split@7844": {
                           "type": "object",
                           "additionalProperties": false
                         },
-                        "__@matchAll@7344": {
+                        "__@matchAll@7846": {
                           "type": "object",
                           "additionalProperties": false
                         }
@@ -1901,23 +1906,23 @@
                         "dotAll": {
                           "type": "boolean"
                         },
-                        "__@match@7335": {
+                        "__@match@7837": {
                           "type": "object",
                           "additionalProperties": false
                         },
-                        "__@replace@7337": {
+                        "__@replace@7839": {
                           "type": "object",
                           "additionalProperties": false
                         },
-                        "__@search@7340": {
+                        "__@search@7842": {
                           "type": "object",
                           "additionalProperties": false
                         },
-                        "__@split@7342": {
+                        "__@split@7844": {
                           "type": "object",
                           "additionalProperties": false
                         },
-                        "__@matchAll@7344": {
+                        "__@matchAll@7846": {
                           "type": "object",
                           "additionalProperties": false
                         }
@@ -2614,23 +2619,23 @@
                         "dotAll": {
                           "type": "boolean"
                         },
-                        "__@match@7335": {
+                        "__@match@7837": {
                           "type": "object",
                           "additionalProperties": false
                         },
-                        "__@replace@7337": {
+                        "__@replace@7839": {
                           "type": "object",
                           "additionalProperties": false
                         },
-                        "__@search@7340": {
+                        "__@search@7842": {
                           "type": "object",
                           "additionalProperties": false
                         },
-                        "__@split@7342": {
+                        "__@split@7844": {
                           "type": "object",
                           "additionalProperties": false
                         },
-                        "__@matchAll@7344": {
+                        "__@matchAll@7846": {
                           "type": "object",
                           "additionalProperties": false
                         }

package/src/schema/tramvai.spec.ts

@@ -144,6 +144,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/utils/npmRequire.ts

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