Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat(webpack): auto detect core-js version #7785

Merged
merged 5 commits into from Jul 27, 2020
Merged

feat(webpack): auto detect core-js version #7785

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b4f2759
feat: add build option to set corejs version
farnabaz Jul 27, 2020
da78b4a
fix tests
farnabaz Jul 27, 2020
4424e9c
refactor: improve error handling and warn for invalid corejs version
pi0 Jul 27, 2020
4804a94
fix: only pick major part
pi0 Jul 27, 2020
072d7c7
simplify as we are already using try/catch
pi0 Jul 27, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 10 additions & 2 deletions packages/cli/test/unit/__snapshots__/webpack.test.js.snap
View file
Open in desktop
Expand Up @@ -73,7 +73,11 @@ exports[`webpack nuxt webpack module.rules 1`] = `
\\"presets\\": Array [
Array [
\\"<nuxtDir>/packages/babel-preset-app/src/index.js\\",
Object {},
Object {
\\"corejs\\": Object {
\\"version\\": \\"2\\",
},
},
],
],
},
Expand Down Expand Up @@ -648,7 +652,11 @@ exports[`webpack nuxt webpack module.rules test=.jsx 1`] = `
\\"presets\\": Array [
Array [
\\"<nuxtDir>/packages/babel-preset-app/src/index.js\\",
Object {},
Object {
\\"corejs\\": Object {
\\"version\\": \\"2\\",
},
},
],
],
},
Expand Down
1 change: 1 addition & 0 deletions packages/config/src/config/build.js
View file
Open in desktop
Expand Up @@ -75,6 +75,7 @@ export default () => ({
pages: true,
commons: true
},
corejs: 'auto',
babel: {
configFile: false,
babelrc: false,
Expand Down
1 change: 1 addition & 0 deletions packages/config/test/__snapshots__/options.test.js.snap
View file
Open in desktop
Expand Up @@ -31,6 +31,7 @@ Object {
"configFile": false,
},
"cache": false,
"corejs": "auto",
"cssSourceMap": false,
"devMiddleware": Object {},
"extractCSS": false,
Expand Down
2 changes: 2 additions & 0 deletions packages/config/test/config/__snapshots__/index.test.js.snap
View file
Open in desktop
Expand Up @@ -16,6 +16,7 @@ Object {
"configFile": false,
},
"cache": false,
"corejs": "auto",
"cssSourceMap": undefined,
"devMiddleware": Object {},
"extractCSS": false,
Expand Down Expand Up @@ -395,6 +396,7 @@ Object {
"configFile": false,
},
"cache": false,
"corejs": "auto",
"cssSourceMap": undefined,
"devMiddleware": Object {},
"extractCSS": false,
Expand Down
23 changes: 22 additions & 1 deletion packages/webpack/src/config/base.js
View file
Open in desktop
Expand Up @@ -13,6 +13,7 @@ import semver from 'semver'

import { TARGETS, isUrl, urlJoin, getPKG } from '@nuxt/utils'

import createRequire from 'create-require'
import PerfLoader from '../utils/perf-loader'
import StyleLoader from '../utils/style-loader'
import WarningIgnorePlugin from '../plugins/warning-ignore'
Expand Down Expand Up @@ -96,6 +97,7 @@ export default class WebpackBaseConfig {

getBabelOptions () {
const envName = this.name
const { buildOptions: { corejs }, options: { rootDir } } = this.buildContext
const options = {
...this.buildContext.buildOptions.babel,
envName
Expand All @@ -114,7 +116,26 @@ export default class WebpackBaseConfig {
)
}

const defaultPreset = [require.resolve('@nuxt/babel-preset-app'), {}]
// Auto detect corejs version
let corejsVersion = corejs
if (corejsVersion === 'auto') {
try {
corejsVersion = createRequire(rootDir)('core-js').version.split('.')[0]
} catch (_err) {
corejsVersion = '2'
}
}

if (corejsVersion !== '2' && corejsVersion !== '3') {
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Comparing with strings but user is supposed to provide 2 or 3 as numbers?

consola.warn(`Invalid corejs version ${JSON.stringify(corejsVersion)}! Possible values are 2 and 3`)
corejsVersion = '2'
}

const defaultPreset = [require.resolve('@nuxt/babel-preset-app'), {
corejs: {
version: corejsVersion
}
}]

if (typeof options.presets === 'function') {
options.presets = options.presets(
Expand Down