Merge branch 'feature/improve-build' into develop

Author: wimpyprogrammer

jest.config.js

@@ -9,11 +9,8 @@ module.exports = {
 			tsConfig: 'tsconfig.test.json',
 		},
 	},
-	moduleFileExtensions: ['js', 'json', 'ts'],
+	preset: 'ts-jest',
+	restoreMocks: true,
 	testEnvironment: 'node',
-	testMatch: ['**/src/**/?*.spec.(js|ts)'],
-	transform: {
-		'^.+\\.ts$': 'ts-jest',
-	},
 	verbose: true,
 };

package.json

@@ -15,8 +15,7 @@
   "main": "lib/index.js",
   "types": "./lib/index.d.ts",
   "files": [
-    "lib/**/!(*.spec).js",
-    "lib/**/*.d.ts"
+    "lib/"
   ],
   "sideEffects": [
     "demo/**/polyfills.ts",
@@ -26,15 +25,15 @@
     "node": ">=8"
   },
   "scripts": {
-    "build": "npm run clean && babel src -d lib --extensions '.js,.ts' && npm run build-types",
+    "build": "npm run clean && babel src -d lib --extensions '.js,.ts' --ignore '**/*.spec.js','**/*.spec.ts' && npm run build-types",
     "build-demo": "npm run clean-demo && webpack --config demo/webpack.config.js",
     "build-types": "tsc -p ./tsconfig.release-types.json",
     "clean": "rimraf lib/*",
     "clean-demo": "rimraf demo/lib/*",
     "format": "prettier --write '{src,demo/src}/**'",
-    "lint": "tsc -p ./tsconfig.release.json; eslint . --ext .js,.ts --parser-options=project:./tsconfig.release.json",
-    "lint-demo": "tsc -p ./demo/tsconfig.json; eslint . --ext .js,.ts --parser-options=project:./demo/tsconfig.json",
-    "lint-tests": "tsc -p ./tsconfig.test.json; eslint . --ext .js,.ts --parser-options=project:./tsconfig.test.json",
+    "lint": "tsc -p ./tsconfig.release.json && eslint . --ext .js,.ts --report-unused-disable-directives --parser-options=project:./tsconfig.release.json",
+    "lint-demo": "tsc -p ./demo/tsconfig.json && eslint . --ext .js,.ts --report-unused-disable-directives --parser-options=project:./demo/tsconfig.json",
+    "lint-tests": "tsc -p ./tsconfig.test.json && eslint . --ext .js,.ts --report-unused-disable-directives --parser-options=project:./tsconfig.test.json",
     "precommit": "pretty-quick --staged",
     "prepublish": "npx publish-please guard",
     "publish-please": "npx publish-please",

src/pattern.spec.ts

@@ -22,8 +22,6 @@ function measureAverageTime(fn: Function, numTrials: number) {
 describe('count', () => {
 	const { count } = patternLib;
 
-	afterEach(() => jest.restoreAllMocks());
-
 	it('passes pattern to expand()', () => {
 		when(jest.spyOn(patternLib, 'expand'))
 			.calledWith('test')
@@ -112,8 +110,6 @@ describe('expand', () => {
 			.mockImplementation(minValue => minValue);
 	});
 
-	afterEach(() => jest.restoreAllMocks());
-
 	it('normalizes pattern with toRegExp()', () => {
 		when(jest.spyOn(patternLib, 'toRegExp'))
 			.calledWith('/test/')
@@ -1524,8 +1520,6 @@ describe('expand', () => {
 describe('expandN', () => {
 	const { expandN } = patternLib;
 
-	afterEach(() => jest.restoreAllMocks());
-
 	it('passes pattern to expand()', () => {
 		when(jest.spyOn(patternLib, 'expand'))
 			.calledWith('test')
@@ -1566,8 +1560,6 @@ describe('expandN', () => {
 describe('expandAll', () => {
 	const { expandAll } = patternLib;
 
-	afterEach(() => jest.restoreAllMocks());
-
 	it('passes pattern to expand()', () => {
 		when(jest.spyOn(patternLib, 'expand'))
 			.calledWith('test')

src/types/regexp-tree.d.ts

@@ -223,7 +223,6 @@ declare module 'regexp-tree' {
 		replace<TNew extends AstClass>(
 			node: AsExpression<TNew>
 		): NodePath<TNew> | null;
-		// eslint-disable-next-line @typescript-eslint/no-explicit-any
 		update(nodeProps: Partial<this['node']>): void;
 		getPreviousSibling(): NodePath<AstClass> | null;
 		getNextSibling(): NodePath<AstClass> | null;