Remove express dependency (#2242)

ghostery · Sep 22, 2021 · 2d76797 · 2d76797
1 parent 4a1a83b
commit 2d76797
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 401 deletions.
diff --git a/packages/adblocker-electron-preload/package.json b/packages/adblocker-electron-preload/package.json
@@ -33,7 +33,7 @@
     "prepack": "yarn run bundle"
   },
   "peerDependencies": {
-    "electron": "11.x || 12.x || 13.x"
+    "electron": ">11"
   },
   "dependencies": {
     "@cliqz/adblocker-content": "^1.22.6"

diff --git a/packages/adblocker-puppeteer/package.json b/packages/adblocker-puppeteer/package.json
@@ -43,10 +43,8 @@
   },
   "devDependencies": {
     "@types/chai": "^4.2.18",
-    "@types/express": "^4.17.11",
     "@types/mocha": "^9.0.0",
     "chai": "^4.2.0",
-    "express": "^4.17.1",
     "mocha": "^9.0.0",
     "nyc": "^15.0.0",
     "puppeteer": "10.4.0",

diff --git a/packages/adblocker-puppeteer/test/adblocker.test.ts b/packages/adblocker-puppeteer/test/adblocker.test.ts
@@ -2,10 +2,13 @@ import { expect } from 'chai';
 import 'mocha';
 
 import * as puppeteer from 'puppeteer';
-import * as express from 'express';
-import { Server } from 'http';
+import * as http from 'http';
 
-import { fromPuppeteerDetails, getHostnameHashesFromLabelsBackward, PuppeteerBlocker } from '../adblocker';
+import {
+  fromPuppeteerDetails,
+  getHostnameHashesFromLabelsBackward,
+  PuppeteerBlocker,
+} from '../adblocker';
 import { AddressInfo } from 'net';
 
 describe('#fromPuppeteerDetails', () => {
@@ -41,21 +44,24 @@ describe('#fromPuppeteerDetails', () => {
 });
 
 describe('#stylesInjection', () => {
-  let server: Server;
+  let server: http.Server;
   let port: number;
   let browser: puppeteer.Browser;
   let page: puppeteer.Page;
 
   before(async () => {
-    const app = express();
-    app.get('/', (_req: any, res: any) => {
-      res.send('<html><title>Empty test HTML</title></html>');
-    });
-    server = app.listen(0, () => {
-      const addressInfo = server.address() as AddressInfo;
-      port = addressInfo.port;
-      console.log('Test server listening on port', port);
-    });
+    server = http
+      .createServer((req, res) => {
+        if (req.method === 'GET') {
+          res.writeHead(200, { 'Content-Type': 'text/html' });
+          res.end('<html><title>Empty test HTML</title></html>');
+        }
+      })
+      .listen(0, () => {
+        const addressInfo = server.address() as AddressInfo;
+        port = addressInfo.port;
+        console.log('Test server listening on port', port);
+      });
     browser = await puppeteer.launch();
     console.log('Puppeteer browser launched.');
     page = await browser.newPage();
@@ -68,11 +74,11 @@ describe('#stylesInjection', () => {
     const blocker = await PuppeteerBlocker.parse('###Meebo\\:AdElement\\.Root');
 
     await blocker.enableBlockingInPage(page);
-    await page.goto(url, {waitUntil: 'networkidle2'});
+    await page.goto(url, { waitUntil: 'networkidle2' });
     const contentWithoutAds = await page.content();
 
     await blocker.disableBlockingInPage(page);
-    await page.goto(url, {waitUntil: 'networkidle2'});
+    await page.goto(url, { waitUntil: 'networkidle2' });
     const content = await page.content();
 
     expect(contentWithoutAds).to.contain(stylesInjectionPrefix);
@@ -85,7 +91,7 @@ describe('#stylesInjection', () => {
     await browser.close();
     console.log('Puppeteer browser closed.');
     server.close(() => {
-      console.log('Test server closed.')
+      console.log('Test server closed.');
     });
   });
 });