Merge branch 'main' into webpack5fix

Author: SimenB

.github/workflows/node.js.yml

@@ -10,11 +10,14 @@ on:
 
 jobs:
   test-node:
-    name: Test on Node.js v${{ matrix.node-version }}
+    name:
+      # prettier-ignore
+      Test on Node.js v${{ matrix.node-version }} and html-webpack-plugin v${{ matrix.html-plugin-version }}
     strategy:
       fail-fast: false
       matrix:
         node-version: [6.x, 8.x, 10.x, 12.x, 14.x, 15.x]
+        html-plugin-version: [3, 4]
     runs-on: ubuntu-latest
 
     steps:
@@ -35,10 +38,14 @@ jobs:
         uses: actions/setup-node@v2
         with:
           node-version: ${{ matrix.node-version }}
-      - run: yarn
+      - name: install with html-webpack-plugin v${{matrix.html-plugin-version }}
+        run: |
+          yarn
+          yarn add --dev html-webpack-plugin@${{matrix.html-plugin-version }}
       - name: run tests
-        run: yarn travis
+        run: yarn cover
       - uses: codecov/codecov-action@v1
+        if: ${{ matrix.html-plugin-version == 4 }}
   test-os:
     name: Test on ${{ matrix.os }} using Node.js LTS
     strategy:
@@ -64,14 +71,35 @@ jobs:
           node-version: 14.x
       - run: yarn
       - name: run tests
-        run: yarn travis
+        run: yarn cover
+  lint:
+    name: Run ESLint using Node.js LTS
+    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
+      - run: yarn
+      - run: yarn lint
 
   release:
     if:
       # prettier-ignore
       ${{ github.event_name == 'push' && github.event.ref == 'refs/heads/main' }}
     name: Release new version
-    needs: [test-node, test-os]
+    needs: [lint, test-node, test-os]
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2

package.json

@@ -9,6 +9,7 @@
   "main": "lib/index.js",
   "scripts": {
     "clean": "del-cli lib/ coverage/ example/*/build example/*/dist",
+    "prebuild": "npm run clean",
     "build": "babel src/ --out-dir lib/",
     "postbuild": "prettier lib/* --write",
     "cover": "jest --coverage",
@@ -21,9 +22,7 @@
     "build-and-update-license": "npm run build && npm run update-license",
     "prepublishOnly": "npm run build",
     "pretest": "npm run lint",
-    "test": "jest",
-    "pretravis": "npm run lint && npm run clean",
-    "travis": "npm run cover"
+    "test": "jest"
   },
   "repository": "SimenB/add-asset-html-webpack-plugin",
   "keywords": [