#24 fixed webpack-cli version and mergify config

owlbeardm · Dec 30, 2020 · 2241baf · 2241baf
1 parent e12ccc5
commit 2241baf
Show file tree

Hide file tree

Showing 3 changed files with 201 additions and 260 deletions.
diff --git a/.mergify.yml b/.mergify.yml
@@ -2,7 +2,7 @@ pull_request_rules:
   - name: automatic merge for Dependabot pull requests
     conditions:
       - author=dependabot[bot]
-      #- status-success=Travis CI - Pull Request
+      - check-success=Travis CI - Pull Request
       - base=develop
     actions:
       merge:
@@ -13,7 +13,7 @@ pull_request_rules:
   - name: automatic merge for Dependabot preview pull requests
     conditions:
       - author=dependabot-preview[bot]
-      #- status-success=Travis CI - Pull Request
+      - check-success=Travis CI - Pull Request
       - base=develop
     actions:
       merge:

diff --git a/package.json b/package.json
@@ -55,8 +55,8 @@
     "terser-webpack-plugin": "^4.2.3",
     "uglifyjs-webpack-plugin": "^2.2.0",
     "webpack": "^4.44.2",
-    "webpack-cli": "^4.3.0",
-    "webpack-dev-server": "^3.10.3"
+    "webpack-cli": "3.3.12",
+    "webpack-dev-server": "^3.11.1"
   },
   "jest": {
     "moduleNameMapper": {