Zengtudor/Nuxt
1
0
Fork 0
mirror of https://github.com/nuxt/nuxt.git synced 2025-03-01 16:13:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Handle publicPath

Browse Source
This commit is contained in:
Sébastien Chopin 2017-02-16 18:16:00 +01:00
parent 5a500b6735
commit 376362ec39
5 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/build.js
View File

@ -83,6 +83,14 @@ export function options () {
if (this.options.build && !Array.isArray(this.options.build.loaders)) extraDefaults.loaders = defaultsLoaders if (this.options.build && !Array.isArray(this.options.build.loaders)) extraDefaults.loaders = defaultsLoaders
if (this.options.build && !Array.isArray(this.options.build.postcss)) extraDefaults.postcss = defaultsPostcss if (this.options.build && !Array.isArray(this.options.build.postcss)) extraDefaults.postcss = defaultsPostcss
this.options.build = _.defaultsDeep(this.options.build, defaults, extraDefaults) this.options.build = _.defaultsDeep(this.options.build, defaults, extraDefaults)
if (this.options.build.publicPath.indexOf('http') === 0) {
// activate only in production mode
if (this.dev) {
this.options.build.publicPath = defaults.publicPath
} else {
this.options.nuxtStatic = false
}
}
// Production, create server-renderer // Production, create server-renderer
if (!this.dev) { if (!this.dev) {
const serverConfig = getWebpackServerConfig.call(this) const serverConfig = getWebpackServerConfig.call(this)

11
lib/generate.js
View File

@ -22,15 +22,6 @@ const defaults = {
export default function () { export default function () {
const s = Date.now() const s = Date.now()
/* /*
** Update loaders config to add router.base path
*/
// this.options.build.loaders.forEach((config) => {
// if (['file', 'url', 'file-loader', 'url-loader'].includes(config.loader)) {
// config.query = config.query || {}
// config.query.publicPath = urlJoin(this.options.router.base, '/_nuxt/')
// }
// })
/*
** Set variables ** Set variables
*/ */
this.options.generate = _.defaultsDeep(this.options.generate, defaults) this.options.generate = _.defaultsDeep(this.options.generate, defaults)
@ -38,7 +29,7 @@ export default function () {
var srcStaticPath = resolve(this.srcDir, 'static') var srcStaticPath = resolve(this.srcDir, 'static')
var srcBuiltPath = resolve(this.dir, '.nuxt', 'dist') var srcBuiltPath = resolve(this.dir, '.nuxt', 'dist')
var distPath = resolve(this.dir, this.options.generate.dir) var distPath = resolve(this.dir, this.options.generate.dir)
var distNuxtPath = resolve(distPath, '_nuxt') var distNuxtPath = join(distPath, (this.options.build.publicPath.indexOf('http') === 0 ? '_nuxt' : this.options.build.publicPath))
return co(function * () { return co(function * () {
/* /*
** Launch build process ** Launch build process

4
lib/nuxt.js
View File

@ -76,8 +76,8 @@ class Nuxt {
this.renderer = null this.renderer = null
// For serving static/ files to / // For serving static/ files to /
this.serveStatic = pify(serveStatic(resolve(this.srcDir, 'static'))) this.serveStatic = pify(serveStatic(resolve(this.srcDir, 'static')))
// For serving .nuxt/dist/ files // For serving .nuxt/dist/ files (only when build.publicPath is not an URL)
this._nuxtRegexp = /^\/_nuxt\// this.options.nuxtStatic = true
this.serveStaticNuxt = pify(serveStatic(resolve(this.dir, '.nuxt', 'dist'))) this.serveStaticNuxt = pify(serveStatic(resolve(this.dir, '.nuxt', 'dist')))
// Add this.Server Class // Add this.Server Class
this.Server = Server this.Server = Server

2
lib/utils.js
View File

@ -28,7 +28,7 @@ export function * waitFor (ms) {
} }
export function urlJoin () { export function urlJoin () {
return [].slice.call(arguments).join('/').replace(/\/+/g, '/') return [].slice.call(arguments).join('/').replace(/\/+/g, '/').replace(':/', '://')
} }
export function promisifyRouteParams (fn) { export function promisifyRouteParams (fn) {

2
lib/webpack/base.config.js
View File

@ -21,7 +21,7 @@ export default function ({ isClient, isServer }) {
vendor: ['vue', 'vue-router', 'vue-meta'] vendor: ['vue', 'vue-router', 'vue-meta']
}, },
output: { output: {
publicPath: urlJoin(this.options.router.base, '/_nuxt/') publicPath: (this.options.build.publicPath.indexOf('http') === 0 ? this.options.build.publicPath : urlJoin(this.options.router.base, this.options.build.publicPath))
}, },
performance: { performance: {
hints: (this.dev ? false : 'warning') hints: (this.dev ? false : 'warning')