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

refactor(builder): pass nuxt options to template as nuxtOptions (#5792)

Browse Source
This commit is contained in:
Xin Du (Clark) 2019-05-23 09:49:40 +01:00 committed by Pooya Parsa
parent 6e9cf8e394
commit 737d5f0fe7
4 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/builder/src/builder.js
View File

@ -514,11 +514,7 @@ export default class Builder {
content = stripWhitespace( content = stripWhitespace(
templateFunction({ templateFunction({
...templateVars, ...templateVars,
...templateFile, ...templateFile
options: {
...templateVars.options,
...templateFile.options
}
}) })
) )
} catch (err) { } catch (err) {

2
packages/builder/src/context/template.js
View File

@ -10,7 +10,7 @@ export default class TemplateContext {
constructor(builder, options) { constructor(builder, options) {
this.templateFiles = Array.from(builder.template.files) this.templateFiles = Array.from(builder.template.files)
this.templateVars = { this.templateVars = {
options, nuxtOptions: options,
extensions: options.extensions extensions: options.extensions
.map(ext => ext.replace(/^\./, '')) .map(ext => ext.replace(/^\./, ''))
.join('|'), .join('|'),

3
packages/builder/test/builder.generate.test.js
View File

@ -371,8 +371,7 @@ describe('builder: builder generate', () => {
...templateContext.templateVars, ...templateContext.templateVars,
custom: true, custom: true,
dst: 'baz.js', dst: 'baz.js',
src: '/var/nuxt/src/baz.js', src: '/var/nuxt/src/baz.js'
options: {}
}) })
expect(stripWhitespace).toBeCalledTimes(3) expect(stripWhitespace).toBeCalledTimes(3)
expect(stripWhitespace).nthCalledWith(1, 'compiled content') expect(stripWhitespace).nthCalledWith(1, 'compiled content')

2
packages/builder/test/context/__snapshots__/template.test.js.snap
View File

@ -38,7 +38,7 @@ TemplateContext {
"test": "test message", "test": "test message",
}, },
"mode": "test mode", "mode": "test mode",
"options": Object { "nuxtOptions": Object {
"ErrorPage": "test_error_page", "ErrorPage": "test_error_page",
"build": Object { "build": Object {
"splitChunks": Object { "splitChunks": Object {