@minecraft/core-build-tasks 1.1.0 → 1.1.1

package/lib/tasks/coreLint.d.ts

@@ -1,2 +1,2 @@
-import type { TaskFunction } from 'just-scripts';
+import { TaskFunction } from 'just-scripts';
 export declare function coreLint(files: string[], fix?: boolean): TaskFunction;

package/lib/tasks/coreLint.js

@@ -6,19 +6,49 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.coreLint = void 0;
+const child_process_1 = require("child_process");
 const fs_1 = require("fs");
 const just_scripts_1 = require("just-scripts");
 const path_1 = __importDefault(require("path"));
 const process_1 = __importDefault(require("process"));
+const LEGACY_CONFIG_FILES = ['.eslintrc.js'];
+const FLAT_CONFIG_FILES = ['eslint.config.js', 'eslint.config.mjs', 'eslint.config.cjs'];
+const POSSIBLE_CONFIG_FILES = [...LEGACY_CONFIG_FILES, ...FLAT_CONFIG_FILES];
+function getConfigFilePath() {
+    for (const file of POSSIBLE_CONFIG_FILES) {
+        const configPath = path_1.default.resolve(process_1.default.cwd(), file);
+        if ((0, fs_1.existsSync)(configPath)) {
+            return configPath;
+        }
+    }
+    return undefined;
+}
+function eslintTask(files, fix) {
+    return () => {
+        const configFilePath = getConfigFilePath();
+        if (configFilePath) {
+            // Setting ESLINT_USE_FLAT_CONFIG environment variable to indicate if the config file is flat or not.
+            // ESLint is not able to determine the type in all the cases, so we need to help it.
+            process_1.default.env['ESLINT_USE_FLAT_CONFIG'] = FLAT_CONFIG_FILES.some(file => configFilePath.endsWith(file))
+                ? 'true'
+                : 'false';
+            const cmd = ['eslint', ...files, '--config', configFilePath, ...(fix ? ['--fix'] : []), '--color'].join(' ');
+            just_scripts_1.logger.info(`Running command: ${cmd}`);
+            return (0, child_process_1.execSync)(cmd, { stdio: 'inherit' });
+        }
+        // no-op if the config file does not exist.
+        return Promise.resolve();
+    };
+}
 function coreLint(files, fix) {
     (0, just_scripts_1.task)('verify-lint', () => {
-        // If the process working directory does not have an `.eslintrc.js` file, fail the build
-        const lintConfig = path_1.default.resolve(process_1.default.cwd(), '.eslintrc.js');
-        if (!(0, fs_1.existsSync)(lintConfig)) {
-            throw new Error(`.eslintrc.js not found at ${lintConfig}.`);
+        // If the process working directory does not have an eslint configuration file, fail the build:
+        // https://eslint.org/docs/latest/use/configure/configuration-files-new
+        if (!getConfigFilePath()) {
+            throw new Error(`ESLint config file not found at ${process_1.default.cwd()}. Possible values: [${POSSIBLE_CONFIG_FILES.join(', ')}]`);
         }
     });
-    (0, just_scripts_1.task)('eslint', (0, just_scripts_1.eslintTask)({ files, fix }));
+    (0, just_scripts_1.task)('eslint', eslintTask(files, fix));
     (0, just_scripts_1.task)('prettier-fix', (0, just_scripts_1.prettierTask)({ files }));
     (0, just_scripts_1.task)('prettier-check', (0, just_scripts_1.prettierCheckTask)({ files }));
     return (0, just_scripts_1.series)('verify-lint', 'eslint', (0, just_scripts_1.condition)('prettier-check', () => !fix), (0, just_scripts_1.condition)('prettier-fix', () => !!fix));

package/lib/tasks/coreLint.js.map

@@ -1 +1 @@
-{"version":3,"file":"coreLint.js","sourceRoot":"","sources":["../../src/tasks/coreLint.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;AAElC,2BAAgC;AAEhC,+CAAoG;AACpG,gDAAwB;AACxB,sDAA8B;AAE9B,SAAgB,QAAQ,CAAC,KAAe,EAAE,GAAa;IACnD,IAAA,mBAAI,EAAC,aAAa,EAAE,GAAG,EAAE;QACrB,wFAAwF;QACxF,MAAM,UAAU,GAAG,cAAI,CAAC,OAAO,CAAC,iBAAO,CAAC,GAAG,EAAE,EAAE,cAAc,CAAC,CAAC;QAC/D,IAAI,CAAC,IAAA,eAAU,EAAC,UAAU,CAAC,EAAE;YACzB,MAAM,IAAI,KAAK,CAAC,6BAA6B,UAAU,GAAG,CAAC,CAAC;SAC/D;IACL,CAAC,CAAC,CAAC;IACH,IAAA,mBAAI,EAAC,QAAQ,EAAE,IAAA,yBAAU,EAAC,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC;IAC3C,IAAA,mBAAI,EAAC,cAAc,EAAE,IAAA,2BAAY,EAAC,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC;IAC9C,IAAA,mBAAI,EAAC,gBAAgB,EAAE,IAAA,gCAAiB,EAAC,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC;IAErD,OAAO,IAAA,qBAAM,EACT,aAAa,EACb,QAAQ,EACR,IAAA,wBAAS,EAAC,gBAAgB,EAAE,GAAG,EAAE,CAAC,CAAC,GAAG,CAAC,EACvC,IAAA,wBAAS,EAAC,cAAc,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CACzC,CAAC;AACN,CAAC;AAlBD,4BAkBC"}
+{"version":3,"file":"coreLint.js","sourceRoot":"","sources":["../../src/tasks/coreLint.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;AAElC,iDAAyC;AACzC,2BAAgC;AAChC,+CAA8G;AAC9G,gDAAwB;AACxB,sDAA8B;AAE9B,MAAM,mBAAmB,GAAG,CAAC,cAAc,CAAC,CAAC;AAC7C,MAAM,iBAAiB,GAAG,CAAC,kBAAkB,EAAE,mBAAmB,EAAE,mBAAmB,CAAC,CAAC;AACzF,MAAM,qBAAqB,GAAG,CAAC,GAAG,mBAAmB,EAAE,GAAG,iBAAiB,CAAC,CAAC;AAE7E,SAAS,iBAAiB;IACtB,KAAK,MAAM,IAAI,IAAI,qBAAqB,EAAE;QACtC,MAAM,UAAU,GAAG,cAAI,CAAC,OAAO,CAAC,iBAAO,CAAC,GAAG,EAAE,EAAE,IAAI,CAAC,CAAC;QACrD,IAAI,IAAA,eAAU,EAAC,UAAU,CAAC,EAAE;YACxB,OAAO,UAAU,CAAC;SACrB;KACJ;IAED,OAAO,SAAS,CAAC;AACrB,CAAC;AAED,SAAS,UAAU,CAAC,KAAe,EAAE,GAAa;IAC9C,OAAO,GAAG,EAAE;QACR,MAAM,cAAc,GAAG,iBAAiB,EAAE,CAAC;QAC3C,IAAI,cAAc,EAAE;YAChB,qGAAqG;YACrG,oFAAoF;YACpF,iBAAO,CAAC,GAAG,CAAC,wBAAwB,CAAC,GAAG,iBAAiB,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,cAAc,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;gBACjG,CAAC,CAAC,MAAM;gBACR,CAAC,CAAC,OAAO,CAAC;YACd,MAAM,GAAG,GAAG,CAAC,QAAQ,EAAE,GAAG,KAAK,EAAE,UAAU,EAAE,cAAc,EAAE,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,SAAS,CAAC,CAAC,IAAI,CACnG,GAAG,CACN,CAAC;YACF,qBAAM,CAAC,IAAI,CAAC,oBAAoB,GAAG,EAAE,CAAC,CAAC;YACvC,OAAO,IAAA,wBAAQ,EAAC,GAAG,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC;SAC9C;QAED,2CAA2C;QAC3C,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;IAC7B,CAAC,CAAC;AACN,CAAC;AAED,SAAgB,QAAQ,CAAC,KAAe,EAAE,GAAa;IACnD,IAAA,mBAAI,EAAC,aAAa,EAAE,GAAG,EAAE;QACrB,+FAA+F;QAC/F,uEAAuE;QACvE,IAAI,CAAC,iBAAiB,EAAE,EAAE;YACtB,MAAM,IAAI,KAAK,CACX,mCAAmC,iBAAO,CAAC,GAAG,EAAE,uBAAuB,qBAAqB,CAAC,IAAI,CAC7F,IAAI,CACP,GAAG,CACP,CAAC;SACL;IACL,CAAC,CAAC,CAAC;IACH,IAAA,mBAAI,EAAC,QAAQ,EAAE,UAAU,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC,CAAC;IACvC,IAAA,mBAAI,EAAC,cAAc,EAAE,IAAA,2BAAY,EAAC,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC;IAC9C,IAAA,mBAAI,EAAC,gBAAgB,EAAE,IAAA,gCAAiB,EAAC,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC;IAErD,OAAO,IAAA,qBAAM,EACT,aAAa,EACb,QAAQ,EACR,IAAA,wBAAS,EAAC,gBAAgB,EAAE,GAAG,EAAE,CAAC,CAAC,GAAG,CAAC,EACvC,IAAA,wBAAS,EAAC,cAAc,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CACzC,CAAC;AACN,CAAC;AAtBD,4BAsBC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@minecraft/core-build-tasks",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "description": "Common build tasks used for minecraft-scripting-libraries",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -18,6 +18,7 @@
     "@microsoft/api-extractor": "^7.38.3",
     "esbuild": "^0.20.1",
     "dotenv": "^16.0.2",
+    "just-scripts": "^2.2.1",
     "prettier": "^2.8.2",
     "rimraf": "^3.0.2",
     "vitest": "^0.34.6",
@@ -27,7 +28,6 @@
   "devDependencies": {
     "@types/node": "^14.0.0 || ^16.0.0 || ^18.0.0",
     "@types/rimraf": "^3.0.2",
-    "just-scripts": "^2.1.3",
     "ts-node": "^10.9.1",
     "tsconfig": "*",
     "typescript": "^5.2.2"