#1215@trivial: Fixes build.

capricorn86 · Jan 18, 2024 · e1271d0 · e1271d0
1 parent d4c3329
commit e1271d0
Show file tree

Hide file tree

Showing 9 changed files with 703 additions and 3,090 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/happy-dom/package-lock.json b/packages/happy-dom/package-lock.json
diff --git a/packages/happy-dom/src/location/Location.ts b/packages/happy-dom/src/location/Location.ts
@@ -30,6 +30,7 @@ export default class Location extends URL {
 	 * Override set href.
 	 */
 	public get href(): string {
+		// @ts-ignore
 		return super.href;
 	}
 

diff --git a/packages/happy-dom/test/css/CSSParser.test.ts b/packages/happy-dom/test/css/CSSParser.test.ts
@@ -1,5 +1,5 @@
 import CSSStyleSheet from '../../src/css/CSSStyleSheet.js';
-import CSSParser from '../../src/css/CSSParser.js';
+import CSSParser from '../../src/css/utilities/CSSParser.js';
 import CSSStyleRule from '../../src/css/rules/CSSStyleRule.js';
 import CSSMediaRule from '../../src/css/rules/CSSMediaRule.js';
 import CSSParserInput from './data/CSSParserInput.js';

diff --git a/...st-environment/bin/build-lit-ts-config.js → ...t-environment/bin/build-lit-ts-config.cjs b/...st-environment/bin/build-lit-ts-config.js → ...t-environment/bin/build-lit-ts-config.cjs
diff --git a/...ironment/bin/copy-package-json-for-lit.js → ...ronment/bin/copy-package-json-for-lit.cjs b/...ironment/bin/copy-package-json-for-lit.js → ...ronment/bin/copy-package-json-for-lit.cjs
diff --git a/...est-environment/bin/copy-tsdef-for-lit.js → ...st-environment/bin/copy-tsdef-for-lit.cjs b/...est-environment/bin/copy-tsdef-for-lit.js → ...st-environment/bin/copy-tsdef-for-lit.cjs
@@ -2,7 +2,7 @@
 /* eslint-disable @typescript-eslint/no-var-requires*/
 
 const Path = require('path');
-const CPY = require('cpy');
+const ChildProcess = require('child_process');
 
 const LIBS = ['@lit/reactive-element', 'lit', 'lit-element', 'lit-html'];
 
@@ -18,11 +18,22 @@ function getLibPath(lib) {
 
 async function main() {
 	await Promise.all(
-		LIBS.map((lib) =>
-			CPY(
-				[Path.join(getLibPath(lib), '*.d.ts')],
-				Path.resolve(Path.join('lib', 'node_modules', lib))
-			)
+		LIBS.map(
+			(lib) =>
+				new Promise((resolve, reject) => {
+					ChildProcess.exec(
+						`cp ${Path.join(getLibPath(lib), '*.d.ts')} ${Path.resolve(
+							Path.join('lib', 'node_modules', lib)
+						)}`,
+						(error, stdout, stderr) => {
+							if (error || stderr) {
+								reject(error || new Error(stderr));
+								return;
+							}
+							resolve(stdout);
+						}
+					);
+				})
 		)
 	);
 }

diff --git a/...-environment/bin/transform-lit-require.js → ...environment/bin/transform-lit-require.cjs b/...-environment/bin/transform-lit-require.js → ...environment/bin/transform-lit-require.cjs
diff --git a/packages/jest-environment/package.json b/packages/jest-environment/package.json
@@ -25,7 +25,7 @@
 		"access": "public"
 	},
 	"scripts": {
-		"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",
+		"compile": "node ./bin/build-lit-ts-config.cjs && 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.cjs && node ./bin/copy-tsdef-for-lit.cjs && node ./bin/copy-package-json-for-lit.cjs && tsc",
 		"watch": "npm run compile && tsc -w --preserveWatchOutput",
 		"test": "jest",
 		"test:watch": "jest --watch",
@@ -50,42 +50,41 @@
 		"@jest/environment": "^29.4.0",
 		"@jest/fake-timers": "^29.4.0",
 		"@jest/types": "^29.4.0",
+		"happy-dom": "0.0.0",
 		"jest-mock": "^29.4.0",
-		"jest-util": "^29.4.0",
-		"happy-dom": "0.0.0"
+		"jest-util": "^29.4.0"
 	},
 	"devDependencies": {
-		"@typescript-eslint/eslint-plugin": "^5.16.0",
-		"@typescript-eslint/parser": "^5.16.0",
-		"@types/node": "^16.11.7",
-		"@types/react": "^18.2.0",
+		"@angular/common": "^10.0.7",
+		"@angular/compiler": "^10.0.7",
+		"@angular/core": "^10.0.7",
+		"@angular/platform-browser": "^10.0.7",
+		"@angular/platform-browser-dynamic": "^10.0.7",
+		"@lit/reactive-element": "^1.3.1",
+		"@radix-ui/react-select": "^1.2.2",
 		"@testing-library/react": "^14.0.0",
 		"@testing-library/user-event": "^14.5.1",
-		"@types/react-dom": "^18.2.0",
 		"@types/jest": "29.5.2",
-		"prettier": "^2.6.0",
-		"typescript": "^5.0.4",
+		"@types/node": "^16.11.7",
+		"@types/react": "^18.2.0",
+		"@types/react-dom": "^18.2.0",
+		"@typescript-eslint/eslint-plugin": "^5.16.0",
+		"@typescript-eslint/parser": "^5.16.0",
+		"express": "^4.18.2",
+		"glob": "^7.2.0",
 		"jest": "^29.4.0",
-		"ts-jest": "^29.1.1",
-		"react": "^18.2.0",
-		"react-dom": "^18.2.0",
-		"@radix-ui/react-select": "^1.2.2",
-		"vue": "^3.2.31",
+		"jquery": "^3.6.0",
 		"lit": "^2.2.1",
-		"@lit/reactive-element": "^1.3.1",
 		"lit-element": "^3.2.0",
 		"lit-html": "^2.2.1",
-		"@angular/core": "^10.0.7",
-		"@angular/platform-browser-dynamic": "^10.0.7",
-		"@angular/platform-browser": "^10.0.7",
-		"@angular/compiler": "^10.0.7",
-		"@angular/common": "^10.0.7",
+		"prettier": "^2.6.0",
+		"react": "^18.2.0",
+		"react-dom": "^18.2.0",
 		"rxjs": "^6.5.3",
-		"jquery": "^3.6.0",
-		"zone.js": "^0.10.3",
-		"glob": "^7.2.0",
-		"cpy": "^8.1.2",
-		"express": "^4.18.2"
+		"ts-jest": "^29.1.1",
+		"typescript": "^5.0.4",
+		"vue": "^3.2.31",
+		"zone.js": "^0.10.3"
 	},
 	"engines": {
 		"node": ">=16.0.0"