Merge branch 'canary' into fix-unicode-and-url-encoding

vercel · Aug 12, 2021 · a9ed1e3 · a9ed1e3
2 parents 146565c + 1552b83
commit a9ed1e3
Show file tree

Hide file tree

Showing 6 changed files with 105 additions and 3 deletions.
diff --git a/examples/with-clerk/.gitignore b/examples/with-clerk/.gitignore
@@ -0,0 +1,34 @@
+# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
+
+# dependencies
+/node_modules
+/.pnp
+.pnp.js
+
+# testing
+/coverage
+
+# next.js
+/.next/
+/out/
+
+# production
+/build
+
+# misc
+.DS_Store
+*.pem
+
+# debug
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+
+# local env files
+.env.local
+.env.development.local
+.env.test.local
+.env.production.local
+
+# vercel
+.vercel
diff --git a/examples/with-deta-base/.gitignore b/examples/with-deta-base/.gitignore
@@ -0,0 +1,34 @@
+# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
+
+# dependencies
+/node_modules
+/.pnp
+.pnp.js
+
+# testing
+/coverage
+
+# next.js
+/.next/
+/out/
+
+# production
+/build
+
+# misc
+.DS_Store
+*.pem
+
+# debug
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+
+# local env files
+.env.local
+.env.development.local
+.env.test.local
+.env.production.local
+
+# vercel
+.vercel
diff --git a/examples/with-mqtt-js/.gitignore b/examples/with-mqtt-js/.gitignore
@@ -0,0 +1,34 @@
+# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
+
+# dependencies
+/node_modules
+/.pnp
+.pnp.js
+
+# testing
+/coverage
+
+# next.js
+/.next/
+/out/
+
+# production
+/build
+
+# misc
+.DS_Store
+*.pem
+
+# debug
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+
+# local env files
+.env.local
+.env.development.local
+.env.test.local
+.env.production.local
+
+# vercel
+.vercel
diff --git a/packages/next/build/generate-build-id.ts b/packages/next/build/generate-build-id.ts
@@ -1,5 +1,5 @@
 export async function generateBuildId(
-  generate: () => string | null,
+  generate: () => string | null | Promise<string | null>,
   fallback: () => string
 ): Promise<string> {
   let buildId = await generate()

diff --git a/packages/next/server/config-shared.ts b/packages/next/server/config-shared.ts
@@ -70,7 +70,7 @@ export type NextConfig = { [key: string]: any } & {
   cleanDistDir?: boolean
   assetPrefix?: string
   useFileSystemPublicRoutes?: boolean
-  generateBuildId?: () => string | null
+  generateBuildId?: () => string | null | Promise<string | null>
   generateEtags?: boolean
   pageExtensions?: string[]
   compress?: boolean

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