Zengtudor/Nuxt
1
0
Fork 0
mirror of https://github.com/nuxt/nuxt.git synced 2024-11-23 14:15:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore(builder): remove validateTemplate check

Browse Source 
by introducing pnp support, there is no stable way to resolve same as webpack
This commit is contained in:
Pooya Parsa 2020-12-23 00:06:08 +01:00
parent e66744ef3f
commit ed6e8cd307
3 changed files with 0 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
packages/builder/package.json
View File

@ -21,7 +21,6 @@
"ignore": "^5.1.8",
"lodash": "^4.17.20",
"pify": "^5.0.0",
"semver": "^7.3.4",
"serialize-javascript": "^5.0.1",
"upath": "^2.0.1"
},

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

@ -7,7 +7,6 @@ import Glob from 'glob'
import hash from 'hash-sum'
import pify from 'pify'
import upath from 'upath'
import semver from 'semver'
import { debounce, omit, template, uniq, uniqBy } from 'lodash'
import {
r,
@ -137,13 +136,6 @@ export default class Builder {
await this.validatePages()
// Validate template
try {
this.validateTemplate()
} catch (err) {
consola.fatal(err)
}
consola.success('Builder initialized')
consola.debug(`App root: ${this.options.srcDir}`)
@ -204,25 +196,6 @@ export default class Builder {
consola.warn(`No \`${this.options.dir.pages}\` directory found in ${dir}. Using the default built-in page.`)
}
validateTemplate () {
// Validate template dependencies
const templateDependencies = this.template.dependencies
for (const depName in templateDependencies) {
const depVersion = templateDependencies[depName]
// Load installed version
const pkg = this.nuxt.resolver.requireModule(path.join(depName, 'package.json'))
if (pkg) {
const validVersion = semver.satisfies(pkg.version, depVersion)
if (!validVersion) {
consola.warn(`${depName}@${depVersion} is recommended but ${depName}@${pkg.version} is installed!`)
}
} else {
consola.warn(`${depName}@${depVersion} is required but not installed!`)
}
}
}
globPathWithExtensions (path) {
return `${path}/**/*.{${this.supportedExtensions.join(',')}}`
}

76
packages/builder/test/builder.build.test.js
View File

@ -1,7 +1,6 @@
import path from 'path'
import consola from 'consola'
import fsExtra from 'fs-extra'
import semver from 'semver'
import { r, waitFor } from '@nuxt/utils'
import { BundleBuilder } from '@nuxt/webpack'
@ -9,7 +8,6 @@ import Builder from '../src/builder'
import { createNuxt } from './__utils__'
jest.mock('fs-extra')
jest.mock('semver/functions/satisfies')
jest.mock('hash-sum', () => src => `hash(${src})`)
jest.mock('@nuxt/utils')
jest.mock('../src/ignore')
@ -41,7 +39,6 @@ describe('builder: builder build', () => {
const bundleBuilder = { build: jest.fn() }
const builder = new Builder(nuxt, bundleBuilder)
builder.validatePages = jest.fn()
builder.validateTemplate = jest.fn()
builder.generateRoutesAndFiles = jest.fn()
builder.resolvePlugins = jest.fn()
@ -54,7 +51,6 @@ describe('builder: builder build', () => {
expect(nuxt.callHook).nthCalledWith(1, 'build:before', builder, nuxt.options.build)
expect(nuxt.callHook).nthCalledWith(2, 'builder:prepared', builder, nuxt.options.build)
expect(builder.validatePages).toBeCalledTimes(1)
expect(builder.validateTemplate).toBeCalledTimes(1)
expect(consola.success).toBeCalledTimes(1)
expect(consola.success).toBeCalledWith('Builder initialized')
expect(consola.debug).toBeCalledTimes(1)
@ -121,7 +117,6 @@ describe('builder: builder build', () => {
const bundleBuilder = { build: jest.fn() }
const builder = new Builder(nuxt, bundleBuilder)
builder.validatePages = jest.fn()
builder.validateTemplate = jest.fn()
builder.generateRoutesAndFiles = jest.fn()
builder.resolvePlugins = jest.fn()
@ -138,24 +133,6 @@ describe('builder: builder build', () => {
expect(r).nthCalledWith(2, '/var/nuxt/build', 'components')
})
test('should throw error when validateTemplate failed', async () => {
const nuxt = createNuxt()
const builder = new Builder(nuxt, BundleBuilder)
builder.validatePages = jest.fn()
builder.validateTemplate = jest.fn(() => {
throw new Error('validate failed')
})
consola.success.mockImplementationOnce(() => {
throw new Error('exit')
})
await expect(builder.build()).rejects.toThrow('exit')
expect(builder._buildStatus).toEqual(3)
expect(consola.fatal).toBeCalledTimes(1)
expect(consola.fatal).toBeCalledWith(new Error('validate failed'))
})
test('should warn built-in page will be used if no pages dir found', async () => {
const nuxt = createNuxt()
nuxt.options.srcDir = '/var/nuxt/src'
@ -227,57 +204,4 @@ describe('builder: builder build', () => {
expect(fsExtra.exists).toBeCalledWith('join(/var/nuxt/src, /var/nuxt/src/pages)')
expect(builder._defaultPage).toBeUndefined()
})
test('should validate dependencies in template', () => {
const nuxt = createNuxt()
nuxt.options.build.template = {
dependencies: {
vue: 'latest',
nuxt: 'edge'
}
}
const builder = new Builder(nuxt, BundleBuilder)
semver.satisfies
.mockReturnValueOnce(true)
.mockReturnValueOnce(true)
nuxt.resolver.requireModule
.mockReturnValueOnce({ version: 'alpha' })
.mockReturnValueOnce({ version: 'beta' })
builder.validateTemplate()
expect(nuxt.resolver.requireModule).toBeCalledTimes(2)
expect(nuxt.resolver.requireModule).nthCalledWith(1, 'join(vue, package.json)')
expect(nuxt.resolver.requireModule).nthCalledWith(2, 'join(nuxt, package.json)')
expect(semver.satisfies).toBeCalledTimes(2)
expect(semver.satisfies).nthCalledWith(1, 'alpha', 'latest')
expect(semver.satisfies).nthCalledWith(2, 'beta', 'edge')
})
test('should warn and throw error if dependencies is not installed', () => {
const nuxt = createNuxt()
nuxt.options.build.template = {
dependencies: {
vue: 'latest',
nuxt: 'edge'
}
}
const builder = new Builder(nuxt, BundleBuilder)
semver.satisfies
.mockReturnValueOnce(false)
nuxt.resolver.requireModule
.mockReturnValueOnce({ version: 'alpha' })
.mockReturnValueOnce(undefined)
builder.validateTemplate()
expect(nuxt.resolver.requireModule).toBeCalledTimes(2)
expect(nuxt.resolver.requireModule).nthCalledWith(1, 'join(vue, package.json)')
expect(nuxt.resolver.requireModule).nthCalledWith(2, 'join(nuxt, package.json)')
expect(consola.warn).toBeCalledTimes(2)
expect(consola.warn).nthCalledWith(1, 'vue@latest is recommended but vue@alpha is installed!')
expect(consola.warn).nthCalledWith(2, 'nuxt@edge is required but not installed!')
expect(semver.satisfies).toBeCalledTimes(1)
expect(semver.satisfies).nthCalledWith(1, 'alpha', 'latest')
})
})