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

refactor: rename static to public (#284)

Browse Source
This commit is contained in:
Daniel Roe 2021-06-30 11:29:48 +01:00 committed by GitHub
parent 1370dd6719
commit 04c3f65539
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
packages/kit/src/config/schema/_common.ts
View File

@ -380,10 +380,16 @@ export default {
/** The directory which will be processed to auto-generate your application page routes. */ /** The directory which will be processed to auto-generate your application page routes. */
pages: 'pages', pages: 'pages',
/** /**
* Your static directory, which will be directly accessible via the Nuxt server and copied * The directory containing your static files, which will be directly accessible via the Nuxt server
* across into your `dist` folder when your app is generated. * and copied across into your `dist` folder when your app is generated.
*/ */
static: 'static', public: {
$resolve: (val, get) => val || get('dir.static') || 'public',
},
static: {
$schema: { deprecated: 'use `dir.public` option instead' },
$resolve: (val, get) => val || get('dir.public') || 'public',
},
/** The folder which will be used to auto-generate your Vuex store structure. */ /** The folder which will be used to auto-generate your Vuex store structure. */
store: 'store' store: 'store'
}, },

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

@ -35,9 +35,9 @@ export async function generate (nitroContext: NitroContext) {
await copy(clientDist, join(nitroContext.output.publicDir, nitroContext._nuxt.publicPath)) await copy(clientDist, join(nitroContext.output.publicDir, nitroContext._nuxt.publicPath))
} }
const staticDir = resolve(nitroContext._nuxt.srcDir, nitroContext._nuxt.staticDir) const publicDir = nitroContext._nuxt.publicDir
if (await isDirectory(staticDir)) { if (await isDirectory(publicDir)) {
await copy(staticDir, nitroContext.output.publicDir) await copy(publicDir, nitroContext.output.publicDir)
} }
consola.success('Generated public ' + prettyPath(nitroContext.output.publicDir)) consola.success('Generated public ' + prettyPath(nitroContext.output.publicDir))

6
packages/nitro/src/context.ts
View File

@ -43,7 +43,7 @@ export interface NitroContext {
srcDir: string srcDir: string
buildDir: string buildDir: string
generateDir: string generateDir: string
staticDir: string publicDir: string
serverDir: string serverDir: string
routerBase: string routerBase: string
publicPath: string publicPath: string
@ -101,7 +101,7 @@ export function getNitroContext (nuxtOptions: NuxtOptions, input: NitroInput): N
srcDir: nuxtOptions.srcDir, srcDir: nuxtOptions.srcDir,
buildDir: nuxtOptions.buildDir, buildDir: nuxtOptions.buildDir,
generateDir: nuxtOptions.generate.dir, generateDir: nuxtOptions.generate.dir,
staticDir: nuxtOptions.dir.static, publicDir: resolve(nuxtOptions.srcDir, nuxtOptions.dir.public || nuxtOptions.dir.static),
serverDir: resolve(nuxtOptions.srcDir, (nuxtOptions.dir as any).server || 'server'), serverDir: resolve(nuxtOptions.srcDir, (nuxtOptions.dir as any).server || 'server'),
routerBase: nuxtOptions.router.base, routerBase: nuxtOptions.router.base,
publicPath: nuxtOptions.build.publicPath, publicPath: nuxtOptions.build.publicPath,
@ -154,7 +154,7 @@ export function getNitroContext (nuxtOptions: NuxtOptions, input: NitroInput): N
// Assets // Assets
nitroContext.assets.dirs.server = { nitroContext.assets.dirs.server = {
dir: resolve(nitroContext._nuxt.rootDir, 'server/assets'), meta: true dir: resolve(nitroContext._nuxt.srcDir, 'server/assets'), meta: true
} }
// console.log(nitroContext) // console.log(nitroContext)

2
packages/nitro/src/presets/vercel.ts
View File

@ -8,7 +8,7 @@ export const vercel: NitroPreset = extendPreset(node, {
output: { output: {
dir: '{{ _nuxt.rootDir }}/.vercel_build_output', dir: '{{ _nuxt.rootDir }}/.vercel_build_output',
serverDir: '{{ output.dir }}/functions/node/server', serverDir: '{{ output.dir }}/functions/node/server',
publicDir: '{{ output.dir }}/static' publicDir: '{{ output.dir }}/public'
}, },
ignore: [ ignore: [
'vercel.json' 'vercel.json'

2
packages/nitro/src/server/dev.ts
View File

@ -54,7 +54,7 @@ export function createDevServer (nitroContext: NitroContext) {
// _nuxt and static // _nuxt and static
app.use(nitroContext._nuxt.publicPath, serveStatic(resolve(nitroContext._nuxt.buildDir, 'dist/client'))) app.use(nitroContext._nuxt.publicPath, serveStatic(resolve(nitroContext._nuxt.buildDir, 'dist/client')))
app.use(nitroContext._nuxt.routerBase, serveStatic(resolve(nitroContext._nuxt.staticDir))) app.use(nitroContext._nuxt.routerBase, serveStatic(resolve(nitroContext._nuxt.publicDir)))
// Dynamic Middlwware // Dynamic Middlwware
const legacyMiddleware = createDynamicMiddleware() const legacyMiddleware = createDynamicMiddleware()