diff --git a/packages/workbox-cli/src/lib/questions/ask-questions.js b/packages/workbox-cli/src/lib/questions/ask-questions.js index d6b62b036..71ec2bac7 100644 --- a/packages/workbox-cli/src/lib/questions/ask-questions.js +++ b/packages/workbox-cli/src/lib/questions/ask-questions.js @@ -22,7 +22,7 @@ const askSWDest = require('./ask-sw-dest'); module.exports = async () => { const globDirectory = await askRootOfWebApp(); const globPatterns = await askExtensionsToCache(globDirectory); - const swDest = await askSWDest(); + const swDest = await askSWDest(globDirectory); const configLocation = await askConfigLocation(); const config = { globDirectory, diff --git a/packages/workbox-cli/src/lib/questions/ask-sw-dest.js b/packages/workbox-cli/src/lib/questions/ask-sw-dest.js index a313f6cf5..9bdb26bf0 100644 --- a/packages/workbox-cli/src/lib/questions/ask-sw-dest.js +++ b/packages/workbox-cli/src/lib/questions/ask-sw-dest.js @@ -16,7 +16,7 @@ const assert = require('assert'); const inquirer = require('inquirer'); -const ol = require('common-tags').oneLine; +const path = require('path'); const errors = require('../errors'); @@ -24,19 +24,20 @@ const errors = require('../errors'); const name = 'swDest'; /** + * @param {string} defaultDir * @return {Promise} The answers from inquirer. */ -function askQuestion() { +function askQuestion(defaultDir) { return inquirer.prompt([{ name, - message: ol`Where would you like your service worker file to be saved?`, + message: `Where would you like your service worker file to be saved?`, type: 'input', - default: 'build/sw.js', + default: path.join(defaultDir, 'sw.js'), }]); } -module.exports = async () => { - const answers = await askQuestion(); +module.exports = async (defaultDir = '.') => { + const answers = await askQuestion(defaultDir); const swDest = answers[name].trim(); assert(swDest, errors['invalid-sw-dest']);