chore: update esbuild, fix worker thread definition (#4326)

zwave-js · Mar 15, 2022 · fdfd66c · fdfd66c
1 parent 25f5393
commit fdfd66c
Show file tree

Hide file tree

Showing 12 changed files with 143 additions and 117 deletions.
diff --git a/.github/renovate.json b/.github/renovate.json
@@ -26,5 +26,5 @@
 			"automerge": true
 		}
 	],
-	"ignoreDeps": ["node", "esbuild"]
+	"ignoreDeps": ["node"]
 }
diff --git a/package.json b/package.json
@@ -61,7 +61,7 @@
     "commitizen": "^4.2.4",
     "coveralls": "^3.1.1",
     "cz-conventional-changelog": "^3.3.0",
-    "esbuild": "0.14.1",
+    "esbuild": "0.14.27",
     "esbuild-register": "^3.3.2",
     "eslint": "^8.10.0",
     "eslint-config-prettier": "^8.5.0",

diff --git a/packages/config/package.json b/packages/config/package.json
@@ -63,7 +63,7 @@
     "@zwave-js/maintenance": "workspace:*",
     "axios": "^0.26.0",
     "comment-json": "^4.2.2",
-    "esbuild": "0.14.1",
+    "esbuild": "0.14.27",
     "esbuild-register": "^3.3.2",
     "jest-extended": "^2.0.0",
     "js-levenshtein": "^1.1.6",

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -52,7 +52,7 @@
     "@types/jest": "^27.4.1",
     "@types/node": "^15.12.5",
     "@types/triple-beam": "^1.3.2",
-    "esbuild": "0.14.1",
+    "esbuild": "0.14.27",
     "esbuild-register": "^3.3.2",
     "jest-extended": "^2.0.0",
     "typescript": "4.6.2"

diff --git a/packages/maintenance/package.json b/packages/maintenance/package.json
@@ -44,7 +44,7 @@
     "@zwave-js/shared": "workspace:*",
     "ansi-colors": "^4.1.1",
     "clipboardy": "^2.3.0",
-    "esbuild": "0.14.1",
+    "esbuild": "0.14.27",
     "esbuild-register": "^3.3.2",
     "fs-extra": "^10.0.1",
     "jest-extended": "^2.0.0",

diff --git a/packages/maintenance/src/generateTypedDocs.ts b/packages/maintenance/src/generateTypedDocs.ts
@@ -500,33 +500,29 @@ async function main(): Promise<void> {
 	}
 }
 
-if (isMainThread) {
-	if (require.main === module) {
-		void main();
-	}
-} else {
-	// Worker thread, export the available methods
-	let _program: Project | undefined;
-	function getProgram(): Project {
-		if (!_program) {
-			_program = new Project({ tsConfigFilePath });
-		}
-		return _program;
+// To be able to use this as a worker thread, export the available methods
+let _program: Project | undefined;
+function getProgram(): Project {
+	if (!_program) {
+		_program = new Project({ tsConfigFilePath });
 	}
+	return _program;
+}
 
-	function processImport(filename: string): Promise<boolean> {
-		return processDocFile(getProgram(), filename);
-	}
+export function processImport(filename: string): Promise<boolean> {
+	return processDocFile(getProgram(), filename);
+}
 
-	function processCC(
-		filename: string,
-	): Promise<{ generatedIndex: string; generatedSidebar: any } | undefined> {
-		const sourceFile = getProgram().getSourceFileOrThrow(filename);
-		return processCCDocFile(sourceFile);
-	}
+export function processCC(
+	filename: string,
+): Promise<{ generatedIndex: string; generatedSidebar: any } | undefined> {
+	const sourceFile = getProgram().getSourceFileOrThrow(filename);
+	return processCCDocFile(sourceFile);
+}
 
-	module.exports = {
-		processImport,
-		processCC,
-	};
+// If this is NOT run as a worker thread, execute the main function
+if (isMainThread) {
+	if (require.main === module) {
+		void main();
+	}
 }
diff --git a/packages/nvmedit/package.json b/packages/nvmedit/package.json
@@ -52,7 +52,7 @@
     "@types/node": "^15.12.5",
     "@types/semver": "^7.3.9",
     "@types/yargs": "^17.0.9",
-    "esbuild": "0.14.1",
+    "esbuild": "0.14.27",
     "esbuild-register": "^3.3.2",
     "jest-extended": "^2.0.0",
     "typescript": "4.6.2"

diff --git a/packages/serial/package.json b/packages/serial/package.json
@@ -51,7 +51,7 @@
     "@types/node": "^15.12.5",
     "@zwave-js/testing": "workspace:*",
     "ansi-colors": "^4.1.1",
-    "esbuild": "0.14.1",
+    "esbuild": "0.14.27",
     "esbuild-register": "^3.3.2",
     "jest-extended": "^2.0.0",
     "typescript": "4.6.2"

diff --git a/packages/shared/package.json b/packages/shared/package.json
@@ -43,7 +43,7 @@
     "@types/fs-extra": "^9.0.13",
     "@types/jest": "^27.4.1",
     "@types/node": "^15.12.5",
-    "esbuild": "0.14.1",
+    "esbuild": "0.14.27",
     "esbuild-register": "^3.3.2",
     "jest-extended": "^2.0.0",
     "typescript": "4.6.2"

diff --git a/packages/testing/package.json b/packages/testing/package.json
@@ -39,7 +39,7 @@
     "@types/triple-beam": "^1.3.2",
     "@zwave-js/core": "workspace:*",
     "ansi-colors": "^4.1.1",
-    "esbuild": "0.14.1",
+    "esbuild": "0.14.27",
     "esbuild-register": "^3.3.2",
     "jest-extended": "^2.0.0",
     "triple-beam": "*",

diff --git a/packages/zwave-js/package.json b/packages/zwave-js/package.json
@@ -85,7 +85,7 @@
     "@xstate/test": "^0.5.1",
     "@zwave-js/maintenance": "workspace:*",
     "@zwave-js/testing": "workspace:*",
-    "esbuild": "0.14.1",
+    "esbuild": "0.14.27",
     "esbuild-register": "^3.3.2",
     "jest-extended": "^2.0.0",
     "mockdate": "^3.0.5",