Merge branch 'canary' into fix/404-cache-control

Author: ijjk

.github/workflows/build_test_deploy.yml

@@ -55,7 +55,7 @@ jobs:
         with:
           path: ./*
           key: ${{ github.sha }}
-      - run: ./check-pre-compiled.sh
+      - run: ./scripts/check-pre-compiled.sh
         if: ${{needs.build.outputs.docsChange != 'docs only change'}}
 
   testUnit:
@@ -146,7 +146,7 @@ jobs:
           path: ./*
           key: ${{ github.sha }}
 
-      - run: bash ./test-pnp.sh
+      - run: bash ./scripts/test-pnp.sh
         if: ${{needs.build.outputs.docsChange != 'docs only change'}}
 
   testsPass:
@@ -251,7 +251,7 @@ jobs:
           path: ./*
           key: ${{ github.sha }}
 
-      - run: ./publish-release.sh
+      - run: ./scripts/publish-release.sh
 
   prStats:
     name: Release Stats
@@ -263,7 +263,7 @@ jobs:
         with:
           path: ./*
           key: ${{ github.sha }}
-      - run: ./release-stats.sh
+      - run: ./scripts/release-stats.sh
       - uses: ./.github/actions/next-stats-action
         env:
           PR_STATS_COMMENT_TOKEN: ${{ secrets.PR_STATS_COMMENT_TOKEN }}

package.json

@@ -34,6 +34,7 @@
     "publish-canary": "lerna version prerelease --preid canary --force-publish && release --pre --skip-questions",
     "publish-stable": "lerna version --force-publish",
     "lint-staged": "lint-staged",
+    "next-with-deps": "./scripts/next-with-deps.sh",
     "next": "node --trace-deprecation --enable-source-maps packages/next/dist/bin/next",
     "debug": "node --inspect packages/next/dist/bin/next"
   },

packages/next/client/index.tsx

@@ -462,6 +462,14 @@ export function renderError(renderErrorProps: RenderErrorProps): Promise<any> {
   return pageLoader
     .loadPage('/_error')
     .then(({ page: ErrorComponent, styleSheets }) => {
+      return lastAppProps?.Component === ErrorComponent
+        ? import('../pages/_error').then((m) => ({
+            ErrorComponent: m.default as React.ComponentType<{}>,
+            styleSheets: [],
+          }))
+        : { ErrorComponent, styleSheets }
+    })
+    .then(({ ErrorComponent, styleSheets }) => {
       // In production we do a normal render with the `ErrorComponent` as component.
       // If we've gotten here upon initial render, we can use the props from the server.
       // Otherwise, we need to call `getInitialProps` on `App` before mounting.

packages/next/taskfile-babel.js

@@ -6,26 +6,26 @@ const path = require('path')
 // eslint-disable-next-line import/no-extraneous-dependencies
 const transform = require('@babel/core').transform
 
+const babelClientPresetEnvOptions = {
+  modules: 'commonjs',
+  targets: {
+    esmodules: true,
+  },
+  bugfixes: true,
+  loose: true,
+  // This is handled by the Next.js webpack config that will run next/babel over the same code.
+  exclude: [
+    'transform-typeof-symbol',
+    'transform-async-to-generator',
+    'transform-spread',
+    'proposal-dynamic-import',
+  ],
+}
+
 const babelClientOpts = {
   presets: [
     '@babel/preset-typescript',
-    [
-      '@babel/preset-env',
-      {
-        modules: 'commonjs',
-        targets: {
-          esmodules: true,
-        },
-        bugfixes: true,
-        loose: true,
-        // This is handled by the Next.js webpack config that will run next/babel over the same code.
-        exclude: [
-          'transform-typeof-symbol',
-          'transform-async-to-generator',
-          'transform-spread',
-        ],
-      },
-    ],
+    ['@babel/preset-env', babelClientPresetEnvOptions],
     ['@babel/preset-react', { useBuiltIns: true }],
   ],
   plugins: [

check-examples.sh renamed to scripts/check-examples.sh

@@ -1,7 +1,5 @@
 #!/bin/bash
 
-cd `dirname $0`
-
 for folder in examples/* ; do
   cp -n packages/create-next-app/templates/default/gitignore $folder/.gitignore;
   if [ -f "$folder/package.json" ]; then

check-pre-compiled.sh renamed to scripts/check-pre-compiled.sh

@@ -0,0 +1,39 @@
+#!/bin/bash
+
+START_DIR=$PWD
+# gets last argument which should be the project dir
+for PROJECT_DIR in $@;do :;done
+
+if [ -z $PROJECT_DIR ];then
+  echo "No project directory provided, exiting..."
+  exit 1;
+fi;
+
+if [ ! -d $PROJECT_DIR ];then
+  echo "Invalid project directory provided, exiting..."
+  exit 1;
+fi;
+
+if [ $PROJECT_DIR == $PWD ] || [ "$PROJECT_DIR" == "." ];then
+  echo "Project directory can not be root, exiting..."
+  exit 1;
+fi;
+
+CONFLICTING_DEPS=("react" "react-dom" "styled-jsx" "next")
+
+for dep in ${CONFLICTING_DEPS[@]};do 
+  if [ -d "$PROJECT_DIR/node_modules/$dep" ];then
+    HAS_CONFLICTING_DEP="yup"
+  fi;
+done
+
+if [ ! -z $HAS_CONFLICTING_DEP ] || [ ! -d "$PROJECT_DIR/node_modules" ];then
+  cd $PROJECT_DIR
+  yarn install
+  for dep in ${CONFLICTING_DEPS[@]};do 
+    rm -rf node_modules/$dep
+  done
+fi
+
+cd $START_DIR
+yarn next $@