Zengtudor/Nuxt
1
0
Fork 0
mirror of https://github.com/nuxt/nuxt.git synced 2025-01-18 17:35:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: skip static dir if not exists

Browse Source
This commit is contained in:
Pooya Parsa 2020-12-07 13:48:29 +01:00
parent daf0c3e6a5
commit 6de295cc9f
2 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
packages/nitro/src/build.ts
View File

@ -5,7 +5,7 @@ import ora from 'ora'
import { readFile, emptyDir, copy } from 'fs-extra' import { readFile, emptyDir, copy } from 'fs-extra'
import { printFSTree } from './utils/tree' import { printFSTree } from './utils/tree'
import { getRollupConfig } from './rollup/config' import { getRollupConfig } from './rollup/config'
import { hl, prettyPath, serializeTemplate, writeFile } from './utils' import { hl, prettyPath, serializeTemplate, writeFile, isDirectory } from './utils'
import { SigmaContext } from './context' import { SigmaContext } from './context'
export async function prepare (sigmaContext: SigmaContext) { export async function prepare (sigmaContext: SigmaContext) {
@ -30,14 +30,17 @@ async function cleanupDir (dir: string) {
export async function generate (sigmaContext: SigmaContext) { export async function generate (sigmaContext: SigmaContext) {
const spinner = ora() const spinner = ora()
spinner.start('Generating public...') spinner.start('Generating public...')
await copy(
resolve(sigmaContext._nuxt.buildDir, 'dist/client'), const clientDist = resolve(sigmaContext._nuxt.buildDir, 'dist/client')
join(sigmaContext.output.publicDir, sigmaContext._nuxt.publicPath) if (await isDirectory(clientDist)) {
) await copy(clientDist, join(sigmaContext.output.publicDir, sigmaContext._nuxt.publicPath))
await copy( }
resolve(sigmaContext._nuxt.srcDir, sigmaContext._nuxt.staticDir),
sigmaContext.output.publicDir const staticDir = resolve(sigmaContext._nuxt.srcDir, sigmaContext._nuxt.staticDir)
) if (await isDirectory(staticDir)) {
await copy(staticDir, sigmaContext.output.publicDir)
}
spinner.succeed('Generated public ' + prettyPath(sigmaContext.output.publicDir)) spinner.succeed('Generated public ' + prettyPath(sigmaContext.output.publicDir))
} }

8
packages/nitro/src/utils/index.ts
View File

@ -74,6 +74,14 @@ export function detectTarget () {
} }
} }
export async function isDirectory (path: string) {
try {
return (await fse.stat(path)).isDirectory()
} catch (_err) {
return false
}
}
export function extendPreset (base: SigmaPreset, preset: SigmaPreset): SigmaPreset { export function extendPreset (base: SigmaPreset, preset: SigmaPreset): SigmaPreset {
return (config: SigmaInput) => { return (config: SigmaInput) => {
if (typeof preset === 'function') { if (typeof preset === 'function') {