@tramvai/cli 5.6.2 → 5.8.0

package/lib/library/typescript/index.d.ts

@@ -23,8 +23,8 @@ declare const _default: (options: Options) => {
         })[] | (string | {
             skipEnvCheck: boolean;
         })[])[];
-        cwd?: string;
         presets: import("@babel/core").PluginItem[];
+        cwd?: string;
         compact?: boolean;
         sourceType: "unambiguous";
         assumptions: {

package/lib/library/webpack/child-app/client/common.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"common.d.ts","sourceRoot":"","sources":["../../../../../src/library/webpack/child-app/client/common.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAIxC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,kCAAkC,CAAC;AAMtE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,2CAA2C,CAAC;wCAEtD,cAAc,mBAAmB,CAAC,cAAc,MAAM;AAArF,wBAgCE"}
+{"version":3,"file":"common.d.ts","sourceRoot":"","sources":["../../../../../src/library/webpack/child-app/client/common.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAIxC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,kCAAkC,CAAC;AAMtE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,2CAA2C,CAAC;wCAYtD,cAAc,mBAAmB,CAAC,cAAc,MAAM;AAArF,wBAkCE"}

package/lib/library/webpack/child-app/client/common.js

@@ -7,6 +7,14 @@ const common_1 = tslib_1.__importDefault(require("../common"));
 const filesClient_1 = tslib_1.__importDefault(require("../../blocks/filesClient"));
 const nodeClient_1 = tslib_1.__importDefault(require("../../blocks/nodeClient"));
 const postcssAssets_1 = tslib_1.__importDefault(require("../../blocks/postcssAssets"));
+const IDENTIFIER_NAME_REPLACE_REGEX = /^([^a-zA-Z$_])/;
+const IDENTIFIER_ALPHA_NUMERIC_NAME_REPLACE_REGEX = /[^a-zA-Z0-9$]+/g;
+// https://github.com/webpack/webpack/blob/da41ad1845947139375fb557107fa8bd2f6f8f27/lib/Template.js#L108
+function toIdentifier(str) {
+    return str
+        .replace(IDENTIFIER_NAME_REPLACE_REGEX, '_$1')
+        .replace(IDENTIFIER_ALPHA_NUMERIC_NAME_REPLACE_REGEX, '_');
+}
 exports.default = (configManager) => (config) => {
     const { name, version } = configManager;
     config.name('client');
@@ -29,6 +37,8 @@ exports.default = (configManager) => (config) => {
         {
             writeToDisk: true,
             filename: `${name}_stats_loadable@${version}.json`,
+            // to prevent webpack modules with same id collision, because Child Apps builds are independent of each other
+            chunkLoadingGlobal: toIdentifier(`__LOADABLE_LOADED_CHUNKS__child_app_${name}_${version}__`),
         },
     ]);
     config.batch((0, filesClient_1.default)(configManager)).batch((0, nodeClient_1.default)(configManager));

package/lib/library/webpack/child-app/client/common.js.map

@@ -1 +1 @@
-{"version":3,"file":"common.js","sourceRoot":"","sources":["../../../../../src/library/webpack/child-app/client/common.ts"],"names":[],"mappings":";;;AACA,kDAAiE;AACjE,sFAAsD;AAItD,+DAA+B;AAC/B,mFAA6C;AAC7C,iFAAiD;AACjD,uFAAuD;AAGvD,kBAAe,CAAC,aAAiD,EAAE,EAAE,CAAC,CAAC,MAAc,EAAE,EAAE;IACvF,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,aAAa,CAAC;IACxC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IAEtB,MAAM,CAAC,KAAK,CAAC,IAAA,gBAAM,EAAC,aAAa,CAAC,CAAC,CAAC;IAEpC,MAAM,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC;IAE9B,MAAM,CAAC,MAAM;SACV,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC;SAC7B,UAAU,CAAC,MAAM,CAAC;SAClB,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC;SAC3B,QAAQ,CAAC,iBAAiB,OAAO,KAAK,CAAC;SACvC,aAAa,CAAC,sCAAsC,CAAC;SACrD,kBAAkB,CAAC,WAAW,CAAC,CAAC;IAEnC,MAAM,CAAC,KAAK,CAAC,IAAA,uBAAa,EAAC,aAAa,CAAC,CAAC,CAAC;IAE3C,MAAM,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC,GAAG,CAAC,6BAAsB,EAAE;QACxD;YACE,QAAQ,EAAE,GAAG,IAAI,UAAU,OAAO,OAAO;SAC1C;KACF,CAAC,CAAC;IAEH,MAAM,CAAC,MAAM,CAAC,uBAAuB,CAAC,CAAC,GAAG,CAAC,wBAAc,EAAE;QACzD;YACE,WAAW,EAAE,IAAI;YACjB,QAAQ,EAAE,GAAG,IAAI,mBAAmB,OAAO,OAAO;SACnD;KACF,CAAC,CAAC;IAEH,MAAM,CAAC,KAAK,CAAC,IAAA,qBAAK,EAAC,aAAa,CAAC,CAAC,CAAC,KAAK,CAAC,IAAA,oBAAU,EAAC,aAAa,CAAC,CAAC,CAAC;AACtE,CAAC,CAAC"}
+{"version":3,"file":"common.js","sourceRoot":"","sources":["../../../../../src/library/webpack/child-app/client/common.ts"],"names":[],"mappings":";;;AACA,kDAAiE;AACjE,sFAAsD;AAItD,+DAA+B;AAC/B,mFAA6C;AAC7C,iFAAiD;AACjD,uFAAuD;AAGvD,MAAM,6BAA6B,GAAG,gBAAgB,CAAC;AACvD,MAAM,2CAA2C,GAAG,iBAAiB,CAAC;AAEtE,wGAAwG;AACxG,SAAS,YAAY,CAAC,GAAW;IAC/B,OAAO,GAAG;SACP,OAAO,CAAC,6BAA6B,EAAE,KAAK,CAAC;SAC7C,OAAO,CAAC,2CAA2C,EAAE,GAAG,CAAC,CAAC;AAC/D,CAAC;AAED,kBAAe,CAAC,aAAiD,EAAE,EAAE,CAAC,CAAC,MAAc,EAAE,EAAE;IACvF,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,aAAa,CAAC;IACxC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IAEtB,MAAM,CAAC,KAAK,CAAC,IAAA,gBAAM,EAAC,aAAa,CAAC,CAAC,CAAC;IAEpC,MAAM,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC;IAE9B,MAAM,CAAC,MAAM;SACV,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC;SAC7B,UAAU,CAAC,MAAM,CAAC;SAClB,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC;SAC3B,QAAQ,CAAC,iBAAiB,OAAO,KAAK,CAAC;SACvC,aAAa,CAAC,sCAAsC,CAAC;SACrD,kBAAkB,CAAC,WAAW,CAAC,CAAC;IAEnC,MAAM,CAAC,KAAK,CAAC,IAAA,uBAAa,EAAC,aAAa,CAAC,CAAC,CAAC;IAE3C,MAAM,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC,GAAG,CAAC,6BAAsB,EAAE;QACxD;YACE,QAAQ,EAAE,GAAG,IAAI,UAAU,OAAO,OAAO;SAC1C;KACF,CAAC,CAAC;IAEH,MAAM,CAAC,MAAM,CAAC,uBAAuB,CAAC,CAAC,GAAG,CAAC,wBAAc,EAAE;QACzD;YACE,WAAW,EAAE,IAAI;YACjB,QAAQ,EAAE,GAAG,IAAI,mBAAmB,OAAO,OAAO;YAClD,6GAA6G;YAC7G,kBAAkB,EAAE,YAAY,CAAC,uCAAuC,IAAI,IAAI,OAAO,IAAI,CAAC;SAC7F;KACF,CAAC,CAAC;IAEH,MAAM,CAAC,KAAK,CAAC,IAAA,qBAAK,EAAC,aAAa,CAAC,CAAC,CAAC,KAAK,CAAC,IAAA,oBAAU,EAAC,aAAa,CAAC,CAAC,CAAC;AACtE,CAAC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tramvai/cli",
-  "version": "5.6.2",
+  "version": "5.8.0",
   "description": "Cli инструмент для сборки и запуска приложений",
   "files": [
     "src",
@@ -74,7 +74,7 @@
     "@tinkoff/utils": "^2.1.3",
     "@tinkoff/webpack-dedupe-plugin": "4.0.2",
     "@tramvai/build": "6.0.3",
-    "@tramvai/react": "5.6.2",
+    "@tramvai/react": "5.8.0",
     "@tramvai/tools-check-versions": "0.7.4",
     "@tramvai/tools-migrate": "0.9.4",
     "ajv": "^8.12.0",

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

@@ -10,6 +10,16 @@ import nodeClient from '../../blocks/nodeClient';
 import postcssAssets from '../../blocks/postcssAssets';
 import type { ChildAppConfigEntry } from '../../../../typings/configEntry/child-app';
 
+const IDENTIFIER_NAME_REPLACE_REGEX = /^([^a-zA-Z$_])/;
+const IDENTIFIER_ALPHA_NUMERIC_NAME_REPLACE_REGEX = /[^a-zA-Z0-9$]+/g;
+
+// https://github.com/webpack/webpack/blob/da41ad1845947139375fb557107fa8bd2f6f8f27/lib/Template.js#L108
+function toIdentifier(str: string) {
+  return str
+    .replace(IDENTIFIER_NAME_REPLACE_REGEX, '_$1')
+    .replace(IDENTIFIER_ALPHA_NUMERIC_NAME_REPLACE_REGEX, '_');
+}
+
 export default (configManager: ConfigManager<ChildAppConfigEntry>) => (config: Config) => {
   const { name, version } = configManager;
   config.name('client');
@@ -38,6 +48,8 @@ export default (configManager: ConfigManager<ChildAppConfigEntry>) => (config: C
     {
       writeToDisk: true,
       filename: `${name}_stats_loadable@${version}.json`,
+      // to prevent webpack modules with same id collision, because Child Apps builds are independent of each other
+      chunkLoadingGlobal: toIdentifier(`__LOADABLE_LOADED_CHUNKS__child_app_${name}_${version}__`),
     },
   ]);