Unverified Commit 83209a4b authored by JJ Kasper's avatar JJ Kasper Committed by GitHub

Ensure @babel/core is de-duped when nccing (#28384)

* Ensure @babel/core is de-duped when nccing

* lint-fix

* ncc babel packages together

* remove un-needed env

* bump
parent 26255a68
...@@ -86,8 +86,6 @@ jobs: ...@@ -86,8 +86,6 @@ jobs:
./packages/next/native/next-swc.linux-x64-gnu.node ./packages/next/native/next-swc.linux-x64-gnu.node
if: ${{needs.build.outputs.docsChange != 'docs only change'}} if: ${{needs.build.outputs.docsChange != 'docs only change'}}
- run: ./scripts/check-pre-compiled.sh - run: ./scripts/check-pre-compiled.sh
env:
NODE_OPTIONS: '--max_old_space_size=4096'
if: ${{needs.build.outputs.docsChange != 'docs only change'}} if: ${{needs.build.outputs.docsChange != 'docs only change'}}
testUnit: testUnit:
......
...@@ -28,10 +28,6 @@ function coreLibPluginPass() { ...@@ -28,10 +28,6 @@ function coreLibPluginPass() {
return require('@babel/core/lib/transformation/plugin-pass') return require('@babel/core/lib/transformation/plugin-pass')
} }
function eslintParser() {
return require('@babel/eslint-parser')
}
function traverse() { function traverse() {
return require('@babel/traverse') return require('@babel/traverse')
} }
...@@ -40,60 +36,64 @@ function generator() { ...@@ -40,60 +36,64 @@ function generator() {
return require('@babel/generator') return require('@babel/generator')
} }
function eslintParser() {
return require('next/dist/compiled/babel-packages').eslintParser()
}
function pluginProposalClassProperties() { function pluginProposalClassProperties() {
return require('@babel/plugin-proposal-class-properties') return require('next/dist/compiled/babel-packages').pluginProposalClassProperties()
} }
function pluginProposalExportNamespaceFrom() { function pluginProposalExportNamespaceFrom() {
return require('@babel/plugin-proposal-export-namespace-from') return require('next/dist/compiled/babel-packages').pluginProposalExportNamespaceFrom()
} }
function pluginProposalNumericSeparator() { function pluginProposalNumericSeparator() {
return require('@babel/plugin-proposal-numeric-separator') return require('next/dist/compiled/babel-packages').pluginProposalNumericSeparator()
} }
function pluginProposalObjectRestSpread() { function pluginProposalObjectRestSpread() {
return require('@babel/plugin-proposal-object-rest-spread') return require('next/dist/compiled/babel-packages').pluginProposalObjectRestSpread()
} }
function pluginSyntaxBigint() { function pluginSyntaxBigint() {
return require('@babel/plugin-syntax-bigint') return require('next/dist/compiled/babel-packages').pluginSyntaxBigint()
} }
function pluginSyntaxDynamicImport() { function pluginSyntaxDynamicImport() {
return require('@babel/plugin-syntax-dynamic-import') return require('next/dist/compiled/babel-packages').pluginSyntaxDynamicImport()
} }
function pluginSyntaxJsx() { function pluginSyntaxJsx() {
return require('@babel/plugin-syntax-jsx') return require('next/dist/compiled/babel-packages').pluginSyntaxJsx()
} }
function pluginTransformDefine() { function pluginTransformDefine() {
return require('babel-plugin-transform-define') return require('next/dist/compiled/babel-packages').pluginTransformDefine()
} }
function pluginTransformModulesCommonjs() { function pluginTransformModulesCommonjs() {
return require('@babel/plugin-transform-modules-commonjs') return require('next/dist/compiled/babel-packages').pluginTransformModulesCommonjs()
} }
function pluginTransformReactRemovePropTypes() { function pluginTransformReactRemovePropTypes() {
return require('babel-plugin-transform-react-remove-prop-types') return require('next/dist/compiled/babel-packages').pluginTransformReactRemovePropTypes()
} }
function pluginTransformRuntime() { function pluginTransformRuntime() {
return require('@babel/plugin-transform-runtime') return require('next/dist/compiled/babel-packages').pluginTransformRuntime()
} }
function presetEnv() { function presetEnv() {
return require('@babel/preset-env') return require('next/dist/compiled/babel-packages').presetEnv()
} }
function presetReact() { function presetReact() {
return require('@babel/preset-react') return require('next/dist/compiled/babel-packages').presetReact()
} }
function presetTypescript() { function presetTypescript() {
return require('@babel/preset-typescript') return require('next/dist/compiled/babel-packages').presetTypescript()
} }
module.exports = { module.exports = {
...@@ -104,8 +104,9 @@ module.exports = { ...@@ -104,8 +104,9 @@ module.exports = {
coreLibNormalizeOpts, coreLibNormalizeOpts,
coreLibBlockHoistPlugin, coreLibBlockHoistPlugin,
coreLibPluginPass, coreLibPluginPass,
eslintParser,
generator, generator,
traverse,
eslintParser,
pluginProposalClassProperties, pluginProposalClassProperties,
pluginProposalExportNamespaceFrom, pluginProposalExportNamespaceFrom,
pluginProposalNumericSeparator, pluginProposalNumericSeparator,
...@@ -120,5 +121,4 @@ module.exports = { ...@@ -120,5 +121,4 @@ module.exports = {
presetEnv, presetEnv,
presetReact, presetReact,
presetTypescript, presetTypescript,
traverse,
} }
/* eslint-disable import/no-extraneous-dependencies */
function eslintParser() {
return require('@babel/eslint-parser')
}
function pluginProposalClassProperties() {
return require('@babel/plugin-proposal-class-properties')
}
function pluginProposalExportNamespaceFrom() {
return require('@babel/plugin-proposal-export-namespace-from')
}
function pluginProposalNumericSeparator() {
return require('@babel/plugin-proposal-numeric-separator')
}
function pluginProposalObjectRestSpread() {
return require('@babel/plugin-proposal-object-rest-spread')
}
function pluginSyntaxBigint() {
return require('@babel/plugin-syntax-bigint')
}
function pluginSyntaxDynamicImport() {
return require('@babel/plugin-syntax-dynamic-import')
}
function pluginSyntaxJsx() {
return require('@babel/plugin-syntax-jsx')
}
function pluginTransformDefine() {
return require('babel-plugin-transform-define')
}
function pluginTransformModulesCommonjs() {
return require('@babel/plugin-transform-modules-commonjs')
}
function pluginTransformReactRemovePropTypes() {
return require('babel-plugin-transform-react-remove-prop-types')
}
function pluginTransformRuntime() {
return require('@babel/plugin-transform-runtime')
}
function presetEnv() {
return require('@babel/preset-env')
}
function presetReact() {
return require('@babel/preset-react')
}
function presetTypescript() {
return require('@babel/preset-typescript')
}
module.exports = {
eslintParser,
pluginProposalClassProperties,
pluginProposalExportNamespaceFrom,
pluginProposalNumericSeparator,
pluginProposalObjectRestSpread,
pluginSyntaxBigint,
pluginSyntaxDynamicImport,
pluginSyntaxJsx,
pluginTransformDefine,
pluginTransformModulesCommonjs,
pluginTransformReactRemovePropTypes,
pluginTransformRuntime,
presetEnv,
presetReact,
presetTypescript,
}
MIT License
Copyright (c) 2014-present Sebastian McKenzie and other contributors
Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
"Software"), to deal in the Software without restriction, including
without limitation the rights to use, copy, modify, merge, publish,
distribute, sublicense, and/or sell copies of the Software, and to
permit persons to whom the Software is furnished to do so, subject to
the following conditions:
The above copyright notice and this permission notice shall be
included in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
{"name":"@babel/core","main":"packages-bundle.js","author":"The Babel Team (https://babel.dev/team)","license":"MIT"}
This diff is collapsed.
This diff is collapsed.
...@@ -112,23 +112,7 @@ export async function ncc_async_sema(task, opts) { ...@@ -112,23 +112,7 @@ export async function ncc_async_sema(task, opts) {
.target('compiled/async-sema') .target('compiled/async-sema')
} }
// eslint-disable-next-line camelcase const babelCorePackages = {
export async function ncc_babel_bundle(task, opts) {
const bundleExternals = { ...externals }
for (const pkg of Object.keys(babelBundlePackages)) {
delete bundleExternals[pkg]
}
await task
.source(opts.src || 'bundles/babel/bundle.js')
.ncc({
packageName: '@babel/core',
bundleName: 'babel',
externals: bundleExternals,
})
.target('compiled/babel')
}
const babelBundlePackages = {
'code-frame': 'next/dist/compiled/babel/code-frame', 'code-frame': 'next/dist/compiled/babel/code-frame',
'@babel/generator': 'next/dist/compiled/babel/generator', '@babel/generator': 'next/dist/compiled/babel/generator',
'@babel/traverse': 'next/dist/compiled/babel/traverse', '@babel/traverse': 'next/dist/compiled/babel/traverse',
...@@ -142,35 +126,43 @@ const babelBundlePackages = { ...@@ -142,35 +126,43 @@ const babelBundlePackages = {
'next/dist/compiled/babel/core-lib-block-hoisting-plugin', 'next/dist/compiled/babel/core-lib-block-hoisting-plugin',
'@babel/core/lib/transformation/plugin-pass': '@babel/core/lib/transformation/plugin-pass':
'next/dist/compiled/babel/core-lib-plugin-pass', 'next/dist/compiled/babel/core-lib-plugin-pass',
'@babel/plugin-proposal-class-properties': }
'next/dist/compiled/babel/plugin-proposal-class-properties',
'@babel/plugin-proposal-export-namespace-from':
'next/dist/compiled/babel/plugin-proposal-export-namespace-from',
'@babel/plugin-proposal-numeric-separator':
'next/dist/compiled/babel/plugin-proposal-numeric-separator',
'@babel/plugin-proposal-object-rest-spread':
'next/dist/compiled/babel/plugin-proposal-object-rest-spread',
'@babel/plugin-syntax-bigint':
'next/dist/compiled/babel/plugin-syntax-bigint',
'@babel/plugin-syntax-dynamic-import':
'next/dist/compiled/babel/plugin-syntax-dynamic-import',
'@babel/plugin-syntax-jsx': 'next/dist/compiled/babel/plugin-syntax-jsx',
'@babel/plugin-transform-modules-commonjs':
'next/dist/compiled/babel/plugin-transform-modules-commonjs',
'@babel/plugin-transform-runtime':
'next/dist/compiled/babel/plugin-transform-runtime',
'@babel/preset-env': 'next/dist/compiled/babel/preset-env',
'@babel/preset-react': 'next/dist/compiled/babel/preset-react',
'@babel/preset-typescript': 'next/dist/compiled/babel/preset-typescript',
'@babel/eslint-parser': 'next/dist/compiled/babel/eslint-parser',
}
Object.assign(externals, babelBundlePackages)
Object.assign(externals, babelCorePackages)
// eslint-disable-next-line camelcase
export async function ncc_babel_bundle(task, opts) {
const bundleExternals = {
...externals,
'next/dist/compiled/babel-packages': 'next/dist/compiled/babel-packages',
}
for (const pkg of Object.keys(babelCorePackages)) {
delete bundleExternals[pkg]
}
await task
.source(opts.src || 'bundles/babel/bundle.js')
.ncc({
packageName: '@babel/core',
bundleName: 'babel',
externals: bundleExternals,
})
.target('compiled/babel')
}
// eslint-disable-next-line camelcase
export async function ncc_babel_bundle_packages(task, opts) { export async function ncc_babel_bundle_packages(task, opts) {
await task
.source(opts.src || 'bundles/babel/packages-bundle.js')
.ncc({
packageName: `@babel/core`,
bundleName: 'babel-packages',
externals: externals,
})
.target(`compiled/babel-packages`)
await task await task
.source(opts.src || 'bundles/babel/packages/*') .source(opts.src || 'bundles/babel/packages/*')
.target('compiled/babel/') .target('compiled/babel')
} }
// eslint-disable-next-line camelcase // eslint-disable-next-line camelcase
...@@ -779,7 +771,6 @@ export async function ncc(task, opts) { ...@@ -779,7 +771,6 @@ export async function ncc(task, opts) {
'ncc_async_retry', 'ncc_async_retry',
'ncc_async_sema', 'ncc_async_sema',
'ncc_babel_bundle', 'ncc_babel_bundle',
'ncc_babel_bundle_packages',
'ncc_bfj', 'ncc_bfj',
'ncc_cacache', 'ncc_cacache',
'ncc_ci_info', 'ncc_ci_info',
...@@ -842,6 +833,7 @@ export async function ncc(task, opts) { ...@@ -842,6 +833,7 @@ export async function ncc(task, opts) {
], ],
opts opts
) )
await task.parallel(['ncc_babel_bundle_packages'], opts)
} }
export async function compile(task, opts) { export async function compile(task, opts) {
......
...@@ -7623,9 +7623,9 @@ core-js-compat@^3.14.0: ...@@ -7623,9 +7623,9 @@ core-js-compat@^3.14.0:
semver "7.0.0" semver "7.0.0"
core-js-compat@^3.16.0: core-js-compat@^3.16.0:
version "3.16.1" version "3.16.2"
resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.16.1.tgz#c44b7caa2dcb94b673a98f27eee1c8312f55bc2d" resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.16.2.tgz#442ef1d933ca6fc80859bd5a1db7a3ba716aaf56"
integrity sha512-NHXQXvRbd4nxp9TEmooTJLUf94ySUG6+DSsscBpTftN1lQLQ4LjnWvc7AoIo4UjDsFF3hB8Uh5LLCRRdaiT5MQ== integrity sha512-4lUshXtBXsdmp8cDWh6KKiHUg40AjiuPD3bOWkNVsr1xkAhpUqCjaZ8lB1bKx9Gb5fXcbRbFJ4f4qpRIRTuJqQ==
dependencies: dependencies:
browserslist "^4.16.7" browserslist "^4.16.7"
semver "7.0.0" semver "7.0.0"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment