Merge branch 'main' into webpack5fix

Author: SimenB

.github/workflows/node.js.yml

@@ -10,9 +10,7 @@ on:
 
 jobs:
   test-node:
-    name:
-      # prettier-ignore
-      Test on Node.js v${{ matrix.node-version }} and html-webpack-plugin v${{ matrix.html-plugin-version }} and webpack v${{ matrix.webpack-version }}
+    name: Test on Node.js v${{ matrix.node-version }} and html-webpack-plugin v${{ matrix.html-plugin-version }} and webpack v${{ matrix.webpack-version }}
     strategy:
       fail-fast: false
       matrix:
@@ -35,6 +33,15 @@ jobs:
             webpack-version: 5
           - node-version: 8.x
             html-plugin-version: 5
+        include:
+          - node-version: 10.x
+            install-puppeteer: true
+          - node-version: 12.x
+            install-puppeteer: true
+          - node-version: 14.x
+            install-puppeteer: true
+          - node-version: 15.x
+            install-puppeteer: true
     runs-on: ubuntu-latest
 
     steps:
@@ -55,13 +62,17 @@ jobs:
         uses: actions/setup-node@v2
         with:
           node-version: ${{ matrix.node-version }}
-      # prettier-ignore
       - name: install with html-webpack-plugin v${{matrix.html-plugin-version }} and webpack v${{ matrix.webpack-version }}
         run: |
           yarn
           yarn add --dev html-webpack-plugin@${{matrix.html-plugin-version }} webpack@${{ matrix.webpack-version }}
           git checkout yarn.lock
-
+      - name: install puppeteer
+        if: ${{ matrix.install-puppeteer }}
+        run: |
+          yarn add --dev puppeteer
+          yarn example
+          git checkout yarn.lock
       - name: run tests
         run: yarn cover
       - uses: codecov/codecov-action@v1
@@ -90,36 +101,13 @@ jobs:
         with:
           node-version: 14.x
       - run: yarn
-      - name: run tests
-        run: yarn cover
-  test-browser:
-    name: Test DLL example with Puppeteer
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v2
-      - name: Get yarn cache directory path
-        id: yarn-cache-dir-path
-        run: echo "::set-output name=dir::$(yarn cache dir)"
-      - uses: actions/cache@v2
-        id: yarn-cache
-        with:
-          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
-          key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-yarn-
-      - uses: actions/[email protected]
-        with:
-          node-version: 14.x
       - name: install puppeteer
         run: |
-          yarn
           yarn add --dev puppeteer
+          yarn example
           git checkout yarn.lock
-      - name: run examples
-        run: yarn example
       - name: run tests
-        run: yarn jest
+        run: yarn cover
   lint:
     name: Run ESLint using Node.js LTS
     runs-on: ubuntu-latest
@@ -143,11 +131,9 @@ jobs:
       - run: yarn lint
 
   release:
-    if:
-      # prettier-ignore
-      ${{ github.event_name == 'push' && github.event.ref == 'refs/heads/main' }}
+    if: ${{ github.event_name == 'push' && github.event.ref == 'refs/heads/main' }}
     name: Release new version
-    needs: [lint, test-node, test-os, test-browser]
+    needs: [lint, test-node, test-os]
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2

package.json

@@ -121,6 +121,12 @@
         "options": {
           "trailingComma": "es5"
         }
+      },
+      {
+        "files": ".github/workflows/**/*.yml",
+        "options": {
+          "printWidth": 175
+        }
       }
     ]
   },

puppeteer.test.js

@@ -9,7 +9,7 @@ let browser;
 
 (() => {
   try {
-    // eslint-disable-next-line global-require,import/no-unresolved
+    // eslint-disable-next-line global-require,import/no-unresolved,import/no-extraneous-dependencies
     puppeteer = require('puppeteer');
   } catch (error) {
     if (error.code !== 'MODULE_NOT_FOUND') {