mirror of
https://github.com/nuxt/nuxt.git
synced 2024-11-11 16:43:55 +00:00
917adc0618
* feat: add options.target * fix(lint): lint * fix(test): update snapshots * fix(builder): default value for target * fix(test): fix test * fix(test): test fixing * fix: use this.options.target * fix: final test * Update packages/vue-renderer/src/renderer.js Co-Authored-By: Alexander Lichter <manniL@gmx.net> * feat: Add target option and update banner * fix(lint): fix * feat: Add warning when using serverMiddleware in static target * chore(utils): add TARGETS and MODES as constants * hotfix: lint * chore(module): add filename as alias of fileName * feat: introducing nuxt export and router/routes.json * hotfix: Fix the linting lord * chore(core): add comment for filename vs fileName * fix: use targets constant * chore: remove warning * fix: unit testing * wip: refactor and use TARGETS * fix: lint * feat: add target as alias for first arg value * fix: generate only for SPA * chore: explain to use nuxt static X * fix: render SPA fallback on redirect for static target * fix: lint issue * fix: only target is useful for now * wip * wip: nuxt static export is looking good * Update packages/generator/src/generator.js Co-Authored-By: Devon Rueckner <indirectlylit@users.noreply.github.com> * Update packages/cli/src/options/common.js Co-Authored-By: Alexander Lichter <manniL@gmx.net> * feat: add options.target * fix(lint): lint * fix(test): update snapshots * fix(builder): default value for target * fix(test): fix test * fix(test): test fixing * fix: use this.options.target * fix: final test * Update packages/vue-renderer/src/renderer.js Co-Authored-By: Alexander Lichter <manniL@gmx.net> * feat: Add target option and update banner * fix(lint): fix * feat: Add warning when using serverMiddleware in static target * chore(utils): add TARGETS and MODES as constants * hotfix: lint * chore(module): add filename as alias of fileName * feat: introducing nuxt export and router/routes.json * hotfix: Fix the linting lord * chore(core): add comment for filename vs fileName * fix: use targets constant * chore: remove warning * fix: unit testing * wip: refactor and use TARGETS * fix: lint * feat: add target as alias for first arg value * chore: explain to use nuxt static X * fix: render SPA fallback on redirect for static target * fix: lint issue * fix: only target is useful for now * wip * wip: nuxt static export is looking good * Update packages/generator/src/generator.js Co-Authored-By: Devon Rueckner <indirectlylit@users.noreply.github.com> * Update packages/cli/src/options/common.js Co-Authored-By: Alexander Lichter <manniL@gmx.net> * fix: duplicate imports * chore: don't server render if an error happens on static target * test: update unit and add export * lint: fix * lint: fix * fix: e2e test * fix: fallback only for static target * fix: dev test * feat: add generate.crawler * fix: full static is when generate.static is given * chore: improvements * fix: Add isFullStatic in nuxt/config.json * feat: handle fetch for full static * feat: router.prefetchPayloads for full static * chore: use fetch in async-data example * fix: add target only if given * fix: use created to have access to props in fetchOnServer * chore: add console.error in dev for easy debugging * feat: payload smart pre-fetching * fix: remove alias for target * fix: increment payloadFetchIndex is static set to false * chore: lint * chore: add serve command * chore: rename universal to server-side * fix: handle payloadPath on SPA fallback * fix: lint * chore lint again * feat: handle spa fallback * feat: support string for exclude * fix: fallback only if no extension or html * chore: use JSON.stringify() for static target * chore: lint again, dammit * chore: fix tests and remove too early return * fix: early return only for server target * fix: update tests * fix: unit tests * chore: add ssr option * chore: add logic for ssr option * fix: #6682 * chore(dx): add next command to run * fix: lint * fix: tests * chore: keep old behaviour for nuxt build in spa * fix: test again, oh boy * fix: alright this is good now * chore: add comment for spa fallback * chore: move routes.json to dot nuxt dir * chore: simplify check for promise * chore: unique lock id * chore: refactor isFullStatic * fix: dont set default in build context * chore: add test for serve * chore: update tests * hotfix: lint tests * chore(dx): improve message for bundling * feat: js payload extraction with jsonp * fix: keep serialized session script for legacy generate * fix: call to setPagePayload from fetchPayload * use devalue for payload chunks * feat: add initial load state chunk * feat: preload payload and state scripts * fix(vue-app): don't re-render the app if trailing slash on SSG * hotfix: remove console.log * chore(dx): add deploy infos for nuxt export Co-authored-by: Pooya Parsa <pyapar@gmail.com> * chore: handle fetching payload.js for nuxt state * chore(dx): error when using nuxt generate and static * chore: remove static option for clarity * chore: remove serverless target * hotfix: lint * hotfix: unit tests * chore: update legacy js resource * chore: remove query params from url in static target * fix: use globalName and urlJoin * chore: typo * feat: previewMode 👀 * chore: rename to enablePreview * fix: wait next tick to avoid error on spa * chore: try 1 sec * hotfix: test only for linux, wtf azure * refactor: static assets - generalize logic for modules need emit export static assets - allow customization for version, dir and base - serialization logic is only in ssr now * feat: smart state chunk creates * fix(client): ignore payload load error * perf: avoide payload loading for spa initial * perf: avoid loading failed chunks again * chore(cli): add simple compression for nuxt serve * test: update snapshots * fix version snapshot * fix(generator): set staticAssetsBase on context only for full static * fix tests * fix: honor shouldHashCspScriptSrc * chore(dx): add log for client-side fallback creation Co-authored-by: Xin Du (Clark) <clark.duxin@gmail.com> Co-authored-by: Alexander Lichter <manniL@gmx.net> Co-authored-by: Pooya Parsa <pooya@pi0.ir> Co-authored-by: Devon Rueckner <indirectlylit@users.noreply.github.com> Co-authored-by: Pooya Parsa <pyapar@gmail.com>
245 lines
8.4 KiB
JavaScript
245 lines
8.4 KiB
JavaScript
import path from 'path'
|
|
import consola from 'consola'
|
|
import fsExtra from 'fs-extra'
|
|
import htmlMinifier from 'html-minifier'
|
|
|
|
import Generator from '../src/generator'
|
|
import { createNuxt } from './__utils__'
|
|
|
|
jest.mock('path')
|
|
jest.mock('fs-extra')
|
|
jest.mock('html-minifier')
|
|
jest.mock('@nuxt/utils')
|
|
|
|
describe('generator: generate route', () => {
|
|
const sep = path.sep
|
|
|
|
beforeAll(() => {
|
|
path.sep = '[sep]'
|
|
path.join.mockImplementation((...args) => `join(${args.join(', ')})`)
|
|
path.dirname.mockImplementation((...args) => `dirname(${args.join(', ')})`)
|
|
})
|
|
|
|
afterAll(() => {
|
|
path.sep = sep
|
|
})
|
|
|
|
beforeEach(() => {
|
|
jest.clearAllMocks()
|
|
})
|
|
|
|
test('should generate route', async () => {
|
|
const nuxt = createNuxt()
|
|
nuxt.options.build.html = { minify: false }
|
|
nuxt.options.generate.minify = undefined
|
|
nuxt.options.generate.subFolders = false
|
|
const generator = new Generator(nuxt)
|
|
path.join.mockClear()
|
|
|
|
const route = '/foo/'
|
|
const payload = {}
|
|
const errors = []
|
|
|
|
const returned = await generator.generateRoute({ route, payload, errors })
|
|
|
|
expect(nuxt.server.renderRoute).toBeCalledTimes(1)
|
|
expect(nuxt.server.renderRoute).toBeCalledWith(route, { payload })
|
|
expect(path.join).toBeCalledTimes(2)
|
|
expect(path.join).nthCalledWith(1, '[sep]', '/foo.html')
|
|
expect(path.join).nthCalledWith(2, generator.distPath, 'join([sep], /foo.html)')
|
|
expect(nuxt.callHook).toBeCalledTimes(2)
|
|
expect(nuxt.callHook).nthCalledWith(1, 'generate:page', {
|
|
route,
|
|
html: 'rendered html',
|
|
path: `join(${generator.distPath}, join([sep], /foo.html))`
|
|
})
|
|
expect(nuxt.callHook).nthCalledWith(2, 'generate:routeCreated', {
|
|
route,
|
|
errors: [],
|
|
path: `join(${generator.distPath}, join([sep], /foo.html))`
|
|
})
|
|
expect(fsExtra.mkdirp).toBeCalledTimes(1)
|
|
expect(fsExtra.mkdirp).toBeCalledWith(`dirname(join(${generator.distPath}, join([sep], /foo.html)))`)
|
|
expect(fsExtra.writeFile).toBeCalledTimes(1)
|
|
expect(fsExtra.writeFile).toBeCalledWith(`join(${generator.distPath}, join([sep], /foo.html))`, 'rendered html', 'utf8')
|
|
expect(returned).toEqual(true)
|
|
})
|
|
|
|
test('should create unhandled error if render route has any exception', async () => {
|
|
const nuxt = createNuxt()
|
|
const error = new Error('render route failed')
|
|
nuxt.server.renderRoute.mockImplementationOnce(() => {
|
|
throw error
|
|
})
|
|
const generator = new Generator(nuxt)
|
|
generator._formatErrors = jest.fn(() => 'formatted errors')
|
|
|
|
const route = '/foo'
|
|
const payload = {}
|
|
const errors = []
|
|
|
|
const returned = await generator.generateRoute({ route, payload, errors })
|
|
|
|
expect(nuxt.server.renderRoute).toBeCalledTimes(1)
|
|
expect(nuxt.server.renderRoute).toBeCalledWith('/foo', { payload })
|
|
expect(nuxt.callHook).toBeCalledTimes(1)
|
|
expect(nuxt.callHook).toBeCalledWith('generate:routeFailed', {
|
|
route,
|
|
errors: [{ type: 'unhandled', route, error }]
|
|
})
|
|
expect(generator._formatErrors).toBeCalledTimes(1)
|
|
expect(generator._formatErrors).toBeCalledWith([{ type: 'unhandled', route, error }])
|
|
expect(consola.error).toBeCalledTimes(1)
|
|
expect(consola.error).toBeCalledWith('formatted errors')
|
|
expect(errors).toEqual([{
|
|
error,
|
|
route,
|
|
type: 'unhandled'
|
|
}])
|
|
expect(returned).toEqual(false)
|
|
})
|
|
|
|
test('should create handled error if render route failed', async () => {
|
|
const nuxt = createNuxt()
|
|
nuxt.options.build.html = { minify: false }
|
|
nuxt.options.generate.minify = undefined
|
|
const error = new Error('render route failed')
|
|
nuxt.server.renderRoute.mockReturnValueOnce({
|
|
html: 'renderer html',
|
|
error
|
|
})
|
|
const generator = new Generator(nuxt)
|
|
|
|
const route = '/foo'
|
|
const payload = {}
|
|
const errors = []
|
|
|
|
const returned = await generator.generateRoute({ route, payload, errors })
|
|
|
|
expect(consola.error).toBeCalledTimes(1)
|
|
expect(consola.error).toBeCalledWith('Error generating /foo')
|
|
expect(errors).toEqual([{
|
|
error,
|
|
route,
|
|
type: 'handled'
|
|
}])
|
|
expect(returned).toEqual(true)
|
|
})
|
|
|
|
test('should warn generate.minify deprecation message', async () => {
|
|
const nuxt = createNuxt()
|
|
nuxt.options.build.html = { minify: false }
|
|
nuxt.options.generate.minify = false
|
|
const generator = new Generator(nuxt)
|
|
|
|
const route = '/foo'
|
|
|
|
const returned = await generator.generateRoute({ route })
|
|
|
|
expect(consola.warn).toBeCalledTimes(1)
|
|
expect(consola.warn).toBeCalledWith(
|
|
'generate.minify has been deprecated and will be removed in the next major version. Use build.html.minify instead!'
|
|
)
|
|
expect(returned).toEqual(true)
|
|
})
|
|
|
|
test('should minify generated html', async () => {
|
|
const nuxt = createNuxt()
|
|
nuxt.options.build.html = { minify: { value: 'test-minify' } }
|
|
nuxt.options.generate.minify = undefined
|
|
const generator = new Generator(nuxt)
|
|
htmlMinifier.minify.mockReturnValueOnce('minified rendered html')
|
|
|
|
const route = '/foo'
|
|
|
|
const returned = await generator.generateRoute({ route })
|
|
|
|
expect(htmlMinifier.minify).toBeCalledTimes(1)
|
|
expect(htmlMinifier.minify).toBeCalledWith('rendered html', { value: 'test-minify' })
|
|
expect(fsExtra.writeFile).toBeCalledTimes(1)
|
|
expect(fsExtra.writeFile).toBeCalledWith(`join(${generator.distPath}, join([sep], /foo.html))`, 'minified rendered html', 'utf8')
|
|
expect(returned).toEqual(true)
|
|
})
|
|
|
|
test('should create unhandled error if minify failed', async () => {
|
|
const nuxt = createNuxt()
|
|
nuxt.options.build.html = { minify: { value: 'test-minify' } }
|
|
nuxt.options.generate.minify = undefined
|
|
const generator = new Generator(nuxt)
|
|
htmlMinifier.minify.mockImplementationOnce(() => {
|
|
throw new Error('minify html failed')
|
|
})
|
|
|
|
const route = '/foo'
|
|
const errors = []
|
|
|
|
const returned = await generator.generateRoute({ route, errors })
|
|
|
|
expect(htmlMinifier.minify).toBeCalledTimes(1)
|
|
expect(htmlMinifier.minify).toBeCalledWith('rendered html', { value: 'test-minify' })
|
|
expect(errors).toEqual([{
|
|
route,
|
|
type: 'unhandled',
|
|
error: new Error('HTML minification failed. Make sure the route generates valid HTML. Failed HTML:\n rendered html')
|
|
}])
|
|
expect(returned).toEqual(true)
|
|
})
|
|
|
|
test('should generate file in sub folder', async () => {
|
|
const nuxt = createNuxt()
|
|
nuxt.options.build.html = { minify: false }
|
|
nuxt.options.generate.subFolders = true
|
|
const generator = new Generator(nuxt)
|
|
path.join.mockClear()
|
|
|
|
const route = '/foo'
|
|
|
|
const returned = await generator.generateRoute({ route })
|
|
|
|
expect(path.join).toBeCalledTimes(2)
|
|
expect(path.join).nthCalledWith(1, route, '[sep]', 'index.html')
|
|
expect(path.join).nthCalledWith(2, generator.distPath, 'join(/foo, [sep], index.html)')
|
|
expect(fsExtra.writeFile).toBeCalledTimes(1)
|
|
expect(fsExtra.writeFile).toBeCalledWith(`join(${generator.distPath}, join(/foo, [sep], index.html))`, 'rendered html', 'utf8')
|
|
expect(returned).toEqual(true)
|
|
})
|
|
|
|
test('should generate 404 file in flat folder', async () => {
|
|
const nuxt = createNuxt()
|
|
nuxt.options.build.html = { minify: false }
|
|
nuxt.options.generate.subFolders = true
|
|
const generator = new Generator(nuxt)
|
|
path.join.mockClear()
|
|
path.join.mockReturnValueOnce('/404/index.html')
|
|
|
|
const route = '/404'
|
|
|
|
const returned = await generator.generateRoute({ route })
|
|
|
|
expect(path.join).toBeCalledTimes(2)
|
|
expect(path.join).nthCalledWith(1, route, '[sep]', 'index.html')
|
|
expect(path.join).nthCalledWith(2, generator.distPath, '/404.html')
|
|
expect(fsExtra.writeFile).toBeCalledTimes(1)
|
|
expect(fsExtra.writeFile).toBeCalledWith(`join(${generator.distPath}, /404.html)`, 'rendered html', 'utf8')
|
|
expect(returned).toEqual(true)
|
|
})
|
|
|
|
test('should generate file in flat folder if route is empty', async () => {
|
|
const nuxt = createNuxt()
|
|
nuxt.options.build.html = { minify: false }
|
|
const generator = new Generator(nuxt)
|
|
path.join.mockClear()
|
|
|
|
const route = ''
|
|
|
|
const returned = await generator.generateRoute({ route })
|
|
|
|
expect(path.join).toBeCalledTimes(2)
|
|
expect(path.join).nthCalledWith(1, '[sep]', 'index.html')
|
|
expect(path.join).nthCalledWith(2, generator.distPath, 'join([sep], index.html)')
|
|
expect(fsExtra.writeFile).toBeCalledTimes(1)
|
|
expect(fsExtra.writeFile).toBeCalledWith(`join(${generator.distPath}, join([sep], index.html))`, 'rendered html', 'utf8')
|
|
expect(returned).toEqual(true)
|
|
})
|
|
})
|