Ensure @babel/types is not duplicated (#28713)

This is a follow-up to #28174 to ensure we de-dupe `@babel/types` correctly as this increased the compiled `babel` packages quite a bit.
vercel · Sep 1, 2021 · 77c0e09 · 77c0e09
1 parent ed9b886
commit 77c0e09
Show file tree

Hide file tree

Showing 6 changed files with 680 additions and 672 deletions.
diff --git a/packages/next/bundles/babel/bundle.js b/packages/next/bundles/babel/bundle.js
@@ -1,5 +1,9 @@
 /* eslint-disable import/no-extraneous-dependencies */
 
+function types() {
+  return require('@babel/types')
+}
+
 function codeFrame() {
   return require('@babel/code-frame')
 }
@@ -97,6 +101,7 @@ function presetTypescript() {
 }
 
 module.exports = {
+  types,
   codeFrame,
   core,
   coreLibConfig,

diff --git a/packages/next/bundles/babel/packages/types.js b/packages/next/bundles/babel/packages/types.js
@@ -0,0 +1 @@
+module.exports = require('./bundle').types()
diff --git a/packages/next/compiled/babel-packages/packages-bundle.js b/packages/next/compiled/babel-packages/packages-bundle.js
diff --git a/packages/next/compiled/babel/bundle.js b/packages/next/compiled/babel/bundle.js
diff --git a/packages/next/compiled/babel/types.js b/packages/next/compiled/babel/types.js
@@ -0,0 +1 @@
+module.exports = require('./bundle').types()
diff --git a/packages/next/taskfile.js b/packages/next/taskfile.js
@@ -116,6 +116,7 @@ const babelCorePackages = {
   'code-frame': 'next/dist/compiled/babel/code-frame',
   '@babel/generator': 'next/dist/compiled/babel/generator',
   '@babel/traverse': 'next/dist/compiled/babel/traverse',
+  '@babel/types': 'next/dist/compiled/babel/types',
   '@babel/core': 'next/dist/compiled/babel/core',
   '@babel/core/lib/config': 'next/dist/compiled/babel/core-lib-config',
   '@babel/core/lib/transformation/normalize-file':