Skip to content

Commit fefb823

Browse files
committed
chore: use consola instead of debug for logging, improve messages
1 parent fa38ca5 commit fefb823

File tree

1 file changed

+19
-13
lines changed

1 file changed

+19
-13
lines changed

src/module.js

Lines changed: 19 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,21 @@ import { resolve, join } from "path";
55
import { copy } from "fs-extra";
66
import _ from "lodash";
77
import { r, urlJoin } from "@nuxt/common";
8+
import consola from "consola";
89
import chokidar from "chokidar";
910
import pify from "pify";
1011
import webpack from "webpack";
1112
import webpackDevMiddleware from "webpack-dev-middleware";
1213
import webpackHotMiddleware from "webpack-hot-middleware";
1314
import serveStatic from "serve-static";
14-
import Debug from "debug";
1515

1616
import pkg from "../package.json";
1717

1818
import ConfigManager from "./configManager";
1919
import getWebpackNetlifyConfig from "./webpack.config";
2020
import { toYAML } from "./utils/yaml";
2121

22-
const debug = Debug("nuxt:netlify-cms");
22+
const logger = consola.withScope("nuxt:netlify-cms");
2323

2424
const WEBPACK_CLIENT_COMPILER_NAME = "client";
2525
const WEBPACK_NETLIFY_COMPILER_NAME = "netlify-cms";
@@ -72,6 +72,8 @@ export default function NetlifyCmsModule(moduleOptions) {
7272
return;
7373
}
7474

75+
logger.success("Netlify-cms builder initialized");
76+
7577
// This will be run just after webpack compiler ends
7678
netlifyCompiler.hooks.done.tapAsync(
7779
"NetlifyCMSPlugin",
@@ -81,7 +83,12 @@ export default function NetlifyCmsModule(moduleOptions) {
8183
/* istanbul ignore next */
8284
return;
8385
}
84-
debug(`Bundle built!`);
86+
87+
logger.success("Netlify-cms bundle generated");
88+
// Show a message inside console when the build is ready
89+
this.options.dev &&
90+
logger.info(`Netlify-cms served on: ${config.adminPath}`);
91+
8592
cb();
8693
}
8794
);
@@ -90,13 +97,6 @@ export default function NetlifyCmsModule(moduleOptions) {
9097
if (this.options.dev) {
9198
// Use shared filesystem and cache
9299
netlifyCompiler.outputFileSystem = bundleBuilder.mfs;
93-
// Show a message inside console when the build is ready
94-
this.nuxt.hook("build:compiled", async name => {
95-
if (name !== WEBPACK_CLIENT_COMPILER_NAME) {
96-
return;
97-
}
98-
debug(`Serving on: ${config.adminPath}`);
99-
});
100100

101101
// Create webpack dev middleware
102102
const netlifyWebpackDevMiddleware = pify(
@@ -159,7 +159,10 @@ export default function NetlifyCmsModule(moduleOptions) {
159159
path: config.adminPath,
160160
handler: async (req, res) => {
161161
if (this.nuxt.renderer.netlifyWebpackDevMiddleware) {
162-
debug(`requesting url: ${urlJoin(config.adminPath, req.url)}`);
162+
logger.info(
163+
`Netlify-cms requested url: ${urlJoin(config.adminPath, req.url)}`
164+
);
165+
163166
await this.nuxt.renderer.netlifyWebpackDevMiddleware(req, res);
164167
}
165168
if (this.nuxt.renderer.netlifyWebpackHotMiddleware) {
@@ -182,6 +185,8 @@ export default function NetlifyCmsModule(moduleOptions) {
182185
this.nuxt.renderer.netlifyWebpackHotMiddleware.publish({
183186
action: "reload"
184187
});
188+
189+
logger.info("Netlify-cms files refreshed");
185190
}, 200);
186191

187192
// Watch for src Files
@@ -207,7 +212,7 @@ export default function NetlifyCmsModule(moduleOptions) {
207212
});
208213
}
209214

210-
// Move cms folder from `dist/_nuxt` folder to `dist/` after nuxt generate
215+
// Move cms folder from `.nuxt/dist/admin` folder to `dist/` after nuxt generate
211216
this.nuxt.hook("generate:distCopied", async nuxt => {
212217
await copy(
213218
resolve(nuxt.options.buildDir, "dist", config.adminPath).replace(
@@ -216,7 +221,8 @@ export default function NetlifyCmsModule(moduleOptions) {
216221
),
217222
join(nuxt.distPath, config.adminPath).replace(/\/$/, "")
218223
);
219-
debug("Netlify CMS files copied");
224+
225+
logger.success("Netlify-cms files copied");
220226
});
221227
}
222228

0 commit comments

Comments
 (0)