diff --git a/lib/builder/builder.mjs b/lib/builder/builder.mjs index 904249c62d..7ca34f801f 100644 --- a/lib/builder/builder.mjs +++ b/lib/builder/builder.mjs @@ -40,7 +40,7 @@ export default class Builder { this.filesWatcher = null this.customFilesWatcher = null this.spinner = createSpinner({ - minimal: this.options.test || this.options.ci + minimal: this.options.minimalCLI }) // Mute stats on dev diff --git a/lib/builder/generator.mjs b/lib/builder/generator.mjs index 9f60faf05f..54a05e35e8 100644 --- a/lib/builder/generator.mjs +++ b/lib/builder/generator.mjs @@ -21,7 +21,7 @@ export default class Generator { ) this.spinner = createSpinner({ - minimal: this.options.test || this.options.ci + minimal: this.options.minimalCLI }) } diff --git a/lib/builder/webpack/base.config.mjs b/lib/builder/webpack/base.config.mjs index 52e827390e..3e9bc71d81 100644 --- a/lib/builder/webpack/base.config.mjs +++ b/lib/builder/webpack/base.config.mjs @@ -132,7 +132,7 @@ export default function webpackBaseConfig({ name, isServer }) { if (this.options.build.profile) { config.plugins.push(new webpack.ProgressPlugin({ profile: true })) } else { - if (!(this.options.test || this.options.ci)) { + if (!(this.options.minimalCLI)) { config.plugins.push(new ProgressPlugin({ spinner: this.spinner, name: isServer ? 'server' : 'client', diff --git a/lib/common/nuxt.config.js b/lib/common/nuxt.config.js index d0643d0e45..b66b295bdf 100644 --- a/lib/common/nuxt.config.js +++ b/lib/common/nuxt.config.js @@ -4,9 +4,10 @@ import isCI from 'is-ci' export default { // Information about running environment dev: process.env.NODE_ENV !== 'production', - debug: undefined, // Will be equal to dev if not provided + debug: undefined, // = dev test: process.env.NODE_ENV === 'test', ci: Boolean(isCI), + minimalCLI: undefined, // = ci || test || !dev // Mode mode: 'universal', diff --git a/lib/common/options.mjs b/lib/common/options.mjs index 2713612164..f1f71606b5 100644 --- a/lib/common/options.mjs +++ b/lib/common/options.mjs @@ -121,6 +121,16 @@ Options.from = function (_options) { ) } + // Debug errors + if (options.debug === undefined) { + options.debug = options.dev + } + + // minimalCLI + if (options.minimalCLI === undefined) { + options.minimalCLI = options.ci || options.test || !options.dev + } + // Apply default hash to CSP option if (options.render.csp === true) { options.render.csp = { hashAlgorithm: 'sha256' } @@ -136,11 +146,6 @@ Options.from = function (_options) { options.build.babel.cacheDirectory = options.dev } - // Debug errors - if (options.debug === undefined) { - options.debug = options.dev - } - // Resource hints if (options.render.resourceHints === undefined) { options.render.resourceHints = !options.dev