Unverified Commit d031cf64 authored by Joe Haddad's avatar Joe Haddad Committed by GitHub

Ensure requests are resolved as directories (#8742)

* Ensure requests are resolved as directories
`resolveRequest` will strip down to baseDir if there's no trailing slash as it assumes you passed a file.

* Disable telemetry for PR Stats
parent cbd427bf
...@@ -319,7 +319,7 @@ export default async function getBaseWebpackConfig( ...@@ -319,7 +319,7 @@ export default async function getBaseWebpackConfig(
// exist. // exist.
let res let res
try { try {
res = resolveRequest(request, context) res = resolveRequest(request, `${context}/`)
} catch (err) { } catch (err) {
// This is a special case for the Next.js data experiment. This // This is a special case for the Next.js data experiment. This
// will be removed in the future. // will be removed in the future.
...@@ -354,7 +354,7 @@ export default async function getBaseWebpackConfig( ...@@ -354,7 +354,7 @@ export default async function getBaseWebpackConfig(
// we need to bundle the code (even if it _should_ be external). // we need to bundle the code (even if it _should_ be external).
let baseRes let baseRes
try { try {
baseRes = resolveRequest(request, dir) baseRes = resolveRequest(request, `${dir}/`)
} catch (err) {} } catch (err) {}
// Same as above: if the package, when required from the root, // Same as above: if the package, when required from the root,
......
...@@ -75,8 +75,8 @@ const renames = [ ...@@ -75,8 +75,8 @@ const renames = [
module.exports = { module.exports = {
commentHeading: 'Stats from current PR', commentHeading: 'Stats from current PR',
commentReleaseHeading: 'Stats from current release', commentReleaseHeading: 'Stats from current release',
appBuildCommand: 'yarn next build', appBuildCommand: 'NEXT_TELEMETRY_DISABLED=1 yarn next build',
appStartCommand: 'yarn next start --port $PORT', appStartCommand: 'NEXT_TELEMETRY_DISABLED=1 yarn next start --port $PORT',
mainRepo: 'zeit/next.js', mainRepo: 'zeit/next.js',
mainBranch: 'canary', mainBranch: 'canary',
autoMergeMain: true, autoMergeMain: true,
......
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