@happy-dom/jest-environment 2.24.1 → 2.24.5

package/bin/build-lit-ts-config.js

@@ -1,92 +1,74 @@
-/* eslint-disable */
+/* eslint-disable no-console*/
+/* eslint-disable @typescript-eslint/no-var-requires*/
 
 const Fs = require('fs');
 const Path = require('path');
-const litElementPath = Path.dirname(require.resolve('lit-element/package.json'));
-const litHTMLPath = Path.dirname(require.resolve('lit-html/package.json'));
-const litElementTSConfig = {
-	"compilerOptions": {
-		"module": "CommonJS",
-		"sourceMap": false,
-		"target": "ES5",
-		"preserveSymlinks": true,
-		"preserveWatchOutput": true,
-		"experimentalDecorators": true,
-		"allowSyntheticDefaultImports": false,
-		"allowJs": true,
-		"checkJs": false,
-		"skipLibCheck": true,
-		"resolveJsonModule": true,
-		"moduleResolution": "node",
-		"noResolve": true,
-		"incremental": true,
-		"tsBuildInfoFile": "lit-element-tsbuildinfo",
-		"lib": [
-			"dom",
-			"es2015",
-			"es2016"
-		],
-		"outDir": "../lib/node_modules/lit-element",
-		"baseUrl": ".",
-		"removeComments": true,
-		"rootDir": litElementPath
-	},
-	"include": [litElementPath],
-	"exclude": [litElementPath + '/src']
-};
-const litHTMLTSConfig = {
-	"compilerOptions": {
-		"module": "CommonJS",
-		"sourceMap": false,
-		"target": "ES5",
-		"preserveSymlinks": true,
-		"preserveWatchOutput": true,
-		"experimentalDecorators": true,
-		"allowSyntheticDefaultImports": false,
-		"allowJs": true,
-		"checkJs": false,
-		"skipLibCheck": true,
-		"resolveJsonModule": true,
-		"moduleResolution": "node",
-		"noResolve": true,
-		"incremental": true,
-		"tsBuildInfoFile": "lit-html-tsbuildinfo",
-		"lib": [
-			"dom",
-			"es2015",
-			"es2016"
-		],
-		"outDir": "../lib/node_modules/lit-html",
-		"baseUrl": ".",
-		"removeComments": true,
-		"rootDir": litHTMLPath
-	},
-	"include": [litHTMLPath],
-	"exclude": [litHTMLPath + '/src']
-};
 
-function writeFile() {
-	return Fs.promises
-		.writeFile(Path.resolve('tmp/tsconfig.lit-element.json'), JSON.stringify(litElementTSConfig, null, 4))
-		.then(() => {
-			return Fs.promises
-					.writeFile(Path.resolve('tmp/tsconfig.lit-html.json'), JSON.stringify(litHTMLTSConfig, null, 4))
-					.catch(error => {
-						// eslint-disable-next-line
-						console.error('Failed to create "tmp/tsconfig.lit-html.json". Error: ' + error);
-					});
-		})
-		.catch(error => {
-			// eslint-disable-next-line
-			console.error('Failed to create "tmp/tsconfig.lit-element.json". Error: ' + error);
-		});
+const LIBS = ['@lit/reactive-element', 'lit', 'lit-element', 'lit-html'];
+
+function getTsConfig(lib) {
+	const split = require.resolve(lib).split('node_modules');
+	const modulePathSplit = split[1].split(Path.sep);
+	const modulePath = modulePathSplit[1].startsWith('@')
+		? modulePathSplit[1] + Path.sep + modulePathSplit[2]
+		: modulePathSplit[1];
+	const path = Path.join(split[0], 'node_modules', modulePath);
+
+	return {
+		compilerOptions: {
+			module: 'CommonJS',
+			sourceMap: false,
+			target: 'es5',
+			preserveSymlinks: true,
+			preserveWatchOutput: true,
+			experimentalDecorators: true,
+			allowSyntheticDefaultImports: false,
+			allowJs: true,
+			checkJs: false,
+			skipLibCheck: true,
+			resolveJsonModule: true,
+			moduleResolution: 'node',
+			noResolve: true,
+			incremental: true,
+			tsBuildInfoFile: lib.replace('@', '').replace(/[/\\]/g, '-') + '-tsbuildinfo',
+			lib: ['es2015', 'es2016', 'es2017'],
+			outDir: '../lib/node_modules/' + lib,
+			baseUrl: '.',
+			removeComments: true,
+			rootDir: path
+		},
+		include: [path],
+		exclude: [path + '/src']
+	};
 }
 
-function createTmpDirectory() {
-	return Fs.promises.mkdir(Path.resolve('tmp'));
+async function writeTsConfigFile(lib) {
+	await Fs.promises.writeFile(
+		Path.resolve(`tmp/tsconfig.${lib.replace('@', '').replace(/[/\\]/g, '-')}.json`),
+		JSON.stringify(getTsConfig(lib), null, 4)
+	);
 }
 
-Fs.promises
-	.access(Path.resolve('tmp'))
-	.then(writeFile)
-	.catch(() => createTmpDirectory().then(writeFile));
+async function createTmpDirectory() {
+	await Fs.promises.mkdir(Path.resolve('tmp'));
+}
+
+async function writeLibFiles() {
+	await Promise.all(LIBS.map(lib => writeTsConfigFile(lib)));
+}
+
+async function main() {
+	try {
+		await Fs.promises.access(Path.resolve('tmp'));
+	} catch (error) {
+		await createTmpDirectory();
+	}
+	await writeLibFiles();
+}
+
+process.on('unhandledRejection', reason => {
+	console.error(reason);
+	process.exit(1);
+});
+
+main();

package/bin/copy-package-json-for-lit.js

@@ -0,0 +1,42 @@
+/* eslint-disable no-console*/
+/* eslint-disable @typescript-eslint/no-var-requires*/
+
+const Path = require('path');
+const FS = require('fs');
+
+const LIBS = ['@lit/reactive-element', 'lit', 'lit-element', 'lit-html'];
+
+function getLibPath(lib) {
+	const split = require.resolve(lib).split('node_modules');
+	const modulePathSplit = split[1].split(Path.sep);
+	const modulePath = modulePathSplit[1].startsWith('@')
+		? modulePathSplit[1] + Path.sep + modulePathSplit[2]
+		: modulePathSplit[1];
+
+	return Path.join(split[0], 'node_modules', modulePath);
+}
+
+async function writePackageJson(from, to) {
+	const packageJson = require(from);
+	delete packageJson.type;
+	delete packageJson.exports;
+	await FS.promises.writeFile(to, JSON.stringify(packageJson, null, 4));
+}
+
+async function main() {
+	await Promise.all(
+		LIBS.map(lib =>
+			writePackageJson(
+				Path.join(getLibPath(lib), 'package.json'),
+				Path.resolve(Path.join('lib', 'node_modules', lib, 'package.json'))
+			)
+		)
+	);
+}
+
+process.on('unhandledRejection', reason => {
+	console.error(reason);
+	process.exit(1);
+});
+
+main();

package/bin/copy-tsdef-for-lit.js

@@ -0,0 +1,35 @@
+/* eslint-disable no-console*/
+/* eslint-disable @typescript-eslint/no-var-requires*/
+
+const Path = require('path');
+const CPY = require('cpy');
+
+const LIBS = ['@lit/reactive-element', 'lit', 'lit-element', 'lit-html'];
+
+function getLibPath(lib) {
+	const split = require.resolve(lib).split('node_modules');
+	const modulePathSplit = split[1].split(Path.sep);
+	const modulePath = modulePathSplit[1].startsWith('@')
+		? modulePathSplit[1] + Path.sep + modulePathSplit[2]
+		: modulePathSplit[1];
+
+	return Path.join(split[0], 'node_modules', modulePath);
+}
+
+async function main() {
+	await Promise.all(
+		LIBS.map(lib =>
+			CPY(
+				[Path.join(getLibPath(lib), '*.d.ts')],
+				Path.resolve(Path.join('lib', 'node_modules', lib))
+			)
+		)
+	);
+}
+
+process.on('unhandledRejection', reason => {
+	console.error(reason);
+	process.exit(1);
+});
+
+main();

package/bin/transform-lit-require.js

@@ -0,0 +1,64 @@
+/* eslint-disable no-console*/
+/* eslint-disable @typescript-eslint/no-var-requires*/
+
+const FS = require('fs');
+const Path = require('path');
+const Glob = require('glob');
+
+const LIBS = ['@lit/reactive-element', 'lit', 'lit-element', 'lit-html'];
+
+function getFiles(lib) {
+	return new Promise((resolve, reject) => {
+		Glob(
+			`${Path.resolve('./lib/node_modules/' + lib)}/**/*.js`,
+			{ nodir: true },
+			(error, files) => {
+				if (error) {
+					reject(error);
+					return;
+				}
+				resolve(files);
+			}
+		);
+	});
+}
+
+async function transformFile(lib, file) {
+	const data = (await FS.promises.readFile(file)).toString();
+	const regexp = /require\(["']([^"']+)["']\)/gm;
+	const libDirectory = lib.split('/').length > 1 ? '../../' : '../';
+	let newData = data;
+	let match = null;
+
+	while ((match = regexp.exec(data))) {
+		for (const externalLib of LIBS) {
+			if (match[1].startsWith(externalLib)) {
+				newData = newData.replace(match[0], `require("${libDirectory}${match[1]}")`);
+			}
+		}
+	}
+
+	if (data !== newData) {
+		await FS.promises.writeFile(file, newData);
+	}
+}
+
+async function transformLib(lib) {
+	const files = await getFiles(lib);
+	const promises = [];
+	for (const file of files) {
+		promises.push(transformFile(lib, file));
+	}
+	await Promise.all(promises);
+}
+
+async function main() {
+	await Promise.all(LIBS.map(lib => transformLib(lib)));
+}
+
+process.on('unhandledRejection', reason => {
+	console.error(reason);
+	process.exit(1);
+});
+
+main();

package/lib/index.d.ts

@@ -3,6 +3,7 @@ import VM from 'vm';
 import { ModuleMocker } from 'jest-mock';
 import { LegacyFakeTimers, ModernFakeTimers } from '@jest/fake-timers';
 import { JestEnvironment, EnvironmentContext } from '@jest/environment';
+import { Window } from 'happy-dom';
 import { Script } from 'vm';
 import { Global, Config } from '@jest/types';
 /**
@@ -11,6 +12,7 @@ import { Global, Config } from '@jest/types';
 export default class HappyDOMEnvironment implements JestEnvironment {
     fakeTimers: LegacyFakeTimers<number>;
     fakeTimersModern: ModernFakeTimers;
+    window: Window;
     global: Global.Global;
     moduleMocker: ModuleMocker;
     /**

package/lib/index.js

@@ -77,8 +77,9 @@ var HappyDOMEnvironment = /** @class */ (function () {
     function HappyDOMEnvironment(config, options) {
         this.fakeTimers = null;
         this.fakeTimersModern = null;
-        this.global = new happy_dom_1.Window();
-        this.moduleMocker = new jest_mock_1.ModuleMocker(this.global);
+        this.window = new happy_dom_1.Window();
+        this.global = this.window;
+        this.moduleMocker = new jest_mock_1.ModuleMocker(this.window);
         vm_1.default.createContext(this.global);
         // Functions are not an instanceof the "Function" class in the VM context, so therefore we set it to the used "Function" class.
         vm_1.default.runInContext('window.Function = (() => {}).constructor;', this.global);
@@ -87,15 +88,15 @@ var HappyDOMEnvironment = /** @class */ (function () {
         // TODO: Remove this ASAP as it currently causes tests to run really slow.
         this.global.Buffer = Buffer;
         // Needed as Jest is using it
-        this.global.global = this.global;
-        JestUtil.installCommonGlobals(this.global, config.globals);
+        this.window.global = this.global;
+        JestUtil.installCommonGlobals(this.window, config.globals);
         if (options && options.console) {
             this.global.console = options.console;
             this.global.window['console'] = options.console;
         }
         this.fakeTimers = new fake_timers_1.LegacyFakeTimers({
             config: config,
-            global: this.global,
+            global: this.window,
             moduleMocker: this.moduleMocker,
             timerConfig: {
                 idToRef: function (id) { return id; },
@@ -104,7 +105,7 @@ var HappyDOMEnvironment = /** @class */ (function () {
         });
         this.fakeTimersModern = new fake_timers_1.ModernFakeTimers({
             config: config,
-            global: this.global
+            global: this.window
         });
     }
     /**

package/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AAAA,6CAA6C;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAE7C,0CAAoB;AACpB,kDAAsC;AACtC,uCAAyC;AACzC,iDAAuE;AAEvE,uCAAmC;AAInC;;GAEG;AACH;IAMC;;;;;OAKG;IACH,6BAAY,MAA4B,EAAE,OAA4B;QAX/D,eAAU,GAA6B,IAAI,CAAC;QAC5C,qBAAgB,GAAqB,IAAI,CAAC;QAC1C,WAAM,GAA6C,IAAI,kBAAM,EAAG,CAAC;QACjE,iBAAY,GAAiB,IAAI,wBAAY,CAAgB,IAAI,CAAC,MAAM,CAAC,CAAC;QAShF,YAAE,CAAC,aAAa,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAE9B,+HAA+H;QAC/H,YAAE,CAAC,YAAY,CAAC,2CAA2C,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;QAE1E,oHAAoH;QACpH,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,eAAe,GAAG,GAAG,CAAC;QAExC,0EAA0E;QAC1E,IAAI,CAAC,MAAM,CAAC,MAAM,GAAG,MAAM,CAAC;QAE5B,6BAA6B;QAC7B,IAAI,CAAC,MAAM,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;QAEjC,QAAQ,CAAC,oBAAoB,CAAC,IAAI,CAAC,MAAM,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC;QAE3D,IAAI,OAAO,IAAI,OAAO,CAAC,OAAO,EAAE;YAC/B,IAAI,CAAC,MAAM,CAAC,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;YACtC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC;SAChD;QAED,IAAI,CAAC,UAAU,GAAG,IAAI,8BAAgB,CAAC;YACtC,MAAM,QAAA;YACN,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,YAAY,EAAE,IAAI,CAAC,YAAY;YAC/B,WAAW,EAAE;gBACZ,OAAO,EAAE,UAAC,EAAU,IAAK,OAAA,EAAE,EAAF,CAAE;gBAC3B,OAAO,EAAE,UAAC,GAAW,IAAK,OAAA,GAAG,EAAH,CAAG;aAC7B;SACD,CAAC,CAAC;QAEH,IAAI,CAAC,gBAAgB,GAAG,IAAI,8BAAgB,CAAC;YAC5C,MAAM,QAAA;YACN,MAAM,EAAE,IAAI,CAAC,MAAM;SACnB,CAAC,CAAC;IACJ,CAAC;IAED;;;;OAIG;IACU,mCAAK,GAAlB;;;;KAAsC;IAEtC;;;;OAIG;IACU,sCAAQ,GAArB;;;gBACC,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,CAAC;gBAC1B,IAAI,CAAC,gBAAgB,CAAC,OAAO,EAAE,CAAC;gBAChC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,aAAa,CAAC,EAAE,CAAC;gBAEtC,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC;gBACnB,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC;gBACzB,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC;gBACvB,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC;;;;KAC7B;IAED;;;;;OAKG;IACI,uCAAS,GAAhB,UAAiB,MAAc;QAC9B,OAAO,MAAM,CAAC,YAAY,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACzC,CAAC;IAED;;;;OAIG;IACI,0CAAY,GAAnB;QACC,OAAO,IAAI,CAAC,MAAM,CAAC;IACpB,CAAC;IACF,0BAAC;AAAD,CAAC,AA3FD,IA2FC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AAAA,6CAA6C;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAE7C,0CAAoB;AACpB,kDAAsC;AACtC,uCAAyC;AACzC,iDAAuE;AAEvE,uCAAmC;AAInC;;GAEG;AACH;IAOC;;;;;OAKG;IACH,6BAAY,MAA4B,EAAE,OAA4B;QAZ/D,eAAU,GAA6B,IAAI,CAAC;QAC5C,qBAAgB,GAAqB,IAAI,CAAC;QAC1C,WAAM,GAAG,IAAI,kBAAM,EAAE,CAAC;QACtB,WAAM,GAA2C,IAAI,CAAC,MAAO,CAAC;QAC9D,iBAAY,GAAiB,IAAI,wBAAY,CAA8B,IAAI,CAAC,MAAO,CAAC,CAAC;QAS/F,YAAE,CAAC,aAAa,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAE9B,+HAA+H;QAC/H,YAAE,CAAC,YAAY,CAAC,2CAA2C,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;QAE1E,oHAAoH;QACpH,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,eAAe,GAAG,GAAG,CAAC;QAExC,0EAA0E;QAC1E,IAAI,CAAC,MAAM,CAAC,MAAM,GAAG,MAAM,CAAC;QAE5B,6BAA6B;QAC7B,IAAI,CAAC,MAAM,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;QAEjC,QAAQ,CAAC,oBAAoB,CAA8B,IAAI,CAAC,MAAO,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC;QAEzF,IAAI,OAAO,IAAI,OAAO,CAAC,OAAO,EAAE;YAC/B,IAAI,CAAC,MAAM,CAAC,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;YACtC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC;SAChD;QAED,IAAI,CAAC,UAAU,GAAG,IAAI,8BAAgB,CAAC;YACtC,MAAM,QAAA;YACN,MAAM,EAA+B,IAAI,CAAC,MAAO;YACjD,YAAY,EAAE,IAAI,CAAC,YAAY;YAC/B,WAAW,EAAE;gBACZ,OAAO,EAAE,UAAC,EAAU,IAAK,OAAA,EAAE,EAAF,CAAE;gBAC3B,OAAO,EAAE,UAAC,GAAW,IAAK,OAAA,GAAG,EAAH,CAAG;aAC7B;SACD,CAAC,CAAC;QAEH,IAAI,CAAC,gBAAgB,GAAG,IAAI,8BAAgB,CAAC;YAC5C,MAAM,QAAA;YACN,MAAM,EAA+B,IAAI,CAAC,MAAO;SACjD,CAAC,CAAC;IACJ,CAAC;IAED;;;;OAIG;IACU,mCAAK,GAAlB;;;;KAAsC;IAEtC;;;;OAIG;IACU,sCAAQ,GAArB;;;gBACC,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,CAAC;gBAC1B,IAAI,CAAC,gBAAgB,CAAC,OAAO,EAAE,CAAC;gBAChC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,aAAa,CAAC,EAAE,CAAC;gBAEtC,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC;gBACnB,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC;gBACzB,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC;gBACvB,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC;;;;KAC7B;IAED;;;;;OAKG;IACI,uCAAS,GAAhB,UAAiB,MAAc;QAC9B,OAAO,MAAM,CAAC,YAAY,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACzC,CAAC;IAED;;;;OAIG;IACI,0CAAY,GAAnB;QACC,OAAO,IAAI,CAAC,MAAM,CAAC;IACpB,CAAC;IACF,0BAAC;AAAD,CAAC,AA5FD,IA4FC"}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@happy-dom/jest-environment",
-	"version": "2.24.1",
+	"version": "2.24.5",
 	"license": "MIT",
 	"homepage": "https://github.com/capricorn86/happy-dom/tree/master/packages/jest-environment",
 	"repository": "https://github.com/capricorn86/happy-dom",
@@ -25,7 +25,7 @@
 		"access": "public"
 	},
 	"scripts": {
-		"compile": "node ./bin/build-lit-ts-config && tsc --project tmp/tsconfig.lit-element.json && tsc --project tmp/tsconfig.lit-html.json && tsc",
+		"compile": "node ./bin/build-lit-ts-config && tsc --project tmp/tsconfig.lit-reactive-element.json && tsc --project tmp/tsconfig.lit-element.json && tsc --project tmp/tsconfig.lit-html.json && tsc --project tmp/tsconfig.lit.json && node ./bin/transform-lit-require.js && node ./bin/copy-tsdef-for-lit.js && node ./bin/copy-package-json-for-lit.js && tsc",
 		"watch": "npm run compile && tsc -w --preserveWatchOutput",
 		"lint": "eslint --ignore-path .gitignore --max-warnings 0 .",
 		"lint:fix": "eslint --ignore-path .gitignore --max-warnings 0 --fix .",
@@ -53,7 +53,7 @@
 		"@jest/environment": "^27.0.3",
 		"@jest/fake-timers": "^27.0.3",
 		"@jest/types": "^27.0.2",
-		"happy-dom": "^2.24.1",
+		"happy-dom": "^2.24.5",
 		"jest-mock": "^27.0.3",
 		"jest-util": "^27.0.2"
 	},
@@ -63,10 +63,12 @@
 		"@angular/core": "^10.0.7",
 		"@angular/platform-browser": "^10.0.7",
 		"@angular/platform-browser-dynamic": "^10.0.7",
+		"@lit/reactive-element": "^1.0.1",
 		"@types/jest": "^26.0.23",
 		"@types/node": "^15.6.0",
 		"@typescript-eslint/eslint-plugin": "^4.24.0",
 		"@typescript-eslint/parser": "^4.24.0",
+		"cpy": "^8.1.2",
 		"eslint": "^7.27.0",
 		"eslint-config-prettier": "^6.7.0",
 		"eslint-plugin-filenames": "^1.3.2",
@@ -75,9 +77,12 @@
 		"eslint-plugin-jsdoc": "^30.4.0",
 		"eslint-plugin-json": "^2.0.1",
 		"eslint-plugin-prettier": "^3.4.0",
+		"glob": "^7.1.6",
 		"jest": "^27.0.4",
 		"jquery": "^3.5.1",
-		"lit-element": "^2.4.0",
+		"lit": "^2.0.2",
+		"lit-element": "^3.0.0",
+		"lit-html": "^2.0.0",
 		"prettier": "^1.19.1",
 		"react": "^16.13.1",
 		"react-dom": "^16.13.1",
@@ -86,5 +91,5 @@
 		"vue": "^2.6.12",
 		"zone.js": "^0.10.3"
 	},
-	"gitHead": "402854e5e7ad9ce96e93b33c6d58f83df7f72653"
+	"gitHead": "e0f4f0203b1a258596eff7d2ae322f4947381df7"
 }

package/src/index.ts

@@ -15,8 +15,9 @@ import { Global, Config } from '@jest/types';
 export default class HappyDOMEnvironment implements JestEnvironment {
 	public fakeTimers: LegacyFakeTimers<number> = null;
 	public fakeTimersModern: ModernFakeTimers = null;
-	public global: Global.Global = <Global.Global>(<undefined>new Window());
-	public moduleMocker: ModuleMocker = new ModuleMocker(<NodeJS.Global>this.global);
+	public window = new Window();
+	public global: Global.Global = <Global.Global>(<unknown>this.window);
+	public moduleMocker: ModuleMocker = new ModuleMocker(<typeof globalThis>(<unknown>this.window));
 
 	/**
 	 * Constructor.
@@ -37,9 +38,9 @@ export default class HappyDOMEnvironment implements JestEnvironment {
 		this.global.Buffer = Buffer;
 
 		// Needed as Jest is using it
-		this.global.global = this.global;
+		this.window.global = this.global;
 
-		JestUtil.installCommonGlobals(this.global, config.globals);
+		JestUtil.installCommonGlobals(<typeof globalThis>(<unknown>this.window), config.globals);
 
 		if (options && options.console) {
 			this.global.console = options.console;
@@ -48,7 +49,7 @@ export default class HappyDOMEnvironment implements JestEnvironment {
 
 		this.fakeTimers = new LegacyFakeTimers({
 			config,
-			global: this.global,
+			global: <typeof globalThis>(<unknown>this.window),
 			moduleMocker: this.moduleMocker,
 			timerConfig: {
 				idToRef: (id: number) => id,
@@ -58,7 +59,7 @@ export default class HappyDOMEnvironment implements JestEnvironment {
 
 		this.fakeTimersModern = new ModernFakeTimers({
 			config,
-			global: this.global
+			global: <typeof globalThis>(<unknown>this.window)
 		});
 	}
 

package/test/lit-element/LitElement.test.ts

@@ -1,3 +1,4 @@
+import LitElementComponent from './LitElementComponent';
 import './LitElementComponent';
 
 const PROP1 = 'PROP1';
@@ -12,18 +13,22 @@ describe('LitElementComponent', () => {
 	});
 
 	it('Tests integration.', () => {
-		const shadowRoot = document.body.querySelector('lit-element-component').shadowRoot;
+		const litElement = <LitElementComponent>document.body.querySelector('lit-element-component');
+		const shadowRoot = litElement.shadowRoot;
 
 		expect(document.body.innerHTML).toBe(
 			`<lit-element-component prop1="${PROP1}"></lit-element-component>`
 		);
 
 		expect(shadowRoot.querySelector('span').innerText).toBe(PROP1);
-		expect(shadowRoot.innerHTML.replace(/[\s]/gm, '')).toBe(
+		expect(
+			shadowRoot.innerHTML
+				.replace(/[\s]/gm, '')
+				.replace(/<!--\?lit\$[0-9]+\$-->/gm, '<!--?lit$123456$-->')
+		).toBe(
 			`
 			<!---->Some text
-			<span><!---->${PROP1}<!----></span>!
-			<!---->
+			<span><!--?lit$123456$-->${PROP1}</span>!
 			<style>
 				span {
 					color: green;

package/test/lit-element/LitElementComponent.ts

@@ -1,25 +1,19 @@
-import {
-	LitElement,
-	TemplateResult,
-	html,
-	css,
-	customElement,
-	property
-} from '../../lib/node_modules/lit-element/lit-element';
+import { LitElement, TemplateResult, html, css, CSSResult } from '../../lib/node_modules/lit';
+import { customElement, property } from '../../lib/node_modules/lit/decorators';
 
 /**
  *
  */
 @customElement('lit-element-component')
-export class LitElementComponent extends LitElement {
-	public static styles = css`
+export default class LitElementComponent extends LitElement {
+	public static styles: CSSResult = css`
 		span {
 			color: green;
 		}
 	`;
 
-	@property({ type: 'string' })
-	public prop1 = null;
+	@property({ type: String })
+	public prop1: string = null;
 
 	/**
 	 * Renders the component.