yarn dev regression fix, ncc revert (vercel#18861)

This fixes the current regression with an ncc revert for now. I will continue to follow up with the ncc upgrade in vercel#18860.
vicasas · Nov 6, 2020 · 4dbb65d · 4dbb65d
1 parent 8799bd2
commit 4dbb65d
Show file tree

Hide file tree

Showing 62 changed files with 1,031 additions and 2,969 deletions.
diff --git a/package.json b/package.json
@@ -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",

diff --git a/packages/create-next-app/package.json b/packages/create-next-app/package.json
@@ -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",

diff --git a/packages/next/build/babel/plugins/amp-attributes.ts b/packages/next/build/babel/plugins/amp-attributes.ts
@@ -1,4 +1,4 @@
-import { NodePath, PluginObj, types } from 'next/dist/compiled/babel/core'
+import { NodePath, PluginObj, types } from '@babel/core'
 
 export default function AmpAttributePatcher(): PluginObj {
   return {

diff --git a/packages/next/build/babel/plugins/commonjs.ts b/packages/next/build/babel/plugins/commonjs.ts
@@ -1,5 +1,5 @@
-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 {

diff --git a/packages/next/build/babel/plugins/jsx-pragma.ts b/packages/next/build/babel/plugins/jsx-pragma.ts
@@ -1,9 +1,5 @@
-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,

diff --git a/packages/next/build/babel/plugins/next-data.ts b/packages/next/build/babel/plugins/next-data.ts
@@ -1,8 +1,4 @@
-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,

diff --git a/packages/next/build/babel/plugins/next-page-config.ts b/packages/next/build/babel/plugins/next-page-config.ts
@@ -1,8 +1,4 @@
-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(

diff --git a/packages/next/build/babel/plugins/next-page-disallow-re-export-all-exports.ts b/packages/next/build/babel/plugins/next-page-disallow-re-export-all-exports.ts
@@ -1,4 +1,4 @@
-import { NodePath, PluginObj, types } from 'next/dist/compiled/babel/core'
+import { NodePath, PluginObj, types } from '@babel/core'
 
 export default function NextPageDisallowReExportAllExports(): PluginObj<any> {
   return {

diff --git a/packages/next/build/babel/plugins/next-ssg-transform.ts b/packages/next/build/babel/plugins/next-ssg-transform.ts
@@ -1,8 +1,4 @@
-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,

diff --git a/packages/next/build/babel/plugins/no-anonymous-default-export.ts b/packages/next/build/babel/plugins/no-anonymous-default-export.ts
@@ -1,4 +1,4 @@
-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({

diff --git a/packages/next/build/babel/plugins/optimize-hook-destructuring.ts b/packages/next/build/babel/plugins/optimize-hook-destructuring.ts
@@ -1,8 +1,4 @@
-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]/

diff --git a/packages/next/build/babel/plugins/react-loadable-plugin.ts b/packages/next/build/babel/plugins/react-loadable-plugin.ts
@@ -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,

diff --git 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'
@@ -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),
   }
 }
diff --git a/packages/next/build/webpack-config.ts b/packages/next/build/webpack-config.ts
@@ -1,4 +1,4 @@
-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'

diff --git a/packages/next/build/webpack/loaders/next-babel-loader.js b/packages/next/build/webpack/loaders/next-babel-loader.js
@@ -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' }
   )
 

diff --git a/packages/next/build/webpack/plugins/next-esm-plugin.ts b/packages/next/build/webpack/plugins/next-esm-plugin.ts
@@ -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,

diff --git a/packages/next/build/webpack/plugins/wellknown-errors-plugin/parseScss.ts b/packages/next/build/webpack/plugins/wellknown-errors-plugin/parseScss.ts
@@ -1,4 +1,4 @@
-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'
 

diff --git a/packages/next/bundles/babel/bundle.js b/packages/next/bundles/babel/bundle.js
diff --git a/packages/next/bundles/babel/packages/code-frame.js b/packages/next/bundles/babel/packages/code-frame.js
diff --git a/packages/next/bundles/babel/packages/core.js b/packages/next/bundles/babel/packages/core.js
diff --git a/packages/next/bundles/babel/packages/plugin-proposal-class-properties.js b/packages/next/bundles/babel/packages/plugin-proposal-class-properties.js
diff --git a/packages/next/bundles/babel/packages/plugin-proposal-export-namespace-from.js b/packages/next/bundles/babel/packages/plugin-proposal-export-namespace-from.js
diff --git a/packages/next/bundles/babel/packages/plugin-proposal-numeric-separator.js b/packages/next/bundles/babel/packages/plugin-proposal-numeric-separator.js
diff --git a/packages/next/bundles/babel/packages/plugin-proposal-object-rest-spread.js b/packages/next/bundles/babel/packages/plugin-proposal-object-rest-spread.js
diff --git a/packages/next/bundles/babel/packages/plugin-syntax-bigint.js b/packages/next/bundles/babel/packages/plugin-syntax-bigint.js
diff --git a/packages/next/bundles/babel/packages/plugin-syntax-dynamic-import.js b/packages/next/bundles/babel/packages/plugin-syntax-dynamic-import.js
diff --git a/packages/next/bundles/babel/packages/plugin-syntax-jsx.js b/packages/next/bundles/babel/packages/plugin-syntax-jsx.js
diff --git a/packages/next/bundles/babel/packages/plugin-transform-modules-commonjs.js b/packages/next/bundles/babel/packages/plugin-transform-modules-commonjs.js
diff --git a/packages/next/bundles/babel/packages/plugin-transform-runtime.js b/packages/next/bundles/babel/packages/plugin-transform-runtime.js
diff --git a/packages/next/bundles/babel/packages/preset-env.js b/packages/next/bundles/babel/packages/preset-env.js
diff --git a/packages/next/bundles/babel/packages/preset-react.js b/packages/next/bundles/babel/packages/preset-react.js
diff --git a/packages/next/bundles/babel/packages/preset-typescript.js b/packages/next/bundles/babel/packages/preset-typescript.js