mirror of
https://github.com/nuxt/nuxt.git
synced 2024-11-26 23:52:06 +00:00
feat: rewrite core to esm
This commit is contained in:
parent
b0f25cbadf
commit
53e98a958c
@ -1,6 +1,7 @@
|
||||
const { Utils } = require('../..')
|
||||
const { resolve } = require('path')
|
||||
const { existsSync } = require('fs')
|
||||
const { requireModule } = require('../../lib/common/module')
|
||||
|
||||
const getRootDir = argv => resolve(argv._[0] || '.')
|
||||
const getNuxtConfigFile = argv => resolve(getRootDir(argv), argv['config-file'])
|
||||
@ -15,7 +16,7 @@ exports.loadNuxtConfig = argv => {
|
||||
|
||||
if (existsSync(nuxtConfigFile)) {
|
||||
delete require.cache[nuxtConfigFile]
|
||||
options = require(nuxtConfigFile)
|
||||
options = requireModule(nuxtConfigFile)
|
||||
} else if (argv['config-file'] !== 'nuxt.config.js') {
|
||||
Utils.fatalError('Could not load config file: ' + argv['config-file'])
|
||||
}
|
||||
|
12
bin/nuxt-dev
12
bin/nuxt-dev
@ -3,17 +3,15 @@
|
||||
|
||||
const defaultsDeep = require('lodash/defaultsDeep')
|
||||
const debug = require('debug')('nuxt:build')
|
||||
debug.color = 2 // force green color
|
||||
const parseArgs = require('minimist')
|
||||
const chokidar = require('chokidar')
|
||||
const { version } = require('../package.json')
|
||||
|
||||
const { version } = require('../package.json')
|
||||
const { Nuxt, Builder, Utils } = require('..')
|
||||
const {
|
||||
loadNuxtConfig,
|
||||
getLatestHost,
|
||||
nuxtConfigFile
|
||||
} = require('./common/utils')
|
||||
|
||||
const { loadNuxtConfig, getLatestHost, nuxtConfigFile } = require('./common/utils')
|
||||
|
||||
debug.color = 2 // force green color
|
||||
|
||||
const argv = parseArgs(process.argv.slice(2), {
|
||||
alias: {
|
||||
|
@ -1,4 +1,4 @@
|
||||
module.exports = {
|
||||
export default {
|
||||
head: {
|
||||
title: 'Nuxt Blog',
|
||||
meta: [
|
||||
|
@ -1,4 +1,4 @@
|
||||
module.exports = {
|
||||
export default {
|
||||
loading: {
|
||||
color: '#4FC08D',
|
||||
failedColor: '#bf5050',
|
||||
|
@ -1,4 +1,4 @@
|
||||
const express = require('express')
|
||||
import express from 'express'
|
||||
|
||||
// Create express router
|
||||
const router = express.Router()
|
||||
@ -30,7 +30,7 @@ router.post('/logout', (req, res) => {
|
||||
})
|
||||
|
||||
// Export the server middleware
|
||||
module.exports = {
|
||||
export default {
|
||||
path: '/api',
|
||||
handler: router
|
||||
}
|
||||
|
@ -1,7 +1,7 @@
|
||||
const bodyParser = require('body-parser')
|
||||
const session = require('express-session')
|
||||
import bodyParser from 'body-parser'
|
||||
import session from 'express-session'
|
||||
|
||||
module.exports = {
|
||||
export default {
|
||||
head: {
|
||||
title: 'Auth Routes',
|
||||
meta: [
|
||||
|
@ -1,4 +1,4 @@
|
||||
module.exports = {
|
||||
export default {
|
||||
modules: [
|
||||
'@nuxtjs/axios',
|
||||
'@nuxtjs/proxy'
|
||||
|
@ -1,4 +1,4 @@
|
||||
module.exports = {
|
||||
export default {
|
||||
render: {
|
||||
bundleRenderer: {
|
||||
cache: require('lru-cache')({
|
||||
|
@ -1,4 +1,4 @@
|
||||
module.exports = function () {
|
||||
export default function () {
|
||||
// Add .coffee extension for store, middleware and more
|
||||
this.nuxt.options.extensions.push('coffee')
|
||||
// Extend build
|
||||
|
@ -1,4 +1,4 @@
|
||||
module.exports = {
|
||||
export default {
|
||||
/*
|
||||
** Headers of the page
|
||||
*/
|
||||
|
@ -1,4 +1,4 @@
|
||||
module.exports = {
|
||||
export default {
|
||||
build: {
|
||||
filenames: {
|
||||
css: 'styles.[chunkhash].css', // default: common.[chunkhash].css
|
||||
|
@ -1,3 +1,3 @@
|
||||
module.exports = {
|
||||
export default {
|
||||
loading: '~/components/loading.vue'
|
||||
}
|
||||
|
@ -1,2 +1,2 @@
|
||||
module.exports = {
|
||||
export default {
|
||||
}
|
||||
|
@ -1 +1 @@
|
||||
module.exports = {}
|
||||
export default {}
|
||||
|
@ -1,5 +1,7 @@
|
||||
const app = require('express')()
|
||||
const { Nuxt, Builder } = require('nuxt')
|
||||
import express from 'express'
|
||||
import { Nuxt, Builder } from 'nuxt'
|
||||
|
||||
const app = express()
|
||||
|
||||
const host = process.env.HOST || '127.0.0.1'
|
||||
const port = process.env.PORT || 3000
|
||||
|
@ -1,4 +1,4 @@
|
||||
module.exports = {
|
||||
export default {
|
||||
head: {
|
||||
titleTemplate: 'Nuxt.js - Dynamic Components',
|
||||
meta: [
|
||||
|
@ -1,4 +1,4 @@
|
||||
module.exports = {
|
||||
export default {
|
||||
head: {
|
||||
meta: [
|
||||
{ content: 'width=device-width,initial-scale=1', name: 'viewport' }
|
||||
|
@ -1,4 +1,4 @@
|
||||
module.exports = {
|
||||
export default {
|
||||
head: {
|
||||
meta: [
|
||||
{ charset: 'utf-8' },
|
||||
|
@ -1,4 +1,4 @@
|
||||
module.exports = {
|
||||
export default {
|
||||
loading: { color: 'cyan' },
|
||||
router: {
|
||||
middleware: 'i18n'
|
||||
|
@ -1,4 +1,4 @@
|
||||
module.exports = {
|
||||
export default {
|
||||
css: ['~/assets/main.css'],
|
||||
layoutTransition: {
|
||||
name: 'layout',
|
||||
|
@ -1,4 +1,4 @@
|
||||
module.exports = {
|
||||
export default {
|
||||
modules: [
|
||||
'@nuxtjs/markdownit'
|
||||
],
|
||||
|
@ -1,4 +1,4 @@
|
||||
module.exports = {
|
||||
export default {
|
||||
head: {
|
||||
titleTemplate: '%s - Nuxt.js',
|
||||
meta: [
|
||||
|
@ -1,4 +1,4 @@
|
||||
module.exports = {
|
||||
export default {
|
||||
router: {
|
||||
middleware: ['visits', 'user-agent']
|
||||
}
|
||||
|
@ -1,4 +1,4 @@
|
||||
module.exports = {
|
||||
export default {
|
||||
loading: false,
|
||||
head: {
|
||||
meta: [
|
||||
|
@ -1,4 +1,4 @@
|
||||
module.exports = {
|
||||
export default {
|
||||
plugins: [
|
||||
// ssr: false to only include it on client-side
|
||||
{ src: '~/plugins/vue-notifications.js', ssr: false }
|
||||
|
@ -1,3 +1,3 @@
|
||||
module.exports = {
|
||||
export default {
|
||||
css: ['~/assets/main.css']
|
||||
}
|
||||
|
@ -1,3 +1,3 @@
|
||||
module.exports = {
|
||||
export default {
|
||||
css: ['~/assets/main.css']
|
||||
}
|
||||
|
@ -1,4 +1,4 @@
|
||||
module.exports = {
|
||||
export default {
|
||||
/*
|
||||
** Single Page Application mode
|
||||
** Means no SSR
|
||||
|
@ -1,6 +1,6 @@
|
||||
const pkg = require('./package')
|
||||
import pkg from './package'
|
||||
|
||||
module.exports = {
|
||||
export default {
|
||||
mode: 'universal',
|
||||
|
||||
/*
|
||||
|
@ -1,4 +1,4 @@
|
||||
module.exports = {
|
||||
export default {
|
||||
build: {
|
||||
// You cannot use ~/ or @/ here since it's a Webpack plugin
|
||||
styleResources: {
|
||||
|
@ -1,3 +1,3 @@
|
||||
module.exports = {
|
||||
export default {
|
||||
css: ['~/assets/css/tailwind.css']
|
||||
}
|
||||
|
@ -127,7 +127,7 @@ var colors = {
|
||||
'pink-lightest': '#ffebef'
|
||||
}
|
||||
|
||||
module.exports = {
|
||||
export default {
|
||||
|
||||
/*
|
||||
|-----------------------------------------------------------------------------
|
||||
|
@ -1,4 +1,4 @@
|
||||
module.exports = function () {
|
||||
export default function () {
|
||||
// Add .ts extension for store, middleware and more
|
||||
this.nuxt.options.extensions.push('ts')
|
||||
// Extend build
|
||||
|
@ -1,4 +1,4 @@
|
||||
module.exports = {
|
||||
export default {
|
||||
env: {
|
||||
baseUrl: process.env.BASE_URL || 'http://localhost:3000'
|
||||
},
|
||||
|
@ -1,4 +1,4 @@
|
||||
module.exports = {
|
||||
export default {
|
||||
css: ['uikit/dist/css/uikit.css'],
|
||||
plugins: [
|
||||
{ src: '~/plugins/uikit.js', ssr: false }
|
||||
|
@ -1,4 +1,4 @@
|
||||
module.exports = {
|
||||
export default {
|
||||
modules: ['@nuxtjs/apollo'],
|
||||
apollo: {
|
||||
networkInterfaces: {
|
||||
|
@ -1,4 +1,4 @@
|
||||
module.exports = {
|
||||
export default {
|
||||
head: {
|
||||
title: 'Nuxt.js + Vue-ChartJS',
|
||||
meta: [
|
||||
|
@ -1,4 +1,4 @@
|
||||
module.exports = {
|
||||
export default {
|
||||
build: {
|
||||
babel: {
|
||||
plugins: ['transform-decorators-legacy', 'transform-class-properties']
|
||||
|
@ -1,4 +1,4 @@
|
||||
module.exports = {
|
||||
export default {
|
||||
/*
|
||||
** We set `spa` mode to have only client-side rendering
|
||||
*/
|
||||
|
@ -8,7 +8,7 @@ const modifyHtml = (html) => {
|
||||
html = html.replace('</head>', ampScript + '</head>')
|
||||
return html
|
||||
}
|
||||
module.exports = {
|
||||
export default {
|
||||
head: {
|
||||
meta: [
|
||||
{ charset: 'utf-8' },
|
||||
|
@ -1,4 +1,4 @@
|
||||
module.exports = {
|
||||
export default {
|
||||
/*
|
||||
** Customize the progress bar color
|
||||
*/
|
||||
|
@ -1,4 +1,4 @@
|
||||
module.exports = {
|
||||
export default {
|
||||
head: {
|
||||
title: 'Nuxt-Cookies',
|
||||
meta: [
|
||||
|
@ -1,4 +1,4 @@
|
||||
module.exports = {
|
||||
export default {
|
||||
/*
|
||||
** Global CSS
|
||||
*/
|
||||
|
@ -1,4 +1,4 @@
|
||||
module.exports = {
|
||||
export default {
|
||||
loading: {
|
||||
color: 'purple'
|
||||
}
|
||||
|
@ -1,16 +1,14 @@
|
||||
'use strict'
|
||||
|
||||
const path = require('path')
|
||||
const compress = require('compression')
|
||||
const cors = require('cors')
|
||||
const feathers = require('feathers')
|
||||
const configuration = require('feathers-configuration')
|
||||
const hooks = require('feathers-hooks')
|
||||
const rest = require('feathers-rest')
|
||||
const bodyParser = require('body-parser')
|
||||
const socketio = require('feathers-socketio')
|
||||
const middleware = require('./middleware')
|
||||
const services = require('./services')
|
||||
import path from 'path'
|
||||
import compress from 'compression'
|
||||
import cors from 'cors'
|
||||
import feathers from 'feathers'
|
||||
import configuration from 'feathers-configuration'
|
||||
import hooks from 'feathers-hooks'
|
||||
import rest from 'feathers-rest'
|
||||
import bodyParser from 'body-parser'
|
||||
import socketio from 'feathers-socketio'
|
||||
import middleware from './middleware'
|
||||
import services from './services'
|
||||
|
||||
const app = feathers()
|
||||
|
||||
@ -27,4 +25,4 @@ app.use(compress())
|
||||
.configure(services)
|
||||
.configure(middleware)
|
||||
|
||||
module.exports = app
|
||||
export default app
|
||||
|
@ -1,12 +1,10 @@
|
||||
'use strict'
|
||||
|
||||
// Add any common hooks you want to share across services in here.
|
||||
//
|
||||
// Below is an example of how a hook is written and exported. Please
|
||||
// see http://docs.feathersjs.com/hooks/readme.html for more details
|
||||
// on hooks.
|
||||
|
||||
exports.myHook = function (options) {
|
||||
export function myHook(options) {
|
||||
return function (hook) {
|
||||
console.log('My custom global hook ran. Feathers is awesome!') // eslint-disable-line no-console
|
||||
}
|
||||
|
@ -1,6 +1,5 @@
|
||||
'use strict'
|
||||
import app from './app'
|
||||
|
||||
const app = require('./app')
|
||||
const port = app.get('port')
|
||||
|
||||
process.on('nuxt:build:done', (err) => {
|
||||
|
@ -1,8 +1,6 @@
|
||||
'use strict'
|
||||
import nuxt from './nuxt'
|
||||
|
||||
const nuxt = require('./nuxt')
|
||||
|
||||
module.exports = function () {
|
||||
export default function () {
|
||||
// Add your custom middleware here. Remember, that
|
||||
// just like Express the order matters, so error
|
||||
// handling middleware should go last.
|
||||
|
@ -1,5 +1,5 @@
|
||||
const resolve = require('path').resolve
|
||||
const { Nuxt, Builder } = require('nuxt')
|
||||
import { resolve } from 'path'
|
||||
import { Nuxt, Builder } from 'nuxt'
|
||||
|
||||
// Setup nuxt.js
|
||||
let config = {}
|
||||
@ -18,6 +18,6 @@ if (config.dev) {
|
||||
}
|
||||
|
||||
// Add nuxt.js middleware
|
||||
module.exports = function (req, res) {
|
||||
export default function (req, res) {
|
||||
nuxt.render(req, res)
|
||||
}
|
||||
|
@ -1,8 +1,6 @@
|
||||
'use strict'
|
||||
import authentication from 'feathers-authentication'
|
||||
|
||||
const authentication = require('feathers-authentication')
|
||||
|
||||
module.exports = function () {
|
||||
export default function () {
|
||||
const app = this
|
||||
|
||||
let config = app.get('auth')
|
||||
|
@ -1,8 +1,7 @@
|
||||
'use strict'
|
||||
const authentication = require('./authentication')
|
||||
const user = require('./user')
|
||||
import authentication from './authentication'
|
||||
import user from './user'
|
||||
|
||||
module.exports = function () {
|
||||
export default function () {
|
||||
const app = this
|
||||
|
||||
app.configure(authentication)
|
||||
|
@ -1,8 +1,7 @@
|
||||
'use strict'
|
||||
import hooks from 'feathers-hooks'
|
||||
import { hooks as auth } from 'feathers-authentication'
|
||||
|
||||
require('../../../hooks')
|
||||
const hooks = require('feathers-hooks')
|
||||
const auth = require('feathers-authentication').hooks
|
||||
|
||||
exports.before = {
|
||||
all: [],
|
||||
|
@ -1,11 +1,9 @@
|
||||
'use strict'
|
||||
import path from 'path'
|
||||
import NeDB from 'nedb'
|
||||
import service from 'feathers-nedb'
|
||||
import hooks from './hooks'
|
||||
|
||||
const path = require('path')
|
||||
const NeDB = require('nedb')
|
||||
const service = require('feathers-nedb')
|
||||
const hooks = require('./hooks')
|
||||
|
||||
module.exports = function () {
|
||||
export default function () {
|
||||
const app = this
|
||||
|
||||
const db = new NeDB({
|
||||
|
@ -1,8 +1,6 @@
|
||||
'use strict'
|
||||
|
||||
const assert = require('assert')
|
||||
const request = require('request')
|
||||
const app = require('../src/app')
|
||||
import assert from 'assert'
|
||||
import request from 'request'
|
||||
import app from '../src/app'
|
||||
|
||||
describe('Feathers application tests', function () {
|
||||
before(function (done) {
|
||||
|
@ -1,7 +1,5 @@
|
||||
'use strict'
|
||||
|
||||
const assert = require('assert')
|
||||
const app = require('../../../src/app')
|
||||
import assert from 'assert'
|
||||
import app from '../../../src/app'
|
||||
|
||||
describe('user service', function () {
|
||||
it('registered the users service', () => {
|
||||
|
@ -1,4 +1,4 @@
|
||||
module.exports = {
|
||||
export default {
|
||||
head: {
|
||||
meta: [
|
||||
{ charset: 'utf-8' },
|
||||
|
@ -1,4 +1,4 @@
|
||||
module.exports = {
|
||||
export default {
|
||||
head: {
|
||||
meta: [
|
||||
{
|
||||
|
@ -1,6 +1,6 @@
|
||||
const path = require('path')
|
||||
const PurgecssPlugin = require('purgecss-webpack-plugin')
|
||||
const glob = require('glob-all')
|
||||
import path from 'path'
|
||||
import PurgecssPlugin from 'purgecss-webpack-plugin'
|
||||
import glob from 'glob-all'
|
||||
|
||||
class TailwindExtractor {
|
||||
static extract(content) {
|
||||
@ -8,7 +8,7 @@ class TailwindExtractor {
|
||||
}
|
||||
}
|
||||
|
||||
module.exports = {
|
||||
export default {
|
||||
build: {
|
||||
extractCSS: true,
|
||||
postcss: [
|
||||
|
@ -127,7 +127,7 @@ var colors = {
|
||||
'pink-lightest': '#ffebef'
|
||||
}
|
||||
|
||||
module.exports = {
|
||||
export default {
|
||||
|
||||
/*
|
||||
|-----------------------------------------------------------------------------
|
||||
|
@ -1,7 +1,10 @@
|
||||
module.exports = function () {
|
||||
const server = require('http').createServer(this.nuxt.renderer.app)
|
||||
const io = require('socket.io')(server)
|
||||
import http from 'http'
|
||||
import socketIO from 'socket.io'
|
||||
|
||||
const server = http.createServer(this.nuxt.renderer.app)
|
||||
const io = socketIO(server)
|
||||
|
||||
export default function () {
|
||||
// overwrite nuxt.listen()
|
||||
this.nuxt.listen = (port, host) => new Promise((resolve) => server.listen(port || 3000, host || 'localhost', resolve))
|
||||
// close this server on 'close' event
|
||||
|
@ -1,4 +1,4 @@
|
||||
module.exports = {
|
||||
export default {
|
||||
head: {
|
||||
meta: [
|
||||
{ charset: 'utf-8' },
|
||||
|
@ -1,10 +1,15 @@
|
||||
const { Nuxt, Builder } = require('nuxt')
|
||||
const app = require('express')()
|
||||
const server = require('http').createServer(app)
|
||||
const io = require('socket.io')(server)
|
||||
import { Nuxt, Builder } from 'nuxt'
|
||||
import express from 'express'
|
||||
import http from 'http'
|
||||
import SocketIO from 'socket.io'
|
||||
|
||||
const port = process.env.PORT || 3000
|
||||
const isProd = process.env.NODE_ENV === 'production'
|
||||
|
||||
const app = express()
|
||||
const server = http.createServer(app)
|
||||
const io = SocketIO(server)
|
||||
|
||||
// We instantiate Nuxt.js with the options
|
||||
let config = require('./nuxt.config.js')
|
||||
config.dev = !isProd
|
||||
|
@ -1,4 +1,4 @@
|
||||
const hooks = require('require-extension-hooks')
|
||||
import hooks from 'require-extension-hooks'
|
||||
|
||||
// Setup browser environment
|
||||
require('browser-env')()
|
||||
|
@ -1,4 +1,4 @@
|
||||
module.exports = {
|
||||
export default {
|
||||
head: {
|
||||
meta: [
|
||||
{
|
||||
|
@ -1,6 +1,6 @@
|
||||
const nodeExternals = require('webpack-node-externals')
|
||||
import nodeExternals from 'webpack-node-externals'
|
||||
|
||||
module.exports = {
|
||||
export default {
|
||||
/*
|
||||
** Head elements
|
||||
** Add Roboto font and Material Icons
|
||||
|
@ -1,7 +1,7 @@
|
||||
const vuxLoader = require('vux-loader')
|
||||
const path = require('path')
|
||||
import vuxLoader from 'vux-loader'
|
||||
import path from 'path'
|
||||
|
||||
module.exports = {
|
||||
export default {
|
||||
head: {
|
||||
meta: [
|
||||
{ charset: 'utf-8' },
|
||||
|
@ -1,29 +1,29 @@
|
||||
const { promisify } = require('util')
|
||||
const _ = require('lodash')
|
||||
const chokidar = require('chokidar')
|
||||
const { remove, readFile, writeFile, mkdirp, existsSync } = require('fs-extra')
|
||||
const fs = require('fs')
|
||||
const hash = require('hash-sum')
|
||||
const webpack = require('webpack')
|
||||
const serialize = require('serialize-javascript')
|
||||
const { join, resolve, basename, extname, dirname } = require('path')
|
||||
const MFS = require('memory-fs')
|
||||
const webpackDevMiddleware = require('webpack-dev-middleware')
|
||||
const webpackHotMiddleware = require('webpack-hot-middleware')
|
||||
const Debug = require('debug')
|
||||
const Glob = require('glob')
|
||||
const { r, wp, wChunk, createRoutes, parallel, relativeTo, waitFor, createSpinner } = require('../common/utils')
|
||||
const { Options } = require('../common')
|
||||
const clientWebpackConfig = require('./webpack/client.config.js')
|
||||
const serverWebpackConfig = require('./webpack/server.config.js')
|
||||
const upath = require('upath')
|
||||
import { promisify } from 'util'
|
||||
import _ from 'lodash'
|
||||
import chokidar from 'chokidar'
|
||||
import { remove, readFile, writeFile, mkdirp, existsSync } from 'fs-extra'
|
||||
import fs from 'fs'
|
||||
import hash from 'hash-sum'
|
||||
import webpack from 'webpack'
|
||||
import serialize from 'serialize-javascript'
|
||||
import { join, resolve, basename, extname, dirname } from 'path'
|
||||
import MFS from 'memory-fs'
|
||||
import webpackDevMiddleware from 'webpack-dev-middleware'
|
||||
import webpackHotMiddleware from 'webpack-hot-middleware'
|
||||
import Debug from 'debug'
|
||||
import Glob from 'glob'
|
||||
import { r, wp, wChunk, createRoutes, parallel, relativeTo, waitFor, createSpinner } from '../common/utils'
|
||||
import Options from '../common/options'
|
||||
import clientWebpackConfig from './webpack/client.config.js'
|
||||
import serverWebpackConfig from './webpack/server.config.js'
|
||||
import upath from 'upath'
|
||||
|
||||
const debug = Debug('nuxt:build')
|
||||
debug.color = 2 // Force green color
|
||||
|
||||
const glob = promisify(Glob)
|
||||
|
||||
module.exports = class Builder {
|
||||
export default class Builder {
|
||||
constructor(nuxt) {
|
||||
this.nuxt = nuxt
|
||||
this.isStatic = false // Flag to know if the build is for a generated app
|
||||
@ -156,7 +156,7 @@ module.exports = class Builder {
|
||||
if (!options.babelrc && !options.presets) {
|
||||
options.presets = [
|
||||
[
|
||||
require.resolve('babel-preset-vue-app'),
|
||||
'babel-preset-vue-app',
|
||||
{
|
||||
targets: isServer ? { node: '8.0.0' } : { ie: 9, uglify: true }
|
||||
}
|
||||
@ -648,7 +648,7 @@ module.exports = class Builder {
|
||||
const options = _.omit(this.options, Options.unsafeKeys)
|
||||
await writeFile(
|
||||
config,
|
||||
`module.exports = ${JSON.stringify(options, null, ' ')}`,
|
||||
`export default ${JSON.stringify(options, null, ' ')}`,
|
||||
'utf8'
|
||||
)
|
||||
}
|
||||
|
@ -1,26 +1,11 @@
|
||||
const {
|
||||
copy,
|
||||
remove,
|
||||
writeFile,
|
||||
mkdirp,
|
||||
removeSync,
|
||||
existsSync
|
||||
} = require('fs-extra')
|
||||
const _ = require('lodash')
|
||||
const { resolve, join, dirname, sep } = require('path')
|
||||
const { minify } = require('html-minifier')
|
||||
const Chalk = require('chalk')
|
||||
const { printWarn, createSpinner } = require('../common/utils')
|
||||
import _ from 'lodash'
|
||||
import { resolve, join, dirname, sep } from 'path'
|
||||
import { minify } from 'html-minifier'
|
||||
import Chalk from 'chalk'
|
||||
import { copy, remove, writeFile, mkdirp, removeSync, existsSync } from 'fs-extra'
|
||||
import { isUrl, promisifyRoute, waitFor, flatRoutes, pe, printWarn, createSpinner } from '../common/utils'
|
||||
|
||||
const {
|
||||
isUrl,
|
||||
promisifyRoute,
|
||||
waitFor,
|
||||
flatRoutes,
|
||||
pe
|
||||
} = require('../common/utils')
|
||||
|
||||
module.exports = class Generator {
|
||||
export default class Generator {
|
||||
constructor(nuxt, builder) {
|
||||
this.nuxt = nuxt
|
||||
this.options = nuxt.options
|
||||
|
@ -1,7 +1,7 @@
|
||||
const Builder = require('./builder')
|
||||
const Generator = require('./generator')
|
||||
import Builder from './builder'
|
||||
import Generator from './generator'
|
||||
|
||||
module.exports = {
|
||||
export default {
|
||||
Builder,
|
||||
Generator
|
||||
}
|
||||
|
@ -1,16 +1,16 @@
|
||||
const ExtractTextPlugin = require('extract-text-webpack-plugin')
|
||||
const TimeFixPlugin = require('time-fix-plugin')
|
||||
const WarnFixPlugin = require('./plugins/warnfix')
|
||||
const ProgressPlugin = require('./plugins/progress')
|
||||
import ExtractTextPlugin from 'extract-text-webpack-plugin'
|
||||
import TimeFixPlugin from 'time-fix-plugin'
|
||||
import WarnFixPlugin from './plugins/warnfix'
|
||||
import ProgressPlugin from './plugins/progress'
|
||||
|
||||
const webpack = require('webpack')
|
||||
const { cloneDeep } = require('lodash')
|
||||
const { join, resolve } = require('path')
|
||||
import webpack from 'webpack'
|
||||
import { cloneDeep } from 'lodash'
|
||||
import { join, resolve } from 'path'
|
||||
|
||||
const { isUrl, urlJoin } = require('../../common/utils')
|
||||
import { isUrl, urlJoin } from '../../common/utils'
|
||||
|
||||
const vueLoader = require('./vue-loader')
|
||||
const styleLoader = require('./style-loader')
|
||||
import vueLoader from './vue-loader'
|
||||
import styleLoader from './style-loader'
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
@ -20,7 +20,7 @@ const styleLoader = require('./style-loader')
|
||||
| webpack config files
|
||||
|--------------------------------------------------------------------------
|
||||
*/
|
||||
module.exports = function webpackBaseConfig({ name, isServer }) {
|
||||
export default function webpackBaseConfig({ name, isServer }) {
|
||||
// Prioritize nested node_modules in webpack search path (#2558)
|
||||
const webpackModulesDir = ['node_modules'].concat(this.options.modulesDir)
|
||||
|
||||
|
@ -1,19 +1,19 @@
|
||||
const { each } = require('lodash')
|
||||
const webpack = require('webpack')
|
||||
// const VueSSRClientPlugin = require('vue-server-renderer/client-plugin')
|
||||
const VueSSRClientPlugin = require('./plugins/vue/client')
|
||||
const HTMLPlugin = require('html-webpack-plugin')
|
||||
const FriendlyErrorsWebpackPlugin = require('friendly-errors-webpack-plugin')
|
||||
const StylishPlugin = require('webpack-stylish')
|
||||
const { BundleAnalyzerPlugin } = require('webpack-bundle-analyzer')
|
||||
const { resolve } = require('path')
|
||||
const Debug = require('debug')
|
||||
const base = require('./base.config.js')
|
||||
import { each } from 'lodash'
|
||||
import webpack from 'webpack'
|
||||
// import VueSSRClientPlugin from 'vue-server-renderer/client-plugin'
|
||||
import VueSSRClientPlugin from './plugins/vue/client'
|
||||
import HTMLPlugin from 'html-webpack-plugin'
|
||||
import FriendlyErrorsWebpackPlugin from 'friendly-errors-webpack-plugin'
|
||||
import StylishPlugin from 'webpack-stylish'
|
||||
import { BundleAnalyzerPlugin } from 'webpack-bundle-analyzer'
|
||||
import { resolve } from 'path'
|
||||
import Debug from 'debug'
|
||||
import base from './base.config.js'
|
||||
|
||||
const debug = Debug('nuxt:build')
|
||||
debug.color = 2 // Force green color
|
||||
|
||||
module.exports = function webpackClientConfig() {
|
||||
export default function webpackClientConfig() {
|
||||
let config = base.call(this, { name: 'client', isServer: false })
|
||||
|
||||
// Entry points
|
||||
|
@ -1,12 +1,12 @@
|
||||
const webpack = require('webpack')
|
||||
const chalk = require('chalk')
|
||||
const _ = require('lodash')
|
||||
import webpack from 'webpack'
|
||||
import chalk from 'chalk'
|
||||
import _ from 'lodash'
|
||||
|
||||
const sharedState = {}
|
||||
|
||||
const BLOCK_CHAR = '█'
|
||||
|
||||
module.exports = class ProgressPlugin extends webpack.ProgressPlugin {
|
||||
export default class ProgressPlugin extends webpack.ProgressPlugin {
|
||||
constructor(options) {
|
||||
super(options)
|
||||
|
||||
|
@ -1,8 +1,8 @@
|
||||
const hash = require('hash-sum')
|
||||
const uniq = require('lodash.uniq')
|
||||
const { isJS, onEmit } = require('./util')
|
||||
import hash from 'hash-sum'
|
||||
import uniq from 'lodash.uniq'
|
||||
import { isJS, onEmit } from './util'
|
||||
|
||||
module.exports = class VueSSRClientPlugin {
|
||||
export default class VueSSRClientPlugin {
|
||||
constructor(options = {}) {
|
||||
this.options = Object.assign({
|
||||
filename: 'vue-ssr-client-manifest.json'
|
||||
|
@ -1,6 +1,6 @@
|
||||
const { validate, isJS, onEmit } = require('./util')
|
||||
import { validate, isJS, onEmit } from './util'
|
||||
|
||||
module.exports = class VueSSRServerPlugin {
|
||||
export default class VueSSRServerPlugin {
|
||||
constructor(options = {}) {
|
||||
this.options = Object.assign({
|
||||
filename: 'vue-ssr-server-bundle.json'
|
||||
|
@ -1,10 +1,10 @@
|
||||
const { red, yellow } = require('chalk')
|
||||
import chalk from 'chalk'
|
||||
|
||||
const prefix = `[vue-server-renderer-webpack-plugin]`
|
||||
const warn = exports.warn = msg => console.error(red(`${prefix} ${msg}\n`)) // eslint-disable-line no-console
|
||||
const tip = exports.tip = msg => console.log(yellow(`${prefix} ${msg}\n`)) // eslint-disable-line no-console
|
||||
export const warn = msg => console.error(chalk.red(`${prefix} ${msg}\n`)) // eslint-disable-line no-console
|
||||
export const tip = msg => console.log(chalk.yellow(`${prefix} ${msg}\n`)) // eslint-disable-line no-console
|
||||
|
||||
exports.validate = compiler => {
|
||||
export const validate = compiler => {
|
||||
if (compiler.options.target !== 'node') {
|
||||
warn('webpack config `target` should be "node".')
|
||||
}
|
||||
@ -21,7 +21,7 @@ exports.validate = compiler => {
|
||||
}
|
||||
}
|
||||
|
||||
exports.onEmit = (compiler, name, hook) => {
|
||||
export const onEmit = (compiler, name, hook) => {
|
||||
if (compiler.hooks) {
|
||||
// Webpack >= 4.0.0
|
||||
compiler.hooks.emit.tap(name,
|
||||
@ -38,6 +38,6 @@ exports.onEmit = (compiler, name, hook) => {
|
||||
}
|
||||
}
|
||||
|
||||
exports.isJS = (file) => /\.js(\?[^.]+)?$/.test(file)
|
||||
export const isJS = (file) => /\.js(\?[^.]+)?$/.test(file)
|
||||
|
||||
exports.isCSS = (file) => /\.css(\?[^.]+)?$/.test(file)
|
||||
export const isCSS = (file) => /\.css(\?[^.]+)?$/.test(file)
|
||||
|
@ -1,4 +1,4 @@
|
||||
module.exports = class WarnFixPlugin {
|
||||
export default class WarnFixPlugin {
|
||||
apply(compiler) /* istanbul ignore next */ {
|
||||
compiler.hooks.done.tap('warnfix-plugin', stats => {
|
||||
stats.compilation.warnings = stats.compilation.warnings.filter(warn => {
|
||||
|
@ -1,10 +1,10 @@
|
||||
const { existsSync } = require('fs')
|
||||
const { resolve, join } = require('path')
|
||||
const { cloneDeep } = require('lodash')
|
||||
const { isPureObject } = require('../../common/utils')
|
||||
const createResolver = require('postcss-import-resolver')
|
||||
import { existsSync } from 'fs'
|
||||
import { resolve, join } from 'path'
|
||||
import { cloneDeep } from 'lodash'
|
||||
import { isPureObject } from '../../common/utils'
|
||||
import createResolver from 'postcss-import-resolver'
|
||||
|
||||
module.exports = function postcssConfig() {
|
||||
export default function postcssConfig() {
|
||||
let config = cloneDeep(this.options.build.postcss)
|
||||
|
||||
/* istanbul ignore if */
|
||||
@ -78,7 +78,7 @@ module.exports = function postcssConfig() {
|
||||
if (isPureObject(config) && isPureObject(config.plugins)) {
|
||||
config.plugins = Object.keys(config.plugins)
|
||||
.map(p => {
|
||||
const plugin = require(this.nuxt.resolvePath(p))
|
||||
const plugin = this.nuxt.requireModule(p)
|
||||
const opts = config.plugins[p]
|
||||
if (opts === false) return // Disabled
|
||||
const instance = plugin(opts)
|
||||
|
@ -1,18 +1,18 @@
|
||||
const webpack = require('webpack')
|
||||
// const VueSSRServerPlugin = require('vue-server-renderer/server-plugin')
|
||||
const VueSSRServerPlugin = require('./plugins/vue/server')
|
||||
const nodeExternals = require('webpack-node-externals')
|
||||
const { each } = require('lodash')
|
||||
const { resolve } = require('path')
|
||||
const { existsSync } = require('fs')
|
||||
const base = require('./base.config.js')
|
||||
import webpack from 'webpack'
|
||||
// import VueSSRServerPlugin from 'vue-server-renderer/server-plugin'
|
||||
import VueSSRServerPlugin from './plugins/vue/server'
|
||||
import nodeExternals from 'webpack-node-externals'
|
||||
import { each } from 'lodash'
|
||||
import { resolve } from 'path'
|
||||
import { existsSync } from 'fs'
|
||||
import base from './base.config.js'
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
| Webpack Server Config
|
||||
|--------------------------------------------------------------------------
|
||||
*/
|
||||
module.exports = function webpackServerConfig() {
|
||||
export default function webpackServerConfig() {
|
||||
let config = base.call(this, { name: 'server', isServer: true })
|
||||
|
||||
// Env object defined in nuxt.config.js
|
||||
|
@ -1,8 +1,8 @@
|
||||
const ExtractTextPlugin = require('extract-text-webpack-plugin')
|
||||
const { join } = require('path')
|
||||
const postcssConfig = require('./postcss')
|
||||
import ExtractTextPlugin from 'extract-text-webpack-plugin'
|
||||
import { join } from 'path'
|
||||
import postcssConfig from './postcss'
|
||||
|
||||
module.exports = function styleLoader(ext, loaders = [], isVueLoader = false) {
|
||||
export default function styleLoader(ext, loaders = [], isVueLoader = false) {
|
||||
const sourceMap = Boolean(this.options.build.cssSourceMap)
|
||||
|
||||
// Normalize loaders
|
||||
|
@ -1,7 +1,7 @@
|
||||
const postcssConfig = require('./postcss')
|
||||
const styleLoader = require('./style-loader')
|
||||
import postcssConfig from './postcss'
|
||||
import styleLoader from './style-loader'
|
||||
|
||||
module.exports = function vueLoader({ isServer }) {
|
||||
export default function vueLoader({ isServer }) {
|
||||
// https://vue-loader.vuejs.org/en
|
||||
const config = {
|
||||
postcss: postcssConfig.call(this),
|
||||
|
@ -1,7 +0,0 @@
|
||||
const Utils = require('./utils')
|
||||
const Options = require('./options')
|
||||
|
||||
module.exports = {
|
||||
Utils,
|
||||
Options
|
||||
}
|
8
lib/common/module.js
Normal file
8
lib/common/module.js
Normal file
@ -0,0 +1,8 @@
|
||||
const esm = require('esm')
|
||||
|
||||
const _esm = esm(module, {})
|
||||
|
||||
exports.requireModule = function requireModule() {
|
||||
const m = _esm.apply(this, arguments)
|
||||
return (m && m.default) || m
|
||||
}
|
@ -1,15 +1,15 @@
|
||||
const _ = require('lodash')
|
||||
const Debug = require('debug')
|
||||
const { join, resolve } = require('path')
|
||||
const { existsSync, readdirSync } = require('fs')
|
||||
const { isUrl, isPureObject } = require('../common/utils')
|
||||
import _ from 'lodash'
|
||||
import Debug from 'debug'
|
||||
import { join, resolve } from 'path'
|
||||
import { existsSync, readdirSync } from 'fs'
|
||||
import { isUrl, isPureObject } from '../common/utils'
|
||||
|
||||
const debug = Debug('nuxt:build')
|
||||
debug.color = 2 // Force green color
|
||||
|
||||
const Options = {}
|
||||
|
||||
module.exports = Options
|
||||
export default Options
|
||||
|
||||
Options.from = function (_options) {
|
||||
// Clone options to prevent unwanted side-effects
|
||||
|
@ -1,35 +1,35 @@
|
||||
const { resolve, relative, sep } = require('path')
|
||||
const _ = require('lodash')
|
||||
const PrettyError = require('pretty-error')
|
||||
const Chalk = require('chalk')
|
||||
const ORA = require('ora')
|
||||
import { resolve, relative, sep } from 'path'
|
||||
import _ from 'lodash'
|
||||
import PrettyError from 'pretty-error'
|
||||
import Chalk from 'chalk'
|
||||
import ORA from 'ora'
|
||||
|
||||
exports.pe = new PrettyError()
|
||||
export const pe = new PrettyError()
|
||||
|
||||
exports.printWarn = function (msg, from) {
|
||||
export const printWarn = function (msg, from) {
|
||||
/* eslint-disable no-console */
|
||||
const fromStr = from ? Chalk.yellow(` ${from}\n\n`) : ' '
|
||||
console.warn('\n' + Chalk.bgYellow.black(' WARN ') + fromStr + msg + '\n')
|
||||
}
|
||||
|
||||
exports.renderError = function (_error, from) {
|
||||
const errStr = exports.pe.render(_error)
|
||||
export const renderError = function (_error, from) {
|
||||
const errStr = pe.render(_error)
|
||||
const fromStr = from ? Chalk.red(` ${from}`) : ''
|
||||
return '\n' + Chalk.bgRed.black(' ERROR ') + fromStr + '\n\n' + errStr
|
||||
}
|
||||
|
||||
exports.printError = function () {
|
||||
export const printError = function () {
|
||||
/* eslint-disable no-console */
|
||||
console.error(exports.renderError(...arguments))
|
||||
console.error(renderError(...arguments))
|
||||
}
|
||||
|
||||
exports.fatalError = function () {
|
||||
export const fatalError = function () {
|
||||
/* eslint-disable no-console */
|
||||
console.error(exports.renderError(...arguments))
|
||||
console.error(renderError(...arguments))
|
||||
process.exit(1)
|
||||
}
|
||||
|
||||
exports.createSpinner = function () {
|
||||
export const createSpinner = function () {
|
||||
return new ORA({
|
||||
color: 'green',
|
||||
spinner: 'clock',
|
||||
@ -37,15 +37,15 @@ exports.createSpinner = function () {
|
||||
})
|
||||
}
|
||||
|
||||
exports.encodeHtml = function encodeHtml(str) {
|
||||
export const encodeHtml = function encodeHtml(str) {
|
||||
return str.replace(/</g, '<').replace(/>/g, '>')
|
||||
}
|
||||
|
||||
exports.getContext = function getContext(req, res) {
|
||||
export const getContext = function getContext(req, res) {
|
||||
return { req, res }
|
||||
}
|
||||
|
||||
exports.setAnsiColors = function setAnsiColors(ansiHTML) {
|
||||
export const setAnsiColors = function setAnsiColors(ansiHTML) {
|
||||
ansiHTML.setColors({
|
||||
reset: ['efefef', 'a6004c'],
|
||||
darkgrey: '5a012b',
|
||||
@ -58,7 +58,7 @@ exports.setAnsiColors = function setAnsiColors(ansiHTML) {
|
||||
})
|
||||
}
|
||||
|
||||
exports.waitFor = function waitFor(ms) {
|
||||
export const waitFor = function waitFor(ms) {
|
||||
return new Promise(resolve => setTimeout(resolve, ms || 0))
|
||||
}
|
||||
|
||||
@ -76,9 +76,7 @@ async function promiseFinally(fn, finalFn) {
|
||||
return result
|
||||
}
|
||||
|
||||
exports.promiseFinally = promiseFinally
|
||||
|
||||
exports.timeout = function timeout(fn, ms, msg) {
|
||||
export const timeout = function timeout(fn, ms, msg) {
|
||||
let timerId
|
||||
const warpPromise = promiseFinally(fn, () => clearTimeout(timerId))
|
||||
const timerPromise = new Promise((resolve, reject) => {
|
||||
@ -87,7 +85,7 @@ exports.timeout = function timeout(fn, ms, msg) {
|
||||
return Promise.race([warpPromise, timerPromise])
|
||||
}
|
||||
|
||||
exports.urlJoin = function urlJoin() {
|
||||
export const urlJoin = function urlJoin() {
|
||||
return [].slice
|
||||
.call(arguments)
|
||||
.join('/')
|
||||
@ -95,11 +93,11 @@ exports.urlJoin = function urlJoin() {
|
||||
.replace(':/', '://')
|
||||
}
|
||||
|
||||
exports.isUrl = function isUrl(url) {
|
||||
export const isUrl = function isUrl(url) {
|
||||
return url.indexOf('http') === 0 || url.indexOf('//') === 0
|
||||
}
|
||||
|
||||
exports.promisifyRoute = function promisifyRoute(fn, ...args) {
|
||||
export const promisifyRoute = function promisifyRoute(fn, ...args) {
|
||||
// If routes is an array
|
||||
if (Array.isArray(fn)) {
|
||||
return Promise.resolve(fn)
|
||||
@ -125,18 +123,18 @@ exports.promisifyRoute = function promisifyRoute(fn, ...args) {
|
||||
return promise
|
||||
}
|
||||
|
||||
exports.sequence = function sequence(tasks, fn) {
|
||||
export const sequence = function sequence(tasks, fn) {
|
||||
return tasks.reduce(
|
||||
(promise, task) => promise.then(() => fn(task)),
|
||||
Promise.resolve()
|
||||
)
|
||||
}
|
||||
|
||||
exports.parallel = function parallel(tasks, fn) {
|
||||
export const parallel = function parallel(tasks, fn) {
|
||||
return Promise.all(tasks.map(task => fn(task)))
|
||||
}
|
||||
|
||||
exports.chainFn = function chainFn(base, fn) {
|
||||
export const chainFn = function chainFn(base, fn) {
|
||||
/* istanbul ignore if */
|
||||
if (!(fn instanceof Function)) {
|
||||
return
|
||||
@ -163,21 +161,21 @@ exports.chainFn = function chainFn(base, fn) {
|
||||
}
|
||||
}
|
||||
|
||||
exports.isPureObject = function isPureObject(o) {
|
||||
export const isPureObject = function isPureObject(o) {
|
||||
return !Array.isArray(o) && typeof o === 'object'
|
||||
}
|
||||
|
||||
const isWindows = (exports.isWindows = /^win/.test(process.platform))
|
||||
export const isWindows = /^win/.test(process.platform)
|
||||
|
||||
const wp = (exports.wp = function wp(p = '') {
|
||||
export const wp = function wp(p = '') {
|
||||
/* istanbul ignore if */
|
||||
if (isWindows) {
|
||||
return p.replace(/\\/g, '\\\\')
|
||||
}
|
||||
return p
|
||||
})
|
||||
}
|
||||
|
||||
exports.wChunk = function wChunk(p = '') {
|
||||
export const wChunk = function wChunk(p = '') {
|
||||
/* istanbul ignore if */
|
||||
if (isWindows) {
|
||||
return p.replace(/\//g, '_')
|
||||
@ -189,7 +187,7 @@ const reqSep = /\//g
|
||||
const sysSep = _.escapeRegExp(sep)
|
||||
const normalize = string => string.replace(reqSep, sysSep)
|
||||
|
||||
const r = (exports.r = function r() {
|
||||
export const r = function r() {
|
||||
let args = Array.prototype.slice.apply(arguments)
|
||||
let lastArg = _.last(args)
|
||||
|
||||
@ -198,9 +196,9 @@ const r = (exports.r = function r() {
|
||||
}
|
||||
|
||||
return wp(resolve(...args.map(normalize)))
|
||||
})
|
||||
}
|
||||
|
||||
exports.relativeTo = function relativeTo() {
|
||||
export const relativeTo = function relativeTo() {
|
||||
let args = Array.prototype.slice.apply(arguments)
|
||||
let dir = args.shift()
|
||||
|
||||
@ -220,7 +218,7 @@ exports.relativeTo = function relativeTo() {
|
||||
return wp(rp)
|
||||
}
|
||||
|
||||
exports.flatRoutes = function flatRoutes(router, path = '', routes = []) {
|
||||
export const flatRoutes = function flatRoutes(router, path = '', routes = []) {
|
||||
router.forEach(r => {
|
||||
if (!r.path.includes(':') && !r.path.includes('*')) {
|
||||
/* istanbul ignore if */
|
||||
@ -288,7 +286,7 @@ function cleanChildrenRoutes(routes, isChild = false) {
|
||||
return routes
|
||||
}
|
||||
|
||||
exports.createRoutes = function createRoutes(files, srcDir, pagesDir) {
|
||||
export const createRoutes = function createRoutes(files, srcDir, pagesDir) {
|
||||
let routes = []
|
||||
files.forEach(file => {
|
||||
let keys = file
|
||||
|
@ -1,12 +1,9 @@
|
||||
const { Options, Utils } = require('../common')
|
||||
const Module = require('./module')
|
||||
const Nuxt = require('./nuxt')
|
||||
const Renderer = require('./renderer')
|
||||
import Module from './module'
|
||||
import Nuxt from './nuxt'
|
||||
import Renderer from './renderer'
|
||||
|
||||
module.exports = {
|
||||
export default {
|
||||
Nuxt,
|
||||
Module,
|
||||
Renderer,
|
||||
Options,
|
||||
Utils
|
||||
Renderer
|
||||
}
|
||||
|
@ -1,9 +1,9 @@
|
||||
const Vue = require('vue')
|
||||
const VueMeta = require('vue-meta')
|
||||
const VueServerRenderer = require('vue-server-renderer')
|
||||
const LRU = require('lru-cache')
|
||||
import Vue from 'vue'
|
||||
import VueMeta from 'vue-meta'
|
||||
import VueServerRenderer from 'vue-server-renderer'
|
||||
import LRU from 'lru-cache'
|
||||
|
||||
module.exports = class MetaRenderer {
|
||||
export default class MetaRenderer {
|
||||
constructor(nuxt, renderer) {
|
||||
this.nuxt = nuxt
|
||||
this.renderer = renderer
|
||||
|
@ -1,8 +1,8 @@
|
||||
const Youch = require('@nuxtjs/youch')
|
||||
const { join, resolve, relative, isAbsolute } = require('path')
|
||||
const { readFile } = require('fs-extra')
|
||||
import Youch from '@nuxtjs/youch'
|
||||
import { join, resolve, relative, isAbsolute } from 'path'
|
||||
import { readFile } from 'fs-extra'
|
||||
|
||||
module.exports = function errorMiddleware(err, req, res, next) {
|
||||
export default function errorMiddleware(err, req, res, next) {
|
||||
// ensure statusCode, message and name fields
|
||||
err.statusCode = err.statusCode || 500
|
||||
err.message = err.message || 'Nuxt Server Error'
|
||||
|
@ -1,9 +1,9 @@
|
||||
const generateETag = require('etag')
|
||||
const fresh = require('fresh')
|
||||
import generateETag from 'etag'
|
||||
import fresh from 'fresh'
|
||||
|
||||
const { getContext } = require('../../common/utils')
|
||||
import { getContext } from '../../common/utils'
|
||||
|
||||
module.exports = async function nuxtMiddleware(req, res, next) {
|
||||
export default async function nuxtMiddleware(req, res, next) {
|
||||
// Get context
|
||||
const context = getContext(req, res)
|
||||
|
||||
|
@ -1,9 +1,9 @@
|
||||
const path = require('path')
|
||||
const fs = require('fs')
|
||||
const hash = require('hash-sum')
|
||||
const { chainFn, sequence, printWarn } = require('../common/utils')
|
||||
import path from 'path'
|
||||
import fs from 'fs'
|
||||
import hash from 'hash-sum'
|
||||
import { chainFn, sequence, printWarn } from '../common/utils'
|
||||
|
||||
module.exports = class ModuleContainer {
|
||||
export default class ModuleContainer {
|
||||
constructor(nuxt) {
|
||||
this.nuxt = nuxt
|
||||
this.options = nuxt.options
|
||||
@ -112,7 +112,7 @@ module.exports = class ModuleContainer {
|
||||
|
||||
// Resolve handler
|
||||
if (!handler) {
|
||||
handler = require(this.nuxt.resolvePath(src))
|
||||
handler = this.nuxt.requireModule(src)
|
||||
}
|
||||
|
||||
// Validate handler
|
||||
|
@ -1,20 +1,21 @@
|
||||
const Debug = require('debug')
|
||||
const enableDestroy = require('server-destroy')
|
||||
const Module = require('module')
|
||||
const { isPlainObject } = require('lodash')
|
||||
const chalk = require('chalk')
|
||||
const { existsSync } = require('fs-extra')
|
||||
const { Options } = require('../common')
|
||||
const { sequence, printError } = require('../common/utils')
|
||||
const { resolve, join } = require('path')
|
||||
const { version } = require('../../package.json')
|
||||
const ModuleContainer = require('./module')
|
||||
const Renderer = require('./renderer')
|
||||
import Debug from 'debug'
|
||||
import enableDestroy from 'server-destroy'
|
||||
import Module from 'module'
|
||||
import { isPlainObject } from 'lodash'
|
||||
import chalk from 'chalk'
|
||||
import { existsSync } from 'fs-extra'
|
||||
import Options from '../common/options'
|
||||
import { sequence, printError } from '../common/utils'
|
||||
import { resolve, join } from 'path'
|
||||
import { version } from '../../package.json'
|
||||
import ModuleContainer from './module'
|
||||
import Renderer from './renderer'
|
||||
import { requireModule } from '../common/module'
|
||||
|
||||
const debug = Debug('nuxt:')
|
||||
debug.color = 5
|
||||
|
||||
module.exports = class Nuxt {
|
||||
export default class Nuxt {
|
||||
constructor(options = {}) {
|
||||
this.options = Options.from(options)
|
||||
|
||||
@ -196,6 +197,10 @@ module.exports = class Nuxt {
|
||||
throw new Error(`Cannot resolve "${path}" from "${_path}"`)
|
||||
}
|
||||
|
||||
requireModule(name) {
|
||||
return requireModule(this.resolvePath(name))
|
||||
}
|
||||
|
||||
async close(callback) {
|
||||
await this.callHook('close', this)
|
||||
|
||||
|
@ -1,22 +1,22 @@
|
||||
const ansiHTML = require('ansi-html')
|
||||
const serialize = require('serialize-javascript')
|
||||
const serveStatic = require('serve-static')
|
||||
const compression = require('compression')
|
||||
const _ = require('lodash')
|
||||
const { join, resolve } = require('path')
|
||||
const fs = require('fs-extra')
|
||||
const { createBundleRenderer } = require('vue-server-renderer')
|
||||
const Debug = require('debug')
|
||||
const connect = require('connect')
|
||||
const launchMiddleware = require('launch-editor-middleware')
|
||||
const crypto = require('crypto')
|
||||
import ansiHTML from 'ansi-html'
|
||||
import serialize from 'serialize-javascript'
|
||||
import serveStatic from 'serve-static'
|
||||
import compression from 'compression'
|
||||
import _ from 'lodash'
|
||||
import { join, resolve } from 'path'
|
||||
import fs from 'fs-extra'
|
||||
import { createBundleRenderer } from 'vue-server-renderer'
|
||||
import Debug from 'debug'
|
||||
import connect from 'connect'
|
||||
import launchMiddleware from 'launch-editor-middleware'
|
||||
import crypto from 'crypto'
|
||||
|
||||
const { setAnsiColors, isUrl, waitFor, timeout } = require('../common/utils')
|
||||
const { Options } = require('../common')
|
||||
import { setAnsiColors, isUrl, waitFor, timeout } from '../common/utils'
|
||||
import Options from '../common/options'
|
||||
|
||||
const MetaRenderer = require('./meta')
|
||||
const errorMiddleware = require('./middleware/error')
|
||||
const nuxtMiddleware = require('./middleware/nuxt')
|
||||
import MetaRenderer from './meta'
|
||||
import errorMiddleware from './middleware/error'
|
||||
import nuxtMiddleware from './middleware/nuxt'
|
||||
|
||||
const debug = Debug('nuxt:render')
|
||||
debug.color = 4 // Force blue color
|
||||
@ -25,7 +25,7 @@ setAnsiColors(ansiHTML)
|
||||
|
||||
let jsdom = null
|
||||
|
||||
module.exports = class Renderer {
|
||||
export default class Renderer {
|
||||
constructor(nuxt) {
|
||||
this.nuxt = nuxt
|
||||
this.options = nuxt.options
|
||||
@ -180,12 +180,10 @@ module.exports = class Renderer {
|
||||
const $m = m
|
||||
let src
|
||||
if (typeof m === 'string') {
|
||||
src = this.nuxt.resolvePath(m)
|
||||
m = require(src)
|
||||
m = this.nuxt.requireModule(m)
|
||||
}
|
||||
if (typeof m.handler === 'string') {
|
||||
src = this.nuxt.resolvePath(m.handler)
|
||||
m.handler = require(src)
|
||||
m.handler = this.nuxt.requireModule(m.handler)
|
||||
}
|
||||
|
||||
const handler = m.handler || m
|
||||
|
19
lib/index.js
19
lib/index.js
@ -1,11 +1,20 @@
|
||||
/*!
|
||||
* Nuxt.js
|
||||
* (c) 2016-2017 Chopin Brothers
|
||||
* Core maintainer: Pooya Parsa (@pi0)
|
||||
* (c) 2016-2018 Chopin Brothers
|
||||
* Core maintainers: Pooya Parsa (@pi0) - Clark Du (@clarkdo)
|
||||
* Released under the MIT License.
|
||||
*/
|
||||
|
||||
const core = require('./core')
|
||||
const builder = require('./builder')
|
||||
const requireModule = require('esm')(module, {})
|
||||
|
||||
module.exports = Object.assign({}, core, builder)
|
||||
const core = requireModule('./core').default
|
||||
const builder = requireModule('./builder').default
|
||||
const Utils = requireModule('./common/utils')
|
||||
const Options = requireModule('./common/options').default
|
||||
|
||||
module.exports = {
|
||||
Utils,
|
||||
Options,
|
||||
...core,
|
||||
...builder
|
||||
}
|
||||
|
18
lib/index.mjs
Normal file
18
lib/index.mjs
Normal file
@ -0,0 +1,18 @@
|
||||
/*!
|
||||
* Nuxt.js
|
||||
* (c) 2016-2018 Chopin Brothers
|
||||
* Core maintainers: Pooya Parsa (@pi0) - Clark Du (@clarkdo)
|
||||
* Released under the MIT License.
|
||||
*/
|
||||
|
||||
import core from './core'
|
||||
import builder from './builder'
|
||||
import * as Utils from './common/utils'
|
||||
import Options from './common/options'
|
||||
|
||||
export default {
|
||||
Utils,
|
||||
Options,
|
||||
...core,
|
||||
...builder
|
||||
}
|
@ -14,6 +14,7 @@
|
||||
}
|
||||
],
|
||||
"main": "./lib/index.js",
|
||||
"module": "./lib/index.mjs",
|
||||
"license": "MIT",
|
||||
"repository": {
|
||||
"type": "git",
|
||||
|
@ -8,6 +8,7 @@ import finalhandler from 'finalhandler'
|
||||
import rp from 'request-promise-native'
|
||||
import { interceptLog, release } from './helpers/console'
|
||||
import { Nuxt, Builder, Generator } from '..'
|
||||
import { loadConfig } from './helpers/config'
|
||||
|
||||
const port = 4002
|
||||
const url = route => 'http://localhost:' + port + route
|
||||
@ -19,10 +20,11 @@ let generator = null
|
||||
|
||||
// Init nuxt.js and create server listening on localhost:4000
|
||||
test.serial('Init Nuxt.js', async t => {
|
||||
let config = require(resolve(rootDir, 'nuxt.config.js'))
|
||||
config.rootDir = rootDir
|
||||
config.buildDir = '.nuxt-generate'
|
||||
config.dev = false
|
||||
const config = loadConfig('basic', {
|
||||
buildDir: '.nuxt-generate',
|
||||
dev: false
|
||||
})
|
||||
|
||||
config.build.stats = false
|
||||
|
||||
const logSpy = await interceptLog(async () => {
|
||||
|
@ -1,8 +1,8 @@
|
||||
import test from 'ava'
|
||||
import { resolve } from 'path'
|
||||
import rp from 'request-promise-native'
|
||||
import { Nuxt, Builder } from '..'
|
||||
import { interceptLog } from './helpers/console'
|
||||
import { loadConfig } from './helpers/config'
|
||||
|
||||
const port = 4007
|
||||
const url = route => 'http://localhost:' + port + route
|
||||
@ -12,10 +12,7 @@ let builder = null
|
||||
|
||||
// Init nuxt.js and create server listening on localhost:4000
|
||||
test.before('Init Nuxt.js', async t => {
|
||||
const rootDir = resolve(__dirname, 'fixtures/custom-dirs')
|
||||
let config = require(resolve(rootDir, 'nuxt.config.js'))
|
||||
config.rootDir = rootDir
|
||||
config.dev = false
|
||||
const config = loadConfig('/custom-dirs', { dev: false })
|
||||
|
||||
const logSpy = await interceptLog(async () => {
|
||||
nuxt = new Nuxt(config)
|
||||
|
@ -1,8 +1,8 @@
|
||||
import test from 'ava'
|
||||
import { resolve } from 'path'
|
||||
import rp from 'request-promise-native'
|
||||
import { Nuxt, Builder } from '..'
|
||||
import { interceptLog, interceptError, release } from './helpers/console'
|
||||
import { loadConfig } from './helpers/config'
|
||||
|
||||
const port = 4009
|
||||
const url = route => 'http://localhost:' + port + route
|
||||
@ -11,9 +11,7 @@ let nuxt = null
|
||||
|
||||
// Init nuxt.js and create server listening on localhost:4000
|
||||
test.before('Init Nuxt.js', async t => {
|
||||
const rootDir = resolve(__dirname, 'fixtures/debug')
|
||||
let config = require(resolve(rootDir, 'nuxt.config.js'))
|
||||
config.rootDir = rootDir
|
||||
const config = loadConfig('debug')
|
||||
|
||||
const logSpy = await interceptLog(async () => {
|
||||
nuxt = new Nuxt(config)
|
||||
|
@ -1,7 +1,7 @@
|
||||
import test from 'ava'
|
||||
import { resolve } from 'path'
|
||||
import { Nuxt, Builder } from '..'
|
||||
import { intercept } from './helpers/console'
|
||||
import { loadConfig } from './helpers/config'
|
||||
|
||||
const port = 4010
|
||||
|
||||
@ -11,10 +11,7 @@ let buildSpies = null
|
||||
|
||||
// Init nuxt.js and create server listening on localhost:4000
|
||||
test.serial('Init Nuxt.js', async t => {
|
||||
const rootDir = resolve(__dirname, 'fixtures/deprecate')
|
||||
let config = require(resolve(rootDir, 'nuxt.config.js'))
|
||||
config.rootDir = rootDir
|
||||
config.dev = false
|
||||
const config = loadConfig('deprecate', { dev: false })
|
||||
|
||||
buildSpies = await intercept(async () => {
|
||||
nuxt = new Nuxt(config)
|
||||
|
@ -1,8 +1,8 @@
|
||||
import test from 'ava'
|
||||
import { resolve } from 'path'
|
||||
import rp from 'request-promise-native'
|
||||
import { Nuxt, Builder } from '..'
|
||||
import { interceptLog, interceptError, release } from './helpers/console'
|
||||
import { loadConfig } from './helpers/config'
|
||||
|
||||
const port = 4005
|
||||
const url = route => 'http://localhost:' + port + route
|
||||
@ -12,10 +12,7 @@ let logSpy
|
||||
|
||||
// Init nuxt.js and create server listening on localhost:4000
|
||||
test.serial('Init Nuxt.js', async t => {
|
||||
const rootDir = resolve(__dirname, 'fixtures/error')
|
||||
const config = require(resolve(rootDir, 'nuxt.config.js'))
|
||||
config.rootDir = rootDir
|
||||
config.dev = false
|
||||
const config = loadConfig('error', { dev: false })
|
||||
|
||||
logSpy = await interceptLog(async () => {
|
||||
nuxt = new Nuxt(config)
|
||||
|
@ -7,10 +7,10 @@ import finalhandler from 'finalhandler'
|
||||
import rp from 'request-promise-native'
|
||||
import { intercept, interceptLog } from './helpers/console'
|
||||
import { Nuxt, Builder, Generator, Options } from '..'
|
||||
import { loadConfig } from './helpers/config'
|
||||
|
||||
const port = 4015
|
||||
const url = route => 'http://localhost:' + port + route
|
||||
const rootDir = resolve(__dirname, 'fixtures/basic')
|
||||
|
||||
let nuxt = null
|
||||
let server = null
|
||||
@ -18,10 +18,10 @@ let generator = null
|
||||
|
||||
// Init nuxt.js and create server listening on localhost:4015
|
||||
test.serial('Init Nuxt.js', async t => {
|
||||
let config = require(resolve(rootDir, 'nuxt.config.js'))
|
||||
config.rootDir = rootDir
|
||||
config.buildDir = '.nuxt-spa-fallback'
|
||||
config.dev = false
|
||||
let config = loadConfig('basic', {
|
||||
buildDir: '.nuxt-spa-fallback',
|
||||
dev: false
|
||||
})
|
||||
config.build.stats = false
|
||||
|
||||
const logSpy = await interceptLog(async () => {
|
||||
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user