Skip to content

Commit

Permalink
refactor: move config files to @nuxt/config (#4212)
Browse files Browse the repository at this point in the history
  • Loading branch information
galvez authored and pi0 committed Oct 27, 2018
1 parent ec7794c commit 007ca05
Show file tree
Hide file tree
Showing 17 changed files with 39 additions and 14 deletions.
2 changes: 1 addition & 1 deletion packages/cli/src/utils.js
Expand Up @@ -4,7 +4,7 @@ import consola from 'consola'
import esm from 'esm'
import wrapAnsi from 'wrap-ansi'
import defaultsDeep from 'lodash/defaultsDeep'
import { nuxtServerConfig } from '@nuxt/common'
import { server as nuxtServerConfig } from '@nuxt/config'

const _require = esm(module, {
cache: false,
Expand Down
2 changes: 1 addition & 1 deletion packages/cli/test/unit/utils.test.js
@@ -1,4 +1,4 @@
import { nuxtServerConfig } from '@nuxt/common'
import { server as nuxtServerConfig } from '@nuxt/config'
import { consola } from '../utils'
import * as utils from '../../src/utils'

Expand Down
3 changes: 1 addition & 2 deletions packages/common/package.json
Expand Up @@ -9,8 +9,7 @@
"main": "dist/common.js",
"dependencies": {
"consola": "^1.4.4",
"lodash": "^4.17.11",
"std-env": "^2.0.2"
"lodash": "^4.17.11"
},
"publishConfig": {
"access": "public"
Expand Down
3 changes: 0 additions & 3 deletions packages/common/src/index.js
@@ -1,6 +1,3 @@
export { default as Modes } from './modes'
export { default as NuxtConfig } from './nuxt.config'
export { default as nuxtServerConfig } from './config/server'
export { default as Options } from './options'
export { default as BuildContext } from './build/context'
export * from './utils'
3 changes: 0 additions & 3 deletions packages/common/src/nuxt.config.js

This file was deleted.

5 changes: 2 additions & 3 deletions packages/common/src/options.js
Expand Up @@ -5,10 +5,9 @@ import defaults from 'lodash/defaults'
import pick from 'lodash/pick'
import isObject from 'lodash/isObject'
import consola from 'consola'

// eslint-disable-next-line
import { default as NuxtConfig, Modes } from '@nuxt/config'

This comment has been minimized.

Copy link
@pi0

pi0 Oct 27, 2018

Member

@galvez I missed this. Mixing default and named exports breaks CJS require. This is why eslint doesn't recommend it.

This comment has been minimized.

Copy link
@galvez

galvez Oct 27, 2018

Author

@pi0 oops, will patch it.

import { isPureObject, isUrl, guardDir, isString } from './utils'
import Modes from './modes'
import NuxtConfig from './nuxt.config'

// hasValue utility
const hasValue = v => typeof v === 'string' && v
Expand Down
3 changes: 3 additions & 0 deletions packages/config/package.js
@@ -0,0 +1,3 @@
export default {
build: true
}
18 changes: 18 additions & 0 deletions packages/config/package.json
@@ -0,0 +1,18 @@
{
"name": "@nuxt/config",
"version": "2.2.0",
"repository": "nuxt/nuxt.js",
"license": "MIT",
"files": [
"dist"
],
"main": "dist/config.js",
"dependencies": {
"consola": "^1.4.4",
"lodash": "^4.17.11",
"std-env": "^2.0.2"
},
"publishConfig": {
"access": "public"
}
}
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
11 changes: 11 additions & 0 deletions packages/config/src/index.js
@@ -0,0 +1,11 @@
import NuxtConfig from './config'

// Export individual bundles for easier access
export { default as Modes } from './modes'
export { default as build } from './config/build'
export { default as messages } from './config/messages'
export { default as render } from './config/render'
export { default as router } from './config/router'
export { default as server } from './config/server'

export default NuxtConfig
File renamed without changes.
3 changes: 2 additions & 1 deletion packages/core/src/renderer.js
Expand Up @@ -9,7 +9,8 @@ import connect from 'connect'
import launchMiddleware from 'launch-editor-middleware'
import consola from 'consola'

import { NuxtConfig, isUrl, timeout, waitFor, determineGlobals } from '@nuxt/common'
import { isUrl, timeout, waitFor, determineGlobals } from '@nuxt/common'
import NuxtConfig from '@nuxt/config'

import MetaRenderer from './meta'
import errorMiddleware from './middleware/error'
Expand Down

0 comments on commit 007ca05

Please sign in to comment.