@tramvai/cli 7.4.0 → 7.4.1
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.
- package/lib/library/webpack/application/client/dev.js +5 -5
- package/lib/library/webpack/application/client/dev.js.map +1 -1
- package/lib/library/webpack/application/client/prod.js +2 -2
- package/lib/library/webpack/application/client/prod.js.map +1 -1
- package/lib/library/webpack/application/server/dev.d.ts.map +1 -1
- package/lib/library/webpack/application/server/dev.js +2 -2
- package/lib/library/webpack/application/server/dev.js.map +1 -1
- package/lib/library/webpack/application/server/prod.d.ts.map +1 -1
- package/lib/library/webpack/application/server/prod.js +2 -2
- package/lib/library/webpack/application/server/prod.js.map +1 -1
- package/lib/library/webpack/child-app/server/common.d.ts.map +1 -1
- package/lib/library/webpack/child-app/server/common.js +2 -2
- package/lib/library/webpack/child-app/server/common.js.map +1 -1
- package/lib/library/webpack/module/common.d.ts.map +1 -1
- package/lib/library/webpack/module/common.js +2 -2
- package/lib/library/webpack/module/common.js.map +1 -1
- package/package.json +7 -7
- package/src/library/webpack/application/client/dev.ts +4 -4
- package/src/library/webpack/application/client/prod.ts +1 -1
- package/src/library/webpack/application/server/dev.ts +2 -1
- package/src/library/webpack/application/server/prod.ts +2 -1
- package/src/library/webpack/child-app/server/common.ts +2 -1
- package/src/library/webpack/module/common.ts +3 -1
- package/lib/library/webpack/plugins/RuntimePathPlugin.d.ts +0 -15
- package/lib/library/webpack/plugins/RuntimePathPlugin.d.ts.map +0 -1
- package/lib/library/webpack/plugins/RuntimePathPlugin.js +0 -42
- package/lib/library/webpack/plugins/RuntimePathPlugin.js.map +0 -1
- package/src/library/webpack/plugins/RuntimePathPlugin.ts +0 -59
|
@@ -9,7 +9,7 @@ const webpackbar_1 = tslib_1.__importDefault(require("webpackbar"));
|
|
|
9
9
|
const react_refresh_webpack_plugin_1 = tslib_1.__importDefault(require("@pmmmwh/react-refresh-webpack-plugin"));
|
|
10
10
|
const object_1 = tslib_1.__importDefault(require("@tinkoff/utils/is/object"));
|
|
11
11
|
const undefined_1 = tslib_1.__importDefault(require("@tinkoff/utils/is/undefined"));
|
|
12
|
-
const
|
|
12
|
+
const plugin_webpack_builder_1 = require("@tramvai/plugin-webpack-builder");
|
|
13
13
|
const common_1 = tslib_1.__importDefault(require("./common"));
|
|
14
14
|
const dev_1 = tslib_1.__importDefault(require("../../common/dev"));
|
|
15
15
|
const dev_2 = require("../dev");
|
|
@@ -93,11 +93,11 @@ const webpackClientConfig = ({ configManager, showProgress, }) => {
|
|
|
93
93
|
}
|
|
94
94
|
config.plugin('fork-ts-checker').use(require('fork-ts-checker-webpack-plugin'), [options]);
|
|
95
95
|
}
|
|
96
|
-
// window.ap
|
|
97
|
-
//
|
|
98
|
-
//
|
|
96
|
+
// window.ap is set in packages/modules/render/src/server/blocks/bundleResource/bundleResource.ts
|
|
97
|
+
// in the development build, window.ap is assigned only if there is a valid ASSETS_PREFIX
|
|
98
|
+
// so we change publicPath to window.ap only under the same condition
|
|
99
99
|
if (process.env.ASSETS_PREFIX && process.env.ASSETS_PREFIX !== 'static') {
|
|
100
|
-
config.plugin('runtime-path').use(
|
|
100
|
+
config.plugin('runtime-path').use(plugin_webpack_builder_1.RuntimePathPlugin, [
|
|
101
101
|
{
|
|
102
102
|
publicPath: 'window.ap',
|
|
103
103
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dev.js","sourceRoot":"","sources":["../../../../../src/library/webpack/application/client/dev.ts"],"names":[],"mappings":";;;;AAAA,8DAA8B;AAC9B,0EAAmC;AACnC,wDAAwB;AAExB,oEAAoC;AACpC,gHAAsE;AAItE,8EAAgD;AAChD,oFAAsD;
|
|
1
|
+
{"version":3,"file":"dev.js","sourceRoot":"","sources":["../../../../../src/library/webpack/application/client/dev.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,7 +7,7 @@ const webpack_chain_1 = tslib_1.__importDefault(require("webpack-chain"));
|
|
|
7
7
|
const path_1 = tslib_1.__importDefault(require("path"));
|
|
8
8
|
const object_1 = tslib_1.__importDefault(require("@tinkoff/utils/is/object"));
|
|
9
9
|
const undefined_1 = tslib_1.__importDefault(require("@tinkoff/utils/is/undefined"));
|
|
10
|
-
const
|
|
10
|
+
const plugin_webpack_builder_1 = require("@tramvai/plugin-webpack-builder");
|
|
11
11
|
const common_1 = tslib_1.__importDefault(require("./common"));
|
|
12
12
|
const optimize_1 = tslib_1.__importDefault(require("../../blocks/optimize"));
|
|
13
13
|
const sourcemaps_1 = tslib_1.__importDefault(require("../../blocks/sourcemaps"));
|
|
@@ -42,7 +42,7 @@ const webpackClientConfig = ({ configManager, }) => {
|
|
|
42
42
|
filename: generateFilename('css', false, configManager),
|
|
43
43
|
chunkFilename: generateFilename('css', true, configManager),
|
|
44
44
|
}));
|
|
45
|
-
config.plugin('runtime-path').use(
|
|
45
|
+
config.plugin('runtime-path').use(plugin_webpack_builder_1.RuntimePathPlugin, [
|
|
46
46
|
{
|
|
47
47
|
publicPath: 'window.ap',
|
|
48
48
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prod.js","sourceRoot":"","sources":["../../../../../src/library/webpack/application/client/prod.ts"],"names":[],"mappings":";;;;AAAA,8DAA8B;AAC9B,0EAAmC;AACnC,wDAAwB;AAExB,8EAAgD;AAChD,oFAAsD;
|
|
1
|
+
{"version":3,"file":"prod.js","sourceRoot":"","sources":["../../../../../src/library/webpack/application/client/prod.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dev.d.ts","sourceRoot":"","sources":["../../../../../src/library/webpack/application/server/dev.ts"],"names":[],"mappings":"AACA,OAAO,MAAM,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"dev.d.ts","sourceRoot":"","sources":["../../../../../src/library/webpack/application/server/dev.ts"],"names":[],"mappings":"AACA,OAAO,MAAM,MAAM,eAAe,CAAC;AAKnC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,kCAAkC,CAAC;AACtE,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,6CAA6C,CAAC;AAM1F,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,uBAAuB,CAAC;AAKpE,eAAO,MAAM,mBAAmB;mBAIf,cAAc,sBAAsB,CAAC;kBACtC,6BAA6B,GAAG,IAAI;YAiFnD,CAAC"}
|
|
@@ -5,7 +5,7 @@ const tslib_1 = require("tslib");
|
|
|
5
5
|
const path_1 = tslib_1.__importDefault(require("path"));
|
|
6
6
|
const webpack_chain_1 = tslib_1.__importDefault(require("webpack-chain"));
|
|
7
7
|
const webpackbar_1 = tslib_1.__importDefault(require("webpackbar"));
|
|
8
|
-
const
|
|
8
|
+
const plugin_webpack_builder_1 = require("@tramvai/plugin-webpack-builder");
|
|
9
9
|
const common_1 = tslib_1.__importDefault(require("./common"));
|
|
10
10
|
const dev_1 = tslib_1.__importDefault(require("../../common/dev"));
|
|
11
11
|
const dev_2 = require("../dev");
|
|
@@ -62,7 +62,7 @@ const webpackServerConfig = ({ configManager, showProgress, }) => {
|
|
|
62
62
|
'process.env.PORT_STATIC': JSON.stringify(configManager.staticPort),
|
|
63
63
|
},
|
|
64
64
|
]);
|
|
65
|
-
config.plugin('runtime-path').use(
|
|
65
|
+
config.plugin('runtime-path').use(plugin_webpack_builder_1.RuntimePathPlugin, [
|
|
66
66
|
{
|
|
67
67
|
publicPath: process.env.ASSETS_PREFIX
|
|
68
68
|
? 'process.env.ASSETS_PREFIX'
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dev.js","sourceRoot":"","sources":["../../../../../src/library/webpack/application/server/dev.ts"],"names":[],"mappings":";;;;AAAA,wDAAwB;AACxB,0EAAmC;AACnC,oEAAoC;
|
|
1
|
+
{"version":3,"file":"dev.js","sourceRoot":"","sources":["../../../../../src/library/webpack/application/server/dev.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prod.d.ts","sourceRoot":"","sources":["../../../../../src/library/webpack/application/server/prod.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"prod.d.ts","sourceRoot":"","sources":["../../../../../src/library/webpack/application/server/prod.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,eAAe,CAAC;AAKnC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,kCAAkC,CAAC;AACtE,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,6CAA6C,CAAC;AAM1F,eAAO,MAAM,mBAAmB;mBAGf,cAAc,sBAAsB,CAAC;YA6FrD,CAAC"}
|
|
@@ -4,7 +4,7 @@ exports.webpackServerConfig = void 0;
|
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const webpack_chain_1 = tslib_1.__importDefault(require("webpack-chain"));
|
|
6
6
|
const terser_webpack_plugin_1 = tslib_1.__importDefault(require("terser-webpack-plugin"));
|
|
7
|
-
const
|
|
7
|
+
const plugin_webpack_builder_1 = require("@tramvai/plugin-webpack-builder");
|
|
8
8
|
const common_1 = tslib_1.__importDefault(require("./common"));
|
|
9
9
|
const sourcemaps_1 = tslib_1.__importDefault(require("../../blocks/sourcemaps"));
|
|
10
10
|
const prod_1 = tslib_1.__importDefault(require("../../common/server/prod"));
|
|
@@ -81,7 +81,7 @@ const webpackServerConfig = ({ configManager, }) => {
|
|
|
81
81
|
]);
|
|
82
82
|
}
|
|
83
83
|
// RuntimePathPlugin необходим для правильной генерации ссылок на ассеты (картинки и т.п. которые грузятся через file-loader или url-loader)
|
|
84
|
-
config.plugin('runtime-path').use(
|
|
84
|
+
config.plugin('runtime-path').use(plugin_webpack_builder_1.RuntimePathPlugin, [
|
|
85
85
|
{
|
|
86
86
|
publicPath: 'process.env.ASSETS_PREFIX',
|
|
87
87
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prod.js","sourceRoot":"","sources":["../../../../../src/library/webpack/application/server/prod.ts"],"names":[],"mappings":";;;;AAAA,0EAAmC;AACnC,0FAAiD;
|
|
1
|
+
{"version":3,"file":"prod.js","sourceRoot":"","sources":["../../../../../src/library/webpack/application/server/prod.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"common.d.ts","sourceRoot":"","sources":["../../../../../src/library/webpack/child-app/server/common.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"common.d.ts","sourceRoot":"","sources":["../../../../../src/library/webpack/child-app/server/common.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAIxC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,kCAAkC,CAAC;AAItE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,2CAA2C,CAAC;wCAEtD,cAAc,mBAAmB,CAAC,cAAc,MAAM;AAArF,wBA6BE"}
|
|
@@ -2,9 +2,9 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const tslib_1 = require("tslib");
|
|
4
4
|
const path_1 = tslib_1.__importDefault(require("path"));
|
|
5
|
+
const plugin_webpack_builder_1 = require("@tramvai/plugin-webpack-builder");
|
|
5
6
|
const common_1 = tslib_1.__importDefault(require("../common"));
|
|
6
7
|
const filesServer_1 = tslib_1.__importDefault(require("../../blocks/filesServer"));
|
|
7
|
-
const RuntimePathPlugin_1 = tslib_1.__importDefault(require("../../plugins/RuntimePathPlugin"));
|
|
8
8
|
exports.default = (configManager) => (config) => {
|
|
9
9
|
config.name('server');
|
|
10
10
|
// settings false is required by the UniversalModuleFederationPlugin
|
|
@@ -16,7 +16,7 @@ exports.default = (configManager) => (config) => {
|
|
|
16
16
|
.publicPath('')
|
|
17
17
|
.filename(`[name]_server@${configManager.version}.js`)
|
|
18
18
|
.chunkFilename('[name]_server.chunk.[contenthash].js');
|
|
19
|
-
config.plugin('runtime-path').use(
|
|
19
|
+
config.plugin('runtime-path').use(plugin_webpack_builder_1.RuntimePathPlugin, [
|
|
20
20
|
{
|
|
21
21
|
publicPath: 'ASSETS_PREFIX',
|
|
22
22
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"common.js","sourceRoot":"","sources":["../../../../../src/library/webpack/child-app/server/common.ts"],"names":[],"mappings":";;;AAAA,wDAAwB;
|
|
1
|
+
{"version":3,"file":"common.js","sourceRoot":"","sources":["../../../../../src/library/webpack/child-app/server/common.ts"],"names":[],"mappings":";;;AAAA,wDAAwB;AAGxB,4EAAoE;AAIpE,+DAA+B;AAC/B,mFAA6C;AAG7C,kBAAe,CAAC,aAAiD,EAAE,EAAE,CAAC,CAAC,MAAc,EAAE,EAAE;IACvF,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IAEtB,oEAAoE;IACpE,qJAAqJ;IACrJ,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IAErB,MAAM,CAAC,KAAK,CAAC,IAAA,gBAAM,EAAC,aAAa,CAAC,CAAC,CAAC;IAEpC,MAAM,CAAC,MAAM;SACV,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC;SAC7B,UAAU,CAAC,EAAE,CAAC;SACd,QAAQ,CAAC,iBAAiB,aAAa,CAAC,OAAO,KAAK,CAAC;SACrD,aAAa,CAAC,sCAAsC,CAAC,CAAC;IAEzD,MAAM,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC,GAAG,CAAC,0CAAiB,EAAE;QACnD;YACE,UAAU,EAAE,eAAe;SAC5B;KACF,CAAC,CAAC;IAEH,MAAM,CAAC,KAAK,CAAC,IAAA,qBAAK,EAAC,aAAa,CAAC,CAAC,CAAC;IAEnC,MAAM,CAAC,MAAM;SACV,IAAI,CAAC,oBAAoB,CAAC;SAC1B,GAAG,CAAC,eAAe,EAAE,UAAU,CAAC;SAChC,GAAG,CAAC,UAAU,CAAC;SACf,MAAM,CAAC,cAAI,CAAC,OAAO,CAAC,SAAS,EAAE,gCAAgC,CAAC,CAAC;SACjE,OAAO,CAAC,EAAE,IAAI,EAAE,aAAa,CAAC,IAAI,EAAE,CAAC,CAAC;AAC3C,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"common.d.ts","sourceRoot":"","sources":["../../../../src/library/webpack/module/common.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"common.d.ts","sourceRoot":"","sources":["../../../../src/library/webpack/module/common.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AASxC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AACnE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,qCAAqC,CAAC;wCAQ9C,cAAc,iBAAiB,CAAC,cAAc,MAAM;AAAnF,wBA8CE"}
|
|
@@ -3,9 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
const tslib_1 = require("tslib");
|
|
4
4
|
const webpack_1 = tslib_1.__importDefault(require("webpack"));
|
|
5
5
|
const path_1 = tslib_1.__importDefault(require("path"));
|
|
6
|
+
const plugin_webpack_builder_1 = require("@tramvai/plugin-webpack-builder");
|
|
6
7
|
const externals_1 = tslib_1.__importDefault(require("./externals"));
|
|
7
8
|
const main_1 = tslib_1.__importDefault(require("../common/main"));
|
|
8
|
-
const RuntimePathPlugin_1 = tslib_1.__importDefault(require("../plugins/RuntimePathPlugin"));
|
|
9
9
|
const ts_1 = tslib_1.__importDefault(require("../blocks/ts"));
|
|
10
10
|
const js_1 = tslib_1.__importDefault(require("../blocks/js"));
|
|
11
11
|
const css_1 = tslib_1.__importDefault(require("../blocks/css"));
|
|
@@ -27,7 +27,7 @@ exports.default = (configManager) => (config) => {
|
|
|
27
27
|
maxChunks: 1,
|
|
28
28
|
},
|
|
29
29
|
]);
|
|
30
|
-
config.plugin('runtime-path').use(
|
|
30
|
+
config.plugin('runtime-path').use(plugin_webpack_builder_1.RuntimePathPlugin, [
|
|
31
31
|
{
|
|
32
32
|
publicPath,
|
|
33
33
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"common.js","sourceRoot":"","sources":["../../../../src/library/webpack/module/common.ts"],"names":[],"mappings":";;;AACA,8DAA8B;AAC9B,wDAAwB;
|
|
1
|
+
{"version":3,"file":"common.js","sourceRoot":"","sources":["../../../../src/library/webpack/module/common.ts"],"names":[],"mappings":";;;AACA,8DAA8B;AAC9B,wDAAwB;AAExB,4EAAoE;AAEpE,oEAAoC;AACpC,kEAAoC;AAKpC,8DAA8B;AAC9B,8DAA8B;AAC9B,gEAAgC;AAChC,8EAA8C;AAC9C,uDAAoD;AAEpD,kBAAe,CAAC,aAA+C,EAAE,EAAE,CAAC,CAAC,MAAc,EAAE,EAAE;IACrF,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,GAAG,aAAa,CAAC;IAE9C,MAAM,iBAAiB,GACrB,aAAa,CAAC,GAAG,KAAK,YAAY;QAChC,CAAC,CAAC,GAAG,IAAI,aAAa;QACtB,CAAC,CAAC,GAAG,IAAI,mCAAmC,CAAC;IACjD,MAAM,UAAU,GAAG,oCAAoC,IAAI,WAAW,IAAI,IAAI,OAAO,IAAI,CAAC;IAE1F,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,cAAI,CAAC,OAAO,CAAC,aAAa,CAAC,OAAO,EAAE,GAAG,IAAI,QAAQ,CAAC,CAAC,CAAC;IAE7E,MAAM,CAAC,SAAS,CAAC,mBAAS,CAAC,CAAC;IAE5B,MAAM,CAAC,KAAK,CAAC,IAAA,oBAAU,EAAC,aAAa,CAAC,CAAC,CAAC;IAExC,MAAM,CAAC,KAAK,CAAC,IAAA,cAAM,EAAC,aAAa,CAAC,CAAC,CAAC;IAEpC,MAAM,CAAC,KAAK,CAAC,IAAA,yBAAW,EAAC,aAAa,CAAC,CAAC,CAAC;IAEzC,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,GAAG,CAAC,iBAAO,CAAC,QAAQ,CAAC,qBAAqB,EAAE;QACvE;YACE,SAAS,EAAE,CAAC;SACb;KACF,CAAC,CAAC;IAEH,MAAM,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC,GAAG,CAAC,0CAAiB,EAAE;QACnD;YACE,UAAU;SACX;KACF,CAAC,CAAC;IAEH,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC;QACpC;YACE,GAAG,IAAI,CAAC,CAAC,CAAC;YACV,oBAAoB,EAAE,IAAI;SAC3B;KACF,CAAC,CAAC;IAEH,MAAM;SACH,KAAK,CAAC,IAAA,YAAE,EAAC,aAAa,CAAC,CAAC;SACxB,KAAK,CAAC,IAAA,YAAE,EAAC,aAAa,CAAC,CAAC;SACxB,KAAK,CACJ,IAAA,aAAG,EAAC,aAAa,EAAE;QACjB,cAAc,EAAE,iBAAiB;KAClC,CAAC,CACH,CAAC;AACN,CAAC,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@tramvai/cli",
|
|
3
|
-
"version": "7.4.
|
|
3
|
+
"version": "7.4.1",
|
|
4
4
|
"description": "Cli инструмент для сборки и запуска приложений",
|
|
5
5
|
"engines": {
|
|
6
6
|
"node": ">=20.18.1"
|
|
@@ -74,13 +74,13 @@
|
|
|
74
74
|
"@tinkoff/request-plugin-retry": "^0.3.0",
|
|
75
75
|
"@tinkoff/utils": "^2.1.3",
|
|
76
76
|
"@tinkoff/webpack-dedupe-plugin": "6.0.1",
|
|
77
|
-
"@tramvai/api": "7.4.
|
|
77
|
+
"@tramvai/api": "7.4.1",
|
|
78
78
|
"@tramvai/build": "8.0.1",
|
|
79
|
-
"@tramvai/plugin-babel-transpiler": "7.4.
|
|
80
|
-
"@tramvai/plugin-swc-transpiler": "7.4.
|
|
81
|
-
"@tramvai/plugin-webpack-builder": "7.4.
|
|
82
|
-
"@tramvai/plugin-webpack-pwa": "7.4.
|
|
83
|
-
"@tramvai/react": "7.4.
|
|
79
|
+
"@tramvai/plugin-babel-transpiler": "7.4.1",
|
|
80
|
+
"@tramvai/plugin-swc-transpiler": "7.4.1",
|
|
81
|
+
"@tramvai/plugin-webpack-builder": "7.4.1",
|
|
82
|
+
"@tramvai/plugin-webpack-pwa": "7.4.1",
|
|
83
|
+
"@tramvai/react": "7.4.1",
|
|
84
84
|
"@tramvai/tools-check-versions": "0.9.2",
|
|
85
85
|
"@tramvai/tools-migrate": "0.11.3",
|
|
86
86
|
"ajv": "^8.12.0",
|
|
@@ -9,8 +9,8 @@ import type { ForkTsCheckerWebpackPluginOptions } from 'fork-ts-checker-webpack-
|
|
|
9
9
|
|
|
10
10
|
import isObject from '@tinkoff/utils/is/object';
|
|
11
11
|
import isUndefined from '@tinkoff/utils/is/undefined';
|
|
12
|
+
import { RuntimePathPlugin } from '@tramvai/plugin-webpack-builder';
|
|
12
13
|
|
|
13
|
-
import RuntimePathPlugin from '../../plugins/RuntimePathPlugin';
|
|
14
14
|
import type { ApplicationConfigEntry } from '../../../../typings/configEntry/application';
|
|
15
15
|
import type { ConfigManager } from '../../../../config/configManager';
|
|
16
16
|
import common from './common';
|
|
@@ -126,9 +126,9 @@ export const webpackClientConfig = ({
|
|
|
126
126
|
config.plugin('fork-ts-checker').use(require('fork-ts-checker-webpack-plugin'), [options]);
|
|
127
127
|
}
|
|
128
128
|
|
|
129
|
-
// window.ap
|
|
130
|
-
//
|
|
131
|
-
//
|
|
129
|
+
// window.ap is set in packages/modules/render/src/server/blocks/bundleResource/bundleResource.ts
|
|
130
|
+
// in the development build, window.ap is assigned only if there is a valid ASSETS_PREFIX
|
|
131
|
+
// so we change publicPath to window.ap only under the same condition
|
|
132
132
|
if (process.env.ASSETS_PREFIX && process.env.ASSETS_PREFIX !== 'static') {
|
|
133
133
|
config.plugin('runtime-path').use(RuntimePathPlugin, [
|
|
134
134
|
{
|
|
@@ -4,10 +4,10 @@ import path from 'path';
|
|
|
4
4
|
|
|
5
5
|
import isObject from '@tinkoff/utils/is/object';
|
|
6
6
|
import isUndefined from '@tinkoff/utils/is/undefined';
|
|
7
|
+
import { RuntimePathPlugin } from '@tramvai/plugin-webpack-builder';
|
|
7
8
|
|
|
8
9
|
// eslint-disable-next-line no-restricted-imports
|
|
9
10
|
import type { ForkTsCheckerWebpackPluginOptions } from 'fork-ts-checker-webpack-plugin/lib/plugin-options';
|
|
10
|
-
import RuntimePathPlugin from '../../plugins/RuntimePathPlugin';
|
|
11
11
|
|
|
12
12
|
import type { ConfigManager } from '../../../../config/configManager';
|
|
13
13
|
import type { ApplicationConfigEntry } from '../../../../typings/configEntry/application';
|
|
@@ -2,10 +2,11 @@ import path from 'path';
|
|
|
2
2
|
import Config from 'webpack-chain';
|
|
3
3
|
import WebpackBar from 'webpackbar';
|
|
4
4
|
|
|
5
|
+
import { RuntimePathPlugin } from '@tramvai/plugin-webpack-builder';
|
|
6
|
+
|
|
5
7
|
import type { ConfigManager } from '../../../../config/configManager';
|
|
6
8
|
import type { ApplicationConfigEntry } from '../../../../typings/configEntry/application';
|
|
7
9
|
|
|
8
|
-
import RuntimePathPlugin from '../../plugins/RuntimePathPlugin';
|
|
9
10
|
import common from './common';
|
|
10
11
|
import commonDev from '../../common/dev';
|
|
11
12
|
import { commonApplicationDev } from '../dev';
|
|
@@ -1,10 +1,11 @@
|
|
|
1
1
|
import Config from 'webpack-chain';
|
|
2
2
|
import TerserPlugin from 'terser-webpack-plugin';
|
|
3
3
|
|
|
4
|
+
import { RuntimePathPlugin } from '@tramvai/plugin-webpack-builder';
|
|
5
|
+
|
|
4
6
|
import type { ConfigManager } from '../../../../config/configManager';
|
|
5
7
|
import type { ApplicationConfigEntry } from '../../../../typings/configEntry/application';
|
|
6
8
|
|
|
7
|
-
import RuntimePathPlugin from '../../plugins/RuntimePathPlugin';
|
|
8
9
|
import common from './common';
|
|
9
10
|
import sourcemaps from '../../blocks/sourcemaps';
|
|
10
11
|
import commonProd from '../../common/server/prod';
|
|
@@ -1,11 +1,12 @@
|
|
|
1
1
|
import path from 'path';
|
|
2
2
|
import type Config from 'webpack-chain';
|
|
3
3
|
|
|
4
|
+
import { RuntimePathPlugin } from '@tramvai/plugin-webpack-builder';
|
|
5
|
+
|
|
4
6
|
import type { ConfigManager } from '../../../../config/configManager';
|
|
5
7
|
|
|
6
8
|
import common from '../common';
|
|
7
9
|
import files from '../../blocks/filesServer';
|
|
8
|
-
import RuntimePathPlugin from '../../plugins/RuntimePathPlugin';
|
|
9
10
|
import type { ChildAppConfigEntry } from '../../../../typings/configEntry/child-app';
|
|
10
11
|
|
|
11
12
|
export default (configManager: ConfigManager<ChildAppConfigEntry>) => (config: Config) => {
|
|
@@ -1,9 +1,11 @@
|
|
|
1
1
|
import type Config from 'webpack-chain';
|
|
2
2
|
import webpack from 'webpack';
|
|
3
3
|
import path from 'path';
|
|
4
|
+
|
|
5
|
+
import { RuntimePathPlugin } from '@tramvai/plugin-webpack-builder';
|
|
6
|
+
|
|
4
7
|
import externals from './externals';
|
|
5
8
|
import common from '../common/main';
|
|
6
|
-
import RuntimePathPlugin from '../plugins/RuntimePathPlugin';
|
|
7
9
|
|
|
8
10
|
import type { ConfigManager } from '../../../config/configManager';
|
|
9
11
|
import type { ModuleConfigEntry } from '../../../typings/configEntry/module';
|
|
@@ -1,15 +0,0 @@
|
|
|
1
|
-
import type webpack from 'webpack';
|
|
2
|
-
import type { Compiler } from 'webpack';
|
|
3
|
-
interface Options {
|
|
4
|
-
publicPath: string;
|
|
5
|
-
}
|
|
6
|
-
/**
|
|
7
|
-
* RuntimePathPlugin необходим для правильной генерации ссылок на ассеты (картинки и т.п. которые грузятся через file-loader или url-loader)
|
|
8
|
-
*/
|
|
9
|
-
export default class RuntimePathPlugin implements webpack.WebpackPluginInstance {
|
|
10
|
-
protected options: Options;
|
|
11
|
-
constructor(options: Options);
|
|
12
|
-
apply(compiler: Compiler): void;
|
|
13
|
-
}
|
|
14
|
-
export {};
|
|
15
|
-
//# sourceMappingURL=RuntimePathPlugin.d.ts.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"RuntimePathPlugin.d.ts","sourceRoot":"","sources":["../../../../src/library/webpack/plugins/RuntimePathPlugin.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,OAAO,MAAM,SAAS,CAAC;AACnC,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAIxC,UAAU,OAAO;IACf,UAAU,EAAE,MAAM,CAAC;CACpB;AAED;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,iBAAkB,YAAW,OAAO,CAAC,qBAAqB;IAC7E,SAAS,CAAC,OAAO,EAAE,OAAO,CAAC;gBAEf,OAAO,EAAE,OAAO;IAI5B,KAAK,CAAC,QAAQ,EAAE,QAAQ;CAsCzB"}
|
|
@@ -1,42 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
const webpack_1 = require("webpack");
|
|
4
|
-
const PLUGIN_NAME = 'RuntimePathPlugin';
|
|
5
|
-
/**
|
|
6
|
-
* RuntimePathPlugin необходим для правильной генерации ссылок на ассеты (картинки и т.п. которые грузятся через file-loader или url-loader)
|
|
7
|
-
*/
|
|
8
|
-
class RuntimePathPlugin {
|
|
9
|
-
constructor(options) {
|
|
10
|
-
this.options = options;
|
|
11
|
-
}
|
|
12
|
-
apply(compiler) {
|
|
13
|
-
const publicPathEval = this.options.publicPath;
|
|
14
|
-
const compilerPublicPath = compiler.options.output.publicPath ?? '';
|
|
15
|
-
const defaultPublicPath = compilerPublicPath === 'auto' ? compilerPublicPath : `"${compilerPublicPath}"`;
|
|
16
|
-
compiler.hooks.thisCompilation.tap(PLUGIN_NAME, (compilation) => {
|
|
17
|
-
compilation.hooks.runtimeRequirementInTree
|
|
18
|
-
.for(webpack_1.RuntimeGlobals.publicPath)
|
|
19
|
-
.tap(PLUGIN_NAME, (chunk) => {
|
|
20
|
-
// set custom public path only to entries and webpack runtime as this way public path will be constructed in runtime
|
|
21
|
-
// some of the webpack plugins may use [importModule](https://webpack.js.org/api/loaders/#thisimportmodule) that allows execute modules at build time
|
|
22
|
-
// for example mini-css-extract-plugin uses this method that leads to error `window is not defined` at build if we don't
|
|
23
|
-
// prevent adding dynamic code to every chunk altogether
|
|
24
|
-
const chunkName = chunk.name.toString();
|
|
25
|
-
const isEntry = compilation.entries.has(chunkName);
|
|
26
|
-
// webpack runtime chunk with runtimeChunk: 'single' option
|
|
27
|
-
const isWebpackRuntime = chunkName === 'runtime';
|
|
28
|
-
const needToPatchRuntime = isEntry || isWebpackRuntime;
|
|
29
|
-
compilation.addRuntimeModule(chunk, new class extends webpack_1.RuntimeModule {
|
|
30
|
-
generate() {
|
|
31
|
-
// setting dynamic publicPath
|
|
32
|
-
return `${webpack_1.RuntimeGlobals.publicPath} = ${needToPatchRuntime ? publicPathEval : defaultPublicPath};`;
|
|
33
|
-
}
|
|
34
|
-
}('runtime-path-module'));
|
|
35
|
-
// вернуть true чтобы не вызывалась логика по умолчанию
|
|
36
|
-
return true;
|
|
37
|
-
});
|
|
38
|
-
});
|
|
39
|
-
}
|
|
40
|
-
}
|
|
41
|
-
exports.default = RuntimePathPlugin;
|
|
42
|
-
//# sourceMappingURL=RuntimePathPlugin.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"RuntimePathPlugin.js","sourceRoot":"","sources":["../../../../src/library/webpack/plugins/RuntimePathPlugin.ts"],"names":[],"mappings":";;AAAA,qCAAwD;AAIxD,MAAM,WAAW,GAAG,mBAAmB,CAAC;AAMxC;;GAEG;AACH,MAAqB,iBAAiB;IAGpC,YAAY,OAAgB;QAC1B,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IACzB,CAAC;IAED,KAAK,CAAC,QAAkB;QACtB,MAAM,cAAc,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC;QAC/C,MAAM,kBAAkB,GAAG,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,UAAU,IAAI,EAAE,CAAC;QACpE,MAAM,iBAAiB,GACrB,kBAAkB,KAAK,MAAM,CAAC,CAAC,CAAC,kBAAkB,CAAC,CAAC,CAAC,IAAI,kBAAkB,GAAG,CAAC;QAEjF,QAAQ,CAAC,KAAK,CAAC,eAAe,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC,WAAW,EAAE,EAAE;YAC9D,WAAW,CAAC,KAAK,CAAC,wBAAwB;iBACvC,GAAG,CAAC,wBAAc,CAAC,UAAU,CAAC;iBAC9B,GAAG,CAAC,WAAW,EAAE,CAAC,KAAK,EAAE,EAAE;gBAC1B,oHAAoH;gBACpH,qJAAqJ;gBACrJ,wHAAwH;gBACxH,wDAAwD;gBACxD,MAAM,SAAS,GAAG,KAAK,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;gBACxC,MAAM,OAAO,GAAG,WAAW,CAAC,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;gBACnD,2DAA2D;gBAC3D,MAAM,gBAAgB,GAAG,SAAS,KAAK,SAAS,CAAC;gBAEjD,MAAM,kBAAkB,GAAG,OAAO,IAAI,gBAAgB,CAAC;gBAEvD,WAAW,CAAC,gBAAgB,CAC1B,KAAK,EACL,IAAK,KAAM,SAAQ,uBAAa;oBAC9B,QAAQ;wBACN,6BAA6B;wBAC7B,OAAO,GAAG,wBAAc,CAAC,UAAU,MACjC,kBAAkB,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,iBACxC,GAAG,CAAC;oBACN,CAAC;iBACM,CAAC,qBAAqB,CAAC,CACjC,CAAC;gBAEF,uDAAuD;gBACvD,OAAO,IAAI,CAAC;YACd,CAAC,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;IACL,CAAC;CACF;AA7CD,oCA6CC"}
|
|
@@ -1,59 +0,0 @@
|
|
|
1
|
-
import { RuntimeModule, RuntimeGlobals } from 'webpack';
|
|
2
|
-
import type webpack from 'webpack';
|
|
3
|
-
import type { Compiler } from 'webpack';
|
|
4
|
-
|
|
5
|
-
const PLUGIN_NAME = 'RuntimePathPlugin';
|
|
6
|
-
|
|
7
|
-
interface Options {
|
|
8
|
-
publicPath: string;
|
|
9
|
-
}
|
|
10
|
-
|
|
11
|
-
/**
|
|
12
|
-
* RuntimePathPlugin необходим для правильной генерации ссылок на ассеты (картинки и т.п. которые грузятся через file-loader или url-loader)
|
|
13
|
-
*/
|
|
14
|
-
export default class RuntimePathPlugin implements webpack.WebpackPluginInstance {
|
|
15
|
-
protected options: Options;
|
|
16
|
-
|
|
17
|
-
constructor(options: Options) {
|
|
18
|
-
this.options = options;
|
|
19
|
-
}
|
|
20
|
-
|
|
21
|
-
apply(compiler: Compiler) {
|
|
22
|
-
const publicPathEval = this.options.publicPath;
|
|
23
|
-
const compilerPublicPath = compiler.options.output.publicPath ?? '';
|
|
24
|
-
const defaultPublicPath =
|
|
25
|
-
compilerPublicPath === 'auto' ? compilerPublicPath : `"${compilerPublicPath}"`;
|
|
26
|
-
|
|
27
|
-
compiler.hooks.thisCompilation.tap(PLUGIN_NAME, (compilation) => {
|
|
28
|
-
compilation.hooks.runtimeRequirementInTree
|
|
29
|
-
.for(RuntimeGlobals.publicPath)
|
|
30
|
-
.tap(PLUGIN_NAME, (chunk) => {
|
|
31
|
-
// set custom public path only to entries and webpack runtime as this way public path will be constructed in runtime
|
|
32
|
-
// some of the webpack plugins may use [importModule](https://webpack.js.org/api/loaders/#thisimportmodule) that allows execute modules at build time
|
|
33
|
-
// for example mini-css-extract-plugin uses this method that leads to error `window is not defined` at build if we don't
|
|
34
|
-
// prevent adding dynamic code to every chunk altogether
|
|
35
|
-
const chunkName = chunk.name.toString();
|
|
36
|
-
const isEntry = compilation.entries.has(chunkName);
|
|
37
|
-
// webpack runtime chunk with runtimeChunk: 'single' option
|
|
38
|
-
const isWebpackRuntime = chunkName === 'runtime';
|
|
39
|
-
|
|
40
|
-
const needToPatchRuntime = isEntry || isWebpackRuntime;
|
|
41
|
-
|
|
42
|
-
compilation.addRuntimeModule(
|
|
43
|
-
chunk,
|
|
44
|
-
new (class extends RuntimeModule {
|
|
45
|
-
generate() {
|
|
46
|
-
// setting dynamic publicPath
|
|
47
|
-
return `${RuntimeGlobals.publicPath} = ${
|
|
48
|
-
needToPatchRuntime ? publicPathEval : defaultPublicPath
|
|
49
|
-
};`;
|
|
50
|
-
}
|
|
51
|
-
} as any)('runtime-path-module')
|
|
52
|
-
);
|
|
53
|
-
|
|
54
|
-
// вернуть true чтобы не вызывалась логика по умолчанию
|
|
55
|
-
return true;
|
|
56
|
-
});
|
|
57
|
-
});
|
|
58
|
-
}
|
|
59
|
-
}
|