@tramvai/cli 4.41.99 → 4.41.104

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tramvai/cli",
-  "version": "4.41.99",
+  "version": "4.41.104",
   "description": "Cli инструмент для сборки и запуска приложений",
   "files": [
     "src",
@@ -65,8 +65,8 @@
     "@tinkoff/babel-plugin-lodash": "^0.1.0",
     "@tinkoff/browserslist-config": "0.4.5",
     "@tinkoff/dippy": "0.10.11",
-    "@tinkoff/is-modern-lib": "4.0.3",
-    "@tinkoff/logger": "0.10.286",
+    "@tinkoff/is-modern-lib": "4.0.4",
+    "@tinkoff/logger": "^0.10.286",
     "@tinkoff/minicss-class-generator": "0.4.3",
     "@tinkoff/package-manager-wrapper": "0.3.4",
     "@tinkoff/request-core": "^0.10.0",
@@ -75,9 +75,9 @@
     "@tinkoff/utils": "^2.1.3",
     "@tinkoff/webpack-dedupe-plugin": "3.0.3",
     "@tramvai/build": "5.0.7",
-    "@tramvai/react": "4.41.99",
-    "@tramvai/tools-check-versions": "0.6.14",
-    "@tramvai/tools-migrate": "0.8.15",
+    "@tramvai/react": "4.41.104",
+    "@tramvai/tools-check-versions": "0.6.15",
+    "@tramvai/tools-migrate": "0.8.16",
     "ajv": "^8.12.0",
     "ansi-escapes": "^4.3.2",
     "autoprefixer": "^10.4.8",
@@ -171,6 +171,7 @@
     "webpack-hot-middleware": "^2.26.0",
     "webpack-sources": "^3.2.3",
     "webpack-stats-plugin": "^1.1.3",
+    "webpack-subresource-integrity": "^5.2.0-rc.1",
     "webpackbar": "^5.0.2",
     "workbox-build": "^6.6.1",
     "workbox-webpack-plugin": "^6.6.1",

package/schema.json

@@ -998,6 +998,46 @@
                   }
                 ]
               },
+              "integrity": {
+                "title": "Integrity generation options",
+                "default": false,
+                "anyOf": [
+                  {
+                    "type": "object",
+                    "properties": {
+                      "enabled": {
+                        "enum": [
+                          "auto",
+                          false,
+                          true
+                        ]
+                      },
+                      "hashFuncNames": {
+                        "type": "array",
+                        "items": {
+                          "enum": [
+                            "sha256",
+                            "sha384",
+                            "sha512"
+                          ],
+                          "type": "string"
+                        }
+                      },
+                      "hashLoading": {
+                        "enum": [
+                          "eager",
+                          "lazy"
+                        ],
+                        "type": "string"
+                      }
+                    },
+                    "additionalProperties": false
+                  },
+                  {
+                    "type": "boolean"
+                  }
+                ]
+              },
               "excludesPresetEnv": {
                 "title": "List of modules to exclude from `@babel/preset-env`",
                 "description": "Option doesn't affect build with swc loader",
@@ -1220,23 +1260,23 @@
                               "dotAll": {
                                 "type": "boolean"
                               },
-                              "__@match@7848": {
+                              "__@match@7872": {
                                 "type": "object",
                                 "additionalProperties": false
                               },
-                              "__@replace@7850": {
+                              "__@replace@7874": {
                                 "type": "object",
                                 "additionalProperties": false
                               },
-                              "__@search@7853": {
+                              "__@search@7877": {
                                 "type": "object",
                                 "additionalProperties": false
                               },
-                              "__@split@7855": {
+                              "__@split@7879": {
                                 "type": "object",
                                 "additionalProperties": false
                               },
-                              "__@matchAll@7857": {
+                              "__@matchAll@7881": {
                                 "type": "object",
                                 "additionalProperties": false
                               }
@@ -1592,6 +1632,46 @@
                     }
                   ]
                 },
+                "integrity": {
+                  "title": "Integrity generation options",
+                  "default": false,
+                  "anyOf": [
+                    {
+                      "type": "object",
+                      "properties": {
+                        "enabled": {
+                          "enum": [
+                            "auto",
+                            false,
+                            true
+                          ]
+                        },
+                        "hashFuncNames": {
+                          "type": "array",
+                          "items": {
+                            "enum": [
+                              "sha256",
+                              "sha384",
+                              "sha512"
+                            ],
+                            "type": "string"
+                          }
+                        },
+                        "hashLoading": {
+                          "enum": [
+                            "eager",
+                            "lazy"
+                          ],
+                          "type": "string"
+                        }
+                      },
+                      "additionalProperties": false
+                    },
+                    {
+                      "type": "boolean"
+                    }
+                  ]
+                },
                 "experiments": {
                   "title": "Change different experimental cli settings",
                   "default": {},
@@ -1942,23 +2022,23 @@
                                 "dotAll": {
                                   "type": "boolean"
                                 },
-                                "__@match@7848": {
+                                "__@match@7872": {
                                   "type": "object",
                                   "additionalProperties": false
                                 },
-                                "__@replace@7850": {
+                                "__@replace@7874": {
                                   "type": "object",
                                   "additionalProperties": false
                                 },
-                                "__@search@7853": {
+                                "__@search@7877": {
                                   "type": "object",
                                   "additionalProperties": false
                                 },
-                                "__@split@7855": {
+                                "__@split@7879": {
                                   "type": "object",
                                   "additionalProperties": false
                                 },
-                                "__@matchAll@7857": {
+                                "__@matchAll@7881": {
                                   "type": "object",
                                   "additionalProperties": false
                                 }
@@ -2314,6 +2394,46 @@
                       }
                     ]
                   },
+                  "integrity": {
+                    "title": "Integrity generation options",
+                    "default": false,
+                    "anyOf": [
+                      {
+                        "type": "object",
+                        "properties": {
+                          "enabled": {
+                            "enum": [
+                              "auto",
+                              false,
+                              true
+                            ]
+                          },
+                          "hashFuncNames": {
+                            "type": "array",
+                            "items": {
+                              "enum": [
+                                "sha256",
+                                "sha384",
+                                "sha512"
+                              ],
+                              "type": "string"
+                            }
+                          },
+                          "hashLoading": {
+                            "enum": [
+                              "eager",
+                              "lazy"
+                            ],
+                            "type": "string"
+                          }
+                        },
+                        "additionalProperties": false
+                      },
+                      {
+                        "type": "boolean"
+                      }
+                    ]
+                  },
                   "experiments": {
                     "title": "Change different experimental cli settings",
                     "default": {},
@@ -2664,23 +2784,23 @@
                                   "dotAll": {
                                     "type": "boolean"
                                   },
-                                  "__@match@7848": {
+                                  "__@match@7872": {
                                     "type": "object",
                                     "additionalProperties": false
                                   },
-                                  "__@replace@7850": {
+                                  "__@replace@7874": {
                                     "type": "object",
                                     "additionalProperties": false
                                   },
-                                  "__@search@7853": {
+                                  "__@search@7877": {
                                     "type": "object",
                                     "additionalProperties": false
                                   },
-                                  "__@split@7855": {
+                                  "__@split@7879": {
                                     "type": "object",
                                     "additionalProperties": false
                                   },
-                                  "__@matchAll@7857": {
+                                  "__@matchAll@7881": {
                                     "type": "object",
                                     "additionalProperties": false
                                   }

package/src/builder/webpack/devServer/server.ts

@@ -241,6 +241,11 @@ export const serverRunner = ({
 
     // Проксируем также и веб-сокеты
     server.on('upgrade', (req, socket, head) => {
+      // prevent uncaughtException when WS is not supported in application server
+      socket.on('error', (err) => {
+        console.error('[dev-server-error] websocket proxy error', err.message);
+      });
+
       proxy.ws(req, socket, { target: `http://localhost:${workerPort}` });
     });
 

package/src/config/configManager.ts

@@ -45,7 +45,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 +56,7 @@ const getOption = <T>(optionName: string, cfgs: any[], dflt: T): T => {
     }
   }
 
-  return dflt;
+  return defaultValue;
 };
 
 type OmitOverridable<T extends Record<string, any>> = {

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

@@ -2,6 +2,7 @@ import path from 'path';
 import fs from 'fs';
 import type Config from 'webpack-chain';
 import { StatsWriterPlugin } from 'webpack-stats-plugin';
+import { SubresourceIntegrityPlugin } from 'webpack-subresource-integrity';
 
 import type { ConfigManager } from '../../../../config/configManager';
 import type { ApplicationConfigEntry } from '../../../../typings/configEntry/application';
@@ -27,9 +28,11 @@ import {
   WEBPACK_DEBUG_STATS_FIELDS,
 } from '../../constants/stats';
 import { pwaBlock } from '../../blocks/pwa/client';
+import AssetsIntegritiesPlugin from '../../plugins/AssetsIntegritiesPlugin';
+import type { IntegrityOptions } from '../../../../typings/configEntry/cli';
 
 export default (configManager: ConfigManager<ApplicationConfigEntry>) => (config: Config) => {
-  const { polyfill, fileSystemPages, env } = configManager;
+  const { polyfill, fileSystemPages, env, integrity } = configManager;
 
   const portal = path.resolve(configManager.rootDir, `packages/${process.env.APP_ID}/portal.js`);
   const polyfillPath = path.resolve(configManager.rootDir, polyfill ?? 'src/polyfill');
@@ -59,11 +62,12 @@ export default (configManager: ConfigManager<ApplicationConfigEntry>) => (config
     .when(portalExists, (cfg) => cfg.entry('portal').add(portal))
     .when(polyfillExists, (cfg) => cfg.entry('polyfill').add(polyfillPath));
 
+  const statsFileName = configManager.modern ? 'stats.modern.json' : 'stats.json';
   config
     .plugin('stats-plugin')
     .use(StatsWriterPlugin, [
       {
-        filename: configManager.modern ? 'stats.modern.json' : 'stats.json',
+        filename: statsFileName,
         stats: {
           ...(env === 'development' ? DEV_STATS_OPTIONS : DEFAULT_STATS_OPTIONS),
           ...(configManager.verboseWebpack ? WEBPACK_DEBUG_STATS_OPTIONS : {}),
@@ -84,5 +88,32 @@ export default (configManager: ConfigManager<ApplicationConfigEntry>) => (config
       },
     ]);
 
+  if (integrity) {
+    const defaultIntegrityOptions: IntegrityOptions = {
+      enabled: 'auto',
+      hashFuncNames: ['sha256'],
+      hashLoading: 'eager',
+    };
+
+    let integrityOptions;
+    if (typeof integrity === 'object') {
+      integrityOptions = {
+        ...defaultIntegrityOptions,
+        ...integrity,
+      };
+    } else {
+      integrityOptions = defaultIntegrityOptions;
+    }
+
+    config
+      .plugin('integrity-plugin')
+      .use(SubresourceIntegrityPlugin, [integrityOptions])
+      .end()
+      // Plugin for transform integrity-plugin result into single integrities field in stats.json
+      .plugin('assets-integrity-plugin')
+      .use(AssetsIntegritiesPlugin, [{ filename: statsFileName }])
+      .end();
+  }
+
   return config;
 };

package/src/library/webpack/constants/stats.ts

@@ -5,6 +5,7 @@ export const DEFAULT_STATS_OPTIONS: StatsOptions = {
 
   publicPath: true,
   assets: true,
+  cachedAssets: true,
   outputPath: true, // выводит информацию о том в какой папке хранится билд на диске
   chunkGroups: true, // позволяет получить в stats поле namedChunkGroups которое потом используется в webpack-flush-chunks для получения чанков-зависимостей
   ids: true, // необходимо чтобы в chunksGroups были выставлены связи между модулями
@@ -14,6 +15,7 @@ export const DEFAULT_STATS_OPTIONS: StatsOptions = {
 export const DEFAULT_STATS_FIELDS: string[] = [
   'publicPath',
   'outputPath',
+  'assets',
   'assetsByChunkName',
   'namedChunkGroups',
   'entrypoints',

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

@@ -0,0 +1,36 @@
+const TARGET_PLUGIN_NAME = 'stats-writer-plugin';
+
+// Generate integrities field and remove assets field in stats.json file
+export default class AssetsIntegritiesPlugin {
+  constructor(private options: { filename: string }) {
+    this.options = options;
+  }
+
+  apply(compiler) {
+    compiler.hooks.thisCompilation.tap(TARGET_PLUGIN_NAME, (compilation) => {
+      compilation.hooks.processAssets.tap(
+        {
+          name: TARGET_PLUGIN_NAME,
+          stage: compilation.constructor.PROCESS_ASSETS_STAGE_REPORT,
+        },
+        () => {
+          const { filename } = this.options;
+          const statsJSON = JSON.parse(compilation.assets[filename].source().toString());
+          const { assets } = statsJSON;
+
+          statsJSON.integrities = assets.reduce((acc, item) => {
+            acc[item.name] = item.integrity;
+            return acc;
+          }, {});
+
+          delete statsJSON.assets;
+
+          compilation.updateAsset(
+            filename,
+            new compiler.webpack.sources.RawSource(JSON.stringify(statsJSON))
+          );
+        }
+      );
+    });
+  }
+}

package/src/models/config.spec.ts

@@ -96,6 +96,7 @@ it('should populate defaults for config', () => {
               "overlay": false,
             },
           },
+          "integrity": false,
           "modern": true,
           "name": "test-app",
           "notifications": {},
@@ -163,6 +164,7 @@ it('should populate defaults for config', () => {
               "overlay": false,
             },
           },
+          "integrity": false,
           "name": "test-child-app",
           "notifications": {},
           "output": "dist/child-app",
@@ -346,6 +348,7 @@ it('should populate defaults for overridable options', () => {
               "overlay": false,
             },
           },
+          "integrity": false,
           "modern": true,
           "name": "test-app",
           "notifications": {},
@@ -429,6 +432,7 @@ it('should populate defaults for overridable options', () => {
               "overlay": false,
             },
           },
+          "integrity": false,
           "name": "test-child-app",
           "notifications": {},
           "output": "dist/child-app",

package/src/schema/autogeneratedSchema.json

@@ -976,6 +976,46 @@
             }
           ]
         },
+        "integrity": {
+          "title": "Integrity generation options",
+          "default": false,
+          "anyOf": [
+            {
+              "type": "object",
+              "properties": {
+                "enabled": {
+                  "enum": [
+                    "auto",
+                    false,
+                    true
+                  ]
+                },
+                "hashFuncNames": {
+                  "type": "array",
+                  "items": {
+                    "enum": [
+                      "sha256",
+                      "sha384",
+                      "sha512"
+                    ],
+                    "type": "string"
+                  }
+                },
+                "hashLoading": {
+                  "enum": [
+                    "eager",
+                    "lazy"
+                  ],
+                  "type": "string"
+                }
+              },
+              "additionalProperties": false
+            },
+            {
+              "type": "boolean"
+            }
+          ]
+        },
         "excludesPresetEnv": {
           "title": "List of modules to exclude from `@babel/preset-env`",
           "description": "Option doesn't affect build with swc loader",
@@ -1198,23 +1238,23 @@
                         "dotAll": {
                           "type": "boolean"
                         },
-                        "__@match@7848": {
+                        "__@match@7872": {
                           "type": "object",
                           "additionalProperties": false
                         },
-                        "__@replace@7850": {
+                        "__@replace@7874": {
                           "type": "object",
                           "additionalProperties": false
                         },
-                        "__@search@7853": {
+                        "__@search@7877": {
                           "type": "object",
                           "additionalProperties": false
                         },
-                        "__@split@7855": {
+                        "__@split@7879": {
                           "type": "object",
                           "additionalProperties": false
                         },
-                        "__@matchAll@7857": {
+                        "__@matchAll@7881": {
                           "type": "object",
                           "additionalProperties": false
                         }
@@ -1561,6 +1601,46 @@
             }
           ]
         },
+        "integrity": {
+          "title": "Integrity generation options",
+          "default": false,
+          "anyOf": [
+            {
+              "type": "object",
+              "properties": {
+                "enabled": {
+                  "enum": [
+                    "auto",
+                    false,
+                    true
+                  ]
+                },
+                "hashFuncNames": {
+                  "type": "array",
+                  "items": {
+                    "enum": [
+                      "sha256",
+                      "sha384",
+                      "sha512"
+                    ],
+                    "type": "string"
+                  }
+                },
+                "hashLoading": {
+                  "enum": [
+                    "eager",
+                    "lazy"
+                  ],
+                  "type": "string"
+                }
+              },
+              "additionalProperties": false
+            },
+            {
+              "type": "boolean"
+            }
+          ]
+        },
         "experiments": {
           "title": "Change different experimental cli settings",
           "default": {},
@@ -1911,23 +1991,23 @@
                         "dotAll": {
                           "type": "boolean"
                         },
-                        "__@match@7848": {
+                        "__@match@7872": {
                           "type": "object",
                           "additionalProperties": false
                         },
-                        "__@replace@7850": {
+                        "__@replace@7874": {
                           "type": "object",
                           "additionalProperties": false
                         },
-                        "__@search@7853": {
+                        "__@search@7877": {
                           "type": "object",
                           "additionalProperties": false
                         },
-                        "__@split@7855": {
+                        "__@split@7879": {
                           "type": "object",
                           "additionalProperties": false
                         },
-                        "__@matchAll@7857": {
+                        "__@matchAll@7881": {
                           "type": "object",
                           "additionalProperties": false
                         }
@@ -2274,6 +2354,46 @@
             }
           ]
         },
+        "integrity": {
+          "title": "Integrity generation options",
+          "default": false,
+          "anyOf": [
+            {
+              "type": "object",
+              "properties": {
+                "enabled": {
+                  "enum": [
+                    "auto",
+                    false,
+                    true
+                  ]
+                },
+                "hashFuncNames": {
+                  "type": "array",
+                  "items": {
+                    "enum": [
+                      "sha256",
+                      "sha384",
+                      "sha512"
+                    ],
+                    "type": "string"
+                  }
+                },
+                "hashLoading": {
+                  "enum": [
+                    "eager",
+                    "lazy"
+                  ],
+                  "type": "string"
+                }
+              },
+              "additionalProperties": false
+            },
+            {
+              "type": "boolean"
+            }
+          ]
+        },
         "experiments": {
           "title": "Change different experimental cli settings",
           "default": {},
@@ -2624,23 +2744,23 @@
                         "dotAll": {
                           "type": "boolean"
                         },
-                        "__@match@7848": {
+                        "__@match@7872": {
                           "type": "object",
                           "additionalProperties": false
                         },
-                        "__@replace@7850": {
+                        "__@replace@7874": {
                           "type": "object",
                           "additionalProperties": false
                         },
-                        "__@search@7853": {
+                        "__@search@7877": {
                           "type": "object",
                           "additionalProperties": false
                         },
-                        "__@split@7855": {
+                        "__@split@7879": {
                           "type": "object",
                           "additionalProperties": false
                         },
-                        "__@matchAll@7857": {
+                        "__@matchAll@7881": {
                           "type": "object",
                           "additionalProperties": false
                         }