Skip to content
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

Jump to bottom

fix!: execute user and integrations edge functions in the correct order #5624

Merged
merged 4 commits into from
Apr 17, 2023
Merged

fix!: execute user and integrations edge functions in the correct order #5624

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3d4e5f5
fix: correctly execute user and integrations edge functions in the ri…
danez Apr 13, 2023
ee24259
chore: fix types
danez Apr 14, 2023
4420d6b
chore: add test for order of edge-functions
danez Apr 14, 2023
ff16d26
chore: enable featureflag
danez Apr 14, 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: 2 additions & 0 deletions .eslintrc.cjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ module.exports = {
extends: '@netlify/eslint-config-node',
plugins: ['sort-destructure-keys'],
parserOptions: {
ecmaVersion: '2020',
babelOptions: {
parserOpts: {
sourceType: 'unambiguous',
Expand Down Expand Up @@ -80,6 +81,7 @@ module.exports = {
{
files: ['src/**/*.mjs', 'bin/**/*.mjs'],
parserOptions: {
ecmaVersion: '2020',
sourceType: 'module',
babelOptions: {
parserOpts: {
Expand Down
2 changes: 1 addition & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ vendor
.DS_STORE

# Local Netlify folder
.netlify
/.netlify

# site
test-site
Expand Down
2 changes: 1 addition & 1 deletion site/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 6 additions & 3 deletions src/lib/edge-functions/proxy.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,11 +79,12 @@ export const initializeProxy = async ({
const server = prepareServer({
config,
configPath,
directories: [internalFunctionsPath, userFunctionsPath].filter(Boolean),
directory: userFunctionsPath,
env: configEnv,
getUpdatedConfig,
importMaps: [importMap].filter(Boolean),
inspectSettings,
internalDirectory: internalFunctionsPath,
internalFunctions,
port: isolatePort,
projectDir,
Expand Down Expand Up @@ -153,11 +154,12 @@ export const isEdgeFunctionsRequest = (req) => req[headersSymbol] !== undefined
const prepareServer = async ({
config,
configPath,
directories,
directory,
env: configEnv,
getUpdatedConfig,
importMaps,
inspectSettings,
internalDirectory,
internalFunctions,
port,
projectDir,
Expand Down Expand Up @@ -187,9 +189,10 @@ const prepareServer = async ({
bundler,
config,
configPath,
directories,
directories: [directory].filter(Boolean),
env: configEnv,
getUpdatedConfig,
internalDirectories: [internalDirectory].filter(Boolean),
internalFunctions,
projectDir,
runIsolate,
Expand Down
Loading