@tramvai/cli 5.6.2 → 5.6.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. package/lib/library/webpack/child-app/client/common.d.ts.map +1 -1
  2. package/lib/library/webpack/child-app/client/common.js +10 -0
  3. package/lib/library/webpack/child-app/client/common.js.map +1 -1
  4. package/package.json +2 -2
  5. package/src/library/webpack/child-app/client/common.ts +12 -0
package/lib/library/webpack/child-app/client/common.d.ts.map CHANGED
@@ -1 +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"}
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;wCAYtD,cAAc,mBAAmB,CAAC,cAAc,MAAM;AAArF,wBAkCE"}
package/lib/library/webpack/child-app/client/common.js CHANGED
@@ -7,6 +7,14 @@ const common_1 = tslib_1.__importDefault(require("../common"));
7
7
  const filesClient_1 = tslib_1.__importDefault(require("../../blocks/filesClient"));
8
8
  const nodeClient_1 = tslib_1.__importDefault(require("../../blocks/nodeClient"));
9
9
  const postcssAssets_1 = tslib_1.__importDefault(require("../../blocks/postcssAssets"));
10
+ const IDENTIFIER_NAME_REPLACE_REGEX = /^([^a-zA-Z$_])/;
11
+ const IDENTIFIER_ALPHA_NUMERIC_NAME_REPLACE_REGEX = /[^a-zA-Z0-9$]+/g;
12
+ // https://github.com/webpack/webpack/blob/da41ad1845947139375fb557107fa8bd2f6f8f27/lib/Template.js#L108
13
+ function toIdentifier(str) {
14
+ return str
15
+ .replace(IDENTIFIER_NAME_REPLACE_REGEX, '_$1')
16
+ .replace(IDENTIFIER_ALPHA_NUMERIC_NAME_REPLACE_REGEX, '_');
17
+ }
10
18
  exports.default = (configManager) => (config) => {
11
19
  const { name, version } = configManager;
12
20
  config.name('client');
@@ -29,6 +37,8 @@ exports.default = (configManager) => (config) => {
29
37
  {
30
38
  writeToDisk: true,
31
39
  filename: `${name}_stats_loadable@${version}.json`,
40
+ // to prevent webpack modules with same id collision, because Child Apps builds are independent of each other
41
+ chunkLoadingGlobal: toIdentifier(`__LOADABLE_LOADED_CHUNKS__child_app_${name}_${version}__`),
32
42
  },
33
43
  ]);
34
44
  config.batch((0, filesClient_1.default)(configManager)).batch((0, nodeClient_1.default)(configManager));
package/lib/library/webpack/child-app/client/common.js.map CHANGED
@@ -1 +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"}
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,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 CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@tramvai/cli",
3
- "version": "5.6.2",
3
+ "version": "5.6.4",
4
4
  "description": "Cli инструмент для сборки и запуска приложений",
5
5
  "files": [
6
6
  "src",
@@ -74,7 +74,7 @@
74
74
  "@tinkoff/utils": "^2.1.3",
75
75
  "@tinkoff/webpack-dedupe-plugin": "4.0.2",
76
76
  "@tramvai/build": "6.0.3",
77
- "@tramvai/react": "5.6.2",
77
+ "@tramvai/react": "5.6.4",
78
78
  "@tramvai/tools-check-versions": "0.7.4",
79
79
  "@tramvai/tools-migrate": "0.9.4",
80
80
  "ajv": "^8.12.0",
package/src/library/webpack/child-app/client/common.ts CHANGED
@@ -10,6 +10,16 @@ import nodeClient from '../../blocks/nodeClient';
10
10
  import postcssAssets from '../../blocks/postcssAssets';
11
11
  import type { ChildAppConfigEntry } from '../../../../typings/configEntry/child-app';
12
12
 
13
+ const IDENTIFIER_NAME_REPLACE_REGEX = /^([^a-zA-Z$_])/;
14
+ const IDENTIFIER_ALPHA_NUMERIC_NAME_REPLACE_REGEX = /[^a-zA-Z0-9$]+/g;
15
+
16
+ // https://github.com/webpack/webpack/blob/da41ad1845947139375fb557107fa8bd2f6f8f27/lib/Template.js#L108
17
+ function toIdentifier(str: string) {
18
+ return str
19
+ .replace(IDENTIFIER_NAME_REPLACE_REGEX, '_$1')
20
+ .replace(IDENTIFIER_ALPHA_NUMERIC_NAME_REPLACE_REGEX, '_');
21
+ }
22
+
13
23
  export default (configManager: ConfigManager<ChildAppConfigEntry>) => (config: Config) => {
14
24
  const { name, version } = configManager;
15
25
  config.name('client');
@@ -38,6 +48,8 @@ export default (configManager: ConfigManager<ChildAppConfigEntry>) => (config: C
38
48
  {
39
49
  writeToDisk: true,
40
50
  filename: `${name}_stats_loadable@${version}.json`,
51
+ // to prevent webpack modules with same id collision, because Child Apps builds are independent of each other
52
+ chunkLoadingGlobal: toIdentifier(`__LOADABLE_LOADED_CHUNKS__child_app_${name}_${version}__`),
41
53
  },
42
54
  ]);
43
55