Merge pull request #26 from bryntum/upgrading-packages

Upgrading packages
bryntum · Jan 16, 2025 · 88ebc8f · 88ebc8f
2 parents d5412e1 + e5a0813
commit 88ebc8f
Show file tree

Hide file tree

Showing 19 changed files with 5,169 additions and 2,412 deletions.
diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml
@@ -24,7 +24,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [14.x, 16.x]
+        node-version: [20.x]
         # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
 
     steps:

diff --git a/Dockerfile b/Dockerfile
@@ -1,6 +1,6 @@
 # Based on https://developers.google.com/web/tools/puppeteer/troubleshooting#running_puppeteer_in_docker
 
-FROM node:16.15.0
+FROM node:20.18.1
 
 RUN apt-get update \
     && apt-get install -y wget gnupg ca-certificates \
@@ -51,5 +51,3 @@ RUN npm i
 EXPOSE 8080 8081
 
 ENTRYPOINT [ "node", "./src/server.js", "-H", "8081" ]
-
-CMD ["bash"]
diff --git a/__tests__/assertions.js b/__tests__/assertions.js
@@ -43,7 +43,7 @@ async function getFile(json, protocol, fileFormat, host, port, timeout) {
         });
 
         request.on('timeout', () => {
-            request.abort();
+            request.destroy();
 
             reject(new Error('timeout'));
         });

diff --git a/__tests__/samples/fileprotocol/data.json b/__tests__/samples/fileprotocol/data.json
@@ -1,6 +1,6 @@
 {
     "html": [
-        { "html" : "<!DOCTYPE html><html class=\"\" style=\"width: 8.25in; height: 11.69in;\"><head><meta content=\"text/html; charset=UTF-8\" http-equiv=\"Content-Type\"/><title></title><link rel=\"stylesheet\" href=\"file:///C:/foo.css\"><link rel=\"stylesheet\" href=\"file:///home/bar.css\"><style>body {background-image: url(\"file:///home/buz.css\");}</style><link rel=\"stylesheet\" href=\"https://bryntum.com/examples/build/grid.stockholm.css?455383\"></head><body></body></html>" }
+        { "html" : "<!DOCTYPE html><html class=\"\" style=\"width: 8.25in; height: 11.69in;\"><head><meta content=\"text/html; charset=UTF-8\" http-equiv=\"Content-Type\"/><title></title><link rel=\"stylesheet\" href=\"file:///C:/foo.css\"><link rel=\"stylesheet\" href=\"file:///home/bar.css\"><style>body {background-image: url(\"file:///home/buz.css\");}</style><link rel=\"stylesheet\" href=\"https://bryntum.com/products/grid/build/grid.stockholm.css?455383\"></head><body></body></html>" }
     ],
     "orientation": "portrait",
     "format": "A4",

diff --git a/__tests__/samples/parallel/parallel2.json b/__tests__/samples/parallel/parallel2.json
diff --git a/__tests__/samples/smoke/base_https.pdf b/__tests__/samples/smoke/base_https.pdf
diff --git a/__tests__/samples/smoke/base_https.pdf.json b/__tests__/samples/smoke/base_https.pdf.json
diff --git a/__tests__/samples/smoke/base_https.png.json b/__tests__/samples/smoke/base_https.png.json
diff --git a/__tests__/smoke.test.js b/__tests__/smoke.test.js
@@ -32,25 +32,25 @@ describe('Should export over HTTP', () => {
         const
             host       = 'localhost',
             protocol   = 'http',
-            port       = 8081,
+            port       = 8082,
             workers    = 1,
             fileFormat = 'pdf';
 
         server = await startServer({ protocol, port, workers, logger : getLoggerConfig('smoke_consequent') });
 
         await assertExportedFile({ protocol, host, port: server.httpPort, fileFormat });
 
-        // Waiting for 30 seconds, export server should kill all idle workers
+        // Waiting for 10 seconds, export server should kill all idle workers
         await new Promise(resolve => {
-            setTimeout(() => resolve(), 30000);
+            setTimeout(() => resolve(), 10000);
         });
 
         const promises = [
             assertExportedFile({ protocol, host, port: server.httpPort, fileFormat }),
             new Promise(resolve => {
                 setTimeout(() => {
                     resolve('timeout');
-                }, 1000 * 60 * 2);
+                }, 1000 * 30);
             })
         ];
 
@@ -59,7 +59,7 @@ describe('Should export over HTTP', () => {
         await Promise.allSettled(promises);
 
         if (winner === 'timeout') {
-            fail('Server have not returned file in 2 minutes');
+            fail('Server have not returned file in 30 seconds');
         }
     });
 });
@@ -69,7 +69,7 @@ describe('Should export over HTTPS', () => {
         test('Should export to PDF', async () => {
             const
                 protocol = 'https',
-                port     = 8081,
+                port     = 8083,
                 workers  = 1;
 
             server = await startServer({ protocol, port, workers, logger : getLoggerConfig('smoke_https_pdf') })

diff --git a/__tests__/utils.js b/__tests__/utils.js
@@ -75,7 +75,7 @@ async function startServer(config = {}) {
         [protocol]       : port,
         'max-workers'    : workers,
         findNextHttpPort : true,
-        chromiumArgs     : isWSL() ? ['--no-sandbox'] : []
+        chromiumArgs     : ['--no-sandbox']
     }, config);
 
     const server = new WebServer(config);