@tramvai/cli 5.1.2 → 5.4.2
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.
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolve.d.ts","sourceRoot":"","sources":["../../../../src/library/webpack/blocks/resolve.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAIxC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;wCAGpC,aAAa,cAAc,MAAM;AAAhE,
|
|
1
|
+
{"version":3,"file":"resolve.d.ts","sourceRoot":"","sources":["../../../../src/library/webpack/blocks/resolve.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAIxC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;wCAGpC,aAAa,cAAc,MAAM;AAAhE,wBA8CE"}
|
|
@@ -6,7 +6,7 @@ const fs_1 = require("fs");
|
|
|
6
6
|
const tsconfig_paths_webpack_plugin_1 = require("tsconfig-paths-webpack-plugin");
|
|
7
7
|
const constants_1 = require("../../../config/constants");
|
|
8
8
|
exports.default = (configManager) => (config) => {
|
|
9
|
-
const { rootDir, modern, buildType } = configManager;
|
|
9
|
+
const { rootDir, root, modern, buildType } = configManager;
|
|
10
10
|
config.resolve.mainFields.merge([
|
|
11
11
|
...(modern && buildType === 'client' ? ['es2017', 'es2016', 'es2015'] : []),
|
|
12
12
|
buildType === 'client' && 'browser',
|
|
@@ -14,10 +14,13 @@ exports.default = (configManager) => (config) => {
|
|
|
14
14
|
'main',
|
|
15
15
|
].filter(Boolean));
|
|
16
16
|
const tsconfigPath = path_1.default.resolve(rootDir, 'tsconfig.json');
|
|
17
|
-
|
|
17
|
+
const appTsconfigPath = path_1.default.resolve(rootDir, root, 'tsconfig.json');
|
|
18
|
+
const tsconfigPathExists = (0, fs_1.existsSync)(tsconfigPath);
|
|
19
|
+
const appTsconfigPathExists = (0, fs_1.existsSync)(appTsconfigPath);
|
|
20
|
+
if (tsconfigPathExists || appTsconfigPathExists) {
|
|
18
21
|
config.resolve.plugin('tsconfig-paths').use(tsconfig_paths_webpack_plugin_1.TsconfigPathsPlugin, [
|
|
19
22
|
{
|
|
20
|
-
configFile: tsconfigPath,
|
|
23
|
+
configFile: appTsconfigPathExists ? appTsconfigPath : tsconfigPath,
|
|
21
24
|
extensions: constants_1.extensions,
|
|
22
25
|
mainFields: config.resolve.mainFields.values(),
|
|
23
26
|
silent: true,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolve.js","sourceRoot":"","sources":["../../../../src/library/webpack/blocks/resolve.ts"],"names":[],"mappings":";;;AACA,wDAAwB;AACxB,2BAAgC;AAChC,iFAAoE;AAEpE,yDAAuD;AAEvD,kBAAe,CAAC,aAA4B,EAAE,EAAE,CAAC,CAAC,MAAc,EAAE,EAAE;IAClE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,GAAG,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"resolve.js","sourceRoot":"","sources":["../../../../src/library/webpack/blocks/resolve.ts"],"names":[],"mappings":";;;AACA,wDAAwB;AACxB,2BAAgC;AAChC,iFAAoE;AAEpE,yDAAuD;AAEvD,kBAAe,CAAC,aAA4B,EAAE,EAAE,CAAC,CAAC,MAAc,EAAE,EAAE;IAClE,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,GAAG,aAAa,CAAC;IAE3D,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,KAAK,CAC7B;QACE,GAAG,CAAC,MAAM,IAAI,SAAS,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QAC3E,SAAS,KAAK,QAAQ,IAAI,SAAS;QACnC,QAAQ;QACR,MAAM;KACP,CAAC,MAAM,CAAC,OAAO,CAAC,CAClB,CAAC;IAEF,MAAM,YAAY,GAAG,cAAI,CAAC,OAAO,CAAC,OAAO,EAAE,eAAe,CAAC,CAAC;IAC5D,MAAM,eAAe,GAAG,cAAI,CAAC,OAAO,CAAC,OAAO,EAAE,IAAI,EAAE,eAAe,CAAC,CAAC;IACrE,MAAM,kBAAkB,GAAG,IAAA,eAAU,EAAC,YAAY,CAAC,CAAC;IACpD,MAAM,qBAAqB,GAAG,IAAA,eAAU,EAAC,eAAe,CAAC,CAAC;IAE1D,IAAI,kBAAkB,IAAI,qBAAqB,EAAE;QAC/C,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC,GAAG,CAAC,mDAAmB,EAAE;YAC/D;gBACE,UAAU,EAAE,qBAAqB,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,YAAY;gBAClE,UAAU,EAAV,sBAAU;gBACV,UAAU,EAAE,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,MAAM,EAAE;gBAC9C,MAAM,EAAE,IAAI;aACb;SACmD,CAAC,CAAC;KACzD;IAED,MAAM,CAAC,OAAO,CAAC,UAAU;SACtB,KAAK,CAAC,sBAAU,CAAC;SACjB,GAAG,EAAE;SACL,KAAK,CAAC,+DAA+D;SACrE,GAAG,CAAC,8BAA8B,EAAE,cAAI,CAAC,OAAO,CAAC,OAAO,EAAE,0BAA0B,CAAC,CAAC;SACtF,GAAG,CAAC,8BAA8B,EAAE,cAAI,CAAC,OAAO,CAAC,OAAO,EAAE,0BAA0B,CAAC,CAAC;QACvF,4FAA4F;QAC5F,8EAA8E;SAC7E,GAAG,CAAC,eAAe,EAAE,cAAI,CAAC,OAAO,CAAC,OAAO,EAAE,8BAA8B,CAAC,CAAC;SAC3E,GAAG,CACF,oBAAoB,EACpB,cAAI,CAAC,OAAO,CAAC,OAAO,EAAE,iDAAiD,CAAC,CACzE;SACA,GAAG,EAAE;SACL,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC;SAC3B,GAAG,CAAC,cAAI,CAAC,OAAO,CAAC,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,cAAc,CAAC,CAAC;SACpE,GAAG,EAAE;SACL,GAAG,EAAE,CAAC;AACX,CAAC,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@tramvai/cli",
|
|
3
|
-
"version": "5.
|
|
3
|
+
"version": "5.4.2",
|
|
4
4
|
"description": "Cli инструмент для сборки и запуска приложений",
|
|
5
5
|
"files": [
|
|
6
6
|
"src",
|
|
@@ -62,9 +62,9 @@
|
|
|
62
62
|
"@sentry/node": "^6.2.5",
|
|
63
63
|
"@svgr/webpack": "^8.1.0",
|
|
64
64
|
"@tinkoff/browserslist-config": "0.5.2",
|
|
65
|
-
"@tinkoff/dippy": "0.11.
|
|
65
|
+
"@tinkoff/dippy": "0.11.3",
|
|
66
66
|
"@tinkoff/is-modern-lib": "5.0.2",
|
|
67
|
-
"@tinkoff/logger": "0.10.
|
|
67
|
+
"@tinkoff/logger": "0.10.503",
|
|
68
68
|
"@tinkoff/minicss-class-generator": "0.5.2",
|
|
69
69
|
"@tinkoff/package-manager-wrapper": "0.4.2",
|
|
70
70
|
"@tinkoff/request-core": "^0.10.0",
|
|
@@ -73,9 +73,9 @@
|
|
|
73
73
|
"@tinkoff/utils": "^2.1.3",
|
|
74
74
|
"@tinkoff/webpack-dedupe-plugin": "4.0.2",
|
|
75
75
|
"@tramvai/build": "6.0.2",
|
|
76
|
-
"@tramvai/react": "5.
|
|
77
|
-
"@tramvai/tools-check-versions": "0.7.
|
|
78
|
-
"@tramvai/tools-migrate": "0.9.
|
|
76
|
+
"@tramvai/react": "5.4.2",
|
|
77
|
+
"@tramvai/tools-check-versions": "0.7.3",
|
|
78
|
+
"@tramvai/tools-migrate": "0.9.3",
|
|
79
79
|
"ajv": "^8.12.0",
|
|
80
80
|
"ansi-escapes": "^4.3.2",
|
|
81
81
|
"autoprefixer": "^10.4.8",
|
|
@@ -6,7 +6,7 @@ import type { ConfigManager } from '../../../config/configManager';
|
|
|
6
6
|
import { extensions } from '../../../config/constants';
|
|
7
7
|
|
|
8
8
|
export default (configManager: ConfigManager) => (config: Config) => {
|
|
9
|
-
const { rootDir, modern, buildType } = configManager;
|
|
9
|
+
const { rootDir, root, modern, buildType } = configManager;
|
|
10
10
|
|
|
11
11
|
config.resolve.mainFields.merge(
|
|
12
12
|
[
|
|
@@ -18,11 +18,14 @@ export default (configManager: ConfigManager) => (config: Config) => {
|
|
|
18
18
|
);
|
|
19
19
|
|
|
20
20
|
const tsconfigPath = path.resolve(rootDir, 'tsconfig.json');
|
|
21
|
+
const appTsconfigPath = path.resolve(rootDir, root, 'tsconfig.json');
|
|
22
|
+
const tsconfigPathExists = existsSync(tsconfigPath);
|
|
23
|
+
const appTsconfigPathExists = existsSync(appTsconfigPath);
|
|
21
24
|
|
|
22
|
-
if (
|
|
25
|
+
if (tsconfigPathExists || appTsconfigPathExists) {
|
|
23
26
|
config.resolve.plugin('tsconfig-paths').use(TsconfigPathsPlugin, [
|
|
24
27
|
{
|
|
25
|
-
configFile: tsconfigPath,
|
|
28
|
+
configFile: appTsconfigPathExists ? appTsconfigPath : tsconfigPath,
|
|
26
29
|
extensions,
|
|
27
30
|
mainFields: config.resolve.mainFields.values(),
|
|
28
31
|
silent: true,
|