Prepared 1.1.0 Release

CHANGELOG.md

@@ -5,13 +5,13 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
-<<<<<<< HEAD
+
+## [1.1.0] - 2021-03-04
 ### Added
 - Ignore diagnostics for files using `phpCodeSniffer.ignorePatterns` option.
-=======
+
 ### Fixed
 - "Ignore * for this line" action should be present for all diagnostics.
->>>>>>> f8802f9 (Fixed "Ignore * for this line" Actions)
 
 ## [1.0.0] - 2021-03-01
 ### Fixed

package.json

@@ -2,7 +2,7 @@
   "name": "vscode-php-codesniffer",
   "displayName": "PHP_CodeSniffer",
   "description": "Brings PHPCS support to VS Code.",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "license": "GPL-2.0-or-later",
   "author": "Christopher Allford",
   "repository": {
@@ -48,7 +48,9 @@
         "phpCodeSniffer.ignorePatterns": {
           "type": "array",
           "description": "An array of regular expressions for paths that should be ignored by the extension.",
-          "default": [ ".*/vendor/.*" ],
+          "default": [
+            ".*/vendor/.*"
+          ],
           "items": {
             "type": "string"
           },
@@ -92,16 +94,16 @@
   "devDependencies": {
     "@types/jest": "^26.0.20",
     "@types/node": "^12.20.4",
-    "@types/vscode": "^1.53.0",
+    "@types/vscode": "~1.53.0",
     "@typescript-eslint/eslint-plugin": "^4.16.1",
     "@typescript-eslint/parser": "^4.16.1",
     "eslint": "^7.21.0",
     "file-loader": "^6.2.0",
     "jest": "^26.6.3",
-    "ts-jest": "^26.5.2",
+    "ts-jest": "^26.5.3",
     "ts-loader": "^8.0.17",
-    "typescript": "^4.2.2",
-    "webpack": "^5.24.2",
+    "typescript": "^4.2.3",
+    "webpack": "^5.24.3",
     "webpack-cli": "^4.5.0"
   },
   "scripts": {