mirror of
https://github.com/terribleplan/next.js.git
synced 2024-01-19 02:48:18 +00:00
c74ad93e14
This fixes a missed bug introduced in #4510. Because the regexp was `/-[^-]*/` and not `/-[^-]*$/`, a wrong part of the filename was being removed: ``` bad: 'foo-bar-0123456789abcdef-0123456789abcdef.js' -> 'foo-0123456789abcdef-0123456789abcdef.js' good: 'foo-bar-0123456789abcdef-0123456789abcdef.js' -> 'foo-bar-0123456789abcdef' ``` By a stroke of luck this didn't affect the existing dynamically generated chunks. To prevent regression I've added unit tests for the function that generates the name. Btw. in the original issue (#4433) I used the right regexp, I just used the wrong regexp in #4510. cc @timneutkens
61 lines
1.5 KiB
JavaScript
61 lines
1.5 KiB
JavaScript
import { join } from 'path'
|
|
import { readdirSync, existsSync } from 'fs'
|
|
|
|
export const IS_BUNDLED_PAGE = /^bundles[/\\]pages.*\.js$/
|
|
export const MATCH_ROUTE_NAME = /^bundles[/\\]pages[/\\](.*)\.js$/
|
|
|
|
export function getChunkNameFromFilename (filename) {
|
|
return filename.replace(/-[^-]*$/, '')
|
|
}
|
|
|
|
export function getAvailableChunks (distDir) {
|
|
const chunksDir = join(distDir, 'chunks')
|
|
if (!existsSync(chunksDir)) return {}
|
|
|
|
const chunksMap = {}
|
|
const chunkFiles = readdirSync(chunksDir)
|
|
|
|
chunkFiles.forEach(filename => {
|
|
if (/\.js$/.test(filename)) {
|
|
const chunkName = getChunkNameFromFilename(filename)
|
|
chunksMap[chunkName] = filename
|
|
}
|
|
})
|
|
|
|
return chunksMap
|
|
}
|
|
|
|
const internalPrefixes = [
|
|
/^\/_next\//,
|
|
/^\/static\//
|
|
]
|
|
|
|
export function isInternalUrl (url) {
|
|
for (const prefix of internalPrefixes) {
|
|
if (prefix.test(url)) {
|
|
return true
|
|
}
|
|
}
|
|
|
|
return false
|
|
}
|
|
|
|
export function addCorsSupport (req, res) {
|
|
if (!req.headers.origin) {
|
|
return { preflight: false }
|
|
}
|
|
|
|
res.setHeader('Access-Control-Allow-Origin', req.headers.origin)
|
|
res.setHeader('Access-Control-Allow-Methods', 'OPTIONS, GET')
|
|
// Based on https://github.com/primus/access-control/blob/4cf1bc0e54b086c91e6aa44fb14966fa5ef7549c/index.js#L158
|
|
res.setHeader('Access-Control-Allow-Headers', req.headers['access-control-request-headers'])
|
|
|
|
if (req.method === 'OPTIONS') {
|
|
res.writeHead(200)
|
|
res.end()
|
|
return { preflight: true }
|
|
}
|
|
|
|
return { preflight: false }
|
|
}
|