Skip to content

Commit 002b04f

Browse files
niieaniniieani
committed
no need for is-ci package + use stderr for live printing
1 parent f581ce3 commit 002b04f

File tree

7 files changed

+19
-24
lines changed

7 files changed

+19
-24
lines changed

‎package.json‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@
4545
"file-loader": "^1.1.6",
4646
"glob": "^7.1.2",
4747
"i18n-webpack-plugin": "^1.0.0",
48-
"is-ci": "1.1.0",
4948
"istanbul": "^0.4.5",
5049
"jade": "^1.11.0",
5150
"jade-loader": "~0.8.0",

‎test/BenchmarkTestCases.benchmark.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,7 @@ describe("BenchmarkTestCases", function() {
300300
if (!config.output.path) config.output.path = outputDirectory;
301301
runBenchmark(baseline.webpack, config, (err, stats) => {
302302
if (err) return done(err);
303-
console.log(` ${baseline.name} ${stats.text}`);
303+
process.stderr.write(` ${baseline.name} ${stats.text}`);
304304
if (baseline.name === "HEAD") headStats = stats;
305305
else baselineStats = stats;
306306
done();
@@ -328,7 +328,7 @@ describe("BenchmarkTestCases", function() {
328328
if (!config.output.path) config.output.path = outputDirectory;
329329
runBenchmark(baseline.webpack, config, (err, stats) => {
330330
if (err) return done(err);
331-
console.log(` ${baseline.name} ${stats.text}`);
331+
process.stderr.write(` ${baseline.name} ${stats.text}`);
332332
if (baseline.name === "HEAD") headStats = stats;
333333
else baselineStats = stats;
334334
done();

‎test/ConfigTestCases.test.js‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ const fs = require("fs");
66
const vm = require("vm");
77
const mkdirp = require("mkdirp");
88
const checkArrayExpectation = require("./checkArrayExpectation");
9-
const isCi = require("is-ci");
109

1110
const Stats = require("../lib/Stats");
1211
const webpack = require("../lib/webpack");
@@ -104,8 +103,8 @@ describe("ConfigTestCases", () => {
104103
}
105104

106105
const compilationName = `config/${category.name}/${testName}`;
107-
if (isCi) {
108-
process.stdout.write(`[COMPILING] ${compilationName}\n`);
106+
if (process.env.CI) {
107+
process.stderr.write(`[COMPILING] ${compilationName}\n`);
109108
}
110109
webpack(options, (err, stats) => {
111110
if (err) {
@@ -125,8 +124,8 @@ describe("ConfigTestCases", () => {
125124
// Wait for uncaught errors to occur
126125
return setTimeout(done, 200);
127126
}
128-
if (isCi) {
129-
process.stdout.write(`[COMPILED] ${compilationName}\n`);
127+
if (process.env.CI) {
128+
process.stderr.write(`[COMPILED] ${compilationName}\n`);
130129
}
131130
const statOptions = Stats.presetToOptions("verbose");
132131
statOptions.colors = false;

‎test/HotTestCases.test.js‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ const path = require("path");
55
const fs = require("fs");
66
const vm = require("vm");
77
const checkArrayExpectation = require("./checkArrayExpectation");
8-
const isCi = require("is-ci");
98

109
const webpack = require("../lib/webpack");
1110

@@ -82,13 +81,13 @@ describe("HotTestCases", () => {
8281
const compilationName = `HotTestCases/${
8382
category.name
8483
}/${testName}`;
85-
if (isCi) {
86-
process.stdout.write(`[COMPILING] ${compilationName}\n`);
84+
if (process.env.CI) {
85+
process.stderr.write(`[COMPILING] ${compilationName}\n`);
8786
}
8887
compiler.run((err, stats) => {
8988
if (err) return done(err);
90-
if (isCi) {
91-
process.stdout.write(`[COMPILED] ${compilationName}\n`);
89+
if (process.env.CI) {
90+
process.stderr.write(`[COMPILED] ${compilationName}\n`);
9291
}
9392
const jsonStats = stats.toJson({
9493
errorDetails: true

‎test/TestCases.template.js‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ const vm = require("vm");
77
const mkdirp = require("mkdirp");
88
const UglifyJsPlugin = require("uglifyjs-webpack-plugin");
99
const checkArrayExpectation = require("./checkArrayExpectation");
10-
const isCi = require("is-ci");
1110

1211
const Stats = require("../lib/Stats");
1312
const webpack = require("../lib/webpack");
@@ -168,13 +167,13 @@ const describeCases = config => {
168167
const compilationName = `${config.name}/${
169168
category.name
170169
}/${testName}`;
171-
if (isCi) {
172-
process.stdout.write(`[COMPILING] ${compilationName}\n`);
170+
if (process.env.CI) {
171+
process.stderr.write(`[COMPILING] ${compilationName}\n`);
173172
}
174173
webpack(options, (err, stats) => {
175174
if (err) done(err);
176-
if (isCi) {
177-
process.stdout.write(`[COMPILED] ${compilationName}\n`);
175+
if (process.env.CI) {
176+
process.stderr.write(`[COMPILED] ${compilationName}\n`);
178177
}
179178
const statOptions = Stats.presetToOptions("verbose");
180179
statOptions.colors = false;

‎test/WatchTestCases.test.js‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ const vm = require("vm");
77
const mkdirp = require("mkdirp");
88
const checkArrayExpectation = require("./checkArrayExpectation");
99
const { remove } = require("./helpers/remove");
10-
const isCi = require("is-ci");
1110

1211
const Stats = require("../lib/Stats");
1312
const webpack = require("../lib/webpack");
@@ -125,8 +124,8 @@ describe("WatchTestCases", () => {
125124
copyDiff(path.join(testDirectory, run.name), tempDirectory);
126125

127126
const compilationName = `watch/${category.name}/${testName}`;
128-
if (isCi) {
129-
process.stdout.write(`[COMPILING] ${compilationName}\n`);
127+
if (process.env.CI) {
128+
process.stderr.write(`[COMPILING] ${compilationName}\n`);
130129
}
131130

132131
setTimeout(() => {
@@ -165,8 +164,8 @@ describe("WatchTestCases", () => {
165164
if (waitMode) return;
166165
run.done = true;
167166
if (err) return done(err);
168-
if (isCi) {
169-
process.stdout.write(`[COMPILED] ${compilationName}\n`);
167+
if (process.env.CI) {
168+
process.stderr.write(`[COMPILED] ${compilationName}\n`);
170169
}
171170
const statOptions = Stats.presetToOptions("verbose");
172171
statOptions.colors = false;

‎yarn.lock‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2595,7 +2595,7 @@ is-callable@^1.1.1, is-callable@^1.1.3:
25952595
version "1.1.3"
25962596
resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.3.tgz#86eb75392805ddc33af71c92a0eedf74ee7604b2"
25972597

2598-
is-ci@1.1.0, is-ci@^1.0.10:
2598+
is-ci@^1.0.10:
25992599
version "1.1.0"
26002600
resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-1.1.0.tgz#247e4162e7860cebbdaf30b774d6b0ac7dcfe7a5"
26012601
dependencies:

0 commit comments

Comments
 (0)