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

fix: add types for build.corejs option and use number (#7789)

Browse Source
This commit is contained in:
Rafał Chłodnicki 2020-07-28 14:33:15 +02:00 committed by GitHub
parent 60f68638cb
commit e295ae7ffd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/cli/test/unit/__snapshots__/webpack.test.js.snap
View File

@ -75,7 +75,7 @@ exports[`webpack nuxt webpack module.rules 1`] = `
\\"<nuxtDir>/packages/babel-preset-app/src/index.js\\", \\"<nuxtDir>/packages/babel-preset-app/src/index.js\\",
Object { Object {
\\"corejs\\": Object { \\"corejs\\": Object {
\\"version\\": \\"2\\", \\"version\\": 2,
}, },
}, },
], ],
@ -654,7 +654,7 @@ exports[`webpack nuxt webpack module.rules test=.jsx 1`] = `
\\"<nuxtDir>/packages/babel-preset-app/src/index.js\\", \\"<nuxtDir>/packages/babel-preset-app/src/index.js\\",
Object { Object {
\\"corejs\\": Object { \\"corejs\\": Object {
\\"version\\": \\"2\\", \\"version\\": 2,
}, },
}, },
], ],

1
packages/types/config/build.d.ts vendored
View File

@ -137,6 +137,7 @@ export interface NuxtOptionsBuild {
analyze?: BundleAnalyzerPlugin.Options | boolean analyze?: BundleAnalyzerPlugin.Options | boolean
babel?: NuxtBabelOptions babel?: NuxtBabelOptions
cache?: boolean cache?: boolean
corejs?: 'auto' | 2 | 3
crossorigin?: string crossorigin?: string
cssSourceMap?: boolean cssSourceMap?: boolean
devMiddleware?: WebpackDevMiddlewareOptions devMiddleware?: WebpackDevMiddlewareOptions

10
packages/webpack/src/config/base.js
View File

@ -120,15 +120,15 @@ export default class WebpackBaseConfig {
let corejsVersion = corejs let corejsVersion = corejs
if (corejsVersion === 'auto') { if (corejsVersion === 'auto') {
try { try {
corejsVersion = createRequire(rootDir)('core-js/package.json').version.split('.')[0] corejsVersion = Number.parseInt(createRequire(rootDir)('core-js/package.json').version.split('.')[0])
} catch (_err) { } catch (_err) {
corejsVersion = '2' corejsVersion = 2
} }
} }
if (corejsVersion !== '2' && corejsVersion !== '3') { if (![2, 3].includes(corejsVersion)) {
consola.warn(`Invalid corejs version ${JSON.stringify(corejsVersion)}! Please set "build.corejs" to either "2" or "3".`) consola.warn(`Invalid corejs version ${corejsVersion}! Please set "build.corejs" to either "auto", 2 or 3.`)
corejsVersion = '2' corejsVersion = 2
} }
const defaultPreset = [require.resolve('@nuxt/babel-preset-app'), { const defaultPreset = [require.resolve('@nuxt/babel-preset-app'), {