diff --git a/packages/next/build/babel/plugins/amp-attributes.ts b/packages/next/build/babel/plugins/amp-attributes.ts index 9cc4ee8941..ac483c33a7 100644 --- a/packages/next/build/babel/plugins/amp-attributes.ts +++ b/packages/next/build/babel/plugins/amp-attributes.ts @@ -1,5 +1,5 @@ -import { NodePath, PluginObj } from 'next/dist/compiled/babel--core' -import { JSXOpeningElement } from 'next/dist/compiled/babel--types' +import { NodePath, PluginObj } from '@babel/core' +import { JSXOpeningElement } from '@babel/types' export default function AmpAttributePatcher(...args: any): PluginObj { return { diff --git a/packages/next/build/babel/plugins/commonjs.ts b/packages/next/build/babel/plugins/commonjs.ts index d95f09dedf..cd32243fbd 100644 --- a/packages/next/build/babel/plugins/commonjs.ts +++ b/packages/next/build/babel/plugins/commonjs.ts @@ -1,6 +1,6 @@ -import { NodePath, PluginObj } from 'next/dist/compiled/babel--core' -import commonjsPlugin from 'next/dist/compiled/babel--plugin-transform-modules-commonjs' -import { Program } from 'next/dist/compiled/babel--types' +import { NodePath, PluginObj } from '@babel/core' +import commonjsPlugin from '@babel/plugin-transform-modules-commonjs' +import { Program } from '@babel/types' // Rewrite imports using next/ to next-server/ export default function NextToNextServer(...args: any): PluginObj { diff --git a/packages/next/build/babel/plugins/jsx-pragma.ts b/packages/next/build/babel/plugins/jsx-pragma.ts index 58779c6734..18a35db5ff 100644 --- a/packages/next/build/babel/plugins/jsx-pragma.ts +++ b/packages/next/build/babel/plugins/jsx-pragma.ts @@ -1,5 +1,5 @@ -import { NodePath, PluginObj } from 'next/dist/compiled/babel--core' -import * as BabelTypes from 'next/dist/compiled/babel--types' +import { NodePath, PluginObj } from '@babel/core' +import * as BabelTypes from '@babel/types' export default function({ types: t, @@ -7,7 +7,7 @@ export default function({ types: typeof BabelTypes }): PluginObj { return { - inherits: require('next/dist/compiled/babel-plugin-syntax-jsx'), + inherits: require('babel-plugin-syntax-jsx'), visitor: { JSXElement(path, state) { state.set('jsx', true) diff --git a/packages/next/build/babel/plugins/next-data.ts b/packages/next/build/babel/plugins/next-data.ts index af0ce2ab1b..6b2c70fe05 100644 --- a/packages/next/build/babel/plugins/next-data.ts +++ b/packages/next/build/babel/plugins/next-data.ts @@ -1,5 +1,5 @@ -import { NodePath, PluginObj } from 'next/dist/compiled/babel--core' -import * as BabelTypes from 'next/dist/compiled/babel--types' +import { NodePath, PluginObj } from '@babel/core' +import * as BabelTypes from '@babel/types' export default function({ types: t, diff --git a/packages/next/build/babel/plugins/next-page-config.ts b/packages/next/build/babel/plugins/next-page-config.ts index 1486796b5b..c968e15c73 100644 --- a/packages/next/build/babel/plugins/next-page-config.ts +++ b/packages/next/build/babel/plugins/next-page-config.ts @@ -1,5 +1,5 @@ -import { NodePath, PluginObj } from 'next/dist/compiled/babel--core' -import * as BabelTypes from 'next/dist/compiled/babel--types' +import { NodePath, PluginObj } from '@babel/core' +import * as BabelTypes from '@babel/types' import { PageConfig } from 'next/types' const STRING_LITERAL_DROP_BUNDLE = '__NEXT_DROP_CLIENT_FILE__' diff --git a/packages/next/build/babel/plugins/next-ssg-transform.ts b/packages/next/build/babel/plugins/next-ssg-transform.ts index 0ed8f752a3..ef20ebb297 100644 --- a/packages/next/build/babel/plugins/next-ssg-transform.ts +++ b/packages/next/build/babel/plugins/next-ssg-transform.ts @@ -1,5 +1,5 @@ -import { NodePath, PluginObj } from 'next/dist/compiled/babel--core' -import * as BabelTypes from 'next/dist/compiled/babel--types' +import { NodePath, PluginObj } from '@babel/core' +import * as BabelTypes from '@babel/types' import { SERVER_PROPS_SSG_CONFLICT } from '../../../lib/constants' import { STATIC_PROPS_ID, diff --git a/packages/next/build/babel/plugins/optimize-hook-destructuring.ts b/packages/next/build/babel/plugins/optimize-hook-destructuring.ts index 7845e0b9d7..60dc921bc1 100644 --- a/packages/next/build/babel/plugins/optimize-hook-destructuring.ts +++ b/packages/next/build/babel/plugins/optimize-hook-destructuring.ts @@ -1,5 +1,5 @@ -import { NodePath, PluginObj } from 'next/dist/compiled/babel--core' -import * as BabelTypes from 'next/dist/compiled/babel--types' +import { NodePath, PluginObj } from '@babel/core' +import * as BabelTypes from '@babel/types' // matches any hook-like (the default) const isHook = /^use[A-Z]/ diff --git a/packages/next/build/babel/plugins/react-loadable-plugin.ts b/packages/next/build/babel/plugins/react-loadable-plugin.ts index cc37d3b385..ea228f62cc 100644 --- a/packages/next/build/babel/plugins/react-loadable-plugin.ts +++ b/packages/next/build/babel/plugins/react-loadable-plugin.ts @@ -23,8 +23,8 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWAR // Modified to put `webpack` and `modules` under `loadableGenerated` to be backwards compatible with next/dynamic which has a `modules` key // Modified to support `dynamic(import('something'))` and `dynamic(import('something'), options) -import { NodePath, PluginObj } from 'next/dist/compiled/babel--core' -import * as BabelTypes from 'next/dist/compiled/babel--types' +import { NodePath, PluginObj } from '@babel/core' +import * as BabelTypes from '@babel/types' export default function({ types: t }: { types: typeof BabelTypes }): PluginObj { return { diff --git a/packages/next/build/babel/preset.ts b/packages/next/build/babel/preset.ts index f746419f2c..08dd3b5f36 100644 --- a/packages/next/build/babel/preset.ts +++ b/packages/next/build/babel/preset.ts @@ -1,4 +1,4 @@ -import { PluginItem } from 'next/dist/compiled/babel--core' +import { PluginItem } from '@babel/core' const env = process.env.NODE_ENV const isProduction = env === 'production' const isDevelopment = env === 'development' @@ -103,11 +103,11 @@ module.exports = ( sourceType: 'unambiguous', presets: [ customModernPreset || [ - require('next/dist/compiled/babel--preset-env').default, + require('@babel/preset-env').default, presetEnvConfig, ], [ - require('next/dist/compiled/babel--preset-react'), + require('@babel/preset-react'), { // This adds @babel/plugin-transform-react-jsx-source and // @babel/plugin-transform-react-jsx-self automatically in development @@ -116,10 +116,7 @@ module.exports = ( ...options['preset-react'], }, ], - [ - require('next/dist/compiled/babel--preset-typescript'), - { allowNamespaces: true }, - ], + [require('@babel/preset-typescript'), { allowNamespaces: true }], ], plugins: [ [ @@ -141,20 +138,20 @@ module.exports = ( lib: true, }, ], - require('next/dist/compiled/babel--plugin-syntax-dynamic-import'), + require('@babel/plugin-syntax-dynamic-import'), require('./plugins/react-loadable-plugin'), [ - require('next/dist/compiled/babel--plugin-proposal-class-properties'), + require('@babel/plugin-proposal-class-properties'), options['class-properties'] || {}, ], [ - require('next/dist/compiled/babel--plugin-proposal-object-rest-spread'), + require('@babel/plugin-proposal-object-rest-spread'), { useBuiltIns: true, }, ], !isServer && [ - require('next/dist/compiled/babel--plugin-transform-runtime'), + require('@babel/plugin-transform-runtime'), { corejs: false, helpers: true, @@ -172,27 +169,20 @@ module.exports = ( ], require('./plugins/amp-attributes'), isProduction && [ - require('next/dist/compiled/babel-plugin-transform-react-remove-prop-types'), + require('babel-plugin-transform-react-remove-prop-types'), { removeImport: true, }, ], - require('next/dist/compiled/babel--plugin-proposal-optional-chaining'), - require('next/dist/compiled/babel--plugin-proposal-nullish-coalescing-operator'), - isServer && require('next/dist/compiled/babel--plugin-syntax-bigint'), - [ - require('next/dist/compiled/babel--plugin-proposal-numeric-separator') - .default, - false, - ], + require('@babel/plugin-proposal-optional-chaining'), + require('@babel/plugin-proposal-nullish-coalescing-operator'), + isServer && require('@babel/plugin-syntax-bigint'), + [require('@babel/plugin-proposal-numeric-separator').default, false], ].filter(Boolean), overrides: [ { test: /\.tsx?$/, - plugins: [ - require('next/dist/compiled/babel--plugin-proposal-numeric-separator') - .default, - ], + plugins: [require('@babel/plugin-proposal-numeric-separator').default], }, ], } diff --git a/packages/next/build/webpack/config/blocks/css/plugins.ts b/packages/next/build/webpack/config/blocks/css/plugins.ts index de1ddd9aff..b333350690 100644 --- a/packages/next/build/webpack/config/blocks/css/plugins.ts +++ b/packages/next/build/webpack/config/blocks/css/plugins.ts @@ -1,7 +1,7 @@ import chalk from 'next/dist/compiled/chalk' import { findConfig } from '../../../../../lib/find-config' import { resolveRequest } from '../../../../../lib/resolve-request' -import browserslist from 'next/dist/compiled/browserslist' +import browserslist from 'browserslist' type CssPluginCollection_Array = (string | [string, boolean | object])[] diff --git a/packages/next/build/webpack/loaders/next-babel-loader.js b/packages/next/build/webpack/loaders/next-babel-loader.js index 1d788f349c..a438cd2524 100644 --- a/packages/next/build/webpack/loaders/next-babel-loader.js +++ b/packages/next/build/webpack/loaders/next-babel-loader.js @@ -1,4 +1,4 @@ -import babelLoader from 'next/dist/compiled/babel-loader' +import babelLoader from 'babel-loader' import { basename, join } from 'path' import hash from 'next/dist/compiled/string-hash' @@ -44,7 +44,7 @@ module.exports = babelLoader.custom(babel => { { type: 'plugin' } ) const commonJsItem = babel.createConfigItem( - require('next/dist/compiled/babel--plugin-transform-modules-commonjs'), + require('@babel/plugin-transform-modules-commonjs'), { type: 'plugin' } ) @@ -180,7 +180,7 @@ module.exports = babelLoader.custom(babel => { } options.plugins.push([ - require.resolve('next/dist/compiled/babel-plugin-transform-define'), + require.resolve('babel-plugin-transform-define'), { 'process.env.NODE_ENV': development ? 'development' : 'production', 'typeof window': isServer ? 'undefined' : 'object', diff --git a/packages/next/build/webpack/plugins/next-esm-plugin.ts b/packages/next/build/webpack/plugins/next-esm-plugin.ts index 8565f63582..91a6f21b4a 100644 --- a/packages/next/build/webpack/plugins/next-esm-plugin.ts +++ b/packages/next/build/webpack/plugins/next-esm-plugin.ts @@ -170,7 +170,7 @@ export default class NextEsmPlugin implements Plugin { if (IS_PRESET_ENV.test(name)) { presets.push([ - require.resolve('next/dist/compiled/babel--preset-modules'), + require.resolve('@babel/preset-modules'), { loose: true }, ]) } else { diff --git a/packages/next/package.json b/packages/next/package.json index 1c5cb03527..0356e7b3ed 100644 --- a/packages/next/package.json +++ b/packages/next/package.json @@ -58,8 +58,29 @@ }, "dependencies": { "@ampproject/toolbox-optimizer": "2.0.1", + "@babel/core": "7.7.2", + "@babel/plugin-proposal-class-properties": "7.7.0", + "@babel/plugin-proposal-nullish-coalescing-operator": "7.7.4", + "@babel/plugin-proposal-numeric-separator": "7.8.3", + "@babel/plugin-proposal-object-rest-spread": "7.6.2", + "@babel/plugin-proposal-optional-chaining": "7.7.4", + "@babel/plugin-syntax-bigint": "7.8.3", + "@babel/plugin-syntax-dynamic-import": "7.2.0", + "@babel/plugin-transform-modules-commonjs": "7.7.0", + "@babel/plugin-transform-runtime": "7.6.2", + "@babel/preset-env": "7.7.1", + "@babel/preset-modules": "0.1.1", + "@babel/preset-react": "7.7.0", + "@babel/preset-typescript": "7.7.2", "@babel/runtime": "7.7.2", + "@babel/types": "7.7.4", "autodll-webpack-plugin": "0.4.2", + "babel-loader": "8.0.6", + "babel-plugin-dynamic-import-node": "2.3.0", + "babel-plugin-syntax-jsx": "6.18.0", + "babel-plugin-transform-define": "2.0.0", + "babel-plugin-transform-react-remove-prop-types": "0.4.24", + "browserslist": "4.8.3", "cache-loader": "4.1.0", "css-loader": "3.3.0", "cssnano-simple": "1.0.0", @@ -95,21 +116,6 @@ "react-dom": "^16.6.0" }, "devDependencies": { - "@babel/core": "7.7.2", - "@babel/plugin-proposal-class-properties": "7.7.0", - "@babel/plugin-proposal-nullish-coalescing-operator": "7.7.4", - "@babel/plugin-proposal-numeric-separator": "7.8.3", - "@babel/plugin-proposal-object-rest-spread": "7.6.2", - "@babel/plugin-proposal-optional-chaining": "7.7.4", - "@babel/plugin-syntax-bigint": "7.8.3", - "@babel/plugin-syntax-dynamic-import": "7.2.0", - "@babel/plugin-transform-modules-commonjs": "7.7.0", - "@babel/plugin-transform-runtime": "7.6.2", - "@babel/preset-env": "7.7.1", - "@babel/preset-modules": "0.1.1", - "@babel/preset-react": "7.7.0", - "@babel/preset-typescript": "7.7.2", - "@babel/types": "7.7.4", "@next/polyfill-nomodule": "9.3.4-canary.0", "@taskr/clear": "1.1.0", "@taskr/esnext": "1.1.0", @@ -153,12 +159,6 @@ "ast-types": "0.13.2", "async-retry": "1.2.3", "async-sema": "3.0.0", - "babel-loader": "8.0.6", - "babel-plugin-dynamic-import-node": "2.3.0", - "babel-plugin-syntax-jsx": "6.18.0", - "babel-plugin-transform-define": "2.0.0", - "babel-plugin-transform-react-remove-prop-types": "0.4.24", - "browserslist": "4.8.3", "chalk": "2.4.2", "ci-info": "2.0.0", "compression": "1.7.4", diff --git a/packages/next/taskfile.js b/packages/next/taskfile.js index c696c2bbbe..beb6a1271d 100644 --- a/packages/next/taskfile.js +++ b/packages/next/taskfile.js @@ -33,8 +33,6 @@ export async function browser_polyfills(task) { } const externals = { - '@babel/core': 'next/dist/compiled/babel--core', - '@babel/helper-plugin-utils': 'next/dist/compiled/babel--helper-plugin-utils', chalk: 'next/dist/compiled/chalk', 'source-map': 'next/dist/compiled/source-map', 'node-fetch': 'next/dist/compiled/node-fetch', @@ -74,267 +72,8 @@ export async function ncc_async_sema(task, opts) { .target('dist/compiled/async-sema') } // eslint-disable-next-line camelcase -export async function ncc_babel__core(task, opts) { - await task - .source(opts.src || relative(__dirname, require.resolve('@babel/core'))) - .ncc({ packageName: '@babel/core', externals }) - .target('dist/compiled/babel--core') -} -// eslint-disable-next-line camelcase -export async function ncc_babel__helper_plugin_utils(task, opts) { - await task - .source( - opts.src || - relative(__dirname, require.resolve('@babel/helper-plugin-utils')) - ) - .ncc({ packageName: '@babel/helper-plugin-utils', externals }) - .target('dist/compiled/babel--helper-plugin-utils') -} -// eslint-disable-next-line camelcase -export async function ncc_babel__plugin_proposal_class_properties(task, opts) { - await task - .source( - opts.src || - relative( - __dirname, - require.resolve('@babel/plugin-proposal-class-properties') - ) - ) - .ncc({ - packageName: '@babel/plugin-proposal-class-properties', - externals, - }) - .target('dist/compiled/babel--plugin-proposal-class-properties') -} -// eslint-disable-next-line camelcase -export async function ncc_babel__plugin_proposal_nullish_coalescing_operator( - task, - opts -) { - await task - .source( - opts.src || - relative( - __dirname, - require.resolve('@babel/plugin-proposal-nullish-coalescing-operator') - ) - ) - .ncc({ - packageName: '@babel/plugin-proposal-nullish-coalescing-operator', - externals, - }) - .target('dist/compiled/babel--plugin-proposal-nullish-coalescing-operator') -} -// eslint-disable-next-line camelcase -export async function ncc_babel__plugin_proposal_numeric_separator(task, opts) { - await task - .source( - opts.src || - relative( - __dirname, - require.resolve('@babel/plugin-proposal-numeric-separator') - ) - ) - .ncc({ - packageName: '@babel/plugin-proposal-numeric-separator', - externals, - }) - .target('dist/compiled/babel--plugin-proposal-numeric-separator') -} -// eslint-disable-next-line camelcase -export async function ncc_babel__plugin_proposal_object_rest_spread( - task, - opts -) { - await task - .source( - opts.src || - relative( - __dirname, - require.resolve('@babel/plugin-proposal-object-rest-spread') - ) - ) - .ncc({ - packageName: '@babel/plugin-proposal-object-rest-spread', - externals, - }) - .target('dist/compiled/babel--plugin-proposal-object-rest-spread') -} -// eslint-disable-next-line camelcase -export async function ncc_babel__plugin_proposal_optional_chaining(task, opts) { - await task - .source( - opts.src || - relative( - __dirname, - require.resolve('@babel/plugin-proposal-optional-chaining') - ) - ) - .ncc({ - packageName: '@babel/plugin-proposal-optional-chaining', - externals, - }) - .target('dist/compiled/babel--plugin-proposal-optional-chaining') -} -// eslint-disable-next-line camelcase -export async function ncc_babel__plugin_syntax_bigint(task, opts) { - await task - .source( - opts.src || - relative(__dirname, require.resolve('@babel/plugin-syntax-bigint')) - ) - .ncc({ - packageName: '@babel/plugin-syntax-bigint', - externals, - }) - .target('dist/compiled/babel--plugin-syntax-bigint') -} -// eslint-disable-next-line camelcase -export async function ncc_babel__plugin_syntax_dynamic_import(task, opts) { - await task - .source( - opts.src || - relative( - __dirname, - // eslint-disable-next-line no-useless-concat - require.resolve('@babel/plugin-syntax-dynamic-i' + 'mport') - ) - ) - .ncc({ - // eslint-disable-next-line no-useless-concat - packageName: '@babel/plugin-syntax-dynamic-i' + 'mport', - externals, - }) - // eslint-disable-next-line no-useless-concat - .target('dist/compiled/babel--plugin-syntax-dynamic-i' + 'mport') -} -// eslint-disable-next-line camelcase -export async function ncc_babel__plugin_transform_modules_commonjs(task, opts) { - await task - .source( - opts.src || - relative( - __dirname, - require.resolve('@babel/plugin-transform-modules-commonjs') - ) - ) - .ncc({ - packageName: '@babel/plugin-transform-modules-commonjs', - externals, - }) - .target('dist/compiled/babel--plugin-transform-modules-commonjs') -} -// eslint-disable-next-line camelcase -export async function ncc_babel__plugin_transform_runtime(task, opts) { - await task - .source( - opts.src || - relative(__dirname, require.resolve('@babel/plugin-transform-runtime')) - ) - .ncc({ - packageName: '@babel/plugin-transform-runtime', - externals, - }) - .target('dist/compiled/babel--plugin-transform-runtime') -} -// eslint-disable-next-line camelcase -export async function ncc_babel__preset_env(task, opts) { - await task - .source( - opts.src || relative(__dirname, require.resolve('@babel/preset-env')) - ) - .ncc({ packageName: '@babel/preset-env', externals }) - .target('dist/compiled/babel--preset-env') -} -// eslint-disable-next-line camelcase -export async function ncc_babel__preset_modules(task, opts) { - await task - .source( - opts.src || relative(__dirname, require.resolve('@babel/preset-modules')) - ) - .ncc({ packageName: '@babel/preset-modules', externals }) - .target('dist/compiled/babel--preset-modules') -} -// eslint-disable-next-line camelcase -export async function ncc_babel__preset_react(task, opts) { - await task - .source( - opts.src || relative(__dirname, require.resolve('@babel/preset-react')) - ) - .ncc({ packageName: '@babel/preset-react', externals }) - .target('dist/compiled/babel--preset-react') -} -// eslint-disable-next-line camelcase -export async function ncc_babel__preset_typescript(task, opts) { - await task - .source( - opts.src || - relative(__dirname, require.resolve('@babel/preset-typescript')) - ) - .ncc({ packageName: '@babel/preset-typescript', externals }) - .target('dist/compiled/babel--preset-typescript') -} -// eslint-disable-next-line camelcase -export async function ncc_babel__types(task, opts) { - await task - .source(opts.src || relative(__dirname, require.resolve('@babel/types'))) - .ncc({ packageName: '@babel/types', externals }) - .target('dist/compiled/babel--types') -} -// eslint-disable-next-line camelcase -export async function ncc_babel_loader(task, opts) { - await task - .source(opts.src || relative(__dirname, require.resolve('babel-loader'))) - .ncc({ packageName: 'babel-loader', externals }) - .target('dist/compiled/babel-loader') -} -// eslint-disable-next-line camelcase -export async function ncc_babel_plugin_syntax_jsx(task, opts) { - await task - .source( - opts.src || - relative(__dirname, require.resolve('babel-plugin-syntax-jsx')) - ) - .ncc({ packageName: 'babel-plugin-syntax-jsx', externals }) - .target('dist/compiled/babel-plugin-syntax-jsx') -} -// eslint-disable-next-line camelcase -export async function ncc_babel_plugin_transform_define(task, opts) { - await task - .source( - opts.src || - relative(__dirname, require.resolve('babel-plugin-transform-define')) - ) - .ncc({ packageName: 'babel-plugin-transform-define', externals }) - .target('dist/compiled/babel-plugin-transform-define') -} -// eslint-disable-next-line camelcase -export async function ncc_babel_plugin_transform_react_remove_prop_types( - task, - opts -) { - await task - .source( - opts.src || - relative( - __dirname, - require.resolve('babel-plugin-transform-react-remove-prop-types') - ) - ) - .ncc({ - packageName: 'babel-plugin-transform-react-remove-prop-types', - externals, - }) - .target('dist/compiled/babel-plugin-transform-react-remove-prop-types') -} -// eslint-disable-next-line camelcase -export async function ncc_browserslist(task, opts) { - await task - .source(opts.src || relative(__dirname, require.resolve('browserslist'))) - .ncc({ packageName: 'browserslist' }) - .target('dist/compiled/browserslist') -} -// eslint-disable-next-line camelcase +// NB: Used by other dependencies, but Zeit version is a duplicate +// version so can be inlined anyway (although may change in future) export async function ncc_chalk(task, opts) { await task .source(opts.src || relative(__dirname, require.resolve('chalk'))) @@ -526,6 +265,8 @@ export async function ncc_recast(task, opts) { .target('dist/compiled/recast') } // eslint-disable-next-line camelcase +// NB: Used by other dependencies, but Zeit version is a duplicate +// version so can be inlined anyway (although may change in future) export async function ncc_resolve(task, opts) { await task .source(opts.src || relative(__dirname, require.resolve('resolve'))) @@ -540,6 +281,8 @@ export async function ncc_send(task, opts) { .target('dist/compiled/send') } // eslint-disable-next-line camelcase +// NB: Used by other dependencies, but Zeit version is a duplicate +// version so can be inlined anyway (although may change in future) export async function ncc_source_map(task, opts) { await task .source(opts.src || relative(__dirname, require.resolve('source-map'))) @@ -603,28 +346,6 @@ export async function precompile(task) { 'ncc_arg', 'ncc_async_retry', 'ncc_async_sema', - 'ncc_babel__core', - 'ncc_babel__helper_plugin_utils', - 'ncc_babel__plugin_proposal_class_properties', - 'ncc_babel__plugin_proposal_nullish_coalescing_operator', - 'ncc_babel__plugin_proposal_numeric_separator', - 'ncc_babel__plugin_proposal_object_rest_spread', - 'ncc_babel__plugin_proposal_optional_chaining', - 'ncc_babel__plugin_syntax_bigint', - // eslint-disable-next-line no-useless-concat - 'ncc_babel__plugin_syntax_dynamic_i' + 'mport', - 'ncc_babel__plugin_transform_modules_commonjs', - 'ncc_babel__plugin_transform_runtime', - 'ncc_babel__preset_env', - 'ncc_babel__preset_modules', - 'ncc_babel__preset_react', - 'ncc_babel__preset_typescript', - 'ncc_babel__types', - 'ncc_babel_loader', - 'ncc_babel_plugin_syntax_jsx', - 'ncc_babel_plugin_transform_define', - 'ncc_babel_plugin_transform_react_remove_prop_types', - 'ncc_browserslist', 'ncc_chalk', 'ncc_ci_info', 'ncc_compression', diff --git a/packages/next/telemetry/events/version.ts b/packages/next/telemetry/events/version.ts index 137408271e..edbd5f1c9c 100644 --- a/packages/next/telemetry/events/version.ts +++ b/packages/next/telemetry/events/version.ts @@ -26,7 +26,7 @@ type EventCliSessionStarted = { function hasBabelConfig(dir: string): boolean { try { const noopFile = path.join(dir, 'noop.js') - const res = require('next/dist/compiled/babel--core').loadPartialConfig({ + const res = require('@babel/core').loadPartialConfig({ cwd: dir, filename: noopFile, sourceFileName: noopFile, diff --git a/packages/next/types/misc.d.ts b/packages/next/types/misc.d.ts index c87d7a4243..56ed03e0d2 100644 --- a/packages/next/types/misc.d.ts +++ b/packages/next/types/misc.d.ts @@ -1,15 +1,16 @@ -declare module 'next/dist/compiled/babel--plugin-transform-modules-commonjs' -declare module 'webpack/lib/GraphHelpers' -declare module 'webpack/lib/DynamicEntryPlugin' -declare module 'unfetch' -declare module 'launch-editor' -declare module 'styled-jsx/server' - +declare module '@babel/plugin-transform-modules-commonjs' +declare module 'browserslist' declare module 'cssnano-simple' { import { Plugin } from 'postcss' const cssnanoSimple: Plugin<{}> export = cssnanoSimple } +declare module 'launch-editor' +declare module 'styled-jsx/server' +declare module 'unfetch' +declare module 'webpack/lib/GraphHelpers' +declare module 'webpack/lib/DynamicEntryPlugin' + declare module 'next/dist/compiled/amphtml-validator' { import m from 'amphtml-validator' export = m @@ -46,15 +47,6 @@ declare module 'next/dist/compiled/arg/index.js' { export = arg } -declare module 'next/dist/compiled/babel--core' { - import m from '@babel/core' - export = m -} -declare module 'next/dist/compiled/babel--types' { - import m from '@babel/types' - export = m -} -declare module 'next/dist/compiled/browserslist' declare module 'next/dist/compiled/chalk' { import m from 'chalk' export = m