@tramvai/cli 5.9.2 → 5.14.9
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/api/analyze/index.js +4 -5
- package/lib/api/analyze/index.js.map +1 -1
- package/lib/api/analyze/providers/shared.js +5 -1
- package/lib/api/analyze/providers/shared.js.map +1 -1
- package/lib/api/benchmark/build.js +8 -9
- package/lib/api/benchmark/build.js.map +1 -1
- package/lib/api/benchmark/start.js +16 -17
- package/lib/api/benchmark/start.js.map +1 -1
- package/lib/api/benchmark/utils/clearCache.js +3 -4
- package/lib/api/benchmark/utils/clearCache.js.map +1 -1
- package/lib/api/build/application.js +8 -6
- package/lib/api/build/application.js.map +1 -1
- package/lib/api/build/child-app.js +8 -6
- package/lib/api/build/child-app.js.map +1 -1
- package/lib/api/build/module.js +8 -6
- package/lib/api/build/module.js.map +1 -1
- package/lib/api/build/package.js +3 -4
- package/lib/api/build/package.js.map +1 -1
- package/lib/api/build/providers/shared.js +6 -1
- package/lib/api/build/providers/shared.js.map +1 -1
- package/lib/api/index.js +2 -4
- package/lib/api/index.js.map +1 -1
- package/lib/api/shared/providers/selfSignedCertificateProvider.js +2 -2
- package/lib/api/shared/providers/selfSignedCertificateProvider.js.map +1 -1
- package/lib/api/start/application.js +15 -12
- package/lib/api/start/application.js.map +1 -1
- package/lib/api/start/child-app.js +15 -12
- package/lib/api/start/child-app.js.map +1 -1
- package/lib/api/start/index.js +3 -4
- package/lib/api/start/index.js.map +1 -1
- package/lib/api/start/module.js +15 -12
- package/lib/api/start/module.js.map +1 -1
- package/lib/api/start/providers/application/server.js +5 -8
- package/lib/api/start/providers/application/server.js.map +1 -1
- package/lib/api/start/providers/application/shared.js +13 -10
- package/lib/api/start/providers/application/shared.js.map +1 -1
- package/lib/api/start/providers/child-app/shared.js +13 -10
- package/lib/api/start/providers/child-app/shared.js.map +1 -1
- package/lib/api/start/providers/module/shared.js +13 -10
- package/lib/api/start/providers/module/shared.js.map +1 -1
- package/lib/api/start/providers/shared.js +1 -2
- package/lib/api/start/providers/shared.js.map +1 -1
- package/lib/api/start/utils/createServer.js +1 -1
- package/lib/api/start/utils/createServer.js.map +1 -1
- package/lib/api/start/utils/listenServer.js +2 -3
- package/lib/api/start/utils/listenServer.js.map +1 -1
- package/lib/api/start/utils/stopServer.js +2 -3
- package/lib/api/start/utils/stopServer.js.map +1 -1
- package/lib/api/start/utils/tips/index.js +5 -2
- package/lib/api/start/utils/tips/index.js.map +1 -1
- package/lib/api/start/utils/tips/tips.js +1 -2
- package/lib/api/start/utils/tips/tips.js.map +1 -1
- package/lib/api/start-prod/application.js +17 -14
- package/lib/api/start-prod/application.js.map +1 -1
- package/lib/api/start-prod/child-app.js +13 -10
- package/lib/api/start-prod/child-app.js.map +1 -1
- package/lib/api/start-prod/index.js +3 -4
- package/lib/api/start-prod/index.js.map +1 -1
- package/lib/api/start-prod/providers/application.js +24 -5
- package/lib/api/start-prod/providers/application.js.map +1 -1
- package/lib/api/start-prod/providers/child-app.js +8 -1
- package/lib/api/start-prod/providers/child-app.js.map +1 -1
- package/lib/api/start-prod/providers/shared.js +14 -16
- package/lib/api/start-prod/providers/shared.js.map +1 -1
- package/lib/builder/webpack/devServer/pool/base/worker.js +7 -3
- package/lib/builder/webpack/devServer/pool/base/worker.js.map +1 -1
- package/lib/builder/webpack/devServer/pool/pool.js +6 -7
- package/lib/builder/webpack/devServer/pool/pool.js.map +1 -1
- package/lib/builder/webpack/devServer/pool/process/pool.js +37 -39
- package/lib/builder/webpack/devServer/pool/process/pool.js.map +1 -1
- package/lib/builder/webpack/devServer/pool/thread/pool.js +39 -39
- package/lib/builder/webpack/devServer/pool/thread/pool.js.map +1 -1
- package/lib/builder/webpack/devServer/server.js +191 -193
- package/lib/builder/webpack/devServer/server.js.map +1 -1
- package/lib/builder/webpack/devServer/setup.js +25 -27
- package/lib/builder/webpack/devServer/setup.js.map +1 -1
- package/lib/builder/webpack/index.js +51 -58
- package/lib/builder/webpack/index.js.map +1 -1
- package/lib/builder/webpack/providers/analyze/shared.js +12 -15
- package/lib/builder/webpack/providers/analyze/shared.js.map +1 -1
- package/lib/builder/webpack/providers/build/application/server.js +2 -5
- package/lib/builder/webpack/providers/build/application/server.js.map +1 -1
- package/lib/builder/webpack/providers/build/clientShared.js +9 -12
- package/lib/builder/webpack/providers/build/clientShared.js.map +1 -1
- package/lib/builder/webpack/providers/shared.js +10 -11
- package/lib/builder/webpack/providers/shared.js.map +1 -1
- package/lib/builder/webpack/utils/copyStatsJsonFile.js +4 -4
- package/lib/builder/webpack/utils/copyStatsJsonFile.js.map +1 -1
- package/lib/builder/webpack/utils/runWebpack.js +9 -3
- package/lib/builder/webpack/utils/runWebpack.js.map +1 -1
- package/lib/cli/CLI.js +2 -5
- package/lib/cli/CLI.js.map +1 -1
- package/lib/cli/index.js +57 -63
- package/lib/cli/index.js.map +1 -1
- package/lib/commands/add/add.js +7 -8
- package/lib/commands/add/add.js.map +1 -1
- package/lib/commands/add/checkPackageValidator.js +3 -3
- package/lib/commands/add/checkPackageValidator.js.map +1 -1
- package/lib/commands/add/command.js +3 -6
- package/lib/commands/add/command.js.map +1 -1
- package/lib/commands/analyze/analyze.js +3 -4
- package/lib/commands/analyze/analyze.js.map +1 -1
- package/lib/commands/benchmark/benchmark.js +4 -4
- package/lib/commands/benchmark/benchmark.js.map +1 -1
- package/lib/commands/build/build.js +3 -4
- package/lib/commands/build/build.js.map +1 -1
- package/lib/commands/createCommand.js +1 -2
- package/lib/commands/createCommand.js.map +1 -1
- package/lib/commands/generate/generate.js +8 -11
- package/lib/commands/generate/generate.js.map +1 -1
- package/lib/commands/generate/utils/askConfigEntry.js +20 -24
- package/lib/commands/generate/utils/askConfigEntry.js.map +1 -1
- package/lib/commands/generate/utils/askGenerator.js +14 -18
- package/lib/commands/generate/utils/askGenerator.js.map +1 -1
- package/lib/commands/new/new.js +47 -49
- package/lib/commands/new/new.js.map +1 -1
- package/lib/commands/new/steps/initializationGit.js +3 -5
- package/lib/commands/new/steps/initializationGit.js.map +1 -1
- package/lib/commands/new/steps/installDependencies.js +17 -19
- package/lib/commands/new/steps/installDependencies.js.map +1 -1
- package/lib/commands/new/steps/renderTemplate.js +3 -5
- package/lib/commands/new/steps/renderTemplate.js.map +1 -1
- package/lib/commands/start/start.js +7 -6
- package/lib/commands/start/start.js.map +1 -1
- package/lib/commands/start-prod/startProd.js +4 -5
- package/lib/commands/start-prod/startProd.js.map +1 -1
- package/lib/commands/static/application.js +38 -18
- package/lib/commands/static/application.js.map +1 -1
- package/lib/commands/static/generate.js +6 -6
- package/lib/commands/static/generate.js.map +1 -1
- package/lib/commands/static/static.js +3 -4
- package/lib/commands/static/static.js.map +1 -1
- package/lib/commands/update/checkVersionValidator.js +3 -4
- package/lib/commands/update/checkVersionValidator.js.map +1 -1
- package/lib/commands/update/command.js +3 -6
- package/lib/commands/update/command.js.map +1 -1
- package/lib/commands/update/dependantLibs.js +3 -3
- package/lib/commands/update/dependantLibs.js.map +1 -1
- package/lib/commands/update/update.js +8 -9
- package/lib/commands/update/update.js.map +1 -1
- package/lib/commands/update/updatePackageJson.js +10 -11
- package/lib/commands/update/updatePackageJson.js.map +1 -1
- package/lib/config/configManager.js +57 -21
- package/lib/config/configManager.js.map +1 -1
- package/lib/di/child.js +1 -1
- package/lib/di/child.js.map +1 -1
- package/lib/di/providers/builder.js +37 -17
- package/lib/di/providers/builder.js.map +1 -1
- package/lib/di/providers/commands.js +22 -25
- package/lib/di/providers/commands.js.map +1 -1
- package/lib/di/providers/config.js +1 -2
- package/lib/di/providers/config.js.map +1 -1
- package/lib/di/providers/std.js +2 -4
- package/lib/di/providers/std.js.map +1 -1
- package/lib/library/babel/index.d.ts.map +1 -1
- package/lib/library/babel/index.js +12 -3
- package/lib/library/babel/index.js.map +1 -1
- package/lib/library/babel/plugins/create-token-pure.js +3 -3
- package/lib/library/babel/plugins/create-token-pure.js.map +1 -1
- package/lib/library/babel/plugins/fill-declare-action-name.js +3 -4
- package/lib/library/babel/plugins/fill-declare-action-name.js.map +1 -1
- package/lib/library/babel/plugins/lazy-component/properties/chunkName.js +1 -1
- package/lib/library/babel/plugins/lazy-component/properties/chunkName.js.map +1 -1
- package/lib/library/babel/plugins/lazy-component/properties/resolve.js +1 -2
- package/lib/library/babel/plugins/lazy-component/properties/resolve.js.map +1 -1
- package/lib/library/babel/plugins/provider-stack.js +1 -2
- package/lib/library/babel/plugins/provider-stack.js.map +1 -1
- package/lib/library/swc/index.js +1 -2
- package/lib/library/swc/index.js.map +1 -1
- package/lib/library/webpack/application/client/common.js +10 -3
- package/lib/library/webpack/application/client/common.js.map +1 -1
- package/lib/library/webpack/application/client/dev.js +24 -10
- package/lib/library/webpack/application/client/dev.js.map +1 -1
- package/lib/library/webpack/application/client/prod/optimization/splitChunks.js +1 -1
- package/lib/library/webpack/application/client/prod/optimization/splitChunks.js.map +1 -1
- package/lib/library/webpack/application/client/prod.js +9 -2
- package/lib/library/webpack/application/client/prod.js.map +1 -1
- package/lib/library/webpack/application/server/common.js +7 -1
- package/lib/library/webpack/application/server/common.js.map +1 -1
- package/lib/library/webpack/application/server/dev.js +8 -4
- package/lib/library/webpack/application/server/dev.js.map +1 -1
- package/lib/library/webpack/application/server/prod.js +8 -1
- package/lib/library/webpack/application/server/prod.js.map +1 -1
- package/lib/library/webpack/blocks/browserslistConfig.js +1 -2
- package/lib/library/webpack/blocks/browserslistConfig.js.map +1 -1
- package/lib/library/webpack/blocks/configToEnv.js +10 -1
- package/lib/library/webpack/blocks/configToEnv.js.map +1 -1
- package/lib/library/webpack/blocks/css.js +9 -8
- package/lib/library/webpack/blocks/css.js.map +1 -1
- package/lib/library/webpack/blocks/dedupe.js +6 -2
- package/lib/library/webpack/blocks/dedupe.js.map +1 -1
- package/lib/library/webpack/blocks/extractCssPlugin.js +1 -2
- package/lib/library/webpack/blocks/extractCssPlugin.js.map +1 -1
- package/lib/library/webpack/blocks/filesClient.js +2 -3
- package/lib/library/webpack/blocks/filesClient.js.map +1 -1
- package/lib/library/webpack/blocks/filesServer.js +2 -3
- package/lib/library/webpack/blocks/filesServer.js.map +1 -1
- package/lib/library/webpack/blocks/nodeClient.js +4 -1
- package/lib/library/webpack/blocks/nodeClient.js.map +1 -1
- package/lib/library/webpack/blocks/optimize.js +25 -6
- package/lib/library/webpack/blocks/optimize.js.map +1 -1
- package/lib/library/webpack/blocks/postcssAssets.js +1 -2
- package/lib/library/webpack/blocks/postcssAssets.js.map +1 -1
- package/lib/library/webpack/blocks/pwa/client.js +21 -13
- package/lib/library/webpack/blocks/pwa/client.js.map +1 -1
- package/lib/library/webpack/blocks/pwa/shared.js +15 -10
- package/lib/library/webpack/blocks/pwa/shared.js.map +1 -1
- package/lib/library/webpack/child-app/client/dev.js +12 -5
- package/lib/library/webpack/child-app/client/dev.js.map +1 -1
- package/lib/library/webpack/child-app/moduleFederationShared.js +32 -28
- package/lib/library/webpack/child-app/moduleFederationShared.js.map +1 -1
- package/lib/library/webpack/child-app/server/dev.js +4 -1
- package/lib/library/webpack/child-app/server/dev.js.map +1 -1
- package/lib/library/webpack/common/client/prod.js +4 -1
- package/lib/library/webpack/common/client/prod.js.map +1 -1
- package/lib/library/webpack/common/dev.js +12 -5
- package/lib/library/webpack/common/dev.js.map +1 -1
- package/lib/library/webpack/common/main.js +10 -4
- package/lib/library/webpack/common/main.js.map +1 -1
- package/lib/library/webpack/common/server/prod.js +4 -1
- package/lib/library/webpack/common/server/prod.js.map +1 -1
- package/lib/library/webpack/constants/stats.js +4 -1
- package/lib/library/webpack/constants/stats.js.map +1 -1
- package/lib/library/webpack/loaders/image-loader/getImageMiniatureURL.js +3 -4
- package/lib/library/webpack/loaders/image-loader/getImageMiniatureURL.js.map +1 -1
- package/lib/library/webpack/loaders/image-loader/index.js +7 -9
- package/lib/library/webpack/loaders/image-loader/index.js.map +1 -1
- package/lib/library/webpack/loaders/pagesResolve.js +72 -74
- package/lib/library/webpack/loaders/pagesResolve.js.map +1 -1
- package/lib/library/webpack/module/client/common.js +5 -1
- package/lib/library/webpack/module/client/common.js.map +1 -1
- package/lib/library/webpack/module/client/dev.js +4 -1
- package/lib/library/webpack/module/client/dev.js.map +1 -1
- package/lib/library/webpack/module/common.js +4 -1
- package/lib/library/webpack/module/common.js.map +1 -1
- package/lib/library/webpack/module/server/common.js +6 -1
- package/lib/library/webpack/module/server/common.js.map +1 -1
- package/lib/library/webpack/module/server/dev.js +4 -1
- package/lib/library/webpack/module/server/dev.js.map +1 -1
- package/lib/library/webpack/plugins/ModuleFederationFixRange.js +7 -9
- package/lib/library/webpack/plugins/ModuleFederationFixRange.js.map +1 -1
- package/lib/library/webpack/plugins/PwaIconsPlugin.js +4 -5
- package/lib/library/webpack/plugins/PwaIconsPlugin.js.map +1 -1
- package/lib/library/webpack/plugins/RuntimePathPlugin.js +1 -2
- package/lib/library/webpack/plugins/RuntimePathPlugin.js.map +1 -1
- package/lib/library/webpack/plugins/WebManifestPlugin.js +2 -3
- package/lib/library/webpack/plugins/WebManifestPlugin.js.map +1 -1
- package/lib/library/webpack/plugins/WebpackBar/reporters/fancy.js +1 -1
- package/lib/library/webpack/plugins/WebpackBar/reporters/fancy.js.map +1 -1
- package/lib/library/webpack/utils/extendEntry.js +9 -2
- package/lib/library/webpack/utils/extendEntry.js.map +1 -1
- package/lib/library/webpack/utils/files.js +5 -3
- package/lib/library/webpack/utils/files.js.map +1 -1
- package/lib/library/webpack/utils/threadLoader.js +7 -4
- package/lib/library/webpack/utils/threadLoader.js.map +1 -1
- package/lib/library/webpack/utils/toWebpackConfig.js +5 -2
- package/lib/library/webpack/utils/toWebpackConfig.js.map +1 -1
- package/lib/library/webpack/utils/transpiler.js +17 -3
- package/lib/library/webpack/utils/transpiler.js.map +1 -1
- package/lib/models/analytics.js +5 -5
- package/lib/models/analytics.js.map +1 -1
- package/lib/models/command.js +28 -33
- package/lib/models/command.js.map +1 -1
- package/lib/models/logger.js +4 -5
- package/lib/models/logger.js.map +1 -1
- package/lib/models/port-manager.js +120 -148
- package/lib/models/port-manager.js.map +1 -1
- package/lib/models/task.js +26 -28
- package/lib/models/task.js.map +1 -1
- package/lib/schema/autogeneratedSchema.json +15 -15
- package/lib/ui/commander.js +1 -1
- package/lib/ui/commander.js.map +1 -1
- package/lib/utils/close.js +2 -3
- package/lib/utils/close.js.map +1 -1
- package/lib/utils/commands/dependencies/checkVersions.js +3 -4
- package/lib/utils/commands/dependencies/checkVersions.js.map +1 -1
- package/lib/utils/commands/dependencies/findTramvaiVersion.js +3 -4
- package/lib/utils/commands/dependencies/findTramvaiVersion.js.map +1 -1
- package/lib/utils/commands/dependencies/getLatestPackageVersion.js +3 -3
- package/lib/utils/commands/dependencies/getLatestPackageVersion.js.map +1 -1
- package/lib/utils/commands/dependencies/migrate.js +3 -4
- package/lib/utils/commands/dependencies/migrate.js.map +1 -1
- package/lib/utils/commands/dependencies/packageHasVersion.js +3 -3
- package/lib/utils/commands/dependencies/packageHasVersion.js.map +1 -1
- package/lib/utils/dev-app/request.js +4 -4
- package/lib/utils/dev-app/request.js.map +1 -1
- package/lib/utils/formatting.js +7 -1
- package/lib/utils/formatting.js.map +1 -1
- package/lib/utils/getTramvaiConfig.js +4 -1
- package/lib/utils/getTramvaiConfig.js.map +1 -1
- package/lib/utils/lockfileHash.js +1 -2
- package/lib/utils/lockfileHash.js.map +1 -1
- package/lib/utils/npmRequire.js +61 -65
- package/lib/utils/npmRequire.js.map +1 -1
- package/lib/utils/packageVersion.js +5 -6
- package/lib/utils/packageVersion.js.map +1 -1
- package/lib/utils/runHandlers.js +2 -3
- package/lib/utils/runHandlers.js.map +1 -1
- package/lib/utils/sentry.js +5 -5
- package/lib/utils/sentry.js.map +1 -1
- package/lib/utils/shouldUseReactRoot.js +1 -2
- package/lib/utils/shouldUseReactRoot.js.map +1 -1
- package/lib/validators/commands/checkDependencies.js +2 -2
- package/lib/validators/commands/checkDependencies.js.map +1 -1
- package/lib/validators/commands/checkPwaDependencies.js +4 -6
- package/lib/validators/commands/checkPwaDependencies.js.map +1 -1
- package/lib/validators/commands/checkSwcDependencies.js +5 -8
- package/lib/validators/commands/checkSwcDependencies.js.map +1 -1
- package/lib/validators/commands/runMigrationsAndCheckVersions.js +4 -5
- package/lib/validators/commands/runMigrationsAndCheckVersions.js.map +1 -1
- package/package.json +7 -7
- package/schema.json +15 -15
- package/src/api/start/__integration__/start.test.ts +1 -1
- package/src/library/babel/index.ts +7 -0
- package/src/schema/autogeneratedSchema.json +15 -15
|
@@ -31,217 +31,215 @@ const serverRunner = ({ di, config, compiler, configManager, server, }) => {
|
|
|
31
31
|
return noop_1.default;
|
|
32
32
|
}
|
|
33
33
|
// eslint-disable-next-line max-statements
|
|
34
|
-
return function runDevServer() {
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
34
|
+
return async function runDevServer() {
|
|
35
|
+
const file = `${Object.keys(config.entryPoints.entries())[0]}.js`;
|
|
36
|
+
const filename = path_1.default.resolve(config.output.get('path'), file);
|
|
37
|
+
// настоящая ссылка на файл используется для отладки в debug режиме
|
|
38
|
+
const realFilename = `${(0, getApplicationUrl_1.getApplicationUrl)({
|
|
39
|
+
host: configManager.staticHost,
|
|
40
|
+
port: configManager.staticPort,
|
|
41
|
+
protocol: configManager.httpProtocol,
|
|
42
|
+
})}/${configManager.output.server}/${file}`;
|
|
43
|
+
const serverCompiler = compiler.compilers.find((comp) => comp.name === 'server');
|
|
44
|
+
if (!serverCompiler) {
|
|
45
|
+
throw new Error('Server compiler has not found');
|
|
46
|
+
}
|
|
47
|
+
const fs = serverCompiler.outputFileSystem;
|
|
48
|
+
// ThreadWorkerPool is experimental
|
|
49
|
+
// it doesn't work well when running integration tests in tramvai repo
|
|
50
|
+
// mostly because of the some problems with `babel-plugin-lodash`
|
|
51
|
+
// but thread workers are more lightweight and performant
|
|
52
|
+
//
|
|
53
|
+
// also currently they do not support nodejs debugging - [issue](https://github.com/nodejs/node/issues/26609)
|
|
54
|
+
// in case of debugging fallback to the child processes
|
|
55
|
+
const { pool, send } = await (0, pool_3.createWorkerPool)(di, configManager.experiments.serverRunner === 'thread' && !configManager.debug
|
|
56
|
+
? pool_2.ThreadWorkerBridge
|
|
57
|
+
: pool_1.ProcessWorkerBridge);
|
|
58
|
+
let worker;
|
|
59
|
+
let serverInvalidated = true;
|
|
60
|
+
let workerPort;
|
|
61
|
+
let resolveWorkerPort;
|
|
62
|
+
let workerPortPromise;
|
|
63
|
+
let hasExitedUnexpectedly = false;
|
|
64
|
+
let proxyErrorCount = 0;
|
|
65
|
+
const proxy = (0, http_proxy_1.createProxyServer)({
|
|
66
|
+
// указываем, что сами обработаем ответ
|
|
67
|
+
selfHandleResponse: true,
|
|
68
|
+
});
|
|
69
|
+
const deathUnsubscribe = (0, death_1.default)({ exit: true, uncaughtException: true })(async (signal, err) => {
|
|
70
|
+
await pool.close(true);
|
|
71
|
+
if (err instanceof Error) {
|
|
72
|
+
console.error(err);
|
|
47
73
|
}
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
let serverInvalidated = true;
|
|
61
|
-
let workerPort;
|
|
62
|
-
let resolveWorkerPort;
|
|
63
|
-
let workerPortPromise;
|
|
64
|
-
let hasExitedUnexpectedly = false;
|
|
65
|
-
let proxyErrorCount = 0;
|
|
66
|
-
const proxy = (0, http_proxy_1.createProxyServer)({
|
|
67
|
-
// указываем, что сами обработаем ответ
|
|
68
|
-
selfHandleResponse: true,
|
|
69
|
-
});
|
|
70
|
-
const deathUnsubscribe = (0, death_1.default)({ exit: true, uncaughtException: true })((signal, err) => tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
71
|
-
yield pool.close(true);
|
|
72
|
-
if (err instanceof Error) {
|
|
73
|
-
console.error(err);
|
|
74
|
-
}
|
|
75
|
-
process.exit(1);
|
|
76
|
-
}));
|
|
77
|
-
di.register({
|
|
78
|
-
provide: tokens_1.CLOSE_HANDLER_TOKEN,
|
|
79
|
-
multi: true,
|
|
80
|
-
useValue: deathUnsubscribe,
|
|
74
|
+
process.exit(1);
|
|
75
|
+
});
|
|
76
|
+
di.register({
|
|
77
|
+
provide: tokens_1.CLOSE_HANDLER_TOKEN,
|
|
78
|
+
multi: true,
|
|
79
|
+
useValue: deathUnsubscribe,
|
|
80
|
+
});
|
|
81
|
+
// отключаем инвалидацию и перезапуск сервера если выставлен флаг noServerRebuild
|
|
82
|
+
if (!configManager.noServerRebuild) {
|
|
83
|
+
serverCompiler.hooks.invalid.tap(HOOK_NAME, () => {
|
|
84
|
+
serverInvalidated = true;
|
|
85
|
+
hasExitedUnexpectedly = false;
|
|
81
86
|
});
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
hasExitedUnexpectedly = false;
|
|
87
|
-
});
|
|
87
|
+
}
|
|
88
|
+
const waitWorkerPort = async () => {
|
|
89
|
+
if (workerPort) {
|
|
90
|
+
return workerPort;
|
|
88
91
|
}
|
|
89
|
-
|
|
90
|
-
if (workerPort) {
|
|
91
|
-
return workerPort;
|
|
92
|
-
}
|
|
93
|
-
if (workerPortPromise) {
|
|
94
|
-
return workerPortPromise;
|
|
95
|
-
}
|
|
96
|
-
workerPortPromise = new Promise((resolve) => {
|
|
97
|
-
resolveWorkerPort = resolve;
|
|
98
|
-
});
|
|
92
|
+
if (workerPortPromise) {
|
|
99
93
|
return workerPortPromise;
|
|
94
|
+
}
|
|
95
|
+
workerPortPromise = new Promise((resolve) => {
|
|
96
|
+
resolveWorkerPort = resolve;
|
|
100
97
|
});
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
98
|
+
return workerPortPromise;
|
|
99
|
+
};
|
|
100
|
+
// http-proxy всегда склеивает слеши в урле, что немного неожиданно при работе с сервером напрямую
|
|
101
|
+
// https://github.com/http-party/node-http-proxy/issues/775
|
|
102
|
+
// поэтому пытаемся вернуть все слеши на место
|
|
103
|
+
proxy.on('proxyReq', (proxyReq, req, res) => {
|
|
104
|
+
// Early Hints support
|
|
105
|
+
proxyReq.socket.on('data', (data) => {
|
|
106
|
+
try {
|
|
107
|
+
const chunk = data.toString();
|
|
108
|
+
if (chunk.startsWith('HTTP/1.1 103 Early Hints')) {
|
|
109
|
+
res.socket.write(data);
|
|
112
110
|
}
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
}
|
|
117
|
-
// https://github.com/http-party/node-http-proxy/issues/1022#issuecomment-439245479
|
|
118
|
-
// eslint-disable-next-line no-param-reassign
|
|
119
|
-
proxyReq.path = req.url;
|
|
111
|
+
}
|
|
112
|
+
catch (e) {
|
|
113
|
+
// do nothing
|
|
114
|
+
}
|
|
120
115
|
});
|
|
121
|
-
//
|
|
122
|
-
//
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
116
|
+
// https://github.com/http-party/node-http-proxy/issues/1022#issuecomment-439245479
|
|
117
|
+
// eslint-disable-next-line no-param-reassign
|
|
118
|
+
proxyReq.path = req.url;
|
|
119
|
+
});
|
|
120
|
+
// делаем запросы к дочернему процессу и пытаемся полностью получить его ответ
|
|
121
|
+
// если всё ок, то просто отправляем полученные данные клиенту
|
|
122
|
+
proxy.on('proxyRes', (proxyRes, req, res) => {
|
|
123
|
+
proxyErrorCount--;
|
|
124
|
+
if (!res.headersSent) {
|
|
125
|
+
// дублируем всю логику прокси и отправляем ответ
|
|
126
|
+
// немного костыль по мотивам https://github.com/http-party/node-http-proxy/issues/1263#issuecomment-394758768
|
|
127
|
+
(0, each_1.default)((handler) => {
|
|
128
|
+
handler(req, res, proxyRes, {});
|
|
129
|
+
}, web_outgoing_1.default);
|
|
130
|
+
}
|
|
131
|
+
//
|
|
132
|
+
// Обработка события aborted нужна только для кейса, когда запросы на localhost:4000
|
|
133
|
+
// проксируются через tramvai сервер, который каждый ребилд переоткрывается на другом порту
|
|
134
|
+
//
|
|
135
|
+
// Кейс нужен для __webpack_hmr, который отдает данные в стриме через server-sent events,
|
|
136
|
+
// и нам нужно всегда держать постоянное соединение к __webpack_hmr,
|
|
137
|
+
// а повторное открытие tramvai сервера на другом порту сбрасывает это соединение
|
|
138
|
+
//
|
|
139
|
+
// В proxy.on('error') уже содержится логика по повторному запросу на другой порт,
|
|
140
|
+
// поэтому нам просто нужно обработать обрыв соединения как ошибку
|
|
141
|
+
//
|
|
142
|
+
proxyRes.on('aborted', () => {
|
|
143
|
+
const contentType = res.getHeader('content-type');
|
|
144
|
+
if (typeof contentType === 'string' && contentType.includes('text/event-stream')) {
|
|
145
|
+
proxy.emit('error', Error('aborted'), req, res);
|
|
131
146
|
}
|
|
132
|
-
//
|
|
133
|
-
// Обработка события aborted нужна только для кейса, когда запросы на localhost:4000
|
|
134
|
-
// проксируются через tramvai сервер, который каждый ребилд переоткрывается на другом порту
|
|
135
|
-
//
|
|
136
|
-
// Кейс нужен для __webpack_hmr, который отдает данные в стриме через server-sent events,
|
|
137
|
-
// и нам нужно всегда держать постоянное соединение к __webpack_hmr,
|
|
138
|
-
// а повторное открытие tramvai сервера на другом порту сбрасывает это соединение
|
|
139
|
-
//
|
|
140
|
-
// В proxy.on('error') уже содержится логика по повторному запросу на другой порт,
|
|
141
|
-
// поэтому нам просто нужно обработать обрыв соединения как ошибку
|
|
142
|
-
//
|
|
143
|
-
proxyRes.on('aborted', () => {
|
|
144
|
-
const contentType = res.getHeader('content-type');
|
|
145
|
-
if (typeof contentType === 'string' && contentType.includes('text/event-stream')) {
|
|
146
|
-
proxy.emit('error', Error('aborted'), req, res);
|
|
147
|
-
}
|
|
148
|
-
});
|
|
149
|
-
proxyRes.pipe(res);
|
|
150
147
|
});
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
148
|
+
proxyRes.pipe(res);
|
|
149
|
+
});
|
|
150
|
+
// в случае ошибки ждём пока получим новый порт и делаем повторный запрос
|
|
151
|
+
// рекурсивные ошибки будут опять попадать сюда и это будет продолжаться до тех пор пока не получим ответ
|
|
152
|
+
proxy.on('error', async (err, req, res) => {
|
|
153
|
+
if (hasExitedUnexpectedly) {
|
|
154
|
+
// @ts-ignore
|
|
155
|
+
res.statusCode = 500;
|
|
156
|
+
res.end(EXITED_UNEXPECTEDLY);
|
|
157
|
+
return;
|
|
158
|
+
}
|
|
159
|
+
if (proxyErrorCount > 10) {
|
|
160
|
+
console.error('[dev-server-error] looping of request proxying to worker', err);
|
|
161
|
+
// @ts-ignore
|
|
162
|
+
res.statusCode = 500;
|
|
163
|
+
res.end(EXITED_UNEXPECTEDLY);
|
|
164
|
+
return;
|
|
165
|
+
}
|
|
166
|
+
if (pool.state !== lightning_pool_1.PoolState.CLOSED) {
|
|
167
|
+
proxyErrorCount++;
|
|
168
|
+
await waitWorkerPort();
|
|
169
|
+
proxy.web(req, res, { target: `http://localhost:${workerPort}` });
|
|
170
|
+
}
|
|
171
|
+
});
|
|
172
|
+
// задаём свой http-сервер который будет проксировать запросы к дочернему процессу
|
|
173
|
+
server.on('request', async (req, res) => {
|
|
174
|
+
if (hasExitedUnexpectedly) {
|
|
175
|
+
res.statusCode = 500;
|
|
176
|
+
res.end(EXITED_UNEXPECTEDLY);
|
|
177
|
+
return;
|
|
178
|
+
}
|
|
179
|
+
await waitWorkerPort();
|
|
180
|
+
proxy.web(req, res, { target: `http://localhost:${workerPort}` });
|
|
181
|
+
});
|
|
182
|
+
// Проксируем также и веб-сокеты
|
|
183
|
+
server.on('upgrade', (req, socket, head) => {
|
|
184
|
+
proxy.ws(req, socket, { target: `http://localhost:${workerPort}` });
|
|
185
|
+
});
|
|
186
|
+
di.register({
|
|
187
|
+
provide: tokens_1.CLOSE_HANDLER_TOKEN,
|
|
188
|
+
multi: true,
|
|
189
|
+
useValue: async () => {
|
|
190
|
+
proxy.close();
|
|
191
|
+
if (worker) {
|
|
192
|
+
// если сервер закрывается, мы должны завершить все дочерние воркеры
|
|
193
|
+
await pool.release(worker);
|
|
194
|
+
await pool.close(true);
|
|
159
195
|
}
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
196
|
+
},
|
|
197
|
+
});
|
|
198
|
+
serverCompiler.hooks.beforeCompile.tapPromise(HOOK_NAME, async () => {
|
|
199
|
+
if (pool.state === lightning_pool_1.PoolState.IDLE) {
|
|
200
|
+
await pool.start();
|
|
201
|
+
}
|
|
202
|
+
});
|
|
203
|
+
compiler.hooks.done.tap(HOOK_NAME, async (stats) => {
|
|
204
|
+
if (serverInvalidated) {
|
|
205
|
+
workerPort = null;
|
|
206
|
+
workerPortPromise = null;
|
|
207
|
+
serverInvalidated = false;
|
|
208
|
+
if (stats.hasErrors()) {
|
|
209
|
+
// всплыли ошибки при сборке - просто игнорим калбек чтобы не падать ниже и дать возможность выполнить пересборку
|
|
165
210
|
return;
|
|
166
211
|
}
|
|
167
|
-
if (
|
|
168
|
-
|
|
169
|
-
yield waitWorkerPort();
|
|
170
|
-
proxy.web(req, res, { target: `http://localhost:${workerPort}` });
|
|
171
|
-
}
|
|
172
|
-
}));
|
|
173
|
-
// задаём свой http-сервер который будет проксировать запросы к дочернему процессу
|
|
174
|
-
server.on('request', (req, res) => tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
175
|
-
if (hasExitedUnexpectedly) {
|
|
176
|
-
res.statusCode = 500;
|
|
177
|
-
res.end(EXITED_UNEXPECTEDLY);
|
|
178
|
-
return;
|
|
212
|
+
if (worker) {
|
|
213
|
+
await pool.release(worker);
|
|
179
214
|
}
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
proxy.ws(req, socket, { target: `http://localhost:${workerPort}` });
|
|
186
|
-
});
|
|
187
|
-
di.register({
|
|
188
|
-
provide: tokens_1.CLOSE_HANDLER_TOKEN,
|
|
189
|
-
multi: true,
|
|
190
|
-
useValue: () => tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
191
|
-
proxy.close();
|
|
192
|
-
if (worker) {
|
|
193
|
-
// если сервер закрывается, мы должны завершить все дочерние воркеры
|
|
194
|
-
yield pool.release(worker);
|
|
195
|
-
yield pool.close(true);
|
|
215
|
+
worker = await pool.acquire();
|
|
216
|
+
worker.on('error', (error) => {
|
|
217
|
+
if (pool.state !== lightning_pool_1.PoolState.CLOSED) {
|
|
218
|
+
console.error('[worker] error:', error);
|
|
219
|
+
hasExitedUnexpectedly = true;
|
|
196
220
|
}
|
|
197
|
-
})
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
if (pool.state === lightning_pool_1.PoolState.IDLE) {
|
|
201
|
-
yield pool.start();
|
|
202
|
-
}
|
|
203
|
-
}));
|
|
204
|
-
compiler.hooks.done.tap(HOOK_NAME, (stats) => tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
205
|
-
if (serverInvalidated) {
|
|
221
|
+
});
|
|
222
|
+
worker.on('exit', async () => {
|
|
223
|
+
hasExitedUnexpectedly = true;
|
|
206
224
|
workerPort = null;
|
|
207
225
|
workerPortPromise = null;
|
|
208
|
-
serverInvalidated = false;
|
|
209
|
-
if (stats.hasErrors()) {
|
|
210
|
-
// всплыли ошибки при сборке - просто игнорим калбек чтобы не падать ниже и дать возможность выполнить пересборку
|
|
211
|
-
return;
|
|
212
|
-
}
|
|
213
226
|
if (worker) {
|
|
214
|
-
|
|
227
|
+
pool.release(worker);
|
|
215
228
|
}
|
|
216
|
-
worker =
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
|
|
223
|
-
|
|
224
|
-
|
|
225
|
-
|
|
226
|
-
|
|
227
|
-
|
|
228
|
-
|
|
229
|
-
|
|
230
|
-
worker = null;
|
|
231
|
-
if (pool.state !== lightning_pool_1.PoolState.CLOSED) {
|
|
232
|
-
console.error(EXITED_UNEXPECTEDLY);
|
|
233
|
-
}
|
|
234
|
-
}));
|
|
235
|
-
worker.once('message', ({ cmd, port }) => {
|
|
236
|
-
if (cmd === 'listen') {
|
|
237
|
-
workerPort = port;
|
|
238
|
-
resolveWorkerPort === null || resolveWorkerPort === void 0 ? void 0 : resolveWorkerPort();
|
|
239
|
-
}
|
|
240
|
-
});
|
|
241
|
-
const script = fs.readFileSync(filename);
|
|
242
|
-
yield send(worker, 'script', { filename: realFilename, script });
|
|
243
|
-
}
|
|
244
|
-
}));
|
|
229
|
+
worker = null;
|
|
230
|
+
if (pool.state !== lightning_pool_1.PoolState.CLOSED) {
|
|
231
|
+
console.error(EXITED_UNEXPECTEDLY);
|
|
232
|
+
}
|
|
233
|
+
});
|
|
234
|
+
worker.once('message', ({ cmd, port }) => {
|
|
235
|
+
if (cmd === 'listen') {
|
|
236
|
+
workerPort = port;
|
|
237
|
+
resolveWorkerPort?.();
|
|
238
|
+
}
|
|
239
|
+
});
|
|
240
|
+
const script = fs.readFileSync(filename);
|
|
241
|
+
await send(worker, 'script', { filename: realFilename, script });
|
|
242
|
+
}
|
|
245
243
|
});
|
|
246
244
|
};
|
|
247
245
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.js","sourceRoot":"","sources":["../../../../src/builder/webpack/devServer/server.ts"],"names":[],"mappings":";;;;AAAA,gFAAgD;AAChD,8EAAiD;AACjD,wDAAwB;AAGxB,0DAA0B;AAC1B,2CAA+C;AAC/C,iDAAiD;AACjD,yGAAwE;AACxE,mDAA2C;AAK3C,8CAA0D;AAC1D,6CAAwD;AACxD,sCAA+C;AAE/C,sCAAgD;AAChD,wEAAqE;AAErE,MAAM,mBAAmB,GAAG;;;;;;;;;CAS3B,CAAC;AASF,MAAM,SAAS,GAAG,WAAW,CAAC;AAEvB,MAAM,YAAY,GAAG,CAAC,EAC3B,EAAE,EACF,MAAM,EACN,QAAQ,EACR,aAAa,EACb,MAAM,GAOP,EAAE,EAAE;IACH,IAAI,CAAC,MAAM,EAAE;QACX,OAAO,cAAI,CAAC;KACb;IACD,0CAA0C;IAC1C,OAAO,
|
|
1
|
+
{"version":3,"file":"server.js","sourceRoot":"","sources":["../../../../src/builder/webpack/devServer/server.ts"],"names":[],"mappings":"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"}
|
|
@@ -34,34 +34,32 @@ const getHotModulePrefix = (configManager) => {
|
|
|
34
34
|
throw new Error(`${configManager.type} is not supported`);
|
|
35
35
|
};
|
|
36
36
|
const createDevServer = ({ di, compiler, configManager, staticServer, }) => {
|
|
37
|
-
return function devServer() {
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
next();
|
|
44
|
-
});
|
|
45
|
-
const devMiddleware = (0, webpack_dev_middleware_1.default)(compiler);
|
|
46
|
-
app.use(getPrefix(configManager), devMiddleware);
|
|
47
|
-
di.register({
|
|
48
|
-
provide: tokens_2.WEBPACK_WATCHING_TOKEN,
|
|
49
|
-
useValue: devMiddleware.context.watching,
|
|
50
|
-
});
|
|
51
|
-
di.register({
|
|
52
|
-
provide: tokens_2.CLOSE_HANDLER_TOKEN,
|
|
53
|
-
multi: true,
|
|
54
|
-
useValue: () => {
|
|
55
|
-
return (0, close_1.close)(compiler);
|
|
56
|
-
},
|
|
57
|
-
});
|
|
58
|
-
if (configManager.hotRefresh.enabled) {
|
|
59
|
-
app.use(getHotModulePrefix(configManager), (0, webpack_hot_middleware_1.default)(compiler, { log: false, statsOptions: { cached: false } }));
|
|
60
|
-
}
|
|
61
|
-
const rootDir = di.get(tokens_1.CONFIG_ROOT_DIR_TOKEN);
|
|
62
|
-
app.use(express_1.default.static(rootDir));
|
|
63
|
-
staticServer.on('request', app);
|
|
37
|
+
return async function devServer() {
|
|
38
|
+
const app = (0, express_1.default)();
|
|
39
|
+
app.use((req, res, next) => {
|
|
40
|
+
res.header('Access-Control-Allow-Origin', '*');
|
|
41
|
+
res.header('Timing-Allow-Origin', '*');
|
|
42
|
+
next();
|
|
64
43
|
});
|
|
44
|
+
const devMiddleware = (0, webpack_dev_middleware_1.default)(compiler);
|
|
45
|
+
app.use(getPrefix(configManager), devMiddleware);
|
|
46
|
+
di.register({
|
|
47
|
+
provide: tokens_2.WEBPACK_WATCHING_TOKEN,
|
|
48
|
+
useValue: devMiddleware.context.watching,
|
|
49
|
+
});
|
|
50
|
+
di.register({
|
|
51
|
+
provide: tokens_2.CLOSE_HANDLER_TOKEN,
|
|
52
|
+
multi: true,
|
|
53
|
+
useValue: () => {
|
|
54
|
+
return (0, close_1.close)(compiler);
|
|
55
|
+
},
|
|
56
|
+
});
|
|
57
|
+
if (configManager.hotRefresh.enabled) {
|
|
58
|
+
app.use(getHotModulePrefix(configManager), (0, webpack_hot_middleware_1.default)(compiler, { log: false, statsOptions: { cached: false } }));
|
|
59
|
+
}
|
|
60
|
+
const rootDir = di.get(tokens_1.CONFIG_ROOT_DIR_TOKEN);
|
|
61
|
+
app.use(express_1.default.static(rootDir));
|
|
62
|
+
staticServer.on('request', app);
|
|
65
63
|
};
|
|
66
64
|
};
|
|
67
65
|
exports.createDevServer = createDevServer;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setup.js","sourceRoot":"","sources":["../../../../src/builder/webpack/devServer/setup.ts"],"names":[],"mappings":";;;;AAAA,8DAA8B;AAE9B,4FAA0D;AAC1D,4FAA0D;AAK1D,+CAA2D;AAC3D,sCAAwE;AACxE,gDAA6C;AAC7C,uDAA+E;AAE/E,MAAM,SAAS,GAAG,CAAC,aAA4B,EAAU,EAAE;IACzD,IAAI,IAAA,wBAAa,EAAC,aAAa,CAAC,EAAE;QAChC,OAAO,GAAG,CAAC;KACZ;IAED,IAAI,IAAA,qBAAU,EAAC,aAAa,CAAC,EAAE;QAC7B,OAAO,IAAI,aAAa,CAAC,IAAI,EAAE,CAAC;KACjC;IAED,IAAI,IAAA,mBAAQ,EAAC,aAAa,CAAC,EAAE;QAC3B,OAAO,IAAI,aAAa,CAAC,IAAI,WAAW,CAAC;KAC1C;IAED,MAAM,IAAI,KAAK,CAAC,GAAG,aAAa,CAAC,IAAI,mBAAmB,CAAC,CAAC;AAC5D,CAAC,CAAC;AAEF,MAAM,kBAAkB,GAAG,CAAC,aAA4B,EAAU,EAAE;IAClE,IAAI,IAAA,wBAAa,EAAC,aAAa,CAAC,EAAE;QAChC,OAAO,IAAI,aAAa,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;KAC1C;IAED,IAAI,IAAA,qBAAU,EAAC,aAAa,CAAC,EAAE;QAC7B,OAAO,IAAI,aAAa,CAAC,IAAI,EAAE,CAAC;KACjC;IAED,IAAI,IAAA,mBAAQ,EAAC,aAAa,CAAC,EAAE;QAC3B,OAAO,IAAI,aAAa,CAAC,IAAI,WAAW,CAAC;KAC1C;IAED,MAAM,IAAI,KAAK,CAAC,GAAG,aAAa,CAAC,IAAI,mBAAmB,CAAC,CAAC;AAC5D,CAAC,CAAC;AAEK,MAAM,eAAe,GAAG,CAAC,EAC9B,EAAE,EACF,QAAQ,EACR,aAAa,EACb,YAAY,GAMb,EAAE,EAAE;IACH,OAAO,
|
|
1
|
+
{"version":3,"file":"setup.js","sourceRoot":"","sources":["../../../../src/builder/webpack/devServer/setup.ts"],"names":[],"mappings":"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"}
|