Skip to content

Commit 6b3db05

Browse files
committed
Switch to static functions for Eleventy version and help args. Fixes #1313
(cherry picked from commit 2b18aab)
1 parent e25a7d2 commit 6b3db05

File tree

2 files changed

+30
-16
lines changed

2 files changed

+30
-16
lines changed

cmd.js

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -62,21 +62,21 @@ try {
6262
);
6363
});
6464

65-
let elev = new Eleventy(argv.input, argv.output, {
66-
// --quiet and --quiet=true both resolve to true
67-
quietMode: argv.quiet,
68-
configPath: argv.config,
69-
source: "cli",
70-
});
71-
72-
// reuse ErrorHandler instance in Eleventy
73-
errorHandler = elev.errorHandler;
74-
7565
if (argv.version) {
76-
console.log(elev.getVersion());
66+
console.log(Eleventy.getVersion());
7767
} else if (argv.help) {
78-
console.log(elev.getHelp());
68+
console.log(Eleventy.getHelp());
7969
} else {
70+
let elev = new Eleventy(argv.input, argv.output, {
71+
// --quiet and --quiet=true both resolve to true
72+
quietMode: argv.quiet,
73+
configPath: argv.config,
74+
source: "cli",
75+
});
76+
77+
// reuse ErrorHandler instance in Eleventy
78+
errorHandler = elev.errorHandler;
79+
8080
if (argv.to === "json" || argv.to === "ndjson") {
8181
// override logging output
8282
elev.setIsVerbose(false);

src/Eleventy.js

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -527,20 +527,27 @@ Verbose Output: ${this.verboseMode}`);
527527
/**
528528
* Reads the version of Eleventy.
529529
*
530-
* @method
530+
* @static
531531
* @returns {String} - The version of Eleventy.
532532
*/
533-
getVersion() {
533+
static getVersion() {
534534
return pkg.version;
535535
}
536536

537+
/**
538+
* @deprecated since 1.0.1, use static Eleventy.getVersion()
539+
*/
540+
getVersion() {
541+
return Eleventy.getVersion();
542+
}
543+
537544
/**
538545
* Shows a help message including usage.
539546
*
540-
* @method
547+
* @static
541548
* @returns {String} - The help mesage.
542549
*/
543-
getHelp() {
550+
static getHelp() {
544551
return `Usage: eleventy
545552
eleventy --input=. --output=./_site
546553
eleventy --serve
@@ -586,6 +593,13 @@ Arguments:
586593
--help`;
587594
}
588595

596+
/**
597+
* @deprecated since 1.0.1, use static Eleventy.getHelp()
598+
*/
599+
getHelp() {
600+
return Eleventy.getHelp();
601+
}
602+
589603
/**
590604
* Resets the config of Eleventy.
591605
*

0 commit comments

Comments
 (0)