Merge branch 'canary' into add-gitignores

vercel · Aug 12, 2021 · 7aa78e6 · 7aa78e6
2 parents 68a5482 + b641140
commit 7aa78e6
Show file tree

Hide file tree

Showing 23 changed files with 47 additions and 26 deletions.
diff --git a/.github/workflows/build_test_deploy.yml b/.github/workflows/build_test_deploy.yml
@@ -265,6 +265,7 @@ jobs:
         with:
           name: next-swc-binaries
           path: packages/next/build/swc/dist
+      - run: echo "//registry.npmjs.org/:_authToken=$NPM_TOKEN" >> ~/.npmrc
       - run: ./scripts/publish-native.js $GITHUB_REF
       - run: ./scripts/publish-release.sh
 

diff --git a/examples/with-fauna/package.json b/examples/with-fauna/package.json
@@ -1,4 +1,5 @@
 {
+  "private": true,
   "name": "with-fauna",
   "version": "1.0.0",
   "license": "MIT",

diff --git a/lerna.json b/lerna.json
@@ -17,5 +17,5 @@
       "registry": "https://registry.npmjs.org/"
     }
   },
-  "version": "11.1.1-canary.0"
+  "version": "11.1.1-canary.3"
 }
diff --git a/packages/create-next-app/package.json b/packages/create-next-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "create-next-app",
-  "version": "11.1.1-canary.0",
+  "version": "11.1.1-canary.3",
   "keywords": [
     "react",
     "next",

diff --git a/packages/eslint-config-next/package.json b/packages/eslint-config-next/package.json
@@ -1,6 +1,6 @@
 {
   "name": "eslint-config-next",
-  "version": "11.1.1-canary.0",
+  "version": "11.1.1-canary.3",
   "description": "ESLint configuration used by NextJS.",
   "main": "index.js",
   "license": "MIT",
@@ -9,7 +9,7 @@
     "directory": "packages/eslint-config-next"
   },
   "dependencies": {
-    "@next/eslint-plugin-next": "11.1.1-canary.0",
+    "@next/eslint-plugin-next": "11.1.1-canary.3",
     "@rushstack/eslint-patch": "^1.0.6",
     "@typescript-eslint/parser": "^4.20.0",
     "eslint-import-resolver-node": "^0.3.4",

diff --git a/packages/eslint-plugin-next/package.json b/packages/eslint-plugin-next/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/eslint-plugin-next",
-  "version": "11.1.1-canary.0",
+  "version": "11.1.1-canary.3",
   "description": "ESLint plugin for NextJS.",
   "main": "lib/index.js",
   "license": "MIT",

diff --git a/packages/next-bundle-analyzer/package.json b/packages/next-bundle-analyzer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/bundle-analyzer",
-  "version": "11.1.1-canary.0",
+  "version": "11.1.1-canary.3",
   "main": "index.js",
   "license": "MIT",
   "repository": {

diff --git a/packages/next-codemod/package.json b/packages/next-codemod/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/codemod",
-  "version": "11.1.1-canary.0",
+  "version": "11.1.1-canary.3",
   "license": "MIT",
   "dependencies": {
     "chalk": "4.1.0",

diff --git a/packages/next-env/package.json b/packages/next-env/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/env",
-  "version": "11.1.1-canary.0",
+  "version": "11.1.1-canary.3",
   "keywords": [
     "react",
     "next",

diff --git a/packages/next-mdx/package.json b/packages/next-mdx/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/mdx",
-  "version": "11.1.1-canary.0",
+  "version": "11.1.1-canary.3",
   "main": "index.js",
   "license": "MIT",
   "repository": {

diff --git a/packages/next-plugin-storybook/package.json b/packages/next-plugin-storybook/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/plugin-storybook",
-  "version": "11.1.1-canary.0",
+  "version": "11.1.1-canary.3",
   "repository": {
     "url": "vercel/next.js",
     "directory": "packages/next-plugin-storybook"

diff --git a/packages/next-polyfill-module/package.json b/packages/next-polyfill-module/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/polyfill-module",
-  "version": "11.1.1-canary.0",
+  "version": "11.1.1-canary.3",
   "description": "A standard library polyfill for ES Modules supporting browsers (Edge 16+, Firefox 60+, Chrome 61+, Safari 10.1+)",
   "main": "dist/polyfill-module.js",
   "license": "MIT",

diff --git a/packages/next-polyfill-nomodule/package.json b/packages/next-polyfill-nomodule/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/polyfill-nomodule",
-  "version": "11.1.1-canary.0",
+  "version": "11.1.1-canary.3",
   "description": "A polyfill for non-dead, nomodule browsers.",
   "main": "dist/polyfill-nomodule.js",
   "license": "MIT",

diff --git a/packages/next/build/babel/loader/get-config.ts b/packages/next/build/babel/loader/get-config.ts
@@ -302,6 +302,7 @@ function getCacheKey(cacheCharacteristics: CharacteristicsGermaneToCaching) {
 
 type BabelConfig = any
 const configCache: Map<any, BabelConfig> = new Map()
+const configFiles: Set<string> = new Set()
 
 export default function getConfig(
   this: NextJsLoaderContext,
@@ -346,7 +347,8 @@ export default function getConfig(
     }
   }
 
-  if (loaderOptions.configFile) {
+  if (loaderOptions.configFile && !configFiles.has(loaderOptions.configFile)) {
+    configFiles.add(loaderOptions.configFile)
     Log.info(
       `Using external babel configuration from ${loaderOptions.configFile}`
     )

diff --git a/packages/next/build/entries.ts b/packages/next/build/entries.ts
@@ -91,7 +91,7 @@ export function createEntrypoints(
     buildId,
     assetPrefix: config.assetPrefix,
     generateEtags: config.generateEtags ? 'true' : '',
-    poweredByHeader: config.poweredByHeader,
+    poweredByHeader: config.poweredByHeader ? 'true' : '',
     canonicalBase: config.amp.canonicalBase || '',
     basePath: config.basePath,
     runtimeConfig: hasRuntimeConfig

diff --git a/packages/next/package.json b/packages/next/package.json
@@ -1,6 +1,6 @@
 {
   "name": "next",
-  "version": "11.1.1-canary.0",
+  "version": "11.1.1-canary.3",
   "description": "The React Framework",
   "main": "./dist/server/next.js",
   "license": "MIT",
@@ -65,10 +65,10 @@
   "dependencies": {
     "@babel/runtime": "7.12.5",
     "@hapi/accept": "5.0.2",
-    "@next/env": "11.1.1-canary.0",
-    "@next/polyfill-module": "11.1.1-canary.0",
-    "@next/react-dev-overlay": "11.1.1-canary.0",
-    "@next/react-refresh-utils": "11.1.1-canary.0",
+    "@next/env": "11.1.1-canary.3",
+    "@next/polyfill-module": "11.1.1-canary.3",
+    "@next/react-dev-overlay": "11.1.1-canary.3",
+    "@next/react-refresh-utils": "11.1.1-canary.3",
     "@node-rs/helper": "1.2.1",
     "assert": "2.0.0",
     "ast-types": "0.13.2",
@@ -153,7 +153,7 @@
     "@babel/traverse": "^7.12.10",
     "@babel/types": "7.12.12",
     "@napi-rs/cli": "1.1.0",
-    "@next/polyfill-nomodule": "11.1.1-canary.0",
+    "@next/polyfill-nomodule": "11.1.1-canary.3",
     "@taskr/clear": "1.1.0",
     "@taskr/esnext": "1.1.0",
     "@taskr/watch": "1.1.0",

diff --git a/packages/next/server/config-shared.ts b/packages/next/server/config-shared.ts
@@ -48,6 +48,22 @@ export type NextConfig = { [key: string]: any } & {
   webpack5?: false
   excludeDefaultMomentLocales?: boolean
 
+  webpack?:
+    | ((
+        config: any,
+        context: {
+          dir: string
+          dev: boolean
+          isServer: boolean
+          buildId: string
+          config: NextConfigComplete
+          defaultLoaders: { babel: any }
+          totalPages: number
+          webpack: any
+        }
+      ) => any)
+    | null
+
   trailingSlash?: boolean
   env?: { [key: string]: string }
   distDir?: string
@@ -58,6 +74,7 @@ export type NextConfig = { [key: string]: any } & {
   generateEtags?: boolean
   pageExtensions?: string[]
   compress?: boolean
+  poweredByHeader?: boolean
   images?: ImageConfig
   devIndicators?: {
     buildActivity?: boolean

diff --git a/packages/react-dev-overlay/package.json b/packages/react-dev-overlay/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/react-dev-overlay",
-  "version": "11.1.1-canary.0",
+  "version": "11.1.1-canary.3",
   "description": "A development-only overlay for developing React applications.",
   "repository": {
     "url": "vercel/next.js",

diff --git a/packages/react-refresh-utils/package.json b/packages/react-refresh-utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/react-refresh-utils",
-  "version": "11.1.1-canary.0",
+  "version": "11.1.1-canary.3",
   "description": "An experimental package providing utilities for React Refresh.",
   "repository": {
     "url": "vercel/next.js",

diff --git a/scripts/check-examples.sh b/scripts/check-examples.sh
@@ -3,7 +3,7 @@
 for folder in examples/* ; do
   if [ -f "$folder/package.json" ]; then
     cp -n packages/create-next-app/templates/default/gitignore $folder/.gitignore;
-    cat $folder/package.json | jq '.license = "MIT"' | sponge $folder/package.json
+    cat $folder/package.json | jq '.license = "MIT" | .private = true' | sponge $folder/package.json
   fi
 done;
 

diff --git a/scripts/publish-native.js b/scripts/publish-native.js
@@ -37,7 +37,7 @@ const cwd = process.cwd()
       )
       execSync(
         `npm publish ${path.join(nativePackagesDir, nativePackage)}${
-          gitref.contains('canary') ? ' --tag canary' : ''
+          gitref.includes('canary') ? ' --tag canary' : ''
         }`
       )
       // lerna publish in next step will fail if git status is not clean

diff --git a/scripts/publish-release.sh b/scripts/publish-release.sh
@@ -12,8 +12,6 @@ if [[ -z "$NPM_TOKEN" ]];then
   exit 0;
 fi
 
-echo "//registry.npmjs.org/:_authToken=$NPM_TOKEN" >> ~/.npmrc
-
 if [[ $(git describe --exact-match 2> /dev/null || :) =~ -canary ]];
 then
   echo "Publishing canary"

diff --git a/test/integration/basic/test/index.test.js b/test/integration/basic/test/index.test.js
@@ -10,6 +10,7 @@ import dynamic from './dynamic'
 import processEnv from './process-env'
 import publicFolder from './public-folder'
 import security from './security'
+import developmentLogs from './development-logs'
 
 const context = {}
 jest.setTimeout(1000 * 60 * 5)
@@ -29,4 +30,5 @@ describe('Basic Features', () => {
   processEnv(context)
   publicFolder(context)
   security(context)
+  developmentLogs(context)
 })