Merge pull request #1222 from capricorn86/task/1215-add-support-for-n…

…on-nodejs-environments

Task/1215 remove unnecessary dependencies

package.json

@@ -35,6 +35,6 @@
 		"typescript": "^5.0.4"
 	},
 	"engines": {
-		"node": ">=12.13"
+		"node": ">=16.0.0"
 	}
 }

packages/global-registrator/package.json

@@ -82,5 +82,8 @@
 		"typescript": "^5.0.4",
 		"react": "^18.2.0",
 		"react-dom": "^18.2.0"
+	},
+	"engines": {
+		"node": ">=16.0.0"
 	}
 }

packages/happy-dom/README.md

@@ -49,7 +49,7 @@ npm install happy-dom
 
 # Usage
 
-A simple example of how you can use Happy DOM.
+Happy DOM can be used as a simulated [Browser](https://github.com/capricorn86/happy-dom/wiki/Browser) or by using the [Window](https://github.com/capricorn86/happy-dom/wiki/Window) class directly to quickly setup up a DOM.
 
 ## Window
 

packages/happy-dom/package.json

@@ -75,23 +75,19 @@
 		"test:debug": "vitest run --inspect-brk --threads=false"
 	},
 	"dependencies": {
-		"css.escape": "^1.5.1",
 		"entities": "^4.5.0",
-		"iconv-lite": "^0.6.3",
 		"webidl-conversions": "^7.0.0",
-		"whatwg-encoding": "^2.0.0",
 		"whatwg-mimetype": "^3.0.0"
 	},
 	"devDependencies": {
-		"@types/css.escape": "^1.5.0",
 		"@types/node": "^16.11.7",
-		"@types/node-fetch": "^2.6.1",
-		"@typescript-eslint/eslint-plugin": "^5.16.0",
-		"@typescript-eslint/parser": "^5.16.0",
 		"@vitest/ui": "^0.33.0",
 		"@webref/css": "6.6.2",
 		"prettier": "^2.6.0",
 		"typescript": "^5.0.4",
 		"vitest": "^0.32.4"
+	},
+	"engines": {
+		"node": ">=16.0.0"
 	}
 }

packages/happy-dom/src/async-task-manager/AsyncTaskManager.ts

@@ -1,8 +1,8 @@
 // We need to set this as a global constant, so that using fake timers in Jest and Vitest won't override this on the global object.
 const TIMER = {
-	setImmediate: setImmediate,
-	clearImmediate: clearImmediate,
-	clearTimeout: clearTimeout
+	setImmediate: globalThis.setImmediate.bind(globalThis),
+	clearImmediate: globalThis.clearImmediate.bind(globalThis),
+	clearTimeout: globalThis.clearTimeout.bind(globalThis)
 };
 
 /**

packages/happy-dom/src/console/VirtualConsole.ts

@@ -2,7 +2,6 @@ import IVirtualConsolePrinter from './types/IVirtualConsolePrinter.js';
 import VirtualConsoleLogLevelEnum from './enums/VirtualConsoleLogLevelEnum.js';
 import VirtualConsoleLogTypeEnum from './enums/VirtualConsoleLogTypeEnum.js';
 import IVirtualConsoleLogGroup from './types/IVirtualConsoleLogGroup.js';
-import * as PerfHooks from 'perf_hooks';
 import { ConsoleConstructor } from 'console';
 
 /**
@@ -276,7 +275,7 @@ export default class VirtualConsole implements Console {
 	 * @param [label=default] Label.
 	 */
 	public time(label = 'default'): void {
-		this.#time[label] = PerfHooks.performance.now();
+		this.#time[label] = performance.now();
 	}
 
 	/**
@@ -288,7 +287,7 @@ export default class VirtualConsole implements Console {
 	public timeEnd(label = 'default'): void {
 		const time = this.#time[label];
 		if (time) {
-			const duration = PerfHooks.performance.now() - time;
+			const duration = performance.now() - time;
 			this.#printer.print({
 				type: VirtualConsoleLogTypeEnum.timeEnd,
 				level: VirtualConsoleLogLevelEnum.info,
@@ -308,7 +307,7 @@ export default class VirtualConsole implements Console {
 	public timeLog(label = 'default', ...args: Array<object | string>): void {
 		const time = this.#time[label];
 		if (time) {
-			const duration = PerfHooks.performance.now() - time;
+			const duration = performance.now() - time;
 			this.#printer.print({
 				type: VirtualConsoleLogTypeEnum.timeLog,
 				level: VirtualConsoleLogLevelEnum.info,

packages/happy-dom/src/css/CSS.ts

@@ -1,6 +1,6 @@
+import CSSEscaper from './utilities/CSSEscaper.js';
 import CSSUnitValue from './CSSUnitValue.js';
 import CSSUnits from './CSSUnits.js';
-import CSSEscape from 'css.escape';
 
 /**
  * The CSS interface holds useful CSS-related methods.
@@ -38,6 +38,6 @@ export default class CSS {
 	 * @returns Escaped string.
 	 */
 	public escape(value: string): string {
-		return CSSEscape(value);
+		return CSSEscaper.escape(value);
 	}
 }

packages/happy-dom/src/css/CSSStyleSheet.ts

@@ -1,6 +1,6 @@
 import DOMException from '../exception/DOMException.js';
 import DOMExceptionNameEnum from '../exception/DOMExceptionNameEnum.js';
-import CSSParser from './CSSParser.js';
+import CSSParser from './utilities/CSSParser.js';
 import CSSRule from './CSSRule.js';
 import MediaList from './MediaList.js';
 

packages/happy-dom/src/css/utilities/CSSEscaper.ts

@@ -0,0 +1,87 @@
+/**
+ * CSS escaper.
+ */
+export default class CSSEscaper {
+	/**
+	 * Escapes CSS.
+	 *
+	 * Based on:
+	 * https://github.com/mathiasbynens/CSS.escape
+	 *
+	 * @param cssText CSS.
+	 * @returns Escaped CSS.
+	 */
+	public static escape(cssText: string): string {
+		if (arguments.length == 0) {
+			throw new TypeError('`CSS.escape` requires an argument.');
+		}
+		const returnValue = String(cssText);
+		const length = returnValue.length;
+		let index = -1;
+		let codeUnit;
+		let result = '';
+		const firstCodeUnit = returnValue.charCodeAt(0);
+
+		if (
+			// If the character is the first character and is a `-` (U+002D), and
+			// There is no second character, […]
+			length == 1 &&
+			firstCodeUnit == 0x002d
+		) {
+			return '\\' + returnValue;
+		}
+
+		while (++index < length) {
+			codeUnit = returnValue.charCodeAt(index);
+			// Note: there’s no need to special-case astral symbols, surrogate
+			// Pairs, or lone surrogates.
+
+			// If the character is NULL (U+0000), then the REPLACEMENT CHARACTER
+			// (U+FFFD).
+			if (codeUnit == 0x0000) {
+				result += '\uFFFD';
+				continue;
+			}
+
+			if (
+				// If the character is in the range [\1-\1F] (U+0001 to U+001F) or is
+				// U+007F, […]
+				(codeUnit >= 0x0001 && codeUnit <= 0x001f) ||
+				codeUnit == 0x007f ||
+				// If the character is the first character and is in the range [0-9]
+				// (U+0030 to U+0039), […]
+				(index == 0 && codeUnit >= 0x0030 && codeUnit <= 0x0039) ||
+				// If the character is the second character and is in the range [0-9]
+				// (U+0030 to U+0039) and the first character is a `-` (U+002D), […]
+				(index == 1 && codeUnit >= 0x0030 && codeUnit <= 0x0039 && firstCodeUnit == 0x002d)
+			) {
+				// https://drafts.csswg.org/cssom/#escape-a-character-as-code-point
+				result += '\\' + codeUnit.toString(16) + ' ';
+				continue;
+			}
+
+			// If the character is not handled by one of the above rules and is
+			// Greater than or equal to U+0080, is `-` (U+002D) or `_` (U+005F), or
+			// Is in one of the ranges [0-9] (U+0030 to U+0039), [A-Z] (U+0041 to
+			// U+005A), or [a-z] (U+0061 to U+007A), […]
+			if (
+				codeUnit >= 0x0080 ||
+				codeUnit == 0x002d ||
+				codeUnit == 0x005f ||
+				(codeUnit >= 0x0030 && codeUnit <= 0x0039) ||
+				(codeUnit >= 0x0041 && codeUnit <= 0x005a) ||
+				(codeUnit >= 0x0061 && codeUnit <= 0x007a)
+			) {
+				// The character itself
+				result += returnValue.charAt(index);
+				continue;
+			}
+
+			// Otherwise, the escaped character.
+			// https://drafts.csswg.org/cssom/#escape-a-character
+			result += '\\' + returnValue.charAt(index);
+		}
+
+		return result;
+	}
+}

packages/happy-dom/src/css/CSSParser.ts → packages/happy-dom/src/css/utilities/CSSParser.ts

@@ -1,13 +1,13 @@
-import CSSRule from './CSSRule.js';
-import * as PropertySymbol from '../PropertySymbol.js';
-import CSSStyleSheet from './CSSStyleSheet.js';
-import CSSStyleRule from './rules/CSSStyleRule.js';
-import CSSKeyframeRule from './rules/CSSKeyframeRule.js';
-import CSSKeyframesRule from './rules/CSSKeyframesRule.js';
-import CSSMediaRule from './rules/CSSMediaRule.js';
-import CSSContainerRule from './rules/CSSContainerRule.js';
-import CSSSupportsRule from './rules/CSSSupportsRule.js';
-import SelectorParser from '../query-selector/SelectorParser.js';
+import CSSRule from '../CSSRule.js';
+import * as PropertySymbol from '../../PropertySymbol.js';
+import CSSStyleSheet from '../CSSStyleSheet.js';
+import CSSStyleRule from '../rules/CSSStyleRule.js';
+import CSSKeyframeRule from '../rules/CSSKeyframeRule.js';
+import CSSKeyframesRule from '../rules/CSSKeyframesRule.js';
+import CSSMediaRule from '../rules/CSSMediaRule.js';
+import CSSContainerRule from '../rules/CSSContainerRule.js';
+import CSSSupportsRule from '../rules/CSSSupportsRule.js';
+import SelectorParser from '../../query-selector/SelectorParser.js';
 
 const COMMENT_REGEXP = /\/\*[\s\S]*?\*\//gm;
 

packages/happy-dom/src/event/Event.ts

@@ -5,7 +5,6 @@ import IBrowserWindow from '../window/IBrowserWindow.js';
 import IShadowRoot from '../nodes/shadow-root/IShadowRoot.js';
 import IEventTarget from './IEventTarget.js';
 import NodeTypeEnum from '../nodes/node/NodeTypeEnum.js';
-import { performance } from 'perf_hooks';
 import EventPhaseEnum from './EventPhaseEnum.js';
 import IDocument from '../nodes/document/IDocument.js';
 

packages/happy-dom/src/fetch/Request.ts

@@ -12,7 +12,6 @@ import FetchBodyUtility from './utilities/FetchBodyUtility.js';
 import AbortSignal from './AbortSignal.js';
 import Stream from 'stream';
 import Blob from '../file/Blob.js';
-import { TextDecoder } from 'util';
 import FetchRequestValidationUtility from './utilities/FetchRequestValidationUtility.js';
 import IRequestReferrerPolicy from './types/IRequestReferrerPolicy.js';
 import IRequestRedirect from './types/IRequestRedirect.js';

packages/happy-dom/src/fetch/Response.ts

@@ -13,7 +13,6 @@ import FormData from '../form-data/FormData.js';
 import FetchBodyUtility from './utilities/FetchBodyUtility.js';
 import DOMException from '../exception/DOMException.js';
 import DOMExceptionNameEnum from '../exception/DOMExceptionNameEnum.js';
-import { TextDecoder } from 'util';
 import MultipartFormDataParser from './multipart/MultipartFormDataParser.js';
 import IBrowserWindow from '../window/IBrowserWindow.js';
 import IBrowserFrame from '../browser/types/IBrowserFrame.js';

packages/happy-dom/src/fetch/types/IRequestBody.ts

@@ -1,11 +1,12 @@
 import { URLSearchParams } from 'url';
 import FormData from '../../form-data/FormData.js';
 import Blob from '../../file/Blob.js';
+import Stream from 'stream';
 
 type IRequestBody =
 	| ArrayBuffer
 	| ArrayBufferView
-	| NodeJS.ReadableStream
+	| Stream.Readable
 	| string
 	| URLSearchParams
 	| Blob

packages/happy-dom/src/fetch/types/IResponse.ts

@@ -1,6 +1,7 @@
 import IHeaders from './IHeaders.js';
 import IBlob from '../../file/IBlob.js';
 import Stream from 'stream';
+import { Buffer } from 'buffer';
 
 /**
  * Fetch response.

packages/happy-dom/src/fetch/types/IResponseBody.ts

@@ -1,11 +1,12 @@
 import { URLSearchParams } from 'url';
 import FormData from '../../form-data/FormData.js';
 import Blob from '../../file/Blob.js';
+import Stream from 'stream';
 
 type IResponseBody =
 	| ArrayBuffer
 	| ArrayBufferView
-	| NodeJS.ReadableStream
+	| Stream.Readable
 	| string
 	| URLSearchParams
 	| Blob

packages/happy-dom/src/fetch/utilities/FetchBodyUtility.ts

@@ -8,6 +8,7 @@ import DOMException from '../../exception/DOMException.js';
 import DOMExceptionNameEnum from '../../exception/DOMExceptionNameEnum.js';
 import IRequestBody from '../types/IRequestBody.js';
 import IResponseBody from '../types/IResponseBody.js';
+import { Buffer } from 'buffer';
 
 /**
  * Fetch body utility.

packages/happy-dom/src/fetch/utilities/SyncFetchScriptBuilder.ts

@@ -1,4 +1,5 @@
 import FetchHTTPSCertificate from '../certificate/FetchHTTPSCertificate.js';
+import { Buffer } from 'buffer';
 
 /**
  * Synchronous fetch script builder.

packages/happy-dom/src/file/Blob.ts

@@ -1,4 +1,5 @@
 import IBlob from './IBlob.js';
+import { Buffer } from 'buffer';
 import * as PropertySymbol from '../PropertySymbol.js';
 
 /**

packages/happy-dom/src/file/File.ts

@@ -1,4 +1,5 @@
 import Blob from './Blob.js';
+import { Buffer } from 'buffer';
 
 /**
  * Reference: