Skip to content

fix: check type before using string-only method #2393

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Dec 8, 2023
Merged

fix: check type before using string-only method #2393

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
466ae14
Update handlerUtils.ts
pieh Dec 8, 2023
af903f2
Create .nvmrc
pieh Dec 8, 2023
f7492c3
Update handlerUtils.ts
pieh Dec 8, 2023
5b57b99
Update handlerUtils.ts
pieh Dec 8, 2023
42d8ff9
maybe downgrade cli?
pieh Dec 8, 2023
75c29ab
chore: remove nvmrc
pieh Dec 8, 2023
f48e52b
Revert "maybe downgrade cli?"
pieh Dec 8, 2023
5eb6901
chore: ?
pieh Dec 8, 2023
a806341
chore: how about different cli?
pieh Dec 8, 2023
66a26d7
chore: remove test debug code
pieh Dec 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/test-integration.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
with:
deno-version: v1.x
- name: Install netlify-cli and npm
run: npm install -g netlify-cli npm
run: npm install -g netlify-cli npm@10.2.4
- name: NPM Install
run: npm install
- name: Run integration tests
Expand Down
10 changes: 6 additions & 4 deletions packages/runtime/src/templates/handlerUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,10 +135,12 @@ export const augmentFsModule = ({

// ...then monkey-patch it to see if it's requesting a CDN file
promises.readFile = (async (file, options) => {
const baseUrl = getBase()

// We only care about page files
if (file.startsWith(pageRoot)) {
// file argument can be a string, URL, etc - Next.js cache reading uses a string
// and that's only thing we really want to handle here, so we just do type checking
// instead of trying to handle all possible type before checking weather read
// is about page files.
if (typeof file === 'string' && file.startsWith(pageRoot)) {
const baseUrl = getBase()
// We only want the part after `.next/server/`
const filePath = file.slice(pageRoot.length + 1)

Expand Down