npm package diff
Package: @forge/bundler
Versions: 4.21.0-next.2 - 4.21.0-next.3
File: package/out/webpack.js
Index: package/out/webpack.js
===================================================================
--- package/out/webpack.js
+++ package/out/webpack.js
@@ -1,12 +1,10 @@
"use strict";
Object.defineProperty(exports, "__esModule", { value: true });
-exports.WebpackBundler = exports.runLinter = exports.getCompiler = exports.handleWebpackCompilationResult = void 0;
+exports.WebpackBundler = exports.getCompiler = exports.handleWebpackCompilationResult = void 0;
const tslib_1 = require("tslib");
-const path_1 = tslib_1.__importDefault(require("path"));
const webpack_1 = tslib_1.__importDefault(require("webpack"));
const cli_shared_1 = require("@forge/cli-shared");
-const lint_1 = require("@forge/lint");
const text_1 = require("./text");
function handleWebpackCompilationResult(logger, err, stats) {
if (err) {
throw err;
@@ -56,41 +54,14 @@
});
return Array.from(filteredModuleNames);
}
}
-const runLinter = async (logger = { info: console.log }, fileSystemReader = new cli_shared_1.FileSystemReader(), fileSystemWriter = new cli_shared_1.FileSystemWriter()) => {
- logger.info(`\n${cli_shared_1.Text.tunnel.preBundleTask(cli_shared_1.Text.lint.running)}`);
- const exclude = [...(await (0, cli_shared_1.listGitIgnoreFiles)(fileSystemReader)), '.git', 'node_modules'];
- const configFile = new cli_shared_1.ConfigFile(fileSystemReader, fileSystemWriter);
- const manifest = await configFile.readConfig();
- const csuikResources = await configFile.getResources(['nativeUI']);
- const csuikDirectories = csuikResources.map((resource) => path_1.default.dirname(resource.path));
- const [filesToLint, ...csuikFilesByDirectory] = await Promise.all([
- fileSystemReader.recursiveReadDir('./src', exclude),
- ...csuikDirectories.map((directory) => fileSystemReader.recursiveReadDir(directory, exclude))
- ]);
- const csuikFilesToLint = csuikFilesByDirectory.reduce((allFiles, directoryFiles) => allFiles.concat(directoryFiles), []);
- try {
- const lintResults = await (0, lint_1.lint)([...filesToLint, ...csuikFilesToLint], manifest, 'development', logger);
- if (lintResults.some((result) => result.size())) {
- logger.info('');
- (0, lint_1.reportLintResults)(logger, lintResults);
- }
- else {
- logger.info(cli_shared_1.LogColor.trace(cli_shared_1.Text.lint.noProblems) + '\n');
- }
- }
- catch (error) {
- logger.info(cli_shared_1.Text.tunnel.lintFailed + '\n');
- }
-};
-exports.runLinter = runLinter;
class WebpackBundler {
logger;
constructor(logger) {
this.logger = logger;
}
- getOutput(config, stats) {
+ async getOutput(config, stats) {
const outputDir = config.output.path;
const metadata = {};
if (stats) {
metadata.modules = getNodeModuleNames(stats);
@@ -99,17 +70,17 @@
}
async runCompiler(config) {
const compiler = getCompiler(config);
return new Promise((resolve, reject) => {
- compiler.run((compilerError, stats) => {
+ compiler.run(async (compilerError, stats) => {
try {
handleWebpackCompilationResult(this.logger, compilerError, stats);
compiler.close((closeError) => {
if (closeError) {
reject(closeError);
}
});
- resolve(this.getOutput(config, stats));
+ resolve(await this.getOutput(config, stats));
}
catch (err) {
reject(err);
}
@@ -134,9 +105,9 @@
const watching = compiler.watch({ poll: 1000 }, async (compilerError, stats) => {
try {
handleWebpackCompilationResult(this.logger, compilerError, stats);
this.logger.info(cli_shared_1.LogColor.trace(args.successMessage));
- const result = this.getOutput(config, stats);
+ const result = await this.getOutput(config, stats);
if (isFirstRun) {
isFirstRun = false;
resolve({ result, stop: () => watching.close(() => void 0) });
}