feat: open editor when clicking error on overlay (#4587)

malcolm-kee · web-flow · commit efb2cec3f8ac · 2022-10-12T19:11:18.000+03:00
diff --git a/client-src/overlay.js b/client-src/overlay.js
@@ -184,7 +184,7 @@ function formatProblem(type, item) {
 // Compilation with errors (e.g. syntax error or missing modules).
 /**
  * @param {string} type
- * @param {Array<string  | { file?: string, moduleName?: string, loc?: string, message?: string }>} messages
+ * @param {Array<string  | { moduleIdentifier?: string, moduleName?: string, loc?: string, message?: string }>} messages
  * @param {string | null} trustedTypesPolicyName
  */
 function show(type, messages, trustedTypesPolicyName) {
@@ -203,6 +203,16 @@ function show(type, messages, trustedTypesPolicyName) {
       typeElement.innerText = header;
       applyStyle(typeElement, msgTypeStyle);
 
+      if (message.moduleIdentifier) {
+        applyStyle(typeElement, { cursor: "pointer" });
+        typeElement.dataset.canOpen = true;
+        typeElement.addEventListener("click", () => {
+          fetch(
+            `/webpack-dev-server/open-editor?fileName=${message.moduleIdentifier}`
+          );
+        });
+      }
+
       // Make it look similar to our terminal.
       const text = ansiHTML(encode(body));
       const messageTextNode = document.createElement("div");
diff --git a/examples/client/overlay/app.js b/examples/client/overlay/app.js
@@ -2,5 +2,9 @@
 
 const target = document.querySelector("#target");
 
+// eslint-disable-next-line import/no-unresolved, import/extensions
+const invalid = require("./invalid.js");
+
+console.log(invalid);
 target.classList.add("pass");
 target.innerHTML = "Success!";
diff --git a/examples/client/overlay/webpack.config.js b/examples/client/overlay/webpack.config.js
@@ -7,7 +7,7 @@ const { setup } = require("../../util");
 module.exports = setup({
   context: __dirname,
   // create error for overlay
-  entry: "./invalid.js",
+  entry: "./app.js",
   devServer: {
     client: {
       overlay: true,
diff --git a/lib/Server.js b/lib/Server.js
@@ -2033,6 +2033,19 @@ class Server {
       }
     );
 
+    /** @type {import("express").Application} */
+    (app).get("/webpack-dev-server/open-editor", (req, res) => {
+      const fileName = req.query.fileName;
+
+      if (typeof fileName === "string") {
+        // @ts-ignore
+        const launchEditor = require("launch-editor");
+        launchEditor(fileName);
+      }
+
+      res.end();
+    });
+
     /** @type {import("express").Application} */
     (app).get(
       "/webpack-dev-server",
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -63,6 +63,7 @@
     "html-entities": "^2.3.2",
     "http-proxy-middleware": "^2.0.3",
     "ipaddr.js": "^2.0.1",
+    "launch-editor": "^2.6.0",
     "open": "^8.0.9",
     "p-retry": "^4.5.0",
     "rimraf": "^3.0.2",
@@ -126,6 +127,7 @@
     "tcp-port-used": "^1.0.2",
     "typescript": "^4.7.2",
     "url-loader": "^4.1.1",
+    "wait-for-expect": "^3.0.2",
     "webpack": "^5.71.0",
     "webpack-cli": "^4.7.2",
     "webpack-merge": "^5.8.0"
diff --git a/test/e2e/__snapshots__/overlay.test.js.snap.webpack5 b/test/e2e/__snapshots__/overlay.test.js.snap.webpack5
@@ -90,11 +90,13 @@ exports[`overlay should not show initially, then show on an error and allow to c
       \\"
     >
       <div
+        data-can-open=\\"true\\"
         style=\\"
           color: rgb(232, 59, 70);
           font-size: 1.2em;
           margin-bottom: 1rem;
           font-family: sans-serif;
+          cursor: pointer;
         \\"
       >
         ERROR in ./foo.js 1:1
@@ -212,11 +214,13 @@ exports[`overlay should not show initially, then show on an error, then hide on
       \\"
     >
       <div
+        data-can-open=\\"true\\"
         style=\\"
           color: rgb(232, 59, 70);
           font-size: 1.2em;
           margin-bottom: 1rem;
           font-family: sans-serif;
+          cursor: pointer;
         \\"
       >
         ERROR in ./foo.js 1:1
@@ -334,11 +338,13 @@ exports[`overlay should not show initially, then show on an error, then show oth
       \\"
     >
       <div
+        data-can-open=\\"true\\"
         style=\\"
           color: rgb(232, 59, 70);
           font-size: 1.2em;
           margin-bottom: 1rem;
           font-family: sans-serif;
+          cursor: pointer;
         \\"
       >
         ERROR in ./foo.js 1:1
@@ -419,11 +425,13 @@ exports[`overlay should not show initially, then show on an error, then show oth
       \\"
     >
       <div
+        data-can-open=\\"true\\"
         style=\\"
           color: rgb(232, 59, 70);
           font-size: 1.2em;
           margin-bottom: 1rem;
           font-family: sans-serif;
+          cursor: pointer;
         \\"
       >
         ERROR in ./foo.js 1:1
diff --git a/test/e2e/overlay.test.js b/test/e2e/overlay.test.js
@@ -4,6 +4,7 @@ const path = require("path");
 const fs = require("graceful-fs");
 const prettier = require("prettier");
 const webpack = require("webpack");
+const waitForExpect = require("wait-for-expect");
 const Server = require("../../lib/Server");
 const config = require("../fixtures/overlay-config/webpack.config");
 const trustedTypesConfig = require("../fixtures/overlay-config/trusted-types.webpack.config");
@@ -478,6 +479,55 @@ describe("overlay", () => {
     await server.stop();
   });
 
+  (isWebpack5 ? it : it.skip)(
+    "should open editor when error with file info is clicked",
+    async () => {
+      const mockLaunchEditorCb = jest.fn();
+      jest.mock("launch-editor", () => mockLaunchEditorCb);
+
+      const compiler = webpack(config);
+      const devServerOptions = {
+        port,
+      };
+      const server = new Server(devServerOptions, compiler);
+
+      await server.start();
+
+      const { page, browser } = await runBrowser();
+
+      await page.goto(`http://localhost:${port}/`, {
+        waitUntil: "networkidle0",
+      });
+
+      const pathToFile = path.resolve(
+        __dirname,
+        "../fixtures/overlay-config/foo.js"
+      );
+      const originalCode = fs.readFileSync(pathToFile);
+
+      fs.writeFileSync(pathToFile, "`;");
+
+      await page.waitForSelector("#webpack-dev-server-client-overlay");
+
+      const frame = page
+        .frames()
+        .find((item) => item.name() === "webpack-dev-server-client-overlay");
+
+      const errorHandle = await frame.$("[data-can-open]");
+
+      await errorHandle.click();
+
+      await waitForExpect(() => {
+        expect(mockLaunchEditorCb).toHaveBeenCalledTimes(1);
+      });
+
+      fs.writeFileSync(pathToFile, originalCode);
+
+      await browser.close();
+      await server.stop();
+    }
+  );
+
   it('should not show a warning when "client.overlay" is "false"', async () => {
     const compiler = webpack(config);
 
diff --git a/test/helpers/run-browser.js b/test/helpers/run-browser.js
@@ -3,6 +3,16 @@
 const puppeteer = require("puppeteer");
 const { puppeteerArgs } = require("./puppeteer-constants");
 
+/**
+ * @typedef {Object} RunBrowserResult
+ * @property {import('puppeteer').Page} page
+ * @property {import('puppeteer').Browser} browser
+ */
+
+/**
+ * @param {Parameters<import('puppeteer').Page['emulate']>[0]} config
+ * @returns {Promise<RunBrowserResult>}
+ */
 function runBrowser(config) {
   const options = {
     viewport: {
@@ -14,7 +24,13 @@ function runBrowser(config) {
   };
 
   return new Promise((resolve, reject) => {
+    /**
+     * @type {import('puppeteer').Page}
+     */
     let page;
+    /**
+     * @type {import('puppeteer').Browser}
+     */
     let browser;
 
     puppeteer
