[Gradle, JS] Adopt Gradle plugin to webpack 5

^KT-42921 fixed
This commit is contained in:
Ilya Goncharov
2020-11-14 21:00:53 +03:00
committed by TeamCityServer
parent a06feaf819
commit 1b8c74337e
10 changed files with 42 additions and 30 deletions
@@ -8,11 +8,12 @@ import {runWithFilteringAndConsoleAdapters} from "./src/Adapter";
const kotlin_test = require('kotlin-test');
process.exit = (exitCode) => {
throw new Error(`Exit with ${exitCode}`)
};
const parser = new CliArgsParser(getDefaultCliDescription());
const parser = new CliArgsParser(
getDefaultCliDescription(),
(exitCode) => {
throw new Error(`Exit with ${exitCode}`)
}
);
const untypedArgs = parser.parse(window.__karma__.config.args);
const initialAdapter = kotlin_test.kotlin.test.detectAdapter_8be2vx$();
@@ -3,7 +3,10 @@ import {runWithFilteringAndConsoleAdapters} from "./src/Adapter";
const kotlin_test = require('kotlin-test');
const parser = new CliArgsParser(getDefaultCliDescription());
const parser = new CliArgsParser(
getDefaultCliDescription(),
process.exit
);
const untypedArgs = parser.parse(process.argv);
const initialAdapter = kotlin_test.kotlin.test.detectAdapter_8be2vx$();
@@ -24,6 +24,7 @@
"rollup-plugin-sourcemaps": "^0.4.2",
"rollup-plugin-typescript2": "^0.25.2",
"rollup-plugin-terser": "^5.1.2",
"typescript": "^3.7.2"
"typescript": "^3.7.2",
"format-util": "^1.0.5"
}
}
@@ -27,7 +27,10 @@ export type CliArgDescription = {
}
export class CliArgsParser {
constructor(private description: CliDescription) {
constructor(
private description: CliDescription,
private onFail: (n: number) => never
) {
}
printUsage() {
@@ -59,7 +62,7 @@ export class CliArgsParser {
println(message);
println();
this.printUsage();
process.exit(1)
this.onFail(1)
}
parse(args: string[]): CliArgValues {
@@ -5,7 +5,7 @@
import {KotlinTestRunner} from "./KotlinTestRunner";
import {TeamCityMessageData, TeamCityMessagesFlow} from "./TeamCityMessagesFlow";
import {format} from "util";
const format = require("format-util");
// don't use enum as it is not minified by uglify
export type IgnoredTestSuitesReporting
@@ -26,7 +26,7 @@ export const TYPED_MESSAGE = `##teamcity[message text='%s' type='%s']`
* @see https://confluence.jetbrains.com/display/TCD65/Build+Script+Interaction+with+TeamCity#BuildScriptInteractionwithTeamCity-servMsgsServiceMessages
*/
const util = require('util');
const format = require('format-util');
export function tcEscape(str) {
if (!str) {
@@ -56,5 +56,5 @@ export function formatMessage() {
formattedArguments.push(tcEscape(param));
});
formattedArguments.unshift(tcMessage);
return util.format.apply(util, formattedArguments);
return format(formattedArguments);
}
@@ -33,13 +33,15 @@ class TeamCityErrorPlugin {
apply(compiler) {
compiler.hooks.done.tap('TeamCityErrorPlugin', (stats) => {
const warningsFilters = this.warningsFilter(stats.compilation.options.stats.warningsFilter);
const warningsFilters = this.warningsFilter(stats.compilation.options.ignoreWarnings);
stats.compilation.errors.forEach(error => {
const type = 'error';
if (error instanceof ModuleNotFoundError) {
error.dependencies.forEach(dependency => {
console[type](formatMessage(TYPED_MESSAGE, `Module '${dependency.request}' not found`, type));
const module = error.module;
module.dependencies.forEach(dependency => {
console[type](
formatMessage(TYPED_MESSAGE, `Module '${dependency.request}' not found in '${module.resource}'`, type));
});
return
}
@@ -158,6 +158,11 @@ find-up@^4.0.0:
locate-path "^5.0.0"
path-exists "^4.0.0"
format-util@^1.0.5:
version "1.0.5"
resolved "https://registry.yarnpkg.com/format-util/-/format-util-1.0.5.tgz#1ffb450c8a03e7bccffe40643180918cc297d271"
integrity sha512-varLbTj0e0yVyRpqQhuWV+8hlePAgaoFRhNFj50BNjEIrw1/DphHSObtqwskVCPWNgzwPoQrZAbfa/SBiicNeg==
fs-extra@8.1.0:
version "8.1.0"
resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz#49d43c45a88cd9677668cb7be1b46efdb8d2e1c0"