From 313be1bce144ab128dbea11e3d6fdb5e8de9ea74 Mon Sep 17 00:00:00 2001 From: Matt Sturgeon Date: Sun, 30 Jul 2017 03:03:01 +0100 Subject: [PATCH] Include hugo as a npm dependency Don't require hugo to be installed separately; instead list the node wrapper module hugo-bin as a dependency. --- CONTRIBUTING.md | 2 -- README.md | 10 +--------- gulpfile.babel.js | 6 +++--- package.json | 1 + 4 files changed, 5 insertions(+), 14 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index a801680..e5575bf 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -5,8 +5,6 @@ please read the [code of conduct](CODE_OF_CONDUCT.md). ## Setup -> Install Hugo in your system: https://github.com/spf13/hugo/releases - ```sh $ git clone https://github.com/netlify/victor-hugo $ cd victor-hugo diff --git a/README.md b/README.md index d0c55ca..caf7b68 100644 --- a/README.md +++ b/README.md @@ -11,15 +11,7 @@ This project is released under the [MIT license](LICENSE). Please make sure you ## Usage -Be sure that you have the latest node, npm and [Hugo](https://gohugo.io/) installed. If you need to install hugo on OSX, run: - -```bash -brew install hugo -``` - -If you don't use OSX or don't use homebrew, follow the instructions for installation here instead: - -http://gohugo.io/overview/installing/ +Be sure that you have the latest node and npm installed. Next, clone this repository and run: diff --git a/gulpfile.babel.js b/gulpfile.babel.js index 8aafe62..ccf48fc 100644 --- a/gulpfile.babel.js +++ b/gulpfile.babel.js @@ -1,5 +1,6 @@ import gulp from "gulp"; -import cp from "child_process"; +import { spawn } from "child_process"; +import hugoBin from "hugo-bin" import gutil from "gulp-util"; import postcss from "gulp-postcss"; import cssImport from "postcss-import"; @@ -9,7 +10,6 @@ import webpack from "webpack"; import webpackConfig from "./webpack.conf"; const browserSync = BrowserSync.create(); -const hugoBin = "hugo"; const defaultArgs = ["-d", "../dist", "-s", "site", "-v"]; gulp.task("hugo", (cb) => buildSite(cb)); @@ -53,7 +53,7 @@ gulp.task("server", ["hugo", "css", "js"], () => { function buildSite(cb, options) { const args = options ? defaultArgs.concat(options) : defaultArgs; - return cp.spawn(hugoBin, args, {stdio: "inherit"}).on("close", (code) => { + return spawn(hugoBin, args, {stdio: "inherit"}).on("close", (code) => { if (code === 0) { browserSync.reload(); cb(); diff --git a/package.json b/package.json index c40797a..b0dd480 100644 --- a/package.json +++ b/package.json @@ -31,6 +31,7 @@ "gulp-babel": "^6.1.2", "gulp-postcss": "^6.1.1", "gulp-util": "^3.0.7", + "hugo-bin": "^0.11.0", "imports-loader": "^0.7.1", "postcss-cssnext": "^2.7.0", "postcss-import": "^10.0.0",