Merge remote-tracking branch 'origin/master' into alpha

.github/dependabot.yml

@@ -9,4 +9,3 @@ updates:
       versioning-strategy: increase
       labels:
           - 'dependencies'
-          - 'automerge'

.github/workflows/codeql-analysis.yml

@@ -0,0 +1,36 @@
+name: 'CodeQL'
+
+on:
+    push:
+        branches: [master, alpha, beta, next]
+    pull_request:
+        # The branches below must be a subset of the branches above
+        branches: [master, alpha, beta, next]
+    schedule:
+        - cron: '32 23 * * 0'
+
+jobs:
+    analyze:
+        name: Analyze
+        runs-on: ubuntu-latest
+
+        strategy:
+            fail-fast: false
+            matrix:
+                language: ['javascript']
+
+        steps:
+            - name: Checkout repository
+              uses: actions/checkout@v2
+
+            # Initializes the CodeQL tools for scanning.
+            - name: Initialize CodeQL
+              uses: github/codeql-action/init@v1
+              with:
+                  languages: ${{ matrix.language }}
+
+            - name: Autobuild
+              uses: github/codeql-action/autobuild@v1
+
+            - name: Perform CodeQL Analysis
+              uses: github/codeql-action/analyze@v1

CHANGELOG.md

@@ -1,30 +1,26 @@
-# [8.0.0-alpha.3](https://github.com/dhis2/cli-style/compare/v8.0.0-alpha.2...v8.0.0-alpha.3) (2020-12-16)
-
-
-### Features
-
-* **eslint:** add import order rule ([#334](https://github.com/dhis2/cli-style/issues/334)) ([c7b9991](https://github.com/dhis2/cli-style/commit/c7b99917e39b2ed16165d0a115f0e0c3ebe775e1))
-
 # [8.0.0-alpha.2](https://github.com/dhis2/cli-style/compare/v8.0.0-alpha.1...v8.0.0-alpha.2) (2020-12-16)
 
-
 ### Features
 
 * opt-in git hooks ([#333](https://github.com/dhis2/cli-style/issues/333)) ([a3bc415](https://github.com/dhis2/cli-style/commit/a3bc415d3971756e2ef53ab59dbbc4fb48046b07))
 
 # [8.0.0-alpha.1](https://github.com/dhis2/cli-style/compare/v7.2.3...v8.0.0-alpha.1) (2020-12-16)
 
-
 ### Code Refactoring
 
 * remove husky ([752b944](https://github.com/dhis2/cli-style/commit/752b94409a3a9735d324d05aefdd296f0d6bfb44))
 
-
 ### BREAKING CHANGES
 
 * Husky has been removed from cli-style. You will need to
 remove hooks that reference husky.sh in .git/hooks.
 
+# [7.3.0](https://github.com/dhis2/cli-style/compare/v7.2.3...v7.3.0) (2020-12-16)
+
+### Features
+
+* **eslint:** add import order rule ([#334](https://github.com/dhis2/cli-style/issues/334)) ([c7b9991](https://github.com/dhis2/cli-style/commit/c7b99917e39b2ed16165d0a115f0e0c3ebe775e1))
+
 ## [7.2.3](https://github.com/dhis2/cli-style/compare/v7.2.2...v7.2.3) (2020-12-16)
 
 

package.json

@@ -34,24 +34,24 @@
         "@dhis2/cli-helpers-engine": "2.1.1",
         "babel-eslint": "^10.1.0",
         "cross-spawn": "^7.0.3",
-        "eslint": "^7.12.1",
-        "eslint-config-prettier": "^6.15.0",
+        "eslint": "^7.18.0",
+        "eslint-config-prettier": "^7.2.0",
         "eslint-plugin-import": "^2.22.1",
-        "eslint-plugin-prettier": "^3.1.4",
-        "eslint-plugin-react": "^7.21.5",
-        "fast-glob": "^3.2.4",
+        "eslint-plugin-prettier": "^3.3.1",
+        "eslint-plugin-react": "^7.22.0",
+        "fast-glob": "^3.2.5",
         "find-up": "^5.0.0",
         "fs-extra": "^9.0.1",
         "perfy": "^1.1.5",
-        "prettier": "^2.1.2",
-        "semver": "^7.3.2",
-        "yargs": "^16.1.0"
+        "prettier": "^2.2.1",
+        "semver": "^7.3.4",
+        "yargs": "^16.2.0"
     },
     "publishConfig": {
         "access": "public"
     },
     "devDependencies": {
-        "@dhis2/cli-utils-docsite": "^2.0.2",
-        "tape": "^5.0.1"
+        "@dhis2/cli-utils-docsite": "^2.0.3",
+        "tape": "^5.1.1"
     }
 }