Merge branch 'release/2.1.0'

Author: wimpyprogrammer

.auto-changelog

@@ -0,0 +1,8 @@
+{
+	"commitLimit": false,
+	"ignoreCommitPattern": "Bump .* version|Merge tag .+ into develop",
+	"package": true,
+	"sortCommits": "date-desc",
+	"startingVersion": "1.1.0",
+	"template": "keepachangelog"
+}

.github/dependabot.yml

@@ -0,0 +1,18 @@
+version: 2
+updates:
+  - package-ecosystem: 'github-actions'
+    directory: '/'
+    schedule:
+      interval: 'weekly'
+      day: 'saturday'
+    assignees:
+      - 'wimpyprogrammer'
+
+  - package-ecosystem: 'npm'
+    directory: '/'
+    schedule:
+      interval: 'weekly'
+      day: 'saturday'
+    assignees:
+      - 'wimpyprogrammer'
+    versioning-strategy: 'widen'

.github/workflows/security-scan.yml

@@ -22,7 +22,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v2.4.0
 
       - name: Initialize CodeQL
         uses: github/codeql-action/init@v1

.github/workflows/tests.yml

@@ -18,31 +18,42 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node-version: [10.x, 14.x]
+        node-version: [12.x, 16.x, lts/*]
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v2.4.0
         with:
           fetch-depth: '2'
 
       - name: Test on Node ${{ matrix.node-version }}
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@v2.5.0
         with:
           node-version: ${{ matrix.node-version }}
 
       - run: npm install
+      - run: npx prettier --check .
       - run: npm run lint
       - run: npm run build
       - run: npm run test
       - run: npx testpack-cli --keep=@types/*,ts-jest,typescript jest.config.js tsconfig.json src/e2e.spec.ts src/tsconfig.test.json
 
       - name: Upload test coverage report to Codecov
-        uses: codecov/codecov-action@v1
+        uses: codecov/codecov-action@v2.1.0
         with:
           fail_ci_if_error: true
 
+      - name: Setup Snyk
+        uses: snyk/actions/setup@master
+        id: snyk
+        with:
+          snyk-version: latest
+
+      - name: Snyk version
+        run: echo "${{ steps.snyk.outputs.version }}"
+
       - name: Run Snyk to check for vulnerabilities
+        if: ${{ github.actor != 'dependabot[bot]' }}
         uses: snyk/actions/node@master
         env:
           SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}

.release-it.json

@@ -7,7 +7,6 @@
 		"changelog": false,
 		"commit": false,
 		"requireBranch": "main",
-		"requireCommits": true,
 		"tagName": "${version}"
 	}
 }

CHANGELOG.md

@@ -25,7 +25,7 @@
 
 		<!-- Google Tag Manager -->
 		<script>
-			(function(w, d, s, l, i) {
+			(function (w, d, s, l, i) {
 				w[l] = w[l] || [];
 				w[l].push({
 					'gtm.start': new Date().getTime(),
@@ -54,17 +54,15 @@
 				src="https://www.googletagmanager.com/ns.html?id=GTM-M4R3GP7"
 				height="0"
 				width="0"
-				style="display:none;visibility:hidden"
+				style="display: none; visibility: hidden"
 			>
 			</iframe>
 		</noscript>
 		<!-- End Google Tag Manager (noscript) -->
 
 		<nav class="navbar navbar-expand-lg navbar-dark bg-primary">
 			<div class="container">
-				<a class="navbar-brand" href="javascript:void(0)">
-					RegEx to Strings
-				</a>
+				<a class="navbar-brand" href="javascript:void(0)"> RegEx to Strings </a>
 				<a
 					href="https://github.com/wimpyprogrammer/regex-to-strings"
 					title="See regex-to-strings on GitHub"
@@ -118,9 +116,7 @@
 
 				<div class="form-inline">
 					<div class="form-group">
-						<label for="delimiter">
-							Separate results by:
-						</label>
+						<label for="delimiter"> Separate results by: </label>
 						<select
 							id="delimiter"
 							class="form-control js-delimiter track-field"
@@ -133,9 +129,7 @@
 					</div>
 
 					<div class="form-group">
-						<label for="max-results">
-							Maximum number of results:
-						</label>
+						<label for="max-results"> Maximum number of results: </label>
 						<input
 							class="form-control js-max-results track-field"
 							id="max-results"

demo/index.html

@@ -27,9 +27,9 @@ export default class DemoForm {
 	protected $errorContainer: HTMLDivElement;
 	protected $errorMessage: HTMLPreElement;
 
-	// eslint-disable-next-line @typescript-eslint/no-empty-function
+	// eslint-disable-next-line @typescript-eslint/no-empty-function, class-methods-use-this
 	public onSubmit: () => void = () => {};
-	// eslint-disable-next-line @typescript-eslint/no-empty-function
+	// eslint-disable-next-line @typescript-eslint/no-empty-function, class-methods-use-this
 	public onCancel: () => void = () => {};
 
 	private onInputKeydown(event: KeyboardEvent): boolean {

demo/src/components/demo-form.ts

@@ -1,6 +1,6 @@
 {
   "name": "regex-to-strings",
-  "version": "2.0.3",
+  "version": "2.1.0",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/wimpyprogrammer/regex-to-strings.git"
@@ -27,45 +27,42 @@
     "*.scss"
   ],
   "engines": {
-    "node": ">=10"
+    "node": ">=12"
   },
   "scripts": {
     "build": "run-s build:*",
     "build:src": "tsc -b --clean && tsc -b",
     "build:demo": "wp --config demo/webpack.config.js",
+    "changelog": "npx auto-changelog",
     "format": "prettier --write '{src,demo/src}/**'",
     "lint": "tsc -b ./tsconfig.lint.json && eslint . --report-unused-disable-directives",
-    "precommit": "pretty-quick --staged",
-    "release": "npx release-it",
+    "release": "npx release-it --no-increment",
     "test": "jest --coverage"
   },
   "devDependencies": {
     "@types/history": "^4.7.3",
-    "@types/jest": "^26.0.10",
+    "@types/jest": "^27.0.1",
     "@types/jest-when": "^2.4.1",
     "@types/lodash": "^4.14.140",
-    "@typescript-eslint/eslint-plugin": "^4.18.0",
-    "@typescript-eslint/parser": "^4.18.0",
-    "clean-webpack-plugin": "^3.0.0",
-    "codecov": "^3.5.0",
-    "css-loader": "^5.1.3",
-    "eslint": "^7.22.0",
-    "eslint-config-airbnb-base": "^14.2.1",
+    "@typescript-eslint/eslint-plugin": "^5.6.0",
+    "@typescript-eslint/parser": "^5.6.0",
+    "clean-webpack-plugin": "^4.0.0",
+    "css-loader": "^6.1.0",
+    "eslint": "^8.4.0",
+    "eslint-config-airbnb-base": "^15.0.0",
     "eslint-config-prettier": "^8.1.0",
     "eslint-import-resolver-typescript": "^2.4.0",
-    "eslint-plugin-import": "^2.18.2",
-    "eslint-plugin-jest": "^24.3.1",
-    "husky": "5.1.3",
-    "jest": "^26.4.2",
+    "eslint-plugin-import": "^2.25.3",
+    "eslint-plugin-jest": "^25.2.1",
+    "jest": "^27.0.1",
     "jest-when": "^3.2.1",
-    "node-sass": "^5.0.0",
+    "node-sass": "^7.0.0",
     "npm-run-all": "^4.1.5",
     "prettier": "2.2.1",
-    "pretty-quick": "3.1.0",
-    "sass-loader": "^11.0.1",
-    "style-loader": "^2.0.0",
-    "ts-jest": "^26.5.3",
-    "ts-loader": "^8.0.18",
+    "sass-loader": "^12.0.0",
+    "style-loader": "^3.0.0",
+    "ts-jest": "^27.0.1",
+    "ts-loader": "^9.1.2",
     "typescript": "^4.2.3",
     "webpack": "^5.26.0",
     "webpack-nano": "^1.1.1",

package.json

@@ -12,11 +12,13 @@ export default class Expansion {
 	/**
 	 * A single blank string Expansion
 	 */
+	// eslint-disable-next-line no-use-before-define
 	public static Blank: Expansion = new Expansion([''], 1);
 
 	/**
 	 * Zero string expansions
 	 */
+	// eslint-disable-next-line no-use-before-define
 	public static Empty: Expansion = new Expansion([], 0);
 
 	/**