From 657a6cc7c99f81b93dcd75f2be5baad0a1e35374 Mon Sep 17 00:00:00 2001 From: "Xin Du (Clark)" Date: Wed, 12 Dec 2018 10:47:54 +0000 Subject: [PATCH] chore: tiny refactoring (#4534) --- packages/config/src/config/index.js | 16 ++++++++-------- packages/webpack/src/builder.js | 16 ++++++++-------- scripts/package.js | 2 +- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/packages/config/src/config/index.js b/packages/config/src/config/index.js index 571b29d8d1..2b57b5ff62 100644 --- a/packages/config/src/config/index.js +++ b/packages/config/src/config/index.js @@ -16,14 +16,14 @@ export function getDefaultNuxtConfig(options = {}) { } return { - ..._app(options), - ..._common(options), - build: build(options), - messages: messages(options), - modes: modes(options), - render: render(options), - router: router(options), + ..._app(), + ..._common(), + build: build(), + messages: messages(), + modes: modes(), + render: render(), + router: router(), server: server(options), - cli: cli(options) + cli: cli() } } diff --git a/packages/webpack/src/builder.js b/packages/webpack/src/builder.js index 076a38ec1e..1f68db3303 100644 --- a/packages/webpack/src/builder.js +++ b/packages/webpack/src/builder.js @@ -85,15 +85,15 @@ export class WebpackBundler { 'Using styleResources without the nuxt-style-resources-module is not suggested and can lead to severe performance issues.', 'Please use https://github.com/nuxt-community/style-resources-module' ) - } - for (const ext of Object.keys(styleResources)) { - await Promise.all(wrapArray(styleResources[ext]).map(async (p) => { - const styleResourceFiles = await glob(path.resolve(this.context.options.rootDir, p)) + for (const ext of Object.keys(styleResources)) { + await Promise.all(wrapArray(styleResources[ext]).map(async (p) => { + const styleResourceFiles = await glob(path.resolve(this.context.options.rootDir, p)) - if (!styleResourceFiles || styleResourceFiles.length === 0) { - throw new Error(`Style Resource not found: ${p}`) - } - })) + if (!styleResourceFiles || styleResourceFiles.length === 0) { + throw new Error(`Style Resource not found: ${p}`) + } + })) + } } // Configure compilers diff --git a/scripts/package.js b/scripts/package.js index ee72843f8b..4adf3775d3 100644 --- a/scripts/package.js +++ b/scripts/package.js @@ -90,7 +90,7 @@ export default class Package { async writePackage() { if (this.options.sortDependencies) { - await this.sortDependencies() + this.sortDependencies() } const pkgPath = this.resolvePath(this.options.pkgPath) this.logger.debug('Writing', pkgPath)