Merge branch 'release/1.3.0'

wimpyprogrammer · wimpyprogrammer · commit abad13a5809f · 2021-12-14T20:04:31.000-06:00
diff --git a/.auto-changelog b/.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"
+}
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -5,8 +5,7 @@
 		"airbnb-base",
 		"plugin:jest/recommended",
 		"plugin:@typescript-eslint/recommended",
-		"prettier",
-		"prettier/@typescript-eslint"
+		"prettier"
 	],
 	"parserOptions": {
 		"ecmaVersion": 2018
diff --git a/.github/dependabot.yml b/.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'
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -18,7 +18,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node-version: [10.x, 14.x]
+        node-version: [12.x, 16.x, lts/*]
 
     steps:
       - name: Checkout repository
@@ -27,22 +27,24 @@ jobs:
           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={ts-jest,typescript} src/e2e.spec.ts
+      - run: npx testpack-cli --keep=@types/jest,ts-jest,typescript src/e2e.spec.ts
 
       - 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: Run Snyk to check for vulnerabilities
+        if: ${{ github.actor != 'dependabot[bot]' }}
         uses: snyk/actions/node@master
         env:
           SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}
diff --git a/.publishrc b/.publishrc
diff --git a/.release-it.json b/.release-it.json
@@ -0,0 +1,12 @@
+{
+	"hooks": {
+		"before:init": ["npm run lint", "npm test"],
+		"after:bump": "npm run build"
+	},
+	"git": {
+		"changelog": false,
+		"commit": false,
+		"requireBranch": "main",
+		"tagName": "${version}"
+	}
+}
diff --git a/CHANGELOG.md b/CHANGELOG.md
diff --git a/demo/index.html b/demo/index.html
@@ -18,7 +18,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(),
@@ -52,7 +52,7 @@
 				src="https://www.googletagmanager.com/ns.html?id=GTM-W4BK9P"
 				height="0"
 				width="0"
-				style="display:none;visibility:hidden"
+				style="display: none; visibility: hidden"
 			>
 			</iframe>
 		</noscript>
@@ -97,9 +97,7 @@
 
 				<div class="form-inline">
 					<div class="form-group">
-						<label for="delimiter">
-							Words/phrases are separated by:
-						</label>
+						<label for="delimiter"> Words/phrases are separated by: </label>
 						<select
 							id="delimiter"
 							class="form-control js-delimiter track-field"
@@ -117,9 +115,7 @@
 							id="case"
 							class="form-check-input js-case track-field"
 						/>
-						<label class="form-check-label" for="case">
-							Case-sensitive
-						</label>
+						<label class="form-check-label" for="case"> Case-sensitive </label>
 					</div>
 
 					<div class="form-group form-check">
@@ -149,9 +145,7 @@
 		<div class="container">
 			<section class="output">
 				<div class="form-group">
-					<label for="output">
-						Matching Regular Expression:
-					</label>
+					<label for="output"> Matching Regular Expression: </label>
 					<textarea
 						readonly="readonly"
 						id="output"
diff --git a/demo/src/utils/wordList.spec.ts b/demo/src/utils/wordList.spec.ts
@@ -5,15 +5,15 @@ const { Preserve, TrimLeadingAndTrailing } = WhitespaceHandling;
 describe('parseString', () => {
 	it.each(['', null, undefined])(
 		'returns an empty array when input string is %p',
-		input => {
+		(input) => {
 			const wordList = parseString(input as string, ',', Preserve);
 			expect(wordList).toEqual([]);
 		}
 	);
 
 	it.each(['', null, undefined])(
 		'returns entire input string in array when delimiter is %p',
-		testDelimiter => {
+		(testDelimiter) => {
 			const delimiter = testDelimiter as string;
 			const wordList = parseString(' some input string ', delimiter, Preserve);
 			expect(wordList).toEqual([' some input string ']);
@@ -22,7 +22,7 @@ describe('parseString', () => {
 
 	it.each([',', '\n', '\t'])(
 		'returns entire input string in array when delimiter %p is not present in input string',
-		delimiter => {
+		(delimiter) => {
 			const wordList = parseString(' some input string ', delimiter, Preserve);
 			expect(wordList).toEqual([' some input string ']);
 		}
@@ -40,10 +40,13 @@ describe('parseString', () => {
 	it.each([
 		['foo Bar b@z ', ' '],
 		['foo  Bar  b@z  ', '  '],
-	])('splits input string %p by delimiter %p', (inputString, delimiter) => {
-		const wordList = parseString(inputString, delimiter, Preserve);
-		expect(wordList).toEqual(['foo', 'Bar', 'b@z', '']);
-	});
+	])(
+		'splits input string %p by whitespace delimiter %p',
+		(inputString, delimiter) => {
+			const wordList = parseString(inputString, delimiter, Preserve);
+			expect(wordList).toEqual(['foo', 'Bar', 'b@z', '']);
+		}
+	);
 
 	it('splits multiline input string by newline delimiter', () => {
 		const input = `foo
diff --git a/demo/src/utils/wordList.ts b/demo/src/utils/wordList.ts
@@ -19,7 +19,7 @@ export function parseString(
 	let words = raw.split(delimiter);
 
 	if (whitespaceHandling === WhitespaceHandling.TrimLeadingAndTrailing) {
-		words = words.map(word => word.trim());
+		words = words.map((word) => word.trim());
 	}
 
 	return words;
diff --git a/package.json b/package.json
@@ -1,36 +1,37 @@
 {
   "name": "strings-to-regex",
-  "version": "1.2.0",
+  "version": "1.3.0",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/wimpyprogrammer/strings-to-regex.git"
   },
   "description": "Condense a set of words into a regular expression pattern",
   "author": "Drew Keller <drew@wimpyprogrammer.com>",
   "license": "MIT",
+  "publishConfig": {
+    "registry": "https://registry.npmjs.org/"
+  },
   "main": "lib/index.js",
   "types": "./lib/index.d.ts",
   "files": [
     "lib/"
   ],
   "sideEffects": false,
   "engines": {
-    "node": ">=10"
+    "node": ">=12"
   },
   "scripts": {
     "build": "run-s clean build:*",
     "build:src": "babel src -d lib --extensions '.js,.ts'",
     "build:demo": "wp --config demo/webpack.config.js",
     "build:types": "tsc -p ./tsconfig.types.json",
+    "changelog": "npx auto-changelog",
     "clean": "rimraf lib/*",
-    "format": "prettier --write 'src/**'",
+    "format": "prettier --write 'src/**' 'demo/**'",
     "lint": "run-s lint:*",
     "lint:src": "tsc -p ./tsconfig.json && eslint ./src --report-unused-disable-directives --ext .js,.ts --parser-options=project:./tsconfig.json",
     "lint:demo": "tsc -p ./demo/tsconfig.json && eslint ./demo --report-unused-disable-directives --ext .js,.ts --parser-options=project:./demo/tsconfig.json",
-    "precommit": "pretty-quick --staged",
-    "prepublish": "npx publish-please guard",
-    "publish-please": "npx publish-please",
-    "publish-please-prereqs": "run-s lint test build",
+    "release": "npx release-it --no-increment",
     "test": "jest --coverage"
   },
   "jest": {
@@ -47,26 +48,24 @@
     "@babel/core": "^7.5.5",
     "@babel/preset-env": "^7.5.5",
     "@babel/preset-typescript": "^7.5.5",
-    "@types/jest": "^26.0.0",
+    "@types/jest": "^27.0.1",
     "@types/jest-when": "^2.7.0",
-    "@typescript-eslint/eslint-plugin": "^4.14.0",
-    "@typescript-eslint/parser": "^4.14.0",
-    "eslint": "7.19.0",
-    "eslint-config-airbnb-base": "14.2.1",
-    "eslint-config-prettier": "^7.2.0",
-    "eslint-import-resolver-typescript": "^2.3.0",
-    "eslint-plugin-import": "^2.18.2",
-    "eslint-plugin-jest": "^24.1.3",
-    "husky": "^4.3.8",
-    "jest": "^26.0.0",
+    "@typescript-eslint/eslint-plugin": "^5.6.0",
+    "@typescript-eslint/parser": "^5.6.0",
+    "eslint": "8.4.1",
+    "eslint-config-airbnb-base": "15.0.0",
+    "eslint-config-prettier": "^8.3.0",
+    "eslint-import-resolver-typescript": "^2.5.0",
+    "eslint-plugin-import": "^2.25.3",
+    "eslint-plugin-jest": "^25.2.1",
+    "jest": "^27.0.1",
     "jest-when": "^3.1.0",
     "npm-run-all": "^4.1.5",
-    "prettier": "^2.2.1",
-    "pretty-quick": "^3.1.0",
+    "prettier": "2.2.1",
     "regex-to-strings": "^2.0.1",
     "rimraf": "^3.0.2",
-    "ts-jest": "^26.4.4",
-    "ts-loader": "^8.0.15",
+    "ts-jest": "^27.0.1",
+    "ts-loader": "^9.1.2",
     "typescript": "^4.1.3",
     "webpack": "^5.0.0",
     "webpack-nano": "^1.1.1"
diff --git a/src/types/charTrie.ts b/src/types/charTrie.ts
@@ -4,6 +4,7 @@ interface CharTrieData {
 
 export type Char = string;
 
+// eslint-disable-next-line no-use-before-define
 export class CharTrie extends Map<Char, CharTrie> {
 	public static create(trieData: CharTrieData): CharTrie {
 		const trieDataPairs = Object.entries(trieData);

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ export function parseString(`
`19`	`19`	`let words = raw.split(delimiter);`
`20`	`20`
`21`	`21`	`if (whitespaceHandling === WhitespaceHandling.TrimLeadingAndTrailing) {`
`22`		`- words = words.map(word => word.trim());`
	`22`	`+ words = words.map((word) => word.trim());`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`return words;`