npm - @minecraft/core-build-tasks - Versions diffs - 1.1.0 → 1.1.2 - Mend

@minecraft/core-build-tasks 1.1.0 → 1.1.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (10) hide show

package/lib/tasks/bundle.d.ts +10 -1
package/lib/tasks/bundle.js +78 -4
package/lib/tasks/bundle.js.map +1 -1
package/lib/tasks/bundle.test.d.ts +1 -0
package/lib/tasks/bundle.test.js +344 -0
package/lib/tasks/bundle.test.js.map +1 -0
package/lib/tasks/coreLint.d.ts +1 -1
package/lib/tasks/coreLint.js +35 -5
package/lib/tasks/coreLint.js.map +1 -1
package/package.json +8 -2

package/lib/tasks/bundle.d.ts CHANGED Viewed

@@ -1,4 +1,5 @@
 import { parallel } from 'just-scripts';
+import { BuildResult } from 'esbuild';
 export type BundleTaskParameters = {
     /** Initial script to be evaluated for the build. Documentation: https://esbuild.github.io/api/#entry-points */
     entryPoint: string;
@@ -8,7 +9,15 @@ export type BundleTaskParameters = {
     minifyWhitespace?: boolean;
     /** The output file for the bundle. Documentation: https://esbuild.github.io/api/#outfile */
     outfile: string;
-    /** Flag to specify how to generate source map. Documentation: https://esbuild.github.io/api/#sourcemap */
+    /** Flag to specify to generate a source map file. Documentation: https://esbuild.github.io/api/#sourcemap*/
     sourcemap?: boolean | 'linked' | 'inline' | 'external' | 'both';
+    /** The output path for the source map file. Ignored if sourcemap is false or 'inline'. */
+    outputSourcemapPath?: string;
 };
+export type PostProcessOutputFilesResult = {
+    sourceMapDirectory: string;
+    outputDirectory: string;
+    generatedFiles: Record<string, string>;
+};
+export declare function postProcessOutputFiles(options: BundleTaskParameters, buildResult: BuildResult): PostProcessOutputFilesResult | undefined;
 export declare function bundleTask(options: BundleTaskParameters): ReturnType<typeof parallel>;

package/lib/tasks/bundle.js CHANGED Viewed

@@ -5,19 +5,93 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.bundleTask = void 0;
+exports.bundleTask = exports.postProcessOutputFiles = void 0;
 const esbuild_1 = __importDefault(require("esbuild"));
+const fs_1 = __importDefault(require("fs"));
+const path_1 = __importDefault(require("path"));
+const MAP_EXTENSION = '.map';
+function isRequiredToMakeAnyFileChange(sourcemap) {
+    return sourcemap !== false && sourcemap !== 'inline';
+}
+function isRequiredToLinkJsFile(sourcemap) {
+    return sourcemap === true || sourcemap === 'linked';
+}
+function linkSourceMaps(sourceMapDirectory, outputDirectory, options, outputFiles) {
+    const generatedFiles = {};
+    for (const element of outputFiles) {
+        if (element.path.endsWith(MAP_EXTENSION)) {
+            const parsedPath = path_1.default.parse(element.path);
+            const sourceMapFilePath = path_1.default.join(sourceMapDirectory, parsedPath.base);
+            const sourceMapContent = JSON.parse(element.text);
+            // Add JS file location.
+            sourceMapContent.file = path_1.default
+                .relative(sourceMapDirectory, path_1.default.join(outputDirectory, parsedPath.name))
+                .replace(/\\/g, '/');
+            generatedFiles[sourceMapFilePath] = JSON.stringify(sourceMapContent);
+        }
+        else if (isRequiredToLinkJsFile(options.sourcemap)) {
+            // Link to the source map file.
+            const dir = path_1.default.parse(element.path).dir;
+            const targetSourceMap = path_1.default
+                .join(path_1.default.relative(dir, sourceMapDirectory), path_1.default.parse(element.path).base)
+                .replace(/\\/g, '/');
+            generatedFiles[element.path] = element.text + `\n//# sourceMappingURL=${targetSourceMap}${MAP_EXTENSION}\n`;
+        }
+        else {
+            generatedFiles[element.path] = element.text;
+        }
+    }
+    return generatedFiles;
+}
+function writeFiles(postProcessOutputFilesResult) {
+    fs_1.default.mkdirSync(postProcessOutputFilesResult.outputDirectory, { recursive: true });
+    if (postProcessOutputFilesResult.sourceMapDirectory !== postProcessOutputFilesResult.outputDirectory) {
+        fs_1.default.mkdirSync(postProcessOutputFilesResult.sourceMapDirectory, { recursive: true });
+    }
+    for (const path of Object.keys(postProcessOutputFilesResult.generatedFiles)) {
+        fs_1.default.writeFileSync(path, postProcessOutputFilesResult.generatedFiles[path]);
+    }
+}
+function postProcessOutputFiles(options, buildResult) {
+    if (!buildResult.outputFiles) {
+        return undefined;
+    }
+    const outputDirectory = path_1.default.parse(options.outfile).dir;
+    const sourceMapDirectory = path_1.default.resolve(options.outputSourcemapPath ?? outputDirectory);
+    const generatedFiles = linkSourceMaps(sourceMapDirectory, outputDirectory, options, buildResult.outputFiles);
+    return { sourceMapDirectory, outputDirectory, generatedFiles: generatedFiles };
+}
+exports.postProcessOutputFiles = postProcessOutputFiles;
 function bundleTask(options) {
-    return async () => {
-        return esbuild_1.default.build({
+    return () => {
+        const isRequiredToMakeChanges = isRequiredToMakeAnyFileChange(options.sourcemap);
+        const isRequiredToLinkJs = isRequiredToLinkJsFile(options.sourcemap);
+        const buildResult = esbuild_1.default.buildSync({
             entryPoints: [options.entryPoint],
             bundle: true,
             format: 'esm',
             minifyWhitespace: options.minifyWhitespace,
             outfile: options.outfile,
-            sourcemap: options.sourcemap,
+            sourcemap: isRequiredToLinkJs ? 'external' : options.sourcemap,
             external: options.external,
+            write: !isRequiredToMakeChanges,
         });
+        if (buildResult.errors.length === 0) {
+            if (isRequiredToMakeChanges) {
+                if (!buildResult.outputFiles) {
+                    process.exitCode = 1;
+                    return Promise.reject(new Error('No output files were generated, check that your entrypoint file is configured correctly.'));
+                }
+                const result = postProcessOutputFiles(options, buildResult);
+                if (result) {
+                    writeFiles(result);
+                }
+            }
+            process.exitCode = 0;
+            return Promise.resolve();
+        }
+        process.exitCode = 1;
+        return Promise.reject(new Error(buildResult.errors.join('\n')));
     };
 }
 exports.bundleTask = bundleTask;

package/lib/tasks/bundle.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"bundle.js","sourceRoot":"","sources":["../../src/tasks/bundle.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;AAGlC,~~sDAA8B~~;~~AAmB9B~~,~~SAAgB~~,UAAU,CAAC,OAA6B;~~IACpD~~,OAAO,KAAK,IAAI,EAAE;~~QACd~~,OAAO,iBAAO,CAAC,~~KAAK~~,CAAC;~~YACjB~~,WAAW,EAAE,CAAC,OAAO,CAAC,UAAU,CAAC;YACjC,MAAM,EAAE,IAAI;YACZ,MAAM,EAAE,KAAK;YACb,gBAAgB,EAAE,OAAO,CAAC,gBAAgB;YAC1C,OAAO,EAAE,OAAO,CAAC,OAAO;YACxB,SAAS,EAAE,OAAO,CAAC,SAAS;~~YAC5B~~,QAAQ,EAAE,OAAO,CAAC,QAAQ;~~SAC7B~~,CAAC,CAAC;~~IACP~~,CAAC,CAAC;AACN,CAAC;~~AAZD~~,~~gCAYC~~"}
1	+ {"version":3,"file":"bundle.js","sourceRoot":"","sources":["../../src/tasks/bundle.ts"],"names":[],"mappings":"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"}

package/lib/tasks/bundle.test.d.ts ADDED Viewed

	@@ -0,0 +1 @@
1	+ export {};

package/lib/tasks/bundle.test.js ADDED Viewed

@@ -0,0 +1,344 @@
+"use strict";
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const vitest_1 = require("vitest");
+const bundle_1 = require("./bundle");
+const path_1 = __importDefault(require("path"));
+function _createParameters(sourcemap, outputFile, outputSourcemapPath) {
+    return {
+        options: {
+            entryPoint: '',
+            outfile: outputFile,
+            sourcemap: sourcemap,
+            outputSourcemapPath: outputSourcemapPath,
+        },
+        buildResult: {
+            outputFiles: [
+                { path: outputFile, contents: new Uint8Array(), hash: '', text: '' },
+                {
+                    path: 'main.js.map',
+                    contents: new Uint8Array(),
+                    hash: '',
+                    text: '{"version":3,"sources":["../../scripts/main.ts"],"sourcesContent":[""],"mappings":";AAAA,SAAS,OAAO;","names":[]}',
+                },
+            ],
+            errors: [],
+            warnings: [],
+            metafile: { inputs: {}, outputs: {} },
+            mangleCache: {},
+        },
+    };
+}
+(0, vitest_1.describe)('postProcessOutputFiles with source map files at different path', () => {
+    (0, vitest_1.it)('sourcemap `true` - Dictionary populated correctly', () => {
+        const sourcemap = true;
+        const debugPath = path_1.default.resolve('./dist/debug');
+        const outputFile = path_1.default.resolve('./dist/scripts/main.js');
+        const parameters = _createParameters(sourcemap, outputFile, debugPath);
+        const expectedSourceMapDirectory = path_1.default.resolve('./dist/debug');
+        const expectedOutputDirectory = path_1.default.resolve('./dist/scripts');
+        const expectedOutputFilePath = outputFile;
+        const expectedSourceMapFilePath = path_1.default.resolve('./dist/debug/main.js.map');
+        const expectedSourceMappingURL = '\n//# sourceMappingURL=../debug/main.js.map\n';
+        const expectedSourceMapFile = '../scripts/main.js';
+        const result = (0, bundle_1.postProcessOutputFiles)(parameters.options, parameters.buildResult);
+        (0, vitest_1.expect)(result).toBeDefined();
+        if (result) {
+            (0, vitest_1.expect)(result.outputDirectory).toBe(expectedOutputDirectory);
+            (0, vitest_1.expect)(result.sourceMapDirectory).toBe(expectedSourceMapDirectory);
+            (0, vitest_1.expect)(Object.keys(result.generatedFiles).length).toBe(2);
+            (0, vitest_1.expect)(result.generatedFiles[expectedOutputFilePath]).toBeDefined();
+            (0, vitest_1.expect)(result.generatedFiles[expectedOutputFilePath]).toBe(expectedSourceMappingURL);
+            (0, vitest_1.expect)(result.generatedFiles[expectedSourceMapFilePath]).toBeDefined();
+            const sourceMap = JSON.parse(result.generatedFiles[expectedSourceMapFilePath]);
+            (0, vitest_1.expect)(sourceMap).toBeDefined();
+            (0, vitest_1.expect)(sourceMap.file).toBeDefined();
+            (0, vitest_1.expect)(sourceMap.file).toBe(expectedSourceMapFile);
+        }
+    });
+    (0, vitest_1.it)('sourcemap `linked` - Dictionary populated correctly', () => {
+        const sourcemap = 'linked';
+        const debugPath = path_1.default.resolve('./dist/debug');
+        const outputFile = path_1.default.resolve('./dist/scripts/main.js');
+        const parameters = _createParameters(sourcemap, outputFile, debugPath);
+        const expectedSourceMapDirectory = path_1.default.resolve('./dist/debug');
+        const expectedOutputDirectory = path_1.default.resolve('./dist/scripts');
+        const expectedOutputFilePath = outputFile;
+        const expectedSourceMapFilePath = path_1.default.resolve('./dist/debug/main.js.map');
+        const expectedSourceMappingURL = '\n//# sourceMappingURL=../debug/main.js.map\n';
+        const expectedSourceMapFile = '../scripts/main.js';
+        const result = (0, bundle_1.postProcessOutputFiles)(parameters.options, parameters.buildResult);
+        (0, vitest_1.expect)(result).toBeDefined();
+        if (result) {
+            (0, vitest_1.expect)(result.outputDirectory).toBe(expectedOutputDirectory);
+            (0, vitest_1.expect)(result.sourceMapDirectory).toBe(expectedSourceMapDirectory);
+            (0, vitest_1.expect)(Object.keys(result.generatedFiles).length).toBe(2);
+            (0, vitest_1.expect)(result.generatedFiles[expectedOutputFilePath]).toBeDefined();
+            (0, vitest_1.expect)(result.generatedFiles[expectedOutputFilePath]).toBe(expectedSourceMappingURL);
+            (0, vitest_1.expect)(result.generatedFiles[expectedSourceMapFilePath]).toBeDefined();
+            const sourceMap = JSON.parse(result.generatedFiles[expectedSourceMapFilePath]);
+            (0, vitest_1.expect)(sourceMap).toBeDefined();
+            (0, vitest_1.expect)(sourceMap.file).toBeDefined();
+            (0, vitest_1.expect)(sourceMap.file).toBe(expectedSourceMapFile);
+        }
+    });
+    (0, vitest_1.it)('sourcemap `external` - Dictionary populated correctly', () => {
+        const sourcemap = 'external';
+        const debugPath = path_1.default.resolve('./dist/debug');
+        const outputFile = path_1.default.resolve('./dist/scripts/main.js');
+        const parameters = _createParameters(sourcemap, outputFile, debugPath);
+        const expectedSourceMapDirectory = path_1.default.resolve('./dist/debug');
+        const expectedOutputDirectory = path_1.default.resolve('./dist/scripts');
+        const expectedOutputFilePath = outputFile;
+        const expectedSourceMapFilePath = path_1.default.resolve('./dist/debug/main.js.map');
+        const expectedSourceMappingURL = '';
+        const expectedSourceMapFile = '../scripts/main.js';
+        const result = (0, bundle_1.postProcessOutputFiles)(parameters.options, parameters.buildResult);
+        (0, vitest_1.expect)(result).toBeDefined();
+        if (result) {
+            (0, vitest_1.expect)(result.outputDirectory).toBe(expectedOutputDirectory);
+            (0, vitest_1.expect)(result.sourceMapDirectory).toBe(expectedSourceMapDirectory);
+            (0, vitest_1.expect)(Object.keys(result.generatedFiles).length).toBe(2);
+            (0, vitest_1.expect)(result.generatedFiles[expectedOutputFilePath]).toBeDefined();
+            (0, vitest_1.expect)(result.generatedFiles[expectedOutputFilePath]).toBe(expectedSourceMappingURL);
+            (0, vitest_1.expect)(result.generatedFiles[expectedSourceMapFilePath]).toBeDefined();
+            const sourceMap = JSON.parse(result.generatedFiles[expectedSourceMapFilePath]);
+            (0, vitest_1.expect)(sourceMap).toBeDefined();
+            (0, vitest_1.expect)(sourceMap.file).toBeDefined();
+            (0, vitest_1.expect)(sourceMap.file).toBe(expectedSourceMapFile);
+        }
+    });
+    (0, vitest_1.it)('sourcemap `both` - Dictionary populated correctly', () => {
+        const sourcemap = 'both';
+        const debugPath = path_1.default.resolve('./dist/debug');
+        const outputFile = path_1.default.resolve('./dist/scripts/main.js');
+        const parameters = _createParameters(sourcemap, outputFile, debugPath);
+        const expectedSourceMapDirectory = path_1.default.resolve('./dist/debug');
+        const expectedOutputDirectory = path_1.default.resolve('./dist/scripts');
+        const expectedOutputFilePath = outputFile;
+        const expectedSourceMapFilePath = path_1.default.resolve('./dist/debug/main.js.map');
+        const expectedSourceMappingURL = '';
+        const expectedSourceMapFile = '../scripts/main.js';
+        const result = (0, bundle_1.postProcessOutputFiles)(parameters.options, parameters.buildResult);
+        (0, vitest_1.expect)(result).toBeDefined();
+        if (result) {
+            (0, vitest_1.expect)(result.outputDirectory).toBe(expectedOutputDirectory);
+            (0, vitest_1.expect)(result.sourceMapDirectory).toBe(expectedSourceMapDirectory);
+            (0, vitest_1.expect)(Object.keys(result.generatedFiles).length).toBe(2);
+            (0, vitest_1.expect)(result.generatedFiles[expectedOutputFilePath]).toBeDefined();
+            (0, vitest_1.expect)(result.generatedFiles[expectedOutputFilePath]).toBe(expectedSourceMappingURL);
+            (0, vitest_1.expect)(result.generatedFiles[expectedSourceMapFilePath]).toBeDefined();
+            const sourceMap = JSON.parse(result.generatedFiles[expectedSourceMapFilePath]);
+            (0, vitest_1.expect)(sourceMap).toBeDefined();
+            (0, vitest_1.expect)(sourceMap.file).toBeDefined();
+            (0, vitest_1.expect)(sourceMap.file).toBe(expectedSourceMapFile);
+        }
+    });
+    (0, vitest_1.it)('sourcemap `inline` - Dictionary populated correctly', () => {
+        const sourcemap = 'inline';
+        const debugPath = path_1.default.resolve('./dist/debug');
+        const outputFile = path_1.default.resolve('./dist/scripts/main.js');
+        const parameters = _createParameters(sourcemap, outputFile, debugPath);
+        const expectedSourceMapDirectory = path_1.default.resolve('./dist/debug');
+        const expectedOutputDirectory = path_1.default.resolve('./dist/scripts');
+        const expectedOutputFilePath = outputFile;
+        const expectedSourceMapFilePath = path_1.default.resolve('./dist/debug/main.js.map');
+        const expectedSourceMappingURL = '';
+        const expectedSourceMapFile = '../scripts/main.js';
+        const result = (0, bundle_1.postProcessOutputFiles)(parameters.options, parameters.buildResult);
+        (0, vitest_1.expect)(result).toBeDefined();
+        if (result) {
+            (0, vitest_1.expect)(result.outputDirectory).toBe(expectedOutputDirectory);
+            (0, vitest_1.expect)(result.sourceMapDirectory).toBe(expectedSourceMapDirectory);
+            (0, vitest_1.expect)(Object.keys(result.generatedFiles).length).toBe(2);
+            (0, vitest_1.expect)(result.generatedFiles[expectedOutputFilePath]).toBeDefined();
+            (0, vitest_1.expect)(result.generatedFiles[expectedOutputFilePath]).toBe(expectedSourceMappingURL);
+            (0, vitest_1.expect)(result.generatedFiles[expectedSourceMapFilePath]).toBeDefined();
+            const sourceMap = JSON.parse(result.generatedFiles[expectedSourceMapFilePath]);
+            (0, vitest_1.expect)(sourceMap).toBeDefined();
+            (0, vitest_1.expect)(sourceMap.file).toBeDefined();
+            (0, vitest_1.expect)(sourceMap.file).toBe(expectedSourceMapFile);
+        }
+    });
+});
+(0, vitest_1.describe)('postProcessOutputFiles with source map files at same path', () => {
+    (0, vitest_1.it)('sourcemap `true` - Dictionary populated correctly using undefined', () => {
+        const sourcemap = true;
+        const debugPath = undefined;
+        const outputFile = path_1.default.resolve('./dist/scripts/main.js');
+        const parameters = _createParameters(sourcemap, outputFile, debugPath);
+        const expectedSourceMapDirectory = path_1.default.resolve('./dist/scripts');
+        const expectedOutputDirectory = path_1.default.resolve('./dist/scripts');
+        const expectedOutputFilePath = outputFile;
+        const expectedSourceMapFilePath = path_1.default.resolve('./dist/scripts/main.js.map');
+        const expectedSourceMappingURL = '\n//# sourceMappingURL=main.js.map\n';
+        const expectedSourceMapFile = 'main.js';
+        const result = (0, bundle_1.postProcessOutputFiles)(parameters.options, parameters.buildResult);
+        (0, vitest_1.expect)(result).toBeDefined();
+        if (result) {
+            (0, vitest_1.expect)(result.outputDirectory).toBe(expectedOutputDirectory);
+            (0, vitest_1.expect)(result.sourceMapDirectory).toBe(expectedSourceMapDirectory);
+            (0, vitest_1.expect)(Object.keys(result.generatedFiles).length).toBe(2);
+            (0, vitest_1.expect)(result.generatedFiles[expectedOutputFilePath]).toBeDefined();
+            (0, vitest_1.expect)(result.generatedFiles[expectedOutputFilePath]).toBe(expectedSourceMappingURL);
+            (0, vitest_1.expect)(result.generatedFiles[expectedSourceMapFilePath]).toBeDefined();
+            const sourceMap = JSON.parse(result.generatedFiles[expectedSourceMapFilePath]);
+            (0, vitest_1.expect)(sourceMap).toBeDefined();
+            (0, vitest_1.expect)(sourceMap.file).toBeDefined();
+            (0, vitest_1.expect)(sourceMap.file).toBe(expectedSourceMapFile);
+        }
+    });
+    (0, vitest_1.it)('sourcemap `true` - Dictionary populated correctly using same path explicitly', () => {
+        const sourcemap = true;
+        const debugPath = path_1.default.resolve('./dist/scripts');
+        const outputFile = path_1.default.resolve('./dist/scripts/main.js');
+        const parameters = _createParameters(sourcemap, outputFile, debugPath);
+        const expectedSourceMapDirectory = path_1.default.resolve('./dist/scripts');
+        const expectedOutputDirectory = path_1.default.resolve('./dist/scripts');
+        const expectedOutputFilePath = outputFile;
+        const expectedSourceMapFilePath = path_1.default.resolve('./dist/scripts/main.js.map');
+        const expectedSourceMappingURL = '\n//# sourceMappingURL=main.js.map\n';
+        const expectedSourceMapFile = 'main.js';
+        const result = (0, bundle_1.postProcessOutputFiles)(parameters.options, parameters.buildResult);
+        (0, vitest_1.expect)(result).toBeDefined();
+        if (result) {
+            (0, vitest_1.expect)(result.outputDirectory).toBe(expectedOutputDirectory);
+            (0, vitest_1.expect)(result.sourceMapDirectory).toBe(expectedSourceMapDirectory);
+            (0, vitest_1.expect)(Object.keys(result.generatedFiles).length).toBe(2);
+            (0, vitest_1.expect)(result.generatedFiles[expectedOutputFilePath]).toBeDefined();
+            (0, vitest_1.expect)(result.generatedFiles[expectedOutputFilePath]).toBe(expectedSourceMappingURL);
+            (0, vitest_1.expect)(result.generatedFiles[expectedSourceMapFilePath]).toBeDefined();
+            const sourceMap = JSON.parse(result.generatedFiles[expectedSourceMapFilePath]);
+            (0, vitest_1.expect)(sourceMap).toBeDefined();
+            (0, vitest_1.expect)(sourceMap.file).toBeDefined();
+            (0, vitest_1.expect)(sourceMap.file).toBe(expectedSourceMapFile);
+        }
+    });
+    (0, vitest_1.it)('sourcemap `linked` - Dictionary populated correctly using undefined', () => {
+        const sourcemap = 'linked';
+        const debugPath = undefined;
+        const outputFile = path_1.default.resolve('./dist/scripts/main.js');
+        const parameters = _createParameters(sourcemap, outputFile, debugPath);
+        const expectedSourceMapDirectory = path_1.default.resolve('./dist/scripts');
+        const expectedOutputDirectory = path_1.default.resolve('./dist/scripts');
+        const expectedOutputFilePath = outputFile;
+        const expectedSourceMapFilePath = path_1.default.resolve('./dist/scripts/main.js.map');
+        const expectedSourceMappingURL = '\n//# sourceMappingURL=main.js.map\n';
+        const expectedSourceMapFile = 'main.js';
+        const result = (0, bundle_1.postProcessOutputFiles)(parameters.options, parameters.buildResult);
+        (0, vitest_1.expect)(result).toBeDefined();
+        if (result) {
+            (0, vitest_1.expect)(result.outputDirectory).toBe(expectedOutputDirectory);
+            (0, vitest_1.expect)(result.sourceMapDirectory).toBe(expectedSourceMapDirectory);
+            (0, vitest_1.expect)(Object.keys(result.generatedFiles).length).toBe(2);
+            (0, vitest_1.expect)(result.generatedFiles[expectedOutputFilePath]).toBeDefined();
+            (0, vitest_1.expect)(result.generatedFiles[expectedOutputFilePath]).toBe(expectedSourceMappingURL);
+            (0, vitest_1.expect)(result.generatedFiles[expectedSourceMapFilePath]).toBeDefined();
+            const sourceMap = JSON.parse(result.generatedFiles[expectedSourceMapFilePath]);
+            (0, vitest_1.expect)(sourceMap).toBeDefined();
+            (0, vitest_1.expect)(sourceMap.file).toBeDefined();
+            (0, vitest_1.expect)(sourceMap.file).toBe(expectedSourceMapFile);
+        }
+    });
+    (0, vitest_1.it)('sourcemap `external` - Dictionary populated correctly using undefined', () => {
+        const sourcemap = 'external';
+        const debugPath = undefined;
+        const outputFile = path_1.default.resolve('./dist/scripts/main.js');
+        const parameters = _createParameters(sourcemap, outputFile, debugPath);
+        const expectedSourceMapDirectory = path_1.default.resolve('./dist/scripts');
+        const expectedOutputDirectory = path_1.default.resolve('./dist/scripts');
+        const expectedOutputFilePath = outputFile;
+        const expectedSourceMapFilePath = path_1.default.resolve('./dist/scripts/main.js.map');
+        const expectedSourceMappingURL = '';
+        const expectedSourceMapFile = 'main.js';
+        const result = (0, bundle_1.postProcessOutputFiles)(parameters.options, parameters.buildResult);
+        (0, vitest_1.expect)(result).toBeDefined();
+        if (result) {
+            (0, vitest_1.expect)(result.outputDirectory).toBe(expectedOutputDirectory);
+            (0, vitest_1.expect)(result.sourceMapDirectory).toBe(expectedSourceMapDirectory);
+            (0, vitest_1.expect)(Object.keys(result.generatedFiles).length).toBe(2);
+            (0, vitest_1.expect)(result.generatedFiles[expectedOutputFilePath]).toBeDefined();
+            (0, vitest_1.expect)(result.generatedFiles[expectedOutputFilePath]).toBe(expectedSourceMappingURL);
+            (0, vitest_1.expect)(result.generatedFiles[expectedSourceMapFilePath]).toBeDefined();
+            const sourceMap = JSON.parse(result.generatedFiles[expectedSourceMapFilePath]);
+            (0, vitest_1.expect)(sourceMap).toBeDefined();
+            (0, vitest_1.expect)(sourceMap.file).toBeDefined();
+            (0, vitest_1.expect)(sourceMap.file).toBe(expectedSourceMapFile);
+        }
+    });
+    (0, vitest_1.it)('sourcemap `both` - Dictionary populated correctly using undefined', () => {
+        const sourcemap = 'both';
+        const debugPath = undefined;
+        const outputFile = path_1.default.resolve('./dist/scripts/main.js');
+        const parameters = _createParameters(sourcemap, outputFile, debugPath);
+        const expectedSourceMapDirectory = path_1.default.resolve('./dist/scripts');
+        const expectedOutputDirectory = path_1.default.resolve('./dist/scripts');
+        const expectedOutputFilePath = outputFile;
+        const expectedSourceMapFilePath = path_1.default.resolve('./dist/scripts/main.js.map');
+        const expectedSourceMappingURL = '';
+        const expectedSourceMapFile = 'main.js';
+        const result = (0, bundle_1.postProcessOutputFiles)(parameters.options, parameters.buildResult);
+        (0, vitest_1.expect)(result).toBeDefined();
+        if (result) {
+            (0, vitest_1.expect)(result.outputDirectory).toBe(expectedOutputDirectory);
+            (0, vitest_1.expect)(result.sourceMapDirectory).toBe(expectedSourceMapDirectory);
+            (0, vitest_1.expect)(Object.keys(result.generatedFiles).length).toBe(2);
+            (0, vitest_1.expect)(result.generatedFiles[expectedOutputFilePath]).toBeDefined();
+            (0, vitest_1.expect)(result.generatedFiles[expectedOutputFilePath]).toBe(expectedSourceMappingURL);
+            (0, vitest_1.expect)(result.generatedFiles[expectedSourceMapFilePath]).toBeDefined();
+            const sourceMap = JSON.parse(result.generatedFiles[expectedSourceMapFilePath]);
+            (0, vitest_1.expect)(sourceMap).toBeDefined();
+            (0, vitest_1.expect)(sourceMap.file).toBeDefined();
+            (0, vitest_1.expect)(sourceMap.file).toBe(expectedSourceMapFile);
+        }
+    });
+    (0, vitest_1.it)('sourcemap `inline` - Dictionary populated correctly using undefined', () => {
+        const sourcemap = 'inline';
+        const debugPath = undefined;
+        const outputFile = path_1.default.resolve('./dist/scripts/main.js');
+        const parameters = _createParameters(sourcemap, outputFile, debugPath);
+        const expectedSourceMapDirectory = path_1.default.resolve('./dist/scripts');
+        const expectedOutputDirectory = path_1.default.resolve('./dist/scripts');
+        const expectedOutputFilePath = outputFile;
+        const expectedSourceMapFilePath = path_1.default.resolve('./dist/scripts/main.js.map');
+        const expectedSourceMappingURL = '';
+        const expectedSourceMapFile = 'main.js';
+        const result = (0, bundle_1.postProcessOutputFiles)(parameters.options, parameters.buildResult);
+        (0, vitest_1.expect)(result).toBeDefined();
+        if (result) {
+            (0, vitest_1.expect)(result.outputDirectory).toBe(expectedOutputDirectory);
+            (0, vitest_1.expect)(result.sourceMapDirectory).toBe(expectedSourceMapDirectory);
+            (0, vitest_1.expect)(Object.keys(result.generatedFiles).length).toBe(2);
+            (0, vitest_1.expect)(result.generatedFiles[expectedOutputFilePath]).toBeDefined();
+            (0, vitest_1.expect)(result.generatedFiles[expectedOutputFilePath]).toBe(expectedSourceMappingURL);
+            (0, vitest_1.expect)(result.generatedFiles[expectedSourceMapFilePath]).toBeDefined();
+            const sourceMap = JSON.parse(result.generatedFiles[expectedSourceMapFilePath]);
+            (0, vitest_1.expect)(sourceMap).toBeDefined();
+            (0, vitest_1.expect)(sourceMap.file).toBeDefined();
+            (0, vitest_1.expect)(sourceMap.file).toBe(expectedSourceMapFile);
+        }
+    });
+});
+(0, vitest_1.describe)('postProcessOutputFiles with no files', () => {
+    (0, vitest_1.it)('sourcemap `true` - Returns undefined', () => {
+        const sourcemap = true;
+        const outputFile = path_1.default.resolve('./dist/scripts/main.js');
+        const parameters = _createParameters(sourcemap, outputFile, undefined);
+        parameters.buildResult.outputFiles = undefined;
+        const result = (0, bundle_1.postProcessOutputFiles)(parameters.options, parameters.buildResult);
+        (0, vitest_1.expect)(result).toBeUndefined();
+    });
+    (0, vitest_1.it)('sourcemap `false` - Returns undefined', () => {
+        const sourcemap = false;
+        const outputFile = path_1.default.resolve('./dist/scripts/main.js');
+        const parameters = _createParameters(sourcemap, outputFile, undefined);
+        parameters.buildResult.outputFiles = undefined;
+        const result = (0, bundle_1.postProcessOutputFiles)(parameters.options, parameters.buildResult);
+        (0, vitest_1.expect)(result).toBeUndefined();
+    });
+});
+//# sourceMappingURL=bundle.test.js.map

package/lib/tasks/bundle.test.js.map ADDED Viewed

@@ -0,0 +1 @@

+ {"version":3,"file":"bundle.test.js","sourceRoot":"","sources":["../../src/tasks/bundle.test.ts"],"names":[],"mappings":"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"}

package/lib/tasks/coreLint.d.ts CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

	@@ -1 +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~~"}
1	+ {"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 CHANGED Viewed

@@ -1,10 +1,16 @@
 {
   "name": "@minecraft/core-build-tasks",
-  "version": "1.1.0",
+  "version": "1.1.2",
   "description": "Common build tasks used for minecraft-scripting-libraries",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "author": "Raphael Landaverde (rlanda@microsoft.com)",
+  "contributors": [
+    {
+      "name": "Francisco Alejandro Garcia Cebada",
+      "email": "frgarc@mojang.com"
+    }
+  ],
   "scripts": {
     "build-tools": "just-scripts build-tools",
     "clean-tools": "just-scripts clean-tools",
@@ -18,6 +24,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 +34,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"