Skip to content

Commit fa79731

Browse files
alexander-akaitalexander-akait
committed
test: debug
1 parent d754291 commit fa79731

3 files changed

Lines changed: 40 additions & 69 deletions

File tree

‎src/index.js‎

Lines changed: 5 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -199,10 +199,10 @@ const noop = () => {};
199199
* @returns {API<RequestInternal, ResponseInternal>} webpack dev middleware
200200
*/
201201
function wdm(compiler, options = {}, isPlugin = false) {
202-
// validate(/** @type {Schema} */ (schema), options, {
203-
// name: "Dev Middleware",
204-
// baseDataPath: "options",
205-
// });
202+
validate(/** @type {Schema} */ (schema), options, {
203+
name: "Dev Middleware",
204+
baseDataPath: "options",
205+
});
206206

207207
const { mimeTypes } = options;
208208

@@ -539,7 +539,7 @@ wdm.koaWrapper = koaWrapper;
539539
* @template {IncomingMessage} [RequestInternal=IncomingMessage]
540540
* @template {ServerResponse} [ResponseInternal=ServerResponse]
541541
* @param {Compiler | MultiCompiler} compiler compiler
542-
* @param {Options<RequestInternal, ResponseInternal> & { debug?: boolean }=} options options
542+
* @param {Options<RequestInternal, ResponseInternal>=} options options
543543
* @param {boolean=} usePlugin true when need to use as a plugin, otherwise false
544544
* @returns {(ctx: EXPECTED_ANY, next: EXPECTED_FUNCTION) => Promise<void> | void} hono wrapper
545545
*/
@@ -639,20 +639,12 @@ function honoWrapper(compiler, options = {}, usePlugin = false) {
639639
* @param {import("fs").ReadStream} stream readable stream
640640
*/
641641
res.stream = (stream) => {
642-
if (options.writeToDisk === true && options.debug) {
643-
console.error(stream);
644-
}
645-
646642
let isResolved = false;
647643

648644
/**
649645
* @param {Error=} err err
650646
*/
651647
const onEvent = (err) => {
652-
if (options.writeToDisk === true && options.debug) {
653-
console.error("onEvent", err);
654-
}
655-
656648
if (isResolved) return;
657649
isResolved = true;
658650

@@ -669,10 +661,6 @@ function honoWrapper(compiler, options = {}, usePlugin = false) {
669661
body = stream;
670662
isFinished = true;
671663

672-
if (options.writeToDisk === true && options.debug) {
673-
console.error("resolve", isFinished);
674-
}
675-
676664
resolve();
677665
};
678666

@@ -729,10 +717,6 @@ function honoWrapper(compiler, options = {}, usePlugin = false) {
729717
},
730718
);
731719
} catch (err) {
732-
if (options.writeToDisk === true && options.debug) {
733-
console.error("catch", err);
734-
}
735-
736720
if (options?.forwardError) {
737721
await next();
738722

@@ -744,18 +728,10 @@ function honoWrapper(compiler, options = {}, usePlugin = false) {
744728
return context.json({ message: /** @type {Error} */ (err).message });
745729
}
746730

747-
if (options.writeToDisk === true && options.debug) {
748-
console.error("body", body);
749-
}
750-
751731
if (typeof body !== "undefined") {
752732
return context.body(body, status);
753733
}
754734

755-
if (options.writeToDisk === true && options.debug) {
756-
console.error("next");
757-
}
758-
759735
await next();
760736
}
761737

‎test/middleware.test.js‎

Lines changed: 34 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -4255,7 +4255,7 @@ describe.each([
42554255
name,
42564256
framework,
42574257
compiler,
4258-
{ writeToDisk: true, debug: true },
4258+
{ writeToDisk: true },
42594259
);
42604260
});
42614261

@@ -4283,22 +4283,20 @@ describe.each([
42834283
(hook) => hook.name === "DevMiddleware",
42844284
),
42854285
).toHaveLength(0);
4286-
expect(fs.existsSync(bundlePath)).toBe(true);
42874286

4288-
instance.invalidate();
4287+
expect(fs.existsSync(bundlePath)).toBe(true);
42894288

4290-
return compiler.hooks.done.tap(
4291-
"DevMiddlewareWriteToDiskTest",
4292-
() => {
4293-
expect(
4294-
compiler.hooks.assetEmitted.taps.filter(
4295-
(hook) => hook.name === "DevMiddleware",
4296-
),
4297-
).toHaveLength(0);
4289+
compiler.hooks.done.tap("DevMiddlewareWriteToDiskTest", () => {
4290+
expect(
4291+
compiler.hooks.assetEmitted.taps.filter(
4292+
(hook) => hook.name === "DevMiddleware",
4293+
),
4294+
).toHaveLength(0);
4295+
});
42984296

4299-
done();
4300-
},
4301-
);
4297+
instance.invalidate(() => {
4298+
done();
4299+
});
43024300
});
43034301
});
43044302

@@ -4380,20 +4378,19 @@ describe.each([
43804378
).toHaveLength(0);
43814379
expect(fs.existsSync(bundlePath)).toBe(true);
43824380

4383-
instance.invalidate();
4381+
compiler.hooks.done.tap("DevMiddlewareWriteToDiskTest", () => {
4382+
expect(
4383+
compiler.hooks.assetEmitted.taps.filter(
4384+
(hook) => hook.name === "DevMiddleware",
4385+
),
4386+
).toHaveLength(0);
43844387

4385-
return compiler.hooks.done.tap(
4386-
"DevMiddlewareWriteToDiskTest",
4387-
() => {
4388-
expect(
4389-
compiler.hooks.assetEmitted.taps.filter(
4390-
(hook) => hook.name === "DevMiddleware",
4391-
),
4392-
).toHaveLength(0);
4388+
done();
4389+
});
43934390

4394-
done();
4395-
},
4396-
);
4391+
instance.invalidate(() => {
4392+
done();
4393+
});
43974394
});
43984395
});
43994396
});
@@ -4440,20 +4437,19 @@ describe.each([
44404437
).toHaveLength(0);
44414438
expect(fs.existsSync(bundlePath)).toBe(false);
44424439

4443-
instance.invalidate();
4440+
compiler.hooks.done.tap("DevMiddlewareWriteToDiskTest", () => {
4441+
expect(
4442+
compiler.hooks.assetEmitted.taps.filter(
4443+
(hook) => hook.name === "DevMiddleware",
4444+
),
4445+
).toHaveLength(0);
44444446

4445-
return compiler.hooks.done.tap(
4446-
"DevMiddlewareWriteToDiskTest",
4447-
() => {
4448-
expect(
4449-
compiler.hooks.assetEmitted.taps.filter(
4450-
(hook) => hook.name === "DevMiddleware",
4451-
),
4452-
).toHaveLength(0);
4447+
done();
4448+
});
44534449

4454-
done();
4455-
},
4456-
);
4450+
instance.invalidate(() => {
4451+
done();
4452+
});
44574453
});
44584454
});
44594455
});

‎test/validation-options.test.js‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@ const configuredFs = createFsFromVolume(new Volume());
1313

1414
configuredFs.join = path.join.bind(path);
1515

16-
// eslint-disable-next-line jest/no-disabled-tests
17-
describe.skip("validation", () => {
16+
describe("validation", () => {
1817
const cases = {
1918
mimeTypes: {
2019
success: [{ phtml: ["text/html"] }],

0 commit comments

Comments
 (0)