hugo-bin-extended 0.134.2 → 0.135.0

package/README.md

@@ -2,7 +2,7 @@
 
 > Binary wrapper for [Hugo](https://github.com/gohugoio/hugo)
 
-- hugo-bin supports the [Extended Hugo version](https://github.com/gohugoio/hugo/releases/tag/v0.43)
+- hugo-bin-extended supports the [Extended Hugo version](https://github.com/gohugoio/hugo/releases/tag/v0.43)
 - For usage within corporate networks or behind corporate proxies, the download repository can be overwritten
 
 See [Installation options](#installation-options) for more details.
@@ -63,6 +63,9 @@ See the [Hugo Documentation](https://gohugo.io/) for more information.
 
 ## Installation options
 
+> [!NOTE]
+> You have to run `npm install hugo-bin-extended` to reinstall `hugo-bin-extended` itself if you change any of these options.
+
 hugo-bin-extended supports options to change the variation of Hugo binaries, to overwrite the download repository and the Hugo version.
 
 Each option can be configured in one of the following ways:
@@ -103,8 +106,6 @@ set HUGO_BIN_DOWNLOAD_REPO=https://some.example.com/artifactory/github-releases
 set HUGO_BIN_HUGO_VERSION=0.124.1
 ```
 
-**Note that you have to run `npm install hugo-bin-extended` to re-install hugo-bin-extended itself, if you change any of these options.**
-
 ### Options
 
 #### buildTags
@@ -129,7 +130,7 @@ Set it to your proxy URL to download the hugo binary from a different download r
 - Default: the version specified in [package.json](package.json)
 
 You can override the Hugo version here. Please note that if any of the URLs have changed upstream, you might not be able to use
-any version and you will probably need to update to a newer hugo-bin version which takes into consideration the new URLs.
+any version and you will probably need to update to a newer hugo-bin-extended version which takes into consideration the new URLs.
 
 ## Super Inspired By
 

package/index.js

@@ -1,7 +1,7 @@
 import process from 'node:process';
-import hugoBin from './lib/index.js';
+import hugoBinExtended from './lib/index.js';
 
-const bin = await hugoBin(process.cwd());
+const bin = await hugoBinExtended(process.cwd());
 const hugoPath = bin.path();
 
 export default hugoPath;

package/lib/index.js

@@ -2,43 +2,54 @@ import fs from 'node:fs/promises';
 import path from 'node:path';
 import process from 'node:process';
 import { fileURLToPath } from 'node:url';
+import { debuglog } from 'node:util';
 import BinWrapper from '@xhmikosr/bin-wrapper';
 import { packageConfig } from 'package-config';
 
+const debug = debuglog('hugo-bin-extended');
 const pkg = new URL('../package.json', import.meta.url);
 const { hugoVersion: HUGO_VERSION } = JSON.parse(await fs.readFile(pkg, 'utf8'));
 
 const destDir = path.join(fileURLToPath(new URL('../vendor/', import.meta.url)));
 const binName = process.platform === 'win32' ? 'hugo.exe' : 'hugo';
 
+debug('[global] HUGO_VERSION:', HUGO_VERSION);
+debug('[global] destDir:', destDir);
+debug('[global] binName:', binName);
+
 /**
  * @param {string} baseUrl
  * @param {string} hugoVersion
  */
 function extendedBin(baseUrl, hugoVersion) {
+  debug('[extendedBin] baseUrl:', baseUrl);
+  debug('[extendedBin] hugoVersion:', hugoVersion);
+
+  const baseName = `hugo_${hugoVersion}`;
+  const baseNameExtended = `hugo_extended_${hugoVersion}`;
+
   return new BinWrapper()
-    .src(`${baseUrl}hugo_extended_${hugoVersion}_darwin-universal.tar.gz`, 'darwin', 'arm64')
-    .src(`${baseUrl}hugo_extended_${hugoVersion}_darwin-universal.tar.gz`, 'darwin', 'x64')
-    .src(`${baseUrl}hugo_extended_${hugoVersion}_linux-amd64.tar.gz`, 'linux', 'x64')
-    .src(`${baseUrl}hugo_extended_${hugoVersion}_linux-arm64.tar.gz`, 'linux', 'arm64')
-    .src(`${baseUrl}hugo_extended_${hugoVersion}_windows-amd64.zip`, 'win32', 'x64')
+    .src(`${baseUrl}${baseNameExtended}_darwin-universal.tar.gz`, 'darwin', 'arm64')
+    .src(`${baseUrl}${baseNameExtended}_darwin-universal.tar.gz`, 'darwin', 'x64')
+    .src(`${baseUrl}${baseNameExtended}_linux-amd64.tar.gz`, 'linux', 'x64')
+    .src(`${baseUrl}${baseNameExtended}_linux-arm64.tar.gz`, 'linux', 'arm64')
+    .src(`${baseUrl}${baseNameExtended}_windows-amd64.zip`, 'win32', 'x64')
     // Fall back to the normal version on unsupported platforms
-    .src(`${baseUrl}hugo_${hugoVersion}_dragonfly-amd64.tar.gz`, 'dragonflybsd', 'x64')
-    .src(`${baseUrl}hugo_${hugoVersion}_freebsd-amd64.tar.gz`, 'freebsd', 'x64')
-    .src(`${baseUrl}hugo_${hugoVersion}_linux-arm.tar.gz`, 'linux', 'arm')
-    .src(`${baseUrl}hugo_${hugoVersion}_netbsd-amd64.tar.gz`, 'netbsd', 'x64')
-    .src(`${baseUrl}hugo_${hugoVersion}_openbsd-amd64.tar.gz`, 'openbsd', 'x64')
-    .src(`${baseUrl}hugo_${hugoVersion}_solaris-amd64.tar.gz`, 'openbsd', 'x64')
-    .src(`${baseUrl}hugo_${hugoVersion}_windows-arm64.zip`, 'win32', 'arm64')
+    .src(`${baseUrl}${baseName}_dragonfly-amd64.tar.gz`, 'dragonflybsd', 'x64')
+    .src(`${baseUrl}${baseName}_freebsd-amd64.tar.gz`, 'freebsd', 'x64')
+    .src(`${baseUrl}${baseName}_linux-arm.tar.gz`, 'linux', 'arm')
+    .src(`${baseUrl}${baseName}_netbsd-amd64.tar.gz`, 'netbsd', 'x64')
+    .src(`${baseUrl}${baseName}_openbsd-amd64.tar.gz`, 'openbsd', 'x64')
+    .src(`${baseUrl}${baseName}_solaris-amd64.tar.gz`, 'openbsd', 'x64')
+    .src(`${baseUrl}${baseName}_windows-arm64.zip`, 'win32', 'arm64')
     .dest(destDir)
     .use(binName);
 }
 
 /**
- * @param {string} cwd
+ * @param {import('pkg-conf').Config} config
  */
-async function main(cwd) {
-  const config = await packageConfig('hugo-bin-extended', { cwd });
+function getOptions(config) {
   const hugoVersion = [
     process.env.HUGO_BIN_HUGO_VERSION,
     process.env.npm_config_hugo_bin_hugo_version,
@@ -52,9 +63,27 @@ async function main(cwd) {
 
   // Strip any leading `v` from hugoVersion because otherwise we'll end up with duplicate `v`s
   const version = hugoVersion[0] === 'v' ? hugoVersion.slice(1) : hugoVersion;
-  const baseUrl = `${downloadRepo}/gohugoio/hugo/releases/download/v${version}/`;
 
-  return extendedBin(baseUrl, version);
+  debug('[getOptions] hugoVersion:', version);
+  debug('[getOptions] downloadRepo:', downloadRepo);
+
+  return {
+    hugoVersion: version,
+    downloadRepo
+  };
+}
+
+/**
+ * @param {string} cwd
+ */
+async function main(cwd) {
+  const config = await packageConfig('hugo-bin-extended', { cwd });
+  const { hugoVersion, downloadRepo } = getOptions(config);
+  const baseUrl = `${downloadRepo}/gohugoio/hugo/releases/download/v${hugoVersion}/`;
+
+  debug('[main] baseUrl:', baseUrl);
+
+  return extendedBin(baseUrl, hugoVersion);
 }
 
 export default main;

package/lib/install.js

@@ -1,7 +1,7 @@
 import { rm } from 'node:fs/promises';
 import path from 'node:path';
 import process from 'node:process';
-import hugoBin from './index.js';
+import hugoBinExtended from './index.js';
 
 function getProjectRoot() {
   // `projectRoot` on postinstall could be INIT_CWD introduced in npm >= 5.4
@@ -29,7 +29,7 @@ async function main() {
 
   await rm(vendorDir, { force: true, recursive: true });
 
-  const bin = await hugoBin(projectRoot);
+  const bin = await hugoBinExtended(projectRoot);
 
   try {
     await bin.run(['version']);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "hugo-bin-extended",
-  "version": "0.134.2",
-  "hugoVersion": "0.134.2",
+  "version": "0.135.0",
+  "hugoVersion": "0.135.0",
   "description": "Binary wrapper for Hugo",
   "repository": {
     "type": "git",