Add @godot/eslint-plugin-ignore-c-preprocessors

dsnopek · Dec 17, 2024 · 4334e85 · 4334e85
1 parent 5a18b0f
commit 4334e85
Show file tree

Hide file tree

Showing 8 changed files with 1,856 additions and 1,830 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -114,6 +114,7 @@ repos:
           - --config
           - platform/web/eslint.config.cjs
         additional_dependencies:
+          - 'https://github.com/godotengine/eslint-plugin-ignore-c-preprocessors/releases/download/0.1.1/godotengine-eslint-plugin-ignore-c-preprocessors-0.1.1.tgz'
           - '@eslint/js@^9.3.0'
           - '@html-eslint/eslint-plugin@^0.24.1'
           - '@html-eslint/parser@^0.24.1'

diff --git a/modules/webxr/native/eslint.config.mjs b/modules/webxr/native/eslint.config.mjs
@@ -0,0 +1,3 @@
+import config from "../../../platform/web/eslint.config.cjs";
+
+export default config;
diff --git a/modules/webxr/native/jsconfig.json b/modules/webxr/native/jsconfig.json
@@ -0,0 +1,5 @@
+{
+	"include": [
+		"./*.js",
+	]
+}
diff --git a/modules/webxr/native/library_godot_webxr.js b/modules/webxr/native/library_godot_webxr.js
@@ -30,15 +30,15 @@
 
 const GodotWebXR = {
 	$GodotWebXR__deps: [
-#if EMSCRIPTEN_VERSION_IS_SMALLER_THAN(3,1,71)
+#if EMSCRIPTEN_VERSION_IS_LESS_THAN(3,1,71)
 		'$Browser',
 #else
 		'$MainLoop',
 #endif
 		'$GL',
 		'$GodotRuntime',
 		'$runtimeKeepalivePush',
-		'$runtimeKeepalivePop'
+		'$runtimeKeepalivePop',
 	],
 	$GodotWebXR: {
 		gl: null,
@@ -73,7 +73,7 @@ const GodotWebXR = {
 			}
 		},
 		monkeyPatchRequestAnimationFrame: (enable) => {
-#if EMSCRIPTEN_VERSION_IS_SMALLER_THAN(3,1,71)
+#if EMSCRIPTEN_VERSION_IS_LESS_THAN(3,1,71)
 			const MainLoop = Browser;
 #endif
 			if (GodotWebXR.orig_requestAnimationFrame === null) {
@@ -84,7 +84,7 @@ const GodotWebXR = {
 				: GodotWebXR.orig_requestAnimationFrame;
 		},
 		pauseResumeMainLoop: () => {
-#if EMSCRIPTEN_VERSION_IS_SMALLER_THAN(3,1,71)
+#if EMSCRIPTEN_VERSION_IS_LESS_THAN(3,1,71)
 			const MainLoop = Browser.mainLoop;
 #endif
 			// Once both GodotWebXR.session and GodotWebXR.space are set or

diff --git a/platform/web/eslint.config.cjs b/platform/web/eslint.config.cjs
@@ -5,6 +5,7 @@ const htmlPlugin = require('@html-eslint/eslint-plugin');
 const pluginJs = require('@eslint/js');
 const pluginReference = require('eslint-plugin-html');
 const stylistic = require('@stylistic/eslint-plugin');
+const pluginIgnoreCPreprocessors = require("@godot/eslint-plugin-ignore-c-preprocessors").default;
 
 if (process && process.env && process.env.npm_command && !fs.existsSync('./platform/web/eslint.config.cjs')) {
 	throw Error('eslint must be run from the Godot project root folder');
@@ -140,6 +141,10 @@ module.exports = [
 	// libraries and modules (browser)
 	{
 		files: ['js/libs/**/*.js', 'platform/web/js/libs/**/*.js', 'modules/**/*.js'],
+		plugins: {
+			"ignore-c-preprocessors": pluginIgnoreCPreprocessors
+		},
+		processor: "ignore-c-preprocessors/ignore-c-preprocessors",
 		languageOptions: {
 			globals: {
 				...globals.browser,

diff --git a/platform/web/js/libs/library_godot_macros.js b/platform/web/js/libs/library_godot_macros.js
@@ -1,5 +1,7 @@
+/* eslint-disable */
 {{{
-	globalThis.___EMSCRIPTEN_VERSION_PARSED = globalThis.EMSCRIPTEN_VERSION.split(".").map((n) => parseInt(n));
+/* eslint-enable */
+	globalThis.___EMSCRIPTEN_VERSION_PARSED = globalThis.EMSCRIPTEN_VERSION.split('.').map((n) => parseInt(n, 10));
 
 	globalThis.___SEMVER_IS_GREATER_THAN = (a, b, { orEqual = false } = {}) => {
 		const [aMajor, aMinor, aPatch] = a;
@@ -15,7 +17,7 @@
 	};
 
 	globalThis.EMSCRIPTEN_VERSION_IS_GREATER_THAN = (major, minor, patch) => {
-		const isGreater =  globalThis.___SEMVER_IS_GREATER_THAN(globalThis.___EMSCRIPTEN_VERSION_PARSED, [major, minor, patch]);
+		const isGreater = globalThis.___SEMVER_IS_GREATER_THAN(globalThis.___EMSCRIPTEN_VERSION_PARSED, [major, minor, patch]);
 		return isGreater;
 	};
 
@@ -24,13 +26,15 @@
 		return isGreaterOrEqual;
 	};
 
-	globalThis.EMSCRIPTEN_VERSION_IS_SMALLER_THAN = (major, minor, patch) => {
+	globalThis.EMSCRIPTEN_VERSION_IS_LESS_THAN = (major, minor, patch) => {
 		const isGreaterOrEqual = globalThis.___SEMVER_IS_GREATER_THAN(globalThis.___EMSCRIPTEN_VERSION_PARSED, [major, minor, patch], { orEqual: true });
 		return !isGreaterOrEqual;
 	};
 
-	globalThis.EMSCRIPTEN_VERSION_IS_SMALLER_THAN_OR_EQUAL = (major, minor, patch) => {
+	globalThis.EMSCRIPTEN_VERSION_IS_LESS_THAN_OR_EQUAL = (major, minor, patch) => {
 		const isGreater = globalThis.___SEMVER_IS_GREATER_THAN(globalThis.___EMSCRIPTEN_VERSION_PARSED, [major, minor, patch]);
 		return !isGreater;
 	};
+/* eslint-disable */
 }}}
+/* eslint-enable */
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		import config from "../../../platform/web/eslint.config.cjs";

		export default config;