Zengtudor/Nuxt
1
0
Fork 0
mirror of https://github.com/nuxt/nuxt.git synced 2024-11-29 09:02:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(schema): use entire object for app properties (#4431)

Browse Source
This commit is contained in:
Daniel Roe 2022-04-19 20:12:28 +01:00 committed by GitHub
parent b30d8ad1f8
commit 71b808c8e9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/schema/src/config/_common.ts
View File

@ -725,9 +725,9 @@ export default {
...get('privateRuntimeConfig'), ...get('privateRuntimeConfig'),
public: get('publicRuntimeConfig'), public: get('publicRuntimeConfig'),
app: { app: {
baseURL: get('app.baseURL'), baseURL: get('app').baseURL,
buildAssetsDir: get('app.buildAssetsDir'), buildAssetsDir: get('app').buildAssetsDir,
cdnURL: get('app.cdnURL'), cdnURL: get('app').cdnURL,
} }
}) })
}, },

2
packages/schema/src/config/build.ts
View File

@ -192,7 +192,7 @@ export default {
* @version 2 * @version 2
*/ */
publicPath: { publicPath: {
$resolve: (val, get) => val ? withTrailingSlash(normalizeURL(val)) : get('app.buildAssetsDir') $resolve: (val, get) => val ? withTrailingSlash(normalizeURL(val)) : get('app').buildAssetsDir
}, },
/** /**

2
packages/schema/src/config/generate.ts
View File

@ -160,7 +160,7 @@ export default {
* The full path to the directory underneath `/_nuxt/` where static assets * The full path to the directory underneath `/_nuxt/` where static assets
* (payload, state and manifest files) will live. * (payload, state and manifest files) will live.
*/ */
base: { $resolve: (val, get) => val || joinURL(get('app.buildAssetsDir'), get('generate.dir')) }, base: { $resolve: (val, get) => val || joinURL(get('app').buildAssetsDir, get('generate.dir')) },
/** The full path to the versioned directory where static assets for the current buidl are located. */ /** The full path to the versioned directory where static assets for the current buidl are located. */
versionBase: { $resolve: (val, get) => val || joinURL(get('generate.base'), get('generate.version')) }, versionBase: { $resolve: (val, get) => val || joinURL(get('generate.base'), get('generate.version')) },
/** A unique string to uniquely identify payload versions (defaults to the current timestamp). */ /** A unique string to uniquely identify payload versions (defaults to the current timestamp). */

2
packages/schema/src/config/router.ts
View File

@ -33,7 +33,7 @@ export default {
* @version 2 * @version 2
*/ */
base: { base: {
$resolve: (val, get) => val ? withTrailingSlash(normalizeURL(val)) : get('app.baseURL') $resolve: (val, get) => val ? withTrailingSlash(normalizeURL(val)) : get('app').baseURL
}, },
/** @private */ /** @private */