Fix rule test for eslint flat config, remove warning for esm on vite

Mojang · Dec 23, 2024 · 4a08d49 · 4a08d49
1 parent 006ab76
commit 4a08d49
Show file tree

Hide file tree

Showing 7 changed files with 88 additions and 22 deletions.
diff --git a/libraries/math/vite.config.ts → libraries/math/vite.config.mts b/libraries/math/vite.config.ts → libraries/math/vite.config.mts
diff --git a/package-lock.json b/package-lock.json
diff --git a/tools/core-build-tasks/src/tasks/bundle.test.ts b/tools/core-build-tasks/src/tasks/bundle.test.ts
@@ -50,7 +50,7 @@ describe('postProcessOutputFiles with source map files at different path', () =>
         const expectedOutputFilePath = outputFile;
         const expectedSourceMapFilePath = path.resolve('./dist/debug/main.js.map');
         const expectedSourceMappingURL = '\n//# sourceMappingURL=../debug/main.js.map\n';
-        const expectedSourceMapFile = '../scripts/main';
+        const expectedSourceMapFile = '../scripts/main.js';
 
         const result = postProcessOutputFiles(parameters.options, parameters.buildResult);
 
@@ -78,7 +78,7 @@ describe('postProcessOutputFiles with source map files at different path', () =>
         const expectedOutputFilePath = outputFile;
         const expectedSourceMapFilePath = path.resolve('./dist/debug/main.js.map');
         const expectedSourceMappingURL = '\n//# sourceMappingURL=../debug/main.js.map\n';
-        const expectedSourceMapFile = '../scripts/main';
+        const expectedSourceMapFile = '../scripts/main.js';
 
         const result = postProcessOutputFiles(parameters.options, parameters.buildResult);
 
@@ -106,7 +106,7 @@ describe('postProcessOutputFiles with source map files at different path', () =>
         const expectedOutputFilePath = outputFile;
         const expectedSourceMapFilePath = path.resolve('./dist/debug/main.js.map');
         const expectedSourceMappingURL = '';
-        const expectedSourceMapFile = '../scripts/main';
+        const expectedSourceMapFile = '../scripts/main.js';
 
         const result = postProcessOutputFiles(parameters.options, parameters.buildResult);
 
@@ -134,7 +134,7 @@ describe('postProcessOutputFiles with source map files at different path', () =>
         const expectedOutputFilePath = outputFile;
         const expectedSourceMapFilePath = path.resolve('./dist/debug/main.js.map');
         const expectedSourceMappingURL = '';
-        const expectedSourceMapFile = '../scripts/main';
+        const expectedSourceMapFile = '../scripts/main.js';
 
         const result = postProcessOutputFiles(parameters.options, parameters.buildResult);
 
@@ -162,7 +162,7 @@ describe('postProcessOutputFiles with source map files at different path', () =>
         const expectedOutputFilePath = outputFile;
         const expectedSourceMapFilePath = path.resolve('./dist/debug/main.js.map');
         const expectedSourceMappingURL = '';
-        const expectedSourceMapFile = '../scripts/main';
+        const expectedSourceMapFile = '../scripts/main.js';
 
         const result = postProcessOutputFiles(parameters.options, parameters.buildResult);
 
@@ -193,7 +193,7 @@ describe('postProcessOutputFiles with source map files at same path', () => {
         const expectedOutputFilePath = outputFile;
         const expectedSourceMapFilePath = path.resolve('./dist/scripts/main.js.map');
         const expectedSourceMappingURL = '\n//# sourceMappingURL=main.js.map\n';
-        const expectedSourceMapFile = 'main';
+        const expectedSourceMapFile = 'main.js';
 
         const result = postProcessOutputFiles(parameters.options, parameters.buildResult);
 
@@ -221,7 +221,7 @@ describe('postProcessOutputFiles with source map files at same path', () => {
         const expectedOutputFilePath = outputFile;
         const expectedSourceMapFilePath = path.resolve('./dist/scripts/main.js.map');
         const expectedSourceMappingURL = '\n//# sourceMappingURL=main.js.map\n';
-        const expectedSourceMapFile = 'main';
+        const expectedSourceMapFile = 'main.js';
 
         const result = postProcessOutputFiles(parameters.options, parameters.buildResult);
 
@@ -249,7 +249,7 @@ describe('postProcessOutputFiles with source map files at same path', () => {
         const expectedOutputFilePath = outputFile;
         const expectedSourceMapFilePath = path.resolve('./dist/scripts/main.js.map');
         const expectedSourceMappingURL = '\n//# sourceMappingURL=main.js.map\n';
-        const expectedSourceMapFile = 'main';
+        const expectedSourceMapFile = 'main.js';
 
         const result = postProcessOutputFiles(parameters.options, parameters.buildResult);
 
@@ -277,7 +277,7 @@ describe('postProcessOutputFiles with source map files at same path', () => {
         const expectedOutputFilePath = outputFile;
         const expectedSourceMapFilePath = path.resolve('./dist/scripts/main.js.map');
         const expectedSourceMappingURL = '';
-        const expectedSourceMapFile = 'main';
+        const expectedSourceMapFile = 'main.js';
 
         const result = postProcessOutputFiles(parameters.options, parameters.buildResult);
 
@@ -305,7 +305,7 @@ describe('postProcessOutputFiles with source map files at same path', () => {
         const expectedOutputFilePath = outputFile;
         const expectedSourceMapFilePath = path.resolve('./dist/scripts/main.js.map');
         const expectedSourceMappingURL = '';
-        const expectedSourceMapFile = 'main';
+        const expectedSourceMapFile = 'main.js';
 
         const result = postProcessOutputFiles(parameters.options, parameters.buildResult);
 
@@ -333,7 +333,7 @@ describe('postProcessOutputFiles with source map files at same path', () => {
         const expectedOutputFilePath = outputFile;
         const expectedSourceMapFilePath = path.resolve('./dist/scripts/main.js.map');
         const expectedSourceMappingURL = '';
-        const expectedSourceMapFile = 'main';
+        const expectedSourceMapFile = 'main.js';
 
         const result = postProcessOutputFiles(parameters.options, parameters.buildResult);
 

diff --git a/...t-plugin-minecraft-linting/vite.config.ts → tools/core-build-tasks/vite.config.mts b/...t-plugin-minecraft-linting/vite.config.ts → tools/core-build-tasks/vite.config.mts
@@ -2,5 +2,5 @@
 import { configDefaults, defineConfig } from 'vitest/config';
 
 export default defineConfig({
-    test: { exclude: [...configDefaults.exclude, '**/build/**', '**/lib/**'], watch: false },
+    test: { exclude: [...configDefaults.exclude, '**/build/**', '**/lib/**', '**/lib-cjs/**'], watch: false },
 });
diff --git a/tools/eslint-plugin-minecraft-linting/package.json b/tools/eslint-plugin-minecraft-linting/package.json
@@ -26,9 +26,10 @@
         "tsconfig": "*"
     },
     "dependencies": {
-        "@typescript-eslint/utils": "^8.18.1",
-        "@typescript-eslint/parser": "^8.18.1",
         "@typescript-eslint/eslint-plugin": "^8.18.1",
+        "@typescript-eslint/parser": "^8.18.1",
+        "@typescript-eslint/rule-tester": "^8.18.1",
+        "@typescript-eslint/utils": "^8.18.1",
         "eslint": "^9.17.0"
     },
     "publishConfig": {

diff --git a/tools/eslint-plugin-minecraft-linting/src/Rules/AvoidUnnecessaryCommand.test.ts b/tools/eslint-plugin-minecraft-linting/src/Rules/AvoidUnnecessaryCommand.test.ts
@@ -1,19 +1,29 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-import { TSESLint } from '@typescript-eslint/utils';
+import { RuleTester } from '@typescript-eslint/rule-tester';
 import * as path from 'path';
-import { describe, it } from 'vitest';
+import { describe, it, afterAll } from 'vitest';
 import AvoidUnnecessaryCommand from './AvoidUnnecessaryCommand.js';
+import globals from 'globals';
+
+// RuleTester needs some global setup to integrate with test runners
+RuleTester.afterAll = afterAll;
+RuleTester.describe = describe;
+RuleTester.it = it;
+RuleTester.itOnly = it;
 
 describe('AvoidUnnecessaryCommand', () => {
     it('Passes TSESList.RuleTester', () => {
-        const ruleTester = new TSESLint.RuleTester({
-            parser: require.resolve('@typescript-eslint/parser'),
-            parserOptions: {
-                sourceType: 'module',
-                tsconfigRootDir: path.join(__dirname, './TestProject'),
-                project: path.join(__dirname, '../../tsconfig.json'),
+        const ruleTester = new RuleTester({
+            languageOptions: {
+                parserOptions: {
+                    ecmaVersion: 'latest',
+                    project: path.join(__dirname, '../../tsconfig.json'),
+                },
+                globals: {
+                    ...globals.node,
+                },
             },
         });
 

diff --git a/tools/core-build-tasks/vite.config.ts → ...-plugin-minecraft-linting/vite.config.mts b/tools/core-build-tasks/vite.config.ts → ...-plugin-minecraft-linting/vite.config.mts