Unverified Commit 4dbb65d0 authored by Guy Bedford's avatar Guy Bedford Committed by GitHub

yarn dev regression fix, ncc revert (#18861)

This fixes the current regression with an ncc revert for now.

I will continue to follow up with the ncc upgrade in https://github.com/vercel/next.js/pull/18860.
parent 8799bd2b
......@@ -37,9 +37,9 @@
},
"pre-commit": "lint-staged",
"devDependencies": {
"@babel/plugin-proposal-object-rest-spread": "7.12.1",
"@babel/plugin-proposal-object-rest-spread": "7.11.0",
"@babel/preset-flow": "7.10.4",
"@babel/preset-react": "7.12.5",
"@babel/preset-react": "7.10.4",
"@fullhuman/postcss-purgecss": "1.3.0",
"@mdx-js/loader": "0.18.0",
"@types/cheerio": "0.22.16",
......@@ -119,7 +119,7 @@
"selenium-webdriver": "4.0.0-alpha.7",
"shell-quote": "1.7.2",
"styled-components": "5.1.0",
"styled-jsx-plugin-postcss": "3.0.2",
"styled-jsx-plugin-postcss": "2.0.1",
"tailwindcss": "1.1.3",
"taskr": "1.1.0",
"tree-kill": "1.2.2",
......
......@@ -33,7 +33,7 @@
"@types/rimraf": "3.0.0",
"@types/tar": "4.0.3",
"@types/validate-npm-package-name": "3.0.0",
"@vercel/ncc": "^0.24.1",
"@zeit/ncc": "0.22.0",
"async-retry": "1.3.1",
"chalk": "2.4.2",
"commander": "2.20.0",
......
import { NodePath, PluginObj, types } from 'next/dist/compiled/babel/core'
import { NodePath, PluginObj, types } from '@babel/core'
export default function AmpAttributePatcher(): PluginObj {
return {
......
import { NodePath, PluginObj, types } from 'next/dist/compiled/babel/core'
import commonjsPlugin from 'next/dist/compiled/babel/plugin-transform-modules-commonjs'
import { NodePath, PluginObj, types } from '@babel/core'
import commonjsPlugin from '@babel/plugin-transform-modules-commonjs'
// Rewrite imports using next/<something> to next-server/<something>
export default function NextToNextServer(...args: any): PluginObj {
......
import {
NodePath,
PluginObj,
types as BabelTypes,
} from 'next/dist/compiled/babel/core'
import jsx from 'next/dist/compiled/babel/plugin-syntax-jsx'
import { NodePath, PluginObj, types as BabelTypes } from '@babel/core'
import jsx from '@babel/plugin-syntax-jsx'
export default function ({
types: t,
......
import {
NodePath,
PluginObj,
types as BabelTypes,
} from 'next/dist/compiled/babel/core'
import { NodePath, PluginObj, types as BabelTypes } from '@babel/core'
export default function ({
types: t,
......
import {
NodePath,
PluginObj,
types as BabelTypes,
} from 'next/dist/compiled/babel/core'
import { NodePath, PluginObj, types as BabelTypes } from '@babel/core'
import { PageConfig } from 'next/types'
import { STRING_LITERAL_DROP_BUNDLE } from '../../../next-server/lib/constants'
......@@ -81,12 +77,9 @@ export default function nextPageConfig({
}
const config: PageConfig = {}
const declarations: BabelTypes.VariableDeclarator[] = [
...((exportPath.node
.declaration as BabelTypes.VariableDeclaration)
?.declarations || []),
exportPath.scope.getBinding(CONFIG_KEY)?.path
.node as BabelTypes.VariableDeclarator,
const declarations = [
...(exportPath.node.declaration?.declarations || []),
exportPath.scope.getBinding(CONFIG_KEY)?.path.node,
].filter(Boolean)
for (const specifier of exportPath.node.specifiers) {
......@@ -154,7 +147,7 @@ export default function nextPageConfig({
)
)
}
const { name } = prop.key as BabelTypes.Identifier
const { name } = prop.key
if (BabelTypes.isIdentifier(prop.key, { name: 'amp' })) {
if (!BabelTypes.isObjectProperty(prop)) {
throw new Error(
......
import { NodePath, PluginObj, types } from 'next/dist/compiled/babel/core'
import { NodePath, PluginObj, types } from '@babel/core'
export default function NextPageDisallowReExportAllExports(): PluginObj<any> {
return {
......
import {
NodePath,
PluginObj,
types as BabelTypes,
} from 'next/dist/compiled/babel/core'
import { NodePath, PluginObj, types as BabelTypes } from '@babel/core'
import { SERVER_PROPS_SSG_CONFLICT } from '../../../lib/constants'
import {
SERVER_PROPS_ID,
......
import { PluginObj, types as BabelTypes } from 'next/dist/compiled/babel/core'
import { PluginObj, types as BabelTypes } from '@babel/core'
import chalk from 'next/dist/compiled/chalk'
export default function NoAnonymousDefaultExport({
......
import {
NodePath,
PluginObj,
types as BabelTypes,
} from 'next/dist/compiled/babel/core'
import { NodePath, PluginObj, types as BabelTypes } from '@babel/core'
// matches any hook-like (the default)
const isHook = /^use[A-Z]/
......
......@@ -23,11 +23,7 @@ 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,
types as BabelTypes,
} from 'next/dist/compiled/babel/core'
import { NodePath, PluginObj, types as BabelTypes } from '@babel/core'
export default function ({
types: t,
......
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'
......@@ -111,11 +111,11 @@ module.exports = (
sourceType: 'unambiguous',
presets: [
customModernPreset || [
require('next/dist/compiled/babel/preset-env'),
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
......@@ -125,7 +125,7 @@ module.exports = (
},
],
[
require('next/dist/compiled/babel/preset-typescript'),
require('@babel/preset-typescript'),
{ allowNamespaces: true, ...options['preset-typescript'] },
],
],
......@@ -149,20 +149,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,
......@@ -185,11 +185,11 @@ module.exports = (
removeImport: true,
},
],
isServer && require('next/dist/compiled/babel/plugin-syntax-bigint'),
isServer && require('@babel/plugin-syntax-bigint'),
// Always compile numeric separator because the resulting number is
// smaller.
require('next/dist/compiled/babel/plugin-proposal-numeric-separator'),
require('next/dist/compiled/babel/plugin-proposal-export-namespace-from'),
require('@babel/plugin-proposal-numeric-separator'),
require('@babel/plugin-proposal-export-namespace-from'),
].filter(Boolean),
}
}
import { codeFrameColumns } from 'next/dist/compiled/babel/code-frame'
import { codeFrameColumns } from '@babel/code-frame'
import ReactRefreshWebpackPlugin from '@next/react-refresh-utils/ReactRefreshWebpackPlugin'
import crypto from 'crypto'
import { readFileSync, realpathSync } from 'fs'
......
......@@ -45,7 +45,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' }
)
......
......@@ -164,7 +164,7 @@ export class NextEsmPlugin implements Plugin {
if (IS_PRESET_ENV.test(name)) {
presets.push([
require('next/dist/compiled/babel/preset-env'),
require.resolve('@babel/preset-env'),
{
bugfixes: true,
loose: true,
......
import { codeFrameColumns } from 'next/dist/compiled/babel/code-frame'
import { codeFrameColumns } from '@babel/code-frame'
import Chalk from 'next/dist/compiled/chalk'
import { SimpleWebpackError } from './simpleWebpackError'
......
/* eslint-disable import/no-extraneous-dependencies */
function codeFrame() {
return require('@babel/code-frame')
}
function core() {
return require('@babel/core')
}
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 pluginTransformModulesCommonjs() {
return require('@babel/plugin-transform-modules-commonjs')
}
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 = {
codeFrame,
core,
pluginProposalClassProperties,
pluginProposalExportNamespaceFrom,
pluginProposalNumericSeparator,
pluginProposalObjectRestSpread,
pluginSyntaxBigint,
pluginSyntaxDynamicImport,
pluginSyntaxJsx,
pluginTransformModulesCommonjs,
pluginTransformRuntime,
presetEnv,
presetReact,
presetTypescript,
}
module.exports = require('./bundle').codeFrame()
module.exports = require('./bundle').core()
module.exports = require('./bundle').pluginProposalClassProperties()
module.exports = require('./bundle').pluginProposalExportNamespaceFrom()
module.exports = require('./bundle').pluginProposalNumericSeparator()
module.exports = require('./bundle').pluginProposalObjectRestSpread()
module.exports = require('./bundle').pluginSyntaxBigint()
module.exports = require('./bundle').pluginSyntaxDynamicImport()
module.exports = require('./bundle').pluginSyntaxJsx()
module.exports = require('./bundle').pluginTransformModulesCommonjs()
module.exports = require('./bundle').pluginTransformRuntime()
module.exports = require('./bundle').presetEnv()
module.exports = require('./bundle').presetReact()
module.exports = require('./bundle').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.
This diff is collapsed.
module.exports = require('./bundle').codeFrame()
module.exports = require('./bundle').core()
{"name":"@babel/core","main":"bundle.js","author":"Sebastian McKenzie <sebmck@gmail.com>","license":"MIT"}
module.exports = require('./bundle').pluginProposalClassProperties()
module.exports = require('./bundle').pluginProposalExportNamespaceFrom()
module.exports = require('./bundle').pluginProposalNumericSeparator()
module.exports = require('./bundle').pluginProposalObjectRestSpread()
module.exports = require('./bundle').pluginSyntaxBigint()
module.exports = require('./bundle').pluginSyntaxDynamicImport()
module.exports = require('./bundle').pluginSyntaxJsx()
module.exports = require('./bundle').pluginTransformModulesCommonjs()
module.exports = require('./bundle').pluginTransformRuntime()
module.exports = require('./bundle').presetEnv()
module.exports = require('./bundle').presetReact()
module.exports = require('./bundle').presetTypescript()
This diff is collapsed.
This diff is collapsed.
This source diff could not be displayed because it is too large. You can view the blob instead.
import { codeFrameColumns } from 'next/dist/compiled/babel/code-frame'
import { codeFrameColumns } from '@babel/code-frame'
import chalk from 'next/dist/compiled/chalk'
import path from 'path'
......
......@@ -61,7 +61,22 @@
},
"dependencies": {
"@ampproject/toolbox-optimizer": "2.7.0-alpha.1",
"@babel/runtime": "7.12.5",
"@babel/code-frame": "7.10.4",
"@babel/core": "7.7.7",
"@babel/plugin-proposal-class-properties": "7.10.4",
"@babel/plugin-proposal-export-namespace-from": "7.10.4",
"@babel/plugin-proposal-numeric-separator": "7.10.4",
"@babel/plugin-proposal-object-rest-spread": "7.11.0",
"@babel/plugin-syntax-bigint": "7.8.3",
"@babel/plugin-syntax-dynamic-import": "7.8.3",
"@babel/plugin-syntax-jsx": "7.10.4",
"@babel/plugin-transform-modules-commonjs": "7.10.4",
"@babel/plugin-transform-runtime": "7.11.5",
"@babel/preset-env": "7.11.5",
"@babel/preset-react": "7.10.4",
"@babel/preset-typescript": "7.10.4",
"@babel/runtime": "7.11.2",
"@babel/types": "7.11.5",
"@hapi/accept": "5.0.1",
"@next/env": "10.0.2-canary.2",
"@next/polyfill-module": "10.0.2-canary.2",
......@@ -109,21 +124,6 @@
"sharp": "0.26.2"
},
"devDependencies": {
"@babel/code-frame": "7.10.4",
"@babel/core": "7.12.3",
"@babel/plugin-proposal-class-properties": "7.12.1",
"@babel/plugin-proposal-export-namespace-from": "7.12.1",
"@babel/plugin-proposal-numeric-separator": "7.12.5",
"@babel/plugin-proposal-object-rest-spread": "7.12.1",
"@babel/plugin-syntax-bigint": "7.8.3",
"@babel/plugin-syntax-dynamic-import": "7.8.3",
"@babel/plugin-syntax-jsx": "7.12.1",
"@babel/plugin-transform-modules-commonjs": "7.12.1",
"@babel/plugin-transform-runtime": "7.12.1",
"@babel/preset-env": "7.12.1",
"@babel/preset-react": "7.12.5",
"@babel/preset-typescript": "7.12.1",
"@babel/types": "7.12.6",
"@next/polyfill-nomodule": "10.0.2-canary.2",
"@taskr/clear": "1.1.0",
"@taskr/esnext": "1.1.0",
......@@ -160,7 +160,7 @@
"@types/styled-jsx": "2.2.8",
"@types/text-table": "0.2.1",
"@types/webpack-sources": "0.1.5",
"@vercel/ncc": "0.24.1",
"@zeit/ncc": "0.22.0",
"amphtml-validator": "1.0.33",
"arg": "4.1.0",
"ast-types": "0.13.2",
......
......@@ -2,8 +2,6 @@
// https://github.com/lukeed/taskr/pull/305
const path = require('path')
// eslint-disable-next-line import/no-extraneous-dependencies
const transform = require('@babel/core').transform
const babelClientOpts = {
......@@ -37,7 +35,6 @@ const babelClientOpts = {
overrides: [
{
test: /\.tsx?$/,
// eslint-disable-next-line import/no-extraneous-dependencies
plugins: [require('@babel/plugin-proposal-numeric-separator').default],
},
],
......@@ -71,7 +68,6 @@ const babelServerOpts = {
overrides: [
{
test: /\.tsx?$/,
// eslint-disable-next-line import/no-extraneous-dependencies
plugins: [require('@babel/plugin-proposal-numeric-separator').default],
},
],
......
......@@ -39,12 +39,7 @@ module.exports = function (task) {
})
if (options && options.packageName) {
writePackageManifest.call(
this,
options.packageName,
file.base,
options.bundleName
)
writePackageManifest.call(this, options.packageName, file.base)
}
file.data = Buffer.from(code, 'utf8')
......@@ -55,14 +50,11 @@ module.exports = function (task) {
// This function writes a minimal `package.json` file for a compiled package.
// It defines `name`, `main`, `author`, and `license`. It also defines `types`.
// n.b. types intended for development usage only.
function writePackageManifest(packageName, main, bundleName) {
function writePackageManifest(packageName, main) {
const packagePath = require.resolve(packageName + '/package.json')
let { name, author, license } = require(packagePath)
const compiledPackagePath = join(
__dirname,
`compiled/${bundleName || packageName}`
)
const compiledPackagePath = join(__dirname, `compiled/${packageName}`)
const potentialLicensePath = join(dirname(packagePath), './LICENSE')
if (existsSync(potentialLicensePath)) {
......
......@@ -22,6 +22,9 @@ export async function browser_polyfills(task) {
}
const externals = {
// Babel
'@babel/core': '@babel/core',
// Browserslist (post-css plugins)
browserslist: 'browserslist',
'caniuse-lite': 'caniuse-lite',
......@@ -80,54 +83,6 @@ export async function ncc_async_sema(task, opts) {
.target('compiled/async-sema')
}
// eslint-disable-next-line camelcase
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',
'@babel/core': 'next/dist/compiled/babel/core',
'@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',
}
Object.assign(externals, babelBundlePackages)
export async function ncc_babel_bundle_packages(task, opts) {
await task
.source(opts.src || 'bundles/babel/packages/*')
.target('compiled/babel/')
}
// eslint-disable-next-line camelcase
externals['babel-loader'] = 'next/dist/compiled/babel-loader'
export async function ncc_babel_loader(task, opts) {
......@@ -581,8 +536,6 @@ export async function ncc(task) {
'ncc_arg',
'ncc_async_retry',
'ncc_async_sema',
'ncc_babel_bundle',
'ncc_babel_bundle_packages',
'ncc_babel_loader',
'ncc_cacache',
'ncc_cache_loader',
......
......@@ -37,7 +37,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,
......
/* eslint-disable import/no-extraneous-dependencies */
declare module 'next/dist/compiled/babel/plugin-transform-modules-commonjs'
declare module 'next/dist/compiled/babel/plugin-syntax-jsx'
declare module '@babel/plugin-transform-modules-commonjs'
declare module '@babel/plugin-syntax-jsx'
declare module 'browserslist'
declare module 'cssnano-simple' {
import { OldPlugin } from 'postcss'
......@@ -49,15 +49,6 @@ declare module 'next/dist/compiled/arg/index.js' {
export = arg
}
declare module 'next/dist/compiled/babel/code-frame' {
export * from '@babel/code-frame'
}
declare module 'next/dist/compiled/babel/preset-env' {
export default any
}
declare module 'next/dist/compiled/babel/core' {
export * from '@babel/core'
}
declare module 'next/dist/compiled/chalk' {
import m from 'chalk'
export = m
......
......@@ -108,7 +108,7 @@ describe('Build Output', () => {
expect(sharedByAll.endsWith('kB')).toBe(true)
if (_appSize.endsWith('kB')) {
expect(parseFloat(_appSize)).toBeLessThanOrEqual(1.01)
expect(parseFloat(_appSize)).toBe(1)
expect(_appSize.endsWith('kB')).toBe(true)
} else {
expect(parseFloat(_appSize) - 1000).toBeLessThanOrEqual(0)
......
This source diff could not be displayed because it is too large. You can view the blob instead.
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