Get the tests working

Author: Mark George

jest.config.js

@@ -1,10 +1,6 @@
 module.exports = {
 	testMatch: [ '**/?(*.)+(spec|test).js' ],
-	transform: {
-		"^.+\\.ts?$": "ts-jest"
-	},
 	setupFilesAfterEnv: [ './tests/config/jest-setup.js' ],
-	collectCoverageFrom: [ 'lib/**/*.ts', 'index.ts' ],
 	globalSetup: 'jest-environment-puppeteer/setup',
 	globalTeardown: 'jest-environment-puppeteer/teardown',
 	testEnvironment: 'jest-environment-puppeteer',

lib/generate-critical-css.ts

@@ -148,10 +148,10 @@ export async function generateCriticalCSS( {
 	successRatio = 1,
 }: {
 	browserInterface: BrowserInterface;
-	progressCallback: ( step: number, total: number ) => void;
+	progressCallback?: ( step: number, total: number ) => void;
 	urls: string[];
 	viewports: Viewport[];
-	filters: FilterSpec;
+	filters?: FilterSpec;
 	successRatio?: number;
 } ): Promise< [ string, Error[] ] > {
 	const successUrlsThreshold = Math.ceil( urls.length * successRatio );

lib/style-ast.ts

@@ -542,9 +542,7 @@ export class StyleAST {
 				}
 
 				// Gather family-name values.
-				const lexer: {
-					findDeclarationValueFragments: Function;
-				} = csstree as any;
+				const lexer = ( csstree as any ).lexer;
 				const frags = lexer.findDeclarationValueFragments(
 					node,
 					'Type',

package-lock.json

@@ -48,7 +48,6 @@
 		"rollup-plugin-polyfill-node": "^0.8.0",
 		"rollup-plugin-terser": "^7.0.2",
 		"stream-http": "^3.2.0",
-		"ts-jest": "^28.0.8",
 		"ts-loader": "^9.3.1",
 		"tsconfig-paths-webpack-plugin": "^4.0.0",
 		"typescript": "^4.7.4",

package.json

@@ -11,10 +11,13 @@ module.exports = {
 		filename: 'main.js',
 	},
 	module: {
-		rules: [ {
-			test: /\.ts$/,
-			loader: 'ts-loader',
-		} ],
+		rules: [
+			{
+			  test: /\.ts?$/,
+			  use: 'ts-loader',
+			  exclude: /node_modules/,
+			},
+		],
 	},
 	target: 'web',
 	performance: {

tests/data/webpack-wrap/webpack.config.js

@@ -1,6 +1,18 @@
 /* global browser */
 
-const { generateCriticalCSS, BrowserInterfacePuppeteer } = require( '../../index' );
+declare global {
+	namespace jest {
+		const mock: any;
+	}
+
+	const expect: any;
+	const describe: any;
+	const beforeAll: any;
+	const afterAll: any;
+	const it: any;
+}
+
+import { generateCriticalCSS, BrowserInterfacePuppeteer } from '../../index';
 const { dataUrl } = require( '../lib/data-directory' );
 const mockFetch = require( '../lib/mock-fetch' );
 const path = require( 'path' );
@@ -12,7 +24,7 @@ const testPageUrls = {
 	pageA: path.join( dataUrl, 'page-a/index.html' ),
 };
 
-let testPages = {};
+let testPages: { [ key: string ]: any } = {};
 
 /**
  * Run a batch of CSS generation test runs, verify the results contain (and do not contain) specific substrings.

tests/unit/generate-critical-css.test.js tests/unit/generate-critical-css.test.ts

@@ -1,8 +1,11 @@
 {
-	"include": [ "index.ts", "lib/*" ],
+	"include": [ "index.ts", "lib/*", "tests/data/webpack-wrap/*" ],
 	"esModuleInterop": true,
 	"compilerOptions": {
-        "target": "ESNext",
-		"sourceMap": true
+        "target": "es6",
+		"module": "es6",
+		"sourceMap": true,
+		"allowJs": true,
+		"moduleResolution": "node",
 	}
 }